Compare commits
40 Commits
267a2bdf6b
...
241c11e26b
| Author | SHA1 | Date | |
|---|---|---|---|
| 241c11e26b | |||
| 97b5eb083f | |||
| 9c9f96d87b | |||
| b7effec665 | |||
| abb199c0f4 | |||
| ae491aa5ab | |||
| e079e77686 | |||
| c3100c3df3 | |||
| 0b57caae75 | |||
| 6cb4156756 | |||
| 653c276b01 | |||
| d391b7c2e6 | |||
| 5fce79e312 | |||
| b5ed12048d | |||
| d1e5974129 | |||
| 8f246910f3 | |||
| 2580767003 | |||
| 2e6272f7f1 | |||
| fd874e07dc | |||
| fa39b4765a | |||
| 2066e3b7cd | |||
| e7a6916cb7 | |||
| ad9b27a15b | |||
| 0c9f5bba6b | |||
| 7f2389a854 | |||
| 71640d5f89 | |||
| 206a85b47b | |||
| 7c4f999049 | |||
| 1475f7d4eb | |||
| 76a99433ed | |||
| d73b040126 | |||
| 1629117105 | |||
| da851ad386 | |||
| c7119cafbc | |||
| 588274b548 | |||
| 1aa2f720a6 | |||
| 32955c01e2 | |||
| 7f3addd652 | |||
| 8ff05305b4 | |||
| ab531786a1 |
2
LICENSE
2
LICENSE
@ -1,6 +1,5 @@
|
||||
MIT/X Consortium License
|
||||
|
||||
© 2010-2026 Hiltjo Posthuma <hiltjo@codemadness.org>
|
||||
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
|
||||
© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
|
||||
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||
@ -12,6 +11,7 @@ MIT/X Consortium License
|
||||
© 2008 Martin Hurton <martin dot hurton at gmail dot com>
|
||||
© 2008 Neale Pickett <neale dot woozle dot org>
|
||||
© 2009 Mate Nagy <mnagy at port70 dot net>
|
||||
© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
|
||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
||||
© 2011 Christoph Lohmann <20h@r-36.net>
|
||||
© 2015-2016 Quentin Rameau <quinq@fifth.space>
|
||||
|
||||
@ -50,7 +50,6 @@ static const float mfact = 0.50; /* factor of master area siz
|
||||
static const int nmaster = 1; /* number of clients in master area */
|
||||
static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
|
||||
static const int lockfullscreen =1; /* 1 will force focus on the fullscreen window */
|
||||
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
|
||||
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# dwm version
|
||||
VERSION = 6.8
|
||||
VERSION = 6.5
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
|
||||
29
drw.c
29
drw.c
@ -178,7 +178,8 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
||||
die("error, cannot allocate color '%s'", clrname);
|
||||
}
|
||||
|
||||
/* Create color schemes. */
|
||||
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
||||
* returned color scheme when done using it. */
|
||||
Clr *
|
||||
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
{
|
||||
@ -186,7 +187,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
Clr *ret;
|
||||
|
||||
/* need at least two colors for a scheme */
|
||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
|
||||
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < clrcount; i++)
|
||||
@ -194,30 +195,6 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
drw_clr_free(Drw *drw, Clr *c)
|
||||
{
|
||||
if (!drw || !c)
|
||||
return;
|
||||
|
||||
/* c is typedef XftColor Clr */
|
||||
XftColorFree(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
||||
DefaultColormap(drw->dpy, drw->screen), c);
|
||||
}
|
||||
|
||||
void
|
||||
drw_scm_free(Drw *drw, Clr *scm, size_t clrcount)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (!drw || !scm)
|
||||
return;
|
||||
|
||||
for (i = 0; i < clrcount; i++)
|
||||
drw_clr_free(drw, &scm[i]);
|
||||
free(scm);
|
||||
}
|
||||
|
||||
void
|
||||
drw_setfontset(Drw *drw, Fnt *set)
|
||||
{
|
||||
|
||||
2
drw.h
2
drw.h
@ -40,9 +40,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
|
||||
|
||||
/* Colorscheme abstraction */
|
||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
||||
void drw_clr_free(Drw *drw, Clr *c);
|
||||
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
||||
void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount);
|
||||
|
||||
/* Cursor abstraction */
|
||||
Cur *drw_cur_create(Drw *drw, int shape);
|
||||
|
||||
31
dwm.c
31
dwm.c
@ -553,7 +553,7 @@ cleanup(void)
|
||||
for (i = 0; i < CurLast; i++)
|
||||
drw_cur_free(drw, cursor[i]);
|
||||
for (i = 0; i < LENGTH(colors); i++)
|
||||
drw_scm_free(drw, scheme[i], 3);
|
||||
free(scheme[i]);
|
||||
free(scheme);
|
||||
XDestroyWindow(dpy, wmcheckwin);
|
||||
drw_free(drw);
|
||||
@ -960,15 +960,14 @@ focusstack(const Arg *arg)
|
||||
Atom
|
||||
getatomprop(Client *c, Atom prop)
|
||||
{
|
||||
int format;
|
||||
unsigned long nitems, dl;
|
||||
int di;
|
||||
unsigned long dl;
|
||||
unsigned char *p = NULL;
|
||||
Atom da, atom = None;
|
||||
|
||||
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||
&da, &format, &nitems, &dl, &p) == Success && p) {
|
||||
if (nitems > 0 && format == 32)
|
||||
atom = *(long *)p;
|
||||
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||
atom = *(Atom *)p;
|
||||
XFree(p);
|
||||
}
|
||||
return atom;
|
||||
@ -1018,10 +1017,10 @@ getstate(Window w)
|
||||
Atom real;
|
||||
|
||||
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
|
||||
&real, &format, &n, &extra, &p) != Success)
|
||||
&real, &format, &n, &extra, (unsigned char **)&p) != Success)
|
||||
return -1;
|
||||
if (n != 0 && format == 32)
|
||||
result = *(long *)p;
|
||||
if (n != 0)
|
||||
result = *p;
|
||||
XFree(p);
|
||||
return result;
|
||||
}
|
||||
@ -1331,7 +1330,7 @@ movemouse(const Arg *arg)
|
||||
handler[ev.type](&ev);
|
||||
break;
|
||||
case MotionNotify:
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / refreshrate))
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / 60))
|
||||
continue;
|
||||
lasttime = ev.xmotion.time;
|
||||
|
||||
@ -1510,7 +1509,7 @@ resizemouse(const Arg *arg)
|
||||
handler[ev.type](&ev);
|
||||
break;
|
||||
case MotionNotify:
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / refreshrate))
|
||||
if ((ev.xmotion.time - lasttime) <= (1000 / 60))
|
||||
continue;
|
||||
lasttime = ev.xmotion.time;
|
||||
|
||||
@ -1613,8 +1612,6 @@ sendmon(Client *c, Monitor *m)
|
||||
c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
|
||||
attachtop(c);
|
||||
attachstack(c);
|
||||
if (c->isfullscreen)
|
||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||
focus(NULL);
|
||||
arrange(NULL);
|
||||
}
|
||||
@ -1656,10 +1653,12 @@ 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]);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user