eeeck/dwm
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
gitea-runner[bot]
2026-03-22 12:23:05 +00:00
parent 02bd09ff29 44dbc6809d
commit f95e729c48
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.mk
+1 -1
View File
@@ -1,5 +1,5 @@
# dwm version # dwm version
VERSION = 6.7 VERSION = 6.8
# Customize below to fit your system # Customize below to fit your system
dwm.c
+13 -13
View File
@@ -445,7 +445,7 @@ buttonpress(XEvent *e)
arg.ui = 1 << i; arg.ui = 1 << i;
} else if (ev->x < x + TEXTW(selmon->ltsymbol)) } else if (ev->x < x + TEXTW(selmon->ltsymbol))
click = ClkLtSymbol; click = ClkLtSymbol;
else if (ev->x > selmon->ww - (int)TEXTW(stext)) else if (ev->x > selmon->ww - (int)TEXTW(stext) + lrpad - 2)
click = ClkStatusText; click = ClkStatusText;
else else
click = ClkWinTitle; click = ClkWinTitle;
@@ -877,15 +877,15 @@ focusstack(const Arg *arg)
Atom Atom
getatomprop(Client *c, Atom prop) getatomprop(Client *c, Atom prop)
{ {
int di; int format;
unsigned long nitems, dl; unsigned long nitems, dl;
unsigned char *p = NULL; unsigned char *p = NULL;
Atom da, atom = None; Atom da, atom = None;
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
&da, &di, &nitems, &dl, &p) == Success && p) { &da, &format, &nitems, &dl, &p) == Success && p) {
if (nitems > 0) if (nitems > 0 && format == 32)
atom = *(Atom *)p; atom = *(long *)p;
XFree(p); XFree(p);
} }
return atom; return atom;
@@ -911,10 +911,10 @@ getstate(Window w)
Atom real; Atom real;
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
&real, &format, &n, &extra, (unsigned char **)&p) != Success) &real, &format, &n, &extra, &p) != Success)
return -1; return -1;
if (n != 0) if (n != 0 && format == 32)
result = *p; result = *(long *)p;
XFree(p); XFree(p);
return result; return result;
} }
@@ -1447,6 +1447,8 @@ sendmon(Client *c, Monitor *m)
c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
attach(c); attach(c);
attachstack(c); attachstack(c);
if (c->isfullscreen)
resizeclient(c, m->mx, m->my, m->mw, m->mh);
focus(NULL); focus(NULL);
arrange(NULL); arrange(NULL);
} }
@@ -1514,12 +1516,10 @@ sendevent(Client *c, Atom proto)
void void
setfocus(Client *c) setfocus(Client *c)
{ {
if (!c->neverfocus) { if (!c->neverfocus)
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XChangeProperty(dpy, root, netatom[NetActiveWindow], XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
XA_WINDOW, 32, PropModeReplace, PropModeReplace, (unsigned char *)&c->win, 1);
(unsigned char *) &(c->win), 1);
}
sendevent(c, wmatom[WMTakeFocus]); sendevent(c, wmatom[WMTakeFocus]);
} }