Merge branch 'backport'

[chaz/openbox] / openbox / mouse.h

diff --git a/openbox/mouse.h b/openbox/mouse.h
index 38e01da893002fbc5156ae4317f4e84fce637a07..a862fe5b4a5f8ee9a0a552feb34b704db4bad967 100644 (file)
--- a/openbox/mouse.h
+++ b/openbox/mouse.h
@@ -19,17 +19,18 @@
 #ifndef ob__mouse_h
 #define ob__mouse_h
 
-#include "action.h"
 #include "frame.h"
 #include "misc.h"
 
 #include <X11/Xlib.h>
 
+struct _ObActionsAct;
+
 void mouse_startup(gboolean reconfig);
 void mouse_shutdown(gboolean reconfig);
 
 gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
-                    ObMouseAction mact, ObAction *action);
+                    ObMouseAction mact, struct _ObActionsAct *action);
 void mouse_unbind_all();
 
 void mouse_event(struct _ObClient *client, XEvent *e);
@@ -37,6 +38,11 @@ void mouse_event(struct _ObClient *client, XEvent *e);
 void mouse_grab_for_client(struct _ObClient *client, gboolean grab);
 
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
-                                          guint button);
+                                          guint button, guint state);
+
+/*! If a replay pointer is needed, then do it.  Call this when windows are
+  going to be moving/appearing/disappearing, so that you know the mouse click
+  will go to the right window */
+void mouse_replay_pointer();
 
 #endif