]> Dogcows Code - chaz/openbox/blobdiff - openbox/event.c
change how rc parsing will work. a=b will be parsed in any [section] and given to...
[chaz/openbox] / openbox / event.c
index f6a198cca826113fc34ceb968d16ba407f7663ec..79befa6625a9bcbffe0125d18616893a60a99003 100644 (file)
@@ -7,16 +7,17 @@
 #include "engine.h"
 #include "focus.h"
 #include "stacking.h"
-#include "keyboard.h"
-#include "pointer.h"
-#include "hooks.h"
 #include "extensions.h"
 #include "timer.h"
 #include "engine.h"
+#include "dispatch.h"
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
@@ -24,12 +25,10 @@ static void event_handle_client(Client *c, XEvent *e);
 
 Time event_lasttime = 0;
 
-/*! A list of all possible combinations of keyboard lock masks */
-static unsigned int mask_list[8];
 /*! The value of the mask for the NumLock modifier */
-static unsigned int NumLockMask;
+unsigned int NumLockMask;
 /*! The value of the mask for the ScrollLock modifier */
-static unsigned int ScrollLockMask;
+unsigned int ScrollLockMask;
 /*! The key codes for the modifier keys */
 static XModifierKeymap *modmap;
 /*! Table of the constant modifier masks */
@@ -65,15 +64,6 @@ void event_startup()
                ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
        }
     }
-
-    mask_list[0] = 0;
-    mask_list[1] = LockMask;
-    mask_list[2] = NumLockMask;
-    mask_list[3] = LockMask | NumLockMask;
-    mask_list[4] = ScrollLockMask;
-    mask_list[5] = ScrollLockMask | LockMask;
-    mask_list[6] = ScrollLockMask | NumLockMask;
-    mask_list[7] = ScrollLockMask | LockMask | NumLockMask;
 }
 
 void event_shutdown()
@@ -132,6 +122,9 @@ void event_process(XEvent *e)
 
     /* pick a window */
     switch (e->type) {
+    case MapRequest:
+       window = e->xmap.window;
+       break;
     case UnmapNotify:
        window = e->xunmap.window;
        break;
@@ -142,18 +135,21 @@ 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;
     }
      
+    client = g_hash_table_lookup(client_map, &window);
+
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
@@ -226,41 +222,79 @@ void event_process(XEvent *e)
        event_lasttime = e->xproperty.time;
        break;
     case FocusIn:
+        g_message("FocusIn on %lx mode %d detail %d", window,
+                  e->xfocus.mode, e->xfocus.detail);
+        /* 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;
+        }
+
+        g_message("FocusIn on %lx", window);
+        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)) {
+        g_message("FocusOut on %lx mode %d detail %d", window,
+                  e->xfocus.mode, e->xfocus.detail);
+       if (e->xfocus.mode == NotifyGrab ||
+            e->xfocus.detail == NotifyInferior ||
+            e->xfocus.detail == NotifyAncestor ||
+            e->xfocus.detail > NotifyNonlinearVirtual) return;
+
+        g_message("FocusOut on %lx", window);
+        /* 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(FALSE);
+                if (fi.xfocus.window == e->xfocus.window)
+                    return;
+            } else
+                focus_fallback(FALSE);
+        }
        break;
     case EnterNotify:
     case LeaveNotify:
        event_lasttime = e->xcrossing.time;
-       if (e->xcrossing.mode != NotifyNormal)
-           return; /* skip me! */
+        /* NotifyUngrab occurs when a mouse button is released and the event is
+           caused, like when lowering a window */
+        if (e->xcrossing.mode == NotifyGrab) return;
        break;
+    default:
+        event_lasttime = CurrentTime;
+        break;
     }
 
-    client = g_hash_table_lookup(client_map, (gpointer)window);
-
-    if (client) {
+    /* deal with it in the kernel */
+    if (client)
        event_handle_client(client, e);
-    else if (window == ob_root)
+    else if (window == ob_root)
        event_handle_root(e);
+    else if (e->type == MapRequest)
+       client_manage(window);
     else if (e->type == ConfigureRequest) {
        /* unhandled configure requests must be used to configure the
           window directly */
@@ -274,8 +308,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);
@@ -284,45 +316,8 @@ void event_process(XEvent *e)
        xerror_set_ignore(FALSE);
     }
 
