aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winprocarg.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-07 10:51:45 +0000
committermarha <marha@users.sourceforge.net>2011-03-07 10:51:45 +0000
commitfaed2dca735b7aa26a146c5e309cafa8134425b9 (patch)
tree497aab7a57588f4c697a764b97e6b12fbbc823ec /xorg-server/hw/xwin/winprocarg.c
parent4f15fcdc65f989800d91278a4040d14f9ebd76ca (diff)
downloadvcxsrv-faed2dca735b7aa26a146c5e309cafa8134425b9.tar.gz
vcxsrv-faed2dca735b7aa26a146c5e309cafa8134425b9.tar.bz2
vcxsrv-faed2dca735b7aa26a146c5e309cafa8134425b9.zip
Added clipboardprimary option to be able to only map THE CLIPBOARD selection to the windows clipboard. Default the CLIPBOARD and the PRIMARY selection are mapped.
Diffstat (limited to 'xorg-server/hw/xwin/winprocarg.c')
-rw-r--r--xorg-server/hw/xwin/winprocarg.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index fef3edd4f..9566a4f0a 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -729,6 +729,30 @@ ddxProcessArgument (int argc, char *argv[], int i)
/* Indicate that we have processed this argument */
return 1;
}
+
+ /*
+ * Look for the '-clipboard' argument
+ */
+ if (IS_OPTION ("-clipboardprimary"))
+ {
+ /* Now the default, we still accept the arg for backwards compatibility */
+ g_fClipboardPrimary = TRUE;
+
+ /* Indicate that we have processed this argument */
+ return 1;
+ }
+
+ /*
+ * Look for the '-noclipboard' argument
+ */
+ if (IS_OPTION ("-noclipboardprimary"))
+ {
+ g_fClipboardPrimary = FALSE;
+
+ /* Indicate that we have processed this argument */
+ return 1;
+ }
+
#endif