Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
roman numerals suck badly, reverting
[dwm.git]
/
draw.c
diff --git
a/draw.c
b/draw.c
index
4441a88
..
9a469f9
100644
(file)
--- a/
draw.c
+++ b/
draw.c
@@
-1,10
+1,9
@@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI
I
Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
#include <stdio.h>
#include <string.h>
* See LICENSE file for license details.
*/
#include "dwm.h"
#include <stdio.h>
#include <string.h>
-#include <X11/Xlocale.h>
/* static */
/* static */
@@
-30,12
+29,13
@@
textnw(const char *text, unsigned int len) {
}
static void
}
static void
-drawtext(const char *text, unsigned long col[ColLast], Bool
ldot, Bool rdot
) {
+drawtext(const char *text, unsigned long col[ColLast], Bool
filledsquare, Bool emptysquare
) {
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ XPoint pt[5];
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@
-43,8
+43,8
@@
drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
return;
w = 0;
olen = len = strlen(text);
return;
w = 0;
olen = len = strlen(text);
- if(len >= sizeof
(buf)
)
- len = sizeof
(buf)
- 1;
+ if(len >= sizeof
buf
)
+ len = sizeof
buf
- 1;
memcpy(buf, text, len);
buf[len] = 0;
h = dc.font.ascent + dc.font.descent;
memcpy(buf, text, len);
buf[len] = 0;
h = dc.font.ascent + dc.font.descent;
@@
-73,17
+73,25
@@
drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
- if(ldot) {
- r.x = dc.x + 2;
- r.y = dc.y + 2;
- r.width = r.height = (h + 2) / 4;
+ x = (h + 2) / 4;
+ if(filledsquare) {
+ r.x = dc.x + 1;
+ r.y = dc.y + 1;
+ r.width = r.height = x + 1;
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
- if(rdot) {
- r.width = r.height = (h + 2) / 4;
- r.x = dc.x + dc.w - r.width - 2;
- r.y = dc.y + dc.h - r.height - 2;
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ else if(emptysquare) {
+ pt[0].x = dc.x + 1;
+ pt[0].y = dc.y + 1;
+ pt[1].x = x;
+ pt[1].y = 0;
+ pt[2].x = 0;
+ pt[2].y = x;
+ pt[3].x = -x;
+ pt[3].y = 0;
+ pt[4].x = 0;
+ pt[4].y = -x;
+ XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
}
}
}
}
@@
-94,7
+102,7
@@
drawall(void) {
Client *c;
for(c = clients; c; c = getnext(c->next))
Client *c;
for(c = clients; c; c = getnext(c->next))
- draw
title
(c);
+ draw
client
(c);
drawstatus();
}
drawstatus();
}
@@
-130,7
+138,7
@@
drawstatus(void) {
}
void
}
void
-draw
title
(Client *c) {
+draw
client
(Client *c) {
if(c == sel && issel) {
drawstatus();
XUnmapWindow(dpy, c->twin);
if(c == sel && issel) {
drawstatus();
XUnmapWindow(dpy, c->twin);
@@
-158,11
+166,10
@@
getcolor(const char *colstr) {
void
setfont(const char *fontstr) {
void
setfont(const char *fontstr) {
- char *
*missing, *def
;
+ char *
def, **missing
;
int i, n;
missing = NULL;
int i, n;
missing = NULL;
- setlocale(LC_ALL, "");
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
@@
-170,10
+177,6
@@
setfont(const char *fontstr) {
while(n--)
fprintf(stderr, "missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
while(n--)
fprintf(stderr, "missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
- if(dc.font.set) {
- XFreeFontSet(dpy, dc.font.set);
- dc.font.set = NULL;
- }
}
if(dc.font.set) {
XFontSetExtents *font_extents;
}
if(dc.font.set) {
XFontSetExtents *font_extents;
@@
-194,11
+197,8
@@
setfont(const char *fontstr) {
if(dc.font.xfont)
XFreeFont(dpy, dc.font.xfont);
dc.font.xfont = NULL;
if(dc.font.xfont)
XFreeFont(dpy, dc.font.xfont);
dc.font.xfont = NULL;
- dc.font.xfont = XLoadQueryFont(dpy, fontstr);
- if (!dc.font.xfont)
- dc.font.xfont = XLoadQueryFont(dpy, "fixed");
- if (!dc.font.xfont)
- eprint("error, cannot init 'fixed' font\n");
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+ eprint("error, cannot load font: '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}