diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2009-06-30 11:19:27 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-10-15 18:35:14 +0100 |
| commit | ece51244ee6b01564d9f8eba7d871c27db3f4459 (patch) | |
| tree | 40d2ccc863dfc5f10470cc5dadb941509ef7ca73 | |
| parent | fd4b7a9eaa38cdc283dc681c2c882ac1f47e1a5f (diff) | |
Enable clipboard integration by default, can be turned off with -noclipboard.
We still accept -clipboard for backwards compatibility. If both are passed,
the last one is accepted (just as other arguments are handled).
| -rw-r--r-- | hw/xwin/InitOutput.c | 5 | ||||
| -rw-r--r-- | hw/xwin/XWin.man | 7 | ||||
| -rw-r--r-- | hw/xwin/winglobals.c | 2 | ||||
| -rwxr-xr-x | hw/xwin/winprocarg.c | 12 |
4 files changed, 18 insertions, 8 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 61ef60f97..97e27eba5 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -809,9 +809,8 @@ winUseMsg (void) "\tmonitors are present.\n"); #ifdef XWIN_CLIPBOARD - ErrorF ("-clipboard\n" - "\tRun the clipboard integration module.\n" - "\tDo not use at the same time as 'xwinclip'.\n"); + ErrorF ("-[no]clipboard\n" + "\tEnable [disable] the clipboard integration. Default is enabled.\n"); ErrorF ("-nounicodeclipboard\n" "\tDo not use Unicode clipboard even if NT-based platform.\n"); diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man index 2ac8a9b1c..6847aaddf 100644 --- a/hw/xwin/XWin.man +++ b/hw/xwin/XWin.man @@ -80,10 +80,9 @@ In addition to the normal server options described in the \fIXserver(1)\fP manual page, \fIXWin\fP accepts the following command line switches, \fIall\fP of which are optional: .TP 8 -.B \-clipboard -Enables the integration -between the Cygwin/X clipboard and Windows clipboard. Do not use in -conjunction with the \fIxwinclip\fP program. +.B \-[no]clipboard +Enables [disables] the integration between the Cygwin/X clipboard and +Windows clipboard. The default is enabled. .TP 8 .B "\-clipupdates \fInum_boxes\fP" Specify an optional threshold, above which the boxes in a shadow diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index 280761e72..511a64bbe 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -114,7 +114,7 @@ winDispatchProcPtr winProcSetSelectionOwnerOrig = NULL; */ Bool g_fUnicodeClipboard = TRUE; -Bool g_fClipboard = FALSE; +Bool g_fClipboard = TRUE; Bool g_fClipboardLaunched = FALSE; Bool g_fClipboardStarted = FALSE; pthread_t g_ptClipboardProc; diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index f1a76b0fa..864f92a20 100755 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -889,11 +889,23 @@ ddxProcessArgument (int argc, char *argv[], int i) */ if (IS_OPTION ("-clipboard")) { + /* Now the default, we still accept the arg for backwards compatibility */ g_fClipboard = TRUE; /* Indicate that we have processed this argument */ return 1; } + + /* + * Look for the '-noclipboard' argument + */ + if (IS_OPTION ("-noclipboard")) + { + g_fClipboard = FALSE; + + /* Indicate that we have processed this argument */ + return 1; + } #endif |