mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1836 from emersion/workspace-focus-update-cursor 

Update cursor when workspace focus changes
This commit is contained in:
Drew DeVault 2018-04-21 14:44:11 +02:00 committed by GitHub
parent 8e32c4a1fb 33ed279494
commit 7d43cedc95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sway/input/cursor.c
View File

@ -59,9 +59,8 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
// find the output the cursor is on
struct wlr_output_layout *output_layout =
root_container.sway_root->output_layout;
struct wlr_output *wlr_output =
wlr_output_layout_output_at(output_layout,
cursor->cursor->x, cursor->cursor->y);
struct wlr_output *wlr_output = wlr_output_layout_output_at(output_layout,
cursor->cursor->x, cursor->cursor->y);
if (wlr_output == NULL) {
return NULL;
}

6
sway/input/seat.c
View File

@ -564,6 +564,12 @@ void seat_set_focus_warp(struct sway_seat *seat,
view_set_activated(view, false);
}
if (last_workspace && last_workspace != new_workspace) {
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
cursor_send_pointer_motion(seat->cursor, now.tv_nsec / 1000);
}
seat->has_focus = (container != NULL);
update_debug_tree();