From 5a468756c07a43e0ee7fa4e406847c86db09834a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 11:42:09 -0500
Subject: reconfigure openbox when the input mapping changes, eg. keyboard
 layout or modifier map

---
 openbox/event.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 5e44bc9f..41bcd350 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -619,6 +619,11 @@ static void event_process(const XEvent *ec, gpointer data)
         event_handle_root(e);
     else if (e->type == MapRequest)
         client_manage(window);
+    else if (e->type == MappingNotify) {
+        /* keyboard layout changes, reconfigure openbox. need to restart the
+           modkeys system, but also to reload the key bindings. */
+        ob_reconfigure();
+    }
     else if (e->type == ClientMessage) {
         /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
            windows that are not managed yet. */
-- 
cgit v1.2.3


From 162a97e158e0dfa774754aee5198786907f9453b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 13:05:11 -0500
Subject: XKB modifiers are strange things, and i don't know how to read them
 properly in modkeys.c and convert it all to the x core stuff.  so we use this
 to get the state of the modifiers, otherwise we end up missing them sometimes
 (like on PPC)

---
 openbox/event.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 41bcd350..0c97bd93 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -247,6 +247,10 @@ static void event_set_curtime(XEvent *e)
 
 static void event_hack_mods(XEvent *e)
 {
+#ifdef XKB
+    XkbStateRec xkb_state;
+#endif
+
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
@@ -256,10 +260,22 @@ static void event_hack_mods(XEvent *e)
         e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
         break;
     case KeyRelease:
-        e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
-        /* remove from the state the mask of the modifier key being released,
-           if it is a modifier key being released that is */
-        e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode);
+#ifdef XKB
+        /* If XKB is present, then the modifiers are all strange from its
+           magic.  Our X core protocol stuff won't work, so we use this to
+           find what the modifier state is instead. */
+        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
+            e->xkey.state = xkb_state.compat_state;
+            break;
+        }
+        else
+#endif
+        {
+            e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
+            /* remove from the state the mask of the modifier key being
+               released, if it is a modifier key being released that is */
+            e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode);
+        }
         break;
     case MotionNotify:
         e->xmotion.state = modkeys_only_modifier_masks(e->xmotion.state);
-- 
cgit v1.2.3


From b447f16f6080e1a92c3ea6a5848609a7a96ea3ce Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 13:06:37 -0500
Subject: code clean up

---
 openbox/event.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 0c97bd93..e3214a7a 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -264,10 +264,8 @@ static void event_hack_mods(XEvent *e)
         /* If XKB is present, then the modifiers are all strange from its
            magic.  Our X core protocol stuff won't work, so we use this to
            find what the modifier state is instead. */
-        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
+        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success)
             e->xkey.state = xkb_state.compat_state;
-            break;
-        }
         else
 #endif
         {
-- 
cgit v1.2.3


From 0ce14a727968736e57fb3fabba3794b46903875f Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 14:40:58 -0500
Subject: fix a focus race condition in two ways:

1. when focusing a window, ignore any enter events up until the serial of the X event causing the focus, not up until the last thing sent to the server.  if we get 2 enters very quickly, then we don't want to ignore the second one just because we are focusing the first window.
2. there is a race if you check (focus_client != d->client) in the delay_focus_func, because the current focused window might change by the time this focus_client would take effect, so don't check that.
---
 openbox/event.c | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index e3214a7a..03229117 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -91,6 +91,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
 static void event_handle_user_input(ObClient *client, XEvent *e);
 static gboolean is_enter_focus_event_ignored(XEvent *e);
+static void event_ignore_enter_range(gulong start, gulong end);
 
 static void focus_delay_dest(gpointer data);
 static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2);
@@ -99,6 +100,8 @@ static void focus_delay_client_dest(ObClient *client, gpointer data);
 
 Time event_curtime = CurrentTime;
 Time event_last_user_time = CurrentTime;
+/*! The serial of the current X event */
+gulong event_curserial;
 
 static gboolean focus_left_screen = FALSE;
 /*! A list of ObSerialRanges which are to be ignored for mouse enter events */
