diff options
| author | okan | 2011-06-24 05:45:57 +0000 |
|---|---|---|
| committer | okan | 2011-06-24 05:45:57 +0000 |
| commit | 2de7aba86f0a58b402764864d7de4af200682895 (patch) | |
| tree | be328e3380de60a30704daad69934c3e1a2e5b39 /mousefunc.c | |
| parent | 042dd52d9a25ab335d4aad404694a0bef8b93ebd (diff) | |
| download | cwm-2de7aba86f0a58b402764864d7de4af200682895.tar.gz | |
struct XftFont already has height which we can use directly instead of
calculating ourselves, so do so.
ok oga@
Diffstat (limited to '')
| -rw-r--r-- | mousefunc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mousefunc.c b/mousefunc.c index 6b50de6..486a6f8 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.26 2011/05/13 12:53:19 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.27 2011/06/24 05:45:57 okan Exp $ */ #include <sys/param.h> @@ -55,7 +55,7 @@ mousefunc_sweep_draw(struct client_ctx *cc) { struct screen_ctx *sc = cc->sc; char asize[10]; /* fits "nnnnxnnnn\0" */ - int width, height, width_size, width_name; + int width, width_size, width_name; snprintf(asize, sizeof(asize), "%dx%d", (cc->geom.width - cc->geom.basew) / cc->geom.incw, @@ -63,17 +63,16 @@ mousefunc_sweep_draw(struct client_ctx *cc) width_size = font_width(sc, asize, strlen(asize)) + 4; width_name = font_width(sc, cc->name, strlen(cc->name)) + 4; width = MAX(width_size, width_name); - height = font_ascent(sc) + font_descent(sc) + 1; XMoveResizeWindow(X_Dpy, sc->menuwin, cc->geom.x, cc->geom.y, - width, height * 2); + width, font_height(sc) * 2); XMapWindow(X_Dpy, sc->menuwin); XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0); XClearWindow(X_Dpy, sc->menuwin); font_draw(sc, cc->name, strlen(cc->name), sc->menuwin, 2, font_ascent(sc) + 1); font_draw(sc, asize, strlen(asize), sc->menuwin, - width / 2 - width_size / 2, height + font_ascent(sc) + 1); + width / 2 - width_size / 2, font_height(sc) + font_ascent(sc) + 1); } void |