]> Dogcows Code - chaz/openbox/blobdiff - openbox/event.c
new method for loading menu files etc
[chaz/openbox] / openbox / event.c
index a9112fdb6c57b4b0896c5deff11516c493ccdb51..094d19fe2267ce4b0045b3c9ee06f0bcd5119f02 100644 (file)
@@ -1,27 +1,65 @@
+#include "debug.h"
 #include "openbox.h"
+#include "dock.h"
 #include "client.h"
 #include "xerror.h"
 #include "prop.h"
 #include "config.h"
 #include "screen.h"
 #include "frame.h"
+#include "menu.h"
+#include "menuframe.h"
+#include "keyboard.h"
+#include "mouse.h"
 #include "framerender.h"
 #include "focus.h"
+#include "moveresize.h"
 #include "stacking.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_client(Client *c, XEvent *e);
+static void event_handle_menu(XEvent *e);
+static void event_handle_dock(ObDock *s, XEvent *e);
+static void event_handle_dockapp(ObDockApp *app, XEvent *e);
+static void event_handle_client(ObClient *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 || \
+                             (e)->xfocus.detail == NotifyAncestor || \
+                             (e)->xfocus.detail > NotifyNonlinearVirtual)
 
 Time event_lasttime = 0;
 
@@ -38,6 +76,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]);
@@ -64,52 +128,60 @@ 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;
 
-    while (TRUE) {
-       /*
-         There are slightly different event retrieval semantics here for
-         local (or high bandwidth) versus remote (or low bandwidth)
-         connections to the display/Xserver.
-       */
-       if (ob_remote) {
-           if (!XPending(ob_display))
-               break;
-       } else {
-           /*
-             This XSync allows for far more compression of events, which
-             makes things like Motion events perform far far better. Since
-             it also means network traffic for every event instead of every
-             X events (where X is the number retrieved at a time), it
-             probably should not be used for setups where Openbox is
-             running on a remote/low bandwidth display/Xserver.
-           */
-           XSync(ob_display, FALSE);
-           if (!XEventsQueued(ob_display, QueuedAlready))
-               break;
-       }
+    while (XPending(ob_display)) {
        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);
+        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();
     }
-     
-    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);
 }
 
 static Window event_get_window(XEvent *e)
@@ -118,6 +190,9 @@ static Window event_get_window(XEvent *e)
 
     /* pick a window */
     switch (e->type) {
+    case SelectionClear:
+        window = RootWindow(ob_display, ob_screen);
+        break;
     case MapRequest:
        window = e->xmap.window;
        break;
@@ -130,12 +205,15 @@ 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) {
-           switch (((XkbAnyEvent*)&e)->xkb_type) {
+           switch (((XkbAnyEvent*)e)->xkb_type) {
            case XkbBellNotify:
-               window = ((XkbBellNotifyEvent*)&e)->window;
+               window = ((XkbBellNotifyEvent*)e)->window;
            default:
                window = None;
            }
@@ -148,32 +226,38 @@ static Window event_get_window(XEvent *e)
 
 static void event_set_lasttime(XEvent *e)
 {
+    Time t = 0;
+
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
-       event_lasttime = e->xbutton.time;
+       t = e->xbutton.time;
        break;
     case KeyPress:
-       event_lasttime = e->xkey.time;
+       t = e->xkey.time;
        break;
     case KeyRelease:
-       event_lasttime = e->xkey.time;
+       t = e->xkey.time;
        break;
     case MotionNotify:
-       event_lasttime = e->xmotion.time;
+       t = e->xmotion.time;
        break;
     case PropertyNotify:
-       event_lasttime = e->xproperty.time;
+       t = e->xproperty.time;
        break;
     case EnterNotify:
     case LeaveNotify:
-       event_lasttime = e->xcrossing.time;
+       t = e->xcrossing.time;
        break;
     default:
-        event_lasttime = CurrentTime;
+        /* if more event types are anticipated, get their timestamp
+           explicitly */
         break;
     }
+
+    if (t > event_lasttime)
+        event_lasttime = t;
 }
 
 #define STRIP_MODS(s) \
@@ -215,6 +299,7 @@ static void event_hack_mods(XEvent *e)
        break;
     case MotionNotify:
         STRIP_MODS(e->xmotion.state);
+#if 0
        /* compress events */
         {
             XEvent ce;
@@ -224,27 +309,27 @@ static void event_hack_mods(XEvent *e)
                 e->xmotion.y_root = ce.xmotion.y_root;
             }
        }
+#endif
        break;
     }
 }
 
-static gboolean event_ignore(XEvent *e, Client *client)
+static gboolean event_ignore(XEvent *e, ObClient *client)
 {
     switch(e->type) {
     case FocusIn:
-#ifdef DEBUG_FOCUS
-        g_message("FocusIn on %lx mode %d detail %d", window,
-                  e->xfocus.mode, e->xfocus.detail);
-#endif
         /* NotifyAncestor is not ignored in FocusIn like it is in FocusOut
            because of RevertToPointerRoot. If the focus ends up reverting to
            pointer root on a workspace change, then the FocusIn event that we
            want will be of type NotifyAncestor. This situation does not occur
            for FocusOut, so it is safely ignored there.
         */
-       if (e->xfocus.detail == NotifyInferior ||
-            e->xfocus.detail > NotifyNonlinearVirtual ||
+       if (INVALID_FOCUSIN(e) ||
             client == NULL) {
+#ifdef DEBUG_FOCUS
+        ob_debug("FocusIn on %lx mode %d detail %d IGNORED\n",
+                 e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
+#endif
             /* says a client was not found for the event (or a valid FocusIn
                event was not found.
             */
@@ -253,54 +338,121 @@ static gboolean event_ignore(XEvent *e, Client *client)
         }
 
 #ifdef DEBUG_FOCUS
-        g_message("FocusIn on %lx", window);
+        ob_debug("FocusIn on %lx mode %d detail %d\n", e->xfocus.window,
+                 e->xfocus.mode, e->xfocus.detail);
 #endif
         break;
     case FocusOut:
+       if (INVALID_FOCUSOUT(e)) {
 #ifdef DEBUG_FOCUS
-        g_message("FocusOut on %lx mode %d detail %d", window,
-                  e->xfocus.mode, e->xfocus.detail);
+        ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n",
+                 e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
 #endif
-       if (e->xfocus.mode == NotifyGrab ||
-            e->xfocus.detail == NotifyInferior ||
-            e->xfocus.detail == NotifyAncestor ||
-            e->xfocus.detail > NotifyNonlinearVirtual) return TRUE;
+            return TRUE;
+        }
+
 #ifdef DEBUG_FOCUS
-       g_message("FocusOut on %lx", window);
+        ob_debug("FocusOut on %lx mode %d detail %d\n",
+                 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 fi, fo;
-            gboolean isfo = FALSE;
-
-            if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
-               event_process(&fi);
-
-                /* when we have gotten a fi/fo pair, then see if there are any
-                   more fo's coming. if there are, then don't fallback just yet
-                */
-                if ((isfo = XCheckTypedEvent(ob_display, FocusOut, &fo)))
-                    XPutBackEvent(ob_display, &fo);
-
-                /* secret magic way of event_process telling us that no client
-                   was found for the FocusIn event. ^_^ */
-                if (!isfo && fi.xfocus.window == None)
-                    focus_fallback(Fallback_NoFocus);
-                if (fi.xfocus.window == e->xfocus.window)
-                    return TRUE;
-            } else
-                focus_fallback(Fallback_NoFocus);
+            XEvent fe;
+            gboolean fallback = TRUE;
+
+            while (TRUE) {
+                if (!XCheckTypedWindowEvent(ob_display, FocusOut,
+                                            e->xfocus.window,&fe))
+                    if (!XCheckTypedEvent(ob_display, FocusIn, &fe))
+                        break;
+                if (fe.type == FocusOut) {
+#ifdef DEBUG_FOCUS
+                    ob_debug("found pending FocusOut");
+#endif
+                    if (!INVALID_FOCUSOUT(&fe)) {
+                        /* if there is a VALID FocusOut still coming, don't
+                           fallback focus yet, we'll deal with it then */
+                        XPutBackEvent(ob_display, &fe);
+                        fallback = FALSE;
+                        break;
+                    }
+                } else {
+#ifdef DEBUG_FOCUS
+                    ob_debug("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
+                            ob_debug("focused window got an Out/In back to "
+                                     "itself IGNORED both");
+#endif
+                            return TRUE;
+                        } else {
+                            event_process(&fe);
+#ifdef DEBUG_FOCUS
+                            ob_debug("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);
+                    /* secret magic way of event_process telling us that no
+                       client was found for the FocusIn event. ^_^ */
+                    if (fe.xfocus.window != None) {
+                        fallback = FALSE;
+                        break;
+                    }
+                }
+            }
+            if (fallback) {
+#ifdef DEBUG_FOCUS
+                ob_debug("no valid FocusIn and no FocusOut events found, "
+                         "falling back");
+#endif
+                focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+            }
         }
        break;
     case EnterNotify:
     case LeaveNotify:
         /* NotifyUngrab occurs when a mouse button is released and the event is
            caused, like when lowering a window */
+        /* NotifyVirtual occurs when ungrabbing the pointer */
         if (e->xcrossing.mode == NotifyGrab ||
-            e->xcrossing.detail == NotifyInferior)
+            e->xcrossing.detail == NotifyInferior ||
+            (e->xcrossing.mode == NotifyUngrab &&
+             e->xcrossing.detail == NotifyVirtual)) {
+#ifdef DEBUG_FOCUS
+            ob_debug("%sNotify mode %d detail %d on %lx IGNORED",
+                     (e->type == EnterNotify ? "Enter" : "Leave"),
+                     e->xcrossing.mode,
+                     e->xcrossing.detail, client?client->window:0);
+#endif
             return TRUE;
+        }
+#ifdef DEBUG_FOCUS
+        ob_debug("%sNotify mode %d detail %d on %lx",
+                 (e->type == EnterNotify ? "Enter" : "Leave"),
+                 e->xcrossing.mode,
+                 e->xcrossing.detail, client?client->window:0);
+#endif
        break;
     }
     return FALSE;
@@ -309,10 +461,31 @@ static gboolean event_ignore(XEvent *e, Client *client)
 static void event_process(XEvent *e)
 {
     Window window;
-    Client *client;
+    ObClient *client = NULL;
+    ObDock *dock = NULL;
+    ObDockApp *dockapp = NULL;
+    ObWindow *obwin = NULL;
 
     window = event_get_window(e);
-    client = g_hash_table_lookup(client_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_Client:
+            client = WINDOW_AS_CLIENT(obwin);
+            break;
+        case Window_Menu:
+        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))
@@ -321,7 +494,11 @@ static void event_process(XEvent *e)
     /* deal with it in the kernel */
     if (client)
        event_handle_client(client, e);
-    else if (window == ob_root)
+    else if (dockapp)
+       event_handle_dockapp(dockapp, e);
+    else if (dock)
+       event_handle_dock(dock, e);
+    else if (window == RootWindow(ob_display, ob_screen))
        event_handle_root(e);
     else if (e->type == MapRequest)
        client_manage(window);
@@ -346,14 +523,42 @@ static void event_process(XEvent *e)
        xerror_set_ignore(FALSE);
     }
 
+    if (menu_frame_visible)
+        if (e->type == MotionNotify || e->type == ButtonRelease ||
+            e->type == ButtonPress ||
+            e->type == KeyPress || e->type == KeyRelease) {
+            event_handle_menu(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 */
-    /*
     if (e->type == ButtonPress || e->type == ButtonRelease ||
-        e->type == MotionNotify)
-        mouse_event(e, client);
-    else if (e->type == KeyPress || e->type == KeyRelease)
-        ;
-    */
+        e->type == MotionNotify || e->type == KeyPress ||
+        e->type == KeyRelease)
+    {
+        ObFrameContext context;
+
+        context = frame_context(client, e->xany.window);
+
+        if (!keyboard_process_interactive_grab(e, &client, &context)) {
+
+            if (e->type == ButtonPress || e->type == ButtonRelease ||
+                e->type == MotionNotify)
+                mouse_event(client, context, e);
+            else if (e->type == KeyPress)
+                keyboard_event(client, e);
+        }
+    }
 
     /* dispatch the event to registered handlers */
     dispatch_x(e, client);
@@ -364,6 +569,11 @@ static void event_handle_root(XEvent *e)
     Atom msgtype;
      
     switch(e->type) {
+    case SelectionClear:
+        ob_debug("Another WM has requested to replace us. Exiting.\n");
+        ob_exit();
+        break;
+
     case ClientMessage:
        if (e->xclient.format != 32) break;
 
@@ -386,72 +596,159 @@ 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) {
+            ob_debug("VIDMODE EVENT\n");
+        }
+#endif
     }
 }
 
-static void event_handle_client(Client *client, XEvent *e)
+static void event_handle_client(ObClient *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
     int i=0;
+    ObFrameContext con;
      
     switch (e->type) {
+    case VisibilityNotify:
+        client->frame->obscured = e->xvisibility.state != VisibilityUnobscured;
+        break;
     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);
+        /* 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 OB_FRAME_CONTEXT_MAXIMIZE:
+                client->frame->max_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case OB_FRAME_CONTEXT_CLOSE:
+                client->frame->close_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case OB_FRAME_CONTEXT_ICONIFY:
+                client->frame->iconify_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break;
+            case OB_FRAME_CONTEXT_ALLDESKTOPS:
+                client->frame->desk_press = (e->type == ButtonPress);
+                framerender_frame(client->frame);
+                break; 
+            case OB_FRAME_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:
+#ifdef DEBUG_FOCUS
+        ob_debug("FocusIn on client for %lx\n", client->window);
+#endif
+        if (client != focus_client) {
+            focus_set_client(client);
+            frame_adjust_focus(client->frame, TRUE);
+        }
+        break;
+    case FocusOut:
+#ifdef DEBUG_FOCUS
+        ob_debug("FocusOut on client for %lx\n", client->window);
+#endif
+        /* 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 == OB_STACKING_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 LeaveNotify:
+        con = frame_context(client, e->xcrossing.window);
+        switch (con) {
+        case OB_FRAME_CONTEXT_MAXIMIZE:
+            client->frame->max_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ALLDESKTOPS:
+            client->frame->desk_hover = FALSE;
+            frame_adjust_state(client->frame);
             break;
-        case Context_Close:
-            client->frame->close_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
+        case OB_FRAME_CONTEXT_SHADE:
+            client->frame->shade_hover = FALSE;
+            frame_adjust_state(client->frame);
             break;
-        case Context_Iconify:
-            client->frame->iconify_press = (e->type == ButtonPress);
-            framerender_frame(client->frame);
+        case OB_FRAME_CONTEXT_ICONIFY:
+            client->frame->iconify_hover = FALSE;
+            frame_adjust_state(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);
+        case OB_FRAME_CONTEXT_CLOSE:
+            client->frame->close_hover = FALSE;
+            frame_adjust_state(client->frame);
             break;
         default:
-            /* nothing changes with clicks for any other contexts */
             break;
         }
         break;
-    case FocusIn:
-        focus_set_client(client);
-    case FocusOut:
-#ifdef DEBUG_FOCUS
-        g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"),
-                  client->window);
-#endif
-        /* focus state can affect the stacking layer */
-        client_calc_layer(client);
-        frame_adjust_focus(client->frame);
-       break;
     case EnterNotify:
-        if (client_normal(client)) {
-            if (ob_state == State_Starting) {
-                /* move it to the top of the focus order */
-                guint desktop = client->desktop;
-                if (desktop == DESKTOP_ALL) desktop = screen_desktop;
-                focus_order[desktop] = g_list_remove(focus_order[desktop],
-                                                     client);
-                focus_order[desktop] = g_list_prepend(focus_order[desktop],
-                                                      client);
-            } else if (config_focus_follow) {
+        con = frame_context(client, e->xcrossing.window);
+        switch (con) {
+        case OB_FRAME_CONTEXT_MAXIMIZE:
+            client->frame->max_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ALLDESKTOPS:
+            client->frame->desk_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_SHADE:
+            client->frame->shade_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ICONIFY:
+            client->frame->iconify_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_CLOSE:
+            client->frame->close_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_FRAME:
+            if (client_normal(client)) {
+                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;
+                    focus_order[desktop] = g_list_remove(focus_order[desktop],
+                                                         client);
+                    focus_order[desktop] = g_list_prepend(focus_order[desktop],
+                                                          client);
+                } else if (config_focus_follow) {
 #ifdef DEBUG_FOCUS
-                g_message("EnterNotify on %lx, focusing window",
-                          client->window);
+                    ob_debug("EnterNotify on %lx, focusing window\n",
+                             client->window);
 #endif
-                client_focus(client);
+                    client_focus(client);
+                }
             }
+            break;
+        default:
+            break;
         }
         break;
     case ConfigureRequest:
@@ -481,15 +778,16 @@ static void event_handle_client(Client *client, XEvent *e)
        /* if we are iconic (or shaded (fvwm does this)) ignore the event */
        if (client->iconic || client->shaded) return;
 
-       if (e->xconfigurerequest.value_mask & CWBorderWidth)
-           client->border_width = e->xconfigurerequest.border_width;
-
        /* resize, then move, as specified in the EWMH section 7.7 */
        if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight |
-                                              CWX | CWY)) {
+                                              CWX | CWY |
+                                               CWBorderWidth)) {
            int x, y, w, h;
-           Corner corner;
-              
+           ObCorner corner;
+
+            if (e->xconfigurerequest.value_mask & CWBorderWidth)
+                client->border_width = e->xconfigurerequest.border_width;
+
            x = (e->xconfigurerequest.value_mask & CWX) ?
                e->xconfigurerequest.x : client->area.x;
            y = (e->xconfigurerequest.value_mask & CWY) ?
@@ -498,37 +796,53 @@ static void event_handle_client(Client *client, XEvent *e)
                e->xconfigurerequest.width : client->area.width;
            h = (e->xconfigurerequest.value_mask & CWHeight) ?
                e->xconfigurerequest.height : client->area.height;
+
+            {
+                int newx = x;
+                int newy = y;
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_normal(client));
+                if (e->xconfigurerequest.value_mask & CWX)
+                    x = newx;
+                if (e->xconfigurerequest.value_mask & CWY)
+                    y = newy;
+            }
               
            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_full(client, corner, x, y, w, h, FALSE, TRUE,
+                                  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;
            }
        }
