X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=fd6e8f822e12b587096e0881c8f1aeb3db13b6e7;hb=889df8a74da733c849cb52c3a76ae59956755882;hp=067ccccc3f0be9b9702dbdf2ec4ea0a51e3ed18d;hpb=34cd50ec5173e350b1d8b350fade2948c50113ee;p=chaz%2Fopenbox
diff --git a/src/client.hh b/src/client.hh
index 067ccccc..fd6e8f82 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -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
@@ -335,11 +335,12 @@ private:
//! 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();
@@ -368,7 +369,7 @@ 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);
@@ -399,7 +400,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
@@ -453,8 +454,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
@@ -505,15 +505,6 @@ public:
//! 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
@@ -522,10 +513,10 @@ public:
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);
@@ -535,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