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

Store previous position in sway_cursor.

This commit is contained in:
Scott Leggett 2018-05-27 22:45:14 +10:00
parent 06098bef98
commit 4cd304e4ba
5 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sway/input/cursor.h
View File

@ -6,6 +6,7 @@
struct sway_cursor { struct sway_cursor {
struct sway_seat *seat; struct sway_seat *seat;
struct wlr_cursor *cursor; struct wlr_cursor *cursor;
struct cursor_position *previous;
struct wlr_xcursor_manager *xcursor_manager; struct wlr_xcursor_manager *xcursor_manager;
struct wl_client *image_client; struct wl_client *image_client;
@ -27,10 +28,14 @@ struct sway_cursor {
struct wl_listener request_set_cursor; struct wl_listener request_set_cursor;
}; };
struct cursor_position {
double x, y;
};
void sway_cursor_destroy(struct sway_cursor *cursor); void sway_cursor_destroy(struct sway_cursor *cursor);
struct sway_cursor *sway_cursor_create(struct sway_seat *seat); struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
void cursor_send_pointer_motion(struct sway_cursor *cursor, void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
double delta_x, double delta_y, uint32_t time_msec, bool allow_refocusing); bool allow_refocusing);
void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec, void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
uint32_t button, enum wlr_button_state state); uint32_t button, enum wlr_button_state state);

2
sway/commands/border.c
View File

