diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/debian/bzr-builder.manifest compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/debian/bzr-builder.manifest --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/debian/bzr-builder.manifest 2012-02-01 14:29:00.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/debian/bzr-builder.manifest 2012-02-09 00:29:47.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 1:{debupstream}+2904+702+201202011428 -lp:~linaro-graphics-wg/compiz-core/linaro-gles2 revid:alexandros.frantzis@linaro.org-20120125165146-m4zsssls64wsymjm +# bzr-builder format 0.3 deb-version 1:{debupstream}+2906+702+201202090029 +lp:~linaro-graphics-wg/compiz-core/linaro-gles2 revid:alexandros.frantzis@linaro.org-20120208184411-4by5jonb89ieji1o nest-part packaging lp:~linaro-maintainers/compiz/overlay debian debian revid:ricardo.salveti@linaro.org-20120131040515-vwa52fjhatn78acy diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/debian/changelog compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/debian/changelog --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/debian/changelog 2012-02-01 14:29:00.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/debian/changelog 2012-02-09 00:29:47.000000000 +0000 @@ -1,8 +1,8 @@ -compiz (1:0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1) oneiric; urgency=low +compiz (1:0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1) oneiric; urgency=low * Auto build. - -- Ricardo Salveti Wed, 01 Feb 2012 14:29:00 +0000 + -- Launchpad Package Builder Thu, 09 Feb 2012 00:29:47 +0000 compiz (1:0.9.6+bzr20120117.2012.01-0linaro3) oneiric; urgency=low diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/annotate/src/annotate.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/annotate/src/annotate.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/annotate/src/annotate.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/annotate/src/annotate.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -79,7 +79,7 @@ format, w, h); cairo = cairo_create (surface); - + if (cairoBuffer.size ()) { cairo_t *cr = cairo_create (surface); @@ -89,18 +89,18 @@ cairoBuffer.c_str (), CAIRO_FORMAT_ARGB32, w, h, stride); - + if (cr && raw_source) - { + { cairo_set_source_surface (cr, raw_source, 0, 0); cairo_paint (cr); - + cairo_surface_destroy (raw_source); cairo_destroy (cr); cairoBuffer.clear (); } } - else + else cairoClear (cairo); } @@ -290,7 +290,7 @@ * - * - "line_width" float, default: 0 - Drawing Width * - * - "stroke_width" float, default: 0 - Drawing Height * - * - All of these are taken from the builtin options if not provided - */ + */ bool AnnoScreen::draw (CompAction *action, @@ -376,7 +376,7 @@ else slant = CAIRO_FONT_SLANT_NORMAL; - str = + str = CompOption::getStringOptionNamed (options, "weight", "").c_str (); if (strcasecmp (str, "bold") == 0) weight = CAIRO_FONT_WEIGHT_BOLD; @@ -385,7 +385,7 @@ x = CompOption::getFloatOptionNamed (options, "x", 0); y = CompOption::getFloatOptionNamed (options, "y", 0); - text = + text = CompOption::getStringOptionNamed (options, "text", "").c_str (); family = CompOption::getStringOptionNamed (options, "family", "Sans").c_str (); @@ -1029,7 +1029,7 @@ } AnnoScreen::~AnnoScreen () -{ +{ writeSerializedData (); if (cairo) diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/bailer/src/bailer.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/bailer/src/bailer.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/bailer/src/bailer.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/bailer/src/bailer.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -79,9 +79,9 @@ "Ensuring a shell for your session"); /* FIXME: will be nicer to get the detection module at start and so, not loading plugin rather - than unloading them, isn't it? */ - unloadPlugins (compizShellUnload); - + than unloading them, isn't it? */ + unloadPlugins (compizShellUnload); + if (strcmp (alternative_shell.c_str (), "") != 0) { compLogMessage ("bailer", @@ -90,7 +90,7 @@ screen->runCommand (alternative_shell.c_str ()); return; } - + if (getenv ("GDMSESSION") != NULL && (strcmp (getenv ("GDMSESSION"), "gnome") == 0)) { screen->runCommand ("gnome-panel"); } diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/clone/src/clone.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/clone/src/clone.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/clone/src/clone.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/clone/src/clone.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -215,7 +215,7 @@ if (screen->outputDevs ()[dstForThisOutput].width () != screen->outputDevs ()[outputId].width () || - screen->outputDevs ()[dstForThisOutput].height () != + screen->outputDevs ()[dstForThisOutput].height () != screen->outputDevs ()[outputId].height ()) transformed = true; else @@ -230,7 +230,7 @@ status = gScreen->glPaintOutput (attrib, transform, sRegion, &screen->outputDevs ()[dstForThisOutput], mask); else - status = + status = gScreen->glPaintOutput (attrib, transform, sRegion, output, mask); if (grab) @@ -315,7 +315,7 @@ if (!w->isViewable () || !cw->cWindow->damaged ()) continue; } - + cw->gWindow->glPaint (cw->gWindow->paintAttrib (), sTransform, srcOutputRegion, PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK); @@ -569,7 +569,7 @@ { GLWindowInterface::setHandler (gWindow, false); } - + CloneScreen::~CloneScreen () { while (!clones.empty ()) diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h 2012-02-09 00:29:40.000000000 +0000 @@ -64,7 +64,7 @@ AllViewports, Panels, Group -} SwitchWindowSelection; +} SwitchWindowSelection; class BaseSwitchScreen { diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/composite/include/composite/composite.h compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/composite/include/composite/composite.h --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/composite/include/composite/composite.h 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/composite/include/composite/composite.h 2012-02-09 00:29:40.000000000 +0000 @@ -98,7 +98,7 @@ public WrapableInterface { public: - + /** * Hook which activates just before the screen is painted, * plugins should use this to calculate animation parameters @@ -107,7 +107,7 @@ * since the last screen repaint */ virtual void preparePaint (int); - + /** * Hook which activates right after the screen is painted, * plugins should use this to run post-paint cleanup, damage handling @@ -115,7 +115,7 @@ * */ virtual void donePaint (); - + /** * Hookable function which dispatches painting of outputs * to rendering plugins such as OpenGL. Hook this function @@ -123,9 +123,9 @@ * manually if you are rendering */ virtual void paint (CompOutput::ptrList &outputs, unsigned int); - + /** - * Hookable function which gets a list of windows that need to be + * Hookable function which gets a list of windows that need to be * evaluated for repainting */ virtual const CompWindowList & getWindowPaintList (); @@ -159,9 +159,9 @@ CompOption::Vector & getOptions (); bool setOption (const CompString &name, CompOption::Value &value); - /** + /** * Register a dispatch PaintHandler for a rendering plugin - */ + */ bool registerPaintHandler (PaintHandler *pHnd); void unregisterPaintHandler (); @@ -169,7 +169,7 @@ /** * Returns the value of an XDamage Extension event signature - */ + */ int damageEvent (); /** @@ -184,7 +184,7 @@ */ void damageRegion (const CompRegion &); void damagePending (); - + unsigned int damageMask (); const CompRegion & currentDamage () const; @@ -203,7 +203,7 @@ /** * Limits the number of redraws per second - */ + */ void setFPSLimiterMode (CompositeFPSLimiterMode newMode); CompositeFPSLimiterMode FPSLimiterMode (); @@ -313,12 +313,12 @@ * Binds the window contents of this window to some offscreen pixmap */ bool bind (); - + /** * Releases the pixmap data for this window with XFreePixmap. */ void release (); - + /** * Returns the window pixmap */ @@ -336,15 +336,15 @@ * offscreen pixmap */ void redirect (); - + /** * Stops this window from being composited, so that the X Server * draws the window on-screen normally and output is not redirected * to an offscreen pixmap */ - + void unredirect (); - + /** * Returns true if a window is redirected */ diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/composite/src/screen.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/composite/src/screen.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/composite/src/screen.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/composite/src/screen.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -693,7 +693,7 @@ /* handle clock rollback */ if (diff < 0) diff = 0; - + bool hasVSyncBehavior = (FPSLimiterMode == CompositeFPSLimiterModeVSyncLike || (pHnd && pHnd->hasVSync ())); @@ -746,7 +746,7 @@ } } } - + if (diff >= redrawTime) return 1; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/cube/src/cube.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/cube/src/cube.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/cube/src/cube.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/cube/src/cube.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -57,7 +57,7 @@ CompOutput *output, int size) WRAPABLE_DEF (cubePaintTop, sAttrib, transform, output, size) - + void CubeScreenInterface::cubePaintBottom (const GLScreenPaintAttrib &sAttrib, const GLMatrix &transform, @@ -93,54 +93,54 @@ CompOutput *output, PaintOrder order) WRAPABLE_DEF (cubeShouldPaintViewport, sAttrib, transform, output, order) - + bool CubeScreenInterface::cubeShouldPaintAllViewports () WRAPABLE_DEF (cubeShouldPaintAllViewports); -int +int CubeScreen::invert () const { return priv->mInvert; } -unsigned short* +unsigned short* CubeScreen::topColor () const { return priv->optionGetTopColor (); } -unsigned short* +unsigned short* CubeScreen::bottomColor () const { return priv->optionGetBottomColor (); } -bool +bool CubeScreen::unfolded () const { return priv->mUnfolded; } -CubeScreen::RotationState +CubeScreen::RotationState CubeScreen::rotationState () const { return priv->mRotationState; } -void +void CubeScreen::rotationState (CubeScreen::RotationState state) { priv->mRotationState = state; } -int +int CubeScreen::xRotations () const { return priv->mXRotations; } -int +int CubeScreen::nOutput () const { return priv->mNOutput; @@ -198,13 +198,13 @@ return Automatic; } -int +int CubeScreen::sourceOutput () const { return priv->mSrcOutput; } -PaintOrder +PaintOrder CubeScreen::paintOrder () const { return priv->mPaintOrder; @@ -214,7 +214,7 @@ CubeScreen::cubeShouldPaintAllViewports () { WRAPABLE_HND_FUNC_RETURN (8, bool, cubeShouldPaintAllViewports); - + return priv->mPaintAllViewports; } @@ -744,8 +744,8 @@ if (mDesktopOpacity != mToOpacity || (progress > 0.0 && progress < 1.0)) { - mDesktopOpacity = - (optionGetInactiveOpacity () - + mDesktopOpacity = + (optionGetInactiveOpacity () - ((optionGetInactiveOpacity () - mOptions[mLastOpacityIndex].value ().f ()) * progress)) / 100.0f * OPAQUE; @@ -758,7 +758,7 @@ mPaintAllViewports = (mDesktopOpacity != OPAQUE || topColor[3] != OPAQUE || bottomColor[3] != OPAQUE); - + cScreen->preparePaint (msSinceLastPaint); } @@ -769,7 +769,7 @@ cubeScreen->cubeGetRotation (x, x, progress); - if (optionGetMultioutputMode () == MultioutputModeOneBigCube && + if (optionGetMultioutputMode () == MultioutputModeOneBigCube && screen->outputDevs ().size () && (progress > 0.0f || mDesktopOpacity != OPAQUE)) { @@ -889,7 +889,7 @@ { int output; - if (!cubeScreen->cubeShouldPaintViewport (sAttrib, transform, outputPtr, + if (!cubeScreen->cubeShouldPaintViewport (sAttrib, transform, outputPtr, paintOrder)) return; @@ -923,9 +923,9 @@ output = mSrcOutput = mOutput[cubeOutput]; cScreen->setWindowPaintOffset (-dView * screen->width (), 0); - + CompRegion reg (screen->outputDevs () [output]); - cubeScreen->cubePaintViewport (sAttrib, transform, reg, + cubeScreen->cubePaintViewport (sAttrib, transform, reg, &screen->outputDevs () [output], mask); cScreen->setWindowPaintOffset (0, 0); } @@ -1086,7 +1086,7 @@ } } -void +void CubeScreen::cubePaintTop (const GLScreenPaintAttrib &sAttrib, const GLMatrix &transform, CompOutput *output, @@ -1151,7 +1151,7 @@ glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); } -void +void CubeScreen::cubePaintBottom (const GLScreenPaintAttrib &sAttrib, const GLMatrix &transform, CompOutput *output, @@ -1215,8 +1215,8 @@ WRAPABLE_HND_FUNC (4, cubePaintInside, sAttrib, transform, output, size) } -void -PrivateCubeScreen::glEnableOutputClipping (const GLMatrix &transform, +void +PrivateCubeScreen::glEnableOutputClipping (const GLMatrix &transform, const CompRegion ®ion, CompOutput *output) { @@ -1261,7 +1261,7 @@ gScreen->glEnableOutputClipping (transform, region, output); } -void +void CubeScreen::cubePaintViewport (const GLScreenPaintAttrib &sAttrib, const GLMatrix &transform, const CompRegion ®ion, @@ -1270,15 +1270,15 @@ { WRAPABLE_HND_FUNC (6, cubePaintViewport, sAttrib, transform, region, output, mask) - priv->gScreen->glPaintTransformedOutput (sAttrib, transform, region, + priv->gScreen->glPaintTransformedOutput (sAttrib, transform, region, output, mask); } -void +void PrivateCubeScreen::glPaintTransformedOutput (const GLScreenPaintAttrib &sAttrib, - const GLMatrix &transform, + const GLMatrix &transform, const CompRegion ®ion, - CompOutput *outputPtr, + CompOutput *outputPtr, unsigned int mask) { GLScreenPaintAttrib sa = sAttrib; @@ -1501,10 +1501,10 @@ gScreen->setTextureFilter (filter); } -bool -PrivateCubeWindow::glPaint (const GLWindowPaintAttrib &attrib, +bool +PrivateCubeWindow::glPaint (const GLWindowPaintAttrib &attrib, const GLMatrix &transform, - const CompRegion ®ion, + const CompRegion ®ion, unsigned int mask) { @@ -1531,9 +1531,9 @@ return cScreen->getWindowPaintList (); } -void +void PrivateCubeScreen::glApplyTransform (const GLScreenPaintAttrib &sAttrib, - CompOutput *output, + CompOutput *output, GLMatrix *transform) { transform->translate (mOutputXOffset, -mOutputYOffset, 0.0f); @@ -1594,7 +1594,7 @@ if (!xid || ::screen->root () == xid) { CUBE_SCREEN (screen); - + if (cs->priv->mGrabIndex) { cs->priv->mUnfolded = false; @@ -1616,7 +1616,7 @@ screen->outputChangeNotify (); } -bool +bool PrivateCubeScreen::setOptionForPlugin (const char *plugin, const char *name, CompOption::Value &v) diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/debugspew/src/debugspew.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/debugspew/src/debugspew.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/debugspew/src/debugspew.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/debugspew/src/debugspew.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -157,7 +157,7 @@ } f = f + compPrintf ("\n"); - + f = f + compPrintf (" WM Protocols :"); #define SPEW_WINDOW_PROTOCOL(protocol) \ @@ -320,7 +320,7 @@ f = f + compPrintf (" == REGIONS == \n"); foreach (CompRegion ®, gWindow->priv->regions) - { + { f = f + compPrintf (" Region, bRect %i %i %i %i\n", reg.boundingRect ().x (), reg.boundingRect ().y (), reg.boundingRect ().width (), reg.boundingRect ().height ()); foreach (const CompRect &r, reg.rects ()) { @@ -499,7 +499,7 @@ f = f + compPrintf ("= Composite Screen =\n"); f = f + compPrintf (" Compositing Active: %i\n", cScreen->compositingActive ()); - f = f + compPrintf (" DamageMask Pending %i Region %i All %i\n", cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_PENDING_MASK, cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_REGION_MASK, cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_ALL_MASK); + f = f + compPrintf (" DamageMask Pending %i Region %i All %i\n", cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_PENDING_MASK, cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_REGION_MASK, cScreen->damageMask () & COMPOSITE_SCREEN_DAMAGE_ALL_MASK); f = f + compPrintf (" Current Damage region bRect %i %i %i %i\n", cScreen->priv->damage.boundingRect ().x (), cScreen->priv->damage.boundingRect ().y (), cScreen->priv->damage.boundingRect ().width (), cScreen->priv->damage.boundingRect ().height ()); foreach (const CompRect &r, cScreen->priv->damage.rects ()) f = f + compPrintf (" Rect: %i %i %i %i\n", r.x (), r.y (), r.width (), r.height ()); diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/decor/src/decor.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/decor/src/decor.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/decor/src/decor.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/decor/src/decor.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -147,8 +147,6 @@ { bool status; - status = gWindow->glDraw (transform, attrib, region, mask); - /* Don't render dock decorations (shadows) on just any old window */ if (!(window->type () & CompWindowTypeDockMask)) { @@ -168,6 +166,8 @@ } } + status = gWindow->glDraw (transform, attrib, region, mask); + return status; } @@ -506,7 +506,7 @@ border = input; maxBorder = maxInput; - + XFree (data); } else @@ -1518,7 +1518,7 @@ * this window to have no decorations */ update (false); - + break; } case CompWindowNotifyReparent: diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/dispatcher.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/dispatcher.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/dispatcher.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/dispatcher.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -47,27 +47,27 @@ foreach (SocketObject *socket, mSockets) delete socket; } - -void + +void EventDispatcherCompiz::flush () { XFlush (QX11Info::display()); } -bool +bool EventDispatcherCompiz::hasPendingEvents () { extern Q_CORE_EXPORT uint qGlobalPostedEventsCount(); return qGlobalPostedEventsCount() != 0; } -void +void EventDispatcherCompiz::interrupt () { wakeUp (); } -bool +bool EventDispatcherCompiz::processEvents (QEventLoop::ProcessEventsFlags flags) { emit awake (); @@ -75,7 +75,7 @@ Display *dpy = QX11Info::display(); while (!(flags & QEventLoop::ExcludeUserInputEvents) - && !mQueuedEvents.isEmpty()) + && !mQueuedEvents.isEmpty()) { // process a pending user input event XEvent event = mQueuedEvents.takeFirst(); @@ -86,7 +86,7 @@ return true; } - while (XPending (dpy)) + while (XPending (dpy)) { XEvent event; @@ -122,7 +122,7 @@ break; } } - + // send through event filter if (filterEvent(&event)) continue; @@ -146,14 +146,14 @@ mSockets.append (new SocketObject (notifier)); } -void +void EventDispatcherCompiz::registerTimer (int timerId, int interval, QObject *object) { TimerObject *timer = new TimerObject (timerId, interval, object); mTimers.append (timer); } -QList +QList EventDispatcherCompiz::registeredTimers (QObject *object) const { QList list; @@ -165,7 +165,7 @@ return list; } -void +void EventDispatcherCompiz::unregisterSocketNotifier (QSocketNotifier *notifier) { SocketObject *sock = NULL; @@ -175,7 +175,7 @@ sock = socket; break; } - + if (sock) { mSockets.removeAll (sock); @@ -183,7 +183,7 @@ } } -bool +bool EventDispatcherCompiz::unregisterTimer (int timerId) { TimerObject *time = NULL; @@ -205,7 +205,7 @@ return false; } -bool +bool EventDispatcherCompiz::unregisterTimers (QObject *object) { QList list; @@ -228,7 +228,7 @@ return false; } -void +void EventDispatcherCompiz::wakeUp () { if (mWakeUpPipe[1]) @@ -236,7 +236,7 @@ return; } -void +void EventDispatcherCompiz::startingUp () { if (pipe (mWakeUpPipe) < 0) @@ -247,7 +247,7 @@ POLLIN | POLLHUP | POLLERR, NULL); } -void +void EventDispatcherCompiz::closingDown () { screen->removeWatchFd (mX11Handle); @@ -256,7 +256,7 @@ -void +void EventDispatcherCompiz::wakeUpEvent () { char buf[256]; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/dispatcher.h compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/dispatcher.h --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/dispatcher.h 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/dispatcher.h 2012-02-09 00:29:40.000000000 +0000 @@ -31,7 +31,7 @@ class TimerObject; class SocketObject; -class EventDispatcherCompiz : +class EventDispatcherCompiz : public QAbstractEventDispatcher { Q_OBJECT @@ -39,7 +39,7 @@ public: EventDispatcherCompiz (QObject *parent = 0); ~EventDispatcherCompiz (); - + virtual void flush (); virtual bool hasPendingEvents (); virtual void interrupt (); @@ -51,18 +51,18 @@ virtual bool unregisterTimer (int timerId); virtual bool unregisterTimers (QObject *object); virtual void wakeUp (); - + void startingUp (); void closingDown (); - + private: void wakeUpEvent (); - + private: QList mTimers; QList mSockets; - + QList mDeleteTimers; QList mDeleteSockets; @@ -70,9 +70,9 @@ CompWatchFdHandle mWakeUpHandle; QList mQueuedEvents; - + int mWakeUpPipe[2]; - + CompTimer mEventTimer; }; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/socket.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/socket.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/socket.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/socket.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -44,7 +44,7 @@ default: return; } - mHandle = screen->addWatchFd (notifier->socket (), mask, + mHandle = screen->addWatchFd (notifier->socket (), mask, boost::bind (&SocketObject::callback, this)); } diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/timer.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/timer.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/kde/src/timer.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/kde/src/timer.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -61,7 +61,7 @@ return mEnabled; } -void +void TimerObject::disable () { mEnabled = false; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/obs/src/obs.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/obs/src/obs.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/obs/src/obs.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/obs/src/obs.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -246,7 +246,7 @@ ObsWindow::updateTimeout () { int i; - + for (i = 0; i < MODIFIER_COUNT; i++) updatePaintModifier (i); diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/paint.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/paint.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/paint.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/paint.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -820,7 +820,7 @@ unsigned int maxGridWidth, unsigned int maxGridHeight) { - WRAPABLE_HND_FUNC (2, glAddGeometry, matrix, region, clip) + WRAPABLE_HND_FUNC (2, glAddGeometry, matrix, region, clip, maxGridWidth, maxGridHeight) BoxRec full; int nMatrix = matrix.size (); diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/programcache.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/programcache.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/programcache.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/programcache.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -110,7 +110,7 @@ { delete priv; } - + GLProgram* GLProgramCache::operator () (std::list shaders) { std::list::iterator name_it; @@ -125,7 +125,7 @@ } std::map::iterator it = priv->cache.find (name); - + if (it == priv->cache.end ()) { GLProgram *program = compileProgram (name, shaders); @@ -168,7 +168,7 @@ // find least recently used GLProgram std::map::iterator it = cache.find (access_history.front ()); assert (it != cache.end ()); - + cache.erase (it); access_history.pop_front (); } diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/screen.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/screen.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/screen.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/screen.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -539,7 +539,7 @@ return; } - if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two")) + if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two")) GL::textureNonPowerOfTwo = true; GL::textureNonPowerOfTwoMipmap = GL::textureNonPowerOfTwo; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/shaders.h compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/shaders.h --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/shaders.h 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/shaders.h 2012-02-09 00:29:40.000000000 +0000 @@ -77,7 +77,7 @@ // - z is saturation //texture0 is the main texture bound to texture unit 0 from GLWindow:: -//glDrawTexture (). texture1, texture2 and texture3 are meant for +//glDrawTexture (). texture1, texture2 and texture3 are meant for //multitexturing and should not be used by plugins. //TODO: Add multitexturing support. diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/texture.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/texture.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/opengl/src/texture.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/opengl/src/texture.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -526,7 +526,7 @@ { glBindTexture (target (), name ()); GLTexture::enable (filter); - + if (damaged) updateMipMap = true; @@ -726,7 +726,7 @@ } GLTexture::enable (filter); - + if (damaged) updateMipMap = true; diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/place/src/place.h compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/place/src/place.h --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/place/src/place.h 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/place/src/place.h 2012-02-09 00:29:40.000000000 +0000 @@ -46,11 +46,11 @@ void handleScreenSizeChange (int width, int height); bool getPointerPosition (CompPoint &p); void addSupportedAtoms (std::vector&); - + CompSize mPrevSize; int mStrutWindowCount; CompTimer mResChangeFallbackHandle; - + Atom fullPlacementAtom; }; @@ -66,7 +66,7 @@ ~PlaceWindow (); bool place (CompPoint &pos); - + CompRect doValidateResizeRequest (unsigned int &, XWindowChanges *, @@ -75,11 +75,10 @@ void validateResizeRequest (unsigned int &mask, XWindowChanges *xwc, unsigned int source); - void grabNotify (int, int, unsigned int, unsigned int); + void grabNotify (int, int, unsigned int, unsigned int); bool mSavedOriginal; CompRect mOrigVpRelRect; CompPoint mPrevServer; - private: typedef enum { diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/resize/src/resize.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/resize/src/resize.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/resize/src/resize.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/resize/src/resize.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -838,7 +838,7 @@ pointerDx += xRoot - lastPointerX; pointerDy += yRoot - lastPointerY; } - + /* If we hit the edge of the screen while resizing * the window and the adjacent window edge has not hit * the edge of the screen, then accumulate pointer motion diff -Nru compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/rotate/src/rotate.cpp compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/rotate/src/rotate.cpp --- compiz-0.9.6+bzr20120117.2012.01+2904+702+201202011428~oneiric1/plugins/rotate/src/rotate.cpp 2012-02-01 14:28:54.000000000 +0000 +++ compiz-0.9.6+bzr20120117.2012.01+2906+702+201202090029~oneiric1/plugins/rotate/src/rotate.cpp 2012-02-09 00:29:40.000000000 +0000 @@ -121,7 +121,7 @@ mMoveWindow = None; } -void +void RotateScreen::preparePaint (int msSinceLastPaint) { float oldXrot = mXrot + mBaseXrot; @@ -352,7 +352,7 @@ cScreen->donePaint (); } -void +void RotateScreen::cubeGetRotation (float &x, float &v, float &progress) { cubeScreen->cubeGetRotation (x, v, progress); @@ -364,8 +364,8 @@ bool RotateScreen::glPaintOutput (const GLScreenPaintAttrib &sAttrib, - const GLMatrix &transform, - const CompRegion ®ion, + const GLMatrix &transform, + const CompRegion ®ion, CompOutput *output, unsigned int mask) { @@ -377,14 +377,14 @@ mask &= ~PAINT_SCREEN_REGION_MASK; mask |= PAINT_SCREEN_TRANSFORMED_MASK; - + return gScreen->glPaintOutput (sAttrib, sTransform, region, output, mask); } return gScreen->glPaintOutput (sAttrib, transform, region, output, mask); } -bool +bool RotateScreen::initiate (CompAction *action, CompAction::State state, CompOption::Vector &options) @@ -450,7 +450,7 @@ return true; } -bool +bool RotateScreen::terminate (CompAction *action, CompAction::State state, CompOption::Vector &options) @@ -479,7 +479,7 @@ return false; } -bool +bool RotateScreen::rotate (CompAction *action, CompAction::State state, CompOption::Vector &options, @@ -507,11 +507,11 @@ o.push_back (CompOption ("root", CompOption::TypeInt)); o.push_back (CompOption ("x", CompOption::TypeInt)); o.push_back (CompOption ("y", CompOption::TypeInt)); - + o[0].value ().set ((int) screen->root ()); o[1].value ().set (CompOption::getIntOptionNamed (options, "x", 0)); o[2].value ().set (CompOption::getIntOptionNamed (options, "y", 0)); - + initiate (NULL, 0, o); } @@ -573,11 +573,11 @@ o.push_back (CompOption ("root", CompOption::TypeInt)); o.push_back (CompOption ("x", CompOption::TypeInt)); o.push_back (CompOption ("y", CompOption::TypeInt)); - + o[0].value ().set ((int) screen->root ()); o[1].value ().set (CompOption::getIntOptionNamed (options, "x", 0)); o[2].value ().set (CompOption::getIntOptionNamed (options, "y", 0)); - + initiate (NULL, 0, o); } @@ -692,7 +692,7 @@ { int pointerDx = pointerX - lastPointerX; int warpX; - + if (direction == -1) { warpX = pointerX + screen->width (); @@ -739,7 +739,7 @@ return false; } -bool +bool RotateScreen::flipTerminate (CompAction *action, CompAction::State state, CompOption::Vector &options) @@ -749,14 +749,14 @@ xid = CompOption::getIntOptionNamed (options, "root", 0); - + if (xid && screen->root () != xid) return false; if (mRotateTimer.active ()) { mRotateTimer.stop (); - + if (mSlow) { mMoveTo = 0.0f; @@ -773,7 +773,7 @@ } -int +int RotateScreen::rotateToDirection (int face) { int delta; @@ -822,7 +822,7 @@ return false; } -void +void RotateScreen::handleEvent (XEvent *event) { switch (event->type) { @@ -892,7 +892,7 @@ dx -= screen->vpSize ().width (); else if (dx * 2 < -screen->vpSize ().width ()) dx += screen->vpSize ().width (); - + o.push_back (CompOption ("root", CompOption::TypeInt)); o.push_back (CompOption ("x", CompOption::TypeInt)); o.push_back (CompOption ("y", CompOption::TypeInt)); @@ -955,7 +955,7 @@ window->activate (); } -void +void RotateWindow::grabNotify (int x, int y, unsigned int state, unsigned int mask) { if (!rScreen->mGrabWindow) @@ -967,7 +967,7 @@ window->grabNotify (x, y, state, mask); } -void +void RotateWindow::ungrabNotify () { if (window == rScreen->mGrabWindow)