From 15739277f5fddcf74ad4824e4d667bced0deba41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20Kesim?= Date: Mon, 31 Jan 2022 17:07:46 +0100 Subject: [PATCH] stackpos applied --- config.def.h | 26 ++++++++++------ config.h | 26 ++++++++++------ dwm.c | 87 ++++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 102 insertions(+), 37 deletions(-) diff --git a/config.def.h b/config.def.h index 5a9fea8..77f12f0 100644 --- a/config.def.h +++ b/config.def.h @@ -26,7 +26,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1 com", "2 taler", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const Rule rules[] = { /* xprop(1): @@ -37,8 +37,8 @@ static const Rule rules[] = { { "Gimp", NULL, NULL, 0, 1, -1 }, { "Alacritty", NULL, "pamix", 0, 1, -1 }, { "Alacritty", NULL, "ncmpcpp", 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, - { "Google-chrome", NULL, NULL, 1 << 8, 0, -1 }, + // { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + // { "Google-chrome", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ @@ -55,8 +55,8 @@ static const Layout layouts[] = { { "[M]", monocle }, { "|M|", centeredmaster }, { ">M>", centeredfloatingmaster }, - { "[@]", spiral }, - { "[\\]", dwindle }, + { "[@]", spiral }, + { "[\\]", dwindle }, }; /* key definitions */ @@ -66,6 +66,14 @@ static const Layout layouts[] = { { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ + { MOD, XK_q, ACTION##stack, {.i = 0 } }, \ + { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ + { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ + { MOD, XK_x, ACTION##stack, {.i = -1 } }, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -92,8 +100,8 @@ static Key keys[] = { { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = -1 } }, - { MODKEY, XK_k, focusstack, {.i = +1 } }, + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) { MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, @@ -129,8 +137,8 @@ static Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, - /* see */ + { MODKEY|ShiftMask, XK_BackSpace, quit, {0} }, + /* see */ { 0, 0x1008FF02,spawn, {.v = brightup} }, { 0, 0x1008FF03,spawn, {.v = brightdown} }, { 0, 0x1008FF11,spawn, {.v = audiodown} }, diff --git a/config.h b/config.h index 5a9fea8..77f12f0 100644 --- a/config.h +++ b/config.h @@ -26,7 +26,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1 com", "2 taler", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const Rule rules[] = { /* xprop(1): @@ -37,8 +37,8 @@ static const Rule rules[] = { { "Gimp", NULL, NULL, 0, 1, -1 }, { "Alacritty", NULL, "pamix", 0, 1, -1 }, { "Alacritty", NULL, "ncmpcpp", 0, 1, -1 }, - { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, - { "Google-chrome", NULL, NULL, 1 << 8, 0, -1 }, + // { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + // { "Google-chrome", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ @@ -55,8 +55,8 @@ static const Layout layouts[] = { { "[M]", monocle }, { "|M|", centeredmaster }, { ">M>", centeredfloatingmaster }, - { "[@]", spiral }, - { "[\\]", dwindle }, + { "[@]", spiral }, + { "[\\]", dwindle }, }; /* key definitions */ @@ -66,6 +66,14 @@ static const Layout layouts[] = { { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ + { MOD, XK_q, ACTION##stack, {.i = 0 } }, \ + { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ + { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ + { MOD, XK_x, ACTION##stack, {.i = -1 } }, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } @@ -92,8 +100,8 @@ static Key keys[] = { { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = -1 } }, - { MODKEY, XK_k, focusstack, {.i = +1 } }, + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) { MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, @@ -129,8 +137,8 @@ static Key keys[] = { TAGKEYS( XK_7, 6) TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, - /* see */ + { MODKEY|ShiftMask, XK_BackSpace, quit, {0} }, + /* see */ { 0, 0x1008FF02,spawn, {.v = brightup} }, { 0, 0x1008FF03,spawn, {.v = brightdown} }, { 0, 0x1008FF11,spawn, {.v = audiodown} }, diff --git a/dwm.c b/dwm.c index fb1bca9..2621106 100644 --- a/dwm.c +++ b/dwm.c @@ -47,15 +47,21 @@ /* macros */ #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) +#define GETINC(X) ((X) - 2000) +#define INC(X) ((X) + 2000) #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy))) +#define ISINC(X) ((X) > 1000 && (X) < 3000) #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) +#define PREVSEL 3000 #define LENGTH(X) (sizeof X / sizeof X[0]) +#define MOD(N,M) ((N)%(M) < 0 ? (N)%(M) + (M) : (N)%(M)) #define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define WIDTH(X) ((X)->w + 2 * (X)->bw) #define HEIGHT(X) ((X)->h + 2 * (X)->bw) #define TAGMASK ((1 << LENGTH(tags)) - 1) #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) +#define TRUNC(X,A,B) (MAX((A), MIN((X), (B)))) #define SYSTEM_TRAY_REQUEST_DOCK 0 /* XEMBED messages */ @@ -210,6 +216,7 @@ static void movemouse(const Arg *arg); static Client *nexttiled(Client *c); static void pop(Client *); static void propertynotify(XEvent *e); +static void pushstack(const Arg *arg); static void quit(const Arg *arg); static Monitor *recttomon(int x, int y, int w, int h); static void removesystrayicon(Client *i); @@ -234,6 +241,7 @@ static void seturgent(Client *c, int urg); static void showhide(Client *c); static void sigchld(int unused); static void spawn(const Arg *arg); +static int stackpos(const Arg *arg); static Monitor *systraytomon(Monitor *m); static void tag(const Arg *arg); static void tagmon(const Arg *arg); @@ -941,27 +949,15 @@ focusmon(const Arg *arg) void focusstack(const Arg *arg) { - Client *c = NULL, *i; + int i = stackpos(arg); + Client *c, *p; - if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen)) + if(i < 0) return; - if (arg->i > 0) { - for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next); - if (!c) - for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next); - } else { - for (i = selmon->clients; i != selmon->sel; i = i->next) - if (ISVISIBLE(i)) - c = i; - if (!c) - for (; i; i = i->next) - if (ISVISIBLE(i)) - c = i; - } - if (c) { - focus(c); - restack(selmon); - } + for(p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c)); + i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next); + focus(c ? c : p); + restack(selmon); } Atom @@ -1391,6 +1387,29 @@ propertynotify(XEvent *e) } } +void +pushstack(const Arg *arg) { + int i = stackpos(arg); + Client *sel = selmon->sel, *c, *p; + + if(i < 0) + return; + else if(i == 0) { + detach(sel); + attach(sel); + } + else { + for(p = NULL, c = selmon->clients; c; p = c, c = c->next) + if(!(i -= (ISVISIBLE(c) && c != sel))) + break; + c = c ? c : p; + detach(sel); + sel->next = c->next; + c->next = sel; + } + arrange(selmon); +} + void quit(const Arg *arg) { @@ -1862,6 +1881,36 @@ spawn(const Arg *arg) } } +int +stackpos(const Arg *arg) { + int n, i; + Client *c, *l; + + if(!selmon->clients) + return -1; + + if(arg->i == PREVSEL) { + for(l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext); + if(!l) + return -1; + for(i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + return i; + } + else if(ISINC(arg->i)) { + if(!selmon->sel) + return -1; + for(i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + for(n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next); + return MOD(i + GETINC(arg->i), n); + } + else if(arg->i < 0) { + for(i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + return MAX(i + arg->i, 0); + } + else + return arg->i; +} + void tag(const Arg *arg) {