archy-linux
/
archy-dwm
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

More format and more improve :D

This commit is contained in:
Anas Elgarhy 2022-10-31 15:25:39 +02:00
parent 44f85c76ec
commit 6099f19a49
12 changed files with 633 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

641
src/drw.c
View File

@ -11,440 +11,421 @@
#define UTF_INVALID 0xFFFD #define UTF_INVALID 0xFFFD
#define UTF_SIZ 4 #define UTF_SIZ 4
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; static const long utfmin[UTF_SIZ + 1] = {0, 0, 0x80, 0x800, 0x10000};
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
static long static long
utf8decodebyte(const char c, size_t *i) utf8decodebyte(const char c, size_t *i) {
{ for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) if (((unsigned char) c & utfmask[*i]) == utfbyte[*i])
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) return (unsigned char) c & ~utfmask[*i];
return (unsigned char)c & ~utfmask[*i]; return 0;
return 0;
} }
static size_t static size_t
utf8validate(long *u, size_t i) utf8validate(long *u, size_t i) {
{ if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) *u = UTF_INVALID;
*u = UTF_INVALID; for (i = 1; *u > utfmax[i]; ++i);
for (i = 1; *u > utfmax[i]; ++i) return i;
;
return i;
} }
static size_t static size_t
utf8decode(const char *c, long *u, size_t clen) utf8decode(const char *c, long *u, size_t clen) {
{ size_t i, j, len, type;
size_t i, j, len, type; long udecoded;
long udecoded;
*u = UTF_INVALID; *u = UTF_INVALID;
if (!clen) if (!clen)
return 0; return 0;
udecoded = utf8decodebyte(c[0], &len); udecoded = utf8decodebyte(c[0], &len);
if (!BETWEEN(len, 1, UTF_SIZ)) if (!BETWEEN(len, 1, UTF_SIZ))
return 1; return 1;
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
if (type) if (type)
return j; return j;
} }
if (j < len) if (j < len)
return 0; return 0;
*u = udecoded; *u = udecoded;
utf8validate(u, len); utf8validate(u, len);
return len; return len;
} }
Drw * Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
{ Drw *drw = ecalloc(1, sizeof(Drw));
Drw *drw = ecalloc(1, sizeof(Drw));
drw->dpy = dpy; drw->dpy = dpy;
drw->screen = screen; drw->screen = screen;
drw->root = root; drw->root = root;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
drw->gc = XCreateGC(dpy, root, 0, NULL); drw->gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
return drw; return drw;
} }
void void
drw_resize(Drw *drw, unsigned int w, unsigned int h) drw_resize(Drw *drw, unsigned int w, unsigned int h) {
{ if (!drw)
if (!drw) return;
return;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
if (drw->drawable) if (drw->drawable)
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
} }
void void
drw_free(Drw *drw) drw_free(Drw *drw) {
{ XFreePixmap(drw->dpy, drw->drawable);
XFreePixmap(drw->dpy, drw->drawable); XFreeGC(drw->dpy, drw->gc);
XFreeGC(drw->dpy, drw->gc); drw_fontset_free(drw->fonts);
drw_fontset_free(drw->fonts); free(drw);
free(drw);
} }
/* This function is an implementation detail. Library users should use /* This function is an implementation detail. Library users should use
* drw_fontset_create instead. * drw_fontset_create instead.
*/ */
static Fnt * static Fnt *
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) {
{ Fnt *font;
Fnt *font; XftFont *xfont = NULL;
XftFont *xfont = NULL; FcPattern *pattern = NULL;
FcPattern *pattern = NULL;
if (fontname) { if (fontname) {
/* Using the pattern found at font->xfont->pattern does not yield the /* Using the pattern found at font->xfont->pattern does not yield the
* same substitution results as using the pattern returned by * same substitution results as using the pattern returned by
* FcNameParse; using the latter results in the desired fallback * FcNameParse; using the latter results in the desired fallback
* behaviour whereas the former just results in missing-character * behaviour whereas the former just results in missing-character
* rectangles being drawn, at least with some fonts. */ * rectangles being drawn, at least with some fonts. */
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
return NULL; return NULL;
} }
if (!(pattern = FcNameParse((FcChar8 *) fontname))) { if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
XftFontClose(drw->dpy, xfont); XftFontClose(drw->dpy, xfont);
return NULL; return NULL;
} }
} else if (fontpattern) { } else if (fontpattern) {
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
fprintf(stderr, "error, cannot load font from pattern.\n"); fprintf(stderr, "error, cannot load font from pattern.\n");
return NULL; return NULL;
} }
} else { } else {
die("no font specified."); die("no font specified.");
} }
font = ecalloc(1, sizeof(Fnt)); font = ecalloc(1, sizeof(Fnt));
font->xfont = xfont; font->xfont = xfont;
font->pattern = pattern; font->pattern = pattern;
font->h = xfont->ascent + xfont->descent; font->h = xfont->ascent + xfont->descent;
font->dpy = drw->dpy; font->dpy = drw->dpy;
return font; return font;
} }
static void static void
xfont_free(Fnt *font) xfont_free(Fnt *font) {
{ if (!font)
if (!font) return;
return; if (font->pattern)
if (font->pattern) FcPatternDestroy(font->pattern);
FcPatternDestroy(font->pattern); XftFontClose(font->dpy, font->xfont);
XftFontClose(font->dpy, font->xfont); free(font);
free(font);
} }
Fnt* Fnt *
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) {
{ Fnt *cur, *ret = NULL;
Fnt *cur, *ret = NULL; size_t i;
size_t i;
if (!drw || !fonts) if (!drw || !fonts)
return NULL; return NULL;
for (i = 1; i <= fontcount; i++) { for (i = 1; i <= fontcount; i++) {
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
cur->next = ret; cur->next = ret;
ret = cur; ret = cur;
} }
} }
return (drw->fonts = ret); return (drw->fonts = ret);
} }
void void
drw_fontset_free(Fnt *font) drw_fontset_free(Fnt *font) {
{ if (font) {
if (font) { drw_fontset_free(font->next);
drw_fontset_free(font->next); xfont_free(font);
xfont_free(font); }
}
} }
void void
drw_clr_create(Drw *drw, Clr *dest, const char *clrname) drw_clr_create(Drw *drw, Clr *dest, const char *clrname) {
{ if (!drw || !dest || !clrname)
if (!drw || !dest || !clrname) return;
return;
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen), DefaultColormap(drw->dpy, drw->screen),
clrname, dest)) clrname, dest))
die("error, cannot allocate color '%s'", clrname); die("error, cannot allocate color '%s'", clrname);
} }
/* Wrapper to create color schemes. The caller has to call free(3) on the /* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */ * returned color scheme when done using it. */
Clr * Clr *
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) {
{ size_t i;
size_t i; Clr *ret;
Clr *ret;
/* need at least two colors for a scheme */ /* need at least two colors for a scheme */
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
return NULL; return NULL;
for (i = 0; i < clrcount; i++) for (i = 0; i < clrcount; i++)
drw_clr_create(drw, &ret[i], clrnames[i]); drw_clr_create(drw, &ret[i], clrnames[i]);
return ret; return ret;
} }
void void
drw_setfontset(Drw *drw, Fnt *set) drw_setfontset(Drw *drw, Fnt *set) {
{ if (drw)
if (drw) drw->fonts = set;
drw->fonts = set;
} }
void void
drw_setscheme(Drw *drw, Clr *scm) drw_setscheme(Drw *drw, Clr *scm) {
{ if (drw)
if (drw) drw->scheme = scm;
drw->scheme = scm;
} }
void void
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) {
{ if (!drw || !drw->scheme)
if (!drw || !drw->scheme) return;
return; XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); if (filled)
if (filled) XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); else
else XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
} }
int int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) {
{ int i, ty, ellipsis_x = 0;
int i, ty, ellipsis_x = 0; unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; XftDraw *d = NULL;
XftDraw *d = NULL; Fnt *usedfont, *curfont, *nextfont;
Fnt *usedfont, *curfont, *nextfont; int utf8strlen, utf8charlen, render = x || y || w || h;
int utf8strlen, utf8charlen, render = x || y || w || h; long utf8codepoint = 0;
long utf8codepoint = 0; const char *utf8str;
const char *utf8str; FcCharSet *fccharset;
FcCharSet *fccharset; FcPattern *fcpattern;
FcPattern *fcpattern; FcPattern *match;
FcPattern *match; XftResult result;
XftResult result; int charexists = 0, overflow = 0;
int charexists = 0, overflow = 0; /* keep track of a couple codepoints for which we have no match. */
/* keep track of a couple codepoints for which we have no match. */ enum {
enum { nomatches_len = 64 }; nomatches_len = 64
static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; };
static unsigned int ellipsis_width = 0; static struct {
long codepoint[nomatches_len];
unsigned int idx;
} nomatches;
static unsigned int ellipsis_width = 0;
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
return 0; return 0;
if (!render) { if (!render) {
w = invert ? invert : ~invert; w = invert ? invert : ~invert;
} else { } else {
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
d = XftDrawCreate(drw->dpy, drw->drawable, d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen), DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen)); DefaultColormap(drw->dpy, drw->screen));
x += lpad; x += lpad;
w -= lpad; w -= lpad;
} }
usedfont = drw->fonts; usedfont = drw->fonts;
if (!ellipsis_width && render) if (!ellipsis_width && render)
ellipsis_width = drw_fontset_getwidth(drw, "..."); ellipsis_width = drw_fontset_getwidth(drw, "...");
while (1) { while (1) {
ew = ellipsis_len = utf8strlen = 0; ew = ellipsis_len = utf8strlen = 0;
utf8str = text; utf8str = text;
nextfont = NULL; nextfont = NULL;
while (*text) { while (*text) {
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
for (curfont = drw->fonts; curfont; curfont = curfont->next) { for (curfont = drw->fonts; curfont; curfont = curfont->next) {
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
if (charexists) { if (charexists) {
drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
if (ew + ellipsis_width <= w) { if (ew + ellipsis_width <= w) {
/* keep track where the ellipsis still fits */ /* keep track where the ellipsis still fits */
ellipsis_x = x + ew; ellipsis_x = x + ew;
ellipsis_w = w - ew; ellipsis_w = w - ew;
ellipsis_len = utf8strlen; ellipsis_len = utf8strlen;
} }
if (ew + tmpw > w) { if (ew + tmpw > w) {
overflow = 1; overflow = 1;
/* called from drw_fontset_getwidth_clamp(): /* called from drw_fontset_getwidth_clamp():
* it wants the width AFTER the overflow * it wants the width AFTER the overflow
*/ */
if (!render) if (!render)
x += tmpw; x += tmpw;
else else
utf8strlen = ellipsis_len; utf8strlen = ellipsis_len;
} else if (curfont == usedfont) { } else if (curfont == usedfont) {
utf8strlen += utf8charlen; utf8strlen += utf8charlen;
text += utf8charlen; text += utf8charlen;
ew += tmpw; ew += tmpw;
} else { } else {
nextfont = curfont; nextfont = curfont;
} }
break; break;
} }
} }
if (overflow || !charexists || nextfont) if (overflow || !charexists || nextfont)
break; break;
else else
charexists = 0; charexists = 0;
} }
if (utf8strlen) { if (utf8strlen) {
if (render) { if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); usedfont->xfont, x, ty, (XftChar8 *) utf8str, utf8strlen);
} }
x += ew; x += ew;
w -= ew; w -= ew;
} }
if (render && overflow) if (render && overflow)
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
if (!*text || overflow) { if (!*text || overflow) {
break; break;
} else if (nextfont) { } else if (nextfont) {
charexists = 0; charexists = 0;
usedfont = nextfont; usedfont = nextfont;
} else { } else {
/* Regardless of whether or not a fallback font is found, the /* Regardless of whether or not a fallback font is found, the
* character must be drawn. */ * character must be drawn. */
charexists = 1; charexists = 1;
for (i = 0; i < nomatches_len; ++i) { for (i = 0; i < nomatches_len; ++i) {
/* avoid calling XftFontMatch if we know we won't find a match */ /* avoid calling XftFontMatch if we know we won't find a match */
if (utf8codepoint == nomatches.codepoint[i]) if (utf8codepoint == nomatches.codepoint[i])
goto no_match; goto no_match;
} }
fccharset = FcCharSetCreate(); fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, utf8codepoint); FcCharSetAddChar(fccharset, utf8codepoint);
if (!drw->fonts->pattern) { if (!drw->fonts->pattern) {
/* Refer to the comment in xfont_create for more information. */ /* Refer to the comment in xfont_create for more information. */
die("the first font in the cache must be loaded from a font string."); die("the first font in the cache must be loaded from a font string.");
} }
fcpattern = FcPatternDuplicate(drw->fonts->pattern); fcpattern = FcPatternDuplicate(drw->fonts->pattern);
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern); FcDefaultSubstitute(fcpattern);
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
FcCharSetDestroy(fccharset); FcCharSetDestroy(fccharset);
FcPatternDestroy(fcpattern); FcPatternDestroy(fcpattern);
if (match) { if (match) {
usedfont = xfont_create(drw, NULL, match); usedfont = xfont_create(drw, NULL, match);
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
for (curfont = drw->fonts; curfont->next; curfont = curfont->next) for (curfont = drw->fonts; curfont->next; curfont = curfont->next); /* NOP */
; /* NOP */ curfont->next = usedfont;
curfont->next = usedfont; } else {
} else { xfont_free(usedfont);
xfont_free(usedfont); nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; no_match:
no_match: usedfont = drw->fonts;
usedfont = drw->fonts; }
} }
} }
} }
} if (d)
if (d) XftDrawDestroy(d);
XftDrawDestroy(d);
return x + (render ? w : 0); return x + (render ? w : 0);
} }
void void
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
{ if (!drw)
if (!drw) return;
return;
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
XSync(drw->dpy, False); XSync(drw->dpy, False);
} }
unsigned int unsigned int
drw_fontset_getwidth(Drw *drw, const char *text) drw_fontset_getwidth(Drw *drw, const char *text) {
{ if (!drw || !drw->fonts || !text)
if (!drw || !drw->fonts || !text) return 0;
return 0; return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
} }
unsigned int unsigned int
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) {
{ unsigned int tmp = 0;
unsigned int tmp = 0; if (drw && drw->fonts && text && n)
if (drw && drw->fonts && text && n) tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); return MIN(n, tmp);
return MIN(n, tmp);
} }
void void
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) {
{ XGlyphInfo ext;
XGlyphInfo ext;
if (!font || !text) if (!font || !text)
return; return;
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *) text, len, &ext);
if (w) if (w)
*w = ext.xOff; *w = ext.xOff;
if (h) if (h)
*h = font->h; *h = font->h;
} }
Cur * Cur *
drw_cur_create(Drw *drw, int shape) drw_cur_create(Drw *drw, int shape) {
{ Cur *cur;
Cur *cur;
if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
return NULL; return NULL;
cur->cursor = XCreateFontCursor(drw->dpy, shape); cur->cursor = XCreateFontCursor(drw->dpy, shape);
return cur; return cur;
} }
void void
drw_cur_free(Drw *drw, Cur *cursor) drw_cur_free(Drw *drw, Cur *cursor) {
{ if (!cursor)
if (!cursor) return;
return;
XFreeCursor(drw->dpy, cursor->cursor); XFreeCursor(drw->dpy, cursor->cursor);
free(cursor); free(cursor);
} }

