diff options
| author | James Booth <boothj5@gmail.com> | 2016-05-25 00:22:51 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-05-25 00:22:51 +0100 |
| commit | 1d5cc3327961739ac84ca3b9d66fc532bc6773b0 (patch) | |
| tree | 262a43107ea5fa8ce89bf6cf5d2e25db47f6f49d | |
| parent | 1a3f8d1be84fd35519fa6709af5bb763d650e15c (diff) | |
| parent | 94212cd01ca87e26a06af4dfbc7b48087c1ef79c (diff) | |
| download | profani-tty-1d5cc3327961739ac84ca3b9d66fc532bc6773b0.tar.gz | |
Merge branch 'master' into complete-empty
| -rw-r--r-- | src/command/cmd_defs.c | 21 | ||||
| -rw-r--r-- | src/ui/console.c | 13 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 415dc7fc..a979dbd6 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -915,24 +915,27 @@ static struct cmd_t command_defs[] = "/win <nick>", "/win <roomjid>", "/win <roomoccupantjid>", - "/win xmlconsole") + "/win xmlconsole", + "/win <plugin>") CMD_DESC( "Move to the specified window.") CMD_ARGS( - { "console", "Go to the Console window." }, - { "<num>", "Go to specified window number." }, - { "<barejid>", "Go to chat window with contact by JID if open." }, - { "<nick>", "Go to chat window with contact by nickname if open." }, - { "<roomjid>", "Go to chat room window with roomjid if open." }, - { "<roomoccupantjid>", "Go to private chat roomoccupantjid if open." }, - { "xmlconsole", "Go to the XML Console window if open." }) + { "console", "Focus the Console window." }, + { "<num>", "Focus specified window number." }, + { "<barejid>", "Focus chat window with contact by JID if open." }, + { "<nick>", "Focus chat window with contact by nickname if open." }, + { "<roomjid>", "Focus chat room window with roomjid if open." }, + { "<roomoccupantjid>", "Focus private chat roomoccupantjid if open." }, + { "xmlconsole", "Focus the XML Console window if open." }, + { "<plugin>", "Focus the plugin window."}) CMD_EXAMPLES( "/win console", "/win 4", "/win friend@chat.org", "/win Eddie", "/win bigroom@conference.chat.org", - "/win bigroom@conference.chat.org/bruce") + "/win bigroom@conference.chat.org/bruce", + "/win wikipedia") }, { "/wins", diff --git a/src/ui/console.c b/src/ui/console.c index ebbddd70..207db949 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -2058,15 +2058,18 @@ cons_help(void) void cons_navigation_help(void) { - int pad = strlen("Alt-PAGEUP, Alt-PAGEDOWN") + 3; ProfWin *console = wins_get_console(); cons_show(""); win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Navigation"); - cons_show_padded(pad, "Alt-1..Alt-0, F1..F10 : Choose window."); - cons_show_padded(pad, "Alt-LEFT, Alt-RIGHT : Previous/next chat window"); - cons_show_padded(pad, "PAGEUP, PAGEDOWN : Page the main window."); - cons_show_padded(pad, "Alt-PAGEUP, Alt-PAGEDOWN : Page occupants/roster panel."); + cons_show("Alt-1..Alt-0, F1..F10 : Choose window."); + cons_show("Alt-LEFT, Alt-RIGHT : Previous/next chat window."); + cons_show("PAGEUP, PAGEDOWN : Page the main window."); + cons_show("Alt-PAGEUP, Alt-PAGEDOWN : Page occupants/roster panel."); cons_show(""); + cons_show("/win <n> : Focus window n, where n is the window number."); + cons_show("/win <name> : Focus window with name, where name is the recipient, room or window title."); + cons_show(""); + cons_show("See '/help win' for more information."); cons_alert(); } |