code reorganize

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index d518b9ccac5bc480f448b7b191053d98a7e7c0e7..4e22e2dc9d2b0f7012d690f71d187e8d55ac7f5a 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -21,11 +21,15 @@ extern "C" {
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
+#include "widget.hh"
+#include "python.hh"
 
 namespace ob {
 
 class OBFrame;
 
+extern PyTypeObject OBClient_Type;
+
 //! Maintains the state of a client window.
 /*!
   OBClient maintains the state of a client window. The state consists of the
@@ -38,7 +42,8 @@ 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 {
+  PyObject_HEAD
 public:
 
   //! The frame window which decorates around the client window
@@ -133,6 +138,14 @@ public:
   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;
   
@@ -296,18 +309,6 @@ private:
   void updateClass();
   // XXX: updateTransientFor();
 
-  //! 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);
-  
 public:
   //! Constructs a new OBClient object around a specified window id
   /*!
@@ -417,6 +418,18 @@ public:
   //! 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);