@@ -243,6 +246,7 @@ static void event_set_curtime(XEvent *e)
         event_last_user_time = CurrentTime;
 
     event_curtime = t;
+    event_curserial = 0;
 }
 
 static void event_hack_mods(XEvent *e)
@@ -479,6 +483,7 @@ static void event_process(const XEvent *ec, gpointer data)
     }
 
     event_set_curtime(e);
+    event_curserial = e->xany.serial;
     event_hack_mods(e);
     if (event_ignore(e, client)) {
         if (ed)
@@ -1010,18 +1015,23 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 is_enter_focus_event_ignored(e))
             {
                 ob_debug_type(OB_DEBUG_FOCUS,
-                              "%sNotify mode %d detail %d on %lx IGNORED\n",
+                              "%sNotify mode %d detail %d serial %lu on %lx "
+                              "IGNORED\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
-                              e->xcrossing.detail, client?client->window:0);
+                              e->xcrossing.detail,
+                              e->xcrossing.serial,
+                              client?client->window:0);
             }
             else {
                 ob_debug_type(OB_DEBUG_FOCUS,
-                              "%sNotify mode %d detail %d on %lx, "
+                              "%sNotify mode %d detail %d serial %lu on %lx, "
                               "focusing window\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
-                              e->xcrossing.detail, (client?client->window:0));
+                              e->xcrossing.detail,
+                              e->xcrossing.serial,
+                              (client?client->window:0));
                 if (config_focus_follow)
                     event_enter_client(client);
             }
@@ -1864,10 +1874,8 @@ static gboolean focus_delay_func(gpointer data)
     if (menu_frame_visible || moveresize_in_progress) return FALSE;
 
     event_curtime = d->time;
-    if (focus_client != d->client) {
-        if (client_focus(d->client) && config_focus_raise)
-            stacking_raise(CLIENT_AS_WINDOW(d->client));
-    }
+    if (client_focus(d->client) && config_focus_raise)
+        stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
     return FALSE; /* no repeat */
 }
@@ -1878,35 +1886,44 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay(void)
+void event_halt_focus_delay(gulong serial)
 {
-    /* ignore all enter events up till now */
-    event_end_ignore_all_enters(1);
+    /* ignore all enter events up till the event which caused this to occur */
+    if (event_curserial) event_ignore_enter_range(1, event_curserial);
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
 }
 
 gulong event_start_ignore_all_enters(void)
 {
+    /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
     return LastKnownRequestProcessed(ob_display);
 }
 
-void event_end_ignore_all_enters(gulong start)
+static void event_ignore_enter_range(gulong start, gulong end)
 {
     ObSerialRange *r;
 
     g_assert(start != 0);
-    XSync(ob_display, FALSE);
+    g_assert(end != 0);
 
     r = g_new(ObSerialRange, 1);
     r->start = start;
-    r->end = LastKnownRequestProcessed(ob_display);
+    r->end = end;
     ignore_serials = g_slist_prepend(ignore_serials, r);
 
+    ob_debug_type(OB_DEBUG_FOCUS, "ignoring enters from %lu until %lu\n",
+                  r->start, r->end);
+
     /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
 }
 
+void event_end_ignore_all_enters(gulong start)
+{
+    event_ignore_enter_range(start, LastKnownRequestProcessed(ob_display));
+}
+
 static gboolean is_enter_focus_event_ignored(XEvent *e)
 {
     GSList *it, *next;
-- 
cgit v1.2.3


From 2b80e4e8ef56bb4fba614139601e750344418e5b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:13:12 -0500
Subject: ignore mouse clicks on override-redirect windows that aren't owned by
 openbox

---
 openbox/event.c | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 03229117..cd562599 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -694,12 +694,50 @@ static void event_process(const XEvent *ec, gpointer data)
     }
 #endif
 
