mirror of
https://codeberg.org/dwl/dwl.git
synced 2026-06-24 16:12:41 +00:00
Compare commits
4 Commits
0.7
...
e23fec173a
| Author | SHA1 | Date | |
|---|---|---|---|
| e23fec173a | |||
| 6cff4367ae | |||
| 82e3bd95fc | |||
| 609d89642c |
@@ -294,7 +294,7 @@ static void gpureset(struct wl_listener *listener, void *data);
|
||||
static void handlesig(int signo);
|
||||
static void incnmaster(const Arg *arg);
|
||||
static void inputdevice(struct wl_listener *listener, void *data);
|
||||
static int keybinding(uint32_t mods, xkb_keysym_t sym);
|
||||
static int keybinding(uint32_t mods, xkb_keysym_t sym, bool run_func);
|
||||
static void keypress(struct wl_listener *listener, void *data);
|
||||
static void keypressmod(struct wl_listener *listener, void *data);
|
||||
static int keyrepeat(void *data);
|
||||
@@ -1556,7 +1556,7 @@ inputdevice(struct wl_listener *listener, void *data)
|
||||
}
|
||||
|
||||
int
|
||||
keybinding(uint32_t mods, xkb_keysym_t sym)
|
||||
keybinding(uint32_t mods, xkb_keysym_t sym, bool run_func)
|
||||
{
|
||||
/*
|
||||
* Here we handle compositor keybindings. This is when the compositor is
|
||||
@@ -1567,6 +1567,7 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
|
||||
for (k = keys; k < END(keys); k++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(k->mod)
|
||||
&& sym == k->keysym && k->func) {
|
||||
if (run_func)
|
||||
k->func(&k->arg);
|
||||
return 1;
|
||||
}
|
||||
@@ -1596,9 +1597,10 @@ keypress(struct wl_listener *listener, void *data)
|
||||
|
||||
/* On _press_ if there is no active screen locker,
|
||||
* attempt to process a compositor keybinding. */
|
||||
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
|
||||
if (!locked) {
|
||||
bool run_func = event->state == WL_KEYBOARD_KEY_STATE_PRESSED;
|
||||
for (i = 0; i < nsyms; i++)
|
||||
handled = keybinding(mods, syms[i]) || handled;
|
||||
handled = keybinding(mods, syms[i], run_func) || handled;
|
||||
}
|
||||
|
||||
if (handled && group->wlr_group->keyboard.repeat_info.delay > 0) {
|
||||
@@ -1646,7 +1648,7 @@ keyrepeat(void *data)
|
||||
1000 / group->wlr_group->keyboard.repeat_info.rate);
|
||||
|
||||
for (i = 0; i < group->nsyms; i++)
|
||||
keybinding(group->mods, group->keysyms[i]);
|
||||
keybinding(group->mods, group->keysyms[i], true);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user