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

@ -110,8 +110,9 @@ typedef void (*window_resize_handler_t)(struct window *window,
void *data);
typedef void (*window_redraw_handler_t)(struct window *window, void *data);
typedef void (*window_frame_handler_t)(struct window *window, uint32_t frame, uint32_t timestamp, void *data);
typedef void (*window_key_handler_t)(struct window *window, uint32_t key, uint32_t unicode,
uint32_t state, uint32_t modifiers, void *data);
typedef void (*window_key_handler_t)(struct window *window, struct input *input,
uint32_t time, uint32_t key, uint32_t unicode,
uint32_t state, void *data);
typedef void (*window_keyboard_focus_handler_t)(struct window *window,
struct input *device, void *data);
@ -236,6 +237,9 @@ window_activate_drag(struct wl_drag *drag, struct window *window,
void
input_get_position(struct input *input, int32_t *x, int32_t *y);
uint32_t
input_get_modifiers(struct input *input);
struct wl_input_device *
input_get_input_device(struct input *input);