46
src/drw.h
View File

@ -1,57 +1,69 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
typedef struct { typedef struct {
Cursor cursor; Cursor cursor;
} Cur; } Cur;
typedef struct Fnt { typedef struct Fnt {
Display *dpy; Display *dpy;
unsigned int h; unsigned int h;
XftFont *xfont; XftFont *xfont;
FcPattern *pattern; FcPattern *pattern;
struct Fnt *next; struct Fnt *next;
} Fnt; } Fnt;
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */ enum {
ColFg, ColBg, ColBorder
}; /* Clr scheme index */
typedef XftColor Clr; typedef XftColor Clr;
typedef struct { typedef struct {
unsigned int w, h; unsigned int w, h;
Display *dpy; Display *dpy;
int screen; int screen;
Window root; Window root;
Drawable drawable; Drawable drawable;
GC gc; GC gc;
Clr *scheme; Clr *scheme;
Fnt *fonts; Fnt *fonts;
} Drw; } Drw;
/* Drawable abstraction */ /* Drawable abstraction */
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
void drw_resize(Drw *drw, unsigned int w, unsigned int h); void drw_resize(Drw *drw, unsigned int w, unsigned int h);
void drw_free(Drw *drw); void drw_free(Drw *drw);
/* Fnt abstraction */ /* Fnt abstraction */
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount);
void drw_fontset_free(Fnt* set);
void drw_fontset_free(Fnt *set);
unsigned int drw_fontset_getwidth(Drw *drw, const char *text); unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
/* Colorscheme abstraction */ /* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);
void drw_cur_free(Drw *drw, Cur *cursor); void drw_cur_free(Drw *drw, Cur *cursor);
/* Drawing context manipulation */ /* Drawing context manipulation */
void drw_setfontset(Drw *drw, Fnt *set); void drw_setfontset(Drw *drw, Fnt *set);
void drw_setscheme(Drw *drw, Clr *scm); void drw_setscheme(Drw *drw, Clr *scm);
/* Drawing functions */ /* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
/* Map functions */ /* Map functions */

