mchalupiak/dwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed TEXTW

Browse Source
This commit is contained in:
Anselm R Garbe 2008-05-26 09:45:34 +01:00
parent 0fe2e783e9
commit 5d2385b636
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dwm.c
View File

@ -52,6 +52,7 @@
#define MAXTAGLEN 16 #define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) #define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
#define VISIBLE(x) ((x)->tags & tagset[seltags]) #define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */ /* enums */
@ -169,7 +170,6 @@ void setup(void);
void spawn(const void *arg); void spawn(const void *arg);
void tag(const void *arg); void tag(const void *arg);
uint textnw(const char *text, uint len); uint textnw(const char *text, uint len);
uint textw(const char *text);
void tile(void); void tile(void);
void tileresize(Client *c, int x, int y, int w, int h); void tileresize(Client *c, int x, int y, int w, int h);
void togglebar(const void *arg); void togglebar(const void *arg);
@ -305,7 +305,7 @@ buttonpress(XEvent *e) {
if(ev->window == barwin) { if(ev->window == barwin) {
x = 0; x = 0;
for(i = 0; i < LENGTH(tags); i++) { for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]); x += TEXTW(tags[i]);
if(ev->x < x) { if(ev->x < x) {
mask = 1 << i; mask = 1 << i;
if(ev->button == Button1) { if(ev->button == Button1) {
@ -491,7 +491,7 @@ drawbar(void) {
dc.x = 0; dc.x = 0;
for(c = stack; c && !VISIBLE(c); c = c->snext); for(c = stack; c && !VISIBLE(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) { for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]); dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) { if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i)); drawtext(tags[i], dc.sel, isurgent(i));
drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
@ -509,7 +509,7 @@ drawbar(void) {
} }
else else
x = dc.x; x = dc.x;
dc.w = textw(stext); dc.w = TEXTW(stext);
dc.x = bw - dc.w; dc.x = bw - dc.w;
if(dc.x < x) { if(dc.x < x) {
dc.x = x; dc.x = x;
@ -1365,7 +1365,7 @@ setup(void) {
/* init bar */ /* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) { for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
w = textw(layouts[i].symbol); w = TEXTW(layouts[i].symbol);
blw = MAX(blw, w); blw = MAX(blw, w);
} }
@ -1437,11 +1437,6 @@ textnw(const char *text, uint len) {
return XTextWidth(dc.font.xfont, text, len); return XTextWidth(dc.font.xfont, text, len);
} }
uint
textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height;
}
void void
tile(void) { tile(void) {
int x, y, h, w; int x, y, h, w;