rasmusq/mangowc-rasmusq
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: support keyboard shortcut inhibitor

Browse Source
This commit is contained in:
DreamMaoMao
2025-11-12 12:55:06 +08:00
parent ecab47fe92
commit 9d6436cf42
3 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/parse_config.h
View File

@@ -69,6 +69,7 @@ typedef struct {
int isunglobal;
int isglobal;
int isoverlay;
int allow_shortcuts_inhibit;
int ignore_maximize;
int ignore_minimize;
int isnosizehint;
@@ -336,6 +337,7 @@ typedef struct {
int syncobj_enable;
int adaptive_sync;
int allow_tearing;
int allow_shortcuts_inhibit;
struct xkb_rule_names xkb_rules;
@@ -1271,6 +1273,8 @@ void parse_option(Config *config, char *key, char *value) {
config->adaptive_sync = atoi(value);
} else if (strcmp(key, "allow_tearing") == 0) {
config->allow_tearing = atoi(value);
} else if (strcmp(key, "allow_shortcuts_inhibit") == 0) {
config->allow_shortcuts_inhibit = atoi(value);
} else if (strcmp(key, "no_border_when_single") == 0) {
config->no_border_when_single = atoi(value);
} else if (strcmp(key, "no_radius_when_single") == 0) {
@@ -1708,6 +1712,7 @@ void parse_option(Config *config, char *key, char *value) {
rule->isunglobal = -1;
rule->isglobal = -1;
rule->isoverlay = -1;
rule->allow_shortcuts_inhibit = -1;
rule->ignore_maximize = -1;
rule->ignore_minimize = -1;
rule->isnosizehint = -1;
@@ -1806,6 +1811,8 @@ void parse_option(Config *config, char *key, char *value) {
rule->focused_opacity = atof(val);
} else if (strcmp(key, "isoverlay") == 0) {
rule->isoverlay = atoi(val);
} else if (strcmp(key, "allow_shortcuts_inhibit") == 0) {
rule->allow_shortcuts_inhibit = atoi(val);
} else if (strcmp(key, "ignore_maximize") == 0) {
rule->ignore_maximize = atoi(val);
} else if (strcmp(key, "ignore_minimize") == 0) {
@@ -2696,6 +2703,7 @@ void override_config(void) {
syncobj_enable = CLAMP_INT(config.syncobj_enable, 0, 1);
adaptive_sync = CLAMP_INT(config.adaptive_sync, 0, 1);
allow_tearing = CLAMP_INT(config.allow_tearing, 0, 2);
allow_shortcuts_inhibit = CLAMP_INT(config.allow_shortcuts_inhibit, 0, 1);
axis_bind_apply_timeout =
CLAMP_INT(config.axis_bind_apply_timeout, 0, 1000);
focus_on_activate = CLAMP_INT(config.focus_on_activate, 0, 1);
@@ -2873,6 +2881,7 @@ void set_value_default() {
config.syncobj_enable = syncobj_enable;
config.adaptive_sync = adaptive_sync;
config.allow_tearing = allow_tearing;
config.allow_shortcuts_inhibit = allow_shortcuts_inhibit;
config.no_border_when_single = no_border_when_single;
config.no_radius_when_single = no_radius_when_single;
config.snap_distance = snap_distance;

1
src/config/preset.h
View File

@@ -105,6 +105,7 @@ int syncobj_enable = 0;
int adaptive_sync = 0;
double drag_refresh_interval = 30.0;
int allow_tearing = TEARING_DISABLED;
int allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
/* keyboard */

88
src/mango.c
View File

@@ -48,6 +48,7 @@
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_keyboard_group.h>
#include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
#include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_linux_drm_syncobj_v1.h>
@@ -172,6 +173,11 @@ enum tearing_mode {
TEARING_FULLSCREEN_ONLY,
};
enum seat_config_shortcuts_inhibit {
SHORTCUTS_INHIBIT_DISABLE,
SHORTCUTS_INHIBIT_ENABLE,
};
typedef struct Pertag Pertag;
typedef struct Monitor Monitor;
typedef struct Client Client;
@@ -369,6 +375,7 @@ struct Client {
bool isleftstack;
int tearing_hint;
int force_tearing;
int allow_shortcuts_inhibit;
};
typedef struct {
@@ -398,6 +405,12 @@ typedef struct {
struct wl_listener destroy;
} KeyboardGroup;
typedef struct {
struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor;
struct wl_listener destroy;
struct wl_list link;
} KeyboardShortcutsInhibitor;
typedef struct {
/* Must keep these three elements in this order */
unsigned int type; /* LayerShell */
@@ -622,7 +635,9 @@ static void urgent(struct wl_listener *listener, void *data);
static void view(const Arg *arg, bool want_animation);
static void handlesig(int signo);
static void
handle_keyboard_shortcuts_inhibit_new_inhibitor(struct wl_listener *listener,
void *data);
static void virtualkeyboard(struct wl_listener *listener, void *data);
static void virtualpointer(struct wl_listener *listener, void *data);
static void warp_cursor(const Client *c);
@@ -750,6 +765,8 @@ static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr;
static struct wlr_layer_shell_v1 *layer_shell;
static struct wlr_output_manager_v1 *output_mgr;
static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
static struct wlr_keyboard_shortcuts_inhibit_manager_v1
*keyboard_shortcuts_inhibit;
static struct wlr_virtual_pointer_manager_v1 *virtual_pointer_mgr;
static struct wlr_output_power_manager_v1 *power_mgr;
static struct wlr_pointer_gestures_v1 *pointer_gestures;
@@ -773,6 +790,7 @@ static struct wlr_pointer_constraint_v1 *active_constraint;
static struct wlr_seat *seat;
static KeyboardGroup *kb_group;
static struct wl_list inputdevices;
static struct wl_list keyboard_shortcut_inhibitors;
static unsigned int cursor_mode;
static Client *grabc;
static int grabcx, grabcy; /* client-relative */
@@ -859,6 +877,8 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
static struct wl_listener start_drag = {.notify = startdrag};
static struct wl_listener new_session_lock = {.notify = locksession};
static struct wl_listener drm_lease_request = {.notify = requestdrmlease};
static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = {
.notify = handle_keyboard_shortcuts_inhibit_new_inhibitor};
#ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data);
@@ -1150,6 +1170,7 @@ static void apply_rule_properties(Client *c, const ConfigWinRule *r) {
APPLY_INT_PROP(c, r, isnosizehint);
APPLY_INT_PROP(c, r, isunglobal);
APPLY_INT_PROP(c, r, noblur);
APPLY_INT_PROP(c, r, allow_shortcuts_inhibit);
APPLY_FLOAT_PROP(c, r, scroller_proportion);
APPLY_FLOAT_PROP(c, r, focused_opacity);
@@ -1977,6 +1998,7 @@ void cleanuplisteners(void) {
wl_list_remove(&start_drag.link);
wl_list_remove(&new_session_lock.link);
wl_list_remove(&tearing_new_object.link);
wl_list_remove(&keyboard_shortcuts_inhibit_new_inhibitor.link);
if (drm_lease_manager) {
wl_list_remove(&drm_lease_request.link);
}
@@ -3266,6 +3288,17 @@ int keyrepeat(void *data) {
return 0;
}
bool is_keyboard_shortcut_inhibitor(struct wlr_surface *surface) {
KeyboardShortcutsInhibitor *kbsinhibitor;
wl_list_for_each(kbsinhibitor, &keyboard_shortcut_inhibitors, link) {
if (kbsinhibitor->inhibitor->surface == surface) {
return true;
}
}
return false;
}
int // 17
keybinding(unsigned int state, bool locked, unsigned int mods, xkb_keysym_t sym,
unsigned int keycode) {
@@ -3284,6 +3317,10 @@ keybinding(unsigned int state, bool locked, unsigned int mods, xkb_keysym_t sym,
keycode == 62 || keycode == 108 || keycode == 105 || keycode == 134)
return false;
if (is_keyboard_shortcut_inhibitor(seat->keyboard_state.focused_surface)) {
return false;
}
for (ji = 0; ji < config.key_bindings_count; ji++) {
if (config.key_bindings_count < 1)
break;
@@ -3591,6 +3628,7 @@ void init_client_properties(Client *c) {
c->allow_csd = 0;
c->force_maximize = 0;
c->force_tearing = 0;
c->allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
}
void // old fix to 0.5
@@ -5003,6 +5041,7 @@ void setup(void) {
* to let us know when new input devices are available on the backend.
*/
wl_list_init(&inputdevices);
wl_list_init(&keyboard_shortcut_inhibitors);
wl_signal_add(&backend->events.new_input, &new_input_device);
virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,
@@ -5032,6 +5071,10 @@ void setup(void) {
kb_group = createkeyboardgroup();
wl_list_init(&kb_group->destroy.link);
keyboard_shortcuts_inhibit = wlr_keyboard_shortcuts_inhibit_v1_create(dpy);
wl_signal_add(&keyboard_shortcuts_inhibit->events.new_inhibitor,
&keyboard_shortcuts_inhibit_new_inhibitor);
output_mgr = wlr_output_manager_v1_create(dpy);
wl_signal_add(&output_mgr->events.apply, &output_mgr_apply);
wl_signal_add(&output_mgr->events.test, &output_mgr_test);
@@ -5559,6 +5602,49 @@ void view(const Arg *arg, bool want_animation) {
}
}
static void
handle_keyboard_shortcuts_inhibitor_destroy(struct wl_listener *listener,
void *data) {
KeyboardShortcutsInhibitor *inhibitor =
wl_container_of(listener, inhibitor, destroy);
wlr_log(WLR_DEBUG, "Removing keyboard shortcuts inhibitor");
wl_list_remove(&inhibitor->link);
wl_list_remove(&inhibitor->destroy.link);
free(inhibitor);
}
void handle_keyboard_shortcuts_inhibit_new_inhibitor(
struct wl_listener *listener, void *data) {
struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor = data;
if (allow_shortcuts_inhibit == SHORTCUTS_INHIBIT_DISABLE) {
return;
}
// per-view, seat-agnostic config via criteria
Client *c = get_client_from_surface(inhibitor->surface);
if (c && !c->allow_shortcuts_inhibit) {
return;
}
wlr_log(WLR_DEBUG, "Adding keyboard shortcuts inhibitor");
KeyboardShortcutsInhibitor *kbsinhibitor =
calloc(1, sizeof(KeyboardShortcutsInhibitor));
kbsinhibitor->inhibitor = inhibitor;
kbsinhibitor->destroy.notify = handle_keyboard_shortcuts_inhibitor_destroy;
wl_signal_add(&inhibitor->events.destroy, &kbsinhibitor->destroy);
wl_list_insert(&keyboard_shortcut_inhibitors, &kbsinhibitor->link);
wlr_keyboard_shortcuts_inhibitor_v1_activate(inhibitor);
}
void virtualkeyboard(struct wl_listener *listener, void *data) {
struct wlr_virtual_keyboard_v1 *kb = data;
/* virtual keyboards shouldn't share keyboard group */