osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 14:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: osama:64162db4b90df6edf6b536e5ecfcaa426bd28877
Branches Tags
osama:master
..
compare: osama:43631961b8c8099b3dc42027031a358fc5d87b8d
Branches Tags
osama:master

3 Commits
64162db4b9 ... 43631961b8

Author SHA1 Message Date
Minty Cube
43631961b8
Merge branch 'bakkeby:master' into master 2024-07-15 08:51:29 +05:00
bakkeby
f4258747be Swallow + noborder compatibility changes ref. #430 2024-07-14 14:27:11 +02:00
bakkeby
3bc91e187c Removing debug print statement 2024-07-14 14:26:45 +02:00
2 changed files with 29 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
dwm.c
View File

@ -4102,7 +4102,6 @@ spawn(const Arg *arg)
if (arg->v == dmenucmd) if (arg->v == dmenucmd)
dmenumon[0] = '0' + selmon->num; dmenumon[0] = '0' + selmon->num;
#endif // NODMENU_PATCH #endif // NODMENU_PATCH
fprintf(stderr, "spawn running cmd:\n");
#if RIODRAW_PATCH #if RIODRAW_PATCH
if ((pid = fork()) == 0) if ((pid = fork()) == 0)

29
patch/swallow.c
View File

@ -13,6 +13,9 @@ swallow(Client *p, Client *c)
{ {
Client *s; Client *s;
XWindowChanges wc; XWindowChanges wc;
#if NOBORDER_PATCH
int border_padding = 0;
#endif // NOBORDER_PATCH
if (c->noswallow > 0 || c->isterminal) if (c->noswallow > 0 || c->isterminal)
return 0; return 0;
@ -46,9 +49,21 @@ swallow(Client *p, Client *c)
setfloatinghint(s); setfloatinghint(s);
#endif // BAR_EWMHTAGS_PATCH #endif // BAR_EWMHTAGS_PATCH
#if NOBORDER_PATCH
wc.border_width = p->bw;
if (noborder(p)) {
wc.border_width = 0;
border_padding = p->bw * 2;
}
XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w + border_padding, s->h + border_padding);
#else
wc.border_width = p->bw; wc.border_width = p->bw;
XConfigureWindow(dpy, p->win, CWBorderWidth, &wc); XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w, s->h); XMoveResizeWindow(dpy, p->win, s->x, s->y, s->w, s->h);
#endif // NOBORDER_PATCH
#if !BAR_FLEXWINTITLE_PATCH #if !BAR_FLEXWINTITLE_PATCH
XSetWindowBorder(dpy, p->win, scheme[SchemeNorm][ColBorder].pixel); XSetWindowBorder(dpy, p->win, scheme[SchemeNorm][ColBorder].pixel);
#endif // BAR_FLEXWINTITLE_PATCH #endif // BAR_FLEXWINTITLE_PATCH
@ -65,6 +80,9 @@ unswallow(Client *c)
{ {
XWindowChanges wc; XWindowChanges wc;
c->win = c->swallowing->win; c->win = c->swallowing->win;
#if NOBORDER_PATCH
int border_padding = 0;
#endif // NOBORDER_PATCH
free(c->swallowing); free(c->swallowing);
c->swallowing = NULL; c->swallowing = NULL;
@ -80,9 +98,20 @@ unswallow(Client *c)
arrange(c->mon); arrange(c->mon);
XMapWindow(dpy, c->win); XMapWindow(dpy, c->win);
#if NOBORDER_PATCH
wc.border_width = c->bw;
if (noborder(c)) {
wc.border_width = 0;
border_padding = c->bw * 2;
}
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w + border_padding, c->h + border_padding);
#else
wc.border_width = c->bw; wc.border_width = c->bw;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
#endif // NOBORDER_PATCH
#if !BAR_FLEXWINTITLE_PATCH #if !BAR_FLEXWINTITLE_PATCH
XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
#endif // BAR_FLEXWINTITLE_PATCH #endif // BAR_FLEXWINTITLE_PATCH