mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor node_at_coords into node_at_cursor

Browse source
This commit is contained in:
madblobfish 2019-01-06 20:04:32 +01:00
parent f5190d1f79
commit 2a806e5157
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/sway/input/cursor.h
View file

@ -66,6 +66,10 @@ struct sway_node *node_at_coords(
void sway_cursor_destroy(struct sway_cursor *cursor);
struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
struct sway_node *node_at_cursor(struct sway_seat *seat,
struct sway_cursor *cursor, double *sx, double *sy);
/**
* "Rebase" a cursor on top of whatever view is underneath it.
*

17
sway/input/cursor.c
View file

@ -155,6 +155,13 @@ struct sway_node *node_at_coords(
return &ws->node;
}
struct sway_node *node_at_cursor(struct sway_seat *seat,
struct sway_cursor *cursor,
struct wlr_surface **surface, double *sx, double *sy) {
return node_at_coords(seat, cursor->cursor->x, cursor->cursor->y, surface,
sx, sy);
}
/**
* Determine if the edge of the given container is on the edge of the
* workspace/output.
@ -278,8 +285,8 @@ void cursor_rebase(struct sway_cursor *cursor) {
uint32_t time_msec = get_current_time_msec();
struct wlr_surface *surface = NULL;
double sx, sy;
cursor->previous.node = node_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
cursor->previous.node = node_at_cursor(cursor->seat, cursor,
&surface, &sx, &sy);
cursor_do_rebase(cursor, time_msec, cursor->previous.node, surface, sx, sy);
}
@ -595,8 +602,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
// Determine what's under the cursor
struct wlr_surface *surface = NULL;
double sx, sy;
struct sway_node *node = node_at_coords(seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
struct sway_node *node = node_at_cursor(seat, cursor, &surface, &sx, &sy);
struct sway_container *cont = node && node->type == N_CONTAINER ?
node->sway_container : NULL;
bool is_floating = cont && container_is_floating(cont);
@ -804,8 +810,7 @@ void dispatch_cursor_axis(struct sway_cursor *cursor,
// Determine what's under the cursor
struct wlr_surface *surface = NULL;
double sx, sy;
struct sway_node *node = node_at_coords(seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
struct sway_node *node = node_at_cursor(seat, cursor, &surface, &sx, &sy);
struct sway_container *cont = node && node->type == N_CONTAINER ?
node->sway_container : NULL;
enum wlr_edges edge = cont ? find_edge(cont, cursor) : WLR_EDGE_NONE;