Safari_Al's patch which fixes inconsistent capitalization in some actions.

[chaz/openbox] / src / Window.cc

diff --git a/src/Window.cc b/src/Window.cc
index b129121c50b59e03f75bd7343222c64bf41007dd..ea6b68cb0487f8fa76f9bef4634f3dc09992753f 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -590,8 +590,8 @@ void BlackboxWindow::decorate(void) {
   }
 
   if (decorations & Decor_Border) {
-    frame.fborder_pixel = screen->getWindowStyle()->f_focus.pixel();
-    frame.uborder_pixel = screen->getWindowStyle()->f_unfocus.pixel();
+    frame.fborder_pixel = screen->getWindowStyle()->f_focus.color().pixel();
+    frame.uborder_pixel = screen->getWindowStyle()->f_unfocus.color().pixel();
   }
 
   if (decorations & Decor_Handle) {
@@ -2710,7 +2710,7 @@ void BlackboxWindow::reparentNotifyEvent(const XReparentEvent *re) {
 
 
 void BlackboxWindow::propertyNotifyEvent(const XPropertyEvent *pe) {
-  if (pe->state == PropertyDelete)
+  if (pe->state == PropertyDelete || ! validateClient())
     return;
 
 #if 0
@@ -3135,6 +3135,9 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, int &dx) {
     screen->reassociateWindow(this, dest, False);
   screen->changeWorkspaceID(dest);
 
+  if (screen->doOpaqueMove())
+    XGrabServer(blackbox->getXDisplay());
+
   XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
   XWarpPointer(blackbox->getXDisplay(), None, 
                screen->getRootWindow(), 0, 0, 0, 0,
@@ -3144,6 +3147,9 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, int &dx) {
                GrabModeAsync, GrabModeAsync,
                None, blackbox->getMoveCursor(), CurrentTime);
 
+  if (screen->doOpaqueMove())
+    XUngrabServer(blackbox->getXDisplay());
+
   if (focus)
     setInputFocus();
 
@@ -3682,14 +3688,16 @@ void BlackboxWindow::enterNotifyEvent(const XCrossingEvent* ce) {
     }
   }
 
-  if ((! leave || inferior) && ! isFocused()) {
-    bool success = setInputFocus();
-    if (success)    // if focus succeeded install the colormap
-      installColormap(True); // XXX: shouldnt we honour no install?
-  }
+  if (! leave || inferior) {
+    if (! isFocused()) {
+      bool success = setInputFocus();
+      if (success)    // if focus succeeded install the colormap
+        installColormap(True); // XXX: shouldnt we honour no install?
+    }
 
-  if (screen->doAutoRaise())
-    timer->start();
+    if (screen->doAutoRaise())
+      timer->start();
+  }
 }