expose focus_cycle_client

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 7b758d30e281409a62a31bcc4353cad152d66d2b..5ece36c7250d4eeba9300e483484e1f450c74136 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -361,6 +361,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         XMapWindow(ob_display, self->bullet);
     } else
         XUnmapWindow(ob_display, self->bullet);
+
+    XFlush(ob_display);
 }
 
 static void menu_frame_render(ObMenuFrame *self)
@@ -514,6 +516,8 @@ static void menu_frame_render(ObMenuFrame *self)
     h += ob_rr_theme->bwidth * 2;
 
     RECT_SET_SIZE(self->area, w, h);
+
+    XFlush(ob_display);
 }
 
 static void menu_frame_update(ObMenuFrame *self)
@@ -711,7 +715,7 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self)
     menu_frame_show(f, self->frame);
 }
 
-void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide)
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
 {
     if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
         self->entry->data.normal.enabled)
@@ -725,31 +729,16 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide)
         ObClient *client = self->frame->client;
 
         /* release grabs before executing the shit */
-        if (hide)
+        if (!(state & ControlMask))
             menu_frame_hide_all();
 
         if (func)
-            func(entry, data);
+            func(entry, state, data);
         else {
             GSList *it;
 
             for (it = acts; it; it = g_slist_next(it))
-            {
-                ObAction *act = it->data;
-                act->data.any.c = client;
-
-                if (act->func == action_moveresize)
-                    screen_pointer_pos(&act->data.moveresize.x,
-                                       &act->data.moveresize.y);
-
-                if (!(act->func == action_cycle_windows ||
-                      act->func == action_desktop_dir ||
-                      act->func == action_send_to_desktop_dir ||
-                      act->func == action_showmenu))
-                {
-                    act->func(&act->data);
-                }
-            }
+                action_run(it->data, client, state);
         }
     }
 }