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

Address review feedback

Browse source
This commit is contained in:
Drew DeVault 2018-03-31 15:13:27 -04:00
parent b9d2983324
commit f2332dc75c
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/input/seat.h
View file

@ -56,6 +56,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat);
void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container);
void sway_seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp);
struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
/**

5
sway/input/cursor.c
View file

@ -120,9 +120,6 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
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,
uint32_t time) {
struct wlr_seat *seat = cursor->seat->wlr_seat;
@ -130,7 +127,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
double sx, sy;
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
if (c && config->focus_follows_mouse) {
_sway_seat_set_focus(cursor->seat, c, false);
sway_seat_set_focus_warp(cursor->seat, c, false);
}
// reset cursor if switching between clients

11
sway/input/seat.c
View file

@ -1,5 +1,6 @@
#define _XOPEN_SOURCE 700
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include "sway/tree/container.h"
#include "sway/input/seat.h"
@ -291,7 +292,7 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->cursor->y);
}
void _sway_seat_set_focus(struct sway_seat *seat,
void sway_seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp) {
struct sway_container *last_focus = sway_seat_get_focus(seat);
@ -351,14 +352,16 @@ void _sway_seat_set_focus(struct sway_seat *seat,
}
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;
// TODO: Change container coords to layout coords
double x = container->x + output->lx + container->width / 2.0;
double y = container->y + output->ly + container->height / 2.0;
if (!wlr_output_layout_contains_point(
root_container.sway_root->output_layout,
output, seat->cursor->cursor->x, seat->cursor->cursor->y)) {
wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
}
}
}
if (last_focus && last_focus->type == C_VIEW &&
!sway_input_manager_has_focus(seat->input, last_focus)) {
@ -371,7 +374,7 @@ void _sway_seat_set_focus(struct sway_seat *seat,
void sway_seat_set_focus(struct sway_seat *seat,
struct sway_container *container) {
_sway_seat_set_focus(seat, container, true);
sway_seat_set_focus_warp(seat, container, true);
}
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {