X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=dd4bfe9faddc3073553158dc61602751a4f87260;hb=40449e199dfeab57e8d147e07989aef339a7da59;hp=724cf5189ae23919436a42d43923834d4f4cc5b2;hpb=d13f021b8bb2a6b8e49f69a370409e79a7f02213;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 724cf518..dd4bfe9f 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -7,6 +7,12 @@
   property changes on the window and some client messages
 */
 
+#include "widget.hh"
+#include "otk/point.hh"
+#include "otk/strut.hh"
+#include "otk/rect.hh"
+#include "otk/eventhandler.hh"
+
 extern "C" {
 #include <X11/Xlib.h>
 
@@ -16,13 +22,7 @@ extern "C" {
 }
 
 #include <string>
-
-#include "screen.hh"
-#include "widget.hh"
-#include "otk/point.hh"
-#include "otk/strut.hh"
-#include "otk/rect.hh"
-#include "otk/eventhandler.hh"
+#include <list>
 
 namespace ob {
 
@@ -34,14 +34,13 @@ 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.
 /*!
   OBClient maintains the state of a client window. The state consists of the
@@ -63,6 +62,22 @@ public:
   */
   OBFrame *frame;
 
+  //! Holds a list of OBClients
+  typedef std::list<OBClient*> List;
+
+  //! The possible stacking layers a client window can be a part of
+  enum StackLayer {
+    Layer_Icon,       //!< 0 - iconified windows, in any order at all
+    Layer_Desktop,    //!< 1 - desktop windows
+    Layer_Below,      //!< 2 - normal windows w/ below
+    Layer_Normal,     //!< 3 - normal windows
+    Layer_Above,      //!< 4 - normal windows w/ above
+    Layer_Top,        //!< 5 - always-on-top-windows (docks?)
+    Layer_Fullscreen, //!< 6 - fullscreeen windows
+    Layer_Internal,   //!< 7 - openbox windows/menus
+    NUM_LAYERS
+  };
+
   //! Corners of the client window, used for anchor positions
   enum Corner { TopLeft,
                 TopRight,
@@ -157,7 +172,11 @@ private:
   //! The id of the group the window belongs to
   Window   _group;
 
-  // XXX: transient_for, transients
+  //! The client which this client is a transient (child) for
+  OBClient *_transient_for;
+
+  //! The clients which are transients (children) of this client
+  OBClient::List _transients;
 
   //! The desktop on which the window resides (0xffffffff for all desktops)
   unsigned long _desktop;
@@ -227,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;
 
@@ -272,7 +294,7 @@ private:
   //! The window should be underneath other windows of the same type
   bool _below;
 
-  OBScreen::StackLayer _layer;
+  StackLayer _layer;
 
   //! A bitmask of values in the OBClient::Decoration enum
   /*!
@@ -304,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
@@ -327,9 +356,10 @@ private:
   void updateIconTitle();
   //! Updates the window's application name and class
   void updateClass();
-  // XXX: updateTransientFor();
   //! Updates the strut for the client
   void updateStrut();
+  //! Updates the window's transient status, and any parents of it
+  void updateTransientFor();
 
   //! Change the client's state hints to match the class' data
   void changeState();
@@ -412,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
@@ -435,7 +468,7 @@ public:
   //! Returns if the window is maximized horizontally
   inline bool maxHorz() const { return _max_horz; }
   //! Returns the window's stacking layer
-  inline OBScreen::StackLayer layer() const { return _layer; }
+  inline StackLayer layer() const { return _layer; }
 
   //! Removes or reapplies the client's border to its window
   /*!
@@ -502,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