dont unshade windows when they get focus

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index d30c01edf47e65273da9ac991b4b478b3d301b98..cdc7137a0b07291674e1c6aa37af67e723fb0ddb 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -439,8 +439,12 @@ void Blackbox::process_event(XEvent *e) {
     if ( i > 0 )
       e = &realevent;
 
+    // the pointer is on the wrong screen
+    if (! e->xmotion.same_screen)
+      break;
+
     // strip the lock key modifiers
-    e->xbutton.state &= ~(NumLockMask | ScrollLockMask | LockMask);
+    e->xmotion.state &= ~(NumLockMask | ScrollLockMask | LockMask);
 
     last_time = e->xmotion.time;
 
@@ -718,8 +722,6 @@ void Blackbox::process_event(XEvent *e) {
 
           if (win->isIconic())
             win->deiconify(False, True);
-          if (win->isShaded())
-            win->shade();
           if (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID())
             screen->changeWorkspaceID(win->getWorkspaceNumber());
           if (win->isVisible() && win->setInputFocus()) {
@@ -1264,15 +1266,15 @@ void Blackbox::load_rc(void) {
 #ifdef    XINERAMA
   if (! config.getValue("session.xineramaSupport.windowPlacement",
                         resource.xinerama_placement))
-    resource.xinerama_placement = true;
+    resource.xinerama_placement = false;
 
   if (! config.getValue("session.xineramaSupport.windowMaximizing",
                         resource.xinerama_maximize))
-    resource.xinerama_maximize = true;
+    resource.xinerama_maximize = false;
 
   if (! config.getValue("session.xineramaSupport.windowSnapping",
                         resource.xinerama_snap))
-    resource.xinerama_snap = true;
+    resource.xinerama_snap = false;
 #endif // XINERAMA
 }