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

Update pointer focus when cycling focus

This commit is contained in:
Las 2018-08-08 13:43:44 +02:00
parent d446c53fe1
commit 59dd1dddba
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rootston/cursor.h
View File

@ -84,4 +84,6 @@ void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
void roots_cursor_update_position(struct roots_cursor *cursor, void roots_cursor_update_position(struct roots_cursor *cursor,
uint32_t time); uint32_t time);
void roots_cursor_update_focus(struct roots_cursor *cursor);
#endif #endif

12
rootston/cursor.c
View File

@ -100,7 +100,7 @@ static void seat_view_deco_button(struct roots_seat_view *view, double sx,
} }
static void roots_passthrough_cursor(struct roots_cursor *cursor, static void roots_passthrough_cursor(struct roots_cursor *cursor,
uint32_t time) { int64_t time) {
bool focus_changed; bool focus_changed;
double sx, sy; double sx, sy;
struct roots_view *view = NULL; struct roots_view *view = NULL;
@ -108,11 +108,13 @@ static void roots_passthrough_cursor(struct roots_cursor *cursor,
struct roots_desktop *desktop = seat->input->server->desktop; struct roots_desktop *desktop = seat->input->server->desktop;
struct wlr_surface *surface = desktop_surface_at(desktop, struct wlr_surface *surface = desktop_surface_at(desktop,
cursor->cursor->x, cursor->cursor->y, &sx, &sy, &view); cursor->cursor->x, cursor->cursor->y, &sx, &sy, &view);
struct wl_client *client = NULL; struct wl_client *client = NULL;
if (surface) { if (surface) {
client = wl_resource_get_client(surface->resource); client = wl_resource_get_client(surface->resource);
} }
if (surface && !roots_seat_allow_input(cursor->seat, surface->resource)) {
if (surface && !roots_seat_allow_input(seat, surface->resource)) {
return; return;
} }
@ -145,7 +147,7 @@ static void roots_passthrough_cursor(struct roots_cursor *cursor,
if (surface) { if (surface) {
focus_changed = (seat->seat->pointer_state.focused_surface != surface); focus_changed = (seat->seat->pointer_state.focused_surface != surface);
wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy); wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy);
if (!focus_changed) { if (!focus_changed && time > 0) {
wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy); wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy);
} }
} else { } else {
@ -158,6 +160,10 @@ static void roots_passthrough_cursor(struct roots_cursor *cursor,
} }
} }
void roots_cursor_update_focus(struct roots_cursor *cursor) {
roots_passthrough_cursor(cursor, -1);
}
void roots_cursor_update_position(struct roots_cursor *cursor, void roots_cursor_update_position(struct roots_cursor *cursor,
uint32_t time) { uint32_t time) {
struct roots_seat *seat = cursor->seat; struct roots_seat *seat = cursor->seat;

4
rootston/seat.c
View File

@ -1186,6 +1186,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
wlr_seat_keyboard_notify_enter(seat->seat, view->wlr_surface, wlr_seat_keyboard_notify_enter(seat->seat, view->wlr_surface,
NULL, 0, NULL); NULL, 0, NULL);
} }
roots_cursor_update_focus(seat->cursor);
} }
/** /**
@ -1220,6 +1222,8 @@ void roots_seat_set_focus_layer(struct roots_seat *seat,
wlr_seat_keyboard_notify_enter(seat->seat, layer->surface, wlr_seat_keyboard_notify_enter(seat->seat, layer->surface,
NULL, 0, NULL); NULL, 0, NULL);
} }
roots_cursor_update_focus(seat->cursor);
} }
void roots_seat_set_exclusive_client(struct roots_seat *seat, void roots_seat_set_exclusive_client(struct roots_seat *seat,