Merge branch 'master' into chaz

[chaz/openbox] / openbox / actions.h

diff --git a/openbox/actions.h b/openbox/actions.h
index a56ece398e8e7ba5937604975aec3c2397fb4989..f8e1ba83c42d867b2ad6ad10df18b4096f7b7c65 100644 (file)
--- a/openbox/actions.h
+++ b/openbox/actions.h
@@ -19,6 +19,7 @@
 #include "misc.h"
 #include "frame.h"
 #include "obt/xml.h"
+#include "obt/keyboard.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -43,9 +44,10 @@ typedef void     (*ObActionsShutdownFunc)(void);
 typedef gboolean (*ObActionsIPreFunc)(guint initial_state, gpointer options);
 typedef void     (*ObActionsIPostFunc)(gpointer options);
 typedef gboolean (*ObActionsIInputFunc)(guint initial_state,
-                                                  XEvent *e,
-                                                  gpointer options,
-                                                  gboolean *used);
+                                        XEvent *e,
+                                        ObtIC *ic,
+                                        gpointer options,
+                                        gboolean *used);
 typedef void     (*ObActionsICancelFunc)(gpointer options);
 typedef gpointer (*ObActionsIDataSetupFunc)(xmlNodePtr node,
                                             ObActionsIPreFunc *pre,
@@ -80,6 +82,10 @@ gboolean actions_register(const gchar *name,
 
 gboolean actions_set_shutdown(const gchar *name,
                               ObActionsShutdownFunc shutdown);
+gboolean actions_set_modifies_focused_window(const gchar *name,
+                                             gboolean modifies);
+gboolean actions_set_can_stop(const gchar *name,
+                              gboolean modifies);
 
 ObActionsAct* actions_parse(xmlNodePtr node);
 ObActionsAct* actions_parse_string(const gchar *name);