all repos — openbox @ 5b6f3c6f7a0e4f1efe3c90865226f02ffa03ca9e

openbox fork - make it a bit more like ryudo 

pass an input context to the interactive input function
Dana Jansens danakj@orodu.net
commit

5b6f3c6f7a0e4f1efe3c90865226f02ffa03ca9e

parent

08269cefbce2fe600269c989f9a6a22a98641ba1

5 files changed, 12 insertions(+), 3 deletions(-)

jump to
M openbox/actions.c → openbox/actions.c 
@@ -397,6 +397,7 @@ {
     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
M openbox/actions.h → 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 @@ your mind and make it not */
 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,
M openbox/actions/cyclewindows.c → 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 i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {
M openbox/actions/desktop.c → openbox/actions/desktop.c 
@@ -43,6 +43,7 @@ 
 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 i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {
M openbox/actions/directionalwindows.c → 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 i_input_func(guint initial_state,
                              XEvent *e,
+                             ObtIC *ic,
                              gpointer options,
                              gboolean *used)
 {