M src/client.hh → src/client.hh

@@ -134,6 +134,14 @@ //! The event mask to grab on client windows
   static const long event_mask = PropertyChangeMask | FocusChangeMask |
                                  StructureNotifyMask;
 
+  //! The mask of events to not let propogate past the client
+  /*!
+    This makes things like xprop work on the client window, but means we have
+    to explicitly grab clicks that we want.
+  */
+  static const long no_propagate_mask = ButtonPressMask | ButtonReleaseMask |
+                                        ButtonMotionMask;
+
   //! The number of unmap events to ignore on the window
   int ignore_unmaps;
   

M src/screen.cc → src/screen.cc

@@ -343,8 +343,7 @@ otk::OBDisplay::grab();
 
   // choose the events we want to receive on the CLIENT window
   attrib_set.event_mask = OBClient::event_mask;
-  attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
-                                     ButtonMotionMask;
+  attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask;
   XChangeWindowAttributes(otk::OBDisplay::display, window,
                           CWEventMask|CWDontPropagate, &attrib_set);