diff options
| author | okan | 2011-07-23 13:09:11 +0000 |
|---|---|---|
| committer | okan | 2011-07-23 13:09:11 +0000 |
| commit | 1ef8b9886258d857d0c25c9ab2f5220b4acb8065 (patch) | |
| tree | bf08246298b4cd95fd5b3d97b89660cf97819606 /menu.c | |
| parent | 53b7330bd878e0239dad070d7049347c8423f10e (diff) | |
| download | cwm-1ef8b9886258d857d0c25c9ab2f5220b4acb8065.tar.gz | |
Clarify defines and make them not look like non-local ones; started by a
small diff from Thomas Pfaff.
ok oga@
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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: menu.c,v 1.29 2011/06/27 12:46:54 okan Exp $ + * $OpenBSD: menu.c,v 1.30 2011/07/23 13:09:11 okan Exp $ */ #include <sys/param.h> @@ -113,11 +113,11 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt, ysave = mc.y; if (prompt == NULL) { - evmask = MenuMask; + evmask = MENUMASK; mc.promptstr[0] = '\0'; mc.list = 1; } else { - evmask = MenuMask | KeyMask; /* only accept keys if prompt */ + evmask = MENUMASK | KEYMASK; /* only accept keys if prompt */ snprintf(mc.promptstr, sizeof(mc.promptstr), "%s%s", prompt, PROMPT_SCHAR); snprintf(mc.dispstr, sizeof(mc.dispstr), "%s%s%s", mc.promptstr, @@ -140,7 +140,7 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt, XSelectInput(X_Dpy, sc->menuwin, evmask); XMapRaised(X_Dpy, sc->menuwin); - if (xu_ptr_grab(sc->menuwin, MenuGrabMask, Cursor_question) < 0) { + if (xu_ptr_grab(sc->menuwin, MENUGRABMASK, Cursor_question) < 0) { XUnmapWindow(X_Dpy, sc->menuwin); return (NULL); } @@ -405,11 +405,11 @@ menu_handle_move(XEvent *e, struct menu_ctx *mc, struct screen_ctx *sc) XFillRectangle(X_Dpy, sc->menuwin, sc->gc, 0, font_height(sc) * mc->prev, mc->width, font_height(sc)); if (mc->entry != -1) { - xu_ptr_regrab(MenuGrabMask, Cursor_normal); + xu_ptr_regrab(MENUGRABMASK, Cursor_normal); XFillRectangle(X_Dpy, sc->menuwin, sc->gc, 0, font_height(sc) * mc->entry, mc->width, font_height(sc)); } else - xu_ptr_regrab(MenuGrabMask, Cursor_default); + xu_ptr_regrab(MENUGRABMASK, Cursor_default); } static struct menu * |