Skip to content

Commit

Permalink
when using the "control" command, the display is mandatory (we wouldn…
Browse files Browse the repository at this point in the history
…'t know where the arguments begin otherwise

git-svn-id: https://xpra.org/svn/Xpra/trunk@4783 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Nov 21, 2013
1 parent c62e5b3 commit b989a87
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions src/man/xpra.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ xpra \- viewer for remote, persistent X applications
\fItcp:HOST:PORT\fP] [\fB\-\-ssh\fP=\fICMD\fP] [\fB\-\-remote\-xpra\fP=\fICMD\fP]
[\fB\-\-socket\-dir\fP=\fIDIR\fP]
.HP
\fBxpra\fP \fBcontrol\fP (\fI:DISPLAY\fP | \fIssh:[USER@]HOST:DISPLAY\fP |
\fItcp:HOST:PORT\fP) \fIcommand\fP [\fIarguments..\fP] [\fB\-\-ssh\fP=\fICMD\fP]
[\fB\-\-remote\-xpra\fP=\fICMD\fP] [\fB\-\-socket\-dir\fP=\fIDIR\fP]
.HP
\fBxpra\fP \fBlist\fP [\fB\-\-socket\-dir\fP=\fIDIR\fP]
.HP
\fBxpra\fP \fBupgrade\fP \fI:DISPLAY\fP [...any options accepted by
Expand Down Expand Up @@ -256,6 +260,9 @@ Note: older servers may not support this feature.
.SS xpra info
Queries the server for version, status and statistics.
Note: older servers may not support this feature.
.SS xpra control
Modify the server at runtime by issuing commands.
The list of commands can be obtained by specifying "help" as command.
.SS xpra stop
This command attaches to a running xpra server, and requests that it
terminates immediately. This generally causes any applications using
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def parse_cmdline(cmdline):
"\t%prog detach [DISPLAY]\n",
"\t%prog screenshot filename [DISPLAY]\n",
"\t%prog info [DISPLAY]\n",
"\t%prog control [DISPLAY] command [arg1] [arg2]..\n",
"\t%prog control DISPLAY command [arg1] [arg2]..\n",
"\t%prog version [DISPLAY]\n"
]
server_modes = []
Expand Down

0 comments on commit b989a87

Please sign in to comment.