make shape work with the titlebar and handle

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 1a6d3b1aa03e8229d8c50dee11fc53275b959ddf..325162edd9070916468012b541a6cbdf16908b5d 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -9,15 +9,22 @@
 
 extern "C" {
 #include <X11/Xlib.h>
+
+#ifdef    SHAPE
+#include <X11/extensions/shape.h>
+#endif // SHAPE
 }
 
 #include <string>
 
 #include "otk/strut.hh"
 #include "otk/rect.hh"
+#include "otk/eventhandler.hh"
 
 namespace ob {
 
+class OBFrame;
+
 //! Maintains the state of a client window.
 /*!
   OBClient maintains the state of a client window. The state consists of the
@@ -30,8 +37,12 @@ namespace ob {
   class' member variables and call whatever is nessary to complete the
   change (such as causing a redraw of the titlebar after the title is changed).
 */
-class OBClient {
+class OBClient : public otk::OtkEventHandler {
 public:
+
+  //! The frame window which decorates around the client window
+  OBFrame *frame;
+  
   //! Possible window types
   enum WindowType { Type_Desktop, //!< A desktop (bottom-most window)
                     Type_Dock,    //!< A dock bar/panel window
@@ -83,7 +94,8 @@ public:
                     Decor_Border   = 1 << 2, //!< Display a border
                     Decor_Iconify  = 1 << 3, //!< Display an iconify button
                     Decor_Maximize = 1 << 4, //!< Display a maximize button
-                    Decor_Close    = 1 << 5  //!< Display a close button
+                    Decor_Sticky   = 1 << 5, //!< Display a sticky button
+                    Decor_Close    = 1 << 6  //!< Display a close button
   };
   //! Holds a bitmask of OBClient::Decoration values
   typedef unsigned char DecorationFlags;
@@ -107,7 +119,16 @@ public:
                      State_Toggle      //!< _NET_WM_STATE_TOGGLE
   };
 
+  //! The event mask to grab on client windows
+  static const long event_mask = PropertyChangeMask | FocusChangeMask;
+
+  //! The number of unmap events to ignore on the window
+  int ignore_unmaps;
+  
 private:
+  //! The screen number on which the client resides
+  int      _screen;
+  
   //! The actual window that this class is wrapping up
   Window   _window;
 
@@ -272,11 +293,15 @@ public:
   //! Constructs a new OBClient object around a specified window id
   /*!
     @param window The window id that the OBClient class should handle
+    @param screen The screen on which the window resides
   */
-  OBClient(Window window);
+  OBClient(int screen, Window window);
   //! Destroys the OBClient object
   virtual ~OBClient();
 
+  //! Returns the screen on which the clien resides
+  inline int screen() const { return _screen; }
+  
   //! Returns the window id that the OBClient object is handling
   inline Window window() const { return _window; }
 
@@ -409,12 +434,12 @@ public:
   //! Returns the position and size of the client relative to the root window
   inline const otk::Rect &area() const { return _area; }
 
-  //! Updates the OBClient class from a property change XEvent
-  void update(const XPropertyEvent &e);
-  //! Processes a client message XEvent for the window and causes an action
-  //! or whatever was specified to occur
-  void update(const XClientMessageEvent &e);
+  virtual void propertyHandler(const XPropertyEvent &e);
 
+  virtual void clientMessageHandler(const XClientMessageEvent &e);
+
+  virtual void shapeHandler(const XShapeEvent &e);
+  
   //! Changes the stored positions and size of the OBClient window
   /*!
     This does not actually change the physical geometry, that needs to be done