add python.hh to the openbox.i deps

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 1726ce4415dec8de1103a465f46f8c41a0db01f4..83f5f1a025830fd333d4e0fc9e80e2bfbdc14780 100644 (file)
--- a/src/client.hh
+++ b/src/client.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,6 +326,13 @@ 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
@@ -389,7 +399,7 @@ public:
     This value is a 0-based index.<br>
     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 +442,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
@@ -522,7 +535,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