X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=458fe088d4006ee6f5bbf5b54f4059d187a1e478;hb=977ecf1f1e82f385a542648b545a0d0877febaf0;hp=1a6d3b1aa03e8229d8c50dee11fc53275b959ddf;hpb=f2ae1c3b176e02eeb109478d3cfbf89647d66100;p=chaz%2Fopenbox diff --git a/src/client.hh b/src/client.hh index 1a6d3b1a..458fe088 100644 --- a/src/client.hh +++ b/src/client.hh @@ -9,15 +9,24 @@ extern "C" { #include + +#ifdef SHAPE +#include +#endif // SHAPE } #include +#include "otk/point.hh" #include "otk/strut.hh" #include "otk/rect.hh" +#include "otk/eventhandler.hh" +#include "widget.hh" namespace ob { +class OBFrame; + //! Maintains the state of a client window. /*! OBClient maintains the state of a client window. The state consists of the @@ -30,8 +39,21 @@ namespace ob { 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 { +class OBClient : public otk::OtkEventHandler, public OBWidget { public: + + //! The frame window which decorates around the client window + /*! + NOTE: This should NEVER be used inside the client class's constructor! + */ + OBFrame *frame; + + //! Corners of the client window, used for anchor positions + enum Corner { TopLeft, + TopRight, + BottomLeft, + BottomRight }; + //! Possible window types enum WindowType { Type_Desktop, //!< A desktop (bottom-most window) Type_Dock, //!< A dock bar/panel window @@ -83,7 +105,8 @@ public: Decor_Border = 1 << 2, //!< Display a border Decor_Iconify = 1 << 3, //!< Display an iconify button Decor_Maximize = 1 << 4, //!< Display a maximize button - Decor_Close = 1 << 5 //!< Display a close button + Decor_Sticky = 1 << 5, //!< Display a sticky button + Decor_Close = 1 << 6 //!< Display a close button }; //! Holds a bitmask of OBClient::Decoration values typedef unsigned char DecorationFlags; @@ -107,7 +130,25 @@ public: State_Toggle //!< _NET_WM_STATE_TOGGLE }; + //! The event mask to grab on client windows + 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; + private: + //! The screen number on which the client resides + int _screen; + //! The actual window that this class is wrapping up Window _window; @@ -132,9 +173,23 @@ private: //! The type of window (what its function is) WindowType _type; - //! Position and size of the window (relative to the root window) + //! Position and size of the window + /*! + This will not always be the actual position of the window on screen, it is + rather, the position requested by the client, to which the window's gravity + is applied. + */ otk::Rect _area; + //! The logical size of the window + /*! + The "logical" size of the window is refers to the user's perception of the + size of the window, and is the value that should be displayed to the user. + For example, with xterms, this value it the number of characters being + displayed in the terminal, instead of the number of pixels. + */ + otk::Point _logical_size; + //! Width of the border on the window. /*! The window manager will set this to 0 while the window is being managed, @@ -142,42 +197,24 @@ private: */ int _border_width; - //! The minimum width of the client window - /*! - If the min is > the max, then the window is not resizable - */ - int _min_x; - //! The minimum height of the client window - /*! - If the min is > the max, then the window is not resizable - */ - int _min_y; - //! The maximum width of the client window + //! The minimum size of the client window /*! If the min is > the max, then the window is not resizable */ - int _max_x; - //! The maximum height of the client window + otk::Point _min_size; + //! The maximum size of the client window /*! If the min is > the max, then the window is not resizable */ - int _max_y; - //! The size of increments to resize the client window by (for the width) - int _inc_x; - //! The size of increments to resize the client window by (for the height) - int _inc_y; - //! The base width of the client window - /*! - This value should be subtracted from the window's actual width when - displaying its size to the user, or working with its min/max width - */ - int _base_x; - //! The base height of the client window + otk::Point _max_size; + //! The size of increments to resize the client window by + otk::Point _size_inc; + //! The base size of the client window /*! - This value should be subtracted from the window's actual height when - displaying its size to the user, or working with its min/max height + This value should be subtracted from the window's actual size when + displaying its size to the user, or working with its min/max size */ - int _base_y; + otk::Point _base_size; //! Where to place the decorated window in relation to the undecorated window int _gravity; @@ -272,11 +309,15 @@ public: //! Constructs a new OBClient object around a specified window id /*! @param window The window id that the OBClient class should handle + @param screen The screen on which the window resides */ - OBClient(Window window); + OBClient(int screen, Window window); //! Destroys the OBClient object virtual ~OBClient(); + //! Returns the screen on which the clien resides + inline int screen() const { return _screen; } + //! Returns the window id that the OBClient object is handling inline Window window() const { return _window; } @@ -362,65 +403,35 @@ public: */ inline bool floating() const { return _floating; } - //! Returns the window's border width - /*! - The border width is set to 0 when the client becomes managed, but the - border width is stored here so that it can be restored to the client window - when it is unmanaged later. - */ - inline int borderWidth() const { return _border_width; } - //! Returns the minimum width of the client window + //! Removes or reapplies the client's border to its window /*! - If the min is > the max, then the window is not resizable - */ - inline int minX() const { return _min_x; } - //! Returns the minimum height of the client window - /*! - If the min is > the max, then the window is not resizable + Used when managing and unmanaging a window. + @param addborder true if adding the border to the client; false if removing + from the client */ - inline int minY() const { return _min_y; } - //! Returns the maximum width of the client window - /*! - If the min is > the max, then the window is not resizable - */ - inline int maxX() const { return _max_x; } - //! Returns the maximum height of the client window - /*! - If the min is > the max, then the window is not resizable - */ - inline int maxY() const { return _max_y; } - //! Returns the increment size for resizing the window (for the width) - inline int incrementX() const { return _inc_x; } - //! Returns the increment size for resizing the window (for the height) - inline int incrementY() const { return _inc_y; } - //! Returns the base width of the window - /*! - This value should be subtracted from the window's actual width when - displaying its size to the user, or working with its min/max width - */ - inline int baseX() const { return _base_x; } - //! Returns the base height of the window - /*! - This value should be subtracted from the window's actual height when - displaying its size to the user, or working with its min/max height - */ - inline int baseY() const { return _base_y; } + 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; } - //! Updates the OBClient class from a property change XEvent - void update(const XPropertyEvent &e); - //! Processes a client message XEvent for the window and causes an action - //! or whatever was specified to occur - void update(const XClientMessageEvent &e); - - //! Changes the stored positions and size of the OBClient window + //! Move the client window + void move(int x, int y); + + //! Resizes the client window, anchoring it in a given corner /*! - This does not actually change the physical geometry, that needs to be done - before/after setting this value to keep it in sync + 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 */ - void setArea(const otk::Rect &area); + void resize(Corner anchor, int x, int y); + + 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); }; }