diff options
| author | martynas <martynas> | 2009-03-28 16:38:54 +0000 |
|---|---|---|
| committer | martynas <martynas> | 2009-03-28 16:38:54 +0000 |
| commit | 8346de997f4b33d7d039076fa9ccb5ce3ff0425a (patch) | |
| tree | a7359f224828c537e1476cd701f3aa692474be5f /menu.c | |
| parent | 17ae65adc59532b77d845c823b9902f7feff1f23 (diff) | |
| download | cwm-8346de997f4b33d7d039076fa9ccb5ce3ff0425a.tar.gz cwm-8346de997f4b33d7d039076fa9ccb5ce3ff0425a.tar.xz cwm-8346de997f4b33d7d039076fa9ccb5ce3ff0425a.zip | |
- avoid shadowed Mask declaration in menu_filter
- make _xev_reincorporate static evmask naming oga@, input okan@. ok okan@, oga@
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/menu.c b/menu.c index 5b60b67..7d0e1d8 100644 --- a/menu.c +++ b/menu.c @@ -73,7 +73,7 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, struct menu *mi = NULL; XEvent e; Window focuswin; - int Mask, focusrevert; + int evmask, focusrevert; sc = screen_current(); @@ -84,11 +84,11 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, xu_ptr_getpos(sc->rootwin, &mc.x, &mc.y); if (prompt == NULL) { - Mask = MenuMask; + evmask = MenuMask; mc.promptstr[0] = '\0'; mc.list = 1; } else { - Mask = MenuMask | KeyMask; /* only accept keys if prompt */ + evmask = MenuMask | KeyMask; /* only accept keys if prompt */ snprintf(mc.promptstr, sizeof(mc.promptstr), "%s%c", prompt, PROMPT_SCHAR); snprintf(mc.dispstr, sizeof(mc.dispstr), "%s%s%c", mc.promptstr, @@ -108,7 +108,7 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, XMoveResizeWindow(X_Dpy, sc->menuwin, mc.x, mc.y, mc.width, font_height()); - XSelectInput(X_Dpy, sc->menuwin, Mask); + XSelectInput(X_Dpy, sc->menuwin, evmask); XMapRaised(X_Dpy, sc->menuwin); if (xu_ptr_grab(sc->menuwin, MenuGrabMask, Cursor_question) < 0) { @@ -126,7 +126,7 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, for (;;) { mc.changed = 0; - XWindowEvent(X_Dpy, sc->menuwin, Mask, &e); + XWindowEvent(X_Dpy, sc->menuwin, evmask, &e); switch (e.type) { default: |