aboutsummaryrefslogtreecommitdiff
path: root/url-mode.c
diff options
context:
space:
mode:
Diffstat (limited to 'url-mode.c')
-rw-r--r--url-mode.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/url-mode.c b/url-mode.c
index 791b4ce0..362ea3af 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -115,23 +115,36 @@ activate_url(struct seat *seat, struct terminal *term, const struct url *url)
void
urls_input(struct seat *seat, struct terminal *term, uint32_t key,
- xkb_keysym_t sym, xkb_mod_mask_t mods, uint32_t serial)
+ xkb_keysym_t sym, xkb_mod_mask_t mods, xkb_mod_mask_t consumed,
+ const xkb_keysym_t *raw_syms, size_t raw_count,
+ uint32_t serial)
{
/* Key bindings */
tll_foreach(seat->kbd.bindings.url, it) {
- if (it->item.mods != mods)
- continue;
+ const struct key_binding *bind = &it->item;
- /* Match symbol */
- if (it->item.sym == sym) {
- execute_binding(seat, term, it->item.action, serial);
+ /* Match translated symbol */
+ if (bind->sym == sym &&
+ bind->mods == (mods & ~consumed))
+ {
+ execute_binding(seat, term, bind->action, serial);
return;
}
+ if (bind->mods != mods)
+ continue;
+
+ for (size_t i = 0; i < raw_count; i++) {
+ if (bind->sym == raw_syms[i]) {
+ execute_binding(seat, term, bind->action, serial);
+ return;
+ }
+ }
+
/* Match raw key code */
- tll_foreach(it->item.key_codes, code) {
+ tll_foreach(bind->key_codes, code) {
if (code->item == key) {
- execute_binding(seat, term, it->item.action, serial);
+ execute_binding(seat, term, bind->action, serial);
return;
}
}
@@ -148,6 +161,9 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
return;
}
+ if (mods & ~consumed)
+ return;
+
wchar_t wc = xkb_state_key_get_utf32(seat->kbd.xkb_state, key);
/*