use the new sexy additions to the python classes

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 27e247a849fc198e9409f6527260dc3ffc7bde8d..e18de3c9ff7694ad1a31cda94a5296ec5e4c5328 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -152,12 +152,6 @@ public:
   //! Holds a bitmask of Client::Decoration values
   typedef unsigned char DecorationFlags;
 
-  //! 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
-                     State_Toggle      //!< _NET_WM_STATE_TOGGLE
-  };
-
   //! The event mask to grab on client windows
   static const long event_mask = PropertyChangeMask | FocusChangeMask |
                                  StructureNotifyMask;
@@ -348,6 +342,9 @@ private:
   //! The number of icons in _icons
   int _nicons;
 
+  Pixmap _pixmap_icon;
+  Pixmap _pixmap_icon_mask;
+
   //! Retrieves the window's initial gravity
   void getGravity();
   //! Retrieves the desktop hint's value and sets Client::_desktop
@@ -382,7 +379,7 @@ private:
     Client::applyStartupState is used to do the same things during the mapping
     process.
   */
-  void setState(StateAction action, long data1, long data2);
+  void setState(Atom action, long data1, long data2);
 
   //! Sends the window to the specified desktop
   void setDesktop(unsigned int desktop);
@@ -414,6 +411,8 @@ private:
   void updateTransientFor();
   //! Updates the window's icons
   void updateIcons();
+  //! Updates the window's kwm icon
+  void updateKwmIcon();
 
   //! Change the client's state hints to match the class' data
   void changeState();
@@ -434,6 +433,10 @@ private:
   //! the topmost node (the window you're starting with).
   Client *Client::searchModalTree(Client *node, Client *skip);
 
+  //! Recursively searches the client 'tree' for a focused client, always skips
+  //! the topmost node (the window you're starting with).
+  Client *Client::searchFocusTree(Client *node, Client *skip);
+
   //! Fires the urgent callbacks which lets the user do what they want with
   //! urgent windows
   void fireUrgent();
@@ -511,16 +514,14 @@ private:
   void applyStartupState();
   
 public:
-#ifndef SWIG
   //! Constructs a new Client object around a specified window id
   /*!
-BB    @param window The window id that the Client class should handle
+    @param window The window id that the Client class should handle
     @param screen The screen on which the window resides
   */
   Client(int screen, Window window);
   //! Destroys the Client object
   virtual ~Client();
-#endif
 
   //! Returns the screen on which the clien resides
   inline int screen() const { return _screen; }
@@ -607,7 +608,7 @@ BB    @param window The window id that the Client class should handle
   inline bool skipPager() const { return _skip_pager; }
   //! The window should not be displayed by taskbars
   inline bool skipTaskbar() const { return _skip_taskbar; } 
- //! Returns if the window is shaded
+  //! Returns if the window is shaded
   /*!
     When the window is shaded, only its titlebar is visible.
   */
@@ -655,6 +656,17 @@ BB    @param window The window id that the Client class should handle
     smaller than the specified size will be returned.
   */
   const Icon *icon(const otk::Size &s) const;
+
+  //! Returns the pixmap for the pixmap icon specified on the window (or None)
+  /*!
+    The icon given by Client::icon should take precedence over this icon/mask.
+  */
+  Pixmap pixmapIcon() const { return _pixmap_icon; }
+  //! Returns the mask for the pixmap icon specified on the window (or None)
+  /*!
+    The icon given by Client::icon should take precedence over this icon/mask.
+  */
+  Pixmap pixmapIconMask() const { return _pixmap_icon_mask; }
   
   //! Move the window (actually, its frame) to a position.
   /*!