Now the display number can be set to automatic by specifying -1

3 files changed, 28 insertions, 25 deletions

diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
index d7f1aa46f..2809bcc4b 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -46,7 +46,8 @@ BEGIN
     CONTROL         "IMG_NODECORATION",IDC_NODECORATION_IMG,"Static",SS_BITMAP | SS_NOTIFY,230,60,0,0
 
     LTEXT           STR_DISPLAY_DESC,IDC_DISPLAY_DESC,7,120,64,12
-    EDITTEXT        IDC_DISPLAY,80,118,67,12,ES_NUMBER
+    LTEXT           STR_DISPLAY_EXTRA_DESC,IDC_DISPLAY_EXTRA_DESC,7,132,200,12
+    EDITTEXT        IDC_DISPLAY,80,118,67,12
 END
 
 IDD_CLIENTS DIALOGEX 0, 0, 317, 143
diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h
index 03f3dac1f..8db7ef190 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/resources.h
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -47,31 +47,32 @@
 #define IDC_NODECORATION_IMG          207

 #define IDC_DISPLAY                   208

 #define IDC_DISPLAY_DESC              209

+#define IDC_DISPLAY_EXTRA_DESC        210

 

-#define IDC_CLIENT_NONE               210

-#define IDC_XDMCP                     211

-#define IDC_CLIENT                    212

-#define IDC_CLIENT_LOCAL              213

-#define IDC_CLIENT_REMOTE             214

-#define IDC_CLIENT_HOST               215

-#define IDC_CLIENT_USER               216

-#define IDC_CLIENT_PASSWORD           217

-#define IDC_CLIENT_CONFIGURE          218

-#define IDC_CLIENT_PROGRAM            219

-#define IDC_XDMCP_QUERY               220

-#define IDC_XDMCP_BROADCAST           221

-#define IDC_XDMCP_INDIRECT            222

-#define IDC_XDMCP_HOST                223

-#define IDC_CLIENT_NONE_DESC          224

-#define IDC_XDMCP_DESC                225

-#define IDC_CLIENT_DESC               226

-#define IDC_XDMCP_QUERY_DESC          227

-#define IDC_CLIENT_PROGRAM_DESC       228

-#define IDC_CLIENT_HOST_DESC          229

-#define IDC_CLIENT_USER_DESC          230

-#define IDC_CLIENT_PASSWORD_DESC      231

-#define IDC_CLIENT_REMOTEPROGRAM      232

-#define IDC_CLIENT_REMOTEPROGRAM_DESC 233

+#define IDC_CLIENT_NONE               211

+#define IDC_XDMCP                     212

+#define IDC_CLIENT                    213

+#define IDC_CLIENT_LOCAL              214

+#define IDC_CLIENT_REMOTE             215

+#define IDC_CLIENT_HOST               216

+#define IDC_CLIENT_USER               217

+#define IDC_CLIENT_PASSWORD           218

+#define IDC_CLIENT_CONFIGURE          219

+#define IDC_CLIENT_PROGRAM            220

+#define IDC_XDMCP_QUERY               221

+#define IDC_XDMCP_BROADCAST           222

+#define IDC_XDMCP_INDIRECT            223

+#define IDC_XDMCP_HOST                224

+#define IDC_CLIENT_NONE_DESC          225

+#define IDC_XDMCP_DESC                226

+#define IDC_CLIENT_DESC               227

+#define IDC_XDMCP_QUERY_DESC          228

+#define IDC_CLIENT_PROGRAM_DESC       229

+#define IDC_CLIENT_HOST_DESC          230

+#define IDC_CLIENT_USER_DESC          231

+#define IDC_CLIENT_PASSWORD_DESC      232

+#define IDC_CLIENT_REMOTEPROGRAM      233

+#define IDC_CLIENT_REMOTEPROGRAM_DESC 234

 

 #define IDC_FONTPATH_DESC             240

 

diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
index dab2b30af..8a3c487f5 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -30,6 +30,7 @@
 #define STR_WINDOWED                "One large window"
 #define STR_NODECORATION            "One window without titlebar"
 #define STR_DISPLAY_DESC            "Display number"
+#define STR_DISPLAY_EXTRA_DESC      "(Specify -1 to let vcxsrv automatically choose one)"
 
 #define STR_CAPTION_CLIENTS         "Client startup"
 #define STR_CLIENT_NONE             "Start no client"