epist alt-tab works now! i.e. NET_ACTIVE_WINDOW is working

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 458fe088d4006ee6f5bbf5b54f4059d187a1e478..2bc7e3f0018eaf28b5f1846d3be127a10fd0266d 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -17,16 +17,31 @@ extern "C" {
 
 #include <string>
 
+#include "screen.hh"
+#include "widget.hh"
 #include "otk/point.hh"
 #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
@@ -111,19 +126,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
@@ -233,6 +235,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;
@@ -248,10 +252,18 @@ private:
   bool _max_vert;
   //! The window is maximized to fill the screen horizontally
   bool _max_horz;
+  //! The window should not be displayed by pagers
+  bool _skip_pager;
+  //! The window should not be displayed by taskbars
+  bool _skip_taskbar;
   //! The window is a 'fullscreen' window, and should be on top of all others
   bool _fullscreen;
   //! The window should be on top of other windows of the same type
-  bool _floating;
+  bool _above;
+  //! The window should be underneath other windows of the same type
+  bool _below;
+
+  OBScreen::StackLayer _layer;
 
   //! A bitmask of values in the OBClient::Decoration enum
   /*!
@@ -290,6 +302,9 @@ private:
   //! Adjusts the window's net_state
   void setState(StateAction action, long data1, long data2);
 
+  //! Calculates the stacking layer for the client window
+  void calcLayer();
+
   //! Update the protocols that the window supports and adjusts things if they
   //! change
   void updateProtocols();
@@ -305,7 +320,11 @@ private:
   void updateClass();
   // XXX: updateTransientFor();
 
+  //! Change the client's state hints to match the class' data
+  void changeState();
+  
 public:
+#ifndef SWIG
   //! Constructs a new OBClient object around a specified window id
   /*!
     @param window The window id that the OBClient class should handle
@@ -314,6 +333,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; }
@@ -391,17 +411,8 @@ public:
   inline bool maxVert() const { return _max_vert; }
   //! Returns if the window is maximized horizontally
   inline bool maxHorz() const { return _max_horz; }
-  //! Returns if the window is fullscreen
-  /*!
-    When the window is fullscreen, it is kept above all others
-  */
-  inline bool fullscreen() const { return _fullscreen; }
-  //! Returns if the window is floating
-  /*!
-    When the window is floating, it is kept above all others in the same
-    stacking layer as it
-  */
-  inline bool floating() const { return _floating; }
+  //! Returns the window's stacking layer
+  inline OBScreen::StackLayer layer() const { return _layer; }
 
   //! Removes or reapplies the client's border to its window
   /*!
@@ -425,13 +436,32 @@ 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();
+
+  //! Shades or unshades the client window
+  /*!
+    @param shade true if the window should be shaded; false if it should be
+                 unshaded.
+  */
+  void shade(bool shade);
   
+  //! 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);
 };
 
 }