]> Dogcows Code - chaz/openbox/blobdiff - openbox/event.c
raise menus above clients.
[chaz/openbox] / openbox / event.c
index 6548d83e993b4c983f5ee4e26667ccb0ce6e08c2..4398c97724d9469d1668fa68245328e30226a8f2 100644 (file)
@@ -2,14 +2,15 @@
 #include "client.h"
 #include "xerror.h"
 #include "prop.h"
+#include "config.h"
 #include "screen.h"
 #include "frame.h"
-#include "engine.h"
+#include "menu.h"
+#include "framerender.h"
 #include "focus.h"
 #include "stacking.h"
 #include "extensions.h"
 #include "timer.h"
-#include "engine.h"
 #include "dispatch.h"
 
 #include <X11/Xlib.h>
@@ -22,6 +23,7 @@
 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(Menu *menu, XEvent *e);
 
 Time event_lasttime = 0;
 
@@ -112,13 +114,9 @@ void event_loop()
     select(x_fd + 1, &selset, NULL, NULL, wait);
 }
 
-void event_process(XEvent *e)
+static Window event_get_window(XEvent *e)
 {
-    XEvent ce;
-    KeyCode *kp;
     Window window;
-    int i, k;
-    Client *client;
 
     /* pick a window */
     switch (e->type) {
@@ -135,58 +133,72 @@ void event_process(XEvent *e)
        window = e->xconfigurerequest.window;
        break;
     default:
-       /* XKB events */
-       if (e->type == extensions_xkb_event_basep) {
+#ifdef XKB
+       if (extensions_xkb && e->type == extensions_xkb_event_basep) {
            switch (((XkbAnyEvent*)&e)->xkb_type) {
            case XkbBellNotify:
                window = ((XkbBellNotifyEvent*)&e)->window;
            default:
                window = None;
            }
-       } else
-           window = e->xany.window;
+        } else
+#endif
+            window = e->xany.window;
     }
-     
+    return window;
+}
+
+static void event_set_lasttime(XEvent *e)
+{
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
        event_lasttime = e->xbutton.time;
-       e->xbutton.state &= ~(LockMask | NumLockMask | ScrollLockMask);
-       /* kill off the Button1Mask etc, only want the modifiers */
-       e->xbutton.state &= (ControlMask | ShiftMask | Mod1Mask |
-                            Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
        break;
     case KeyPress:
        event_lasttime = e->xkey.time;
-       e->xkey.state &= ~(LockMask | NumLockMask | ScrollLockMask);
-       /* kill off the Button1Mask etc, only want the modifiers */
-       e->xkey.state &= (ControlMask | ShiftMask | Mod1Mask |
-                         Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-       /* add to the state the mask of the modifier being pressed, if it is
-          a modifier key being pressed (this is a little ugly..) */
-/* I'm commenting this out cuz i don't want "C-Control_L" being returned. */
-/*     kp = modmap->modifiermap;*/
-/*     for (i = 0; i < mask_table_size; ++i) {*/
-/*         for (k = 0; k < modmap->max_keypermod; ++k) {*/
-/*             if (*kp == e->xkey.keycode) {*/ /* found the keycode */
-                   /* add the mask for it */
-/*                 e->xkey.state |= mask_table[i];*/
-                   /* cause the first loop to break; */
-/*                 i = mask_table_size;*/
-/*                 break;*/ /* get outta here! */
-/*             }*/
-/*             ++kp;*/
-/*         }*/
-/*     }*/
-
        break;
     case KeyRelease:
        event_lasttime = e->xkey.time;
-       e->xkey.state &= ~(LockMask | NumLockMask | ScrollLockMask);
-       /* kill off the Button1Mask etc, only want the modifiers */
-       e->xkey.state &= (ControlMask | ShiftMask | Mod1Mask |
-                         Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+       break;
+    case MotionNotify:
+       event_lasttime = e->xmotion.time;
+       break;
+    case PropertyNotify:
+       event_lasttime = e->xproperty.time;
+       break;
+    case EnterNotify:
+    case LeaveNotify:
+       event_lasttime = e->xcrossing.time;
+       break;
+    default:
+        event_lasttime = CurrentTime;
+        break;
+    }
+}
+
+#define STRIP_MODS(s) \
+       s &= ~(LockMask | NumLockMask | ScrollLockMask), \
+       /* kill off the Button1Mask etc, only want the modifiers */ \
+       s &= (ControlMask | ShiftMask | Mod1Mask | \
+              Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask) \
+
+static void event_hack_mods(XEvent *e)
+{
+    KeyCode *kp;
+    int i, k;
+
+    switch (e->type) {
+    case ButtonPress:
+    case ButtonRelease:
+        STRIP_MODS(e->xbutton.state);
+       break;
+    case KeyPress:
+        STRIP_MODS(e->xkey.state);
+       break;
+    case KeyRelease:
+        STRIP_MODS(e->xkey.state);
        /* remove from the state the mask of the modifier being released, if
           it is a modifier key being released (this is a little ugly..) */
        kp = modmap->modifiermap;
@@ -204,57 +216,116 @@ void event_process(XEvent *e)
        }
        break;
     case MotionNotify:
-       event_lasttime = e->xmotion.time;
-       e->xmotion.state &= ~(LockMask | NumLockMask | ScrollLockMask);
-       /* kill off the Button1Mask etc, only want the modifiers */
-       e->xmotion.state &= (ControlMask | ShiftMask | Mod1Mask |
-                            Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+        STRIP_MODS(e->xmotion.state);
        /* compress events */
-       while (XCheckTypedWindowEvent(ob_display, window, e->type, &ce)) {
-           e->xmotion.x_root = ce.xmotion.x_root;
-           e->xmotion.y_root = ce.xmotion.y_root;
+        {
+            XEvent ce;
+            while (XCheckTypedWindowEvent(ob_display, e->xmotion.window,
+                                          e->type, &ce)) {
+                e->xmotion.x_root = ce.xmotion.x_root;
+                e->xmotion.y_root = ce.xmotion.y_root;
+            }
        }
        break;
-    case PropertyNotify:
-       event_lasttime = e->xproperty.time;
-       break;
+    }
+}
+
+static gboolean event_ignore(XEvent *e, Client *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 ||
+            client == NULL) {
+            /* says a client was not found for the event (or a valid FocusIn
+               event was not found.
+            */
+            e->xfocus.window = None;
+            return TRUE;
+        }
+
+#ifdef DEBUG_FOCUS
+        g_message("FocusIn on %lx", window);
+#endif
+        break;
     case FocusOut:
-       if (e->xfocus.mode == NotifyGrab)
-           /*|| e.xfocus.mode == NotifyUngrab ||*/
-              
-           /* From Metacity, from WindowMaker, ignore all funky pointer
-              root events. Its commented out cuz I don't think we need this
-              at all. If problems arise we can look into it */
-           /*e.xfocus.detail > NotifyNonlinearVirtual) */
-           return; /* skip me! */
-       if (e->type == FocusOut) {
-           /* FocusOut events just make us look for FocusIn events. They
-              are mostly ignored otherwise. */
-           XEvent fi;
-           if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
+#ifdef DEBUG_FOCUS
+        g_message("FocusOut on %lx mode %d detail %d", 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;
+#ifdef DEBUG_FOCUS
+       g_message("FocusOut on %lx", window);
+#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);
-               /* dont unfocus the window we just focused! */
-               if (fi.xfocus.window == e->xfocus.window)
-                   return;
-           }
-       }
+
+                /* 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);
+        }
        break;
     case EnterNotify:
     case LeaveNotify:
-       event_lasttime = e->xcrossing.time;
-        /* XXX this caused problems before... but i don't remember why. hah.
-           so back it is. if problems arise again, then try filtering on the
-           detail instead of the mode. */
-        if (e->xcrossing.mode != NotifyNormal) return;
+        /* NotifyUngrab occurs when a mouse button is released and the event is
+           caused, like when lowering a window */
+        if (e->xcrossing.mode == NotifyGrab ||
+            e->xcrossing.detail == NotifyInferior)
+            return TRUE;
        break;
     }
+    return FALSE;
+}
 
-    client = g_hash_table_lookup(client_map, (gpointer)window);
-    g_message("EVENT: 0x%lx -> 0x%lx", window, client);
+static void event_process(XEvent *e)
+{
+    Window window;
+    Client *client;
+    Menu *menu = NULL;
+
+    window = event_get_window(e);
+    if (!(client = g_hash_table_lookup(client_map, &window)))
+        menu = g_hash_table_lookup(menu_map, &window);
+    event_set_lasttime(e);
+    event_hack_mods(e);
+    if (event_ignore(e, client))
+        return;
 
     /* deal with it in the kernel */
-    if (client)
+    if (menu)
+        event_handle_menu(menu, e);
+    else if (client)
        event_handle_client(client, e);
     else if (window == ob_root)
        event_handle_root(e);
@@ -273,8 +344,6 @@ void event_process(XEvent *e)
        xwc.sibling = e->xconfigurerequest.above;
        xwc.stack_mode = e->xconfigurerequest.detail;
        
-       g_message("Proxying configure event for 0x%lx", window);
-       
        /* we are not to be held responsible if someone sends us an
           invalid request! */
        xerror_set_ignore(TRUE);
@@ -283,6 +352,15 @@ void event_process(XEvent *e)
        xerror_set_ignore(FALSE);
     }
 
+    /* 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)
+        ;
+    */
+
     /* dispatch the event to registered handlers */
     dispatch_x(e, client);
 }
