mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-19 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store last button and use it when views request to move or resize

Browse source
This commit is contained in:
Ryan Dwyer 2018-07-21 11:23:48 +10:00
parent 6767d8a593
commit 9df660ee31
5 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/input/cursor.c
View file

@ -429,7 +429,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
// Deny moving or resizing a fullscreen view
if (cont->type == C_VIEW && cont->sway_view->is_fullscreen) {
wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
seat_pointer_notify_button(seat, time_msec, button, state);
return;
}
@ -442,7 +442,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
// Check for beginning move
if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED &&
(mod_pressed || over_title)) {
seat_begin_move(seat, cont);
seat_begin_move(seat, cont, BTN_LEFT);
return;
}
@ -456,7 +456,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
}
// Send event to surface
wlr_seat_pointer_notify_button(seat->wlr_seat, time_msec, button, state);
seat_pointer_notify_button(seat, time_msec, button, state);
}
void dispatch_cursor_button(struct sway_cursor *cursor,
@ -480,8 +480,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
if (layer->current.keyboard_interactive) {
seat_set_focus_layer(cursor->seat, layer);
}
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
time_msec, button, state);
seat_pointer_notify_button(cursor->seat, time_msec, button, state);
} else if (cont && container_is_floating(cont)) {
dispatch_cursor_button_floating(cursor, time_msec, button, state,
surface, sx, sy, cont);
@ -501,15 +500,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
if (new_ws != old_ws) {
seat_set_focus(cursor->seat, cont);
}
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
time_msec, button, state);
seat_pointer_notify_button(cursor->seat, time_msec, button, state);
} else if (cont) {
seat_set_focus(cursor->seat, cont);
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
time_msec, button, state);
seat_pointer_notify_button(cursor->seat, time_msec, button, state);
} else {
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat,
time_msec, button, state);
seat_pointer_notify_button(cursor->seat, time_msec, button, state);
}
transaction_commit_dirty();

12
sway/input/seat.c
View file

@ -901,14 +901,15 @@ struct seat_config *seat_get_config(struct sway_seat *seat) {
return NULL;
}
void seat_begin_move(struct sway_seat *seat, struct sway_container *con) {
void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
uint32_t button) {
if (!seat->cursor) {
wlr_log(WLR_DEBUG, "Ignoring move request due to no cursor device");
return;
}
seat->operation = OP_MOVE;
seat->op_container = con;
seat->op_button = BTN_LEFT;
seat->op_button = button;
}
void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
@ -951,3 +952,10 @@ void seat_end_mouse_operation(struct sway_seat *seat) {
seat->operation = OP_NONE;
seat->op_container = NULL;
}
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
uint32_t button, enum wlr_button_state state) {
seat->last_button = button;
seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
time_msec, button, state);
}