X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.hh;h=382ab1df01794e33adaf1d7dc59dca931858a7fa;hb=432ac0983e058133e03885171f266dc4ba07f488;hp=8d97bfcceb17cc23213cf52233a9ca61f99857d2;hpb=0c2f0e0b5e974bace6b7488541fac0fed23c5bc9;p=chaz%2Fopenbox

diff --git a/src/client.hh b/src/client.hh
index 8d97bfcc..382ab1df 100644
--- 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,8 +342,8 @@ private:
   //! The number of icons in _icons
   int _nicons;
 
-  Pixmap _kwm_icon;
-  Pixmap _kwm_icon_mask;
+  Pixmap _pixmap_icon;
+  Pixmap _pixmap_icon_mask;
 
   //! Retrieves the window's initial gravity
   void getGravity();
@@ -385,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);
@@ -484,8 +478,11 @@ private:
   /*!
     @param x The X coordinate to move to.
     @param y The Y coordinate to move to.
+    @param final true if this is the final move, false if there are more move
+                 events coming. The client is not notified of the move when
+                 final is false.
   */
-  void internal_move(int x, int y);
+  void internal_move(int x, int y, bool final = true);
   //! Internal version of the Client::resize function
   /*!
     This also maintains things like the client's minsize, and size increments.
@@ -520,16 +517,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; }
@@ -601,7 +596,7 @@ BB    @param window The window id that the Client class should handle
   inline DecorationFlags disabledDecorations() const
     { return _disabled_decorations; }
   //! Returns the functions that the user can perform on the window
-  inline FunctionFlags funtions() const { return _functions; }
+  inline FunctionFlags functions() const { return _functions; }
 
   //! Return the client this window is transient for
   inline Client *transientFor() const { return _transient_for; }
@@ -616,7 +611,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.
   */
@@ -665,16 +660,16 @@ BB    @param window The window id that the Client class should handle
   */
   const Icon *icon(const otk::Size &s) const;
 
-  //! Returns the pixmap for the KWM_WIN_ICON specified on the window (or None)
+  //! 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 kwmIcon() const { return _kwm_icon; }
-  //! Returns the mask for the KWM_WIN_ICON specified on the window (or None)
+  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 kwmIconMask() const { return _kwm_icon_mask; }
+  Pixmap pixmapIconMask() const { return _pixmap_icon_mask; }
   
   //! Move the window (actually, its frame) to a position.
   /*!
@@ -682,8 +677,11 @@ BB    @param window The window id that the Client class should handle
     the position specified.
     @param x The X coordinate to move to.
     @param y The Y coordinate to move to.
+    @param final true if this is the final move, false if there are more move
+                 events coming. The client is not notified of the move when
+                 final is false.
   */
-  void move(int x, int y);
+  void move(int x, int y, bool final = true);
   
   //! Resizes the client window, anchoring it in a given corner
   /*!