diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-17 15:57:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 15:57:13 +0200 |
commit | 765c80e5f7c36df77e9475a662648a0d87b93606 (patch) | |
tree | 21f28277ff5109d9f8ec196a12fc74bbb5dfd994 /include | |
parent | Merge pull request #2862 from SpeedJack/fix-stringop-overflow (diff) | |
parent | view: rewarp cursor during view_unmap (diff) | |
download | sway-765c80e5f7c36df77e9475a662648a0d87b93606.tar.gz sway-765c80e5f7c36df77e9475a662648a0d87b93606.tar.zst sway-765c80e5f7c36df77e9475a662648a0d87b93606.zip |
Merge pull request #2820 from Emantor/fix-mouse-warping-container
Fix mouse warping container
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/cursor.h | 7 | ||||
-rw-r--r-- | include/sway/tree/view.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 4d47ab42..5556ea11 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -46,6 +46,11 @@ void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec, | |||
46 | uint32_t button, enum wlr_button_state state); | 46 | uint32_t button, enum wlr_button_state state); |
47 | 47 | ||
48 | void cursor_set_image(struct sway_cursor *cursor, const char *image, | 48 | void cursor_set_image(struct sway_cursor *cursor, const char *image, |
49 | struct wl_client *client); | 49 | struct wl_client *client); |
50 | 50 | ||
51 | void cursor_warp_to_container(struct sway_cursor *cursor, | ||
52 | struct sway_container *container); | ||
53 | |||
54 | void cursor_warp_to_workspace(struct sway_cursor *cursor, | ||
55 | struct sway_workspace *workspace); | ||
51 | #endif | 56 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 870ef2e0..dc1f0b02 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -329,7 +329,8 @@ void view_destroy(struct sway_view *view); | |||
329 | 329 | ||
330 | void view_begin_destroy(struct sway_view *view); | 330 | void view_begin_destroy(struct sway_view *view); |
331 | 331 | ||
332 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); | 332 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface, |
333 | bool fullscreen, bool decoration); | ||
333 | 334 | ||
334 | void view_unmap(struct sway_view *view); | 335 | void view_unmap(struct sway_view *view); |
335 | 336 | ||