-    if (e->type == ButtonPress || e->type == ButtonRelease ||
-        e->type == MotionNotify || e->type == KeyPress ||
-        e->type == KeyRelease)
-    {
-        event_handle_user_input(client, e);
+    if (e->type == ButtonPress || e->type == ButtonRelease) {
+        /* If the button press was on some non-root window, or was physically
+           on the root window, the process it */
+        if (window != RootWindow(ob_display, ob_screen) ||
+            e->xbutton.subwindow == None)
+        {
+            event_handle_user_input(client, e);
+        }
+        /* Otherwise only process it if it was physically on an openbox
+           internal window */
+        else {
+            Window target, parent, root, *children;
+            unsigned int nchildren;
+            ObWindow *w;
+
+            /* Find the top level ancestor of the subwindow, besides the
+               root */
+            target = e->xbutton.subwindow;
+            ob_debug("subwindow 0x%x\n", target);
+            while (XQueryTree(ob_display, target, &root, &parent, &children,
+                              &nchildren) != 0)
+            {
+                XFree(children);
+                if (parent == root) {
+                    ob_debug("parent is root\n");
+                    break;
+                }
+                target = parent;
+            }
+            ob_debug("toplevel 0x%x\n", target);
+
+            w = g_hash_table_lookup(window_map, &target);
+            ob_debug("w 0x%x\n", w);
+                
+            if ((w = g_hash_table_lookup(window_map, &target)) &&
+                WINDOW_IS_INTERNAL(w))
+            {
+                event_handle_user_input(client, e);
+            }
+        }
     }
+    else if (e->type == KeyPress || e->type == KeyRelease ||
+             e->type == MotionNotify)
+        event_handle_user_input(client, e);
 
     /* if something happens and it's not from an XEvent, then we don't know
        the time */
-- 
cgit v1.2.3


From bf259be653b9c37c79f9cd8ababffe225857ce9f Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:28:35 -0500
Subject: fixes from commit 0ce14a727968736e57fb3fabba3794b46903875f the xsync
 was needed to get the right serial for the end of the ignore range

---
 openbox/event.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index cd562599..cc3ea68f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -74,6 +74,7 @@ typedef struct
 {
     ObClient *client;
     Time time;
+    gulong serial;
 } ObFocusDelayData;
 
 typedef struct
@@ -246,7 +247,6 @@ static void event_set_curtime(XEvent *e)
         event_last_user_time = CurrentTime;
 
     event_curtime = t;
-    event_curserial = 0;
 }
 
 static void event_hack_mods(XEvent *e)
@@ -742,6 +742,7 @@ static void event_process(const XEvent *ec, gpointer data)
     /* if something happens and it's not from an XEvent, then we don't know
        the time */
     event_curtime = CurrentTime;
+    event_curserial = 0;
 }
 
 static void event_handle_root(XEvent *e)
@@ -816,6 +817,7 @@ void event_enter_client(ObClient *client)
             data = g_new(ObFocusDelayData, 1);
             data->client = client;
             data->time = event_curtime;
+            data->serial = event_curserial;
 
             ob_main_loop_timeout_add(ob_main_loop,
                                      config_focus_delay * 1000,
@@ -825,6 +827,7 @@ void event_enter_client(ObClient *client)
             ObFocusDelayData data;
             data.client = client;
             data.time = event_curtime;
+            data.serial = event_curserial;
             focus_delay_func(&data);
         }
     }
@@ -1912,6 +1915,7 @@ static gboolean focus_delay_func(gpointer data)
     if (menu_frame_visible || moveresize_in_progress) return FALSE;
 
     event_curtime = d->time;
+    event_curserial = d->serial;
     if (client_focus(d->client) && config_focus_raise)
         stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
