aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-03-31 15:32:29 -0400
committerLibravatar GitHub <noreply@github.com>2018-03-31 15:32:29 -0400
commit122b96abed9955f78e3f157167d34312f5bb551d (patch)
treefdcb6ffc0520145a029118aec443eb2199981d77 /include
parentMerge pull request #1689 from emersion/destroy-output-segfaults (diff)
parentAddress review feedback (diff)
downloadsway-122b96abed9955f78e3f157167d34312f5bb551d.tar.gz
sway-122b96abed9955f78e3f157167d34312f5bb551d.tar.zst
sway-122b96abed9955f78e3f157167d34312f5bb551d.zip
Merge pull request #1684 from swaywm/follow-warp
Implement focus_follows_mouse, mouse_warping
Diffstat (limited to 'include')
-rw-r--r--include/sway/config.h1
-rw-r--r--include/sway/input/seat.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index ac1105b4..03b51948 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -304,7 +304,6 @@ struct sway_config {
304 bool reloading; 304 bool reloading;
305 bool reading; 305 bool reading;
306 bool auto_back_and_forth; 306 bool auto_back_and_forth;
307 bool seamless_mouse;
308 bool show_marks; 307 bool show_marks;
309 308
310 bool edge_gaps; 309 bool edge_gaps;
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 496bfd5d..31210a5a 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -56,6 +56,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat);
56 56
57void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container); 57void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container);
58 58
59void sway_seat_set_focus_warp(struct sway_seat *seat,
60 struct sway_container *container, bool warp);
61
59struct sway_container *sway_seat_get_focus(struct sway_seat *seat); 62struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
60 63
61/** 64/**