make use of the --enable-clobber option

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 6726cbace53068a4af16709b14b4b67127364771..0fde13d721caad7ee28f6d3322746c1e1c5b2fc0 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -239,6 +239,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 +277,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;
 }
@@ -366,11 +371,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 +389,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
 }
 
 

diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 7a6251dab90879eb4cabc5bee5521d5ec01ba518..921f6ecd1a76733d0a88f3059b1995367ec8a279 100644 (file)
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -77,8 +77,10 @@ private:
   };
   BShape shape;
 
+#ifndef   NOCLOBBER
   unsigned int MaskList[8];
   size_t MaskListLength;
+#endif // NOCLOBBER
 
   enum RunState { STARTUP, RUNNING, SHUTDOWN };
   RunState run_state;