hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-07 14:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

rootston: handle grab end

Browse source
This commit is contained in:
Tony Crisci 2017-10-06 07:32:59 -04:00
parent 4657f10dd2
commit 48ae4fc588
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/rootston/input.h
View file

@ -105,6 +105,8 @@ struct roots_input {
struct wl_listener cursor_axis; struct wl_listener cursor_axis;
struct wl_listener cursor_tool_axis; struct wl_listener cursor_tool_axis;
struct wl_listener cursor_tool_tip; struct wl_listener cursor_tool_tip;
struct wl_listener pointer_grab_end;
}; };
struct roots_input *input_create(struct roots_server *server, struct roots_input *input_create(struct roots_server *server,

3
include/wlr/types/wlr_seat.h
View file

@ -94,6 +94,9 @@ struct wlr_seat {
struct { struct {
struct wl_signal client_bound; struct wl_signal client_bound;
struct wl_signal client_unbound; struct wl_signal client_unbound;
struct wl_signal pointer_grab_begin;
struct wl_signal pointer_grab_end;
} events; } events;
void *data; void *data;

9
rootston/cursor.c
View file

@ -265,6 +265,12 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
(uint32_t)(event->time_usec / 1000), BTN_LEFT, event->state); (uint32_t)(event->time_usec / 1000), BTN_LEFT, event->state);
} }
static void handle_pointer_grab_end(struct wl_listener *listener, void *data) {
struct roots_input *input =
wl_container_of(listener, input, pointer_grab_end);
cursor_update_position(input, 0);
}
void cursor_initialize(struct roots_input *input) { void cursor_initialize(struct roots_input *input) {
struct wlr_cursor *cursor = input->cursor; struct wlr_cursor *cursor = input->cursor;
@ -292,6 +298,9 @@ void cursor_initialize(struct roots_input *input) {
wl_list_init(&input->cursor_tool_tip.link); wl_list_init(&input->cursor_tool_tip.link);
wl_signal_add(&cursor->events.tablet_tool_tip, &input->cursor_tool_tip); wl_signal_add(&cursor->events.tablet_tool_tip, &input->cursor_tool_tip);
input->cursor_tool_tip.notify = handle_tool_tip; input->cursor_tool_tip.notify = handle_tool_tip;
wl_signal_add(&input->wl_seat->events.pointer_grab_end, &input->pointer_grab_end);
input->pointer_grab_end.notify = handle_pointer_grab_end;
} }
static void reset_device_mappings(struct roots_config *config, static void reset_device_mappings(struct roots_config *config,

9
types/wlr_seat.c
View file

@ -246,6 +246,9 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
wl_signal_init(&wlr_seat->events.client_bound); wl_signal_init(&wlr_seat->events.client_bound);
wl_signal_init(&wlr_seat->events.client_unbound); wl_signal_init(&wlr_seat->events.client_unbound);
wl_signal_init(&wlr_seat->events.pointer_grab_begin);
wl_signal_init(&wlr_seat->events.pointer_grab_end);
return wlr_seat; return wlr_seat;
} }
@ -438,12 +441,14 @@ void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat,
struct wlr_seat_pointer_grab *grab) { struct wlr_seat_pointer_grab *grab) {
grab->seat = wlr_seat; grab->seat = wlr_seat;
wlr_seat->pointer_state.grab = grab; wlr_seat->pointer_state.grab = grab;
// TODO: replay the last enter
wl_signal_emit(&wlr_seat->events.pointer_grab_begin, grab);
} }
void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat) { void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat) {
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
wlr_seat->pointer_state.grab = wlr_seat->pointer_state.default_grab; wlr_seat->pointer_state.grab = wlr_seat->pointer_state.default_grab;
// TODO: replay the last enter wl_signal_emit(&wlr_seat->events.pointer_grab_end, grab);
} }
void wlr_seat_pointer_notify_enter(struct wlr_seat *wlr_seat, void wlr_seat_pointer_notify_enter(struct wlr_seat *wlr_seat,