nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pass an input context to the interactive input function

Browse source
This commit is contained in:
Dana Jansens 2010-02-11 14:39:09 -05:00
parent 08269cefbc
commit 5b6f3c6f7a
5 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
openbox/actions.c
View file

@ -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

8
openbox/actions.h
View file

@ -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,

2
openbox/actions/cyclewindows.c
View file

@ -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)
{

2
openbox/actions/desktop.c
View file

@ -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)
{

2
openbox/actions/directionalwindows.c
View file

@ -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)
{