Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.h

diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index ec5ce10dfe65eb083a7d6a74932066fc221dcfcd..2d0f7dced493644a2804cab6291cfba424ffaf1d 100644 (file)
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -27,6 +27,12 @@
 
 struct _ObClient;
 
+typedef enum {
+    OB_RESIZE_POS_CENTER,
+    OB_RESIZE_POS_TOP,
+    OB_RESIZE_POS_FIXED
+} ObResizePopupPos;
+
 extern gboolean moveresize_in_progress;
 extern struct _ObClient *moveresize_client;
 #ifdef SYNC
@@ -36,6 +42,7 @@ extern XSyncAlarm moveresize_alarm;
 void moveresize_startup(gboolean reconfig);
 void moveresize_shutdown(gboolean reconfig);
 
+/*! @param corner This is one of the prop_atoms.net_wm_moveresize_ atoms */
 void moveresize_start(struct _ObClient *c,
                       gint x, gint y, guint button, guint32 corner);
 void moveresize_end(gboolean cancel);