Merge branch 'master' into chaz

[chaz/openbox] / openbox / resist.h

diff --git a/openbox/resist.h b/openbox/resist.h
index b961bbeb9c88962c76e463dab2ee016cce7e0fc8..31cc7177e06422e72276b6bb427ec8ce5df7dc36 100644 (file)
--- a/openbox/resist.h
+++ b/openbox/resist.h
@@ -19,13 +19,23 @@
 #ifndef ob__resist_h
 #define ob__resist_h
 
-struct _ObClient;
+#include "misc.h"
 
 #include <glib.h>
 
-void resist_move_windows(struct _ObClient *c, gint *x, gint *y);
-void resist_move_monitors(struct _ObClient *c, gint *x, gint *y);
-void resist_size_windows(struct _ObClient *c, gint *w, gint *h, ObCorner corn);
-void resist_size_monitors(struct _ObClient *c, gint *w, gint *h,ObCorner corn);
+struct _ObClient;
+
+/*! @x The client's x destination (in the client's coordinates, not the frame's
+    @y The client's y destination (in the client's coordinates, not the frame's
+*/
+void resist_move_windows(struct _ObClient *c, gint resist, gint *x, gint *y);
+/*! @x The client's x destination (in the client's coordinates, not the frame's
+    @y The client's y destination (in the client's coordinates, not the frame's
+*/
+void resist_move_monitors(struct _ObClient *c, gint resist, gint *x, gint *y);
+void resist_size_windows(struct _ObClient *c, gint resist, gint *w, gint *h,
+                         ObDirection dir);
+void resist_size_monitors(struct _ObClient *c, gint resist, gint *w, gint *h,
+                          ObDirection dir);
 
 #endif