include the all otk stuff into the openbox python module. rename widget.hh to stop...

[chaz/openbox] / src / frame.hh

diff --git a/src/frame.hh b/src/frame.hh
index 1d7ebd6c29a116def3c71ae98a96f3c2a6d94b0f..01f706de8b5850255e33b3955e511e693a091069 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;
@@ -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
   /*!
@@ -93,10 +80,27 @@ public:
   //! Set the style to decorate the frame with
   virtual void setStyle(otk::Style *style);
 
+  //! Empty overridden method to prevent automatic alignment of children
+  virtual void adjust();
+  
+  //! Displays focused decorations
+  virtual void focus();
+  //! Displays unfocused decorations
+  virtual void unfocus();
+
+  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
+  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.
@@ -113,25 +117,25 @@ public:
   void frameGravity(int &x, int &y);
 
   //! Gets the window id of the frame's "plate" subelement
-  inline Window plate() const { return _plate.getWindow(); }
+  inline Window plate() const { return _plate.window(); }
   //! Gets the window id of the frame's "titlebar" subelement
-  inline Window titlebar() const { return _titlebar.getWindow(); }
+  inline Window titlebar() const { return _titlebar.window(); }
   //! Gets the window id of the frame's "label" subelement
-  inline Window label() const { return _label.getWindow(); }
+  inline Window label() const { return _label.window(); }
   //! Gets the window id of the frame's "close button" subelement
-  inline Window button_close() const { return _button_close.getWindow(); }
+  inline Window button_close() const { return _button_close.window(); }
   //! Gets the window id of the frame's "iconify button" subelement
-  inline Window button_iconify() const { return _button_iconify.getWindow(); }
+  inline Window button_iconify() const { return _button_iconify.window(); }
   //! Gets the window id of the frame's "maximize button" subelement
-  inline Window button_max() const { return _button_max.getWindow(); }
+  inline Window button_max() const { return _button_max.window(); }
   //! Gets the window id of the frame's "sticky button" subelement
-  inline Window button_stick() const { return _button_stick.getWindow(); }
+  inline Window button_stick() const { return _button_stick.window(); }
   //! Gets the window id of the frame's "handle" subelement
-  inline Window handle() const { return _handle.getWindow(); }
+  inline Window handle() const { return _handle.window(); }
   //! Gets the window id of the frame's "left grip" subelement
-  inline Window grip_left() const { return _grip_left.getWindow(); }
+  inline Window grip_left() const { return _grip_left.window(); }
   //! Gets the window id of the frame's "right grip" subelement
-  inline Window grip_right() const { return _grip_right.getWindow(); }
+  inline Window grip_right() const { return _grip_right.window(); }
 
 };