Compare commits
3 Commits
18b76b790d
...
patched
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a07421c195 | ||
| 006706b5d0 | |||
|
|
0243a59c57 |
46
config.def.h
46
config.def.h
@@ -1,8 +1,8 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/* appearance */
|
||||
static const unsigned int borderpx = 2; /* border pixel of windows */
|
||||
static const unsigned int gappx = 2; /* gaps between windows */
|
||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||
static const unsigned int gappx = 6; /* gaps between windows */
|
||||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const int showbar = 1; /* 0 means no bar */
|
||||
static const int topbar = 1; /* 0 means bottom bar */
|
||||
@@ -13,18 +13,16 @@ static const char col_gray2[] = "#444444";
|
||||
static const char col_gray3[] = "#bbbbbb";
|
||||
static const char col_gray4[] = "#eeeeee";
|
||||
static const char col_cyan[] = "#005577";
|
||||
static const char col_border_focus_light[] = "#df8c20"; // hsl(34 75% 50%)
|
||||
static const char col_border_focus_dark[] = "#b25e34"; // hsl(20 55% 45%)
|
||||
static const char *colorsdark[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||
[SchemeSel] = { col_gray4, col_cyan, col_border_focus_dark },
|
||||
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||
[SchemeHid] = { col_cyan, col_gray1, col_cyan },
|
||||
};
|
||||
static const char *colorslight[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { col_gray1, col_gray3, col_gray2 },
|
||||
[SchemeSel] = { col_cyan, col_gray4, col_border_focus_light },
|
||||
[SchemeSel] = { col_cyan, col_gray4, col_cyan },
|
||||
[SchemeHid] = { col_cyan, col_gray1, col_cyan },
|
||||
};
|
||||
|
||||
@@ -55,7 +53,7 @@ static const Layout layouts[] = {
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
#define MODKEY Mod4Mask
|
||||
#define MODKEY Mod1Mask
|
||||
#define TAGKEYS(KEY,TAG) \
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
@@ -70,14 +68,16 @@ static char dmenumon[2] = "0"; /* component of dmenu{dark,light}, manipulated in
|
||||
static const char *dmenudark[] = { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
static const char *dmenulight[] = { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray3, "-nf", col_gray1, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
static const char *termcmd[] = { "st", NULL };
|
||||
static const char *lockcmd[] = { "slock", NULL };
|
||||
static const char *suspendcmd[] = { "systemctl", "suspend", NULL };
|
||||
static const char *themecmd[] = { "lupan-set-theme", "toggle", NULL };
|
||||
#include "shift-tools.c"
|
||||
|
||||
#include "exitdwm.c"
|
||||
static const Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XK_p, spawndmenu, {0} },
|
||||
{ MODKEY, XK_o, shiftviewclients, { .i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_o, shiftview, { .i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_i, shiftview, { .i = -1 } },
|
||||
{ MODKEY, XK_i, shiftviewclients, { .i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstackvis, {.i = +1 } },
|
||||
@@ -87,9 +87,14 @@ static const Key keys[] = {
|
||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
||||
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||
{ MODKEY|ShiftMask, XK_h, shiftboth, { .i = -1 } },
|
||||
{ MODKEY|ControlMask, XK_h, shiftswaptags, { .i = -1 } },
|
||||
{ MODKEY|ControlMask, XK_l, shiftswaptags, { .i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_l, shiftboth, { .i = +1 } },
|
||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||
{ MODKEY, XK_Return, zoom, {0} },
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
{ MODKEY, XK_g, goback, {0} },
|
||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||
@@ -114,22 +119,17 @@ static const Key keys[] = {
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
{ ControlMask, XK_1, focusbynum, {.i = 0} },
|
||||
{ ControlMask, XK_2, focusbynum, {.i = 1} },
|
||||
{ ControlMask, XK_3, focusbynum, {.i = 2} },
|
||||
{ ControlMask, XK_4, focusbynum, {.i = 3} },
|
||||
{ ControlMask, XK_5, focusbynum, {.i = 4} },
|
||||
{ ControlMask, XK_6, focusbynum, {.i = 5} },
|
||||
{ ControlMask, XK_7, focusbynum, {.i = 6} },
|
||||
{ ControlMask, XK_8, focusbynum, {.i = 7} },
|
||||
{ ControlMask, XK_9, focusbynum, {.i = 8} },
|
||||
{ MODKEY|ShiftMask, XK_j, focusbynum, {.i = 0} },
|
||||
{ MODKEY|ShiftMask, XK_k, focusbynum, {.i = 1} },
|
||||
{ MODKEY|ShiftMask, XK_l, focusbynum, {.i = 2} },
|
||||
{ MODKEY|ShiftMask, XK_colon, focusbynum, {.i = 3} },
|
||||
{ MODKEY|ShiftMask, XK_f, focusbynum, {.i = 4} },
|
||||
{ MODKEY|ShiftMask, XK_d, focusbynum, {.i = 5} },
|
||||
{ MODKEY|ShiftMask, XK_s, focusbynum, {.i = 6} },
|
||||
{ MODKEY|ShiftMask, XK_a, focusbynum, {.i = 7} },
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
|
||||
{ MODKEY|ShiftMask, XK_e, exitdwm, {0} },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_s, spawn, {.v = suspendcmd } },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_l, spawn, {.v = lockcmd } },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_t, spawn, {.v = themecmd } },
|
||||
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
|
||||
32
dwm.c
32
dwm.c
@@ -180,6 +180,7 @@ static Atom getatomprop(Client *c, Atom prop);
|
||||
static int getrootptr(int *x, int *y);
|
||||
static long getstate(Window w);
|
||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||
static void goback(const Arg *arg);
|
||||
static void grabbuttons(Client *c, int focused);
|
||||
static void grabkeys(void);
|
||||
static void hide(const Arg *arg);
|
||||
@@ -287,7 +288,7 @@ static Cur *cursor[CurLast];
|
||||
static Clr **scheme, **schemedark, **schemelight;
|
||||
static Display *dpy;
|
||||
static Drw *drw;
|
||||
static Monitor *mons, *selmon;
|
||||
static Monitor *mons, *selmon, *prevmon;
|
||||
static Window root, wmcheckwin;
|
||||
static const char **dmenucmd;
|
||||
static int colormodechanged;
|
||||
@@ -452,6 +453,7 @@ buttonpress(XEvent *e)
|
||||
/* focus monitor if necessary */
|
||||
if ((m = wintomon(ev->window)) && m != selmon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
@@ -840,6 +842,7 @@ enternotify(XEvent *e)
|
||||
m = c ? c->mon : wintomon(ev->window);
|
||||
if (m != selmon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
} else if (!c || c == selmon->sel)
|
||||
return;
|
||||
@@ -872,8 +875,10 @@ focus(Client *c)
|
||||
}
|
||||
}
|
||||
if (c) {
|
||||
if (c->mon != selmon)
|
||||
if (c->mon != selmon) {
|
||||
prevmon = selmon;
|
||||
selmon = c->mon;
|
||||
}
|
||||
if (c->isurgent)
|
||||
seturgent(c, 0);
|
||||
detachstack(c);
|
||||
@@ -909,6 +914,7 @@ focusmon(const Arg *arg)
|
||||
if ((m = dirtomon(arg->i)) == selmon)
|
||||
return;
|
||||
unfocus(selmon->sel, 0);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
warp(selmon->sel);
|
||||
@@ -1031,6 +1037,22 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size)
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
goback(const Arg *arg)
|
||||
{
|
||||
if (prevmon == NULL) {
|
||||
Arg a = {0};
|
||||
view(&a);
|
||||
} else if (prevmon != selmon) {
|
||||
unfocus(selmon->sel, 0);
|
||||
Monitor *p = selmon;
|
||||
selmon = prevmon;
|
||||
focus(NULL);
|
||||
prevmon = p;
|
||||
warp(selmon->sel);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
grabbuttons(Client *c, int focused)
|
||||
{
|
||||
@@ -1291,6 +1313,8 @@ motionnotify(XEvent *e)
|
||||
return;
|
||||
if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
if (m != selmon)
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
@@ -1352,6 +1376,7 @@ movemouse(const Arg *arg)
|
||||
XUngrabPointer(dpy, CurrentTime);
|
||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||
sendmon(c, m);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
@@ -1543,6 +1568,7 @@ resizemouse(const Arg *arg)
|
||||
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||
sendmon(c, m);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
@@ -2081,6 +2107,7 @@ toggleview(const Arg *arg)
|
||||
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
|
||||
|
||||
if (newtagset) {
|
||||
prevmon = NULL;
|
||||
selmon->tagset[selmon->seltags] = newtagset;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
@@ -2409,6 +2436,7 @@ view(const Arg *arg)
|
||||
{
|
||||
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
||||
return;
|
||||
prevmon = NULL;
|
||||
selmon->seltags ^= 1; /* toggle sel tagset */
|
||||
if (arg->ui & TAGMASK)
|
||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
||||
|
||||
135
shift-tools.c
Normal file
135
shift-tools.c
Normal file
@@ -0,0 +1,135 @@
|
||||
/* Sends a window to the next/prev tag */
|
||||
void
|
||||
shifttag(const Arg *arg)
|
||||
{
|
||||
Arg shifted;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
|
||||
else /* right circular shift */
|
||||
shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i));
|
||||
tag(&shifted);
|
||||
}
|
||||
/* Sends a window to the next/prev tag that has a client, else it moves it to the next/prev one. */
|
||||
void
|
||||
shifttagclients(const Arg *arg)
|
||||
{
|
||||
|
||||
Arg shifted;
|
||||
Client *c;
|
||||
unsigned int tagmask = 0;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
for (c = selmon->clients; c; c = c->next)
|
||||
if (!(c->tags))
|
||||
tagmask = tagmask | c->tags;
|
||||
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
do {
|
||||
shifted.ui = (shifted.ui << arg->i)
|
||||
| (shifted.ui >> (LENGTH(tags) - arg->i));
|
||||
} while (tagmask && !(shifted.ui & tagmask));
|
||||
else /* right circular shift */
|
||||
do {
|
||||
shifted.ui = (shifted.ui >> (- arg->i)
|
||||
| shifted.ui << (LENGTH(tags) + arg->i));
|
||||
} while (tagmask && !(shifted.ui & tagmask));
|
||||
tag(&shifted);
|
||||
}
|
||||
/* Navigate to the next/prev tag */
|
||||
void
|
||||
shiftview(const Arg *arg)
|
||||
{
|
||||
Arg shifted;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
shifted.ui = (shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i));
|
||||
else /* right circular shift */
|
||||
shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i));
|
||||
view(&shifted);
|
||||
}
|
||||
/* Navigate to the next/prev tag that has a client, else moves it to the next/prev tag */
|
||||
void
|
||||
shiftviewclients(const Arg *arg)
|
||||
{
|
||||
Arg shifted;
|
||||
Client *c;
|
||||
unsigned int tagmask = 0;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
for (c = selmon->clients; c; c = c->next)
|
||||
if (!(c->tags))
|
||||
tagmask = tagmask | c->tags;
|
||||
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
do {
|
||||
shifted.ui = (shifted.ui << arg->i)
|
||||
| (shifted.ui >> (LENGTH(tags) - arg->i));
|
||||
} while (tagmask && !(shifted.ui & tagmask));
|
||||
else /* right circular shift */
|
||||
do {
|
||||
shifted.ui = (shifted.ui >> (- arg->i)
|
||||
| shifted.ui << (LENGTH(tags) + arg->i));
|
||||
} while (tagmask && !(shifted.ui & tagmask));
|
||||
view(&shifted);
|
||||
}
|
||||
/* move the current active window to the next/prev tag and view it. More like following the window */
|
||||
void
|
||||
shiftboth(const Arg *arg)
|
||||
{
|
||||
Arg shifted;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
|
||||
else /* right circular shift */
|
||||
shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i)));
|
||||
tag(&shifted);
|
||||
view(&shifted);
|
||||
}
|
||||
//helper function for shiftswaptags.
|
||||
//see: https://github.com/moizifty/DWM-Build/blob/65379c62640788881486401a0d8c79333751b02f/config.h#L48
|
||||
void
|
||||
swaptags(const Arg *arg)
|
||||
{
|
||||
Client *c;
|
||||
unsigned int newtag = arg->ui & TAGMASK;
|
||||
unsigned int curtag = selmon->tagset[selmon->seltags];
|
||||
|
||||
if (newtag == curtag || !curtag || (curtag & (curtag-1)))
|
||||
return;
|
||||
|
||||
for (c = selmon->clients; c != NULL; c = c->next) {
|
||||
if ((c->tags & newtag) || (c->tags & curtag))
|
||||
c->tags ^= curtag ^ newtag;
|
||||
|
||||
if (!c->tags)
|
||||
c->tags = newtag;
|
||||
}
|
||||
|
||||
//move to the swaped tag
|
||||
//selmon->tagset[selmon->seltags] = newtag;
|
||||
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
/* swaps "tags" (all the clients) with the next/prev tag. */
|
||||
void
|
||||
shiftswaptags(const Arg *arg)
|
||||
{
|
||||
Arg shifted;
|
||||
shifted.ui = selmon->tagset[selmon->seltags];
|
||||
|
||||
if (arg->i > 0) /* left circular shift */
|
||||
shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
|
||||
else /* right circular shift */
|
||||
shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i)));
|
||||
swaptags(&shifted);
|
||||
// uncomment if you also want to "go" (view) the tag where the the clients are going
|
||||
//view(&shifted);
|
||||
}
|
||||
Reference in New Issue
Block a user