link in python not guile

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 9c0bd7d4402272bdb2b0523d18cbd11f9c033285..458fe088d4006ee6f5bbf5b54f4059d187a1e478 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -21,6 +21,7 @@ extern "C" {
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
+#include "widget.hh"
 
 namespace ob {
 
@@ -38,7 +39,7 @@ class OBFrame;
   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 : public otk::OtkEventHandler {
+class OBClient : public otk::OtkEventHandler, public OBWidget {
 public:
 
   //! The frame window which decorates around the client window
@@ -130,7 +131,16 @@ public:
   };
 
   //! The event mask to grab on client windows
-  static const long event_mask = PropertyChangeMask | FocusChangeMask;
+  static const long event_mask = PropertyChangeMask | FocusChangeMask |
+                                 StructureNotifyMask;
+
+  //! The mask of events to not let propogate past the client
+  /*!
+    This makes things like xprop work on the client window, but means we have
+    to explicitly grab clicks that we want.
+  */
+  static const long no_propagate_mask = ButtonPressMask | ButtonReleaseMask |
+                                        ButtonMotionMask;
 
   //! The number of unmap events to ignore on the window
   int ignore_unmaps;
@@ -295,21 +305,6 @@ private:
   void updateClass();
   // XXX: updateTransientFor();
 
-  //! Move the client window
-  /*!
-    This shouldnt be used to move the window internally! It will apply
-    window gravity after moving the 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 size The new size for the client
-  */
-  void resize(Corner anchor, int x, int y);
-  
 public:
   //! Constructs a new OBClient object around a specified window id
   /*!
@@ -408,19 +403,35 @@ public:
   */
   inline bool floating() const { return _floating; }
 
-  //! Returns the client's requested border width (not used by the wm)
-  inline int borderWidth() const { return _border_width; }
+  //! Removes or reapplies the client's border to its window
+  /*!
+    Used when managing and unmanaging a window.
+    @param addborder true if adding the border to the client; false if removing
+                     from the client
+  */
+  void toggleClientBorder(bool addborder);
 
   //! Returns the position and size of the client relative to the root window
   inline const otk::Rect &area() const { return _area; }
 
+  //! 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
+  */
+  void resize(Corner anchor, int x, int y);
+  
   virtual void propertyHandler(const XPropertyEvent &e);
-
   virtual void clientMessageHandler(const XClientMessageEvent &e);
-
   virtual void shapeHandler(const XShapeEvent &e);
-  
   virtual void configureRequestHandler(const XConfigureRequestEvent &e);
+  virtual void unmapHandler(const XUnmapEvent &e);
+  virtual void destroyHandler(const XDestroyWindowEvent &e);
 };
 
 }