X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient.hh;h=724cf5189ae23919436a42d43923834d4f4cc5b2;hb=a5df374fbd412bb8540448bc4a437492b505d39a;hp=927fc2f1878141ad4fdc12157fa8a67229101c7b;hpb=8735c12d9633738a5150c451457471d797fa9bf1;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 927fc2f1..724cf518 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -171,6 +171,8 @@ private:
   std::string  _app_name;
   //! The class of the window, can used for grouping
   std::string  _app_class;
+  //! The specified role of the window, used for identification
+  std::string  _role;
 
   //! The type of window (what its function is)
   WindowType   _type;
@@ -183,6 +185,13 @@ private:
   */
   otk::Rect    _area;
 
+  //! The window's strut
+  /*!
+    The strut defines areas of the screen that are marked off-bounds for window
+    placement. In theory, where this window exists.
+  */
+  otk::Strut   _strut;
+
   //! The logical size of the window
   /*!
     The "logical" size of the window is refers to the user's perception of the
@@ -319,6 +328,8 @@ private:
   //! Updates the window's application name and class
   void updateClass();
   // XXX: updateTransientFor();
+  //! Updates the strut for the client
+  void updateStrut();
 
   //! Change the client's state hints to match the class' data
   void changeState();
@@ -343,6 +354,16 @@ public:
 
   //! Returns the type of the window, one of the OBClient::WindowType values
   inline WindowType type() const { return _type; }
+  //! Returns if the window should be treated as a normal window.
+  /*!
+    Some windows (desktops, docks, splash screens) have special rules applied
+    to them in a number of places regarding focus or user interaction.
+  */
+  inline bool normal() const {
+    return ! (_type == Type_Desktop || _type == Type_Dock ||
+              _type == Type_Splash);
+  }
+  
   //! Returns the desktop on which the window resides
   /*!
     This value is a 0-based index.<br>
@@ -357,9 +378,11 @@ public:
   inline const std::string &appName() const { return _app_name; }
   //! Returns the class of the window
   inline const std::string &appClass() const { return _app_class; }
+  //! Returns the program-specified role of the window
+  inline const std::string &role() const { return _role; }
   //! Returns if the window can be focused
   /*!
-    @return true if the window can receive focusl otherwise, false
+    @return true if the window can receive focus; otherwise, false
   */
   inline bool canFocus() const { return _can_focus; }
   //! Returns if the window has indicated that it needs urgent attention
@@ -425,21 +448,39 @@ public:
   //! Returns the position and size of the client relative to the root window
   inline const otk::Rect &area() const { return _area; }
 
+  //! Returns the client's strut definition
+  inline const otk::Strut &strut() const { return _strut; }
+
   //! Move the client window
   void move(int x, int y);
   
   //! Resizes the client window, anchoring it in a given corner
   /*!
     This also maintains things like the client's minsize, and size increments.
-    @param anchor The corner to keep in the same position when resizing
-    @param x The X component of the new size for the client
-    @param y The Y component of the new size for the client
+    @param anchor The corner to keep in the same position when resizing.
+    @param w The width component of the new size for the client.
+    @param h The height component of the new size for the client.
+    @param x An optional X coordinate to which the window will be moved
+             after resizing.
+    @param y An optional Y coordinate to which the window will be moved
+             after resizing.
+    The x and y coordinates must both be sepcified together, or they will have
+    no effect. When they are specified, the anchor is ignored.
   */
-  void resize(Corner anchor, int x, int y);
+  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.<br>
+    '0' - the normal layer<br>
+    '> 0' - the 'above' layer<br>
+    '< 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
@@ -461,6 +502,7 @@ 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