aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar taiyu <taiyu.len@gmail.com>2015-08-21 10:28:49 -0700
committerLibravatar taiyu <taiyu.len@gmail.com>2015-08-21 10:28:49 -0700
commit5a67628ad91d42d737acea659ed2782ec344933e (patch)
treef11e9d3032fd59060b9044bd2a7ed0009655bbf2 /include
parentbugfixes, renames (diff)
parentRemoved ugly intializer for pointer_state (diff)
downloadsway-5a67628ad91d42d737acea659ed2782ec344933e.tar.gz
sway-5a67628ad91d42d737acea659ed2782ec344933e.tar.zst
sway-5a67628ad91d42d737acea659ed2782ec344933e.zip
Merge branch 'master' of https://github.com/SirCmpwn/sway
merge
Diffstat (limited to 'include')
-rw-r--r--include/input_state.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/input_state.h b/include/input_state.h
index 000996e0..04fde42d 100644
--- a/include/input_state.h
+++ b/include/input_state.h
@@ -37,13 +37,19 @@ extern struct pointer_state {
37 struct pointer_tiling { 37 struct pointer_tiling {
38 bool resize; 38 bool resize;
39 swayc_t *init_view; 39 swayc_t *init_view;
40 struct wlc_origin *lock_pos; 40 struct wlc_origin lock_pos;
41 } tiling; 41 } tiling;
42 struct pointer_lock { 42 struct pointer_lock {
43 // Lock movement for certain edges
43 bool left; 44 bool left;
44 bool right; 45 bool right;
45 bool top; 46 bool top;
46 bool bottom; 47 bool bottom;
48 // Lock movement in certain directions
49 bool temp_left;
50 bool temp_right;
51 bool temp_up;
52 bool temp_down;
47 } lock; 53 } lock;
48} pointer_state; 54} pointer_state;
49 55