diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-16 09:12:48 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-18 09:18:32 +1000 |
| commit | b637b61a7a25219991280717d9bf8a463ed4d8a8 (patch) | |
| tree | b8b0d0d5e7a13f354ede4c19746f1ebd6042f8a3 /sway | |
| parent | a36625a482585e86d465df1eaa3669c1c4390a20 (diff) | |
Rename mousedown to down and make seat operation a named enum
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/input/cursor.c | 8 | ||||
| -rw-r--r-- | sway/input/seat.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index bd0030f0..5a2743e3 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -215,7 +215,7 @@ static enum wlr_edges find_resize_edge(struct sway_container *cont, return edge; } -static void handle_mousedown_motion(struct sway_seat *seat, +static void handle_down_motion(struct sway_seat *seat, struct sway_cursor *cursor, uint32_t time_msec) { struct sway_container *con = seat->op_container; if (seat_is_input_allowed(seat, con->sway_view->surface)) { @@ -409,8 +409,8 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, if (seat->operation != OP_NONE) { switch (seat->operation) { - case OP_MOUSEDOWN: - handle_mousedown_motion(seat, cursor, time_msec); + case OP_DOWN: + handle_down_motion(seat, cursor, time_msec); break; case OP_MOVE: handle_move_motion(seat, cursor); @@ -762,7 +762,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, if (surface && cont && state == WLR_BUTTON_PRESSED) { seat_set_focus(seat, cont); seat_pointer_notify_button(seat, time_msec, button, state); - seat_begin_mousedown(seat, cont, button, sx, sy); + seat_begin_down(seat, cont, button, sx, sy); return; } diff --git a/sway/input/seat.c b/sway/input/seat.c index 045bf91a..cc7c28d8 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -954,9 +954,9 @@ struct seat_config *seat_get_config(struct sway_seat *seat) { return NULL; } -void seat_begin_mousedown(struct sway_seat *seat, struct sway_container *con, +void seat_begin_down(struct sway_seat *seat, struct sway_container *con, uint32_t button, double sx, double sy) { - seat->operation = OP_MOUSEDOWN; + seat->operation = OP_DOWN; seat->op_container = con; seat->op_button = button; seat->op_ref_lx = seat->cursor->cursor->x; @@ -1018,7 +1018,7 @@ void seat_begin_resize_tiling(struct sway_seat *seat, } void seat_end_mouse_operation(struct sway_seat *seat) { - int operation = seat->operation; + enum sway_seat_operation operation = seat->operation; if (seat->operation == OP_MOVE) { // We "move" the container to its own location so it discovers its // output again. @@ -1027,7 +1027,7 @@ void seat_end_mouse_operation(struct sway_seat *seat) { } seat->operation = OP_NONE; seat->op_container = NULL; - if (operation == OP_MOUSEDOWN) { + if (operation == OP_DOWN) { // Set the cursor's previous coords to the x/y at the start of the // operation, so the container change will be detected if using // focus_follows_mouse and the cursor moved off the original container |