handle unmaps better. all thanks to acroread sending wacky unmap events

[chaz/openbox] / src / frame.hh

diff --git a/src/frame.hh b/src/frame.hh
index 5f70b643e372ca09f7967fde8d3f3d8c554d2038..b204567ed75fcadbccfc2090b9455f554ec4a926 100644 (file)
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -33,10 +33,8 @@ class OBFrame : public otk::OtkWidget, public OBWidget {
 public:
 
   //! The event mask to grab on frame windows
-  static const long event_mask = EnterWindowMask | LeaveWindowMask |
-                                 ButtonPressMask | ButtonReleaseMask |
-                                 ButtonMotionMask;
-
+  static const long event_mask = EnterWindowMask | LeaveWindowMask;
+   
 private:
   OBClient *_client;
   const otk::ScreenInfo *_screen;
@@ -72,13 +70,7 @@ private:
   //! Reparents the client window from the root window onto the frame
   void grabClient();
   //! Reparents the client window back to the root window
-  /*!
-    @param remap Re-map the client window when we're done reparenting?
-  */
-  void releaseClient(bool remap);
-
-  //! Shape the frame window to the client window
-  void adjustShape();
+  void releaseClient();
 
 public:
   //! Constructs an OBFrame object, and reparents the client to itself
@@ -93,8 +85,9 @@ public:
   //! Set the style to decorate the frame with
   virtual void setStyle(otk::Style *style);
 
-  //! Realign children
+  //! Empty overridden method to prevent automatic alignment of children
   virtual void adjust();
+  
   //! Displays focused decorations
   virtual void focus();
   //! Displays unfocused decorations
@@ -106,6 +99,8 @@ public:
   void adjustSize();
   //! Update the frame's position to match the client
   void adjustPosition();
+  //! Shape the frame window to the client window
+  void adjustShape();
 
   //! Applies gravity to the client's position to find where the frame should
   //! be positioned.