Added possibility of mapping the PRIMARY selection

3 files changed, 13 insertions, 6 deletions

diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
index f6675e192..e432d724b 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -100,14 +100,17 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION STR_CAPTION_EXTRA
 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,24,280,27
+    AUTOCHECKBOX    STR_CLIPBOARD,IDC_CLIPBOARD,7,10,300,10
+    LTEXT           STR_CLIPBOARD_DESC,IDC_CLIPBOARD_DESC,19,20,280,27
 
-    AUTOCHECKBOX    STR_WGL,IDC_WGL,7,42,300,10
-    LTEXT           STR_WGL_DESC,IDC_WGL_DESC,19,52,280,27
+    AUTOCHECKBOX    STR_CLIPBOARDPRIMARY,IDC_CLIPBOARDPRIMARY,19,30,300,10
+    LTEXT           STR_CLIPBOARDPRIMARY_DESC,IDC_CLIPBOARDPRIMARY_DESC,31,40,280,27
 
-    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,84,280,10
-    EDITTEXT        IDC_EXTRA_PARAMS,7,98,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    AUTOCHECKBOX    STR_WGL,IDC_WGL,7,56,300,10
+    LTEXT           STR_WGL_DESC,IDC_WGL_DESC,19,66,280,27
+
+    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,95,280,10
+    EDITTEXT        IDC_EXTRA_PARAMS,7,105,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
 END
 
 IDD_FINISH 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 4465952c7..93a9bbf44 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/resources.h
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -101,3 +101,5 @@
 #define IDC_EXTRA_PARAMS_DESC    263

 #define IDC_WGL                  264

 #define IDC_WGL_DESC             265

+#define IDC_CLIPBOARDPRIMARY      266

+#define IDC_CLIPBOARDPRIMARY_DESC 267

diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
index 1896ffe59..10a00d967 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -60,6 +60,8 @@
 #define STR_CAPTION_EXTRA          "Extra settings"
 #define STR_CLIPBOARD               "Clipboard"
 #define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
+#define STR_CLIPBOARDPRIMARY        "Primary Selection"
+#define STR_CLIPBOARDPRIMARY_DESC   "Also map the PRIMARY selection to the windows clipboard."
 #define STR_WGL                     "Native opengl"
 #define STR_WGL_DESC                "Use the native windows opengl library (wgl). Make sure to export the LIBGL_ALWAYS_INDIRECT environment variable."
 #define STR_EXTRA_PARAMS_DESC       "Additional parameters for VcXsrv"