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

- avoid shadowed Mask declaration in menu_filter

Browse Source 
- make _xev_reincorporate static
evmask naming oga@, input okan@.  ok okan@, oga@
This commit is contained in:
martynas 2009-03-28 16:38:54 +00:00
parent 17ae65adc5
commit 8346de997f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu.c
View File

@ -73,7 +73,7 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
struct menu *mi = NULL; struct menu *mi = NULL;
XEvent e; XEvent e;
Window focuswin; Window focuswin;
int Mask, focusrevert; int evmask, focusrevert;
sc = screen_current(); 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); xu_ptr_getpos(sc->rootwin, &mc.x, &mc.y);
if (prompt == NULL) { if (prompt == NULL) {
Mask = MenuMask; evmask = MenuMask;
mc.promptstr[0] = '\0'; mc.promptstr[0] = '\0';
mc.list = 1; mc.list = 1;
} else { } 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, snprintf(mc.promptstr, sizeof(mc.promptstr), "%s%c", prompt,
PROMPT_SCHAR); PROMPT_SCHAR);
snprintf(mc.dispstr, sizeof(mc.dispstr), "%s%s%c", mc.promptstr, 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, XMoveResizeWindow(X_Dpy, sc->menuwin, mc.x, mc.y, mc.width,
font_height()); font_height());
XSelectInput(X_Dpy, sc->menuwin, Mask); XSelectInput(X_Dpy, sc->menuwin, evmask);
XMapRaised(X_Dpy, sc->menuwin); 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) {
@ -126,7 +126,7 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
for (;;) { for (;;) {
mc.changed = 0; mc.changed = 0;
XWindowEvent(X_Dpy, sc->menuwin, Mask, &e); XWindowEvent(X_Dpy, sc->menuwin, evmask, &e);
switch (e.type) { switch (e.type) {
default: default:

2
xevents.c
View File

@ -431,7 +431,7 @@ xev_register(struct xevent *xev)
TAILQ_INSERT_TAIL(xq, xev, entry); TAILQ_INSERT_TAIL(xq, xev, entry);
} }
void static void
_xev_reincorporate(void) _xev_reincorporate(void)
{ {
struct xevent *xev; struct xevent *xev;