X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=450c86702638fa26ea94ed74a0f3d9984e525811;hb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;hp=5e7ba927c14daf4e448b775f28f387629ad6b350;hpb=6e2593cadc9a755d0e08facb7df0459a786e692b;p=chaz%2Fopenbox

diff --git a/src/frame.hh b/src/frame.hh
index 5e7ba927..450c8670 100644
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -9,59 +9,57 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include <string>
-
 #include "client.hh"
+#include "backgroundwidget.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>
 
 namespace ob {
 
 //! Holds and decorates a frame around an OBClient (client window)
 /*!
+  The frame is responsible for calling XSelectInput on the client window's new
+  parent with the SubstructureRedirectMask so that structure events for the
+  client are sent to the window manager.
 */
-class OBFrame {
+class OBFrame : public otk::OtkWidget {
+public:
+
+  //! The event mask to grab on frame windows
+  static const long event_mask = EnterWindowMask | LeaveWindowMask;
+
 private:
-  const OBClient *_client;
+  OBClient *_client;
   const otk::ScreenInfo *_screen;
 
   //! The style to use for size and display the decorations
-  const otk::Style *_style;
+  otk::Style *_style;
 
-  //! The window id of the base frame window
-  Window _window;
   //! The size of the frame on each side of the client window
   otk::Strut _size;
 
-  // decoration windows
-  Window _titlebar;
-  otk::Rect _titlebar_area;
-  
-  Window _button_close;
-  otk::Rect _button_close_area;
-  
-  Window _button_iconify;
-  otk::Rect _button_iconify_area;
-
-  Window _button_max;
-  otk::Rect _button_max_area;
-
-  Window _button_stick;
-  otk::Rect _button_stick_area;
-
-  Window _label;
-  otk::Rect _label_area;
-
-  Window _handle;
-  otk::Rect _handle_area;
-
-  Window _grip_left;
-  otk::Rect _grip_left_area;
+  //! The size of the frame on each side of the client window inside the border
+  otk::Strut _innersize;
 
-  Window _grip_right;
-  otk::Rect _grip_right_area;
+  // decoration windows
+  OBBackgroundWidget  _plate;   // sits entirely under the client window
+  OBBackgroundWidget  _titlebar;
+  otk::OtkButton      _button_close;
+  otk::OtkButton      _button_iconify;
+  otk::OtkButton      _button_max;
+  otk::OtkButton      _button_stick;
+  otk::OtkFocusLabel  _label;
+  OBBackgroundWidget  _handle;
+  otk::OtkButton      _grip_left;
+  otk::OtkButton      _grip_right;
 
   //! The decorations to display on the window.
   /*!
@@ -70,11 +68,6 @@ private:
   */
   OBClient::DecorationFlags _decorations;
 
-  //! Creates the base frame window
-  Window createFrame();
-  //! Creates a child frame decoration element window
-  Window createChild(Window parent, Cursor cursor);
-
   //! Reparents the client window from the root window onto the frame
   void grabClient();
   //! Reparents the client window back to the root window
@@ -83,37 +76,41 @@ private:
   */
   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
   /*!
     @param client The client window which will be decorated by the new OBFrame
     @param style The style to use to decorate the frame
   */
-  OBFrame(const OBClient *client, const otk::Style *style);
+  OBFrame(OBClient *client, otk::Style *style);
   //! Destroys the OBFrame object
   virtual ~OBFrame();
 
-  //! Load a style to decorate the frame with
-  void loadStyle(const otk::Style *style);
+  //! Set the style to decorate the frame with
+  virtual void setStyle(otk::Style *style);
+
+  //! Update the frame's size to match the client
+  void adjustSize();
+  //! Update the frame's position to match the client
+  void adjustPosition();
+
+  //! 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);
 
-  //! Update the frame to match the client
-  void update();
-  //! Shape the frame window to the client window
-  void updateShape(); 
-  
-  //! Returns the frame's most-parent window, which is a child of the root
-  //! window
-  inline Window window() const { return _window; }
-
-  inline Window titlebar() const { return _titlebar; }
-  inline Window label() const { return _label; }
-  inline Window buttonIconify() const { return _button_iconify; }
-  inline Window buttonMax() const { return _button_max; }
-  inline Window buttonStick() const { return _button_stick; }
-  inline Window buttonClose() const { return _button_close; }
-  inline Window handle() const { return _handle; }
-  inline Window gripLeft() const { return _grip_left; }
-  inline Window gripRight() const { return _grip_right; }
 };
 
 }