X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=dd4bfe9faddc3073553158dc61602751a4f87260;hb=cc39863363f6c424a1d5f3790ef182b52b69a53e;hp=1726ce4415dec8de1103a465f46f8c41a0db01f4;hpb=c7b22b4f9cee63d860ad4f6617cd5210299b9d8b;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 1726ce44..dd4bfe9f 100644
--- 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.
@@ -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
@@ -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