@@ -561,7 +875,7 @@ static void event_handle_client(Client *client, XEvent *e)
        client_unmanage(client);
        break;
     case MapRequest:
-        g_message("MapRequest for 0x%lx", client->window);
+        ob_debug("MapRequest for 0x%lx\n", client->window);
         if (!client->iconic) break; /* this normally doesn't happen, but if it
                                        does, we don't want it! */
         if (screen_showing_desktop)
@@ -573,7 +887,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 */
@@ -615,32 +929,98 @@ static void event_handle_client(Client *client, XEvent *e)
                                    FALSE);
        } else if (msgtype == prop_atoms.net_wm_state) {
            /* can't compress these */
-           g_message("net_wm_state %s %ld %ld for 0x%lx",
-                     (e->xclient.data.l[0] == 0 ? "Remove" :
-                      e->xclient.data.l[0] == 1 ? "Add" :
-                      e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"),
-                     e->xclient.data.l[1], e->xclient.data.l[2],
-                     client->window);
+           ob_debug("net_wm_state %s %ld %ld for 0x%lx\n",
+                     (e->xclient.data.l[0] == 0 ? "Remove" :
+                      e->xclient.data.l[0] == 1 ? "Add" :
+                      e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"),
+                     e->xclient.data.l[1], e->xclient.data.l[2],
+                     client->window);
            client_set_state(client, e->xclient.data.l[0],
                             e->xclient.data.l[1], e->xclient.data.l[2]);
        } else if (msgtype == prop_atoms.net_close_window) {
-           g_message("net_close_window for 0x%lx", client->window);
+           ob_debug("net_close_window for 0x%lx\n", client->window);
            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);
-       }
+           ob_debug("net_active_window for 0x%lx\n", client->window);
+            client_activate(client, FALSE);
+       } else if (msgtype == prop_atoms.net_wm_moveresize) {
+           ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
+            if ((Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_topleft ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_top ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_topright ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_right ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_right ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_bottomright ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_bottom ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_bottomleft ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_left ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_move ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_size_keyboard ||
+                (Atom)e->xclient.data.l[2] ==
+                prop_atoms.net_wm_moveresize_move_keyboard) {
+
+                moveresize_start(client, e->xclient.data.l[0],
+                                 e->xclient.data.l[1], e->xclient.data.l[3],
+                                 e->xclient.data.l[2]);
+            }
+        } else if (msgtype == prop_atoms.net_moveresize_window) {
+            int oldg = client->gravity;
+            int tmpg, x, y, w, h;
+
+            if (e->xclient.data.l[0] & 0xff)
+                tmpg = e->xclient.data.l[0] & 0xff;
+            else
+                tmpg = oldg;
+
+            if (e->xclient.data.l[0] & 1 << 8)
+                x = e->xclient.data.l[1];
+            else
+                x = client->area.x;
+            if (e->xclient.data.l[0] & 1 << 9)
+                y = e->xclient.data.l[2];
+            else
+                y = client->area.y;
+            if (e->xclient.data.l[0] & 1 << 10)
+                w = e->xclient.data.l[3];
+            else
+                w = client->area.width;
+            if (e->xclient.data.l[0] & 1 << 11)
+                h = e->xclient.data.l[4];
+            else
+                h = client->area.height;
+            client->gravity = tmpg;
+
+            {
+                int newx = x;
+                int newy = y;
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_normal(client));
+                if (e->xclient.data.l[0] & 1 << 8)
+                    x = newx;
+                if (e->xclient.data.l[0] & 1 << 9)
+                    y = newy;
+            }
+              
+            client_configure(client, OB_CORNER_TOPLEFT,
+                             x, y, w, h, FALSE, TRUE);
+
+            client->gravity = oldg;
+        }
        break;
     case PropertyNotify:
        /* validate cuz we query stuff off the client here */