13
src/dwm.c
View File

@ -47,18 +47,6 @@
#include "dwm.h" #include "dwm.h"
/* macros */ /* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x, y, w, h, m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define SYSTEM_TRAY_REQUEST_DOCK 0 #define SYSTEM_TRAY_REQUEST_DOCK 0
/* XEMBED messages */ /* XEMBED messages */
#define XEMBED_EMBEDDED_NOTIFY 0 #define XEMBED_EMBEDDED_NOTIFY 0
@ -70,7 +58,6 @@
#define XEMBED_WINDOW_DEACTIVATE 2 #define XEMBED_WINDOW_DEACTIVATE 2
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
/* variables */ /* variables */
static Systray *systray = NULL; static Systray *systray = NULL;

179
src/layouts/centeredmaster.c
View File

@ -1,102 +1,103 @@
#include "../dwm.h"
#include "../util.h"
void void
centeredmaster(Monitor *m) centeredmaster(Monitor *m) {
{ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
unsigned int i, n, h, mw, mx, my, oty, ety, tw; Client *c;
Client *c;
/* count number of clients in the selected monitor */ /* count number of clients in the selected monitor */
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if (n == 0) if (n == 0)
return; return;
/* initialize areas */ /* initialize areas */
mw = m->ww; mw = m->ww;
mx = 0; mx = 0;
my = 0; my = 0;
tw = mw; tw = mw;
if (n > m->nmaster) { if (n > m->nmaster) {
/* go mfact box in the center if more than nmaster clients */ /* go mfact box in the center if more than nmaster clients */
mw = m->nmaster ? m->ww * m->mfact : 0; mw = m->nmaster ? m->ww * m->mfact : 0;
tw = m->ww - mw; tw = m->ww - mw;
if (n - m->nmaster > 1) { if (n - m->nmaster > 1) {
/* only one client */ /* only one client */
mx = (m->ww - mw) / 2; mx = (m->ww - mw) / 2;
tw = (m->ww - mw) / 2; tw = (m->ww - mw) / 2;
} }
} }
oty = 0; oty = 0;
ety = 0; ety = 0;
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
/* nmaster clients are stacked vertically, in the center /* nmaster clients are stacked vertically, in the center
* of the screen */ * of the screen */
h = (m->wh - my) / (MIN(n, m->nmaster) - i); h = (m->wh - my) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw), resize(c, m->wx + mx, m->wy + my, mw - (2 * c->bw),
h - (2*c->bw), 0); h - (2 * c->bw), 0);
my += HEIGHT(c); my += HEIGHT(c);
} else { } else {
/* stack clients are stacked vertically */ /* stack clients are stacked vertically */
if ((i - m->nmaster) % 2 ) { if ((i - m->nmaster) % 2) {
h = (m->wh - ety) / ( (1 + n - i) / 2); h = (m->wh - ety) / ((1 + n - i) / 2);
resize(c, m->wx, m->wy + ety, tw - (2*c->bw), resize(c, m->wx, m->wy + ety, tw - (2 * c->bw),
h - (2*c->bw), 0); h - (2 * c->bw), 0);
ety += HEIGHT(c); ety += HEIGHT(c);
} else { } else {
h = (m->wh - oty) / ((1 + n - i) / 2); h = (m->wh - oty) / ((1 + n - i) / 2);
resize(c, m->wx + mx + mw, m->wy + oty, resize(c, m->wx + mx + mw, m->wy + oty,
tw - (2*c->bw), h - (2*c->bw), 0); tw - (2 * c->bw), h - (2 * c->bw), 0);
oty += HEIGHT(c); oty += HEIGHT(c);
} }
} }
} }
void void
centeredfloatingmaster(Monitor *m) centeredfloatingmaster(Monitor *m) {
{ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx; Client *c;
Client *c;
/* count number of clients in the selected monitor */ /* count number of clients in the selected monitor */
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if (n == 0) if (n == 0)
return; return;
/* initialize nmaster area */ /* initialize nmaster area */
if (n > m->nmaster) { if (n > m->nmaster) {
/* go mfact box in the center if more than nmaster clients */ /* go mfact box in the center if more than nmaster clients */
if (m->ww > m->wh) { if (m->ww > m->wh) {
mw = m->nmaster ? m->ww * m->mfact : 0; mw = m->nmaster ? m->ww * m->mfact : 0;
mh = m->nmaster ? m->wh * 0.9 : 0; mh = m->nmaster ? m->wh * 0.9 : 0;
} else { } else {
mh = m->nmaster ? m->wh * m->mfact : 0; mh = m->nmaster ? m->wh * m->mfact : 0;
mw = m->nmaster ? m->ww * 0.9 : 0; mw = m->nmaster ? m->ww * 0.9 : 0;
} }
mx = mxo = (m->ww - mw) / 2; mx = mxo = (m->ww - mw) / 2;
my = myo = (m->wh - mh) / 2; my = myo = (m->wh - mh) / 2;
} else { } else {
/* go fullscreen if all clients are in the master area */ /* go fullscreen if all clients are in the master area */
mh = m->wh; mh = m->wh;
mw = m->ww; mw = m->ww;
mx = mxo = 0; mx = mxo = 0;
my = myo = 0; my = myo = 0;
} }
for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
/* nmaster clients are stacked horizontally, in the center /* nmaster clients are stacked horizontally, in the center
* of the screen */ * of the screen */
w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i); w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, w - (2*c->bw), resize(c, m->wx + mx, m->wy + my, w - (2 * c->bw),
mh - (2*c->bw), 0); mh - (2 * c->bw), 0);
mx += WIDTH(c); mx += WIDTH(c);
} else { } else {
/* stack clients are stacked horizontally */ /* stack clients are stacked horizontally */
w = (m->ww - tx) / (n - i); w = (m->ww - tx) / (n - i);
resize(c, m->wx + tx, m->wy, w - (2*c->bw), resize(c, m->wx + tx, m->wy, w - (2 * c->bw),
m->wh - (2*c->bw), 0); m->wh - (2 * c->bw), 0);
tx += WIDTH(c); tx += WIDTH(c);
} }
} }