@@ -298,7 +376,7 @@ static void event_handle_root(XEvent *e)
        msgtype = e->xclient.message_type;
        if (msgtype == prop_atoms.net_current_desktop) {
            unsigned int d = e->xclient.data.l[0];
-           if (d <= screen_num_desktops)
+           if (d < screen_num_desktops)
                screen_set_desktop(d);
        } else if (msgtype == prop_atoms.net_number_of_desktops) {
            unsigned int d = e->xclient.data.l[0];
@@ -321,19 +399,72 @@ static void event_handle_client(Client *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
+    int i=0;
      
     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;
+        }
+        break;
     case FocusIn:
-        client_set_focused(client, TRUE);
-       break;
+        focus_set_client(client);
     case FocusOut:
-        client_set_focused(client, FALSE);
+#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) {
+#ifdef DEBUG_FOCUS
+                g_message("EnterNotify on %lx, focusing window",
+                          client->window);
+#endif
+                client_focus(client);
+            }
+        }
+        break;
     case ConfigureRequest:
-       g_message("ConfigureRequest for window %lx", client->window);
        /* compress these */
        while (XCheckTypedWindowEvent(ob_display, client->window,
                                      ConfigureRequest, &ce)) {
+            ++i;
            /* XXX if this causes bad things.. we can compress config req's
               with the same mask. */
            e->xconfigurerequest.value_mask |=
@@ -413,11 +544,9 @@ static void event_handle_client(Client *client, XEvent *e)
            client->ignore_unmaps--;
            break;
        }
