X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=c32d8bae630eeb67084b9ab67507f036cab43d69;hb=6c4126ec617ccb0dd4e6bf0e3aecaa2181172c66;hp=409641df650b82107182476eef55e0064aaf3f2b;hpb=5e27544d073856731363c1be9b132074e13259f6;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 409641df..c32d8bae 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   event.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "debug.h"
 #include "openbox.h"
 #include "dock.h"
@@ -15,6 +33,7 @@
 #include "framerender.h"
 #include "focus.h"
 #include "moveresize.h"
+#include "group.h"
 #include "stacking.h"
 #include "extensions.h"
 #include "event.h"
@@ -35,12 +54,18 @@
 #include <X11/ICE/ICElib.h>
 #endif
 
+typedef struct
+{
+    gboolean ignored;
+} ObEventData;
+
 static void event_process(const XEvent *e, gpointer data);
 static void event_handle_root(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 event_handle_group(ObGroup *g, XEvent *e);
 
 static gboolean focus_delay_func(gpointer data);
 static void focus_delay_client_dest(gpointer data);
@@ -70,6 +95,7 @@ static const int mask_table[] = {
 };
 static int mask_table_size;
 
+static guint ignore_enter_focus = 0;
 static ObClient *focus_delay_client;
 
 static gboolean menu_can_hide;
@@ -287,8 +313,8 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 	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);
+            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.
@@ -370,14 +396,20 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                         }
                     }
 
-                    /* 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, NULL);
-                    /* 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;
+                    {
+                        ObEventData d;
+
+                        /* 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, &d);
+                        if (!d.ignored) {
+#ifdef DEBUG_FOCUS
+                            ob_debug("FocusIn was OK, so don't fallback\n");
+#endif
+                            fallback = FALSE;
+                            break;
+                        }
                     }
                 }
             }
@@ -389,34 +421,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                 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 and NotifyAncestor occurs when ungrabbing the
-           pointer (Ancestor happens when the pointer is on a window border) */
-        if (e->xcrossing.mode == NotifyGrab ||
-            e->xcrossing.detail == NotifyInferior ||
-            (e->xcrossing.mode == NotifyUngrab &&
-             (e->xcrossing.detail == NotifyAncestor ||
-              e->xcrossing.detail == NotifyNonlinearVirtual ||
-              e->xcrossing.detail == NotifyVirtual))) {
-#ifdef DEBUG_FOCUS
-            ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
-                     (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\n",
-                 (e->type == EnterNotify ? "Enter" : "Leave"),
-                 e->xcrossing.mode,
-                 e->xcrossing.detail, client?client->window:0);
-#endif
-	break;
+        break;
     }
     return FALSE;
 }
@@ -424,43 +429,53 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 static void event_process(const XEvent *ec, gpointer data)
 {
     Window window;
+    ObGroup *group = NULL;
     ObClient *client = NULL;
     ObDock *dock = NULL;
     ObDockApp *dockapp = NULL;
     ObWindow *obwin = NULL;
     XEvent ee, *e;
+    ObEventData *ed = data;
 
     /* make a copy we can mangle */
     ee = *ec;
     e = &ee;
 
     window = event_get_window(e);
-    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;
+    if (!(e->type == PropertyNotify &&
+          (group = g_hash_table_lookup(group_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))
+    if (event_ignore(e, client)) {
+        if (ed)
+            ed->ignored = TRUE;
         return;
+    } else if (ed)
+            ed->ignored = FALSE;
 
     /* deal with it in the kernel */
-    if (client)
+    if (group)
+	event_handle_group(group, e);
+    else if (client)
 	event_handle_client(client, e);
     else if (dockapp)
 	event_handle_dockapp(dockapp, e);
@@ -500,9 +515,14 @@ static void event_process(const XEvent *ec, gpointer data)
             event_handle_menu(e);
         else {
             if (!keyboard_process_interactive_grab(e, &client)) {
-                if (moveresize_in_progress)
+                if (moveresize_in_progress) {
                     moveresize_event(e);
 
+                    /* make further actions work on the client being
+                       moved/resized */
+                    client = moveresize_client;
+                }
+
                 menu_can_hide = FALSE;
                 ob_main_loop_timeout_add(ob_main_loop,
                                          G_USEC_PER_SEC / 4,
@@ -517,8 +537,7 @@ static void event_process(const XEvent *ec, gpointer data)
                        causes the window which appears to be focused to be
                        the one on which the actions will be executed */
                     keyboard_event((focus_cycle_target ?
-                                    focus_cycle_target :
-                                    (client ? client : focus_client)), e);
+                                    focus_cycle_target : client), e);
             }
         }
     }
@@ -531,7 +550,7 @@ static void event_handle_root(XEvent *e)
     switch(e->type) {
     case SelectionClear:
         ob_debug("Another WM has requested to replace us. Exiting.\n");
-        ob_exit();
+        ob_exit(0);
         break;
 
     case ClientMessage:
@@ -572,6 +591,16 @@ static void event_handle_root(XEvent *e)
     }
 }
 
