make the TRAN_GROUP an unsigned long

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 79befa6625a9bcbffe0125d18616893a60a99003..9d31e6bcdf42206b9aed6975fcc76898488e2f73 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -2,6 +2,7 @@
 #include "client.h"
 #include "xerror.h"
 #include "prop.h"
+#include "config.h"
 #include "screen.h"
 #include "frame.h"
 #include "engine.h"
@@ -222,8 +223,10 @@ void event_process(XEvent *e)
        event_lasttime = e->xproperty.time;
        break;
     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
@@ -240,17 +243,23 @@ void event_process(XEvent *e)
             return;
         }
 
+#ifdef DEBUG_FOCUS
         g_message("FocusIn on %lx", window);
+#endif
         break;
     case FocusOut:
+#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;
-
-        g_message("FocusOut on %lx", window);
+ 
+#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. */
         {
@@ -269,11 +278,11 @@ void event_process(XEvent *e)
                 /* 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);
+                    focus_fallback(Fallback_NoFocus);
                 if (fi.xfocus.window == e->xfocus.window)
                     return;
             } else
-                focus_fallback(FALSE);
+                focus_fallback(Fallback_NoFocus);
         }
        break;
     case EnterNotify:
@@ -281,7 +290,9 @@ void event_process(XEvent *e)
        event_lasttime = e->xcrossing.time;
         /* NotifyUngrab occurs when a mouse button is released and the event is
            caused, like when lowering a window */
-        if (e->xcrossing.mode == NotifyGrab) return;
+        if (e->xcrossing.mode == NotifyGrab ||
+            e->xcrossing.detail == NotifyInferior)
+            return;
        break;
     default:
         event_lasttime = CurrentTime;
@@ -360,8 +371,10 @@ static void event_handle_client(Client *client, XEvent *e)
     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);
         engine_frame_adjust_focus(client->frame);
@@ -376,8 +389,13 @@ static void event_handle_client(Client *client, XEvent *e)
                                                      client);
                 focus_order[desktop] = g_list_prepend(focus_order[desktop],
                                                       client);
-            } else if (focus_follow)
+            } else if (config_focus_follow) {
+#ifdef DEBUG_FOCUS
+                g_message("EnterNotify on %lx, focusing window",
+                          client->window);
+#endif
                 client_focus(client);
+            }
         }
         break;
     case ConfigureRequest:
@@ -403,7 +421,6 @@ 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;
@@ -488,6 +505,7 @@ 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)