add autohiding to the slit

4 files changed, 61 insertions, 5 deletions

diff --git a/openbox/event.c b/openbox/event.c
index 9a351f73..a9eb0fa5 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -24,6 +24,7 @@
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
+static void event_handle_slit(Slit *s, XEvent *e);
 static void event_handle_slitapp(SlitApp *app, XEvent *e);
 static void event_handle_client(Client *c, XEvent *e);
 static void event_handle_menu(Menu *menu, XEvent *e);
@@ -376,13 +377,15 @@ static void event_process(XEvent *e)
 {
     Window window;
     Client *client = NULL;
+    Slit *slit = NULL;
     SlitApp *slitapp = NULL;
     Menu *menu = NULL;
 
     window = event_get_window(e);
     if (!(client = g_hash_table_lookup(client_map, &window)))
         if (!(slitapp = g_hash_table_lookup(slit_app_map, &window)))
-            menu = g_hash_table_lookup(menu_map, &window);
+            if (!(slit = g_hash_table_lookup(slit_map, &window)))
+                menu = g_hash_table_lookup(menu_map, &window);
 
     event_set_lasttime(e);
     event_hack_mods(e);
@@ -397,6 +400,8 @@ static void event_process(XEvent *e)
 	event_handle_client(client, e);
     else if (slitapp)
 	event_handle_slitapp(slitapp, e);
+    else if (slit)
+	event_handle_slit(slit, e);
     else if (window == ob_root)
 	event_handle_root(e);
     else if (e->type == MapRequest)
@@ -908,6 +913,18 @@ static void event_handle_menu(Menu *menu, XEvent *e)
     }
 }
 
+static void event_handle_slit(Slit *s, XEvent *e)
+{
+    switch (e->type) {
+    case EnterNotify:
+        slit_hide(s, FALSE);
+        break;
+    case LeaveNotify:
+        slit_hide(s, TRUE);
+        break;
+    }
+}
+
 static void event_handle_slitapp(SlitApp *app, XEvent *e)
 {
     switch (e->type) {
diff --git a/openbox/slit.c b/openbox/slit.c
index 98eb010e..a43edccf 100644
--- a/openbox/slit.c
+++ b/openbox/slit.c
@@ -1,10 +1,11 @@
 #include "slit.h"
 #include "screen.h"
+#include "timer.h"
 #include "openbox.h"
 #include "render/theme.h"
 #include "render/render.h"
 
-#define SLIT_EVENT_MASK (EnterNotifyMask | LeaveNotifyMask)
+#define SLIT_EVENT_MASK (EnterWindowMask | LeaveWindowMask)
 #define SLITAPP_EVENT_MASK (StructureNotifyMask)
 
 struct Slit {
@@ -25,6 +26,8 @@ struct Slit {
 
     Appearance *a_frame;
 
+    Timer *hide_timer;
+
     GList *slit_apps;
 };
 
@@ -50,13 +53,15 @@ void slit_startup()
     for (i = 0; i < nslits; ++i) {
         slit[i].horz = FALSE;
         slit[i].hide = TRUE;
-        slit[i].hidden = FALSE;
+        slit[i].hidden = TRUE;
         slit[i].pos = SlitPos_TopRight;
 
+        attrib.event_mask = SLIT_EVENT_MASK;
         attrib.override_redirect = True;
         slit[i].frame = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
                                       render_depth, InputOutput, render_visual,
-                                      CWOverrideRedirect, &attrib);
+                                      CWOverrideRedirect | CWEventMask,
+                                      &attrib);
         slit[i].a_frame = appearance_copy(theme_a_unfocused_title);
         XSetWindowBorder(ob_display, slit[i].frame, theme_b_color->pixel);
         XSetWindowBorderWidth(ob_display, slit[i].frame, theme_bwidth);
@@ -330,3 +335,35 @@ void slit_app_configure(SlitApp *app, int w, int h)
     app->h = h;
     slit_configure(app->slit);
 }
+
+static void hide_timeout(Slit *self)
+{
+    /* dont repeat */
+    timer_stop(self->hide_timer);
+    self->hide_timer = NULL;
+
+    /* hide */
+    self->hidden = TRUE;
+    slit_configure(self);
+}
+
+void slit_hide(Slit *self, gboolean hide)
+{
+    if (self->hidden == hide)
+        return;
+    if (!hide) {
+        /* show */
+        self->hidden = FALSE;
+        slit_configure(self);
+
+        /* if was hiding, stop it */
+        if (self->hide_timer) {
+            timer_stop(self->hide_timer);
+            self->hide_timer = NULL;
+        }
+    } else {
+        g_assert(!self->hide_timer);
+        self->hide_timer = timer_start(3000000,
+                                       (TimeoutHandler)hide_timeout, self);
+    }
+}
diff --git a/openbox/slit.h b/openbox/slit.h
index d7e9efa7..ded94621 100644
--- a/openbox/slit.h
+++ b/openbox/slit.h
@@ -31,12 +31,14 @@ typedef enum {
     SlitPos_Left
 } SlitPosition;
 
+extern GHashTable *slit_map;
 extern GHashTable *slit_app_map;
 
 void slit_startup();
 void slit_shutdown();
 
 void slit_configure_all();
+void slit_hide(Slit *self, gboolean hide);
 
 void slit_add(Window win, XWMHints *wmhints, XWindowAttributes *attrib);
 
diff --git a/openbox/timer.h b/openbox/timer.h
index da6c8642..e50ffa8c 100644
--- a/openbox/timer.h
+++ b/openbox/timer.h
@@ -7,7 +7,7 @@
 typedef void (*TimeoutHandler)(void *data);
 
 typedef struct Timer {
-    /*! Milliseconds between timer firings */
+    /*! Microseconds between timer firings */
     long delay;
     /*! Callback for timer expiry */
     TimeoutHandler action;