diff options
| author | okan | 2013-05-02 17:25:15 +0000 |
|---|---|---|
| committer | okan | 2013-05-02 17:25:15 +0000 |
| commit | a0f62e37b272c6a5f0ea3189df531cb94de8ced6 (patch) | |
| tree | ae467220b5cd0656160ea736872adda586b1788d /mousefunc.c | |
| parent | 363edbca19eb979d12939a5fb8502e682498e39b (diff) | |
| download | cwm-a0f62e37b272c6a5f0ea3189df531cb94de8ced6.tar.gz | |
no need for font_{ascent,descent,height} wrappers; limit font_width to
just requiring xftfont.
Diffstat (limited to '')
| -rw-r--r-- | mousefunc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mousefunc.c b/mousefunc.c index f975d13..a011bf8 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.46 2013/04/08 15:43:04 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.47 2013/05/02 17:25:15 okan Exp $ */ #include <sys/param.h> @@ -55,23 +55,24 @@ mousefunc_sweep_draw(struct client_ctx *cc) { struct screen_ctx *sc = cc->sc; char asize[10]; /* fits "nnnnxnnnn\0" */ - int width, width_size, width_name; + int width, width_size, width_name, height; (void)snprintf(asize, sizeof(asize), "%dx%d", (cc->geom.w - cc->hint.basew) / cc->hint.incw, (cc->geom.h - cc->hint.baseh) / cc->hint.inch); - width_size = font_width(sc, asize, strlen(asize)) + 4; - width_name = font_width(sc, cc->name, strlen(cc->name)) + 4; + width_size = font_width(sc->xftfont, asize, strlen(asize)) + 4; + width_name = font_width(sc->xftfont, cc->name, strlen(cc->name)) + 4; width = MAX(width_size, width_name); + height = sc->xftfont->height + 1; XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0); - XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, width, font_height(sc) * 2); + XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, width, height * 2); XMapWindow(X_Dpy, sc->menuwin); XClearWindow(X_Dpy, sc->menuwin); font_draw(sc, cc->name, strlen(cc->name), sc->menuwin, 0, - 2, font_ascent(sc) + 1); + 2, sc->xftfont->ascent + 1); font_draw(sc, asize, strlen(asize), sc->menuwin, 0, - width / 2 - width_size / 2, font_height(sc) + font_ascent(sc) + 1); + width / 2 - width_size / 2, height + sc->xftfont->ascent + 1); } void |