@ -41,7 +41,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->cursor) { if (seat->cursor) {
cursor_send_pointer_motion(seat->cursor, 0, 0, 0, false); cursor_send_pointer_motion(seat->cursor, 0, false);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

4
sway/commands/seat/cursor.c
View File

@ -36,7 +36,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
int delta_x = strtol(argv[1], NULL, 10); int delta_x = strtol(argv[1], NULL, 10);
int delta_y = strtol(argv[2], NULL, 10); int delta_y = strtol(argv[2], NULL, 10);
wlr_cursor_move(cursor->cursor, NULL, delta_x, delta_y); wlr_cursor_move(cursor->cursor, NULL, delta_x, delta_y);
cursor_send_pointer_motion(cursor, 0, 0, 0, true); cursor_send_pointer_motion(cursor, 0, true);
} else if (strcasecmp(argv[0], "set") == 0) { } else if (strcasecmp(argv[0], "set") == 0) {
if (argc < 3) { if (argc < 3) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
@ -45,7 +45,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
float x = strtof(argv[1], NULL) / root_container.width; float x = strtof(argv[1], NULL) / root_container.width;
float y = strtof(argv[2], NULL) / root_container.height; float y = strtof(argv[2], NULL) / root_container.height;
wlr_cursor_warp_absolute(cursor->cursor, NULL, x, y); wlr_cursor_warp_absolute(cursor->cursor, NULL, x, y);
cursor_send_pointer_motion(cursor, 0, 0, 0, true); cursor_send_pointer_motion(cursor, 0, true);
} else { } else {
if (argc < 2) { if (argc < 2) {
return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);

84
sway/input/cursor.c
View File

@ -135,25 +135,23 @@ static struct sway_container *container_at_coords(
return output->swayc; return output->swayc;
} }
void cursor_send_pointer_motion(struct sway_cursor *cursor, void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
double delta_x, double delta_y, uint32_t time_msec, bool allow_refocusing) { bool allow_refocusing) {
struct sway_container *prev_c = NULL;
struct wlr_surface *surface = NULL;
double sx, sy;
if (delta_x != 0 || delta_y != 0) {
// Use the motion delta to find the container the pointer was previously
// over.
prev_c = container_at_coords(cursor->seat,
cursor->cursor->x - delta_x, cursor->cursor->y - delta_y,
&surface, &sx, &sy);
}
if (time_msec == 0) { if (time_msec == 0) {
time_msec = get_current_time_msec(); time_msec = get_current_time_msec();
} }
struct wlr_seat *seat = cursor->seat->wlr_seat; struct wlr_seat *seat = cursor->seat->wlr_seat;
struct wlr_surface *surface = NULL;
double sx, sy;
// Find the container the pointer was previously over
struct sway_container *prev_c = container_at_coords(cursor->seat,
cursor->previous->x, cursor->previous->y, &surface, &sx, &sy);
// Update the stored previous position
cursor->previous->x = cursor->cursor->x;
cursor->previous->y = cursor->cursor->y;
struct sway_container *c = container_at_coords(cursor->seat, struct sway_container *c = container_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (c && config->focus_follows_mouse && allow_refocusing) { if (c && config->focus_follows_mouse && allow_refocusing) {
@ -173,39 +171,38 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor,
} }
} else if (c->type == C_VIEW) { } else if (c->type == C_VIEW) {
bool do_mouse_focus = true; bool do_mouse_focus = true;
bool is_visible = view_is_visible(c->sway_view);
struct sway_container *p = c->parent; struct sway_container *p = c->parent;
// Don't switch focus unless we have moved from one container to another. // Don't switch focus unless we have moved from one container to another
if (c && prev_c && c == prev_c) { if (c && c == prev_c) {
do_mouse_focus = false; do_mouse_focus = false;
} }
// Skip check if we already know not to focus. // Don't switch focus on title mouseover for stacked and tabbed layouts
if (do_mouse_focus) { // If pointed container is in nested containers which are inside
// Don't switch focus on title mouseover for // tabbed/stacked layout we should skip them
// stacked and tabbed layouts if (do_mouse_focus && !is_visible) {
// If pointed container is in nested containers which are
// inside tabbed/stacked layout we should skip them
bool is_visible = view_is_visible(c->sway_view);
while (p) { while (p) {
if ((p->layout == L_TABBED || p->layout == L_STACKED) if ((p->layout == L_TABBED || p->layout == L_STACKED)) {
&& !is_visible) {
do_mouse_focus = false; do_mouse_focus = false;
break; break;
} }
p = p->parent; p = p->parent;
} }
} }
if (!do_mouse_focus) { if (do_mouse_focus) {
struct sway_container *next_focus = seat_get_focus_inactive(
cursor->seat, p);
if(next_focus && !sway_assert(next_focus->type == C_VIEW,
"focus inactive container is not a view")) {
return;
}
if (next_focus && view_is_visible(next_focus->sway_view)) {
seat_set_focus_warp(cursor->seat, next_focus, false);
}
} else {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} else {
struct sway_container *next_focus =
seat_get_focus_inactive(cursor->seat, &root_container);
if (next_focus) {
if (!sway_assert(next_focus->type == C_VIEW,
"focus inactive container is not a view")) {
return;
}
if (view_is_visible(next_focus->sway_view)) {
seat_set_focus_warp(cursor->seat, next_focus, false);
}
}
} }
} }
} }
@ -238,8 +235,7 @@ static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct wlr_event_pointer_motion *event = data; struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(cursor->cursor, event->device, wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y); event->delta_x, event->delta_y);
cursor_send_pointer_motion(cursor, event->delta_x, event->delta_y, cursor_send_pointer_motion(cursor, event->time_msec, true);
event->time_msec, true);
} }
static void handle_cursor_motion_absolute( static void handle_cursor_motion_absolute(
@ -249,7 +245,7 @@ static void handle_cursor_motion_absolute(
wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat); wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_motion_absolute *event = data; struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y); wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
cursor_send_pointer_motion(cursor, 0, 0, event->time_msec, true); cursor_send_pointer_motion(cursor, event->time_msec, true);
} }
void dispatch_cursor_button(struct sway_cursor *cursor, void dispatch_cursor_button(struct sway_cursor *cursor,
@ -419,7 +415,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
} }
wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y); wlr_cursor_warp_absolute(cursor->cursor, event->device, x, y);
cursor_send_pointer_motion(cursor, 0, 0, event->time_msec, true); cursor_send_pointer_motion(cursor, event->time_msec, true);
} }
static void handle_tool_tip(struct wl_listener *listener, void *data) { static void handle_tool_tip(struct wl_listener *listener, void *data) {
@ -496,8 +492,15 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
return NULL; return NULL;
} }
struct cursor_position *previous = calloc(1, sizeof(struct cursor_position));
if (!sway_assert(previous, "could not allocate sway cursor position")) {
free(cursor);
return NULL;
}
struct wlr_cursor *wlr_cursor = wlr_cursor_create(); struct wlr_cursor *wlr_cursor = wlr_cursor_create();
if (!sway_assert(wlr_cursor, "could not allocate wlr cursor")) { if (!sway_assert(wlr_cursor, "could not allocate wlr cursor")) {
free(previous);
free(cursor); free(cursor);
return NULL; return NULL;
} }
@ -548,6 +551,7 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
cursor->request_set_cursor.notify = handle_request_set_cursor; cursor->request_set_cursor.notify = handle_request_set_cursor;
cursor->cursor = wlr_cursor; cursor->cursor = wlr_cursor;
cursor->previous = previous;
return cursor; return cursor;
} }

4
sway/input/seat.c
View File

@ -602,7 +602,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
wlr_output, seat->cursor->cursor->x, wlr_output, seat->cursor->cursor->x,
seat->cursor->cursor->y)) { seat->cursor->cursor->y)) {
wlr_cursor_warp(seat->cursor->cursor, NULL, x, y); wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
cursor_send_pointer_motion(seat->cursor, 0, 0, 0, true); cursor_send_pointer_motion(seat->cursor, 0, true);
} }
} }
} }
@ -613,7 +613,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
} }
if (last_workspace && last_workspace != new_workspace) { if (last_workspace && last_workspace != new_workspace) {
cursor_send_pointer_motion(seat->cursor, 0, 0, 0, true); cursor_send_pointer_motion(seat->cursor, 0, true);
} }
seat->has_focus = (container != NULL); seat->has_focus = (container != NULL);