-       g_message("UnmapNotify for %lx", client->window);
        client_unmanage(client);
        break;
     case DestroyNotify:
-       g_message("DestroyNotify for %lx", client->window);
        client_unmanage(client);
        break;
     case ReparentNotify:
@@ -438,6 +567,9 @@ static void event_handle_client(Client *client, XEvent *e)
        client_unmanage(client);
        break;
     case MapRequest:
+        g_message("MapRequest for 0x%lx", client->window);
+        if (!client->iconic) break; /* this normally doesn't happen, but if it
+                                       does, we don't want it! */
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
         client_iconify(client, FALSE, TRUE);
@@ -483,10 +615,13 @@ static void event_handle_client(Client *client, XEvent *e)
                }
                e->xclient = ce.xclient;
            }
-           client_set_desktop(client, e->xclient.data.l[0]);
+            if ((unsigned)e->xclient.data.l[0] < screen_num_desktops ||
+                (unsigned)e->xclient.data.l[0] == DESKTOP_ALL)
+                client_set_desktop(client, (unsigned)e->xclient.data.l[0],
+                                   FALSE);
        } else if (msgtype == prop_atoms.net_wm_state) {
            /* can't compress these */
-           g_message("net_wm_state %s %ld %ld for 0x%lx\n",
+           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"),
@@ -495,10 +630,10 @@ static void event_handle_client(Client *client, XEvent *e)
            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\n", client->window);
+           g_message("net_close_window for 0x%lx", client->window);
            client_close(client);
        } else if (msgtype == prop_atoms.net_active_window) {
-           g_message("net_active_window for 0x%lx\n", client->window);
+           g_message("net_active_window for 0x%lx", client->window);
            if (screen_showing_desktop)
                screen_show_desktop(FALSE);
            if (client->iconic)
@@ -561,5 +696,30 @@ static void event_handle_client(Client *client, XEvent *e)
            client_update_icons(client);
        else if (msgtype == prop_atoms.kwm_win_icon)
            client_update_kwm_icon(client);
+    default:
+        ;
+#ifdef SHAPE
+        if (extensions_shape && e->type == extensions_shape_event_basep) {
+            client->shaped = ((XShapeEvent*)e)->shaped;
+            frame_adjust_shape(client->frame);
+        }
+#endif
+    }
+}
+
+static void event_handle_menu(Menu *menu, XEvent *e)
+{
+    MenuEntry *entry;
+
+    switch (e->type) {
+    case EnterNotify:
+    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);
+        }
+        break;
     }
 }
This page took 0.030367 seconds and 4 git commands to generate.