mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: do action/close menu in successive press & release

Browse source 
In OpenBox, when cursor button is pressed to open menu, a subsequent
cursor button release can perform actions or close the menu.
This commit makes labwc follow that behavior.

Fixes: #1750
This commit is contained in:
tokyo4j 2024-04-24 18:46:30 +09:00 • committed by Hiroaki Yamamoto
parent ca0299d259
commit 1d3ed45704
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/input/cursor.c
View file

@ -929,9 +929,6 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
return consumed_by_frame_context; return consumed_by_frame_context;
} }
/* Set in cursor_button_press(), used in cursor_button_release() */
static bool close_menu;
static void static void
cursor_button_press(struct seat *seat, uint32_t button, cursor_button_press(struct seat *seat, uint32_t button,
enum wlr_button_state button_state, uint32_t time_msec) enum wlr_button_state button_state, uint32_t time_msec)
@ -949,11 +946,6 @@ cursor_button_press(struct seat *seat, uint32_t button,
} }
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {
/*
* We close the menu on RELEASE to not leak a stray releases and
* to be consistent with Openbox
*/
close_menu = true;
return; return;
} }
@ -1019,15 +1011,12 @@ cursor_button_release(struct seat *seat, uint32_t button,
seat_reset_pressed(seat); seat_reset_pressed(seat);
if (server->input_mode == LAB_INPUT_STATE_MENU) { if (server->input_mode == LAB_INPUT_STATE_MENU) {
if (close_menu) { if (ctx.type == LAB_SSD_MENU) {
if (ctx.type == LAB_SSD_MENU) { menu_call_selected_actions(server);
menu_call_selected_actions(server); } else {
} else { menu_close_root(server);
menu_close_root(server); cursor_update_common(server, &ctx, time_msec,
cursor_update_common(server, &ctx, time_msec, /*cursor_has_moved*/ false);
/*cursor_has_moved*/ false);
}
close_menu = false;
} }
return; return;
} }