diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-03-25 15:16:00 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-03-25 15:16:00 +0000 |
| commit | d6c45db8da203367d57ae380f9f4efe2a0cb9636 (patch) | |
| tree | 341cf6129fe724edad9466a18310713489a3c74a /openbox | |
| parent | 20f4d7fd44a268c1f461495f8c4c8f269aa0f292 (diff) | |
bad idea.. more thought is needed..
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/action.c | 14 | ||||
| -rw-r--r-- | openbox/action.h | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/openbox/action.c b/openbox/action.c index 4187c262..4fd86d30 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1013,7 +1013,7 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, - guint state, gint button, gint x, gint y, Time time, + guint state, guint button, gint x, gint y, Time time, gboolean cancel, gboolean done) { GSList *it; @@ -1621,16 +1621,8 @@ void action_exit(union ActionData *data) void action_showmenu(union ActionData *data) { if (data->showmenu.name) { - gint x, y; - ObClient *c = data->showmenu.any.c; - if (data->any.button == -1 && c) { - x = c->frame->area.x + c->frame->size.left; - y = c->frame->area.y + c->frame->size.top; - } else { - x = data->any.x; - y = data->any.y; - } - menu_show(data->showmenu.name, x, y, c); + menu_show(data->showmenu.name, data->any.x, data->any.y, + data->showmenu.any.c); } } diff --git a/openbox/action.h b/openbox/action.h index 26ae55d5..b1bc081f 100644 --- a/openbox/action.h +++ b/openbox/action.h @@ -212,7 +212,7 @@ ObAction* action_copy(const ObAction *a); affects interactive actions, but should generally always be FALSE. */ void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context, - guint state, gint button, gint x, gint y, Time time, + guint state, guint button, gint x, gint y, Time time, gboolean cancel, gboolean done); #define action_run_mouse(a, c, n, s, b, x, y, t) \ @@ -222,7 +222,7 @@ void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context, action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, t, n, d) #define action_run_key(a, c, s, x, y, t) \ - action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, -1, x, y, t, FALSE, FALSE) + action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, t, FALSE, FALSE) #define action_run(a, c, s, t) \ action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, t, FALSE, FALSE) |