aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortaiyu <taiyu.len@gmail.com>2015-08-21 10:28:49 -0700
committertaiyu <taiyu.len@gmail.com>2015-08-21 10:28:49 -0700
commit5a67628ad91d42d737acea659ed2782ec344933e (patch)
treef11e9d3032fd59060b9044bd2a7ed0009655bbf2 /include
parent1a1ac64662a603fdeb7025bed3822e24f9158076 (diff)
parentad72abb58f32673a942c9c607a300e8dba0e9f22 (diff)
downloadsway-5a67628ad91d42d737acea659ed2782ec344933e.tar.xz
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 {
struct pointer_tiling {
bool resize;
swayc_t *init_view;
- struct wlc_origin *lock_pos;
+ struct wlc_origin lock_pos;
} tiling;
struct pointer_lock {
+ // Lock movement for certain edges
bool left;
bool right;
bool top;
bool bottom;
+ // Lock movement in certain directions
+ bool temp_left;
+ bool temp_right;
+ bool temp_up;
+ bool temp_down;
} lock;
} pointer_state;