pgrondek/dwm
pgrondek/dwm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: pgrondek:7ba333192a848030e1caf6abbd972c4336d9b425
Branches Tags
pgrondek:master
..
compare: pgrondek:03d28aa9639b1f2378b8182f1b95e26dd6301b7b
Branches Tags
pgrondek:master

No commits in common. "7ba333192a848030e1caf6abbd972c4336d9b425" and "03d28aa9639b1f2378b8182f1b95e26dd6301b7b" have entirely different histories.
7ba333192a ... 03d28aa963

3 changed files with 3 additions and 37 deletions
Show Stats Expand all files Collapse all files

2
config.def.h
View File

@ -46,7 +46,6 @@ static const Layout layouts[] = {
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */ { "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
{ "|||", col },
}; };
/* key definitions */ /* key definitions */
@ -82,7 +81,6 @@ static Key keys[] = {
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_c, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_space, setlayout, {0} }, { MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY, XK_0, view, {.ui = ~0 } },

11
config.h
View File

@ -32,8 +32,7 @@ static const Rule rules[] = {
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating monitor */
{ "Virt-viewer", NULL, NULL, 1 << 8, 0, -1 }, { "Virt-viewer", NULL, NULL, 1 << 8, 0, -1 },
{ "Firefox", "Toolkit", "Picture-in-Picture", (1 << 9) - 1 , 0, -1 }
}; };
/* layout(s) */ /* layout(s) */
@ -44,8 +43,7 @@ static const int resizehints = 1; /* 1 means respect size hints in tiled resi
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "|||", col }, { "><>", NULL }, /* no layout function means floating behavior */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
}; };
@ -94,10 +92,7 @@ static Key keys[] = {
{ MODKEY, XK_F1, spawn, SHCMD("firefox") }, { MODKEY, XK_F1, spawn, SHCMD("firefox") },
{ MODKEY, XK_F2, spawn, SHCMD("nautilus") }, { MODKEY, XK_F2, spawn, SHCMD("nautilus") },
{ MODKEY, XK_F3, spawn, SHCMD("gedit") }, { MODKEY, XK_F3, spawn, SHCMD("gedit") },
{ MODKEY, XK_F4, spawn, SHCMD("idea") },
{ MODKEY, XK_F5, spawn, SHCMD("idea") },
{ MODKEY, XK_F6, spawn, SHCMD("clion") },
{ MODKEY, XK_F7, spawn, SHCMD("pycharm") },
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)

27
dwm.c
View File

@ -180,7 +180,6 @@ static void checkotherwm(void);
static void cleanup(void); static void cleanup(void);
static void cleanupmon(Monitor *mon); static void cleanupmon(Monitor *mon);
static void clientmessage(XEvent *e); static void clientmessage(XEvent *e);
static void col(Monitor *);
static void configure(Client *c); static void configure(Client *c);
static void configurenotify(XEvent *e); static void configurenotify(XEvent *e);
static void configurerequest(XEvent *e); static void configurerequest(XEvent *e);
@ -1922,32 +1921,6 @@ tile(Monitor *m)
} }
} }
void
col(Monitor *m) {
unsigned int i, n, h, w, x, y,mw;
Client *c;
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
if(n > m->nmaster)
mw = m->nmaster ? m->ww * m->mfact : 0;
else
mw = m->ww;
for(i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
if(i < m->nmaster) {
w = (mw - x) / (MIN(n, m->nmaster)-i);
resize(c, x + m->wx, m->wy, w - (2*c->bw), m->wh - (2*c->bw), False);
x += WIDTH(c);
}
else {
h = (m->wh - y) / (n - i);
resize(c, x + m->wx, m->wy + y, m->ww - x - (2*c->bw), h - (2*c->bw), False);
y += HEIGHT(c);
}
}
}
void void
togglebar(const Arg *arg) togglebar(const Arg *arg)
{ {