mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-15 06:59:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wlroots' into split-containers2

Browse source
This commit is contained in:
Tony Crisci 2018-04-04 00:20:44 -04:00
commit 741e3959e3
14 changed files with 386 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

36
sway/input/seat.c
View file

@ -352,8 +352,11 @@ void seat_configure_xcursor(struct sway_seat *seat) {
void seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp) {
struct sway_container *last_focus = seat_get_focus(seat);
if (seat->focused_layer) {
return;
}
struct sway_container *last_focus = seat_get_focus(seat);
if (container && last_focus == container) {
return;
}
@ -419,6 +422,37 @@ void seat_set_focus(struct sway_seat *seat,
seat_set_focus_warp(seat, container, true);
}
void seat_set_focus_layer(struct sway_seat *seat,
struct wlr_layer_surface *layer) {
if (!layer) {
seat->focused_layer = NULL;
return;
}
if (seat->focused_layer == layer) {
return;
}
if (seat->has_focus) {
struct sway_container *focus = seat_get_focus(seat);
if (focus->type == C_VIEW) {
wlr_seat_keyboard_clear_focus(seat->wlr_seat);
view_set_activated(focus->sway_view, false);
}
}
if (layer->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
seat->focused_layer = layer;
}
struct wlr_keyboard *keyboard =
wlr_seat_get_keyboard(seat->wlr_seat);
if (keyboard) {
wlr_seat_keyboard_notify_enter(seat->wlr_seat,
layer->surface, keyboard->keycodes,
keyboard->num_keycodes, &keyboard->modifiers);
} else {
wlr_seat_keyboard_notify_enter(seat->wlr_seat,
layer->surface, NULL, 0, NULL);
}
}
struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
struct sway_container *container) {
return seat_get_focus_by_type(seat, container, C_TYPES);