Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sravan Balaji
2023-01-14 09:57:17 -05:00
2 changed files with 23 additions and 5 deletions

View File

@ -67,13 +67,13 @@ endif
mkdir -p ${DESTDIR}${MANPREFIX}/man1
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
mkdir -p ${DESTDIR}${PREFIX}/share/xsession
cp -n dwm.desktop ${DESTDIR}${PREFIX}/share/xsession
chmod 644 ${DESTDIR}${PREFIX}/share/xsession/dwm.desktop
mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
cp -n dwm.desktop ${DESTDIR}${PREFIX}/share/xsessions
chmod 644 ${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop
uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/dwm\
${DESTDIR}${MANPREFIX}/man1/dwm.1\
${DESTDIR}${PREFIX}/share/xsession/dwm.desktop
${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop
.PHONY: all options clean dist install uninstall

20
dwm.c
View File

@ -4352,7 +4352,7 @@ unfocus(Client *c, int setfocus, Client *nextfocus)
void
unmanage(Client *c, int destroyed)
{
Monitor *m = c->mon;
Monitor *m;
#if SWITCHTAG_PATCH
unsigned int switchtag = c->switchtag;
#endif // SWITCHTAG_PATCH
@ -4361,6 +4361,24 @@ unmanage(Client *c, int destroyed)
XkbInfo *xkb;
#endif // XKB_PATCH
#if ZOOMSWAP_PATCH
/* Make sure to clear any previous zoom references to the client being removed. */
#if PERTAG_PATCH
int i;
for (m = mons; m; m = m->next) {
for (i = 0; i <= NUMTAGS; i++) {
if (m->pertag->prevzooms[i] == c) {
m->pertag->prevzooms[i] = NULL;
}
}
}
#else
if (c == prevzoom)
prevzoom = NULL;
#endif // PERTAG_PATCH
#endif // ZOOMSWAP_PATCH
m = c->mon;
#if SWALLOW_PATCH
if (c->swallowing) {
unswallow(c);