diff -Nru compiz-plugin-stereo3d-0.3.8~oneiric1/debian/bzr-builder.manifest compiz-plugin-stereo3d-0.3.9~oneiric1/debian/bzr-builder.manifest --- compiz-plugin-stereo3d-0.3.8~oneiric1/debian/bzr-builder.manifest 2012-03-23 13:12:35.000000000 +0000 +++ compiz-plugin-stereo3d-0.3.9~oneiric1/debian/bzr-builder.manifest 2012-03-24 11:05:19.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.3.8 -lp:compiz-plugin-stereo3d/stable revid:kontakt@ddudek.pl-20120322104428-tvff3dl31wm4k04g -nest-part packaging lp:~ddudek/compiz-plugin-stereo3d/packaging debian debian revid:kontakt@ddudek.pl-20120323125447-ni09bgmnmddmwakw +# bzr-builder format 0.3 deb-version 0.3.9 +lp:compiz-plugin-stereo3d/stable revid:kontakt@ddudek.pl-20120324104359-fhds65uam8zbk3mi +nest-part packaging lp:~ddudek/compiz-plugin-stereo3d/packaging debian debian revid:kontakt@ddudek.pl-20120324110114-2u3txcrmux1mdwcw diff -Nru compiz-plugin-stereo3d-0.3.8~oneiric1/debian/changelog compiz-plugin-stereo3d-0.3.9~oneiric1/debian/changelog --- compiz-plugin-stereo3d-0.3.8~oneiric1/debian/changelog 2012-03-23 13:12:35.000000000 +0000 +++ compiz-plugin-stereo3d-0.3.9~oneiric1/debian/changelog 2012-03-24 11:05:19.000000000 +0000 @@ -1,11 +1,6 @@ -compiz-plugin-stereo3d (0.3.8~oneiric1) oneiric; urgency=low +compiz-plugin-stereo3d (0.3.9~oneiric1) lucid; urgency=low * Auto build. - -- Daniel Dudek Fri, 23 Mar 2012 13:12:35 +0000 + -- Daniel Dudek Sat, 24 Mar 2012 11:05:19 +0000 -compiz-plugin-stereo3d (0.3.8) oneiric; urgency=low - - * First public release - - -- Daniel Dudek Wed, 23 Mar 2012 11:11:15 +0100 diff -Nru compiz-plugin-stereo3d-0.3.8~oneiric1/src/animations.cpp compiz-plugin-stereo3d-0.3.9~oneiric1/src/animations.cpp --- compiz-plugin-stereo3d-0.3.8~oneiric1/src/animations.cpp 2012-03-23 13:12:34.000000000 +0000 +++ compiz-plugin-stereo3d-0.3.9~oneiric1/src/animations.cpp 2012-03-24 11:05:19.000000000 +0000 @@ -35,7 +35,8 @@ backgroundDepth = depth; updateMousePosition(); - Stereo3DWindow *lastDrawnWindow; + Stereo3DWindow *lastDrawnWindow = NULL; + Stereo3DWindow *bkgWindow = NULL; foreach (CompWindow *w, windows) @@ -48,7 +49,7 @@ } if(floatingWindowsCount == 0 ) floatingWindowsCount++; - //compLogMessage ("stereoscopic-output", CompLogLevelWarn, "WndCount: %d", windowsCount); + //compLogMessage ("stereo3d", CompLogLevelWarn, "WndCount: %d", windowsCount); float step = (depth + foregroundCurrZ) / (float)floatingWindowsCount; @@ -73,13 +74,13 @@ sow -> saturation = 1.0f - 0.5 * lightingStrength; - lastDrawnWindow = sow; + bkgWindow = sow; break; case FTDOCK: sow ->dstAttrs.translation[GLVector::z] = 0.0f; sow ->dstAttrs.rotation[GLVector::y] = 0.0f; - lastDrawnWindow = sow; +// lastDrawnWindow = sow; break; case FTWINDOW: @@ -111,7 +112,12 @@ } - lastDrawnWindow->drawMouse = true; + if(lastDrawnWindow != NULL) + lastDrawnWindow->drawMouse = true; + else if(bkgWindow != NULL) + bkgWindow->drawMouse = true; + else + compLogMessage ("stereo3d", CompLogLevelWarn, "no window found to hook up mouse drawing"); } diff -Nru compiz-plugin-stereo3d-0.3.8~oneiric1/src/stereo3d.cpp compiz-plugin-stereo3d-0.3.9~oneiric1/src/stereo3d.cpp --- compiz-plugin-stereo3d-0.3.8~oneiric1/src/stereo3d.cpp 2012-03-23 13:12:34.000000000 +0000 +++ compiz-plugin-stereo3d-0.3.9~oneiric1/src/stereo3d.cpp 2012-03-24 11:05:19.000000000 +0000 @@ -296,7 +296,7 @@ void Stereo3DScreen::updateCursor (CursorTexture * cursorTex) { - compLogMessage ("stereoscopic-output", CompLogLevelWarn, "updateCursor!"); +// compLogMessage ("stereo3d", CompLogLevelWarn, "updateCursor!"); unsigned char *pixels; int i; Display *dpy = screen->dpy (); @@ -330,6 +330,7 @@ if (!pixels) { XFree (ci); + return; } @@ -367,7 +368,7 @@ pixels[(i * 4) + 3] = (pix >> 24) & 0xff; } - compLogMessage ("stereoscopic-output", CompLogLevelWarn, "unable to get system cursor image!"); + compLogMessage ("stereo3d", CompLogLevelWarn, "unable to get system cursor image!"); } glBindTexture (GL_TEXTURE_RECTANGLE_ARB, cursorTex->texture); @@ -461,7 +462,7 @@ sos -> setNoConvergencePrjectionMatrix(); status &= gWindow->glDraw (transform, fragment, region, mask); if(drawMouse) - { + { sos->drawCursor( ); } } @@ -505,6 +506,8 @@ glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glLineWidth (2.0f); glBegin( GL_LINES ); { @@ -753,9 +756,8 @@ if (window->overrideRedirect ()) return FTNONE; - if (!window->isViewable () || window->shaded ()) - return FTNONE; - + if (!window->isViewable () || window->shaded ()) + return FTNONE; //TODO: move fetching options out of the drawing loop diff -Nru compiz-plugin-stereo3d-0.3.8~oneiric1/stereo3d.xml.in compiz-plugin-stereo3d-0.3.9~oneiric1/stereo3d.xml.in --- compiz-plugin-stereo3d-0.3.8~oneiric1/stereo3d.xml.in 2012-03-23 13:12:34.000000000 +0000 +++ compiz-plugin-stereo3d-0.3.9~oneiric1/stereo3d.xml.in 2012-03-24 11:05:19.000000000 +0000 @@ -66,7 +66,7 @@ <_long>Strength of stereo effect (maximum disparity in px) 105 0 - 500 + 300 1 @@ -122,7 +122,7 @@