Add an environment variable for using the desktop

[Mike Hearn]

Convenient to have until winedesktop finally appears, then it can be
removed.

Mike Hearn <mh at codeweavers.com>
Add an environment variable for using the desktop

Index: dlls/x11drv/x11drv_main.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11drv_main.c,v
retrieving revision 1.104
diff -u -p -d -u -r1.104 x11drv_main.c
--- dlls/x11drv/x11drv_main.c	1 Jun 2005 11:08:39 -0000	1.104
+++ dlls/x11drv/x11drv_main.c	5 Jun 2005 20:57:08 -0000
@@ -246,7 +246,11 @@ static void setup_options(void)
         }
     }
 
-    if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) ))
+    if (getenv( "WINEDESKTOP" ))
+    {
+        desktop_geometry = strdup( getenv("WINEDESKTOP") );
+    }
+    else if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) ))
     {
         /* Imperfect validation:  If Desktop=N, then we don't turn on
         ** the --desktop option.  We should really validate for a correct
@@ -322,6 +326,7 @@ static BOOL process_attach(void)
 
     if (!(display = XOpenDisplay( NULL ))) return FALSE;
 
+    TRACE("display opened on file descriptor %d\n", ConnectionNumber(display));
     fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */
     screen = DefaultScreenOfDisplay( display );
     visual = DefaultVisual( display, DefaultScreen(display) );