mirror of
https://github.com/labwc/labwc.git
synced 2026-04-14 08:21:58 -04:00
[wip] feature: Allow blocking wayland protocols
Missing: - [ ] docs (including it only applying to new windows after --reconfigure) - [ ] discuss config naming and format
This commit is contained in:
parent
cb4afadd01
commit
6adf19feda
3 changed files with 43 additions and 0 deletions
|
|
@ -31,6 +31,11 @@ struct window_switcher_field {
|
||||||
struct wl_list link; /* struct rcxml.window_switcher.fields */
|
struct wl_list link; /* struct rcxml.window_switcher.fields */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct blocked_protocol {
|
||||||
|
struct wl_list link; /* struct rcxml.blocked_protocols */
|
||||||
|
char *interface_name;
|
||||||
|
};
|
||||||
|
|
||||||
struct rcxml {
|
struct rcxml {
|
||||||
char *config_dir;
|
char *config_dir;
|
||||||
|
|
||||||
|
|
@ -94,6 +99,7 @@ struct rcxml {
|
||||||
} window_switcher;
|
} window_switcher;
|
||||||
|
|
||||||
struct wl_list window_rules; /* struct window_rule.link */
|
struct wl_list window_rules; /* struct window_rule.link */
|
||||||
|
struct wl_list blocked_protocols; /* struct blocked_protocol.link */
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct rcxml rc;
|
extern struct rcxml rc;
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ static bool in_mousebind;
|
||||||
static bool in_libinput_category;
|
static bool in_libinput_category;
|
||||||
static bool in_window_switcher_field;
|
static bool in_window_switcher_field;
|
||||||
static bool in_window_rules;
|
static bool in_window_rules;
|
||||||
|
static bool in_blocked_protocols;
|
||||||
|
|
||||||
static struct usable_area_override *current_usable_area_override;
|
static struct usable_area_override *current_usable_area_override;
|
||||||
static struct keybind *current_keybind;
|
static struct keybind *current_keybind;
|
||||||
|
|
@ -166,6 +167,16 @@ fill_window_rule(char *nodename, char *content)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
fill_blocked_protocols(char *nodename, char *content)
|
||||||
|
{
|
||||||
|
if (!strcasecmp(nodename, "name.interface.blockedProtocols")) {
|
||||||
|
struct blocked_protocol *proto = znew(*proto);
|
||||||
|
proto->interface_name = xstrdup(content);
|
||||||
|
wl_list_append(&rc.blocked_protocols, &proto->link);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
fill_window_switcher_field(char *nodename, char *content)
|
fill_window_switcher_field(char *nodename, char *content)
|
||||||
{
|
{
|
||||||
|
|
@ -536,6 +547,10 @@ entry(xmlNode *node, char *nodename, char *content)
|
||||||
fill_window_rule(nodename, content);
|
fill_window_rule(nodename, content);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (in_blocked_protocols) {
|
||||||
|
fill_blocked_protocols(nodename, content);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* handle nodes without content, e.g. <keyboard><default /> */
|
/* handle nodes without content, e.g. <keyboard><default /> */
|
||||||
if (!strcmp(nodename, "default.keyboard")) {
|
if (!strcmp(nodename, "default.keyboard")) {
|
||||||
|
|
@ -736,6 +751,12 @@ xml_tree_walk(xmlNode *node)
|
||||||
in_window_rules = false;
|
in_window_rules = false;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (!strcasecmp((char *)n->name, "blockedProtocols")) {
|
||||||
|
in_blocked_protocols = true;
|
||||||
|
traverse(n);
|
||||||
|
in_blocked_protocols = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
traverse(n);
|
traverse(n);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -776,6 +797,7 @@ rcxml_init(void)
|
||||||
wl_list_init(&rc.regions);
|
wl_list_init(&rc.regions);
|
||||||
wl_list_init(&rc.window_switcher.fields);
|
wl_list_init(&rc.window_switcher.fields);
|
||||||
wl_list_init(&rc.window_rules);
|
wl_list_init(&rc.window_rules);
|
||||||
|
wl_list_init(&rc.blocked_protocols);
|
||||||
}
|
}
|
||||||
has_run = true;
|
has_run = true;
|
||||||
|
|
||||||
|
|
@ -1318,6 +1340,13 @@ rcxml_finish(void)
|
||||||
rule_destroy(rule);
|
rule_destroy(rule);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct blocked_protocol *proto, *proto_tmp;
|
||||||
|
wl_list_for_each_safe(proto, proto_tmp, &rc.blocked_protocols, link) {
|
||||||
|
wl_list_remove(&proto->link);
|
||||||
|
zfree(proto->interface_name);
|
||||||
|
zfree(proto);
|
||||||
|
}
|
||||||
|
|
||||||
/* Reset state vars for starting fresh when Reload is triggered */
|
/* Reset state vars for starting fresh when Reload is triggered */
|
||||||
current_usable_area_override = NULL;
|
current_usable_area_override = NULL;
|
||||||
current_keybind = NULL;
|
current_keybind = NULL;
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,15 @@ server_global_filter(const struct wl_client *client, const struct wl_global *glo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
struct blocked_protocol *proto;
|
||||||
|
wl_list_for_each(proto, &rc.blocked_protocols, link) {
|
||||||
|
if (!strcmp(iface->name, proto->interface_name)) {
|
||||||
|
wlr_log(WLR_INFO, "blocking protocol %s", proto->interface_name);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wlr_log(WLR_DEBUG, "protocol not blocked: %s", iface->name);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue