add misc.h with some standard enumerations with proper prefixing and capitalizations.
[mikachu/openbox.git] / openbox / event.c
index 91aa510..11eacbd 100644 (file)
@@ -1,4 +1,5 @@
 #include "openbox.h"
+#include "dock.h"
 #include "client.h"
 #include "xerror.h"
 #include "prop.h"
 #include "extensions.h"
 #include "timer.h"
 #include "dispatch.h"
+#include "event.h"
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <glib.h>
+
+#ifdef USE_LIBSN
+#  include <libsn/sn.h>
+#endif
+
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
+#ifdef HAVE_SIGNAL_H
+#  include <signal.h>
+#endif
+
+#ifdef USE_SM
+#include <X11/ICE/ICElib.h>
+#endif
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
+static void event_handle_dock(Dock *s, XEvent *e);
+static void event_handle_dockapp(DockApp *app, XEvent *e);
 static void event_handle_client(Client *c, XEvent *e);
-static void event_handle_menu(Menu *menu, XEvent *e);
+static void event_handle_menu(Client *c, XEvent *e);
+static void fd_event_handle();
+#ifdef USE_SM
+static void ice_watch(IceConn conn, IcePointer data, Bool opening,
+                      IcePointer *watch_data);
+#endif
+static void find_max_fd();
 
 #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
+                            (e)->xfocus.detail == NotifyAncestor || \
                             (e)->xfocus.detail > NotifyNonlinearVirtual)
 #define INVALID_FOCUSOUT(e) ((e)->xfocus.mode == NotifyGrab || \
                              (e)->xfocus.detail == NotifyInferior || \
@@ -48,6 +72,32 @@ static const int mask_table[] = {
 };
 static int mask_table_size;
 
+static fd_set selset, allset;
+#ifdef USE_SM
+static IceConn ice_conn;
+static int ice_fd;
+#endif
+static int max_fd, x_fd;
+static GData *fd_handler_list;
+
+
+#ifdef USE_SM
+static void ice_watch(IceConn conn, IcePointer data, Bool opening,
+                      IcePointer *watch_data)
+{
+    if (opening) {
+        g_assert (ice_fd < 0);
+        ice_conn = conn;
+        ice_fd = IceConnectionNumber(conn);
+        FD_SET(ice_fd, &allset);
+    } else {
+        FD_CLR(ice_fd, &allset);
+        ice_fd = -1;
+    }
+    find_max_fd();
+}
+#endif
+
 void event_startup()
 {
     mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]);
@@ -74,18 +124,28 @@ void event_startup()
                ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
        }
     }
+
+    FD_ZERO(&allset);
+    max_fd = x_fd = ConnectionNumber(ob_display);
+    FD_SET(x_fd, &allset);
+
+#ifdef USE_SM
+    ice_fd = -1;
+    IceAddConnectionWatch(ice_watch, NULL);
+#endif
+
+    g_datalist_init(&fd_handler_list);
 }
 
 void event_shutdown()
 {
     XFreeModifiermap(modmap);
+    g_datalist_clear(&fd_handler_list);
 }
 
 void event_loop()
 {
-    fd_set selset;
     XEvent e;
-    int x_fd;
     struct timeval *wait;
     gboolean had_event = FALSE;
 
@@ -113,16 +173,31 @@ void event_loop()
        }
        XNextEvent(ob_display, &e);
 
+#ifdef USE_LIBSN
+        sn_display_process_event(ob_sn_display, &e);
+#endif
+
        event_process(&e);
         had_event = TRUE;
     }
 
     if (!had_event) {
         timer_dispatch((GTimeVal**)&wait);
-        x_fd = ConnectionNumber(ob_display);
-        FD_ZERO(&selset);
-        FD_SET(x_fd, &selset);
-        select(x_fd + 1, &selset, NULL, NULL, wait);
+        selset = allset;
+        select(max_fd + 1, &selset, NULL, NULL, wait);
+
+        /* handle the X events as soon as possible? */
+        if (FD_ISSET(x_fd, &selset))
+            return;
+
+#ifdef USE_SM
+        if (ice_fd >= 0 && FD_ISSET(ice_fd, &selset)) {
+            Bool b;
+            IceProcessMessages(ice_conn, NULL, &b);
+        }
+#endif
+
+        fd_event_handle();
     }
 }
 
@@ -144,6 +219,9 @@ static Window event_get_window(XEvent *e)
     case ConfigureRequest:
        window = e->xconfigurerequest.window;
        break;
+    case ConfigureNotify:
+        window = e->xconfigure.window;
+        break;
     default:
 #ifdef XKB
        if (extensions_xkb && e->type == extensions_xkb_event_basep) {
@@ -284,14 +362,13 @@ static gboolean event_ignore(XEvent *e, Client *client)
                   e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
 #endif
 
-        /* Try process a FocusIn first, and if a legit one isn't found, then
-           do the fallback shiznit. */
         {
             XEvent fe;
             gboolean fallback = TRUE;
 
             while (TRUE) {
-                if (!XCheckTypedEvent(ob_display, FocusOut, &fe))
+                if (!XCheckTypedWindowEvent(ob_display, FocusOut,
+                                            e->xfocus.window,&fe))
                     if (!XCheckTypedEvent(ob_display, FocusIn, &fe))
                         break;
                 if (fe.type == FocusOut) {
@@ -309,6 +386,36 @@ static gboolean event_ignore(XEvent *e, Client *client)
 #ifdef DEBUG_FOCUS
                     g_message("found pending FocusIn");
 #endif
+                    /* is the focused window getting a FocusOut/In back to
+                       itself?
+                    */
+                    if (fe.xfocus.window == e->xfocus.window &&
+                        !event_ignore(&fe, client)) {
+                        /*
+                          if focus_client is not set, then we can't do
+                          this. we need the FocusIn. This happens in the
+                          case when the set_focus_client(NULL) in the
+                          focus_fallback function fires and then
+                          focus_fallback picks the currently focused
+                          window (such as on a SendToDesktop-esque action.
+                        */
+                        if (focus_client) {
+#ifdef DEBUG_FOCUS
+                            g_message("focused window got an Out/In back to "
+                                      "itself IGNORED both");
+#endif
+                            return TRUE;
+                        } else {
+                            event_process(&fe);
+#ifdef DEBUG_FOCUS
+                            g_message("focused window got an Out/In back to "
+                                      "itself but focus_client was null "
+                                      "IGNORED just the Out");
+#endif
+                            return TRUE;
+                        }
+                    }
+
                     /* once all the FocusOut's have been dealt with, if there
                        is a FocusIn still left and it is valid, then use it */
                     event_process(&fe);
@@ -338,7 +445,7 @@ static gboolean event_ignore(XEvent *e, Client *client)
             e->xcrossing.detail == NotifyInferior ||
             (e->xcrossing.mode == NotifyUngrab &&
              e->xcrossing.detail == NotifyVirtual)) {
-#ifndef DEBUG_FOCUS
+#ifdef DEBUG_FOCUS
             g_message("%sNotify mode %d detail %d on %lx IGNORED",
                       (e->type == EnterNotify ? "Enter" : "Leave"),
                       e->xcrossing.mode,
@@ -346,7 +453,7 @@ static gboolean event_ignore(XEvent *e, Client *client)
 #endif
             return TRUE;
         }
-#ifndef DEBUG_FOCUS
+#ifdef DEBUG_FOCUS
         g_message("%sNotify mode %d detail %d on %lx",
                   (e->type == EnterNotify ? "Enter" : "Leave"),
                   e->xcrossing.mode,
@@ -360,23 +467,46 @@ static gboolean event_ignore(XEvent *e, Client *client)
 static void event_process(XEvent *e)
 {
     Window window;
-    Client *client;
+    Client *client = NULL;
+    Dock *dock = NULL;
+    DockApp *dockapp = NULL;
     Menu *menu = NULL;
+    ObWindow *obwin = NULL;
 
     window = event_get_window(e);
-    if (!(client = g_hash_table_lookup(client_map, &window)))
-        menu = g_hash_table_lookup(menu_map, &window);
+    if ((obwin = g_hash_table_lookup(window_map, &window))) {
+        switch (obwin->type) {
+        case Window_Dock:
+            dock = WINDOW_AS_DOCK(obwin);
+            break;
+        case Window_DockApp:
+            dockapp = WINDOW_AS_DOCKAPP(obwin);
+            break;
+        case Window_Menu:
+            menu = WINDOW_AS_MENU(obwin);
+            break;
+        case Window_Client:
+            client = WINDOW_AS_CLIENT(obwin);
+            break;
+        case Window_Internal:
+            /* not to be used for events */
+            g_assert_not_reached();
+            break;
+        }
+    }
+
     event_set_lasttime(e);
     event_hack_mods(e);
     if (event_ignore(e, client))
         return;
 
     /* deal with it in the kernel */
-    if (menu) {
-        event_handle_menu(menu, e);
-        return;
-    } else if (client)
+    if (client)
        event_handle_client(client, e);
+    else if (dockapp)
+       event_handle_dockapp(dockapp, e);
+    else if (dock)
+       event_handle_dock(dock, e);
     else if (window == ob_root)
        event_handle_root(e);
     else if (e->type == MapRequest)
@@ -402,12 +532,23 @@ static void event_process(XEvent *e)
        xerror_set_ignore(FALSE);
     }
 
+    if (menu_visible)
+        if (e->type == MotionNotify || e->type == ButtonRelease ||
+            e->type == ButtonPress ||
+            e->type == KeyPress || e->type == KeyRelease) {
+            event_handle_menu(client, e);
+
+            return; /* no dispatch! */
+        }
+
     if (moveresize_in_progress)
         if (e->type == MotionNotify || e->type == ButtonRelease ||
             e->type == ButtonPress ||
             e->type == KeyPress || e->type == KeyRelease) {
             moveresize_event(e);
+
             return; /* no dispatch! */
+            
         }
 
     /* user input (action-bound) events */
@@ -450,6 +591,19 @@ static void event_handle_root(XEvent *e)
        else if (e->xproperty.atom == prop_atoms.net_desktop_layout)
            screen_update_layout();
        break;
+    case ConfigureNotify:
+#ifdef XRANDR
+        XRRUpdateConfiguration(e);
+#endif
+        screen_resize();
+        break;
+    default:
+        ;
+#ifdef VIDMODE
+        if (extensions_vidmode && e->type == extensions_vidmode_event_basep) {
+            g_message("VIDMODE EVENT");
+        }
+#endif
     }
 }
 
@@ -462,46 +616,62 @@ static void event_handle_client(Client *client, XEvent *e)
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
-        switch (frame_context(client, e->xbutton.window)) {
-        case Context_Maximize:
-            client->frame->max_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
-            break;
-        case Context_Close:
-            client->frame->close_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
-            break;
-        case Context_Iconify:
-            client->frame->iconify_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
-            break;
-        case Context_AllDesktops:
-            client->frame->desk_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
-            break; 
-        case Context_Shade:
-            client->frame->shade_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
-            break;
-        default:
-            /* nothing changes with clicks for any other contexts */
-            break;
+        /* Wheel buttons don't draw because they are an instant click, so it
+           is a waste of resources to go drawing it. */
+        if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) {
+            switch (frame_context(client, e->xbutton.window)) {
+            case Context_Maximize:
+                client->frame->max_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case Context_Close:
+                client->frame->close_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case Context_Iconify:
+                client->frame->iconify_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case Context_AllDesktops:
+                client->frame->desk_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break; 
+            case Context_Shade:
+                client->frame->shade_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            default:
+                /* nothing changes with clicks for any other contexts */
+                break;
+            }
         }
         break;
     case FocusIn:
-        focus_set_client(client);
+#ifdef DEBUG_FOCUS
+        g_message("FocusIn on client for %lx", client->window);
+#endif
+        if (client != focus_client) {
+            focus_set_client(client);
+            frame_adjust_focus(client->frame, TRUE);
+        }
+        break;
     case FocusOut:
 #ifdef DEBUG_FOCUS
-        g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"),
-                  client->window);
+        g_message("FocusOut on client for %lx", client->window);
 #endif
-        /* focus state can affect the stacking layer */
-        client_calc_layer(client);
-        frame_adjust_focus(client->frame);
+        /* are we a fullscreen window or a transient of one? (checks layer)
+           if we are then we need to be iconified since we are losing focus
+         */
+        if (client->layer == Layer_Fullscreen && !client->iconic &&
+            !client_search_focus_tree_full(client))
+            /* iconify fullscreen windows when they and their transients
+               aren't focused */
+            client_iconify(client, TRUE, TRUE);
+        frame_adjust_focus(client->frame, FALSE);
        break;
     case EnterNotify:
         if (client_normal(client)) {
-            if (ob_state == State_Starting) {
+            if (ob_state == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
                 guint desktop = client->desktop;
                 if (desktop == DESKTOP_ALL) desktop = screen_desktop;
@@ -552,7 +722,7 @@ static void event_handle_client(Client *client, XEvent *e)
        if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight |
                                               CWX | CWY)) {
            int x, y, w, h;
-           Corner corner;
+           ObCorner corner;
               
            x = (e->xconfigurerequest.value_mask & CWX) ?
                e->xconfigurerequest.x : client->area.x;
@@ -566,33 +736,33 @@ static void event_handle_client(Client *client, XEvent *e)
            switch (client->gravity) {
            case NorthEastGravity:
            case EastGravity:
-               corner = Corner_TopRight;
+               corner = OB_CORNER_TOPRIGHT;
                break;
            case SouthWestGravity:
            case SouthGravity:
-               corner = Corner_BottomLeft;
+               corner = OB_CORNER_BOTTOMLEFT;
                break;
            case SouthEastGravity:
-               corner = Corner_BottomRight;
+               corner = OB_CORNER_BOTTOMRIGHT;
                break;
            default:     /* NorthWest, Static, etc */
-               corner = Corner_TopLeft;
+               corner = OB_CORNER_TOPLEFT;
            }
 
-           client_configure(client, corner, x, y, w, h, FALSE, FALSE);
+           client_configure(client, corner, x, y, w, h, FALSE, TRUE);
        }
 
        if (e->xconfigurerequest.value_mask & CWStackMode) {
            switch (e->xconfigurerequest.detail) {
            case Below:
            case BottomIf:
-               stacking_lower(client);
+               stacking_lower(CLIENT_AS_WINDOW(client));
                break;
 
            case Above:
            case TopIf:
            default:
-               stacking_raise(client);
+               stacking_raise(CLIENT_AS_WINDOW(client));
                break;
            }
        }
@@ -637,7 +807,7 @@ static void event_handle_client(Client *client, XEvent *e)
         if (client->shaded)
             client_shade(client, FALSE);
         client_focus(client);
-        stacking_raise(client);
+        stacking_raise(CLIENT_AS_WINDOW(client));
        break;
     case ClientMessage:
        /* validate cuz we query stuff off the client here */
@@ -692,18 +862,7 @@ static void event_handle_client(Client *client, XEvent *e)
            client_close(client);
        } else if (msgtype == prop_atoms.net_active_window) {
            g_message("net_active_window for 0x%lx", client->window);
-           if (screen_showing_desktop)
-               screen_show_desktop(FALSE);
-           if (client->iconic)
-               client_iconify(client, FALSE, TRUE);
-           else if (!client->frame->visible)
-               /* if its not visible for other reasons, then don't mess
-                  with it */
-               break;
-            if (client->shaded)
-                client_shade(client, FALSE);
-            client_focus(client);
-            stacking_raise(client);
+            client_activate(client);
        } else if (msgtype == prop_atoms.net_wm_moveresize) {
            g_message("net_wm_moveresize for 0x%lx", client->window);
             if ((Atom)e->xclient.data.l[2] ==
@@ -761,7 +920,8 @@ static void event_handle_client(Client *client, XEvent *e)
             else
                 h = client->area.y;
             client->gravity = tmpg;
-            client_configure(client, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
+            client_configure(client, OB_CORNER_TOPLEFT,
+                             x, y, w, h, FALSE, TRUE);
             client->gravity = oldg;
         }
        break;
@@ -796,11 +956,10 @@ static void event_handle_client(Client *client, XEvent *e)
            client_setup_decor_and_functions(client);
        }
        else if (msgtype == prop_atoms.net_wm_name ||
-                msgtype == prop_atoms.wm_name)
-           client_update_title(client);
-       else if (msgtype == prop_atoms.net_wm_icon_name ||
+                msgtype == prop_atoms.wm_name ||
+                 msgtype == prop_atoms.net_wm_icon_name ||
                 msgtype == prop_atoms.wm_icon_name)
-           client_update_icon_title(client);
+           client_update_title(client);
        else if (msgtype == prop_atoms.wm_class)
            client_update_class(client);
        else if (msgtype == prop_atoms.wm_protocols) {
@@ -809,10 +968,9 @@ static void event_handle_client(Client *client, XEvent *e)
        }
        else if (msgtype == prop_atoms.net_wm_strut)
            client_update_strut(client);
-       else if (msgtype == prop_atoms.net_wm_icon)
+       else if (msgtype == prop_atoms.net_wm_icon ||
+                 msgtype == prop_atoms.kwm_win_icon)
            client_update_icons(client);
-       else if (msgtype == prop_atoms.kwm_win_icon)
-           client_update_kwm_icon(client);
     default:
         ;
 #ifdef SHAPE
@@ -824,44 +982,205 @@ static void event_handle_client(Client *client, XEvent *e)
     }
 }
 
-static void event_handle_menu(Menu *menu, XEvent *e)
+static void event_handle_menu(Client *client, XEvent *e)
 {
+    static MenuEntry *over = NULL;
     MenuEntry *entry;
+    Menu *top;
+    GSList *it;
+
+    top = g_slist_nth_data(menu_visible, 0);
 
     g_message("EVENT %d", e->type);
     switch (e->type) {
+    case KeyPress:
+        if (over) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+            over = NULL;
+        }
+/*
+        if (top->hide)
+            top->hide(top);
+        else
+*/
+            menu_hide(top);
+        break;
     case ButtonPress:
-        if (e->xbutton.button == 3)
-            menu_hide(menu);
+        if (e->xbutton.button > 3) break;
+
+       g_message("BUTTON PRESS");
         break;
     case ButtonRelease:
-        if (!menu->shown) break;
-
-/*        grab_pointer_window(FALSE, None, menu->frame);*/
-
-        entry = menu_find_entry(menu, e->xbutton.window);
-        if (entry) {
-            int junk;
-            Window wjunk;
-            guint ujunk, b, w, h;
-            XGetGeometry(ob_display, e->xbutton.window,
-                         &wjunk, &junk, &junk, &w, &h, &b, &ujunk);
-            if (e->xbutton.x >= (signed)-b &&
-                e->xbutton.y >= (signed)-b &&
-                e->xbutton.x < (signed)(w+b) &&
-                e->xbutton.y < (signed)(h+b)) {
-                menu_entry_fire(entry);
+        if (e->xbutton.button > 3) break;
+
+       g_message("BUTTON RELEASED");
+
+        for (it = menu_visible; it; it = g_slist_next(it)) {
+            Menu *m = it->data;
+            if (e->xbutton.x_root >= m->location.x - ob_rr_theme->bwidth &&
+                e->xbutton.y_root >= m->location.y - ob_rr_theme->bwidth &&
+                e->xbutton.x_root < m->location.x + m->size.width +
+                ob_rr_theme->bwidth &&
+                e->xbutton.y_root < m->location.y + m->size.height +
+                ob_rr_theme->bwidth) {
+                if ((entry = menu_find_entry_by_pos(it->data,
+                                                    e->xbutton.x_root -
+                                                    m->location.x,
+                                                    e->xbutton.y_root -
+                                                    m->location.y))) {
+                    if (over) {
+                        if (over->parent->mouseover)
+                            over->parent->mouseover(over, FALSE);
+                        else
+                            menu_control_mouseover(over, FALSE); 
+                        menu_entry_render(over);
+                        over = NULL;
+                        /* this hides the menu */
+                        menu_entry_fire(entry);
+                    }
+                }
+                break;
+            }
+        }
+        if (!it) {
+            if (over) {
+                if (over->parent->mouseover)
+                    over->parent->mouseover(over, FALSE);
+                else
+                    menu_control_mouseover(over, FALSE); 
+                menu_entry_render(over);
+                over = NULL;
+            }
+/*
+            if (top->hide)
+                top->hide(top);
+            else
+*/
+                menu_hide(top);
+        }
+       
+        break;
+    case MotionNotify:
+        g_message("motion");
+        for (it = menu_visible; it; it = g_slist_next(it)) {
+            Menu *m = it->data;
+            if ((entry = menu_find_entry_by_pos(it->data,
+                                                e->xmotion.x_root -
+                                                m->location.x,
+                                                e->xmotion.y_root -
+                                                m->location.y))) {
+                if (over && entry != over) {
+                    if (over->parent->mouseover)
+                        over->parent->mouseover(over, FALSE);
+                    else
+                        menu_control_mouseover(over, FALSE);
+                    menu_entry_render(over);
+                }
+
+                over = entry;
+                if (over->parent->mouseover)
+                    over->parent->mouseover(over, TRUE);
+                else
+                    menu_control_mouseover(over, TRUE);
+                menu_entry_render(over);
+                break;
             }
         }
+        if (!it && over) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+            over = NULL;
+        }
+        break;
+    }
+}
+
+void event_add_fd_handler(event_fd_handler *h) {
+    g_datalist_id_set_data(&fd_handler_list, h->fd, h);
+    FD_SET(h->fd, &allset);
+    max_fd = MAX(max_fd, h->fd);
+}
+
+static void find_max_fd_foreach(GQuark n, gpointer data, gpointer max)
+{
+    *((unsigned int *)max) = MAX(*((unsigned int *)max), n);
+}
+
+static void find_max_fd()
+{ 
+    int tmpmax = -1;
+    g_datalist_foreach(&fd_handler_list, find_max_fd_foreach,
+                       (gpointer)&tmpmax);
+    max_fd = MAX(x_fd, tmpmax);
+#ifdef USE_SM
+    max_fd = MAX(ice_fd, tmpmax);
+#endif
+}
+
+void event_remove_fd(int n)
+{
+    FD_CLR(n, &allset);
+    g_datalist_id_remove_data(&fd_handler_list, (GQuark)n);
+    find_max_fd();
+}
+
+static void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data)
+{
+    if (FD_ISSET( (int)n, &selset)) {
+        event_fd_handler *h = (event_fd_handler *)data;
+        g_assert(h->fd == (int)n);
+        h->handler(h->fd, h->data);
+    }
+}
+
+static void fd_event_handle()
+{
+    g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL);
+}
+
+static void event_handle_dock(Dock *s, XEvent *e)
+{
+    switch (e->type) {
+    case ButtonPress:
+        stacking_raise(DOCK_AS_WINDOW(s));
         break;
     case EnterNotify:
+        dock_hide(FALSE);
+        break;
     case LeaveNotify:
-        g_message("enter/leave");
-        entry = menu_find_entry(menu, e->xcrossing.window);
-        if (entry) {
-            entry->hilite = e->type == EnterNotify;
-            menu_entry_render(entry);
-        }
+        dock_hide(TRUE);
+        break;
+    }
+}
+
+static void event_handle_dockapp(DockApp *app, XEvent *e)
+{
+    switch (e->type) {
+    case MotionNotify:
+        dock_app_drag(app, &e->xmotion);
+        break;
+    case UnmapNotify:
+       if (app->ignore_unmaps) {
+           app->ignore_unmaps--;
+           break;
+       }
+       dock_remove(app, TRUE);
+       break;
+    case DestroyNotify:
+       dock_remove(app, FALSE);
+       break;
+    case ReparentNotify:
+       dock_remove(app, FALSE);
+       break;
+    case ConfigureNotify:
+        dock_app_configure(app, e->xconfigure.width, e->xconfigure.height);
         break;
     }
 }