2
src/layouts/centeredmaster.h
View File

@ -7,4 +7,4 @@ static void centeredfloatingmaster(Monitor *m);
#include "centeredmaster.c" #include "centeredmaster.c"
#endif // !centeredmaster.h #endif // centeredmaster_H

107
src/layouts/fibonacci.c
View File

@ -1,66 +1,65 @@
#include "../dwm.h"
void void
fibonacci(Monitor *mon, int s) { fibonacci(Monitor *mon, int s) {
unsigned int i, n, nx, ny, nw, nh; unsigned int i, n, nx, ny, nw, nh;
Client *c; Client *c;
for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
if(n == 0) if (n == 0)
return; return;
nx = mon->wx; nx = mon->wx;
ny = 0; ny = 0;
nw = mon->ww; nw = mon->ww;
nh = mon->wh; nh = mon->wh;
for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) { for (i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
if((i % 2 && nh / 2 > 2 * c->bw) if ((i % 2 && nh / 2 > 2 * c->bw)
|| (!(i % 2) && nw / 2 > 2 * c->bw)) { || (!(i % 2) && nw / 2 > 2 * c->bw)) {
if(i < n - 1) { if (i < n - 1) {
if(i % 2) if (i % 2)
nh /= 2; nh /= 2;
else else
nw /= 2; nw /= 2;
if((i % 4) == 2 && !s) if ((i % 4) == 2 && !s)
nx += nw; nx += nw;
else if((i % 4) == 3 && !s) else if ((i % 4) == 3 && !s)
ny += nh; ny += nh;
} }
if((i % 4) == 0) { if ((i % 4) == 0) {
if(s) if (s)
ny += nh; ny += nh;
else else
ny -= nh; ny -= nh;
} } else if ((i % 4) == 1)
else if((i % 4) == 1) nx += nw;
nx += nw; else if ((i % 4) == 2)
else if((i % 4) == 2) ny += nh;
ny += nh; else if ((i % 4) == 3) {
else if((i % 4) == 3) { if (s)
if(s) nx += nw;
nx += nw; else
else nx -= nw;
nx -= nw; }
} if (i == 0) {
if(i == 0) if (n != 1)
{ nw = mon->ww * mon->mfact;
if(n != 1) ny = mon->wy;
nw = mon->ww * mon->mfact; } else if (i == 1)
ny = mon->wy; nw = mon->ww - nw;
} i++;
else if(i == 1) }
nw = mon->ww - nw; resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
i++; }
}
resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
}
} }
void void
dwindle(Monitor *mon) { dwindle(Monitor *mon) {
fibonacci(mon, 1); fibonacci(mon, 1);
} }
void void
spiral(Monitor *mon) { spiral(Monitor *mon) {
fibonacci(mon, 0); fibonacci(mon, 0);
} }

