E CVS: elogin atmosphere

[<enl...@li...>]

Enlightenment CVS committal

Author  : atmosphere
Project : misc
Module  : elogin

Dir     : misc/elogin/src/daemon


Modified Files:
	spawner.c spawner.h 


Log Message:
small change, use DISPLAY environmental variable

===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/daemon/spawner.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- spawner.c	28 May 2002 17:17:22 -0000	1.4
+++ spawner.c	24 Jul 2002 02:18:08 -0000	1.5
@@ -11,7 +11,6 @@
 
 /* globals */
 Spawner_Display *d;
-char *xdisplay = X_DISP;
 
 /**
  * write_elogind_pidfile - write the elogind pid to the specified pidfile
@@ -81,14 +80,15 @@
       switch (c)
       {
         case 'd':              /* display */
-           free(xdisplay);
-           xdisplay = strdup(optarg);
+	   setenv("DISPLAY", optarg, 1);
            break;
         default:
            exit(1);
       }
    }
-
+    
+   if(!getenv("DISPLAY"))
+       setenv("DISPLAY", X_DISP, 1);
    fork_and_exit();
    /* register child signal handler */
    signal(SIGCHLD, elogin_exit);
@@ -239,7 +239,7 @@
         break;
    }
 
-   d->name = strdup(xdisplay);
+   d->name = strdup(getenv("DISPLAY"));
    while (!(d->display = XOpenDisplay(d->name)))
    {
       double current_time;
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/daemon/spawner.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- spawner.h	28 May 2002 17:17:22 -0000	1.3
+++ spawner.h	24 Jul 2002 02:18:08 -0000	1.4
@@ -12,7 +12,7 @@
 
 #define X_SERVER "/usr/X11R6/bin/X -terminate -ac -quiet"
 /* #define X_SERVER "/usr/X11R6/bin/Xnest -terminate -geometry 640x480 -ac -full :1" */
-#define X_DISP "localhost:0"
+#define X_DISP ":0"	/* only used if DISPLAY variable is NOT set */
 #define ELOGIN "/usr/local/bin/elogin"
 #define PIDFILE "/var/run/elogind.pid"