X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=b64878eeed5eb525851ffc624040d2f7e56433c8;hb=056ff3b50cddd39b6f45969c17611dc3bf396ae9;hp=8f0dc4f1d77cfdf020107e2e58af737d0ec500d1;hpb=8c0fe026fe45d5cccfb0175f698d088d3eb9bc13;p=chaz%2Fopenbox diff --git a/src/client.hh b/src/client.hh index 8f0dc4f1..b64878ee 100644 --- a/src/client.hh +++ b/src/client.hh @@ -17,11 +17,12 @@ extern "C" { #include +#include "screen.hh" +#include "widget.hh" #include "otk/point.hh" #include "otk/strut.hh" #include "otk/rect.hh" #include "otk/eventhandler.hh" -#include "widget.hh" namespace ob { @@ -182,6 +183,13 @@ private: */ otk::Rect _area; + //! The window's strut + /*! + The strut defines areas of the screen that are marked off-bounds for window + placement. In theory, where this window exists. + */ + otk::Strut _strut; + //! The logical size of the window /*! The "logical" size of the window is refers to the user's perception of the @@ -251,10 +259,18 @@ private: bool _max_vert; //! The window is maximized to fill the screen horizontally bool _max_horz; + //! The window should not be displayed by pagers + bool _skip_pager; + //! The window should not be displayed by taskbars + bool _skip_taskbar; //! The window is a 'fullscreen' window, and should be on top of all others bool _fullscreen; //! The window should be on top of other windows of the same type - bool _floating; + bool _above; + //! The window should be underneath other windows of the same type + bool _below; + + OBScreen::StackLayer _layer; //! A bitmask of values in the OBClient::Decoration enum /*! @@ -293,6 +309,9 @@ private: //! Adjusts the window's net_state void setState(StateAction action, long data1, long data2); + //! Calculates the stacking layer for the client window + void calcLayer(); + //! Update the protocols that the window supports and adjusts things if they //! change void updateProtocols(); @@ -307,7 +326,12 @@ private: //! Updates the window's application name and class void updateClass(); // XXX: updateTransientFor(); + //! Updates the strut for the client + void updateStrut(); + //! Change the client's state hints to match the class' data + void changeState(); + public: #ifndef SWIG //! Constructs a new OBClient object around a specified window id @@ -328,6 +352,16 @@ public: //! Returns the type of the window, one of the OBClient::WindowType values inline WindowType type() const { return _type; } + //! Returns if the window should be treated as a normal window. + /*! + Some windows (desktops, docks, splash screens) have special rules applied + to them in a number of places regarding focus or user interaction. + */ + inline bool normal() const { + return ! (_type == Type_Desktop || _type == Type_Dock || + _type == Type_Splash); + } + //! Returns the desktop on which the window resides /*! This value is a 0-based index.
@@ -396,17 +430,8 @@ public: inline bool maxVert() const { return _max_vert; } //! Returns if the window is maximized horizontally inline bool maxHorz() const { return _max_horz; } - //! Returns if the window is fullscreen - /*! - When the window is fullscreen, it is kept above all others - */ - inline bool fullscreen() const { return _fullscreen; } - //! Returns if the window is floating - /*! - When the window is floating, it is kept above all others in the same - stacking layer as it - */ - inline bool floating() const { return _floating; } + //! Returns the window's stacking layer + inline OBScreen::StackLayer layer() const { return _layer; } //! Removes or reapplies the client's border to its window /*! @@ -419,35 +444,63 @@ public: //! Returns the position and size of the client relative to the root window inline const otk::Rect &area() const { return _area; } + //! Returns the client's strut definition + inline const otk::Strut &strut() const { return _strut; } + //! Move the client window void move(int x, int y); //! Resizes the client window, anchoring it in a given corner /*! This also maintains things like the client's minsize, and size increments. - @param anchor The corner to keep in the same position when resizing - @param x The X component of the new size for the client - @param y The Y component of the new size for the client + @param anchor The corner to keep in the same position when resizing. + @param w The width component of the new size for the client. + @param h The height component of the new size for the client. + @param x An optional X coordinate to which the window will be moved + after resizing. + @param y An optional Y coordinate to which the window will be moved + after resizing. + The x and y coordinates must both be sepcified together, or they will have + no effect. When they are specified, the anchor is ignored. */ - void resize(Corner anchor, int x, int y); + void resize(Corner anchor, int w, int h, int x = INT_MIN, int y = INT_MIN); //! Request the client to close its window. void close(); + //! Sets the window's stacking layer + /*! + @param l An integer specifying the layer.
+ '0' - the normal layer
+ '> 0' - the 'above' layer
+ '< 0' - the 'below' layer + */ + void setStackLayer(int l); + + //! Shades or unshades the client window + /*! + @param shade true if the window should be shaded; false if it should be + unshaded. + */ + void shade(bool shade); + //! Attempt to focus the client window bool focus(); //! Remove focus from the client window void unfocus(); - + virtual void focusHandler(const XFocusChangeEvent &e); virtual void unfocusHandler(const XFocusChangeEvent &e); virtual void propertyHandler(const XPropertyEvent &e); virtual void clientMessageHandler(const XClientMessageEvent &e); - virtual void shapeHandler(const XShapeEvent &e); virtual void configureRequestHandler(const XConfigureRequestEvent &e); virtual void unmapHandler(const XUnmapEvent &e); virtual void destroyHandler(const XDestroyWindowEvent &e); + virtual void reparentHandler(const XReparentEvent &e); +#if defined(SHAPE) + virtual void shapeHandler(const XShapeEvent &e); +#endif // SHAPE }; }