44
src/layouts/grid.c
View File

@ -1,27 +1,29 @@
#include "../dwm.h"
void void
grid(Monitor *m) { grid(Monitor *m) {
unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows; unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows;
Client *c; Client *c;
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next))
n++; n++;
/* grid dimensions */ /* grid dimensions */
for(rows = 0; rows <= n/2; rows++) for (rows = 0; rows <= n / 2; rows++)
if(rows*rows >= n) if (rows * rows >= n)
break; break;
cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
/* window geoms (cell height/width) */ /* window geoms (cell height/width) */
ch = m->wh / (rows ? rows : 1); ch = m->wh / (rows ? rows : 1);
cw = m->ww / (cols ? cols : 1); cw = m->ww / (cols ? cols : 1);
for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
cx = m->wx + (i / rows) * cw; cx = m->wx + (i / rows) * cw;
cy = m->wy + (i % rows) * ch; cy = m->wy + (i % rows) * ch;
/* adjust height/width of last row/column's windows */ /* adjust height/width of last row/column's windows */
ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0; ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0;
aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0; aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0;
resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False); resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
i++; i++;
} }
} }

26
src/layouts/monocle.c
View File

@ -1,14 +1,16 @@
void #include "../dwm.h"
monocle(Monitor *m) #include "../util.h"
{
unsigned int n = 0;
Client *c;
for (c = m->clients; c; c = c->next) void
if (ISVISIBLE(c)) monocle(Monitor *m) {
n++; unsigned int n = 0;
if (n > 0) /* override layout symbol */ Client *c;
snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) for (c = m->clients; c; c = c->next)
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); if (ISVISIBLE(c))
n++;
if (n > 0) /* override layout symbol */
snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
} }

