aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-05-25 00:22:32 +01:00
commit b91a1e5560
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/cmd_defs.c
View File

@ -915,24 +915,27 @@ static struct cmd_t command_defs[] =
"/win <nick>", "/win <nick>",
"/win <roomjid>", "/win <roomjid>",
"/win <roomoccupantjid>", "/win <roomoccupantjid>",
"/win xmlconsole") "/win xmlconsole",
"/win <plugin>")
CMD_DESC( CMD_DESC(
"Move to the specified window.") "Move to the specified window.")
CMD_ARGS( CMD_ARGS(
{ "console", "Go to the Console window." }, { "console", "Focus the Console window." },
{ "<num>", "Go to specified window number." }, { "<num>", "Focus specified window number." },
{ "<barejid>", "Go to chat window with contact by JID if open." }, { "<barejid>", "Focus chat window with contact by JID if open." },
{ "<nick>", "Go to chat window with contact by nickname if open." }, { "<nick>", "Focus chat window with contact by nickname if open." },
{ "<roomjid>", "Go to chat room window with roomjid if open." }, { "<roomjid>", "Focus chat room window with roomjid if open." },
{ "<roomoccupantjid>", "Go to private chat roomoccupantjid if open." }, { "<roomoccupantjid>", "Focus private chat roomoccupantjid if open." },
{ "xmlconsole", "Go to the XML Console window if open." }) { "xmlconsole", "Focus the XML Console window if open." },
{ "<plugin>", "Focus the plugin window."})
CMD_EXAMPLES( CMD_EXAMPLES(
"/win console", "/win console",
"/win 4", "/win 4",
"/win friend@chat.org", "/win friend@chat.org",
"/win Eddie", "/win Eddie",
"/win bigroom@conference.chat.org", "/win bigroom@conference.chat.org",
"/win bigroom@conference.chat.org/bruce") "/win bigroom@conference.chat.org/bruce",
"/win wikipedia")
}, },
{ "/wins", { "/wins",

13
src/ui/console.c
View File

@ -2058,15 +2058,18 @@ cons_help(void)
void void
cons_navigation_help(void) cons_navigation_help(void)
{ {
int pad = strlen("Alt-PAGEUP, Alt-PAGEDOWN") + 3;
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Navigation"); win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Navigation");
cons_show_padded(pad, "Alt-1..Alt-0, F1..F10 : Choose window."); cons_show("Alt-1..Alt-0, F1..F10 : Choose window.");
cons_show_padded(pad, "Alt-LEFT, Alt-RIGHT : Previous/next chat window"); cons_show("Alt-LEFT, Alt-RIGHT : Previous/next chat window.");
cons_show_padded(pad, "PAGEUP, PAGEDOWN : Page the main window."); cons_show("PAGEUP, PAGEDOWN : Page the main window.");
cons_show_padded(pad, "Alt-PAGEUP, Alt-PAGEDOWN : Page occupants/roster panel."); cons_show("Alt-PAGEUP, Alt-PAGEDOWN : Page occupants/roster panel.");
cons_show(""); 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(); cons_alert();
} }