Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
implemented new color scheme accordingly to Sanders proposal
[dwm.git]
/
draw.c
diff --git
a/draw.c
b/draw.c
index
0237b40
..
19604f3
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
hborder, Bool vborder
) {
+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);
@@
-73,13
+73,25
@@
drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborde
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(vborder) {
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1);
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1);
+ 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);
}
}
- if(hborder) {
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1);
- XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2);
+ 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);
}
}
}
}
@@
-90,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();
}
@@
-108,7
+120,7
@@
drawstatus(void) {
dc.x += dc.w;
}
dc.w = bmw;
dc.x += dc.w;
}
dc.w = bmw;
- drawtext(arrange == dofloat ?
FLOATSYMBOL : TILESYMBOL, dc.status
, False, False);
+ drawtext(arrange == dofloat ?
FLOATSYMBOL : TILESYMBOL, dc.norm
, False, False);
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = bw - dc.w;
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = bw - dc.w;
@@
-116,7
+128,7
@@
drawstatus(void) {
dc.x = x;
dc.w = bw - x;
}
dc.x = x;
dc.w = bw - x;
}
- drawtext(stext, dc.
status
, False, False);
+ drawtext(stext, dc.
norm
, False, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
@@
-126,19
+138,13
@@
drawstatus(void) {
}
void
}
void
-draw
title
(Client *c) {
+draw
client
(Client *c) {
if(c == sel && issel) {
drawstatus();
if(c == sel && issel) {
drawstatus();
- XUnmapWindow(dpy, c->twin);
- XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
return;
}
return;
}
- XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
- XMapWindow(dpy, c->twin);
- dc.x = dc.y = 0;
- dc.w = c->tw;
- drawtext(c->name, dc.norm, False,False);
- XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
XSync(dpy, False);
}
XSync(dpy, False);
}
@@
-154,11
+160,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);
@@
-166,10
+171,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;
@@
-190,11
+191,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;
}