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, public OBWidget {
+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::Strut _innersize;
// 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;
+ BackgroundWidget _plate; // sits entirely under the client window
+ BackgroundWidget _titlebar;
+ ButtonWidget _button_close;
+ ButtonWidget _button_iconify;
+ ButtonWidget _button_max;
+ ButtonWidget _button_stick;
+ 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;
+ 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::Style *style);
+ //! Destroys the Frame object
+ virtual ~Frame();
//! Set the style to decorate the frame with
virtual void setStyle(otk::Style *style);
//! 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