blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlr-seat: honor seat version

This commit is contained in:
Tony Crisci 2017-10-03 15:13:29 -04:00
parent 5f3c56de28
commit d1cb0edf20
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
types/wlr_seat.c
View File

@ -12,6 +12,13 @@ static void resource_destroy(struct wl_client *client,
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
static void pointer_send_frame(struct wl_resource *resource) {
if (wl_resource_get_version(resource) >=
WL_POINTER_FRAME_SINCE_VERSION) {
wl_pointer_send_frame(resource);
}
}
static void wl_pointer_set_cursor(struct wl_client *client, static void wl_pointer_set_cursor(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial, uint32_t serial,
@ -159,7 +166,9 @@ static void wl_seat_bind(struct wl_client *wl_client, void *_wlr_seat,
wl_resource_set_implementation(handle->wl_resource, &wl_seat_impl, wl_resource_set_implementation(handle->wl_resource, &wl_seat_impl,
handle, wlr_seat_handle_resource_destroy); handle, wlr_seat_handle_resource_destroy);
wl_list_insert(&wlr_seat->handles, &handle->link); wl_list_insert(&wlr_seat->handles, &handle->link);
wl_seat_send_name(handle->wl_resource, wlr_seat->name); if (version >= WL_SEAT_NAME_SINCE_VERSION) {
wl_seat_send_name(handle->wl_resource, wlr_seat->name);
}
wl_seat_send_capabilities(handle->wl_resource, wlr_seat->capabilities); wl_seat_send_capabilities(handle->wl_resource, wlr_seat->capabilities);
wl_signal_emit(&wlr_seat->events.client_bound, handle); wl_signal_emit(&wlr_seat->events.client_bound, handle);
} }
@ -296,7 +305,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_leave(focused_handle->pointer, serial, wl_pointer_send_leave(focused_handle->pointer, serial,
focused_surface->resource); focused_surface->resource);
wl_pointer_send_frame(focused_handle->pointer); pointer_send_frame(focused_handle->pointer);
} }
// enter the current surface // enter the current surface
@ -304,7 +313,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_enter(handle->pointer, serial, surface->resource, wl_pointer_send_enter(handle->pointer, serial, surface->resource,
wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_fixed_from_double(sx), wl_fixed_from_double(sy));
wl_pointer_send_frame(handle->pointer); pointer_send_frame(handle->pointer);
} }
// reinitialize the focus destroy events // reinitialize the focus destroy events
@ -341,7 +350,7 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
wl_pointer_send_motion(wlr_seat->pointer_state.focused_handle->pointer, wl_pointer_send_motion(wlr_seat->pointer_state.focused_handle->pointer,
time, wl_fixed_from_double(sx), wl_fixed_from_double(sy)); time, wl_fixed_from_double(sx), wl_fixed_from_double(sy));
wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer); pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer);
} }
uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
@ -353,7 +362,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_button(wlr_seat->pointer_state.focused_handle->pointer, wl_pointer_send_button(wlr_seat->pointer_state.focused_handle->pointer,
serial, time, button, state); serial, time, button, state);
wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer); pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer);
return serial; return serial;
} }
@ -369,11 +378,12 @@ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
if (value) { if (value) {
wl_pointer_send_axis(pointer, time, orientation, wl_pointer_send_axis(pointer, time, orientation,
wl_fixed_from_double(value)); wl_fixed_from_double(value));
} else { } else if (wl_resource_get_version(pointer) >=
WL_POINTER_AXIS_STOP_SINCE_VERSION) {
wl_pointer_send_axis_stop(pointer, time, orientation); wl_pointer_send_axis_stop(pointer, time, orientation);
} }
wl_pointer_send_frame(pointer); pointer_send_frame(pointer);
} }
static void keyboard_switch_seat_keyboard(struct wlr_seat_handle *handle, static void keyboard_switch_seat_keyboard(struct wlr_seat_handle *handle,
@ -388,7 +398,8 @@ static void keyboard_switch_seat_keyboard(struct wlr_seat_handle *handle,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, seat_kb->keyboard->keymap_fd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, seat_kb->keyboard->keymap_fd,
seat_kb->keyboard->keymap_size); seat_kb->keyboard->keymap_size);
if (wl_resource_get_version(handle->keyboard) >= 2) { if (wl_resource_get_version(handle->keyboard) >=
WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) {
// TODO: Make this better // TODO: Make this better
wl_keyboard_send_repeat_info(handle->keyboard, 25, 600); wl_keyboard_send_repeat_info(handle->keyboard, 25, 600);
} }