since the root and event window are the same in the case of a button

event on the screen's root window, there's no need to pass down the
entire XButtonEvent event, at least to group_menu(), the only callback
which takes an argument at this point; instead use the already populated
screen.

1 files changed, 2 insertions, 5 deletions

diff --git a/group.c b/group.c
index 9a66e74..a5a04b2 100644
--- a/group.c
+++ b/group.c
@@ -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: group.c,v 1.77 2013/07/08 15:48:16 okan Exp $
+ * $OpenBSD: group.c,v 1.78 2013/07/09 01:24:49 okan Exp $
  */
 
 #include <sys/param.h>
@@ -309,16 +309,13 @@ group_cycle(struct screen_ctx *sc, int flags)
 }
 
 void
-group_menu(XButtonEvent *e)
+group_menu(struct screen_ctx *sc)
 {
-	struct screen_ctx	*sc;
 	struct group_ctx	*gc;
 	struct menu		*mi;
 	struct menu_q		 menuq;
 	int			 i;
 
-	sc = screen_fromroot(e->root);
-
 	TAILQ_INIT(&menuq);
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {