← Back to branch summary

~ps-jenkins/compiz/latestsnapshot-10.9.9daily13.05.0813.04-0ubuntu1

« back to all changes in this revision

Viewing changes to src/window.cpp

  • Committer: Tarmac
  • Author(s): Daniel van Vugt
  • Date: 2013-04-02 19:24:11 UTC
  • mfrom: (3643.1.3 back-to-raring)
  • Revision ID: tarmac-20130402192411-8jqkwbion75aazvt
Make lp:compiz/0.9.9 identical to lp:compiz/raring, so we can use it for 
raring maintenance and eliminate lp:compiz/raring.

The changes that this proposal "undoes" have not been lost. They have just
moved to the new development series: lp:compiz/0.9.10 (lp:compiz now points
to this).

Approved by PS Jenkins bot, Sam Spilsbury.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/window.cpp
38
38
 
39
39
#include <boost/bind.hpp>
40
40
#include <boost/make_shared.hpp>
41
 
#include <boost/pointer_cast.hpp>
42
41
 
43
42
#include <core/icon.h>
44
43
#include <core/atoms.h>
2170
2169
{
2171
2170
}
2172
2171
 
 
2172
void
 
2173
CompWindow::syncPosition ()
 
2174
{
 
2175
}
 
2176
 
2173
2177
bool
2174
2178
CompWindow::focus ()
2175
2179
{
3017
3021
    return m;
3018
3022
}
3019
3023
 
3020
 
static bool isPendingRestack (const compiz::X11::PendingEvent::Ptr &p)
 
3024
static bool isPendingRestack (compiz::X11::PendingEvent::Ptr p)
3021
3025
{
3022
 
    compiz::X11::PendingConfigureEvent::Ptr pc =
3023
 
        boost::static_pointer_cast <compiz::X11::PendingConfigureEvent> (p);
 
3026
    compiz::X11::PendingConfigureEvent::Ptr pc = boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
3024
3027
 
3025
3028
    return pc->matchVM (CWStackMode | CWSibling);
3026
3029
}
3027
3030
 
3028
 
static bool isExistingRequest (const compiz::X11::PendingEvent::Ptr &p,
3029
 
                               XWindowChanges &xwc,
3030
 
                               unsigned int valueMask)
 
3031
static bool isExistingRequest (compiz::X11::PendingEvent::Ptr p, XWindowChanges &xwc, unsigned int valueMask)
3031
3032
{
3032
 
    compiz::X11::PendingConfigureEvent::Ptr pc =
3033
 
            boost::static_pointer_cast <compiz::X11::PendingConfigureEvent> (p);
 
3033
    compiz::X11::PendingConfigureEvent::Ptr pc = boost::shared_static_cast <compiz::X11::PendingConfigureEvent> (p);
3034
3034
 
3035
3035
    return pc->matchRequest (xwc, valueMask);
3036
3036
}
4161
4161
 
4162
4162
                if (serverFrame)
4163
4163
                {
4164
 
                    compiz::X11::PendingEvent::Ptr pc (new compiz::X11::PendingConfigureEvent (
4165
 
                                                        screen->dpy (), serverFrame, valueMask, &lxwc));
 
4164
                    compiz::X11::PendingEvent::Ptr pc =
 
4165
                            boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
 
4166
                                                                                      new compiz::X11::PendingConfigureEvent (
 
4167
                                                                                          screen->dpy (), serverFrame, valueMask, &lxwc)));
4166
4168
 
4167
4169
                    pendingConfigures.add (pc);
4168
4170
                }