@@ -1924,7 +1928,7 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay(gulong serial)
+void event_halt_focus_delay()
 {
     /* ignore all enter events up till the event which caused this to occur */
     if (event_curserial) event_ignore_enter_range(1, event_curserial);
@@ -1933,7 +1937,6 @@ void event_halt_focus_delay(gulong serial)
 
 gulong event_start_ignore_all_enters(void)
 {
-    /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
     return LastKnownRequestProcessed(ob_display);
 }
@@ -1959,6 +1962,7 @@ static void event_ignore_enter_range(gulong start, gulong end)
 
 void event_end_ignore_all_enters(gulong start)
 {
+    XSync(ob_display, FALSE);
     event_ignore_enter_range(start, LastKnownRequestProcessed(ob_display));
 }
 
-- 
cgit v1.2.3


From 78cd9bba523f4986413e3aefe87704e9d11cd081 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:33:43 -0500
Subject: continue commit 2b80e4e8ef56bb4fba614139601e750344418e5b - remove
 debug code, and some unneeded stuff

---
 openbox/event.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index cc3ea68f..d2cb7567 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -705,30 +705,9 @@ static void event_process(const XEvent *ec, gpointer data)
         /* Otherwise only process it if it was physically on an openbox
            internal window */
         else {
-            Window target, parent, root, *children;
-            unsigned int nchildren;
             ObWindow *w;
 
-            /* Find the top level ancestor of the subwindow, besides the
-               root */
-            target = e->xbutton.subwindow;
-            ob_debug("subwindow 0x%x\n", target);
-            while (XQueryTree(ob_display, target, &root, &parent, &children,
-                              &nchildren) != 0)
-            {
-                XFree(children);
-                if (parent == root) {
-                    ob_debug("parent is root\n");
-                    break;
-                }
-                target = parent;
-            }
-            ob_debug("toplevel 0x%x\n", target);
-
-            w = g_hash_table_lookup(window_map, &target);
-            ob_debug("w 0x%x\n", w);
-                
-            if ((w = g_hash_table_lookup(window_map, &target)) &&
+            if ((w = g_hash_table_lookup(window_map, &e->xbutton.subwindow)) &&
                 WINDOW_IS_INTERNAL(w))
             {
                 event_handle_user_input(client, e);
-- 
cgit v1.2.3


From 040d344a89f40487de8a1920e0aaeccd93a6a995 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:57:32 -0500
Subject: don't take KeyRelease events for menus until they receive a KeyPress
 event first.  avoid using the key binding used to show the menu to execute
 something inside it.

---
 openbox/event.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index d2cb7567..6b0ecdd7 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1671,6 +1671,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
 
     /* Allow control while going thru the menu */
     else if (ev->type == KeyPress && (state & ~ControlMask) == 0) {
+        frame->got_press = TRUE;
+
         if (keycode == ob_keycode(OB_KEY_ESCAPE)) {
             menu_frame_hide_all();
             ret = TRUE;
@@ -1704,7 +1706,7 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
 
        Allow ControlMask only, and don't bother if the menu is empty */
     else if (ev->type == KeyRelease && (state & ~ControlMask) == 0 &&
-             frame->entries)
+             frame->entries && frame->got_press)
     {
         if (keycode == ob_keycode(OB_KEY_RETURN)) {
             /* Enter runs the active item or goes into the submenu.
-- 
cgit v1.2.3


From 405d9a3e431b01a221be65f41bccb6c80c43b0a4 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 21:19:58 -0500
Subject: dont reparse the config file when the keyboard map changes. just
 rebind everything. yay for mika as inspiration

---
 openbox/event.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 6b0ecdd7..bc59d67e 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -639,9 +639,12 @@ static void event_process(const XEvent *ec, gpointer data)
     else if (e->type == MapRequest)
         client_manage(window);
     else if (e->type == MappingNotify) {
-        /* keyboard layout changes, reconfigure openbox. need to restart the
-           modkeys system, but also to reload the key bindings. */
-        ob_reconfigure();
+        /* keyboard layout changes for modifier mapping changes. reload the
+           modifier map, and rebind all the key bindings as appropriate */
+        ob_debug("Kepboard map changed. Reloading keyboard bindings.\n");
+        modkeys_shutdown(TRUE);
+        modkeys_startup(TRUE);
+        keyboard_rebind();
     }
     else if (e->type == ClientMessage) {
         /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
-- 
cgit v1.2.3


From 669c7655be8fef885e2f5ea0b0d389046ebb6753 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 23:16:06 -0500
Subject: since the internal windows are in window_map now, it's possible we'll
 get them back when we check what window an event happened on.  so don't abort
 if that happens anymore.

---
 openbox/event.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index bc59d67e..04ecf383 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -475,10 +475,12 @@ static void event_process(const XEvent *ec, gpointer data)
             client = WINDOW_AS_CLIENT(obwin);
             break;
         case Window_Menu:
-        case Window_Internal:
             /* not to be used for events */
             g_assert_not_reached();
             break;
+        case Window_Internal:
+            /* we don't do anything with events directly on these windows */
+            break;
         }
     }
 
-- 
cgit v1.2.3


From 5148b839fefe16b54f26bc0d2c7a500127cf2725 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 Jan 2008 02:50:34 -0500
Subject: sync when killing all keyboard grabs, so that we can be sure they are
 gone before proceeding (fixes a race condition when running things that want
 to grab the keyboard very quickly.  yes, arch is that fast somehow..)

---
 openbox/event.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 04ecf383..44e0f532 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1997,6 +1997,8 @@ void event_cancel_all_key_grabs(void)
     }
     else
         ungrab_passive_key();
+
+    XSync(ob_display, FALSE);
 }
 
 gboolean event_time_after(Time t1, Time t2)
-- 
cgit v1.2.3


From fb7a71da202632c7301ada67c8b4420bfb8d8fbe Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 21:40:15 -0500
Subject: can tell when a window that was "closed" has stopped responding now

---
 openbox/event.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 44e0f532..5d85eaeb 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -767,6 +767,9 @@ static void event_handle_root(XEvent *e)
                 ob_restart();
             else if (e->xclient.data.l[0] == 3)
                 ob_exit(0);
+        } else if (msgtype == prop_atoms.wm_protocols) {
+            if (e->xclient.data.l[0] == prop_atoms.net_wm_ping)
+                ping_got_pong(e->xclient.data.l[1]);
         }
         break;
     case PropertyNotify:
-- 
cgit v1.2.3


From 0be98fee4743c795b06aa23881b82eff5bab3ef6 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 16 Jan 2008 15:25:08 +0100
Subject: Various fixes for sparse warnings.

Define void functions with (void), not ().
Add missing includes.
Some functions were declared static but defined non-static.
Some variables that should be file static were file global but not used in any other file.
prop.h defined a new prop_atoms in each file that included it instead of declaring it extern.
---
 openbox/event.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index 5d85eaeb..f4ebfa47 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -43,6 +43,7 @@
 #include "stacking.h"
 #include "extensions.h"
 #include "translate.h"
+#include "ping.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -102,8 +103,8 @@ static void focus_delay_client_dest(ObClient *client, gpointer data);
 Time event_curtime = CurrentTime;
 Time event_last_user_time = CurrentTime;
 /*! The serial of the current X event */
-gulong event_curserial;
 
+static gulong event_curserial;
 static gboolean focus_left_screen = FALSE;
 /*! A list of ObSerialRanges which are to be ignored for mouse enter events */
 static GSList *ignore_serials = NULL;
@@ -1917,7 +1918,7 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay()
+void event_halt_focus_delay(void)
 {
     /* ignore all enter events up till the event which caused this to occur */
     if (event_curserial) event_ignore_enter_range(1, event_curserial);
-- 
cgit v1.2.3


From 299687110d478a4928932f72031c345b27a01840 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 18:44:22 -0500
Subject: use hash tables in ping.[ch] instead of a list. we're pinging every
 window, not just windows youre trying to close, so don't use datastructures
 that suck with lots of windows..

---
 openbox/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openbox/event.c')

diff --git a/openbox/event.c b/openbox/event.c
index f4ebfa47..025f1188 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -769,7 +769,7 @@ static void event_handle_root(XEvent *e)
             else if (e->xclient.data.l[0] == 3)
                 ob_exit(0);
         } else if (msgtype == prop_atoms.wm_protocols) {
-            if (e->xclient.data.l[0] == prop_atoms.net_wm_ping)
+            if ((Atom)e->xclient.data.l[0] == prop_atoms.net_wm_ping)
                 ping_got_pong(e->xclient.data.l[1]);
         }
         break;
-- 
cgit v1.2.3