all repos — openbox @ 533992f5aae6804eb77b90f70bf032a09a373930

openbox fork - make it a bit more like ryudo 

handle the XGetGeomtry failing for button releases
Dana Jansens danakj@orodu.net
commit

533992f5aae6804eb77b90f70bf032a09a373930

parent

9e3d680cf74f575ebe50d25588154a4f2f9550e9

1 files changed, 25 insertions(+), 19 deletions(-)

jump to
M openbox/mouse.c → openbox/mouse.c 
@@ -1,5 +1,6 @@ 
 #include "openbox.h"
 #include "config.h"
+#include "xerror.h"
 #include "action.h"
 #include "event.h"
 #include "client.h"

@@ -228,27 +229,32 @@ /* clicks are only valid if its released over the window */
             int junk1, junk2;
             Window wjunk;
             guint ujunk, b, w, h;
-            XGetGeometry(ob_display, e->xbutton.window,
-                         &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
-            if (e->xbutton.x >= (signed)-b &&
-                e->xbutton.y >= (signed)-b &&
-                e->xbutton.x < (signed)(w+b) &&
-                e->xbutton.y < (signed)(h+b)) {
-                click = TRUE;
-                /* double clicks happen if there were 2 in a row! */
-                if (lbutton == button &&
-                    lwindow == e->xbutton.window &&
-                    e->xbutton.time - config_mouse_dclicktime <=
-                    ltime) {
-                    dclick = TRUE;
+            Status s;
+            xerror_set_ignore(TRUE);
+            s = XGetGeometry(ob_display, e->xbutton.window,
+                             &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
+            xerror_set_ignore(FALSE);
+            if (s == Success) {
+                if (e->xbutton.x >= (signed)-b &&
+                    e->xbutton.y >= (signed)-b &&
+                    e->xbutton.x < (signed)(w+b) &&
+                    e->xbutton.y < (signed)(h+b)) {
+                    click = TRUE;
+                    /* double clicks happen if there were 2 in a row! */
+                    if (lbutton == button &&
+                        lwindow == e->xbutton.window &&
+                        e->xbutton.time - config_mouse_dclicktime <=
+                        ltime) {
+                        dclick = TRUE;
+                        lbutton = 0;
+                    } else {
+                        lbutton = button;
+                        lwindow = e->xbutton.window;
+                    }
+                } else {
                     lbutton = 0;
-                } else {
-                    lbutton = button;
-                    lwindow = e->xbutton.window;
+                    lwindow = None;
                 }
-            } else {
-                lbutton = 0;
-                lwindow = None;
             }
 
             button = 0;