Merge lp:~azzar1/nux/fix-893670 into lp:nux/2.0

[Andrea Azzarone]

This branch is a partial fix for the bug #893670. It requires also:
- https://code.launchpad.net/~andyrock/compiz-core/scale-left-padding/+merge/88622
- https://code.launchpad.net/~andyrock/unity/scale-left-padding/+merge/88625

But you can test it setting the spacing option in the scale ccsm panel to 100.

[Andrea Azzarone (azzar1)]

This branch is a partial fix for the bug #893670.

[Mirco Müller (macslow)]

Looks fine.

review: Approve

[Andrea Azzarone (azzar1)]

We're waiting for the the other two branches.

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2012-01-06 18:43:37 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2012-01-15 23:24:26 +0000
@@ -1682,12 +1682,6 @@
         {
           //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: MapNotify event.");
           m_pEvent->type = NUX_WINDOW_MAP;
-
-          XSetInputFocus(xevent.xany.display,
-                          xevent.xany.window,
-                          RevertToParent,
-                          CurrentTime);
-
         }
         
         break;
@@ -2727,5 +2721,3 @@
   }
 
 }
-
-
 
=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2011-11-01 15:58:46 +0000
+++ NuxGraphics/XInputWindow.cpp	2012-01-15 23:24:26 +0000
@@ -335,10 +335,14 @@
     {
       XMapRaised(display_, window_);
       mapped_ = true;
+
+      XEvent xevent;
+      while (XCheckTypedWindowEvent(display_, window_, MapNotify, &xevent));
+      XSetInputFocus(display_, window_, RevertToParent, CurrentTime);
+
     }
     XMoveResizeWindow(display_, window_,
                       geometry_.x, geometry_.y,
                       geometry_.width, geometry_.height);
   }
 }
-