X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=eeb042321c23fcab530d013657172404b239c800;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=37e26cb2af98a440d5dd10f4923a4516fec580ee;hpb=52cb7bd11ed83a57c4c1affcdac8a1f7d68ae551;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 37e26cb2..eeb04232 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -21,11 +21,26 @@ extern "C" {
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
+#include "widget.hh"
 
 namespace ob {
 
 class OBFrame;
 
+//! The MWM Hints as retrieved from the window property
+/*!
+  This structure only contains 3 elements, even though the Motif 2.0
+  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
+};
+
+
 //! Maintains the state of a client window.
 /*!
   OBClient maintains the state of a client window. The state consists of the
@@ -38,7 +53,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
@@ -110,19 +125,6 @@ public:
   //! Holds a bitmask of OBClient::Decoration values
   typedef unsigned char DecorationFlags;
 
-  //! The MWM Hints as retrieved from the window property
-  /*!
-    This structure only contains 3 elements, even though the Motif 2.0
-    structure contains 5. We only use the first 3, so that is all gets defined.
-  */
-  typedef 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
-  };
-
   //! Possible actions that can be made with the _NET_WM_STATE client message
   enum StateAction { State_Remove = 0, //!< _NET_WM_STATE_REMOVE
                      State_Add,        //!< _NET_WM_STATE_ADD
@@ -133,6 +135,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 +306,8 @@ 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 size The new size for the client
-  */
-  void resize(Corner anchor, int x, int y);
-  
 public:
+#ifndef SWIG
   //! Constructs a new OBClient object around a specified window id
   /*!
     @param window The window id that the OBClient class should handle
@@ -316,6 +316,7 @@ public:
   OBClient(int screen, Window window);
   //! Destroys the OBClient object
   virtual ~OBClient();
+#endif
 
   //! Returns the screen on which the clien resides
   inline int screen() const { return _screen; }
@@ -416,6 +417,21 @@ 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);
+
+  //! Request the client to close its window.
+  void close();
+  
   virtual void propertyHandler(const XPropertyEvent &e);
   virtual void clientMessageHandler(const XClientMessageEvent &e);
   virtual void shapeHandler(const XShapeEvent &e);