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

Fix interaction between warping and following

Browse source
This commit is contained in:
Drew DeVault 2018-03-31 11:18:29 -04:00
parent 9b38ef950f
commit b9d2983324
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/input/cursor.c
View file

@ -120,6 +120,9 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
return NULL; return NULL;
} }
void _sway_seat_set_focus(struct sway_seat *seat,
struct sway_container *container, bool warp);
static void cursor_send_pointer_motion(struct sway_cursor *cursor, static void cursor_send_pointer_motion(struct sway_cursor *cursor,
uint32_t time) { uint32_t time) {
struct wlr_seat *seat = cursor->seat->wlr_seat; struct wlr_seat *seat = cursor->seat->wlr_seat;
@ -127,7 +130,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
double sx, sy; double sx, sy;
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
if (c && config->focus_follows_mouse) { if (c && config->focus_follows_mouse) {
sway_seat_set_focus(cursor->seat, c); _sway_seat_set_focus(cursor->seat, c, false);
} }
// reset cursor if switching between clients // reset cursor if switching between clients

13
sway/input/seat.c
View file

@ -291,8 +291,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->cursor->y); seat->cursor->cursor->y);
} }
void sway_seat_set_focus(struct sway_seat *seat, void _sway_seat_set_focus(struct sway_seat *seat,
struct sway_container *container) { struct sway_container *container, bool warp) {
struct sway_container *last_focus = sway_seat_get_focus(seat); struct sway_container *last_focus = sway_seat_get_focus(seat);
if (container && last_focus == container) { if (container && last_focus == container) {
@ -349,7 +349,9 @@ void sway_seat_set_focus(struct sway_seat *seat,
if (new_output && new_output->type != C_OUTPUT) { if (new_output && new_output->type != C_OUTPUT) {
new_output = container_parent(new_output, C_OUTPUT); new_output = container_parent(new_output, C_OUTPUT);
} }
if (new_output != last_output && config->mouse_warping) { if (new_output && last_output && new_output != last_output
&& config->mouse_warping && warp) {
wlr_log(L_DEBUG, "warpin the mouse baby");
struct wlr_output *output = new_output->sway_output->wlr_output; struct wlr_output *output = new_output->sway_output->wlr_output;
// TODO: Change container coords to layout coords // TODO: Change container coords to layout coords
double x = container->x + output->lx + container->width / 2.0; double x = container->x + output->lx + container->width / 2.0;
@ -367,6 +369,11 @@ void sway_seat_set_focus(struct sway_seat *seat,
seat->has_focus = (container != NULL); seat->has_focus = (container != NULL);
} }
void sway_seat_set_focus(struct sway_seat *seat,
struct sway_container *container) {
_sway_seat_set_focus(seat, container, true);
}
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) { struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {
struct sway_seat_container *current = NULL; struct sway_seat_container *current = NULL;
struct sway_container *parent = NULL; struct sway_container *parent = NULL;