Add simple menu handling.

1 files changed, 14 insertions, 4 deletions

diff --git a/root.c b/root.c
index 68c6463..fa64df8 100644
--- a/root.c
+++ b/root.c
@@ -43,7 +43,11 @@ static void root_key_press( struct gwm_window *window,
 	if( keyboard_map[ ev->detail ][ 0 ] == key_actions[ i ].keysym &&
 	    ( ev->state & 0xFF & key_actions[ i ].modifiers ) ==
 	    key_actions[ i ].modifiers ) {
-	    key_actions[ i ].handler( window, (xcb_generic_event_t *) ev );
+	    union callback_param cp;
+
+	    cp.p = NULL;
+	    key_actions[ i ].handler( focus_frame ? focus_frame : window,
+				      (xcb_generic_event_t *) ev, cp );
 
 	    break;
 	}
@@ -52,10 +56,12 @@ static void root_key_press( struct gwm_window *window,
 static const struct button_action {
     int button;
     xcb_mod_mask_t modifiers;
-    void ( *handler )( struct gwm_window *window, xcb_generic_event_t *ev );
+    void ( *handler )( struct gwm_window *window, xcb_generic_event_t *ev,
+		       union callback_param cp );
 } button_actions[] = {
     /* FIXME This table should be configurable, of course. */
-    { 1, 0, action_map_all_icons },
+    { 1, 0, action_root_menu },
+    { 2, 0, action_map_all_icons },
     { 3, 0, action_start_xterm }
 };
 
@@ -73,7 +79,11 @@ static void root_button_press( struct gwm_window *window,
 	if( ev->detail == button_actions[ i ].button &&
 	    ( ev->state & 0xFF & button_actions[ i ].modifiers ) ==
 	    button_actions[ i ].modifiers ) {
-	    button_actions[ i ].handler( window, (xcb_generic_event_t *) ev );
+	    union callback_param cp;
+
+	    cp.p = NULL;
+	    button_actions[ i ].handler( window, (xcb_generic_event_t *) ev,
+					 cp );
 
 	    break;
 	}