pass an input context to the interactive input function

diff --git a/openbox/actions.c b/openbox/actions.c
index 35d5cc25f095c23f2acd78806ee00d7d63a31544..2c60ba4096313ac8a7ec2388226c820f87a95b33 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -397,6 +397,7 @@ gboolean actions_interactive_input_event(XEvent *e)
     gboolean used = FALSE;
     if (interactive_act) {
         if (!interactive_act->i_input(interactive_initial_state, e,
+                                      grab_input_context(),
                                       interactive_act->options, &used))
         {
             used = TRUE; /* if it cancelled the action then it has to of

diff --git a/openbox/actions.h b/openbox/actions.h
index a56ece398e8e7ba5937604975aec3c2397fb4989..e03bc577742fd0eb92d03019c53061b1a3ea9393 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,

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 6619b387165b896bca51cde2e0000eaa7ffdfb75..782a4c604ee79e4f7f89b43bf48b0ec0e494c9a7 100644 (file)
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -43,6 +43,7 @@ static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used);
 static void     i_cancel_func(gpointer options);
@@ -169,6 +170,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 59aae832d4c2cad27c561f60540770f021b02422..a2d4be29fe03112d3973bae9d30159095e7b1eed 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -43,6 +43,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_pre_func(guint state, gpointer options);
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used);
 static void i_post_func(gpointer options);
@@ -297,6 +298,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {

diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index c5b908bbe04abec1fb39829dbd59af8d2b338b21..e8410c96cc217fb954dc611bb771ee0f3b699748 100644 (file)
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -32,6 +32,7 @@ static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used);
 static void     i_cancel_func(gpointer options);
@@ -254,6 +255,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
 static gboolean i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {