mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2406 from RyanDwyer/fix-focus-crashes

Browse source 
Fix focus related crashes
This commit is contained in:
Drew DeVault 2018-08-02 08:07:40 -04:00 committed by GitHub
parent e2eaf7b9b5 9339026a31
commit eec25ce60e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/input/seat.c
View file

@ -775,8 +775,12 @@ void seat_set_focus_warp(struct sway_seat *seat,
} }
} }
if (container->type == C_VIEW) { if (container) {
ipc_event_window(container, "focus"); if (container->type == C_VIEW) {
ipc_event_window(container, "focus");
} else if (container->type == C_WORKSPACE) {
ipc_event_workspace(NULL, container, "focus");
}
} }
seat->has_focus = (container != NULL); seat->has_focus = (container != NULL);

5
sway/tree/view.c
View file

@ -496,7 +496,7 @@ static struct sway_container *select_workspace(struct sway_view *view) {
} }
// Use the focused workspace // Use the focused workspace
ws = seat_get_focus(seat); ws = seat_get_focus_inactive(seat, &root_container);
if (ws->type != C_WORKSPACE) { if (ws->type != C_WORKSPACE) {
ws = container_parent(ws, C_WORKSPACE); ws = container_parent(ws, C_WORKSPACE);
} }
@ -505,7 +505,8 @@ static struct sway_container *select_workspace(struct sway_view *view) {
static bool should_focus(struct sway_view *view) { static bool should_focus(struct sway_view *view) {
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *prev_focus = seat_get_focus(seat); struct sway_container *prev_focus =
seat_get_focus_inactive(seat, &root_container);
struct sway_container *prev_ws = prev_focus->type == C_WORKSPACE ? struct sway_container *prev_ws = prev_focus->type == C_WORKSPACE ?
prev_focus : container_parent(prev_focus, C_WORKSPACE); prev_focus : container_parent(prev_focus, C_WORKSPACE);
struct sway_container *map_ws = container_parent(view->swayc, C_WORKSPACE); struct sway_container *map_ws = container_parent(view->swayc, C_WORKSPACE);