X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient.hh;h=6cafb94326ca05b30bc8906eb8fee67eff8fbdc5;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=1726ce4415dec8de1103a465f46f8c41a0db01f4;hpb=c7b22b4f9cee63d860ad4f6617cd5210299b9d8b;p=chaz%2Fopenbox
diff --git a/src/client.hh b/src/client.hh
index 1726ce44..6cafb943 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -7,7 +7,7 @@
property changes on the window and some client messages
*/
-#include "widget.hh"
+#include "widgetbase.hh"
#include "otk/point.hh"
#include "otk/strut.hh"
#include "otk/rect.hh"
@@ -34,11 +34,11 @@ class OBFrame;
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
+ //! The number of elements in the OBClient::MwmHints struct
+ static const unsigned int elements = 3;
};
//! Maintains the state of a client window.
@@ -179,7 +179,7 @@ private:
OBClient::List _transients;
//! The desktop on which the window resides (0xffffffff for all desktops)
- unsigned long _desktop;
+ long _desktop;
//! Normal window title
std::string _title; // XXX: Have to keep track if this string is Utf8 or not
@@ -246,6 +246,9 @@ private:
*/
otk::Point _base_size;
+ //! Window decoration and functionality hints
+ MwmHints _mwmhints;
+
//! Where to place the decorated window in relation to the undecorated window
int _gravity;
@@ -323,13 +326,21 @@ private:
//! OBClient::_shaped
void getShaped();
+ //! Set up what decor should be shown on the window and what functions should
+ //! be allowed (OBClient::_decorations and OBClient::_functions).
+ /*!
+ This also updates the NET_WM_ALLOWED_ACTIONS hint.
+ */
+ void setupDecorAndFunctions();
+
//! Sets the wm_state to the specified value
void setWMState(long state);
- //! Sends the window to the specified desktop
- void setDesktop(long desktop);
//! Adjusts the window's net_state
void setState(StateAction action, long data1, long data2);
+ //! Sends the window to the specified desktop
+ void setDesktop(long desktop);
+
//! Calculates the stacking layer for the client window
void calcLayer();
@@ -353,12 +364,22 @@ private:
//! Change the client's state hints to match the class' data
void changeState();
+
+ //! Request the client to close its window.
+ void close();
+
+ //! 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);
public:
#ifndef SWIG
//! Constructs a new OBClient object around a specified window id
/*!
- @param window The window id that the OBClient class should handle
+BB @param window The window id that the OBClient class should handle
@param screen The screen on which the window resides
*/
OBClient(int screen, Window window);
@@ -389,7 +410,7 @@ public:
This value is a 0-based index.
A value of 0xffffffff indicates that the window exists on all desktops.
*/
- inline unsigned long desktop() const { return _desktop; }
+ inline long desktop() const { return _desktop; }
//! Returns the window's title
inline const std::string &title() const { return _title; }
//! Returns the window's title when it is iconified
@@ -432,6 +453,9 @@ public:
//! Returns the functions that the user can perform on the window
inline FunctionFlags funtions() const { return _functions; }
+ //! Return the client this window is transient for
+ inline OBClient *transientFor() const { return _transient_for; }
+
//! Returns if the window is modal
/*!
If the window is modal, then no other windows that it is related to can get
@@ -440,8 +464,7 @@ public:
inline bool modal() const { return _modal; }
//! Returns if the window is shaded
/*!
- When the window is shaded, only its titlebar is visible, the client itself
- is not mapped
+ When the window is shaded, only its titlebar is visible.
*/
inline bool shaded() const { return _shaded; }
//! Returns if the window is iconified
@@ -489,30 +512,11 @@ public:
*/
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();
+ bool focus() const;
//! Remove focus from the client window
- void unfocus();
+ void unfocus() const;
virtual void focusHandler(const XFocusChangeEvent &e);
virtual void unfocusHandler(const XFocusChangeEvent &e);
@@ -522,7 +526,6 @@ public:
virtual void unmapHandler(const XUnmapEvent &e);
virtual void destroyHandler(const XDestroyWindowEvent &e);
virtual void reparentHandler(const XReparentEvent &e);
- virtual void mapRequestHandler(const XMapRequestEvent &e);
#if defined(SHAPE)
virtual void shapeHandler(const XShapeEvent &e);
#endif // SHAPE