diff options
| author | oga <oga> | 2009-12-10 17:16:51 +0000 |
|---|---|---|
| committer | oga <oga> | 2009-12-10 17:16:51 +0000 |
| commit | 134e777cf095ae292730e1c9d3f7967099878024 (patch) | |
| tree | 80a226385db61bf2bdf72e0c0b3490f0930303e9 /menu.c | |
| parent | ee7df6a95f80bebc9ec2d8571c1ff8ff2f53cfd0 (diff) | |
| download | cwm-134e777cf095ae292730e1c9d3f7967099878024.tar.gz cwm-134e777cf095ae292730e1c9d3f7967099878024.tar.xz cwm-134e777cf095ae292730e1c9d3f7967099878024.zip | |
finish unfucking the screen_ctx handling.
remove screen_current() it was utterly bogus when nscreens > 1. pass a fake client_ctx in the case where there's no client and the kbfunc or mousefunc doesn't need a real one, it just contains the current screen, modify these functions so that they pass down the screen context to their callees. make groups per screen, it's the only way it makes sense in this regard. ok okan@.
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/menu.c b/menu.c index 2ac0d13..69f0588 100644 --- a/menu.c +++ b/menu.c @@ -69,11 +69,11 @@ menu_init(struct screen_ctx *sc) } struct menu * -menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, +menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt, + char *initial, int dummy, void (*match)(struct menu_q *, struct menu_q *, char *), void (*print)(struct menu *, int)) { - struct screen_ctx *sc; struct menu_ctx mc; struct menu_q resultq; struct menu *mi = NULL; @@ -81,8 +81,6 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy, Window focuswin; int evmask, focusrevert; - sc = screen_current(); - TAILQ_INIT(&resultq); bzero(&mc, sizeof(mc)); |