9 files changed, 384 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
new file mode 100644
index 000000000..8b00df4ef
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include <windows.h>
+#include "resources.h"
+
+#ifndef STR_CAPTION_DISPLAY
+#include "strings.rc"
+#endif
+
+IDD_DISPLAY DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_DISPLAY
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_MULTIWINDOW,IDC_MULTIWINDOW,7,25,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_FULLSCREEN,IDC_FULLSCREEN,157,25,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_WINDOWED,IDC_WINDOWED,7,75,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_NODECORATION,IDC_NODECORATION,157,75,70,24,BS_MULTILINE|BS_TOP
+
+    CONTROL         "IMG_MULTIWINDOW",IDC_MULTIWINDOW_IMG,"Static",SS_BITMAP | SS_NOTIFY,80,10,0,0
+    CONTROL         "IMG_FULLSCREEN",IDC_FULLSCREEN_IMG,"Static",SS_BITMAP | SS_NOTIFY,230,10,0,0
+    CONTROL         "IMG_WINDOWED",IDC_WINDOWED_IMG,"Static",SS_BITMAP | SS_NOTIFY,80,60,0,0
+    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
+END
+
+IDD_CLIENTS DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_CLIENTS
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_CLIENT_NONE,IDC_CLIENT_NONE,7,14,300,10
+    AUTORADIOBUTTON STR_CLIENT,IDC_CLIENT,7,56,300,10
+    AUTORADIOBUTTON STR_XDMCP,IDC_XDMCP,7,98,300,10
+
+    LTEXT           STR_CLIENT_NONE_DESC,IDC_CLIENT_NONE_DESC,19,28,280,27
+    LTEXT           STR_CLIENT_DESC,IDC_CLIENT_DESC,19,70,280,27
+    LTEXT           STR_XDMCP_DESC,IDC_XDMCP_DESC,19,112,280,27
+END
+
+IDD_PROGRAM DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_PROGRAM
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           STR_CLIENT_PROGRAM_DESC,IDC_CLIENT_PROGRAM_DESC,7,14,64,10
+    COMBOBOX        IDC_CLIENT_PROGRAM,70,12,64,54,CBS_DROPDOWN | WS_VSCROLL
+
+    AUTORADIOBUTTON STR_CLIENT_LOCAL,IDC_CLIENT_LOCAL,7,28,300,10
+    AUTORADIOBUTTON STR_CLIENT_REMOTE,IDC_CLIENT_REMOTE,7,42,300,10
+    
+    LTEXT           STR_CLIENT_PROTOCOL_DESC,IDC_CLIENT_PROTOCOL_DESC,19,56,70,10
+    COMBOBOX        IDC_CLIENT_PROTOCOL,100,54,64,54,CBS_DROPDOWNLIST | WS_VSCROLL
+    
+    LTEXT           STR_CLIENT_HOST_DESC,IDC_CLIENT_HOST_DESC,19,70,70,10
+    LTEXT           STR_CLIENT_USER_DESC,IDC_CLIENT_USER_DESC,19,84,70,10
+    EDITTEXT        IDC_CLIENT_HOST,100,68,64,12
+    EDITTEXT        IDC_CLIENT_USER,100,82,64,12
+END
+
+IDD_XDMCP DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_XDMCP
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_XDMCP_QUERY, IDC_XDMCP_QUERY,7,14,64,10
+    EDITTEXT        IDC_XDMCP_HOST,78,12,64,12
+    AUTOCHECKBOX    STR_XDMCP_INDIRECT,IDC_XDMCP_INDIRECT,19,28,280,10
+    AUTORADIOBUTTON STR_XDMCP_BROADCAST, IDC_XDMCP_BROADCAST,7,42,300,10
+    LTEXT           STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,56,300,42
+END
+
+IDD_CLIPBOARD DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_CLIPBOARD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTOCHECKBOX    STR_CLIPBOARD,IDC_CLIPBOARD,7,14,300,10
+    LTEXT           STR_CLIPBOARD_DESC,IDC_CLIPBOARD_DESC,19,28,280,27
+
+    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,56,280,10
+    EDITTEXT        IDC_EXTRA_PARAMS,7,70,128,12
+END
+
+IDD_FINISH DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_FINISH
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           STR_FINISH_DESC,IDC_FINISH_DESC,7,14,300,28
+    LTEXT           STR_FINISH_SAVE_DESC,IDC_FINISH_SAVE_DESC,7,56,300,12
+    PUSHBUTTON      STR_FINISH_SAVE,IDC_FINISH_SAVE,7,68,75,14 
+END
diff --git a/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp b/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp
new file mode 100644
index 000000000..0d051f0b4
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/images.rc b/xorg-server/hw/xwin/xlaunch/resources/images.rc
new file mode 100644
index 000000000..2eac53c93
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/images.rc
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+IMG_MULTIWINDOW BITMAP "resources\\multiwindow.bmp"
+IMG_WINDOWED BITMAP "resources\\windowed.bmp"
+IMG_FULLSCREEN BITMAP "resources\\fullscreen.bmp"
+IMG_NODECORATION BITMAP "resources\\nodecoration.bmp"
diff --git a/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp b/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp
new file mode 100644
index 000000000..0755c87b4
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp b/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp
new file mode 100644
index 000000000..e9e1ce690
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h
new file mode 100644
index 000000000..470005192
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#define IDC_STATIC -1
+
+#define IDD_WELCOME             100
+#define IDD_FINISH              101
+#define IDD_DISPLAY             102
+#define IDD_CLIENTS             103
+#define IDD_PROGRAM             104
+#define IDD_XDMCP               105
+#define IDD_FONTPATH            106
+#define IDD_CLIPBOARD           107
+
+#define IDS_DISPLAY_TITLE       300
+#define IDS_DISPLAY_SUBTITLE    301
+#define IDS_CLIENTS_TITLE       302
+#define IDS_CLIENTS_SUBTITLE    303
+#define IDS_PROGRAM_TITLE       304
+#define IDS_PROGRAM_SUBTITLE    305
+#define IDS_XDMCP_TITLE         306
+#define IDS_XDMCP_SUBTITLE      307
+#define IDS_FONTPATH_TITLE      308
+#define IDS_FONTPATH_SUBTITLE   309
+#define IDS_FINISH_TITLE        310
+#define IDS_FINISH_SUBTITLE     311
+#define IDS_CLIPBOARD_TITLE     312
+#define IDS_CLIPBOARD_SUBTITLE  313
+#define IDS_SAVE_TITLE          320
+#define IDS_SAVE_FILETITLE      321
+#define IDS_SAVE_FILTER         322
+                
+#define IDC_MULTIWINDOW         200
+#define IDC_WINDOWED            201
+#define IDC_FULLSCREEN          202
+#define IDC_NODECORATION        203
+#define IDC_MULTIWINDOW_IMG     204
+#define IDC_WINDOWED_IMG        205
+#define IDC_FULLSCREEN_IMG      206
+#define IDC_NODECORATION_IMG    207
+#define IDC_DISPLAY             208
+#define IDC_DISPLAY_DESC        209
+
+#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_PROTOCOL     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_PROTOCOL_DESC 231
+
+#define IDC_FONTPATH_DESC        240
+
+#define IDC_FINISH_DESC		 250
+#define IDC_FINISH_SAVE		 251
+#define IDC_FINISH_SAVE_DESC     252
+
+#define IDC_CLIPBOARD            260
+#define IDC_CLIPBOARD_DESC       261
+#define IDC_EXTRA_PARAMS         262
+#define IDC_EXTRA_PARAMS_DESC    263
diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.rc b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
new file mode 100644
index 000000000..07fd52f32
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include <windows.h>
+
+#include "resources.h"
+#include "images.rc"
+#include "dialog.rc"
diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
new file mode 100644
index 000000000..5a9cd281b
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#define STR_CAPTION_DISPLAY         "Display settings"
+#define STR_MULTIWINDOW             "Multiple windows"
+#define STR_FULLSCREEN              "Fullscreen"
+#define STR_WINDOWED                "One large window"
+#define STR_NODECORATION            "One window without titlebar"
+#define STR_DISPLAY_DESC            "Display number"
+
+#define STR_CAPTION_CLIENTS         "Client startup"
+#define STR_CLIENT_NONE             "Start no client"
+#define STR_CLIENT_NONE_DESC		"This will just start the xserver. You will be able to start local clients later."
+#define STR_CLIENT					"Start a program"
+#define STR_CLIENT_DESC				"This will start a local or remote program which will connect to the xserver. You will be able to start local clients later too. Remote programs are started using SSH."
+#define STR_XDMCP					"Open session via XDMCP"
+#define STR_XDMCP_DESC				"This will start a remote XDMCP session. Starting local clients later is limited. This option is not available with the ""Multiple windows"" mode."
+
+#define STR_CAPTION_PROGRAM         "Start program"
+#define STR_CLIENT_PROGRAM_DESC     "Start program"
+#define STR_CLIENT_LOCAL            "Start program on this computer"
+#define STR_CLIENT_REMOTE           "Start program on remote computer"
+#define STR_CLIENT_PROTOCOL_DESC    "Connect using"
+#define STR_CLIENT_HOST_DESC        "Connect to computer"
+#define STR_CLIENT_USER_DESC        "Login as user"
+
+
+#define STR_CAPTION_XDMCP           "XDMCP settings"
+#define STR_XDMCP_QUERY             "Connect to host"
+#define STR_XDMCP_INDIRECT          "Use indirect connect"
+#define STR_XDMCP_BROADCAST         "Search for hosts (broadcast)"
+#define STR_XDMCP_QUERY_DESC        "Some XDMCP servers must be configured to allow remote connections. Please check the documentation about configuring XDMCP servers."
+
+
+#define STR_CAPTION_FONTPATH        "Fontpath settings"
+
+#define STR_CAPTION_CLIPBOARD       "Clipboard settings"
+#define STR_CLIPBOARD               "Clipboard"
+#define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
+#define STR_EXTRA_PARAMS_DESC       "Additional parameters for Xming"
+
+#define STR_CAPTION_FINISH          "Finish configuration"
+#define STR_FINISH_DESC	            "Configuration is complete. Clish Finish to start Xming."
+#define STR_FINISH_SAVE_DESC        "You may also save the configuration for later use."
+#define STR_FINISH_SAVE	            "Save configuration"
+
+#define STR_DISPLAY_TITLE           "Select display settings"
+#define STR_DISPLAY_SUBTITLE        "Choose how Xming display programs"
+#define STR_CLIENTS_TITLE           "Select how to start clients"
+#define STR_CLIENTS_SUBTITLE        ""
+#define STR_PROGRAM_TITLE           "Specify the program to start"
+#define STR_PROGRAM_SUBTITLE        ""
+#define STR_XDMCP_TITLE             "Configure a remote XDMCP connection"
+#define STR_XDMCP_SUBTITLE          ""
+#define STR_FONTPATH_TITLE          "Define font locations"
+#define STR_FONTPATH_SUBTITLE       ""
+#define STR_FINISH_TITLE            "Configuration complete"
+#define STR_FINISH_SUBTITLE         ""
+#define STR_CLIPBOARD_TITLE         "Clipboard settings"
+#define STR_CLIPBOARD_SUBTITLE      ""
+
+#define STR_SAVE_TITLE              "Save configuration"
+#define STR_SAVE_FILETITLE          "Filename"
+#define STR_SAVE_FILTER             "Xlaunch Files (*.xlaunch)%*.xlaunch%%"
+
+STRINGTABLE
+BEGIN
+    IDS_DISPLAY_TITLE       STR_DISPLAY_TITLE       
+    IDS_DISPLAY_SUBTITLE    STR_DISPLAY_SUBTITLE    
+    IDS_CLIENTS_TITLE       STR_CLIENTS_TITLE       
+    IDS_CLIENTS_SUBTITLE    STR_CLIENTS_SUBTITLE    
+    IDS_PROGRAM_TITLE       STR_PROGRAM_TITLE       
+    IDS_PROGRAM_SUBTITLE    STR_PROGRAM_SUBTITLE    
+    IDS_XDMCP_TITLE         STR_XDMCP_TITLE         
+    IDS_XDMCP_SUBTITLE      STR_XDMCP_SUBTITLE      
+    IDS_FONTPATH_TITLE      STR_FONTPATH_TITLE      
+    IDS_FONTPATH_SUBTITLE   STR_FONTPATH_SUBTITLE   
+    IDS_FINISH_TITLE        STR_FINISH_TITLE      
+    IDS_FINISH_SUBTITLE     STR_FINISH_SUBTITLE   
+    IDS_CLIPBOARD_TITLE     STR_CLIPBOARD_TITLE      
+    IDS_CLIPBOARD_SUBTITLE  STR_CLIPBOARD_SUBTITLE   
+    IDS_SAVE_TITLE	    STR_SAVE_TITLE
+    IDS_SAVE_FILETITLE      STR_SAVE_FILETITLE
+    IDS_SAVE_FILTER         STR_SAVE_FILTER
+END
diff --git a/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp b/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp
new file mode 100644
index 000000000..9eff2bff9
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp