Compare commits
11 Commits
wip
...
c013256eef
| Author | SHA1 | Date | |
|---|---|---|---|
| c013256eef | |||
|
|
431135ecd9 | ||
|
|
f2837055a1 | ||
|
|
5bcc02f2a7 | ||
| 9e3e644c21 | |||
| b6d063c786 | |||
| 272db9d233 | |||
| e93f93b98c | |||
| cc4d5e65d7 | |||
|
|
9b49e9ad18 | ||
|
|
cfe958510f |
2
LICENSE
2
LICENSE
@@ -1,6 +1,5 @@
|
||||
MIT/X Consortium License
|
||||
|
||||
© 2010-2026 Hiltjo Posthuma <hiltjo@codemadness.org>
|
||||
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
||||
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
||||
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||
@@ -12,6 +11,7 @@ MIT/X Consortium License
|
||||
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
||||
© 2008 Neale Pickett <neale dot woozle dot org>
|
||||
© 2009 Mate Nagy <mnagy at port70 dot net>
|
||||
© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
|
||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
||||
© 2011 Christoph Lohmann <20h@r-36.net>
|
||||
© 2015-2016 Quentin Rameau <quinq@fifth.space>
|
||||
|
||||
68
config.def.h
68
config.def.h
@@ -1,9 +1,8 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include "gaplessgrid.c"
|
||||
|
||||
/* 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 */
|
||||
@@ -14,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 },
|
||||
};
|
||||
|
||||
@@ -47,18 +44,16 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95]
|
||||
static const int nmaster = 1; /* number of clients in master area */
|
||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
||||
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
|
||||
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "HHH", gaplessgrid },
|
||||
};
|
||||
|
||||
/* 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,48 +65,30 @@ static const Layout layouts[] = {
|
||||
|
||||
/* commands */
|
||||
static char dmenumon[2] = "0"; /* component of dmenu{dark,light}, manipulated in spawndmenu() */
|
||||
static const char *dmenudark[] = { "dmenu_run", "-l", "10", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
static const char *dmenulight[] = { "dmenu_run", "-l", "10", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray3, "-nf", col_gray1, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||
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"
|
||||
#include "movestack.c"
|
||||
|
||||
static const Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XK_p, spawndmenu, {0} },
|
||||
{ MODKEY, XK_u, shiftview, { .i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_u, shifttag, { .i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_y, shifttag, { .i = -1 } },
|
||||
{ MODKEY, XK_y, shiftview, { .i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstackvis, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstackvis, {.i = -1 } },
|
||||
{ MODKEY|ControlMask, XK_j, focusstackhid, {.i = +1 } },
|
||||
{ MODKEY|ControlMask, XK_k, focusstackhid, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_j, focusstackhid, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, focusstackhid, {.i = -1 } },
|
||||
{ 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|ShiftMask, XK_j, movestack, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },
|
||||
{ MODKEY, XK_Return, zoom, {0} },
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
{ MODKEY, XK_w, goback, {0} },
|
||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY, XK_g, setlayout, {.v = &layouts[3]} },
|
||||
{ MODKEY, XK_space, setlayout, {0} },
|
||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
@@ -122,7 +99,7 @@ static const Key keys[] = {
|
||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||
{ MODKEY, XK_s, show, {0} },
|
||||
{ MODKEY|ShiftMask, XK_s, showall, {0} },
|
||||
{ MODKEY|ControlMask, XK_s, hide, {0} },
|
||||
{ MODKEY, XK_h, hide, {0} },
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
@@ -132,24 +109,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, XK_o, winview, {0} },
|
||||
{ MODKEY, XK_a, gridall, {} },
|
||||
{ MODKEY, XK_r, winviewmono, {} },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_s, spawn, {.v = suspendcmd } },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_l, spawn, {.v = lockcmd } },
|
||||
{ MODKEY|ControlMask|ShiftMask, XK_t, spawn, {.v = themecmd } },
|
||||
{ MODKEY|ShiftMask, XK_e, exitdwm, {0} },
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# dwm version
|
||||
VERSION = 6.7
|
||||
VERSION = 6.6
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
|
||||
29
drw.c
29
drw.c
@@ -178,7 +178,8 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
||||
die("error, cannot allocate color '%s'", clrname);
|
||||
}
|
||||
|
||||
/* Create color schemes. */
|
||||
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
||||
* returned color scheme when done using it. */
|
||||
Clr *
|
||||
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
{
|
||||
@@ -186,7 +187,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
Clr *ret;
|
||||
|
||||
/* need at least two colors for a scheme */
|
||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
|
||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < clrcount; i++)
|
||||
@@ -194,30 +195,6 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
drw_clr_free(Drw *drw, Clr *c)
|
||||
{
|
||||
if (!drw || !c)
|
||||
return;
|
||||
|
||||
/* c is typedef XftColor Clr */
|
||||
XftColorFree(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
||||
DefaultColormap(drw->dpy, drw->screen), c);
|
||||
}
|
||||
|
||||
void
|
||||
drw_scm_free(Drw *drw, Clr *scm, size_t clrcount)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (!drw || !scm)
|
||||
return;
|
||||
|
||||
for (i = 0; i < clrcount; i++)
|
||||
drw_clr_free(drw, &scm[i]);
|
||||
free(scm);
|
||||
}
|
||||
|
||||
void
|
||||
drw_setfontset(Drw *drw, Fnt *set)
|
||||
{
|
||||
|
||||
2
drw.h
2
drw.h
@@ -40,9 +40,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
|
||||
|
||||
/* Colorscheme abstraction */
|
||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
||||
void drw_clr_free(Drw *drw, Clr *c);
|
||||
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
||||
void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount);
|
||||
|
||||
/* Cursor abstraction */
|
||||
Cur *drw_cur_create(Drw *drw, int shape);
|
||||
|
||||
3
dwm.1
3
dwm.1
@@ -110,9 +110,6 @@ Increase master area size.
|
||||
.B Mod1\-h
|
||||
Decrease master area size.
|
||||
.TP
|
||||
.B Mod1\-o
|
||||
Select view of the window in focus. The list of tags to be displayed is matched to the window tag list.
|
||||
.TP
|
||||
.B Mod1\-Return
|
||||
Zooms/cycles focused window to/from master area (tiled layouts only).
|
||||
.TP
|
||||
|
||||
86
dwm.c
86
dwm.c
@@ -51,6 +51,7 @@
|
||||
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
|
||||
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
|
||||
#define HIDDEN(C) ((getstate(C->win) == IconicState))
|
||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
||||
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
|
||||
#define WIDTH(X) ((X)->w + 2 * (X)->bw + gappx)
|
||||
#define HEIGHT(X) ((X)->h + 2 * (X)->bw + gappx)
|
||||
@@ -179,7 +180,6 @@ 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);
|
||||
@@ -250,13 +250,10 @@ static void view(const Arg *arg);
|
||||
static void warp(const Client *c);
|
||||
static Client *wintoclient(Window w);
|
||||
static Monitor *wintomon(Window w);
|
||||
static void winview(const Arg* arg);
|
||||
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||
static void zoom(const Arg *arg);
|
||||
static void gridall(const Arg *arg);
|
||||
static void winviewmono(const Arg *arg);
|
||||
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
@@ -290,7 +287,7 @@ static Cur *cursor[CurLast];
|
||||
static Clr **scheme, **schemedark, **schemelight;
|
||||
static Display *dpy;
|
||||
static Drw *drw;
|
||||
static Monitor *mons, *selmon, *prevmon;
|
||||
static Monitor *mons, *selmon;
|
||||
static Window root, wmcheckwin;
|
||||
static const char **dmenucmd;
|
||||
static int colormodechanged;
|
||||
@@ -455,7 +452,6 @@ buttonpress(XEvent *e)
|
||||
/* focus monitor if necessary */
|
||||
if ((m = wintomon(ev->window)) && m != selmon) {
|
||||
unfocus(selmon->sel, 1);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
@@ -530,8 +526,8 @@ cleanup(void)
|
||||
for (i = 0; i < CurLast; i++)
|
||||
drw_cur_free(drw, cursor[i]);
|
||||
for (i = 0; i < LENGTH(colorsdark); i++) {
|
||||
drw_scm_free(drw, schemedark[i], 3);
|
||||
drw_scm_free(drw, schemelight[i], 3);
|
||||
free(schemedark[i]);
|
||||
free(schemelight[i]);
|
||||
}
|
||||
free(schemedark);
|
||||
free(schemelight);
|
||||
@@ -844,7 +840,6 @@ 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;
|
||||
@@ -877,10 +872,8 @@ focus(Client *c)
|
||||
}
|
||||
}
|
||||
if (c) {
|
||||
if (c->mon != selmon) {
|
||||
prevmon = selmon;
|
||||
if (c->mon != selmon)
|
||||
selmon = c->mon;
|
||||
}
|
||||
if (c->isurgent)
|
||||
seturgent(c, 0);
|
||||
detachstack(c);
|
||||
@@ -916,7 +909,6 @@ focusmon(const Arg *arg)
|
||||
if ((m = dirtomon(arg->i)) == selmon)
|
||||
return;
|
||||
unfocus(selmon->sel, 0);
|
||||
prevmon = selmon;
|
||||
selmon = m;
|
||||
focus(NULL);
|
||||
warp(selmon->sel);
|
||||
@@ -976,14 +968,13 @@ Atom
|
||||
getatomprop(Client *c, Atom prop)
|
||||
{
|
||||
int di;
|
||||
unsigned long nitems, dl;
|
||||
unsigned long dl;
|
||||
unsigned char *p = NULL;
|
||||
Atom da, atom = None;
|
||||
|
||||
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||
&da, &di, &nitems, &dl, &p) == Success && p) {
|
||||
if (nitems > 0)
|
||||
atom = *(Atom *)p;
|
||||
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||
atom = *(Atom *)p;
|
||||
XFree(p);
|
||||
}
|
||||
return atom;
|
||||
@@ -1040,22 +1031,6 @@ 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)
|
||||
{
|
||||
@@ -1316,8 +1291,6 @@ 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);
|
||||
}
|
||||
@@ -1354,7 +1327,7 @@ movemouse(const Arg *arg)
|
||||
handler[ev.type](&ev);
|
||||
break;
|
||||
case MotionNotify:
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / refreshrate))
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / 60))
|
||||
continue;
|
||||
lasttime = ev.xmotion.time;
|
||||
|
||||
@@ -1379,7 +1352,6 @@ 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);
|
||||
}
|
||||
@@ -1548,7 +1520,7 @@ resizemouse(const Arg *arg)
|
||||
handler[ev.type](&ev);
|
||||
break;
|
||||
case MotionNotify:
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / refreshrate))
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / 60))
|
||||
continue;
|
||||
lasttime = ev.xmotion.time;
|
||||
|
||||
@@ -1571,7 +1543,6 @@ 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);
|
||||
}
|
||||
@@ -2110,7 +2081,6 @@ 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);
|
||||
@@ -2439,7 +2409,6 @@ 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;
|
||||
@@ -2499,41 +2468,6 @@ wintomon(Window w)
|
||||
return selmon;
|
||||
}
|
||||
|
||||
/* Selects for the view of the focused window. The list of tags */
|
||||
/* to be displayed is matched to the focused window tag list. */
|
||||
void
|
||||
winview(const Arg* arg){
|
||||
Window win, win_r, win_p, *win_c;
|
||||
unsigned nc;
|
||||
int unused;
|
||||
Client* c;
|
||||
Arg a;
|
||||
|
||||
if (!XGetInputFocus(dpy, &win, &unused)) return;
|
||||
while(XQueryTree(dpy, win, &win_r, &win_p, &win_c, &nc)
|
||||
&& win_p != win_r) win = win_p;
|
||||
|
||||
if (!(c = wintoclient(win))) return;
|
||||
|
||||
a.ui = c->tags;
|
||||
view(&a);
|
||||
}
|
||||
|
||||
/* by desgua */
|
||||
void
|
||||
gridall(const Arg *arg)
|
||||
{
|
||||
setlayout(&(Arg){.v = &layouts[3]});
|
||||
view(&(Arg){.ui = ~0});
|
||||
}
|
||||
|
||||
void
|
||||
winviewmono(const Arg *arg)
|
||||
{
|
||||
winview(&(Arg){0});
|
||||
setlayout(&(Arg){.v = &layouts[2]});
|
||||
}
|
||||
|
||||
/* There's no way to check accesses to destroyed windows, thus those cases are
|
||||
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
|
||||
* default error handler, which may call exit. */
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
void
|
||||
gaplessgrid(Monitor *m) {
|
||||
unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
|
||||
Client *c;
|
||||
|
||||
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ;
|
||||
if(n == 0)
|
||||
return;
|
||||
|
||||
/* grid dimensions */
|
||||
for(cols = 0; cols <= n/2; cols++)
|
||||
if(cols*cols >= n)
|
||||
break;
|
||||
if(n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
||||
cols = 2;
|
||||
rows = n/cols;
|
||||
|
||||
/* window geometries */
|
||||
cw = cols ? m->ww / cols : m->ww;
|
||||
cn = 0; /* current column number */
|
||||
rn = 0; /* current row number */
|
||||
for(i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
|
||||
if(i/rows + 1 > cols - n%cols)
|
||||
rows = n/cols + 1;
|
||||
ch = rows ? m->wh / rows : m->wh;
|
||||
cx = m->wx + cn*cw;
|
||||
cy = m->wy + rn*ch;
|
||||
resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
|
||||
rn++;
|
||||
if(rn >= rows) {
|
||||
rn = 0;
|
||||
cn++;
|
||||
}
|
||||
}
|
||||
}
|
||||
48
movestack.c
48
movestack.c
@@ -1,48 +0,0 @@
|
||||
void
|
||||
movestack(const Arg *arg) {
|
||||
Client *c = NULL, *p = NULL, *pc = NULL, *i;
|
||||
|
||||
if(arg->i > 0) {
|
||||
/* find the client after selmon->sel */
|
||||
for(c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
|
||||
if(!c)
|
||||
for(c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
|
||||
|
||||
}
|
||||
else {
|
||||
/* find the client before selmon->sel */
|
||||
for(i = selmon->clients; i != selmon->sel; i = i->next)
|
||||
if(ISVISIBLE(i) && !i->isfloating)
|
||||
c = i;
|
||||
if(!c)
|
||||
for(; i; i = i->next)
|
||||
if(ISVISIBLE(i) && !i->isfloating)
|
||||
c = i;
|
||||
}
|
||||
/* find the client before selmon->sel and c */
|
||||
for(i = selmon->clients; i && (!p || !pc); i = i->next) {
|
||||
if(i->next == selmon->sel)
|
||||
p = i;
|
||||
if(i->next == c)
|
||||
pc = i;
|
||||
}
|
||||
|
||||
/* swap c and selmon->sel selmon->clients in the selmon->clients list */
|
||||
if(c && c != selmon->sel) {
|
||||
Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next;
|
||||
selmon->sel->next = c->next==selmon->sel?c:c->next;
|
||||
c->next = temp;
|
||||
|
||||
if(p && p != c)
|
||||
p->next = c;
|
||||
if(pc && pc != selmon->sel)
|
||||
pc->next = selmon->sel;
|
||||
|
||||
if(selmon->sel == selmon->clients)
|
||||
selmon->clients = c;
|
||||
else if(c == selmon->clients)
|
||||
selmon->clients = selmon->sel;
|
||||
|
||||
arrange(selmon);
|
||||
}
|
||||
}
|
||||
135
shift-tools.c
135
shift-tools.c
@@ -1,135 +0,0 @@
|
||||
/* 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