@@ -673,23 +1053,22 @@ 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) {
            client_update_protocols(client);
            client_setup_decor_and_functions(client);
        }
-       else if (msgtype == prop_atoms.net_wm_strut)
+       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
@@ -700,3 +1079,116 @@ static void event_handle_client(Client *client, XEvent *e)
 #endif
     }
 }
+
+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, max_fd);
+#endif
+}
+
+void event_remove_fd(gint 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(ObDock *s, XEvent *e)
+{
+    switch (e->type) {
+    case ButtonPress:
+        stacking_raise(DOCK_AS_WINDOW(s));
+        break;
+    case EnterNotify:
+        dock_hide(FALSE);
+        break;
+    case LeaveNotify:
+        dock_hide(TRUE);
+        break;
+    }
+}
+
+static void event_handle_dockapp(ObDockApp *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;
+    }
+}
+
+static void event_handle_menu(XEvent *ev)
+{
+    ObMenuFrame *f;
+    ObMenuEntryFrame *e;
+
+    switch (ev->type) {
+    case ButtonRelease:
+        if (!(f = menu_frame_under(ev->xbutton.x_root,
+                                   ev->xbutton.y_root)))
+            menu_frame_hide_all();
+        else {
+            if ((e = menu_entry_frame_under(ev->xbutton.x_root,
+                                            ev->xbutton.y_root)))
+                menu_entry_frame_execute(e,
+                                         !(ev->xbutton.state & ControlMask));
+        }
+        break;
+    case MotionNotify:
+        if ((f = menu_frame_under(ev->xmotion.x_root,
+                                  ev->xmotion.y_root))) {
+            menu_frame_move_on_screen(f);
+            if ((e = menu_entry_frame_under(ev->xmotion.x_root,
+                                            ev->xmotion.y_root)))
+                menu_frame_select(f, e);
+        }
+        break;
+    }
+}
This page took 0.048949 seconds and 4 git commands to generate.