Merge pull request #997 from dcz-purism/master

Ignore clicks on un-focuseable things.
This commit is contained in:
Drew DeVault 2018-05-24 10:30:15 -04:00 committed by GitHub
commit a0eb37e2ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -273,7 +273,9 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
} }
break; break;
case WLR_BUTTON_PRESSED: case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view); if (view) {
roots_seat_set_focus(seat, view);
}
if (surface && wlr_surface_is_layer_surface(surface)) { if (surface && wlr_surface_is_layer_surface(surface)) {
struct wlr_layer_surface *layer = struct wlr_layer_surface *layer =
wlr_layer_surface_from_wlr_surface(surface); wlr_layer_surface_from_wlr_surface(surface);

View File

@ -798,6 +798,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
if (view == NULL) { if (view == NULL) {
seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH; seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
wlr_seat_keyboard_clear_focus(seat->seat);
return; return;
} }