diff options
| author | Joe <rbo@gmx.us> | 2025-03-02 00:03:03 +0100 |
|---|---|---|
| committer | Joe <rbo@gmx.us> | 2025-03-02 00:03:03 +0100 |
| commit | f8df8450d2308b82144c62dae5a2a8a929239466 (patch) | |
| tree | 647d03f4bebdd12f8f8b53e6eb99db93b3339301 | |
| parent | zoomswapped (diff) | |
| download | dwl-f8df8450d2308b82144c62dae5a2a8a929239466.tar.gz dwl-f8df8450d2308b82144c62dae5a2a8a929239466.tar.bz2 dwl-f8df8450d2308b82144c62dae5a2a8a929239466.tar.xz dwl-f8df8450d2308b82144c62dae5a2a8a929239466.tar.zst dwl-f8df8450d2308b82144c62dae5a2a8a929239466.zip | |
fix
| -rw-r--r-- | config.def.h | 21 | ||||
| -rw-r--r-- | dwl.c | 8 |
2 files changed, 18 insertions, 11 deletions
diff --git a/config.def.h b/config.def.h index 56310a4..74ce003 100644 --- a/config.def.h +++ b/config.def.h @@ -174,12 +174,13 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static const char *termcmd[] = { "alacritty", NULL }; -static const char *menucmd[] = { "wmenu-run", NULL }; +static const char *termcmd[] = { "alacritty", NULL }; +static const char *menucmd[] = { "wmenu-run", NULL }; +static const char *dmlog_cmd[] = { "dmlog", NULL }; static const char *dmpass_full_cmd[] = { "dmpass", "--full", NULL }; static const char *dmpass_cmd[] = { "dmpass", NULL }; static const char *dmotp_cmd[] = { "dmotp", NULL }; -static const char *browser_cmd[] = { "firefox", NULL }; +static const char *browser_cmd[] = { "firefox", NULL }; static const Key keys[] = { /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ @@ -193,6 +194,8 @@ static const Key keys[] = { { MODKEY, XKB_KEY_F4, togglescratch, {.v = spflip } }, { MODKEY, XKB_KEY_F5, togglescratch, {.v = spmpd } }, { MODKEY, XKB_KEY_F6, togglescratch, {.v = spnews } }, + { MODKEY|CTRL, XKB_KEY_F12, spawn, {.v = dmlog_cmd } }, + { MODKEY|CTRL, XKB_KEY_BackSpace, spawn, {.v = dmlog_cmd } }, { MODKEY|CTRL, XKB_KEY_p, spawn, {.v = dmpass_cmd } }, { MODKEY|CTRL|SHIFT, XKB_KEY_p, spawn, {.v = dmpass_full_cmd } }, { MODKEY|CTRL, XKB_KEY_o, spawn, {.v = dmotp_cmd } }, @@ -229,14 +232,10 @@ static const Key keys[] = { { MODKEY, XKB_KEY_bracketright, focusmon, {.i = WLR_DIRECTION_RIGHT} }, { MODKEY, XKB_KEY_h, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, XKB_KEY_l, focusmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|SHIFT, XKB_KEY_H, tagmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|SHIFT, XKB_KEY_L, tagmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|SHIFT, XKB_KEY_bracketleft, tagmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|SHIFT, XKB_KEY_bracketright, tagmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|SHIFT, XKB_KEY_H, focusmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|SHIFT, XKB_KEY_L, focusmon, {.i = WLR_DIRECTION_RIGHT} }, - { MODKEY|SHIFT, XKB_KEY_leftmiddlecurlybrace, focusmon, {.i = WLR_DIRECTION_LEFT} }, - { MODKEY|SHIFT, XKB_KEY_rightmiddlecurlybrace, focusmon, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|SHIFT, XKB_KEY_H, tagandfocusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|SHIFT, XKB_KEY_L, tagandfocusmon, {.i = WLR_DIRECTION_RIGHT} }, + { MODKEY|SHIFT, XKB_KEY_leftmiddlecurlybrace, tagandfocusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY|SHIFT, XKB_KEY_rightmiddlecurlybrace, tagandfocusmon, {.i = WLR_DIRECTION_RIGHT} }, TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), @@ -394,6 +394,7 @@ static void startdrag(struct wl_listener *listener, void *data); static int statusin(int fd, unsigned int mask, void *data); static void tag(const Arg *arg); static void tagmon(const Arg *arg); +static void tagandfocusmon(const Arg *arg); static void tile(Monitor *m); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); @@ -3196,6 +3197,13 @@ tagmon(const Arg *arg) } void +tagandfocusmon(const Arg *arg) +{ + tagmon(arg); + focusmon(arg); +} + +void tile(Monitor *m) { unsigned int mw, my, ty; |