make all parents/transients that are related have the same sticky state.

[chaz/openbox] / src / BaseDisplay.cc

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 6726cbace53068a4af16709b14b4b67127364771..5c34a727133aa07733a26530ebabc8e770b2dcd7 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -91,12 +91,11 @@ using std::string;
 // X error handler to handle any and all X errors while the application is
 // running
 static bool internal_error = False;
-static Window last_bad_window = None;
 
 BaseDisplay *base_display;
 
-#ifdef    DEBUG
 static int handleXErrors(Display *d, XErrorEvent *e) {
+#ifdef    DEBUG
   char errtxt[128];
 
   XGetErrorText(d, e->error_code, errtxt, 128);
@@ -106,10 +105,11 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
           base_display->getApplicationName(), errtxt, e->error_code,
           e->request_code, e->minor_code, e->resourceid);
 #else
-static int handleXErrors(Display *, XErrorEvent *e) {
+  // shutup gcc
+  (void) d;
+  (void) e;
 #endif // DEBUG
 
-  if (e->error_code == BadWindow) last_bad_window = e->resourceid;
   if (internal_error) abort();
 
   return(False);
@@ -179,7 +179,6 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   application_name = app_name;
 
   run_state = STARTUP;
-  last_bad_window = None;
 
   ::base_display = this;
 
@@ -239,6 +238,7 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   for (int i = 0; i < ScreenCount(display); ++i)
     screenInfoList.push_back(ScreenInfo(this, i));
 
+#ifndef   NOCLOBBER
   NumLockMask = ScrollLockMask = 0;
 
   const XModifierKeymap* const modmap = XGetModifierMapping(display);
@@ -276,6 +276,10 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
 
   if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
+#else  // NOCLOBBER
+  NumLockMask = 0;
+  ScrollLockMask = 0;
+#endif // NOCLOBBER
 
   gccache = 0;
 }
@@ -297,11 +301,6 @@ void BaseDisplay::eventLoop(void) {
     if (XPending(display)) {
       XEvent e;
       XNextEvent(display, &e);
-
-      if (last_bad_window != None && e.xany.window == last_bad_window)
-        continue;
-
-      last_bad_window = None;
       process_event(&e);
     } else {
       fd_set rfds;
@@ -366,11 +365,16 @@ void BaseDisplay::grabButton(unsigned int button, unsigned int modifiers,
                              unsigned int event_mask, int pointer_mode,
                              int keyboard_mode, Window confine_to,
                              Cursor cursor) const {
-  for (size_t cnt = 0; cnt < MaskListLength; ++cnt) {
+#ifndef   NOCLOBBER
+  for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
     XGrabButton(display, button, modifiers | MaskList[cnt], grab_window,
                 owner_events, event_mask, pointer_mode, keyboard_mode,
                 confine_to, cursor);
-  }
+#else  // NOCLOBBER
+  XGrabButton(display, button, modifiers, grab_window,
+              owner_events, event_mask, pointer_mode, keyboard_mode,
+              confine_to, cursor);
+#endif // NOCLOBBER
 }
 
 /*
@@ -379,9 +383,12 @@ void BaseDisplay::grabButton(unsigned int button, unsigned int modifiers,
  */
 void BaseDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
                                Window grab_window) const {
-  for (size_t cnt = 0; cnt < MaskListLength; ++cnt) {
+#ifndef   NOCLOBBER
+  for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
     XUngrabButton(display, button, modifiers | MaskList[cnt], grab_window);
-  }
+#else  // NOCLOBBER
+  XUngrabButton(display, button, modifiers, grab_window);
+#endif // NOCLOBBER
 }