48
src/layouts/tile.c
View File

@ -1,27 +1,29 @@
#include "../dwm.h"
#include "../util.h"
void void
tile(Monitor *m) tile(Monitor *m) {
{ unsigned int i, n, h, mw, my, ty;
unsigned int i, n, h, mw, my, ty; Client *c;
Client *c;
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if (n == 0) if (n == 0)
return; return;
if (n > m->nmaster) if (n > m->nmaster)
mw = m->nmaster ? m->ww * m->mfact : 0; mw = m->nmaster ? m->ww * m->mfact : 0;
else else
mw = m->ww; mw = m->ww;
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i); h = (m->wh - my) / (MIN(n, m->nmaster) - i);
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); resize(c, m->wx, m->wy + my, mw - (2 * c->bw), h - (2 * c->bw), 0);
if (my + HEIGHT(c) < m->wh) if (my + HEIGHT(c) < m->wh)
my += HEIGHT(c); my += HEIGHT(c);
} else { } else {
h = (m->wh - ty) / (n - i); h = (m->wh - ty) / (n - i);
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2 * c->bw), h - (2 * c->bw), 0);
if (ty + HEIGHT(c) < m->wh) if (ty + HEIGHT(c) < m->wh)
ty += HEIGHT(c); ty += HEIGHT(c);
} }
} }

