kill the typedef

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 27e247a849fc198e9409f6527260dc3ffc7bde8d..932bac16251b73c1e8650eab3f56f9ff0d3d6756 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -348,6 +348,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
@@ -414,6 +417,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 +439,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();
@@ -655,6 +664,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.
   /*!