+static void event_handle_group(ObGroup *group, XEvent *e)
+{
+    GSList *it;
+
+    g_assert(e->type == PropertyNotify);
+
+    for (it = group->members; it; it = g_slist_next(it))
+        event_handle_client(it->data, e);
+}
+
 static void event_handle_client(ObClient *client, XEvent *e)
 {
     XEvent ce;
@@ -677,6 +706,14 @@ static void event_handle_client(ObClient *client, XEvent *e)
         }
         break;
     case EnterNotify:
+    {
+        gboolean nofocus = FALSE;
+
+        if (ignore_enter_focus) {
+            ignore_enter_focus--;
+            nofocus = TRUE;
+        }
+
         con = frame_context(client, e->xcrossing.window);
         switch (con) {
         case OB_FRAME_CONTEXT_MAXIMIZE:
@@ -700,11 +737,23 @@ static void event_handle_client(ObClient *client, XEvent *e)
             frame_adjust_state(client->frame);
             break;
         case OB_FRAME_CONTEXT_FRAME:
-            if (client_normal(client)) {
-                if (config_focus_follow) {
+            if (!nofocus && client_normal(client) && config_focus_follow) {
+                if (e->xcrossing.mode == NotifyGrab ||
+                    e->xcrossing.detail == NotifyInferior)
+                {
+#ifdef DEBUG_FOCUS
+                    ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
+                             (e->type == EnterNotify ? "Enter" : "Leave"),
+                             e->xcrossing.mode,
+                             e->xcrossing.detail, client?client->window:0);
+#endif
+                } else {
 #ifdef DEBUG_FOCUS
-                    ob_debug("EnterNotify on %lx, focusing window\n",
-                             client->window);
+                    ob_debug("%sNotify mode %d detail %d on %lx, "
+                             "focusing window\n",
+                             (e->type == EnterNotify ? "Enter" : "Leave"),
+                             e->xcrossing.mode,
+                             e->xcrossing.detail, client?client->window:0);
 #endif
                     if (config_focus_delay) {
                         ob_main_loop_timeout_add(ob_main_loop,
@@ -721,6 +770,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             break;
         }
         break;
+    }
     case ConfigureRequest:
 	/* compress these */
 	while (XCheckTypedWindowEvent(ob_display, client->window,
@@ -1062,6 +1112,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
                  msgtype == prop_atoms.kwm_win_icon) {
 	    client_update_icons(client);
         }
+        else if (msgtype == prop_atoms.sm_client_id) {
+            client_update_sm_client_id(client);
+        }
     default:
         ;
 #ifdef SHAPE
@@ -1147,6 +1200,16 @@ static void event_handle_menu(XEvent *ev)
                                             ev->xmotion.y_root)))
                 menu_frame_select(f, e);
         }
+        {
+            ObMenuFrame *a;
+
+            a = find_active_menu();
+            if (a && a != f &&
+                a->selected->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
+            {
+                menu_frame_select(a, NULL);
+            }
+        }
         break;
     case KeyPress:
         if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
@@ -1197,3 +1260,8 @@ static void focus_delay_client_dest(gpointer data)
         focus_delay_client = NULL;
     }
 }
+
+void event_ignore_enter_focus(guint num)
+{
+    ignore_enter_focus += num;
+}