Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.h

diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index a5391c5a997475abf1da043ea0ebfc66f3fafd48..2d0f7dced493644a2804cab6291cfba424ffaf1d 100644 (file)
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -1,20 +1,52 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   moveresize.h for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __moveresize_h
 #define __moveresize_h
 
 #include <glib.h>
 
+#ifdef SYNC
+#include <X11/extensions/sync.h>
+#endif
+
 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
+extern XSyncAlarm moveresize_alarm;
+#endif
 
 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,
-                      int x, int y, guint button, guint32 corner);
+                      gint x, gint y, guint button, guint32 corner);
 void moveresize_end(gboolean cancel);
 
-void moveresize_event(XEvent *e);
+gboolean moveresize_event(XEvent *e);
 
 #endif