mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-simple-im: Fold keyboard_input_handle_key() into event handler

Browse Source
This commit is contained in:
Kristian Høgsberg 2012-11-27 14:20:31 -05:00
parent 3a3704db20
commit 6aae61483b
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
clients/weston-simple-im.c
View File

@ -150,32 +150,6 @@ keyboard_input_handle_keymap(struct keyboard_input *keyboard_input,
1 << xkb_map_mod_get_index(keyboard_input->keymap, "Shift"); 1 << xkb_map_mod_get_index(keyboard_input->keymap, "Shift");
} }
static void
keyboard_input_handle_key(struct keyboard_input *keyboard_input,
uint32_t serial, uint32_t time,
uint32_t key, uint32_t state_w)
{
uint32_t code;
uint32_t num_syms;
const xkb_keysym_t *syms;
xkb_keysym_t sym;
enum wl_keyboard_key_state state = state_w;
if (!keyboard_input->state)
return;
code = key + 8;
num_syms = xkb_key_get_syms(keyboard_input->state, code, &syms);
sym = XKB_KEY_NoSymbol;
if (num_syms == 1)
sym = syms[0];
if (keyboard_input->key_handler)
(*keyboard_input->key_handler)(keyboard_input, serial, time, key, sym,
state, keyboard_input->user_data);
}
static void static void
keyboard_input_set_user_data(struct keyboard_input *keyboard_input, void *data) keyboard_input_set_user_data(struct keyboard_input *keyboard_input, void *data)
{ {
@ -236,9 +210,26 @@ input_method_keyboard_key(void *data,
uint32_t state_w) uint32_t state_w)
{ {
struct simple_im *keyboard = data; struct simple_im *keyboard = data;
struct keyboard_input *keyboard_input = keyboard->keyboard_input;
uint32_t code;
uint32_t num_syms;
const xkb_keysym_t *syms;
xkb_keysym_t sym;
enum wl_keyboard_key_state state = state_w;
keyboard_input_handle_key(keyboard->keyboard_input, serial, if (!keyboard_input->state)
time, key, state_w); return;
code = key + 8;
num_syms = xkb_key_get_syms(keyboard_input->state, code, &syms);
sym = XKB_KEY_NoSymbol;
if (num_syms == 1)
sym = syms[0];
if (keyboard_input->key_handler)
(*keyboard_input->key_handler)(keyboard_input, serial, time, key, sym,
state, keyboard_input->user_data);
} }
static void static void