pass an input context to the interactive input function
This commit is contained in:
parent
08269cefbc
commit
5b6f3c6f7a
5 changed files with 12 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue