From 14ac3391c5d071a67de062f4857280212e12afdb Mon Sep 17 00:00:00 2001
From: oga
Date: Thu, 10 Dec 2009 17:16:51 +0000
Subject: 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@.
---
 menu.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'menu.c')

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));
-- 
cgit v1.2.3-2-gb3c3