diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-03-29 23:19:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-29 23:19:14 -0400 |
commit | 6b7841b11ff4cd35f54d69dc92029855893e5ce0 (patch) | |
tree | 88c2de0d08e00b2a30cb20cdfadfa6e53f5c59b4 /sway/input/cursor.c | |
parent | Merge pull request #1652 from ascent12/glclear (diff) | |
parent | arrange windows (diff) | |
download | sway-6b7841b11ff4cd35f54d69dc92029855893e5ce0.tar.gz sway-6b7841b11ff4cd35f54d69dc92029855893e5ce0.tar.zst sway-6b7841b11ff4cd35f54d69dc92029855893e5ce0.zip |
Merge pull request #1647 from acrisci/refactor-tree
Refactor tree
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 8a0d1df5..d57ac3e3 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <wlr/types/wlr_cursor.h> | 7 | #include <wlr/types/wlr_cursor.h> |
8 | #include <wlr/types/wlr_xcursor_manager.h> | 8 | #include <wlr/types/wlr_xcursor_manager.h> |
9 | #include "sway/input/cursor.h" | 9 | #include "sway/input/cursor.h" |
10 | #include "sway/view.h" | 10 | #include "sway/tree/view.h" |
11 | #include "list.h" | 11 | #include "list.h" |
12 | #include "log.h" | 12 | #include "log.h" |
13 | 13 | ||
@@ -49,8 +49,8 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor, | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | swayc_t *swayc = | 52 | struct sway_container *swayc = |
53 | swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); | 53 | container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); |
54 | if (swayc) { | 54 | if (swayc) { |
55 | wlr_seat_pointer_notify_enter(seat, surface, sx, sy); | 55 | wlr_seat_pointer_notify_enter(seat, surface, sx, sy); |
56 | wlr_seat_pointer_notify_motion(seat, time, sx, sy); | 56 | wlr_seat_pointer_notify_motion(seat, time, sx, sy); |
@@ -87,8 +87,8 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) { | |||
87 | if (event->button == BTN_LEFT) { | 87 | if (event->button == BTN_LEFT) { |
88 | struct wlr_surface *surface = NULL; | 88 | struct wlr_surface *surface = NULL; |
89 | double sx, sy; | 89 | double sx, sy; |
90 | swayc_t *swayc = | 90 | struct sway_container *swayc = |
91 | swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); | 91 | container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy); |
92 | 92 | ||
93 | sway_seat_set_focus(cursor->seat, swayc); | 93 | sway_seat_set_focus(cursor->seat, swayc); |
94 | } | 94 | } |