Pass input device and time in key_handler callback

Move the modifiers to a input device getter function.
This commit is contained in:
Kristian Høgsberg 2011-01-19 14:20:33 -05:00
parent 5029a13283
commit 67cac8a565
5 changed files with 28 additions and 10 deletions

View file

@ -922,8 +922,8 @@ window_handle_key(void *data, struct wl_input_device *input_device,
input->modifiers &= ~d->xkb->map->modmap[code];
if (window->key_handler)
(*window->key_handler)(window, key, sym, state,
input->modifiers, window->user_data);
(*window->key_handler)(window, input, time, key, sym, state,
window->user_data);
}
static void
@ -1014,6 +1014,12 @@ input_get_input_device(struct input *input)
return input->input_device;
}
uint32_t
input_get_modifiers(struct input *input)
{
return input->modifiers;
}
struct wl_drag *
window_create_drag(struct window *window)
{