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

add a height to struct menu and use it in the most obvious of places.

Browse Source
This commit is contained in:
okan 2012-10-23 16:08:59 +00:00
parent 637c52abf8
commit 710347df1b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu.c
View File

@ -51,6 +51,7 @@ struct menu_ctx {
int noresult; int noresult;
int prev; int prev;
int entry; int entry;
int height;
int width; int width;
int num; int num;
int x; int x;
@ -301,7 +302,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
struct menu *mi; struct menu *mi;
XineramaScreenInfo *xine; XineramaScreenInfo *xine;
int xmin, xmax, ymin, ymax; int xmin, xmax, ymin, ymax;
int n, dy, xsave, ysave; int n, xsave, ysave;
if (mc->list) { if (mc->list) {
if (TAILQ_EMPTY(resultq) && mc->list) { if (TAILQ_EMPTY(resultq) && mc->list) {
@ -317,12 +318,12 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
mc->num = 0; mc->num = 0;
mc->width = 0; mc->width = 0;
dy = 0; mc->height = 0;
if (mc->hasprompt) { if (mc->hasprompt) {
(void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s", (void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s",
mc->promptstr, mc->searchstr, PROMPT_ECHAR); mc->promptstr, mc->searchstr, PROMPT_ECHAR);
mc->width = font_width(sc, mc->dispstr, strlen(mc->dispstr)); mc->width = font_width(sc, mc->dispstr, strlen(mc->dispstr));
dy = font_height(sc); mc->height = font_height(sc);
mc->num = 1; mc->num = 1;
} }
@ -339,7 +340,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
mc->width = MAX(mc->width, font_width(sc, text, mc->width = MAX(mc->width, font_width(sc, text,
MIN(strlen(text), MENU_MAXENTRY))); MIN(strlen(text), MENU_MAXENTRY)));
dy += font_height(sc); mc->height += font_height(sc);
mc->num++; mc->num++;
} }
@ -365,19 +366,20 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
mc->width = xmax - xmin; mc->width = xmax - xmin;
} }
if (mc->y + dy >= ymax) if (mc->y + mc->height >= ymax)
mc->y = ymax - dy; mc->y = ymax - mc->height;
/* never hide the top of the menu */ /* never hide the top of the menu */
if (mc->y < ymin) { if (mc->y < ymin) {
mc->y = ymin; mc->y = ymin;
dy = ymax - ymin; mc->height = ymax - ymin;
} }
if (mc->x != xsave || mc->y != ysave) if (mc->x != xsave || mc->y != ysave)
xu_ptr_setpos(sc->rootwin, mc->x, mc->y); xu_ptr_setpos(sc->rootwin, mc->x, mc->y);
XClearWindow(X_Dpy, sc->menuwin); XClearWindow(X_Dpy, sc->menuwin);
XMoveResizeWindow(X_Dpy, sc->menuwin, mc->x, mc->y, mc->width, dy); XMoveResizeWindow(X_Dpy, sc->menuwin, mc->x, mc->y,
mc->width, mc->height);
if (mc->hasprompt) { if (mc->hasprompt) {
font_draw(sc, mc->dispstr, strlen(mc->dispstr), sc->menuwin, font_draw(sc, mc->dispstr, strlen(mc->dispstr), sc->menuwin,