#123 Made disable clipboard take effect on server

This commit is contained in:
Xinyu Hou
2016-09-15 16:19:10 -04:00
committed by Andrew Nelless
parent 9c0bac7c7d
commit 673829f511
3 changed files with 17 additions and 6 deletions

View File

@@ -765,7 +765,7 @@ Config::readSectionOptions(ConfigReadContext& s)
else if (name == "win32KeepForeground") {
addOption("", kOptionWin32KeepForeground, s.parseBoolean(value));
}
else if (name == "enableClipboard") {
else if (name == "clipboardSharing") {
addOption("", kOptionClipboardSharing, s.parseBoolean(value));
}
@@ -1380,6 +1380,9 @@ Config::getOptionName(OptionID id)
if (id == kOptionScreenPreserveFocus) {
return "preserveFocus";
}
if (id == kOptionClipboardSharing) {
return "clipboardSharing";
}
return NULL;
}
@@ -1396,7 +1399,8 @@ Config::getOptionValue(OptionID id, OptionValue value)
id == kOptionXTestXineramaUnaware ||
id == kOptionRelativeMouseMoves ||
id == kOptionWin32KeepForeground ||
id == kOptionScreenPreserveFocus) {
id == kOptionScreenPreserveFocus ||
id == kOptionClipboardSharing) {
return (value != 0) ? "true" : "false";
}
if (id == kOptionModifierMapForShift ||