draw menu separators

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 42eea890b2fea4add7c442baf05b55324ea8c5a5..b517014a795df3334fdf470c5b101c7fb6934359 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -1,3 +1,4 @@
+#include "mainloop.h"
 #include "focus.h"
 #include "screen.h"
 #include "frame.h"
@@ -7,7 +8,6 @@
 #include "client.h"
 #include "action.h"
 #include "prop.h"
-#include "timer.h"
 #include "config.h"
 #include "keytree.h"
 #include "keyboard.h"
@@ -27,7 +27,6 @@ typedef struct {
 static GSList *interactive_states;
 
 static KeyBindingTree *curpos;
-static ObTimer *chain_timer;
 
 static void grab_for_window(Window win, gboolean grab)
 {
@@ -62,23 +61,23 @@ static void grab_keys(gboolean grab)
         grab_for_window(((ObClient*)it->data)->frame->window, grab);
 }
 
+static gboolean chain_timeout(gpointer data)
+{
+    keyboard_reset_chains();
+
+    return FALSE; /* don't repeat */
+}
+
 void keyboard_reset_chains()
 {
-    if (chain_timer) {
-        timer_stop(chain_timer);
-        chain_timer = NULL;
-    }
+    ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+
     if (curpos) {
         curpos = NULL;
         grab_keys(TRUE);
     }
 }
 
-static void chain_timeout(ObTimer *t, void *data)
-{
-    keyboard_reset_chains();
-}
-
 gboolean keyboard_bind(GList *keylist, ObAction *action)
 {
     KeyBindingTree *tree, *t;
@@ -164,18 +163,10 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
                 cancel = done = TRUE;
         }
         if (done) {
-            if (s->action->func == action_cycle_windows) {
-                s->action->data.cycle.cancel = cancel;
-                s->action->data.cycle.final = TRUE;
-            }
-            if (s->action->func == action_desktop_dir) {
-                s->action->data.desktopdir.cancel = cancel;
-                s->action->data.desktopdir.final = TRUE;
-            }
-            if (s->action->func == action_send_to_desktop_dir) {
-                s->action->data.sendtodir.cancel = cancel;
-                s->action->data.sendtodir.final = TRUE;
-            }
+            g_assert(s->action->data.any.interactive);
+
+            s->action->data.inter.cancel = cancel;
+            s->action->data.inter.final = TRUE;
 
             s->action->func(&s->action->data);
 
@@ -213,10 +204,10 @@ void keyboard_event(ObClient *client, const XEvent *e)
         if (p->key == e->xkey.keycode &&
             p->state == e->xkey.state) {
             if (p->first_child != NULL) { /* part of a chain */
-                if (chain_timer) timer_stop(chain_timer);
+                ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
                 /* 5 second timeout for chains */
-                chain_timer = timer_start(5000*1000, chain_timeout,
-                                          NULL);
+                ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
+                                         chain_timeout, NULL, NULL);
                 curpos = p;
                 grab_keys(TRUE);
             } else {
@@ -226,38 +217,19 @@ void keyboard_event(ObClient *client, const XEvent *e)
                     if (act->func != NULL) {
                         act->data.any.c = client;
 
-                        if (act->func == action_cycle_windows)
-                        {
-                            act->data.cycle.final = FALSE;
-                            act->data.cycle.cancel = FALSE;
-                        }
-                        if (act->func == action_desktop_dir)
-                        {
-                            act->data.desktopdir.final = FALSE;
-                            act->data.desktopdir.cancel = FALSE;
-                        }
-                        if (act->func == action_send_to_desktop_dir)
-                        {
-                            act->data.sendtodir.final = FALSE;
-                            act->data.sendtodir.cancel = FALSE;
-                        }
-
-                        if (act->func == action_moveresize)
-                        {
+                        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))
-                        {
+                        if (act->data.any.interactive) {
+                            act->data.inter.cancel = FALSE;
+                            act->data.inter.final = FALSE;
                             keyboard_interactive_grab(e->xkey.state, client,
                                                       0, act);
                         }
 
-                        if (act->func == action_showmenu)
-                        {
+                        if (act->func == action_showmenu) {
                             act->data.showmenu.x = e->xkey.x_root;
                             act->data.showmenu.y = e->xkey.y_root;
                         }