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

Added center patch, along with own modifications.

Browse Source 
Tiled layout now horizontally centers windows with iscentered rule, if
it is the only window.
This commit is contained in:
sheldonmlee 2021-10-22 03:59:38 +08:00
parent 396367b271
commit 483b8be753
3 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -26,9 +26,9 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
/* class instance title tags mask iscentered isfloating monitor */
{ "Gimp", NULL, NULL, 0, 0, 1, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 },
};
/* layout(s) */

17
config.h
View File

@ -45,14 +45,15 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 },
{ "Firefox", NULL, NULL, 1 << 1, 0, -1 },
{ "firefox", NULL, NULL, 1 << 1, 0, -1 },
{ "discord", NULL, NULL, 1 << 2, 0, -1 },
{ "Steam", NULL, NULL, 1 << 3, 0, -1 },
{ "Lutris", NULL, NULL, 1 << 3, 0, -1 },
{ "UE4Editor", NULL, NULL, 1 << 3, 0, -1 },
/* class instance title tags mask iscentered isfloating monitor */
{ "Gimp", NULL, NULL, 0, 0, 1, -1 },
{ "Alacritty", NULL, NULL, 0, 1, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 1, 0, 0, -1 },
{ "firefox", NULL, NULL, 1 << 1, 0, 0, -1 },
{ "discord", NULL, NULL, 1 << 2, 0, 0, -1 },
{ "Steam", NULL, NULL, 1 << 3, 0, 0, -1 },
{ "Lutris", NULL, NULL, 1 << 3, 0, 0, -1 },
{ "UE4Editor", NULL, NULL, 1 << 3, 0, 0, -1 },
};
/* layout(s) */

31
dwm.c
View File

@ -92,7 +92,7 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
int isfixed, iscentered, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
Client *next;
Client *snext;
Monitor *mon;
@ -137,6 +137,7 @@ typedef struct {
const char *instance;
const char *title;
unsigned int tags;
int iscentered;
int isfloating;
int monitor;
} Rule;
@ -293,6 +294,7 @@ applyrules(Client *c)
XClassHint ch = { NULL, NULL };
/* rule matching */
c->iscentered = 0;
c->isfloating = 0;
c->tags = 0;
XGetClassHint(dpy, c->win, &ch);
@ -305,6 +307,7 @@ applyrules(Client *c)
&& (!r->class || strstr(class, r->class))
&& (!r->instance || strstr(instance, r->instance)))
{
c->iscentered = r->iscentered;
c->isfloating = r->isfloating;
c->tags |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next);
@ -1088,6 +1091,10 @@ manage(Window w, XWindowAttributes *wa)
updatewindowtype(c);
updatesizehints(c);
updatewmhints(c);
if (c->iscentered) {
c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
}
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
grabbuttons(c, 0);
if (!c->isfloating)
@ -1718,6 +1725,17 @@ tile(Monitor *m)
if (n == 0)
return;
c = nexttiled(m->clients);
if (n == 1 && c && c->iscentered){
resize(c,
m->wx + m->ww*(1 - m->mfact)/2,
m->wy,
m->ww * m->mfact - 2 * m->sel->bw,
m->wh - 2 * m->sel->bw, 0
);
return;
}
if (n > m->nmaster)
mw = m->nmaster ? m->ww * m->mfact : 0;
else
@ -1734,6 +1752,13 @@ tile(Monitor *m)
if (ty + HEIGHT(c) < m->wh)
ty += HEIGHT(c);
}
if (n == 1 && m->sel->iscentered)
resize(m->sel,
(m->wx + m->ww*(1 - m->mfact)/2),
m->wy,
m->ww * m->mfact - 2 * m->sel->bw,
m->wh - 2 * m->sel->bw, 0
);
}
void
@ -2049,8 +2074,10 @@ updatewindowtype(Client *c)
if (state == netatom[NetWMFullscreen])
setfullscreen(c, 1);
if (wtype == netatom[NetWMWindowTypeDialog])
if (wtype == netatom[NetWMWindowTypeDialog]) {
c->iscentered = 1;
c->isfloating = 1;
}
}
void