80
src/movestack.c
View File

@ -1,48 +1,50 @@
#include "dwm.h"
#include "util.h"
static void static void
movestack(const Arg *arg) { movestack(const Arg *arg) {
Client *c = NULL, *p = NULL, *pc = NULL, *i; Client *c = NULL, *p = NULL, *pc = NULL, *i;
if(arg->i > 0) { if (arg->i > 0) {
/* find the client after selmon->sel */ /* find the client after selmon->sel */
for(c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next); for (c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
if(!c) if (!c)
for(c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next); for (c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
} } else {
else { /* find the client before selmon->sel */
/* find the client before selmon->sel */ for (i = selmon->clients; i != selmon->sel; i = i->next)
for(i = selmon->clients; i != selmon->sel; i = i->next) if (ISVISIBLE(i) && !i->isfloating)
if(ISVISIBLE(i) && !i->isfloating) c = i;
c = i; if (!c)
if(!c) for (; i; i = i->next)
for(; i; i = i->next) if (ISVISIBLE(i) && !i->isfloating)
if(ISVISIBLE(i) && !i->isfloating) c = i;
c = i; }
} /* find the client before selmon->sel and c */
/* find the client before selmon->sel and c */ for (i = selmon->clients; i && (!p || !pc); i = i->next) {
for(i = selmon->clients; i && (!p || !pc); i = i->next) { if (i->next == selmon->sel)
if(i->next == selmon->sel) p = i;
p = i; if (i->next == c)
if(i->next == c) pc = i;
pc = i; }
}
/* swap c and selmon->sel selmon->clients in the selmon->clients list */ /* swap c and selmon->sel selmon->clients in the selmon->clients list */
if(c && c != selmon->sel) { if (c && c != selmon->sel) {
Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next; Client *temp = selmon->sel->next == c ? selmon->sel : selmon->sel->next;
selmon->sel->next = c->next==selmon->sel?c:c->next; selmon->sel->next = c->next == selmon->sel ? c : c->next;
c->next = temp; c->next = temp;
if(p && p != c) if (p && p != c)
p->next = c; p->next = c;
if(pc && pc != selmon->sel) if (pc && pc != selmon->sel)
pc->next = selmon->sel; pc->next = selmon->sel;
if(selmon->sel == selmon->clients) if (selmon->sel == selmon->clients)
selmon->clients = c; selmon->clients = c;
else if(c == selmon->clients) else if (c == selmon->clients)
selmon->clients = selmon->sel; selmon->clients = selmon->sel;
arrange(selmon); arrange(selmon);
} }
} }

56
src/transient.c
View File

@ -6,37 +6,37 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
int main(void) { int main(void) {
Display *d; Display *d;
Window r, f, t = None; Window r, f, t = None;
XSizeHints h; XSizeHints h;
XEvent e; XEvent e;
d = XOpenDisplay(NULL); d = XOpenDisplay(NULL);
if (!d) if (!d)
exit(1); exit(1);
r = DefaultRootWindow(d); r = DefaultRootWindow(d);
f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0); f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
h.min_width = h.max_width = h.min_height = h.max_height = 400; h.min_width = h.max_width = h.min_height = h.max_height = 400;
h.flags = PMinSize | PMaxSize; h.flags = PMinSize | PMaxSize;
XSetWMNormalHints(d, f, &h); XSetWMNormalHints(d, f, &h);
XStoreName(d, f, "floating"); XStoreName(d, f, "floating");
XMapWindow(d, f); XMapWindow(d, f);
XSelectInput(d, f, ExposureMask); XSelectInput(d, f, ExposureMask);
while (1) { while (1) {
XNextEvent(d, &e); XNextEvent(d, &e);
if (t == None) { if (t == None) {
sleep(5); sleep(5);
t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0); t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
XSetTransientForHint(d, t, f); XSetTransientForHint(d, t, f);
XStoreName(d, t, "transient"); XStoreName(d, t, "transient");
XMapWindow(d, t); XMapWindow(d, t);
XSelectInput(d, t, ExposureMask); XSelectInput(d, t, ExposureMask);
} }
} }
XCloseDisplay(d); XCloseDisplay(d);
exit(0); exit(0);
} }

19
src/util.h
View File

@ -1,8 +1,25 @@
/* See LICENSE file for copyright and license details. */ #ifndef UTIL_H
#define UTIL_H
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x, y, w, h, m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
#define MAX(A, B) ((A) > (B) ? (A) : (B)) #define MAX(A, B) ((A) > (B) ? (A) : (B))
#define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B))
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) #define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
void die(const char *fmt, ...); void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size); void *ecalloc(size_t nmemb, size_t size);
#endif // util_H