X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=e6236830e62056e494a40822bdc60001458a6543;hb=f11bd1b0cc5973590d1ee547736ac00f50447efa;hp=1816ad011ef17f39b30ebe6fc66100dd2977c073;hpb=73f7a0bd69607663050f02acf121f40a739d9619;p=chaz%2Fopenbox

diff --git a/src/frame.hh b/src/frame.hh
index 1816ad01..e6236830 100644
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -10,14 +10,14 @@ extern "C" {
 }
 
 #include "client.hh"
+#include "backgroundwidget.hh"
+#include "labelwidget.hh"
+#include "buttonwidget.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
 #include "otk/style.hh"
 #include "otk/widget.hh"
-#include "otk/button.hh"
-#include "otk/focuswidget.hh"
-#include "otk/focuslabel.hh"
 
 #include <string>
 
@@ -29,12 +29,12 @@ namespace ob {
   parent with the SubstructureRedirectMask so that structure events for the
   client are sent to the window manager.
 */
-class OBFrame : public otk::OtkWidget {
+class OBFrame : public otk::OtkWidget, public OBWidget {
 public:
 
   //! The event mask to grab on frame windows
   static const long event_mask = EnterWindowMask | LeaveWindowMask;
-
+   
 private:
   OBClient *_client;
   const otk::ScreenInfo *_screen;
@@ -49,16 +49,16 @@ private:
   otk::Strut _innersize;
 
   // decoration windows
-  otk::OtkFocusWidget _plate;   // sits entirely under the client window
-  otk::OtkFocusWidget _titlebar;
-  otk::OtkButton      _button_close;
-  otk::OtkButton      _button_iconify;
-  otk::OtkButton      _button_max;
-  otk::OtkButton      _button_stick;
-  otk::OtkFocusLabel  _label;
-  otk::OtkFocusWidget _handle;
-  otk::OtkButton      _grip_left;
-  otk::OtkButton      _grip_right;
+  OBBackgroundWidget  _plate;   // sits entirely under the client window
+  OBBackgroundWidget  _titlebar;
+  OBButtonWidget      _button_close;
+  OBButtonWidget      _button_iconify;
+  OBButtonWidget      _button_max;
+  OBButtonWidget      _button_stick;
+  OBLabelWidget       _label;
+  OBBackgroundWidget  _handle;
+  OBButtonWidget      _grip_left;
+  OBButtonWidget      _grip_right;
 
   //! The decorations to display on the window.
   /*!
@@ -67,14 +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);
-
 public:
   //! Constructs an OBFrame object, and reparents the client to itself
   /*!
@@ -88,18 +80,66 @@ public:
   //! Set the style to decorate the frame with
   virtual void setStyle(otk::Style *style);
 
-  //! Update the frame to match the client
-  void adjust();
+  //! 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
+  /*!
+    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 for the client's gravity, moving the frame to the
-  //! appropriate place
-  void applyGravity();
+  //! Applies gravity to the client's position to find where the frame should
+  //! be positioned.
+  /*!
+    @return The proper coordinates for the frame, based on the client.
+  */
+  void clientGravity(int &x, int &y);
+
+  //! Reversly applies gravity to the frame's position to find where the client
+  //! should be positioned.
+  /*!
+    @return The proper coordinates for the client, based on the frame.
+  */
+  void frameGravity(int &x, int &y);
+
+  //! Gets the window id of the frame's "plate" subelement
+  inline Window plate() const { return _plate.window(); }
+  //! Gets the window id of the frame's "titlebar" subelement
+  inline Window titlebar() const { return _titlebar.window(); }
+  //! Gets the window id of the frame's "label" subelement
+  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.window(); }
+  //! Gets the window id of the frame's "iconify button" subelement
+  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.window(); }
+  //! Gets the window id of the frame's "sticky button" subelement
+  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.window(); }
+  //! Gets the window id of the frame's "left grip" subelement
+  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.window(); }
 
-  //! Reversely applies gravity for the client's gravity, moving the frame so
-  //! that the client is in its pre-gravity position
-  void reverseGravity();
 };
 
 }