mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

- let callers of font_draw figure out (and pass) the color instead of an

Browse Source 
'active' flag.
- use strlen() inside of font_draw; the only instance where it wasn't
  used happened to be ignored on a subsequent draw.
This commit is contained in:
okan 2013-05-14 12:35:56 +00:00
parent 112f616d1d
commit c637a54048
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.h
View File

@ -447,7 +447,7 @@ void conf_mousebind(struct conf *, char *, char *);
void conf_screen(struct screen_ctx *); void conf_screen(struct screen_ctx *);
void conf_ungrab(struct conf *, struct keybinding *); void conf_ungrab(struct conf *, struct keybinding *);
void font_draw(struct screen_ctx *, const char *, int, void font_draw(struct screen_ctx *, const char *,
Drawable, int, int, int); Drawable, int, int, int);
void font_init(struct screen_ctx *, const char *, void font_init(struct screen_ctx *, const char *,
const char **); const char **);

9
font.c
View File

@ -75,13 +75,10 @@ font_width(XftFont *xftfont, const char *text, int len)
} }
void void
font_draw(struct screen_ctx *sc, const char *text, int len, font_draw(struct screen_ctx *sc, const char *text,
Drawable d, int active, int x, int y) Drawable d, int color, int x, int y)
{ {
int color;
color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
XftDrawChange(sc->xftdraw, d); XftDrawChange(sc->xftdraw, d);
XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[color], sc->xftfont, x, y, XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[color], sc->xftfont, x, y,
(const FcChar8*)text, len); (const FcChar8*)text, strlen(text));
} }

8
menu.c
View File

@ -419,7 +419,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
mc->width, mc->height); mc->width, mc->height);
if (mc->hasprompt) { if (mc->hasprompt) {
font_draw(sc, mc->dispstr, strlen(mc->dispstr), sc->menuwin, 0, font_draw(sc, mc->dispstr, sc->menuwin, CWM_COLOR_MENU_FONT,
0, sc->xftfont->ascent); 0, sc->xftfont->ascent);
n = 1; n = 1;
} else } else
@ -434,8 +434,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
if (mc->y + y > xine.h) if (mc->y + y > xine.h)
break; break;
font_draw(sc, text, MIN(strlen(text), MENU_MAXENTRY), font_draw(sc, text, sc->menuwin, CWM_COLOR_MENU_FONT, 0, y);
sc->menuwin, 0, 0, y);
n++; n++;
} }
if (mc->hasprompt && n > 1 && (mc->searchstr[0] != '\0')) { if (mc->hasprompt && n > 1 && (mc->searchstr[0] != '\0')) {
@ -466,7 +465,8 @@ menu_draw_entry(struct screen_ctx *sc, struct menu_ctx *mc,
XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0, XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0,
(sc->xftfont->height + 1) * entry, mc->width, (sc->xftfont->height + 1) * entry, mc->width,
(sc->xftfont->height + 1) + sc->xftfont->descent); (sc->xftfont->height + 1) + sc->xftfont->descent);
font_draw(sc, text, strlen(text), sc->menuwin, active, color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
font_draw(sc, text, sc->menuwin, color,
0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1); 0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1);
} }

4
mousefunc.c
View File

@ -62,8 +62,8 @@ mousefunc_sweep_draw(struct client_ctx *cc)
XMapWindow(X_Dpy, sc->menuwin); XMapWindow(X_Dpy, sc->menuwin);
XClearWindow(X_Dpy, sc->menuwin); XClearWindow(X_Dpy, sc->menuwin);
font_draw(sc, asize, strlen(asize), sc->menuwin, 0, 0, font_draw(sc, asize, sc->menuwin, CWM_COLOR_MENU_FONT,
sc->xftfont->ascent + 1); 0, sc->xftfont->ascent + 1);
} }
void void