X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fshowmenu.c;h=c1d53e41d8c76fbc74ac7d147cccdcfa69b50fd7;hb=ffaac4a65043b6d4ea1e358d17f68f8c703db73d;hp=6b6cbbe0f10053f6bbbb7131259f4fee048614db;hpb=38268dc917ac9e59d9e8ef87825c9489ced77e95;p=chaz%2Fopenbox

diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
index 6b6cbbe0..c1d53e41 100644
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/showmenu.c
@@ -1,4 +1,5 @@
 #include "openbox/actions.h"
+#include "openbox/menu.h"
 #include <glib.h>
 
 typedef struct {
@@ -8,20 +9,10 @@ typedef struct {
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
-/*
-static gboolean i_input_func(guint initial_state,
-                             XEvent *e,
-                             gpointer options,
-                             gboolean *used);
-static void     i_cancel_func(gpointer options);
-*/
 
-void action_showmenu_startup()
+void action_showmenu_startup(void)
 {
-    actions_register("ShowMenu",
-                     setup_func,
-                     free_func,
-                     run_func,
+    actions_register("ShowMenu", setup_func, free_func, run_func,
                      NULL, NULL);
 }
 
@@ -40,11 +31,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 static void free_func(gpointer options)
 {
     Options *o = options;
-
-    if (o) {
-        g_free(o->name);
-        g_free(o);
-    }
+    g_free(o->name);
+    g_free(o);
 }
 
 /* Always return FALSE because its not interactive */
@@ -53,17 +41,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
 
     /* you cannot call ShowMenu from inside a menu */
-    if (data->uact == OB_USER_ACTION_MENU_SELECTION) return FALSE;
-
-    if (o->name) {
-        gboolean mouse = (data->uact == OB_USER_ACTION_MOUSE_PRESS ||
-                          data->uact == OB_USER_ACTION_MOUSE_RELEASE ||
-                          data->uact == OB_USER_ACTION_MOUSE_CLICK ||
-                          data->uact == OB_USER_ACTION_MOUSE_DOUBLE_CLICK ||
-                          data->uact == OB_USER_ACTION_MOUSE_MOTION);
-
-        menu_show(o->name, data->x, data->y, mouse, data->client);
-    }
+    if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name)
+        menu_show(o->name, data->x, data->y, data->button != 0, data->client);
 
     return FALSE;
 }