move the approproate code for map request handling to the client class. this will...

[chaz/openbox] / src / frame.hh

diff --git a/src/frame.hh b/src/frame.hh
index 7313c3a12dfe8013b03fcb8cf3005f12b5f1ade4..a36a6eec531cbe3ea46c318bb5ae67da81ff6590 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;
@@ -77,12 +75,6 @@ private:
   */
   void releaseClient(bool remap);
 
-  //! Shape the frame window to the client window
-  void adjustShape();
-
-  //! Grabs or ungrabs buttons on the frame
-  void grabButtons(bool grab);
-  
 public:
   //! Constructs an OBFrame object, and reparents the client to itself
   /*!
@@ -110,6 +102,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.