Attachment 6992 Details for Bug 8101 – Patch for dbus-launch to allow auto-starting of the daemon

[patch] Patch for dbus-launch to allow auto-starting of the daemon

dbus-autolaunch-dbuslaunch.diff (text/plain), 24.65 KB, created by Thiago Macieira on 2006-09-15 09:06:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thiago Macieira

Created: 2006-09-15 09:06:00 UTC

Size: 24.65 KB

patch

obsolete

>? dbus-launch.c.flc
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dbus/dbus/tools/Makefile.am,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile.am
>--- Makefile.am	8 Aug 2006 21:30:31 -0000	1.20
>+++ Makefile.am	15 Sep 2006 15:33:30 -0000
>@@ -13,7 +13,8 @@
> 	dbus-print-message.h
> 
> dbus_launch_SOURCES=				\
>-	dbus-launch.c
>+	dbus-launch.c				\
>+	dbus-launch-x11.c
> 
> dbus_cleanup_sockets_SOURCES=			\
> 	dbus-cleanup-sockets.c
>Index: dbus-launch.c
>===================================================================
>RCS file: /cvs/dbus/dbus/tools/dbus-launch.c,v
>retrieving revision 1.16
>diff -u -r1.16 dbus-launch.c
>--- dbus-launch.c	1 Sep 2006 20:47:09 -0000	1.16
>+++ dbus-launch.c	15 Sep 2006 15:33:31 -0000
>@@ -20,7 +20,7 @@
>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>  *
>  */
>-#include <config.h>
>+#include "dbus-launch.h"
> #include <stdlib.h>
> #include <unistd.h>
> #include <fcntl.h>
>@@ -32,22 +32,14 @@
> #include <signal.h>
> #include <stdarg.h>
> #include <sys/select.h>
>+#include <time.h>
>+
> #ifdef DBUS_BUILD_X11
> #include <X11/Xlib.h>
>+extern Display *xdisplay;
> #endif
> 
>-#ifndef TRUE
>-#define TRUE (1)
>-#endif
>-
>-#ifndef FALSE
>-#define FALSE (0)
>-#endif
>-
>-#undef	MAX
>-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
>-
>-static void
>+void
> verbose (const char *format,
>          ...)
> {
>@@ -95,7 +87,7 @@
>   exit (0);
> }
> 
>-static char *
>+char *
> xstrdup (const char *str)
> {
>   int len;
>@@ -276,7 +268,7 @@
> 
> static pid_t bus_pid_to_kill = -1;
> 
>-static void
>+void
> kill_bus_and_exit (void)
> {
>   verbose ("Killing message bus and exiting babysitter\n");
>@@ -293,15 +285,35 @@
>   exit (0);
> }
> 
>-#ifdef DBUS_BUILD_X11
>-static int
>-x_io_error_handler (Display *xdisplay)
>-{
>-  verbose ("X IO error\n");
>-  kill_bus_and_exit ();
>-  return 0;
>+static void
>+print_variables (const char *bus_address, pid_t bus_pid, long bus_wid,
>+		 int c_shell_syntax, int bourne_shell_syntax,
>+		 int binary_syntax)
>+{
>+  if (binary_syntax)
>+    {
>+      write (1, bus_address, strlen (bus_address) + 1);
>+      write (1, &bus_pid, sizeof bus_pid);
>+      write (1, &bus_wid, sizeof bus_wid);
>+      return;
>+    }
>+  else if (c_shell_syntax)
>+    {
>+      printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s';\n", bus_address);	
>+      printf ("set DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
>+      if (bus_wid)
>+	printf ("set DBUS_SESSION_BUS_WID=%ld;\n", (long) bus_wid);
>+    }
>+  else
>+    {
>+      printf ("DBUS_SESSION_BUS_ADDRESS='%s';\n", bus_address);
>+      if (bourne_shell_syntax)
>+	printf ("export DBUS_SESSION_BUS_ADDRESS;\n");
>+      printf ("DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
>+      if (bus_wid)
>+	printf ("DBUS_SESSION_BUS_WID=%ld;\n", (long) bus_wid);
>+    }
> }
>-#endif
> 
> static int got_sighup = FALSE;
> 
>@@ -326,9 +338,6 @@
>   fd_set err_set;
>   struct sigaction act;
>   sigset_t empty_mask;
>-#ifdef DBUS_BUILD_X11
>-  Display *xdisplay;
>-#endif
>   
>   /* install SIGHUP handler */
>   got_sighup = FALSE;
>@@ -340,17 +349,13 @@
>   sigaction (SIGTERM,  &act, NULL);
>   
> #ifdef DBUS_BUILD_X11
>-  xdisplay = XOpenDisplay (NULL);
>   if (xdisplay != NULL)
>     {
>-      verbose ("Successfully opened X display\n");
>       x_fd = ConnectionNumber (xdisplay);
>-      XSetIOErrorHandler (x_io_error_handler);
>     }
>   else
>     x_fd = -1;
> #else
>-  verbose ("Compiled without X11 support\n");
>   x_fd = -1;
> #endif
> 
>@@ -405,15 +410,7 @@
>         verbose ("X fd condition reading = %d error = %d\n",
>                  FD_ISSET (x_fd, &read_set),
>                  FD_ISSET (x_fd, &err_set));
>-      
>-      if (xdisplay != NULL)
>-        {      
>-          while (XPending (xdisplay))
>-            {
>-              XEvent ignored;
>-              XNextEvent (xdisplay, &ignored);
>-            }
>-        }
>+      x11_handle_event ();
> #endif
> 
>       if (tty_fd >= 0)
>@@ -455,19 +452,14 @@
> static void
> babysit (int   exit_with_session,
>          pid_t child_pid,
>-         int   read_bus_pid_fd,  /* read pid from here */
>-         int   write_bus_pid_fd) /* forward pid to here */
>+         int   read_bus_pid_fd)  /* read pid from here */
> {
>   int ret;
>-#define MAX_PID_LEN 64
>-  char buf[MAX_PID_LEN];
>-  long val;
>-  char *end;
>   int dev_null_fd;
>   const char *s;
> 
>-  verbose ("babysitting, exit_with_session = %d, child_pid = %ld, read_bus_pid_fd = %d, write_bus_pid_fd = %d\n",
>-           exit_with_session, (long) child_pid, read_bus_pid_fd, write_bus_pid_fd);
>+  verbose ("babysitting, exit_with_session = %d, child_pid = %ld, read_bus_pid_fd = %d\n",
>+           exit_with_session, (long) child_pid, read_bus_pid_fd);
>   
>   /* We chdir ("/") since we are persistent and daemon-like, and fork
>    * again so dbus-launch can reap the parent.  However, we don't
>@@ -536,41 +528,26 @@
>   /* Child continues */
>   verbose ("=== Babysitter process created\n");
> 
>-  verbose ("Reading PID from daemon\n");
>-  /* Now read data */
>-  switch (read_line (read_bus_pid_fd, buf, MAX_PID_LEN))
>+  verbose ("Reading PID from bus\n");
>+      
>+  switch (read_pid (read_bus_pid_fd, &bus_pid_to_kill))
>     {
>     case READ_STATUS_OK:
>       break;
>     case READ_STATUS_EOF:
>-      fprintf (stderr, "EOF reading PID from bus daemon\n");
>+      fprintf (stderr, "EOF in dbus-launch reading PID from bus daemon\n");
>       exit (1);
>       break;
>     case READ_STATUS_ERROR:
>-      fprintf (stderr, "Error reading PID from bus daemon: %s\n",
>-               strerror (errno));
>+      fprintf (stderr, "Error in dbus-launch reading PID from bus daemon: %s\n",
>+	       strerror (errno));
>       exit (1);
>       break;
>     }
> 
>-  end = NULL;
>-  val = strtol (buf, &end, 0);
>-  if (buf == end || end == NULL)
>-    {
>-      fprintf (stderr, "Failed to parse bus PID \"%s\": %s\n",
>-               buf, strerror (errno));
>-      exit (1);
>-    }
>-
>-  bus_pid_to_kill = val;
>-
>   verbose ("Got PID %ld from daemon\n",
>            (long) bus_pid_to_kill);
>   
>-  /* Write data to launcher */
>-  write_pid (write_bus_pid_fd, bus_pid_to_kill);
>-  close (write_bus_pid_fd);
>-  
>   if (exit_with_session)
>     {
>       /* Bus is now started and launcher has needed info;
>@@ -597,9 +574,11 @@
>   const char *runprog = NULL;
>   int remaining_args = 0;
>   int exit_with_session;
>+  int binary_syntax = FALSE;
>   int c_shell_syntax = FALSE;
>   int bourne_shell_syntax = FALSE;
>   int auto_shell_syntax = FALSE;
>+  int x11_integration = FALSE;
>   int i;  
>   int ret;
>   int bus_pid_to_launcher_pipe[2];
>@@ -628,10 +607,14 @@
>       else if (strcmp (arg, "-s") == 0 ||
> 	       strcmp (arg, "--sh-syntax") == 0)
>         bourne_shell_syntax = TRUE;
>+      else if (strcmp (arg, "--binary-syntax") == 0)
>+	binary_syntax = TRUE;
>       else if (strcmp (arg, "--version") == 0)
>         version ();
>       else if (strcmp (arg, "--exit-with-session") == 0)
>         exit_with_session = TRUE;
>+      else if (strcmp (arg, "--x11-integration") == 0)
>+	x11_integration = TRUE;
>       else if (strstr (arg, "--config-file=") == arg)
>         {
>           const char *file;
>@@ -672,9 +655,6 @@
>       ++i;
>     }
> 
>-  if (exit_with_session)
>-    verbose ("--exit-with-session enabled\n");
>-
>   if (auto_shell_syntax)
>     {
>       if ((shname = getenv ("SHELL")) != NULL)
>@@ -688,8 +668,52 @@
>        bourne_shell_syntax = TRUE;
>     }  
> 
>+  if (exit_with_session)
>+    verbose ("--exit-with-session enabled\n");
>+
>+  if (x11_integration)
>+    {
>+#ifndef DBUS_BUILD_X11
>+      fprintf (stderr, "X11 integration requested, but X11 support not compiled in.\n"
>+	       "Cannot continue.\n");
>+      return 1;
>+#else
>+      char *address;
>+      pid_t pid;
>+      long wid;
>+
>+      verbose ("X11 integration enabled.\n");
>+      if (!exit_with_session)
>+	{
>+	  verbose ("--exit-with-session automatically enabled\n");
>+	  exit_with_session = TRUE;
>+	}
>+
>+      if (!x11_init ())
>+	{
>+	  fprintf (stderr, "X11 initialization failed.\n");
>+	  return 1;
>+	}
>+
>+      if (!x11_get_address (&address, &pid, &wid))
>+	{
>+	  fprintf (stderr, "X11 communication error.\n");
>+	  return 1;
>+	}
>+
>+      if (address != NULL)
>+	{
>+	  verbose ("dbus-daemon is already running. Returning existing parameters.\n");
>+	  print_variables (address, pid, wid, c_shell_syntax,
>+			   bourne_shell_syntax, binary_syntax);
>+	  return 0;
>+	}
>+#endif
>+    }
>+
>   if (pipe (bus_pid_to_launcher_pipe) < 0 ||
>-      pipe (bus_address_to_launcher_pipe) < 0)
>+      pipe (bus_address_to_launcher_pipe) < 0 ||
>+      pipe (bus_pid_to_babysitter_pipe) < 0)
>     {
>       fprintf (stderr,
>                "Failed to create pipe: %s\n",
>@@ -697,9 +721,6 @@
>       exit (1);
>     }
> 
>-  bus_pid_to_babysitter_pipe[READ_END] = -1;
>-  bus_pid_to_babysitter_pipe[WRITE_END] = -1;
>-  
>   ret = fork ();
>   if (ret < 0)
>     {
>@@ -716,17 +737,9 @@
>       char write_address_fd_as_string[MAX_FD_LEN];
> 
>       verbose ("=== Babysitter's intermediate parent created\n");
>-      
>+
>       /* Fork once more to create babysitter */
>       
>-      if (pipe (bus_pid_to_babysitter_pipe) < 0)
>-        {
>-          fprintf (stderr,
>-                   "Failed to create pipe: %s\n",
>-                   strerror (errno));
>-          exit (1);              
>-        }
>-      
>       ret = fork ();
>       if (ret < 0)
>         {
>@@ -741,6 +754,7 @@
>           verbose ("=== Babysitter's intermediate parent continues\n");
>           
>           close (bus_pid_to_launcher_pipe[READ_END]);
>+	  close (bus_pid_to_launcher_pipe[WRITE_END]);
>           close (bus_address_to_launcher_pipe[READ_END]);
>           close (bus_address_to_launcher_pipe[WRITE_END]);
>           close (bus_pid_to_babysitter_pipe[WRITE_END]);
>@@ -750,8 +764,7 @@
>            * daemon
>            */
>           babysit (exit_with_session, ret,
>-                   bus_pid_to_babysitter_pipe[READ_END],
>-                   bus_pid_to_launcher_pipe[WRITE_END]);
>+                   bus_pid_to_babysitter_pipe[READ_END]);
>           exit (0);
>         }
> 
>@@ -763,10 +776,10 @@
>       close (bus_pid_to_launcher_pipe[READ_END]);
>       close (bus_address_to_launcher_pipe[READ_END]);
>       close (bus_pid_to_babysitter_pipe[READ_END]);
>-      close (bus_pid_to_launcher_pipe[WRITE_END]);
>+      close (bus_pid_to_babysitter_pipe[WRITE_END]);
> 
>       sprintf (write_pid_fd_as_string,
>-               "%d", bus_pid_to_babysitter_pipe[WRITE_END]);
>+               "%d", bus_pid_to_launcher_pipe[WRITE_END]);
> 
>       sprintf (write_address_fd_as_string,
>                "%d", bus_address_to_launcher_pipe[WRITE_END]);
>@@ -809,14 +822,20 @@
>   else
>     {
>       /* Parent */
>-#define MAX_ADDR_LEN 512
>+#define MAX_PID_LEN 64
>       pid_t bus_pid;  
>       char bus_address[MAX_ADDR_LEN];
>+      char buf[MAX_PID_LEN];
>+      char *end;
>+      long wid = 0;
>+      long val;
>+      int ret2;
> 
>       verbose ("=== Parent dbus-launch continues\n");
>       
>       close (bus_pid_to_launcher_pipe[WRITE_END]);
>       close (bus_address_to_launcher_pipe[WRITE_END]);
>+      close (bus_pid_to_babysitter_pipe[READ_END]);
> 
>       verbose ("Waiting for babysitter's intermediate parent\n");
>       
>@@ -851,25 +870,51 @@
>         
>       close (bus_address_to_launcher_pipe[READ_END]);
> 
>-      verbose ("Reading PID from babysitter\n");
>-      
>-      switch (read_pid (bus_pid_to_launcher_pipe[READ_END], &bus_pid))
>-        {
>-        case READ_STATUS_OK:
>-          break;
>-        case READ_STATUS_EOF:
>-          fprintf (stderr, "EOF in dbus-launch reading address from bus daemon\n");
>-          exit (1);
>-          break;
>-        case READ_STATUS_ERROR:
>-          fprintf (stderr, "Error in dbus-launch reading address from bus daemon: %s\n",
>-                   strerror (errno));
>-          exit (1);
>-          break;
>-        }
>+      verbose ("Reading PID from daemon\n");
>+      /* Now read data */
>+      switch (read_line (bus_pid_to_launcher_pipe[READ_END], buf, MAX_PID_LEN))
>+	{
>+	case READ_STATUS_OK:
>+	  break;
>+	case READ_STATUS_EOF:
>+	  fprintf (stderr, "EOF reading PID from bus daemon\n");
>+	  exit (1);
>+	  break;
>+	case READ_STATUS_ERROR:
>+	  fprintf (stderr, "Error reading PID from bus daemon: %s\n",
>+		   strerror (errno));
>+	  exit (1);
>+	  break;
>+	}
>+
>+      end = NULL;
>+      val = strtol (buf, &end, 0);
>+      if (buf == end || end == NULL)
>+	{
>+	  fprintf (stderr, "Failed to parse bus PID \"%s\": %s\n",
>+		   buf, strerror (errno));
>+	  exit (1);
>+	}
>+
>+      bus_pid = val;
> 
>       close (bus_pid_to_launcher_pipe[READ_END]);
>-      
>+
>+#ifdef DBUS_BUILD_X11
>+      ret2 = x11_save_address (bus_address, bus_pid, &wid);
>+      if (ret2 < 0)
>+	fprintf (stderr, "Error saving bus information.\n");
>+      if (ret2 <= 0)
>+	{
>+	  bus_pid_to_kill = bus_pid;
>+	  kill_bus_and_exit ();
>+	}
>+#endif
>+
>+      /* Forward the pid to the babysitter */
>+      write_pid (bus_pid_to_babysitter_pipe[WRITE_END], bus_pid);
>+      close (bus_pid_to_babysitter_pipe[WRITE_END]);
>+
>       if (runprog)
> 	{
> 	  char *envvar;
>@@ -904,18 +949,8 @@
> 	}
>       else
> 	{
>-	  if (c_shell_syntax)
>-	    printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s';\n", bus_address);	
>-	  else
>-	    {
>-	      printf ("DBUS_SESSION_BUS_ADDRESS='%s';\n", bus_address);
>-	      if (bourne_shell_syntax)
>-		printf ("export DBUS_SESSION_BUS_ADDRESS;\n");
>-	    }
>-	  if (c_shell_syntax)
>-	    printf ("set DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
>-	  else
>-	    printf ("DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
>+	  print_variables (bus_address, bus_pid, wid, c_shell_syntax,
>+			   bourne_shell_syntax, binary_syntax);
> 	}
> 	  
>       verbose ("dbus-launch exiting\n");
>--- /dev/null	2006-09-12 17:30:44.756285750 +0200
>+++ dbus-launch.h	2006-09-15 14:34:19.000000000 +0200
>@@ -0,0 +1,56 @@
>+/* -*- mode: C; c-file-style: "gnu" -*- */
>+/* dbus-launch.c  dbus-launch utility
>+ *
>+ * Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
>+ *
>+ * Licensed under the Academic Free License version 2.1
>+ * 
>+ * 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.
>+ * 
>+ * You should have received a copy of the GNU General Public License
>+ * along with this program; if not, write to the Free Software
>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ *
>+ */
>+
>+#ifndef DBUS_LAUNCH_H
>+#define DBUS_LAUNCH_H
>+
>+#include <config.h>
>+#include <sys/types.h>
>+
>+#ifndef TRUE
>+#define TRUE (1)
>+#endif
>+
>+#ifndef FALSE
>+#define FALSE (0)
>+#endif
>+
>+#undef	MAX
>+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
>+
>+#define MAX_ADDR_LEN 512
>+
>+/* defined in dbus-launch.c */
>+void verbose (const char *format, ...);
>+char *xstrdup (const char *str);
>+void kill_bus_and_exit (void);
>+
>+#ifdef DBUS_BUILD_X11
>+/* defined in dbus-launch-x11.c */
>+int x11_init (void);
>+int x11_get_address (char **paddress, pid_t *pid, long *wid);
>+int x11_save_address (char *address, pid_t pid, long *wid);
>+void x11_handle_event (void);
>+#endif
>+
>+#endif
>--- /dev/null	2006-09-12 17:30:44.756285750 +0200
>+++ dbus-launch-x11.c	2006-09-15 15:56:18.000000000 +0200
>@@ -0,0 +1,387 @@
>+/* -*- mode: C; c-file-style: "gnu" -*- */
>+/* dbus-launch.c  dbus-launch utility
>+ *
>+ * Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
>+ *
>+ * Licensed under the Academic Free License version 2.1
>+ * 
>+ * 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.
>+ * 
>+ * You should have received a copy of the GNU General Public License
>+ * along with this program; if not, write to the Free Software
>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ *
>+ */
>+#include "dbus-launch.h"
>+
>+#ifdef DBUS_BUILD_X11
>+#include <stdlib.h>
>+#include <unistd.h>
>+#include <fcntl.h>
>+#include <errno.h>
>+#include <stdio.h>
>+#include <string.h>
>+#include <pwd.h>
>+#include <X11/Xlib.h>
>+#include <X11/Xatom.h>
>+
>+Display *xdisplay;
>+static Atom selection_atom;
>+static Atom address_atom;
>+static Atom pid_atom;
>+
>+static int
>+x_io_error_handler (Display *xdisplay)
>+{
>+  verbose ("X IO error\n");
>+  kill_bus_and_exit ();
>+  return 0;
>+}
>+
>+static char *
>+get_local_hostname (void)
>+{
>+  static const int increment = 128;
>+  static char *cache = NULL;
>+  char *buffer = NULL;
>+  int size = 0;
>+
>+  while (cache == NULL)
>+    {
>+      size += increment;
>+      buffer = realloc (buffer, size);
>+      if (buffer == NULL)
>+        return NULL;            /* out of memory */
>+
>+      if (gethostname (buffer, size - 1) == -1 &&
>+          errno != ENAMETOOLONG)
>+        return NULL;
>+
>+      buffer[size - 1] = '\0';  /* to make sure */
>+      cache = buffer;
>+    }
>+
>+  return cache;
>+}
>+
>+static char *
>+get_session_file (void)
>+{
>+  static const char prefix[] = "/.dbus-session-file_";
>+  char *hostname;
>+  char *display;
>+  char *home;
>+  char *result;
>+  char *p;
>+
>+  display = xstrdup (getenv ("DISPLAY"));
>+  if (display == NULL)
>+    {
>+      verbose ("X11 integration disabled because X11 is not running\n");
>+      return NULL;
>+    }
>+
>+  /* remove the screen part of the display name */
>+  p = strrchr (display, ':');
>+  if (p != NULL)
>+    for ( ; *p; ++p)
>+      if (*p == '.')
>+        {
>+          *p = '\0';
>+          break;
>+        }
>+
>+  /* replace the : in the display with _ */
>+  for (p = display; *p; ++p)
>+    if (*p == ':')
>+      *p = '_';
>+
>+  hostname = get_local_hostname ();
>+  if (hostname == NULL)
>+    {
>+      /* out of memory */
>+      free (display);
>+      return NULL;
>+    }
>+
>+  home = getenv ("HOME");
>+  if (home == NULL)
>+    {
>+      /* try from the user database */
>+      struct passwd *user = getpwuid (getuid());
>+      if (user == NULL)
>+	{
>+	  verbose ("X11 integration disabled because the home directory"
>+		   " could not be determined\n");
>+	  free (display);
>+	  return NULL;
>+	}
>+
>+      home = user->pw_dir;
>+    }
>+
>+  result = malloc (strlen (home) + strlen (prefix) + strlen (hostname) +
>+		   strlen (display) + 2);
>+  if (result == NULL)
>+    {
>+      /* out of memory */
>+      free (display);
>+      return NULL;
>+    }
>+
>+  strcpy (result, home);
>+  strcat (result, prefix);
>+  strcat (result, hostname);
>+  strcat (result, "_");
>+  strcat (result, display);
>+  free (display);
>+
>+  verbose ("session file: %s\n", result);
>+  return result;
>+}
>+
>+static Display *
>+open_x11 (void)
>+{
>+  if (xdisplay != NULL)
>+    return xdisplay;
>+
>+  xdisplay = XOpenDisplay (NULL);
>+  if (xdisplay != NULL)
>+    {
>+      verbose ("Connected to X11 display '%s'\n", DisplayString (xdisplay));
>+      XSetIOErrorHandler (x_io_error_handler);
>+    }
>+  return xdisplay;
>+}
>+
>+static int
>+init_x_atoms (Display *display)
>+{
>+  static const char selection_prefix[] = "D-BUS_SESSION_SELECTION_";
>+  static const char address_prefix[] = "D-BUS_SESSION_ADDRESS";
>+  static const char pid_prefix[] = "D-BUS_SESSION_PID";
>+  char *atom_name;
>+  char *hostname;
>+  char *user_name;
>+  struct passwd *user;
>+
>+  user = getpwuid (getuid ());
>+  if (user == NULL)
>+    {
>+      verbose ("Could not determine the user informations; aborting X11 integration.\n");
>+      return FALSE;
>+    }
>+  user_name = xstrdup(user->pw_name);
>+
>+  hostname = get_local_hostname ();
>+  if (hostname == NULL)
>+    {
>+      verbose ("Could not create X11 atoms; aborting X11 integration.\n");
>+      free (user_name);
>+      return FALSE;
>+    }
>+
>+  atom_name = malloc (strlen (hostname) + strlen (user_name) + 2 +
>+                      MAX (strlen (selection_prefix),
>+                           MAX (strlen (address_prefix),
>+                                strlen (pid_prefix))));
>+  if (atom_name == NULL)
>+    {
>+      verbose ("Could not create X11 atoms; aborting X11 integration.\n");
>+      free (user_name);
>+      return FALSE;
>+    }
>+
>+  /* create the selection atom */
>+  strcpy (atom_name, selection_prefix);
>+  strcat (atom_name, user_name);
>+  strcat (atom_name, "_");
>+  strcat (atom_name, hostname);
>+  selection_atom = XInternAtom (display, atom_name, FALSE);
>+
>+  /* create the address property atom */
>+  strcpy (atom_name, address_prefix);
>+  address_atom = XInternAtom (display, atom_name, FALSE);
>+
>+  /* create the PID property atom */
>+  strcpy (atom_name, pid_prefix);
>+  pid_atom = XInternAtom (display, atom_name, FALSE);
>+
>+  free (atom_name);
>+  free (user_name);
>+  return TRUE;
>+}
>+
>+/*
>+ * Gets the daemon address from the X11 display.
>+ * Returns FALSE if there was an error. Returning
>+ * TRUE does not mean the address exists.
>+ */
>+int
>+x11_get_address (char **paddress, pid_t *pid, long *wid)
>+{
>+  Atom type;
>+  Window owner;
>+  int format;
>+  unsigned long items;
>+  unsigned long after;
>+  char *data;
>+
>+  *paddress = NULL;
>+
>+  /* locate the selection owner */
>+  owner = XGetSelectionOwner (xdisplay, selection_atom);
>+  if (owner == None)
>+    return TRUE;                /* no owner */
>+  if (wid != NULL)
>+    *wid = (long) owner;
>+
>+  /* get the bus address */
>+  XGetWindowProperty (xdisplay, owner, address_atom, 0, 1024, False,
>+                      XA_STRING, &type, &format, &items, &after,
>+                      (unsigned char **) &data);
>+  if (type == None || after != 0 || data == NULL || format != 8)
>+    return FALSE;               /* error */
>+
>+  *paddress = xstrdup (data);
>+  XFree (data);
>+
>+  /* get the PID */
>+  if (pid != NULL)
>+    {
>+      *pid = 0;
>+      XGetWindowProperty (xdisplay, owner, pid_atom, 0, sizeof pid, False,
>+                          XA_CARDINAL, &type, &format, &items, &after,
>+                          (unsigned char **) &data);
>+      if (type != None && after == 0 && data != NULL && format == 32)
>+        *pid = *(pid_t*)data;
>+      XFree (data);
>+    }
>+
>+  return TRUE;                  /* success */
>+}
>+
>+/*
>+ * Saves the address in the X11 display. Returns 0 on success.
>+ * If an error occurs, returns -1. If the selection already exists,
>+ * returns 1. (i.e. another daemon is already running)
>+ */
>+static Window
>+set_address_in_x11(char *address, pid_t pid)
>+{
>+  char *current_address;
>+  Window wid;
>+
>+  /* lock the X11 display to make sure we're doing this atomically */
>+  XGrabServer (xdisplay);
>+
>+  if (!x11_get_address (&current_address, NULL, NULL))
>+    {
>+      /* error! */
>+      XUngrabServer (xdisplay);
>+      return None;
>+    }
>+
>+  if (current_address != NULL)
>+    {
>+      /* someone saved the address in the meantime */
>+      XUngrabServer (xdisplay);
>+      free (current_address);
>+      return None;
>+    }
>+
>+  /* Create our window */
>+  wid = XCreateSimpleWindow (xdisplay, RootWindow (xdisplay, 0), -20, -20, 10, 10,
>+                             0, WhitePixel (xdisplay, 0),
>+                             BlackPixel (xdisplay, 0));
>+  verbose ("Created window %d\n", wid);
>+
>+  /* Save the property in the window */
>+  XChangeProperty (xdisplay, wid, address_atom, XA_STRING, 8, PropModeReplace,
>+                   (unsigned char *)address, strlen (address));
>+  XChangeProperty (xdisplay, wid, pid_atom, XA_CARDINAL, 32, PropModeReplace,
>+                   (unsigned char *)&pid, sizeof(pid) / 4);
>+
>+  /* Now grab the selection */
>+  XSetSelectionOwner (xdisplay, selection_atom, wid, CurrentTime);
>+
>+  /* Ungrab the server to let other people use it too */
>+  XUngrabServer (xdisplay);
>+
>+  XFlush (xdisplay);
>+
>+  return wid;
>+}
>+
>+/*
>+ * Saves the session address in session file. Returns TRUE on
>+ * success, FALSE if an error occurs.
>+ */
>+static int
>+set_address_in_file (char *address, pid_t pid, Window wid)
>+{
>+  char *session_file;
>+  FILE *f;
>+
>+  session_file = get_session_file();
>+  if (session_file == NULL)
>+    return FALSE;
>+
>+  f = fopen (session_file, "w");
>+  if (f == NULL)
>+    return FALSE;               /* some kind of error */
>+  fprintf (f, "%s\n%ld\n%ld\n", address, (long)pid, (long)wid);
>+
>+  fclose (f);
>+  free (session_file);
>+
>+  return TRUE;
>+}
>+
>+int
>+x11_save_address (char *address, pid_t pid, long *wid)
>+{
>+  Window id = set_address_in_x11 (address, pid);
>+  if (id != None)
>+    {
>+      if (!set_address_in_file (address, pid, id))
>+        return FALSE;
>+
>+      if (wid != NULL)
>+        *wid = (long) id;
>+      return TRUE;
>+    }
>+  return FALSE;
>+}
>+
>+int
>+x11_init (void)
>+{
>+  return open_x11 () != NULL && init_x_atoms (xdisplay);
>+}
>+
>+void
>+x11_handle_event (void)
>+{
>+  if (xdisplay != NULL)
>+    {      
>+      while (XPending (xdisplay))
>+        {
>+          XEvent ignored;
>+          XNextEvent (xdisplay, &ignored);
>+        }
>+    }
>+}  
>+
>+#else
>+void dummy_dbus_launch_x11 (void) { }
>+#endif

Actions: View | Splinter Review

Attachments on bug 8101: 6991 | 6992

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.