X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=b2cc2d16419c153da873adb7f678b2f7ca3c0240;hb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;hp=7248c71fdb268831c99da864f3f30cf569c2d014;hpb=52cb7bd11ed83a57c4c1affcdac8a1f7d68ae551;p=chaz%2Fopenbox diff --git a/src/frame.hh b/src/frame.hh index 7248c71f..b2cc2d16 100644 --- a/src/frame.hh +++ b/src/frame.hh @@ -10,38 +10,36 @@ 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/renderstyle.hh" #include "otk/widget.hh" -#include "otk/button.hh" -#include "otk/focuswidget.hh" -#include "otk/focuslabel.hh" +#include "otk/ustring.hh" #include namespace ob { -//! Holds and decorates a frame around an OBClient (client window) +//! Holds and decorates a frame around an Client (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 : public otk::OtkWidget { +class Frame : public otk::Widget, public WidgetBase { public: //! The event mask to grab on frame windows static const long event_mask = EnterWindowMask | LeaveWindowMask; - + private: - OBClient *_client; + Client *_client; const otk::ScreenInfo *_screen; - //! The style to use for size and display the decorations - otk::Style *_style; - //! The size of the frame on each side of the client window otk::Strut _size; @@ -49,52 +47,64 @@ 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; + BackgroundWidget _plate; // sits entirely under the client window + BackgroundWidget _titlebar; + ButtonWidget _button_close; + ButtonWidget _button_iconify; + ButtonWidget _button_max; + ButtonWidget _button_alldesk; + LabelWidget _label; + BackgroundWidget _handle; + ButtonWidget _grip_left; + ButtonWidget _grip_right; //! The decorations to display on the window. /*! - This is by default the same value as in the OBClient::decorations, but it + This is by default the same value as in the Client::decorations, but it is duplicated here so that it can be overridden per-window by the user. */ - 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(); + Client::DecorationFlags _decorations; public: - //! Constructs an OBFrame object, and reparents the client to itself + //! Constructs an Frame object, and reparents the client to itself /*! - @param client The client window which will be decorated by the new OBFrame + @param client The client window which will be decorated by the new Frame @param style The style to use to decorate the frame */ - OBFrame(OBClient *client, otk::Style *style); - //! Destroys the OBFrame object - virtual ~OBFrame(); + Frame(Client *client, otk::RenderStyle *style); + //! Destroys the Frame object + virtual ~Frame(); + //! Returns the size of the frame on each side of the client + const otk::Strut& size() const { return _size; } + //! Set the style to decorate the frame with - virtual void setStyle(otk::Style *style); + virtual void setStyle(otk::RenderStyle *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 otk::ustring &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(); + //! Update the frame to match the client's new state (for things like toggle + //! buttons) + void adjustState(); //! Applies gravity to the client's position to find where the frame should //! be positioned. @@ -110,6 +120,27 @@ public: */ 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 "all desktops button" subelement + inline Window button_alldesk() const { return _button_alldesk.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(); } + }; }