diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-21 10:40:12 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-22 23:10:19 +1000 |
commit | 0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3 (patch) | |
tree | ab1b5be08daccc0e92ebff7497687b252fa5f5dc /sway/input/cursor.c | |
parent | Remove unnecessary includes (diff) | |
download | sway-0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3.tar.gz sway-0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3.tar.zst sway-0c87bff5d1ce686afdc25d37eee4bdd8f08abdd3.zip |
Replace static handle_end_operation with seat_end_mouse_operation
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 8b9208c6..ec83746e 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -427,21 +427,6 @@ static void handle_cursor_motion_absolute( | |||
427 | transaction_commit_dirty(); | 427 | transaction_commit_dirty(); |
428 | } | 428 | } |
429 | 429 | ||
430 | static void handle_end_operation(struct sway_seat *seat) { | ||
431 | if (seat->operation == OP_MOVE) { | ||
432 | // We "move" the container to its own location so it discovers its | ||
433 | // output again. | ||
434 | struct sway_container *con = seat->op_container; | ||
435 | container_floating_move_to(con, con->x, con->y); | ||
436 | seat->operation = OP_NONE; | ||
437 | seat->op_container = NULL; | ||
438 | } else { | ||
439 | // OP_RESIZE | ||
440 | seat->operation = OP_NONE; | ||
441 | seat->op_container = NULL; | ||
442 | } | ||
443 | } | ||
444 | |||
445 | static void dispatch_cursor_button_floating(struct sway_cursor *cursor, | 430 | static void dispatch_cursor_button_floating(struct sway_cursor *cursor, |
446 | uint32_t time_msec, uint32_t button, enum wlr_button_state state, | 431 | uint32_t time_msec, uint32_t button, enum wlr_button_state state, |
447 | struct wlr_surface *surface, double sx, double sy, | 432 | struct wlr_surface *surface, double sx, double sy, |
@@ -484,7 +469,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, | |||
484 | uint32_t time_msec, uint32_t button, enum wlr_button_state state) { | 469 | uint32_t time_msec, uint32_t button, enum wlr_button_state state) { |
485 | if (cursor->seat->operation != OP_NONE && | 470 | if (cursor->seat->operation != OP_NONE && |
486 | button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) { | 471 | button == cursor->seat->op_button && state == WLR_BUTTON_RELEASED) { |
487 | handle_end_operation(cursor->seat); | 472 | seat_end_mouse_operation(cursor->seat); |
488 | return; | 473 | return; |
489 | } | 474 | } |
490 | if (time_msec == 0) { | 475 | if (time_msec == 0) { |