-    /* dispatch Crossing, Pointer and Key events to the hooks */
-    switch(e->type) {
-    case EnterNotify:
-        if (client != NULL) engine_mouse_enter(client->frame, window);
-       HOOKFIRECLIENT(pointerenter, client);
-       break;
-    case LeaveNotify:
-        if (client != NULL) engine_mouse_leave(client->frame, window);
-       HOOKFIRECLIENT(pointerleave, client);
-       break;
-    case ButtonPress:
-        if (client != NULL) 
-            engine_mouse_press(client->frame, window,
-                               e->xbutton.x, e->xbutton.y);
-       pointer_event(e, client);
-        break;
-    case ButtonRelease:
-        if (client != NULL)
-            engine_mouse_release(client->frame, window,
-                                 e->xbutton.x, e->xbutton.y);
-       pointer_event(e, client);
-        break;
-    case MotionNotify:
-       pointer_event(e, client);
-       break;
-    case KeyPress:     
-    case KeyRelease:
-       keyboard_event(&e->xkey);
-       break;
-    default:
-       /* XKB events */
-       if (e->type == extensions_xkb_event_basep) {
-           switch (((XkbAnyEvent*)&e)->xkb_type) {
-           case XkbBellNotify:
-               HOOKFIRECLIENT(bell, client);
-               break;
-           }
-       }
-    }
+    /* dispatch the event to registered handlers */
+    dispatch_x(e, client);
 }
 
 static void event_handle_root(XEvent *e)
@@ -330,17 +325,13 @@ static void event_handle_root(XEvent *e)
     Atom msgtype;
      
     switch(e->type) {
-    case MapRequest:
-       g_message("MapRequest on root");
-       client_manage(e->xmap.window);
-       break;
     case ClientMessage:
        if (e->xclient.format != 32) break;
 
        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];
@@ -363,32 +354,37 @@ static void event_handle_client(Client *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
+    int i=0;
      
     switch (e->type) {
     case FocusIn:
-       client->focused = TRUE;
-       engine_frame_adjust_focus(client->frame);
-
-       /* focus state can affect the stacking layer */
-       client_calc_layer(client);
-
-       focus_set_client(client);
-       break;
+        focus_set_client(client);
     case FocusOut:
-       client->focused = FALSE;
-       engine_frame_adjust_focus(client->frame);
-
-       /* focus state can affect the stacking layer */
-       client_calc_layer(client);
-
-       if (focus_client == client)
-           focus_set_client(NULL);
+        g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"),
+                  client->window);
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
+        engine_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 (focus_follow)
+                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 |=
@@ -407,6 +403,7 @@ static void event_handle_client(Client *client, XEvent *e)
            if (ce.xconfigurerequest.value_mask & CWStackMode)
                e->xconfigurerequest.detail = ce.xconfigurerequest.detail;
        }
+        if (i) g_message("Compressed %d Configures", i);
 
        /* if we are iconic (or shaded (fvwm does this)) ignore the event */
        if (client->iconic || client->shaded) return;
@@ -468,11 +465,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:
@@ -493,10 +488,18 @@ static void event_handle_client(Client *client, XEvent *e)
        client_unmanage(client);
        break;
     case MapRequest:
-       /* we shouldn't be able to get this unless we're iconic */
-       g_assert(client->iconic);
-
-       HOOKFIRECLIENT(requestactivate, client);
+        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);
+        if (!client->frame->visible)
+            /* if its not visible still, then don't mess with it */
+            break;
+        if (client->shaded)
+            client_shade(client, FALSE);
+        client_focus(client);
+        stacking_raise(client);
        break;
     case ClientMessage:
        /* validate cuz we query stuff off the client here */
@@ -532,10 +535,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"),
@@ -544,10 +550,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)
@@ -555,8 +561,11 @@ static void event_handle_client(Client *client, XEvent *e)
            else if (!client->frame->visible)
                /* if its not visible for other reasons, then don't mess
                   with it */
-               return;
-           HOOKFIRECLIENT(requestactivate, client);
+               break;
+            if (client->shaded)
+                client_shade(client, FALSE);
+            client_focus(client);
+            stacking_raise(client);
        }
        break;
     case PropertyNotify:
@@ -607,5 +616,13 @@ 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;
+            engine_frame_adjust_shape(client->frame);
+        }
+#endif
     }
 }
This page took 0.029467 seconds and 4 git commands to generate.