diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 19:33:51 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 19:40:56 +0100 |
| commit | 4ef611eea9b10ed5851abb990835ce73bbac6a9f (patch) | |
| tree | 907b48a2a9fd804deda2903e157a7dd6913bc005 /nx-X11 | |
| parent | 35aab85c79200d861c906b691bf8b6be99d58590 (diff) | |
| download | nx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.tar.gz nx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.tar.bz2 nx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.zip | |
Add -clipboard cmdline option to nxagent (206_nxagent_clipboard-as-nxoption.full.patch).
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 6666393e4..c72b9c4e8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -984,7 +984,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-clipboard")) { - if (!strcmp(argv[i+1], "both")) + if ((!strcmp(argv[i+1], "both")) || (!strcmp(argv[i+1], "1"))) { nxagentChangeOption(Clipboard, ClipboardBoth); } @@ -996,7 +996,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) { nxagentChangeOption(Clipboard, ClipboardServer); } - else if (!strcmp(argv[i+1], "none")) + else if ((!strcmp(argv[i+1], "none")) || (!strcmp(argv[i+1], "1"))) { nxagentChangeOption(Clipboard, ClipboardNone); } @@ -1255,6 +1255,29 @@ static void nxagentParseOptions(char *name, char *value) return; } + else if (strcmp(name, "clipboard") == 0) + { + if ((strcmp(value, "both") == 0) || (strcmp(value, "1") == 0)) + { + nxagentChangeOption(Clipboard, ClipboardBoth); + } + else if (strcmp(value, "client") == 0) + { + nxagentChangeOption(Clipboard, ClipboardClient); + } + else if (strcmp(value, "server") == 0) + { + nxagentChangeOption(Clipboard, ClipboardServer); + } + else if ((strcmp(value, "none") == 0) || (strcmp(value, "0") == 0)) + { + nxagentChangeOption(Clipboard, ClipboardNone); + } + else + { + nxagentChangeOption(Clipboard, ClipboardBoth); + } + } else { #ifdef DEBUG |