**/
#include "ecore_wl_private.h"
+#include <sys/mman.h>
/* FIXME: This gives BTN_LEFT/RIGHT/MIDDLE for linux systems ...
* What about other OSs ?? */
# define BTN_BACK 0x116
#endif
+#define MOD_SHIFT_MASK 0x01
+#define MOD_ALT_MASK 0x02
+#define MOD_CONTROL_MASK 0x04
+
/* local function prototypes */
-static void _ecore_wl_input_cb_motion(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, int sx, int sy);
-static void _ecore_wl_input_cb_button(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int button, unsigned int state);
-static void _ecore_wl_input_cb_axis(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, unsigned int axis, int value);
-static void _ecore_wl_input_cb_key(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int key, unsigned int state);
-static void _ecore_wl_input_cb_pointer_enter(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface, int sx, int sy);
-static void _ecore_wl_input_cb_pointer_leave(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface);
-static void _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface, struct wl_array *keys);
-static void _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface);
-static void _ecore_wl_input_cb_touch_down(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, struct wl_surface *surface __UNUSED__, int id __UNUSED__, int x, int y);
-static void _ecore_wl_input_cb_touch_up(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, int id __UNUSED__);
-static void _ecore_wl_input_cb_touch_motion(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, int id __UNUSED__, int x, int y);
-static void _ecore_wl_input_cb_touch_frame(void *data __UNUSED__, struct wl_input_device *input_device __UNUSED__);
-static void _ecore_wl_input_cb_touch_cancel(void *data __UNUSED__, struct wl_input_device *input_device __UNUSED__);
+static void _ecore_wl_input_seat_handle_capabilities(void *data, struct wl_seat *seat, enum wl_seat_capability caps);
+
+static void _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, struct wl_surface *surface, wl_fixed_t sx, wl_fixed_t sy);
+static void _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, struct wl_surface *surface);
+static void _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, wl_fixed_t sx, wl_fixed_t sy);
+static void _ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int button, unsigned int state);
+static void _ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, wl_fixed_t value);
+static void _ecore_wl_input_cb_keyboard_keymap(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int format, int fd, unsigned int size);
+static void _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface, struct wl_array *keys __UNUSED__);
+static void _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface);
+static void _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int key, unsigned int state);
+static void _ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial __UNUSED__, unsigned int depressed, unsigned int latched, unsigned int locked, unsigned int group);
+static void _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch __UNUSED__, unsigned int serial, unsigned int timestamp, struct wl_surface *surface __UNUSED__, int id __UNUSED__, wl_fixed_t x, wl_fixed_t y);
+static void _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch __UNUSED__, unsigned int serial, unsigned int timestamp, int id __UNUSED__);
+static void _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch __UNUSED__, unsigned int timestamp, int id __UNUSED__, wl_fixed_t x, wl_fixed_t y);
+static void _ecore_wl_input_cb_touch_frame(void *data __UNUSED__, struct wl_touch *touch __UNUSED__);
+static void _ecore_wl_input_cb_touch_cancel(void *data __UNUSED__, struct wl_touch *touch __UNUSED__);
static void _ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, unsigned int id);
-static void _ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer);
+static void _ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *offer);
static void _ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device);
-static void _ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, int x, int y);
+static void _ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, wl_fixed_t x, wl_fixed_t y);
static void _ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device);
static void _ecore_wl_input_cb_data_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer);
static void _ecore_wl_input_mouse_up_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int timestamp);
static void _ecore_wl_input_mouse_wheel_send(Ecore_Wl_Input *input, unsigned int axis, int value, unsigned int timestamp);
+/* static int _ecore_wl_input_keysym_to_string(unsigned int symbol, char *buffer, int len); */
+
/* wayland interfaces */
-static const struct wl_input_device_listener _ecore_wl_input_listener =
+static const struct wl_pointer_listener pointer_listener =
{
- _ecore_wl_input_cb_motion,
- _ecore_wl_input_cb_button,
- _ecore_wl_input_cb_axis,
- _ecore_wl_input_cb_key,
_ecore_wl_input_cb_pointer_enter,
_ecore_wl_input_cb_pointer_leave,
+ _ecore_wl_input_cb_pointer_motion,
+ _ecore_wl_input_cb_pointer_button,
+ _ecore_wl_input_cb_pointer_axis,
+};
+
+static const struct wl_keyboard_listener keyboard_listener =
+{
+ _ecore_wl_input_cb_keyboard_keymap,
_ecore_wl_input_cb_keyboard_enter,
_ecore_wl_input_cb_keyboard_leave,
+ _ecore_wl_input_cb_keyboard_key,
+ _ecore_wl_input_cb_keyboard_modifiers,
+};
+
+static const struct wl_touch_listener touch_listener =
+{
_ecore_wl_input_cb_touch_down,
_ecore_wl_input_cb_touch_up,
_ecore_wl_input_cb_touch_motion,
_ecore_wl_input_cb_touch_cancel
};
+static const struct wl_seat_listener _ecore_wl_seat_listener =
+{
+ _ecore_wl_input_seat_handle_capabilities,
+};
+
+
static const struct wl_data_device_listener _ecore_wl_data_listener =
{
_ecore_wl_input_cb_data_offer,
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (!input) return;
input->grab = win;
input->grab_button = button;
}
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (!input) return;
input->grab = NULL;
input->grab_button = 0;
}
+EAPI void
+ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, int hot_x, int hot_y)
+{
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (input)
+ wl_pointer_set_cursor(input->pointer, input->pointer_enter_serial,
+ surface, hot_x, hot_y);
+}
+
+EAPI void
+ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_name)
+{
+ struct wl_cursor_image *cursor_image;
+ struct wl_buffer *buffer;
+ struct wl_cursor *cursor;
+
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (!input) return;
+
+ /* No cursor */
+ if (!cursor_name)
+ {
+ ecore_wl_input_pointer_set(input, NULL, 0, 0);
+ return;
+ }
+
+ if (!(cursor = ecore_wl_cursor_get(cursor_name)))
+ return;
+
+ if ((!cursor->images) || (!cursor->images[0]))
+ return;
+
+ cursor_image = cursor->images[0];
+ if ((buffer = wl_cursor_image_get_buffer(cursor_image)))
+ {
+ ecore_wl_input_pointer_set(input, input->cursor_surface,
+ cursor_image->hotspot_x,
+ cursor_image->hotspot_y);
+ wl_surface_attach(input->cursor_surface, buffer, 0, 0);
+ wl_surface_damage(input->cursor_surface, 0, 0,
+ cursor_image->width, cursor_image->height);
+ }
+}
+
+EAPI void
+ecore_wl_input_cursor_default_restore(Ecore_Wl_Input *input)
+{
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (!input) return;
+
+ /* Restore to default wayland cursor */
+ ecore_wl_input_cursor_from_name_set(input, "left_ptr");
+}
+
void
_ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id)
{
input->pointer_focus = NULL;
input->keyboard_focus = NULL;
- input->input_device =
- wl_display_bind(ewd->wl.display, id, &wl_input_device_interface);
+ input->seat =
+ wl_display_bind(ewd->wl.display, id, &wl_seat_interface);
wl_list_insert(ewd->inputs.prev, &input->link);
- wl_input_device_add_listener(input->input_device,
- &_ecore_wl_input_listener, input);
- wl_input_device_set_user_data(input->input_device, input);
+ wl_seat_add_listener(input->seat,
+ &_ecore_wl_seat_listener, input);
+ wl_seat_set_user_data(input->seat, input);
input->data_device =
wl_data_device_manager_get_data_device(ewd->wl.data_device_manager,
- input->input_device);
+ input->seat);
wl_data_device_add_listener(input->data_device,
&_ecore_wl_data_listener, input);
+ input->cursor_surface =
+ wl_compositor_create_surface(_ecore_wl_disp->wl.compositor);
+
ewd->input = input;
}
input->selection_source = NULL;
if (input->data_device) wl_data_device_destroy(input->data_device);
- if (input->input_device) wl_input_device_destroy(input->input_device);
+ if (input->seat) wl_seat_destroy(input->seat);
wl_list_remove(&input->link);
+
+ if (input->xkb.state)
+ xkb_state_unref(input->xkb.state);
+ if (input->xkb.keymap)
+ xkb_map_unref(input->xkb.keymap);
+ if (input->cursor_surface)
+ wl_surface_destroy(input->cursor_surface);
+
free(input);
}
/* local functions */
static void
-_ecore_wl_input_cb_motion(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, int sx, int sy)
+_ecore_wl_input_seat_handle_capabilities(void *data, struct wl_seat *seat, enum wl_seat_capability caps)
{
Ecore_Wl_Input *input;
- LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
if (!(input = data)) return;
+ if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer))
+ {
+ input->pointer = wl_seat_get_pointer(seat);
+ wl_pointer_set_user_data(input->pointer, input);
+ wl_pointer_add_listener(input->pointer, &pointer_listener, input);
+ }
+ else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && (input->pointer))
+ {
+ wl_pointer_destroy(input->pointer);
+ input->pointer = NULL;
+ }
+
+ if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && (!input->keyboard))
+ {
+ input->keyboard = wl_seat_get_keyboard(seat);
+ wl_keyboard_set_user_data(input->keyboard, input);
+ wl_keyboard_add_listener(input->keyboard, &keyboard_listener, input);
+ }
+ else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && (input->keyboard))
+ {
+ wl_keyboard_destroy(input->keyboard);
+ input->keyboard = NULL;
+ }
+
+ if ((caps & WL_SEAT_CAPABILITY_TOUCH) && (!input->touch))
+ {
+ input->touch = wl_seat_get_touch(seat);
+ wl_touch_set_user_data(input->touch, input);
+ wl_touch_add_listener(input->touch, &touch_listener, input);
+ }
+ else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && (input->touch))
+ {
+ wl_touch_destroy(input->touch);
+ input->touch = NULL;
+ }
+}
- _pointer_x = sx;
- _pointer_y = sy;
- input->sx = sx;
- input->sy = sy;
+static void
+_ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, wl_fixed_t sx, wl_fixed_t sy)
+{
+ Ecore_Wl_Input *input;
+
+ /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
+
+ if (!(input = data)) return;
+
+ _pointer_x = input->sx = wl_fixed_to_int(sx);
+ _pointer_y = input->sy = wl_fixed_to_int(sy);
input->timestamp = timestamp;
}
static void
-_ecore_wl_input_cb_button(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int button, unsigned int state)
+_ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int button, unsigned int state)
{
Ecore_Wl_Input *input;
input->timestamp = timestamp;
input->display->serial = serial;
-// _ecore_wl_input_mouse_move_send(input, timestamp);
+// _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp);
if (state)
{
}
static void
-_ecore_wl_input_cb_axis(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, unsigned int axis, int value)
+_ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, wl_fixed_t value)
{
Ecore_Wl_Input *input;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!(input = data)) return;
- _ecore_wl_input_mouse_wheel_send(input, axis, value, timestamp);
+ _ecore_wl_input_mouse_wheel_send(input, axis, wl_fixed_to_int(value),
+ timestamp);
}
static void
-_ecore_wl_input_cb_key(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int key, unsigned int state)
+_ecore_wl_input_cb_keyboard_keymap(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int format, int fd, unsigned int size)
+{
+ Ecore_Wl_Input *input;
+ char *map = NULL;
+
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (!(input = data))
+ {
+ close(fd);
+ return;
+ }
+
+ if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1)
+ {
+ close(fd);
+ return;
+ }
+
+ map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+ if (map == MAP_FAILED)
+ {
+ close(fd);
+ return;
+ }
+
+ input->xkb.keymap =
+ xkb_map_new_from_string(input->display->xkb.context, map,
+ XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+
+ munmap(map, size);
+ close(fd);
+
+ if (!(input->xkb.keymap)) return;
+ if (!(input->xkb.state = xkb_state_new(input->xkb.keymap)))
+ {
+ xkb_map_unref(input->xkb.keymap);
+ input->xkb.keymap = NULL;
+ return;
+ }
+
+ input->xkb.control_mask =
+ 1 << xkb_map_mod_get_index(input->xkb.keymap, "Control");
+ input->xkb.alt_mask =
+ 1 << xkb_map_mod_get_index(input->xkb.keymap, "Mod1");
+ input->xkb.shift_mask =
+ 1 << xkb_map_mod_get_index(input->xkb.keymap, "Shift");
+}
+
+/*
+ * _ecore_wl_input_keysym_to_string: Translate a symbol to its printable form
+ *
+ * @symbol: the symbol to translate
+ * @buffer: the buffer where to put the translated string
+ * @len: size of the buffer
+ *
+ * Translates @symbol into a printable representation in @buffer, if possible.
+ *
+ * Return value: The number of bytes of the translated string, 0 if the
+ * symbol can't be printed
+ *
+ * Note: The code is derived from libX11's src/KeyBind.c
+ * Copyright 1985, 1987, 1998 The Open Group
+ *
+ */
+static int
+_ecore_wl_input_keysym_to_string(unsigned int symbol, char *buffer, int len)
+{
+ unsigned long high_bytes;
+ unsigned char c;
+
+ high_bytes = symbol >> 8;
+ if (!(len &&
+ ((high_bytes == 0) ||
+ ((high_bytes == 0xFF) &&
+ (((symbol >= XKB_KEY_BackSpace) &&
+ (symbol <= XKB_KEY_Clear)) ||
+ (symbol == XKB_KEY_Return) ||
+ (symbol == XKB_KEY_Escape) ||
+ (symbol == XKB_KEY_KP_Space) ||
+ (symbol == XKB_KEY_KP_Tab) ||
+ (symbol == XKB_KEY_KP_Enter) ||
+ ((symbol >= XKB_KEY_KP_Multiply) &&
+ (symbol <= XKB_KEY_KP_9)) ||
+ (symbol == XKB_KEY_KP_Equal) ||
+ (symbol == XKB_KEY_Delete))))))
+ return 0;
+
+ if (symbol == XKB_KEY_KP_Space)
+ c = ' ';
+ else if (high_bytes == 0xFF)
+ c = symbol & 0x7F;
+ else
+ c = symbol & 0xFF;
+
+ buffer[0] = c;
+ return 1;
+}
+
+static void
+_ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int keycode, unsigned int state)
{
Ecore_Wl_Input *input;
Ecore_Wl_Window *win;
- unsigned int keycode = 0;
+ unsigned int code, num;
+ const xkb_keysym_t *syms;
+ xkb_keysym_t sym;
+ char string[32], key[32], keyname[32];
+ Ecore_Event_Key *e;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!(input = data)) return;
-
- input->timestamp = timestamp;
input->display->serial = serial;
+ code = keycode + 8;
+
win = input->keyboard_focus;
if ((!win) || (win->keyboard_device != input)) return;
- /* FIXME: NB: I believe this should be min_key_code rather than 8,
- * but weston code has it like this */
- keycode = key + 8;
+ num = xkb_key_get_syms(input->xkb.state, code, &syms);
+
+ xkb_state_update_key(input->xkb.state, code,
+ (state ? XKB_KEY_DOWN : XKB_KEY_UP));
+
+ /* mask = xkb_state_serialize_mods(input->display->xkb.state, */
+ /* (XKB_STATE_DEPRESSED | XKB_STATE_LATCHED)); */
+ /* input->modifiers = 0; */
+ /* if (mask & input->display->xkb.control_mask) */
+ /* input->modifiers |= MOD_CONTROL_MASK; */
+ /* if (mask & input->display->xkb.alt_mask) */
+ /* input->modifiers |= MOD_ALT_MASK; */
+ /* if (mask & input->display->xkb.shift_mask) */
+ /* input->modifiers |= MOD_SHIFT_MASK; */
+
+ if (num == 1) sym = syms[0];
+ else sym = XKB_KEY_NoSymbol;
+
+ memset(key, 0, sizeof(key));
+ memset(keyname, 0, sizeof(keyname));
+ memset(string, 0, sizeof(string));
- /* if ((input->modifiers & XKB_COMMON_SHIFT_MASK) && */
- /* (XkbKeyGroupWidth(_ecore_wl_disp->xkb, keycode, 0) > 1)) */
- /* level = 1; */
- /* keysym = XkbKeySymEntry(_ecore_wl_disp->xkb, keycode, level, 0); */
+ /* TODO: Switch over to the libxkbcommon API when it is available */
+ if (!_ecore_wl_input_keysym_to_string(sym, string, sizeof(string)))
+ string[0] = '\0';
+
+ xkb_keysym_get_name(sym, key, sizeof(key));
+ xkb_keysym_get_name(sym, keyname, sizeof(keyname));
+
+ e = malloc(sizeof(Ecore_Event_Key) + strlen(keyname) + strlen(key) +
+ strlen(string) + 3);
+
+ e->keyname = (char *)(e + 1);
+ e->key = e->keyname + strlen(keyname) + 1;
+ e->string = strlen(string) ? e->key + strlen(key) + 1 : NULL;
+ e->compose = e->string;
+
+ strcpy((char *)e->keyname, keyname);
+ strcpy((char *)e->key, key);
+ if (strlen (string))
+ strcpy((char *)e->string, string);
+
+ e->window = win->id;
+ e->event_window = win->id;
+ e->timestamp = timestamp;
+ e->modifiers = input->modifiers;
if (state)
- input->modifiers |= _ecore_wl_disp->xkb->map->modmap[keycode];
+ ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL);
else
- input->modifiers &= ~_ecore_wl_disp->xkb->map->modmap[keycode];
+ ecore_event_add(ECORE_EVENT_KEY_UP, e, NULL, NULL);
}
static void
-_ecore_wl_input_cb_pointer_enter(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface, int sx, int sy)
+_ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial __UNUSED__, unsigned int depressed, unsigned int latched, unsigned int locked, unsigned int group)
+{
+ Ecore_Wl_Input *input;
+ xkb_mod_mask_t mask = 0;
+
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (!(input = data)) return;
+ if (input->xkb.state)
+ {
+ xkb_state_update_mask(input->xkb.state, depressed, latched,
+ locked, 0, 0, group);
+
+ mask =
+ xkb_state_serialize_mods(input->xkb.state,
+ (XKB_STATE_DEPRESSED | XKB_STATE_LATCHED));
+ }
+
+ input->modifiers = 0;
+
+ /* The Ecore_Event_Modifiers don't quite match the X mask bits */
+ if (mask & input->xkb.control_mask)
+ input->modifiers |= MOD_CONTROL_MASK;
+ if (mask & input->xkb.alt_mask)
+ input->modifiers |= MOD_ALT_MASK;
+ if (mask & input->xkb.shift_mask)
+ input->modifiers |= MOD_SHIFT_MASK;
+}
+
+static void
+_ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, struct wl_surface *surface, wl_fixed_t sx, wl_fixed_t sy)
{
Ecore_Wl_Input *input;
Ecore_Wl_Window *win = NULL;
input->timestamp = (tv.tv_sec * 1000 + tv.tv_usec / 1000);
}
- input->sx = sx;
- input->sy = sy;
+ input->sx = wl_fixed_to_int(sx);
+ input->sy = wl_fixed_to_int(sy);
input->display->serial = serial;
input->pointer_enter_serial = serial;
win->pointer_device = input;
input->pointer_focus = win;
- _ecore_wl_input_mouse_move_send(input, win, input->timestamp);
+ /* _ecore_wl_input_mouse_move_send(input, win, input->timestamp); */
_ecore_wl_input_mouse_in_send(input, win, input->timestamp);
+ /* The cursor on the surface is undefined until we set it */
+ ecore_wl_window_cursor_default_restore(win);
+
/* NB: This whole 'if' below is a major HACK due to wayland's stupidness
* of not sending a mouse_up (or any notification at all for that matter)
* when a move or resize grab is finished */
}
static void
-_ecore_wl_input_cb_pointer_leave(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface)
+_ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, struct wl_surface *surface)
{
Ecore_Wl_Input *input;
Ecore_Wl_Window *win;
win->pointer_device = NULL;
input->pointer_focus = NULL;
- _ecore_wl_input_mouse_move_send(input, win, input->timestamp);
+ /* _ecore_wl_input_mouse_move_send(input, win, input->timestamp); */
_ecore_wl_input_mouse_out_send(input, win, input->timestamp);
if (input->grab)
}
static void
-_ecore_wl_input_cb_keyboard_enter(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface, struct wl_array *keys)
+_ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface, struct wl_array *keys __UNUSED__)
{
Ecore_Wl_Input *input;
Ecore_Wl_Window *win = NULL;
- unsigned int *k, *end;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
input->timestamp = (tv.tv_sec * 1000 + tv.tv_usec / 1000);
}
- end = keys->data + keys->size;
- input->modifiers = 0;
- for (k = keys->data; k < end; k++)
- input->modifiers |= _ecore_wl_disp->xkb->map->modmap[*k];
-
input->display->serial = serial;
if (!(win = wl_surface_get_user_data(surface))) return;
win->keyboard_device = input;
input->keyboard_focus = win;
- /* FIXME: NB: This may need to be 'serial' */
_ecore_wl_input_focus_in_send(input, win, input->timestamp);
}
static void
-_ecore_wl_input_cb_keyboard_leave(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, struct wl_surface *surface)
+_ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface)
{
Ecore_Wl_Input *input;
Ecore_Wl_Window *win;
}
static void
-_ecore_wl_input_cb_touch_down(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, struct wl_surface *surface __UNUSED__, int id __UNUSED__, int x, int y)
+_ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch __UNUSED__, unsigned int serial, unsigned int timestamp, struct wl_surface *surface __UNUSED__, int id __UNUSED__, wl_fixed_t x, wl_fixed_t y)
{
Ecore_Wl_Input *input;
/* input->timestamp = timestamp; */
input->display->serial = serial;
input->button = 0;
- input->sx = x;
- input->sy = y;
+ input->sx = wl_fixed_to_int(x);
+ input->sy = wl_fixed_to_int(y);
_ecore_wl_input_mouse_down_send(input, input->pointer_focus, timestamp);
}
static void
-_ecore_wl_input_cb_touch_up(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int serial, unsigned int timestamp, int id __UNUSED__)
+_ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch __UNUSED__, unsigned int serial, unsigned int timestamp, int id __UNUSED__)
{
Ecore_Wl_Input *input;
}
static void
-_ecore_wl_input_cb_touch_motion(void *data, struct wl_input_device *input_device __UNUSED__, unsigned int timestamp, int id __UNUSED__, int x, int y)
+_ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch __UNUSED__, unsigned int timestamp, int id __UNUSED__, wl_fixed_t x, wl_fixed_t y)
{
Ecore_Wl_Input *input;
/* FIXME: NB: Not sure yet if input->timestamp should be set here.
* This needs to be tested with an actual touch device */
/* input->timestamp = timestamp; */
- input->sx = x;
- input->sy = y;
+ input->sx = wl_fixed_to_int(x);
+ input->sy = wl_fixed_to_int(y);
_ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp);
}
static void
-_ecore_wl_input_cb_touch_frame(void *data __UNUSED__, struct wl_input_device *input_device __UNUSED__)
+_ecore_wl_input_cb_touch_frame(void *data __UNUSED__, struct wl_touch *touch __UNUSED__)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
}
static void
-_ecore_wl_input_cb_touch_cancel(void *data __UNUSED__, struct wl_input_device *input_device __UNUSED__)
+_ecore_wl_input_cb_touch_cancel(void *data __UNUSED__, struct wl_touch *touch __UNUSED__)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
}
}
static void
-_ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer)
+_ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *offer)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
}
static void
-_ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, int x, int y)
+_ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, wl_fixed_t x, wl_fixed_t y)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
ev->y = input->sy;
/* ev->root.x = input->sx; */
/* ev->root.y = input->sy; */
+ /* printf("Input Modifiers: %d\n", input->modifiers); */
ev->modifiers = input->modifiers;
/* FIXME: Need to get these from wayland somehow */
/* ev->root.x = input->sx; */
/* ev->root.y = input->sy; */
- if (axis == WL_INPUT_DEVICE_AXIS_VERTICAL_SCROLL)
+ if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
{
- ev->direction = value;
- ev->z = 1;
+ ev->direction = 0;
+ ev->z = -value;
}
- else if (axis == WL_INPUT_DEVICE_AXIS_HORIZONTAL_SCROLL)
+ else if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
{
- /* TODO: handle horizontal scroll */
+ ev->direction = 1;
+ ev->z = -value;
}
if (input->grab)
projects / framework / uifw / ecore.git / blobdiff