X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=7313c3a12dfe8013b03fcb8cf3005f12b5f1ade4;hb=9823b821f5623ef2ad182f914e07a97a93f3952e;hp=0c3a93f2a8d885dcc4d713857f6dfee23c3e7594;hpb=c4a1fac49da32250dc4567880b385feb7feaa908;p=chaz%2Fopenbox diff --git a/src/frame.hh b/src/frame.hh index 0c3a93f2..7313c3a1 100644 --- a/src/frame.hh +++ b/src/frame.hh @@ -10,10 +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 @@ -21,47 +25,42 @@ 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 OBWidget { +public: + + //! The event mask to grab on frame windows + static const long event_mask = EnterWindowMask | LeaveWindowMask | + ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask; + private: 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; + //! The size of the frame on each side of the client window inside the border + otk::Strut _innersize; - Window _handle; - otk::Rect _handle_area; - - Window _grip_left; - otk::Rect _grip_left_area; - - Window _grip_right; - otk::Rect _grip_right_area; + // decoration windows + 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. /*! @@ -70,11 +69,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 +77,75 @@ 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 /*! @param client The client window which will be decorated by the new OBFrame @param style The style to use to decorate the frame */ - OBFrame(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 to match the client - void update(); - //! Shape the frame window to the client window - void updateShape(); + //! Empty overridden method to prevent automatic alignment of children + virtual void adjust(); - //! 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; } + //! Displays focused decorations + virtual void focus(); + //! Displays unfocused decorations + virtual void unfocus(); + + void setTitle(const std::string &text); + + //! 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); + + //! 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(); } + }; }