Move to dwm.c

This commit is contained in:
speedie 2023-09-07 20:29:10 +02:00 committed by GitHub
parent c8a27bfe62
commit 2fa0f98d22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 23 deletions

View file

@ -101,25 +101,14 @@ static const Layout layouts[] = {
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
/* replace the values with ones on col_color as an workaround */
static const char *dmenucmd[] = { "j4-dmenu-desktop", "--dmenu", "dmenu -fn 'Hack Nerd Font:size=14' -nb '#173f4f' -nf '#ffffff' -sb '#124f5f' -sf '#eeeeee' -g 6 -l 6 ", "--term", "st", NULL };
static const char *dmenualt[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_color1, "-nf", col_color3, "-sb", col_color5, "-sf", col_color4, "-g", "6", "-l", "6", NULL};
static const char *termcmd[] = { "st", NULL };
static const char *tabtermcmd[] = { "tabbed", "-r 2", "st", "-w", "''", NULL };
static const char *firefoxcmd[] = { "firefox", NULL };
static const char *thunarcmd[] = { "dolphin", NULL };
#include "shiftview.c"
static Key keys[] = {
/* modifier key function argument */
{ Mod4Mask, XK_s, spawn, {.v = dmenucmd } },
{ Mod4Mask|ShiftMask, XK_s, spawn, {.v = dmenualt } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY|ShiftMask, XK_t, spawn, {.v = tabtermcmd } },
{ MODKEY|ShiftMask, XK_i, spawn, {.v = firefoxcmd } },
{ Mod4Mask, XK_e, spawn, {.v = thunarcmd } },
{ Mod4Mask, XK_s, spawn, SHCMD("j4-dmenu-desktop --dmenu dmenu -fn 'Hack Nerd Font:size=14' -nb '#173f4f' -nf '#ffffff' -sb '#124f5f' -sf '#eeeeee' -g 6 -l 6 --term st") },
{ Mod4Mask|ShiftMask, XK_s, spawn, SHCMD("dmenu_run -fn 'Hack Nerd Font:size=14' -nb '#173f4f' -nf '#ffffff' -sb '#124f5f' -sf '#eeeeee' -g 6 -l 6") },
{ MODKEY|ShiftMask, XK_Return, spawn, SHCMD("st -e") },
{ MODKEY|ShiftMask, XK_t, spawn, SHCMD("tabbed -r 2 st -w ''") },
{ MODKEY|ShiftMask, XK_i, spawn, SHCMD("firefox") },
{ Mod4Mask, XK_e, spawn, SHCMD("dolphin") },
{ Mod4Mask, XK_Print, spawn, SHCMD("maim ~/Pictures/Screenshot_$(date +%s).png") },
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
{ MODKEY|ShiftMask, XK_n, togglefollow, {0} },

View file

@ -242,6 +242,7 @@ static void setmfact(const Arg *arg);
static void setup(void);
static void seturgent(Client *c, int urg);
static void show(const Arg *arg);
static void shiftview(const Arg *arg);
static void showwin(Client *c);
static void showhide(Client *c);
static void sigchld(int unused);
@ -1979,6 +1980,21 @@ show(const Arg *arg)
showwin(selmon->sel);
}
void
shiftview(const Arg *arg) {
Arg shifted;
if(arg->i > 0) // left circular shift
shifted.ui = (selmon->tagset[selmon->seltags] << arg->i)
| (selmon->tagset[selmon->seltags] >> (LENGTH(tags) - arg->i));
else // right circular shift
shifted.ui = selmon->tagset[selmon->seltags] >> (- arg->i)
| selmon->tagset[selmon->seltags] << (LENGTH(tags) + arg->i);
view(&shifted);
}
void
showwin(Client *c)
{