diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c index 33b2a962d..4bdaf4cdb 100644 --- a/client/X11/cli/xfreerdp.c +++ b/client/X11/cli/xfreerdp.c @@ -31,6 +31,25 @@ #include "../xf_client.h" #include "../xfreerdp.h" +static void xfreerdp_print_help(void) +{ + printf("Keyboard Shortcuts:\n"); + printf("\t\n"); + printf("\t\treleases keyboard and mouse grab\n"); + printf("\t++\n"); + printf("\t\ttoggles fullscreen state of the application\n"); + printf("\t++c\n"); + printf("\t\ttoggles remote control in a remote assistance session\n"); + printf("\tAction Script\n"); + printf("\t\tExecutes a predefined script on key press.\n"); + printf("\t\tShould the script not exist it is ignored.\n"); + printf("\t\tScripts can be provided at the default localtion ~/.config/freerdp/action.sh or as " + "command line argument /action:script:\n"); + printf("\t\tThe script will receive the current key combination as argument.\n"); + printf("\t\tThe output of the script is parsed for 'key-local' which tells that the script " + "used the key combination, otherwise the combination is forwarded to the remote.\n"); +} + int main(int argc, char* argv[]) { int rc = 1; @@ -59,6 +78,8 @@ int main(int argc, char* argv[]) { rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv); + xfreerdp_print_help(); + if (freerdp_settings_get_bool(settings, FreeRDP_ListMonitors)) xf_list_monitors(xfc); diff --git a/client/X11/man/CMakeLists.txt b/client/X11/man/CMakeLists.txt index 386f13de5..d6d2fe979 100644 --- a/client/X11/man/CMakeLists.txt +++ b/client/X11/man/CMakeLists.txt @@ -1,6 +1,7 @@ set(DEPS xfreerdp-channels.1.xml xfreerdp-examples.1.xml + xfreerdp-shortcuts.1.xml xfreerdp-envvar.1.xml ) diff --git a/client/X11/man/xfreerdp-shortcuts.1.xml b/client/X11/man/xfreerdp-shortcuts.1.xml new file mode 100644 index 000000000..a6b96eac0 --- /dev/null +++ b/client/X11/man/xfreerdp-shortcuts.1.xml @@ -0,0 +1,25 @@ + + Keyboard Shortcuts + + + <Right CTRL> + releases keyboard and mouse grab + + + <CTRL>+<ALT>+<Return> + toggles fullscreen state of the application + + + <CTRL>+<ALT>+c + toggles remote control in a remote assistance session + + + Action Script + executes a predefined script on key press. + Should the script not exist it is ignored. + Scripts can be provided at the default localtion ~/.config/freerdp/action.sh or as command line argument /action:script:<path>. + The script will receive the current key combination as argument. + The output of the script is parsed for key-local which tells that the script used the key combination, otherwise the combination is forwarded to the remote. + + + diff --git a/client/X11/man/xfreerdp.1.xml.in b/client/X11/man/xfreerdp.1.xml.in index 271e39da4..7e7c782f7 100644 --- a/client/X11/man/xfreerdp.1.xml.in +++ b/client/X11/man/xfreerdp.1.xml.in @@ -3,6 +3,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ + @@ -49,6 +50,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" &syntax; + &shortcuts; + &channels; &envvar;