X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=80c6e4ee159530a5bbd7ade87663491f16ad6156;hb=a6f5b33ad90637705af9717c978bf895455c71ba;hp=9c0bd7d4402272bdb2b0523d18cbd11f9c033285;hpb=1fa445c88033e564a25d907a7f478e76bff9e89e;p=chaz%2Fopenbox diff --git a/src/client.hh b/src/client.hh index 9c0bd7d4..80c6e4ee 100644 --- a/src/client.hh +++ b/src/client.hh @@ -17,6 +17,8 @@ extern "C" { #include +#include "screen.hh" +#include "widget.hh" #include "otk/point.hh" #include "otk/strut.hh" #include "otk/rect.hh" @@ -26,6 +28,20 @@ namespace ob { class OBFrame; +//! The MWM Hints as retrieved from the window property +/*! + This structure only contains 3 elements, even though the Motif 2.0 + structure contains 5. We only use the first 3, so that is all gets defined. +*/ +struct MwmHints { + //! The number of elements in the OBClient::MwmHints struct + static const unsigned int elements = 3; + unsigned long flags; //!< A bitmask of OBClient::MwmFlags values + unsigned long functions; //!< A bitmask of OBClient::MwmFunctions values + unsigned long decorations;//!< A bitmask of OBClient::MwmDecorations values +}; + + //! Maintains the state of a client window. /*! OBClient maintains the state of a client window. The state consists of the @@ -38,7 +54,7 @@ class OBFrame; class' member variables and call whatever is nessary to complete the change (such as causing a redraw of the titlebar after the title is changed). */ -class OBClient : public otk::OtkEventHandler { +class OBClient : public otk::OtkEventHandler, public OBWidget { public: //! The frame window which decorates around the client window @@ -110,19 +126,6 @@ public: //! Holds a bitmask of OBClient::Decoration values typedef unsigned char DecorationFlags; - //! The MWM Hints as retrieved from the window property - /*! - This structure only contains 3 elements, even though the Motif 2.0 - structure contains 5. We only use the first 3, so that is all gets defined. - */ - typedef struct MwmHints { - //! The number of elements in the OBClient::MwmHints struct - static const unsigned int elements = 3; - unsigned long flags; //!< A bitmask of OBClient::MwmFlags values - unsigned long functions; //!< A bitmask of OBClient::MwmFunctions values - unsigned long decorations;//!< A bitmask of OBClient::MwmDecorations values - }; - //! Possible actions that can be made with the _NET_WM_STATE client message enum StateAction { State_Remove = 0, //!< _NET_WM_STATE_REMOVE State_Add, //!< _NET_WM_STATE_ADD @@ -130,7 +133,16 @@ public: }; //! The event mask to grab on client windows - static const long event_mask = PropertyChangeMask | FocusChangeMask; + static const long event_mask = PropertyChangeMask | FocusChangeMask | + StructureNotifyMask; + + //! The mask of events to not let propogate past the client + /*! + This makes things like xprop work on the client window, but means we have + to explicitly grab clicks that we want. + */ + static const long no_propagate_mask = ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask; //! The number of unmap events to ignore on the window int ignore_unmaps; @@ -223,6 +235,8 @@ private: bool _urgent; //! Notify the window when it receives focus? bool _focus_notify; + //! Does the client window have the input focus? + bool _focused; //! The window uses shape extension to be non-rectangular? bool _shaped; @@ -238,10 +252,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 /*! @@ -280,6 +302,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(); @@ -295,22 +320,11 @@ private: void updateClass(); // XXX: updateTransientFor(); - //! Move the client window - /*! - This shouldnt be used to move the window internally! It will apply - window gravity after moving the 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 size The new size for the client - */ - void resize(Corner anchor, int x, int y); + //! 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 /*! @param window The window id that the OBClient class should handle @@ -319,6 +333,7 @@ public: OBClient(int screen, Window window); //! Destroys the OBClient object virtual ~OBClient(); +#endif //! Returns the screen on which the clien resides inline int screen() const { return _screen; } @@ -396,31 +411,65 @@ 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 + //! Returns the window's stacking layer + inline OBScreen::StackLayer layer() const { return _layer; } + + //! Removes or reapplies the client's border to its window /*! - When the window is floating, it is kept above all others in the same - stacking layer as it + Used when managing and unmanaging a window. + @param addborder true if adding the border to the client; false if removing + from the client */ - inline bool floating() const { return _floating; } - - //! Returns the client's requested border width (not used by the wm) - inline int borderWidth() const { return _border_width; } + void toggleClientBorder(bool addborder); //! Returns the position and size of the client relative to the root window inline const otk::Rect &area() const { return _area; } - virtual void propertyHandler(const XPropertyEvent &e); + //! 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 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 w, int h, int x = INT_MIN, int y = INT_MIN); - virtual void clientMessageHandler(const XClientMessageEvent &e); + //! Request the client to close its window. + void close(); - virtual void shapeHandler(const XShapeEvent &e); + //! 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 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 }; }