diff --git a/LICENSE b/LICENSE index 995172f..596e6cd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ MIT/X Consortium License +© 2010-2026 Hiltjo Posthuma © 2006-2019 Anselm R Garbe © 2006-2009 Jukka Salmi © 2006-2007 Sander van Dijk @@ -11,7 +12,6 @@ MIT/X Consortium License © 2008 Martin Hurton © 2008 Neale Pickett © 2009 Mate Nagy -© 2010-2016 Hiltjo Posthuma © 2010-2012 Connor Lane Smith © 2011 Christoph Lohmann <20h@r-36.net> © 2015-2016 Quentin Rameau diff --git a/bldit.lua b/bldit.lua new file mode 100644 index 0000000..2fd0960 --- /dev/null +++ b/bldit.lua @@ -0,0 +1,38 @@ +bldit_version = "1.1.3" +package_version = "1.1.3" + +dependencies = {} + +targets = { + default = { + build = function() + e,h,c = os.execute("rm config.h") -- I don't really like config.h personally i prefer config.def.h + if c ~= 0 and c ~= nil then + print("Clean Error") + print("GIVEN UP") + return c + end + e,h,c = os.execute("make clean") + if c ~= 0 and c ~= nil then + print("Clean Error") + print("GIVEN UP") + return c + end + e,h,c = os.execute("make") + if c ~= 0 and c ~= nil then + print("Build Error") + print("GIVEN UP") + return c + end + return 0 + end, + install = function() + e,h,c = os.execute("make install PREFIX="..prefix) + return c or 0 + end, + uninstall = function() + e,h,c = os.execute("make uninstall PREFIX="..prefix) + return c or 0 + end, + } +} diff --git a/config.mk b/config.mk index b469a2b..982dc21 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # dwm version -VERSION = 6.6 +VERSION = 6.8 # Customize below to fit your system diff --git a/dwm.c b/dwm.c index 4f345ee..ab3a84c 100644 --- a/dwm.c +++ b/dwm.c @@ -440,7 +440,7 @@ buttonpress(XEvent *e) arg.ui = 1 << i; } else if (ev->x < x + TEXTW(selmon->ltsymbol)) click = ClkLtSymbol; - else if (ev->x > selmon->ww - (int)TEXTW(stext)) + else if (ev->x > selmon->ww - (int)TEXTW(stext) + lrpad - 2) click = ClkStatusText; else click = ClkWinTitle; @@ -863,14 +863,15 @@ focusstack(const Arg *arg) Atom getatomprop(Client *c, Atom prop) { - int di; - unsigned long dl; + int format; + unsigned long nitems, dl; unsigned char *p = NULL; Atom da, atom = None; if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, - &da, &di, &dl, &dl, &p) == Success && p) { - atom = *(Atom *)p; + &da, &format, &nitems, &dl, &p) == Success && p) { + if (nitems > 0 && format == 32) + atom = *(long *)p; XFree(p); } return atom; @@ -896,10 +897,10 @@ getstate(Window w) Atom real; 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; - if (n != 0) - result = *p; + if (n != 0 && format == 32) + result = *(long *)p; XFree(p); return result; } @@ -1428,6 +1429,8 @@ sendmon(Client *c, Monitor *m) c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ attach(c); attachstack(c); + if (c->isfullscreen) + resizeclient(c, m->mx, m->my, m->mw, m->mh); focus(NULL); arrange(NULL); } @@ -1469,12 +1472,10 @@ sendevent(Client *c, Atom proto) void setfocus(Client *c) { - if (!c->neverfocus) { + if (!c->neverfocus) XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XChangeProperty(dpy, root, netatom[NetActiveWindow], - XA_WINDOW, 32, PropModeReplace, - (unsigned char *) &(c->win), 1); - } + XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32, + PropModeReplace, (unsigned char *)&c->win, 1); sendevent(c, wmatom[WMTakeFocus]); }