X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=d2a41dd7254eb31f35c8ee4bd32fc6ddb6376018;hb=ee14d8a3ccadfaeb16f47187f071914353258bc6;hp=4e22e2dc9d2b0f7012d690f71d187e8d55ac7f5a;hpb=68194ce957db36ead19a39fdc7636a220befafe9;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 4e22e2dc..d2a41dd7 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -22,13 +22,24 @@ extern "C" {
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
 #include "widget.hh"
-#include "python.hh"
 
 namespace ob {
 
 class OBFrame;
 
-extern PyTypeObject OBClient_Type;
+//! 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.
 /*!
@@ -43,7 +54,6 @@ extern PyTypeObject OBClient_Type;
   change (such as causing a redraw of the titlebar after the title is changed).
 */
 class OBClient : public otk::OtkEventHandler, public OBWidget {
-  PyObject_HEAD
 public:
 
   //! The frame window which decorates around the client window
@@ -115,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
@@ -237,6 +234,8 @@ private:
   bool _urgent;
   //! Notify the window when it receives focus?
   bool _focus_notify;
+  //! Does the client window have the input focus?
+  bool _focused;
 
   //! The window uses shape extension to be non-rectangular?
   bool _shaped;
@@ -310,6 +309,7 @@ private:
   // XXX: updateTransientFor();
 
 public:
+#ifndef SWIG
   //! Constructs a new OBClient object around a specified window id
   /*!
     @param window The window id that the OBClient class should handle
@@ -318,6 +318,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; }
@@ -429,13 +430,25 @@ public:
     @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();
+
+  //! Attempt to focus the client window
+  bool focus();
+
+  //! Remove focus from the client window
+  void unfocus();
   
+  virtual void focusHandler(const XFocusChangeEvent &e);
+  virtual void unfocusHandler(const XFocusChangeEvent &e);
   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);
+  virtual void reparentHandler(const XReparentEvent &e);
 };
 
 }