diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-14 17:14:23 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-14 17:14:23 -0500 |
commit | cd161aa98532a29129547cf05b778a6dfe915821 (patch) | |
tree | 2df9dac8d8dd50246646cbe2cee3ca143c01f080 | |
parent | We wlc_point now (diff) | |
download | sway-cd161aa98532a29129547cf05b778a6dfe915821.tar.gz sway-cd161aa98532a29129547cf05b778a6dfe915821.tar.zst sway-cd161aa98532a29129547cf05b778a6dfe915821.zip |
We somewhat more wlc_point now
Apparently I missed some
cc @Cloudef
-rw-r--r-- | sway/handlers.c | 6 | ||||
-rw-r--r-- | sway/input_state.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 510b4261..cadfce5c 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -295,8 +295,8 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier | |||
295 | return EVENT_PASSTHROUGH; | 295 | return EVENT_PASSTHROUGH; |
296 | } | 296 | } |
297 | 297 | ||
298 | static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct wlc_origin *origin) { | 298 | static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct wlc_point *origin) { |
299 | struct wlc_origin new_origin = *origin; | 299 | struct wlc_point new_origin = *origin; |
300 | // Switch to adjacent output if touching output edge. | 300 | // Switch to adjacent output if touching output edge. |
301 | // | 301 | // |
302 | // Since this doesn't currently support moving windows between outputs we | 302 | // Since this doesn't currently support moving windows between outputs we |
@@ -338,7 +338,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
338 | 338 | ||
339 | 339 | ||
340 | static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers, | 340 | static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers, |
341 | uint32_t button, enum wlc_button_state state, const struct wlc_origin *origin) { | 341 | uint32_t button, enum wlc_button_state state, const struct wlc_point *origin) { |
342 | 342 | ||
343 | // Update view pointer is on | 343 | // Update view pointer is on |
344 | pointer_state.view = container_under_pointer(); | 344 | pointer_state.view = container_under_pointer(); |
diff --git a/sway/input_state.c b/sway/input_state.c index 9bd8ad4d..88506c92 100644 --- a/sway/input_state.c +++ b/sway/input_state.c | |||
@@ -162,9 +162,9 @@ static void reset_initial_sibling(void) { | |||
162 | pointer_state.mode = 0; | 162 | pointer_state.mode = 0; |
163 | } | 163 | } |
164 | 164 | ||
165 | void pointer_position_set(struct wlc_origin *new_origin, bool force_focus) { | 165 | void pointer_position_set(struct wlc_point *new_origin, bool force_focus) { |
166 | struct wlc_origin origin; | 166 | struct wlc_point origin; |
167 | wlc_pointer_get_origin(&origin); | 167 | wlc_pointer_get_position(&origin); |
168 | pointer_state.delta.x = new_origin->x - origin.x; | 168 | pointer_state.delta.x = new_origin->x - origin.x; |
169 | pointer_state.delta.y = new_origin->y - origin.y; | 169 | pointer_state.delta.y = new_origin->y - origin.y; |
170 | 170 | ||
@@ -182,11 +182,11 @@ void pointer_position_set(struct wlc_origin *new_origin, bool force_focus) { | |||
182 | } | 182 | } |
183 | } | 183 | } |
184 | 184 | ||
185 | wlc_pointer_set_origin(new_origin); | 185 | wlc_pointer_set_position(new_origin); |
186 | } | 186 | } |
187 | 187 | ||
188 | void center_pointer_on(swayc_t *view) { | 188 | void center_pointer_on(swayc_t *view) { |
189 | struct wlc_origin new_origin; | 189 | struct wlc_point new_origin; |
190 | new_origin.x = view->x + view->width/2; | 190 | new_origin.x = view->x + view->width/2; |
191 | new_origin.y = view->y + view->height/2; | 191 | new_origin.y = view->y + view->height/2; |
192 | pointer_position_set(&new_origin, true); | 192 | pointer_position_set(&new_origin, true); |
@@ -214,8 +214,8 @@ static void pointer_mode_set_right(void) { | |||
214 | int midway_x = initial.ptr->x + initial.ptr->width/2; | 214 | int midway_x = initial.ptr->x + initial.ptr->width/2; |
215 | int midway_y = initial.ptr->y + initial.ptr->height/2; | 215 | int midway_y = initial.ptr->y + initial.ptr->height/2; |
216 | 216 | ||
217 | struct wlc_origin origin; | 217 | struct wlc_point origin; |
218 | wlc_pointer_get_origin(&origin); | 218 | wlc_pointer_get_position(&origin); |
219 | lock.left = origin.x > midway_x; | 219 | lock.left = origin.x > midway_x; |
220 | lock.top = origin.y > midway_y; | 220 | lock.top = origin.y > midway_y; |
221 | 221 | ||
@@ -279,8 +279,8 @@ void pointer_mode_update(void) { | |||
279 | pointer_state.mode = 0; | 279 | pointer_state.mode = 0; |
280 | return; | 280 | return; |
281 | } | 281 | } |
282 | struct wlc_origin origin; | 282 | struct wlc_point origin; |
283 | wlc_pointer_get_origin(&origin); | 283 | wlc_pointer_get_position(&origin); |
284 | int dx = origin.x; | 284 | int dx = origin.x; |
285 | int dy = origin.y; | 285 | int dy = origin.y; |
286 | 286 | ||