X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=e6236830e62056e494a40822bdc60001458a6543;hb=6bad7e676ad841ffce8e2a05f0d8538f149454ea;hp=ab1e1b0347eb5c82e4a90fa42cfbc5bc453e76fb;hpb=7db3ffecc980821ada3e805e2471716896e2410a;p=chaz%2Fopenbox

diff --git a/src/frame.hh b/src/frame.hh
index ab1e1b03..e6236830 100644
--- 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;
@@ -69,17 +67,6 @@ private:
   */
   OBClient::DecorationFlags _decorations;
 
-  //! 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();
-
 public:
   //! Constructs an OBFrame object, and reparents the client to itself
   /*!
@@ -103,10 +90,20 @@ public:
 
   void setTitle(const std::string &text);
  
+  //! Reparents the client window from the root window onto the frame
+  void grabClient();
+  //! Reparents the client window back to the root window
+  /*!
+    This is not to be called if the client has already reparented itself.
+  */
+  void releaseClient();
+
   //! Update the frame's size to match the client
   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.