Attachment 15589 Details for Bug 15293 – Patch improving X11 handling

[patch] Patch improving X11 handling

dbus-x11-handling.patch (text/plain), 1.60 KB, created by Owen Taylor on 2008-03-31 14:44:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2008-03-31 14:44:39 UTC

Size: 1.60 KB

patch

obsolete

>commit 13d0d3142558befe4767c5234c29a6b7c7099092
>Author: Owen W. Taylor <otaylor@fishsoup.net>
>Date:   Mon Mar 31 17:40:26 2008 -0400
>
>    Clean up X event handling to be 100% correct.
>    We need to call while (XPending()) { XNextEvent(); } before
>    we select, not after.
>
>diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
>index 6a10ffa..216f743 100644
>--- a/tools/dbus-launch.c
>+++ b/tools/dbus-launch.c
>@@ -458,6 +458,17 @@ kill_bus_when_session_ends (void)
>   
>   while (TRUE)
>     {
>+#ifdef DBUS_BUILD_X11
>+      /* Dump events on the floor, and let
>+       * IO error handler run if we lose
>+       * the X connection. It's important to
>+       * run this before going into select() since
>+       * we might have queued outgoing messages or
>+       * events.
>+       */
>+      x11_handle_event ();
>+#endif
>+      
>       FD_ZERO (&read_set);
>       FD_ZERO (&err_set);
> 
>@@ -472,7 +483,7 @@ kill_bus_when_session_ends (void)
>           FD_SET (x_fd, &read_set);
>           FD_SET (x_fd, &err_set);
>         }
>-      
>+
>       select (MAX (tty_fd, x_fd) + 1,
>               &read_set, NULL, &err_set, NULL);
> 
>@@ -483,15 +494,12 @@ kill_bus_when_session_ends (void)
>         }
>       
> #ifdef DBUS_BUILD_X11
>-      /* Dump events on the floor, and let
>-       * IO error handler run if we lose
>-       * the X connection
>+      /* Events will be processed before we select again
>        */
>       if (x_fd >= 0)
>         verbose ("X fd condition reading = %d error = %d\n",
>                  FD_ISSET (x_fd, &read_set),
>                  FD_ISSET (x_fd, &err_set));
>-      x11_handle_event ();
> #endif
> 
>       if (tty_fd >= 0)

Actions: View | Splinter Review

Attachments on bug 15293: 15588 | 15589

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.