From 9a7546b0fd81cebb759c3b8732c9ff5d9d71aa0f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 15 Jul 2017 23:17:42 -0400 Subject: [PATCH] Moved the remaining help files for the text client out of the server and into the text client. --- citadel/messages/entermsg | 3 --- citadel/messages/help | 33 -------------------------- citadel/messages/mainmenu | 11 --------- textclient/src/citadel.c | 7 +++--- textclient/src/commands.c | 15 +++++++++++- textclient/src/include/help.h | 44 ++++++++++++++++++++++++++++++----- textclient/src/messages.c | 6 +++-- 7 files changed, 60 insertions(+), 59 deletions(-) delete mode 100644 citadel/messages/entermsg delete mode 100644 citadel/messages/help delete mode 100644 citadel/messages/mainmenu diff --git a/citadel/messages/entermsg b/citadel/messages/entermsg deleted file mode 100644 index 09a3a9016..000000000 --- a/citadel/messages/entermsg +++ /dev/null @@ -1,3 +0,0 @@ -Entering message. Word wrap will give you soft linebreaks. Pressing the -'enter' key will give you a hard linebreak and an indent. Press 'enter' twice -when finished. diff --git a/citadel/messages/help b/citadel/messages/help deleted file mode 100644 index 4ccc16f0f..000000000 --- a/citadel/messages/help +++ /dev/null @@ -1,33 +0,0 @@ - ^variantname Help Menu - - ? Help. (Typing a '?' will give you a menu almost anywhere) - A Abandon this room where you stopped reading, goto next room. - C Chat (multiuser chat, where available) - D Prints directory, if there is one in the current room. - E Enter a message. - F Read all messages in the room, forward. - G Goto next room which has UNREAD messages. - H Help. Same as '?' - I Reads the Information file for this room. - K List of Known rooms. - L Reads the last five messages in the room. - N Reads all new messages in the room. - O Reads all old messages, backwards. - P Page another user (send an instant message) - R Reads all messages in the room, in reverse order. - S Skips current room without making its messages old. - T Terminate (logout) - U Ungoto (returns to the last room you were in) - W Displays who is currently logged in. - X Toggle eXpert mode (menus and help blurbs on/off) - Z Zap (forget) room. (Removes the room from your list) - + - Goto next, previous room on current floor. - > < Goto next, previous floor. - * Enter any locally installed 'doors'. - - In addition, there are dot commands. You hit the . (dot), then press the -first letter of each word of the command. As you hit the letters, the words -pop onto your screen. Exceptions: after you hit .Help or .Goto, the remainder -of the command is a help file name or room name. - - *** USE .elp ? or .elp SUMMARY for additional help *** diff --git a/citadel/messages/mainmenu b/citadel/messages/mainmenu deleted file mode 100644 index a4d43fec3..000000000 --- a/citadel/messages/mainmenu +++ /dev/null @@ -1,11 +0,0 @@ - ----------------------------------------------------------------------- - Room cmds: nown rooms, oto next room, <.G>oto a specific room, - kip this room, bandon this room, ap this room, - ngoto (move back) - Message cmds: ew msgs, orward read, everse read, ld msgs, - ast five msgs, nter a message - General cmds: help, erminate, hat, ho is online - Misc: toggle eXpert mode, irectory - - (Type .Help SUMMARY for extended commands, to hide this menu) - ----------------------------------------------------------------------- diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c index 5e8cc6203..70cddecef 100644 --- a/textclient/src/citadel.c +++ b/textclient/src/citadel.c @@ -1736,7 +1736,7 @@ NEWUSR: if (IsEmptyStr(rc_password)) { if (termn8 == 0) switch (mcmd) { case 1: - formout(ipc, "help"); + display_help(ipc, "help"); break; case 4: entmsg(ipc, 0, ((userflags & US_EXTEDIT) ? 2 : 0), 0); @@ -1908,8 +1908,9 @@ NEWUSR: if (IsEmptyStr(rc_password)) { break; case 21: - if (argbuf[0] == 0) - strcpy(aaa, "?"); + if (argbuf[0] == 0) { + strcpy(argbuf, "?"); + } display_help(ipc, argbuf); break; diff --git a/textclient/src/commands.c b/textclient/src/commands.c index fc115d2fd..1af9e8f68 100644 --- a/textclient/src/commands.c +++ b/textclient/src/commands.c @@ -979,7 +979,20 @@ int getcmd(CtdlIPC *ipc, char *argbuf) enable_color = 0; } /* if we're running in idiot mode, display a cute little menu */ - IFNEXPERT formout(ipc, "mainmenu"); + + IFNEXPERT { + scr_printf("-----------------------------------------------------------------------\n"); + scr_printf("Room cmds: nown rooms, oto next room, <.G>oto a specific room,\n"); + scr_printf(" kip this room, bandon this room, ap this room,\n"); + scr_printf(" ngoto (move back)\n"); + scr_printf("Message cmds: ew msgs, orward read, everse read, ld msgs,\n"); + scr_printf(" ast five msgs, nter a message\n"); + scr_printf("General cmds: help, erminate, hat, ho is online\n"); + scr_printf("Misc: toggle eXpert mode, irectory\n"); + scr_printf("\n"); + scr_printf(" (Type .Help SUMMARY for extended commands, to hide this menu)\n"); + scr_printf("-----------------------------------------------------------------------\n"); + } print_instant(); strcpy(argbuf, ""); diff --git a/textclient/src/include/help.h b/textclient/src/include/help.h index b49c6426b..c373dc362 100644 --- a/textclient/src/include/help.h +++ b/textclient/src/include/help.h @@ -1,6 +1,6 @@ // // Help files for the text client are now embedded directly into the client. -// Copyright (c) 1988-2016 by Art Cancro and the citadel.org developers. +// Copyright (c) 1988-2017 by Art Cancro and the citadel.org developers. // This program is gleefully made available to the world under the terms of // the GNU General Public License v3, with the following three modifications: // 1. The name of our favorite operating system is 'Linux,' not 'GNU/Linux.' @@ -9,17 +9,53 @@ // char *helpnames[] = { + "help", "admin", "floors", "intro", "mail", "network", - "policy", "software" }; char *helptexts[] = { +" Citadel Help Menu\n" +" \n" +" ? Help. (Typing a '?' will give you a menu almost anywhere)\n" +" A Abandon this room where you stopped reading, goto next room.\n" +" C Chat (multiuser chat, where available)\n" +" D Prints directory, if there is one in the current room.\n" +" E Enter a message.\n" +" F Read all messages in the room, forward.\n" +" G Goto next room which has UNREAD messages.\n" +" H Help. Same as '?'\n" +" I Reads the Information file for this room.\n" +" K List of Known rooms.\n" +" L Reads the last five messages in the room.\n" +" N Reads all new messages in the room.\n" +" O Reads all old messages, backwards.\n" +" P Page another user (send an instant message)\n" +" R Reads all messages in the room, in reverse order.\n" +" S Skips current room without making its messages old.\n" +" T Terminate (logout)\n" +" U Ungoto (returns to the last room you were in)\n" +" W Displays who is currently logged in.\n" +" X Toggle eXpert mode (menus and help blurbs on/off)\n" +" Z Zap (forget) room. (Removes the room from your list)\n" +" + - Goto next, previous room on current floor.\n" +" > < Goto next, previous floor.\n" +" * Enter any locally installed 'doors'.\n" +" \n" +" In addition, there are dot commands. You hit the . (dot), then press the\n" +"first letter of each word of the command. As you hit the letters, the words\n" +"pop onto your screen. Exceptions: after you hit .Help or .Goto, the remainder\n" +"of the command is a help file name or room name.\n" +" \n" +" *** USE .elp ? for additional help *** \n" + +, + "The following commands are available only to Admins. A subset of these\n" "commands are available to room aides when they are currently in the room\n" "they are room aide for.\n" @@ -262,10 +298,6 @@ char *helptexts[] = { , -" < this new user policy resides in ./messages/newuser > \n" - -, - " Citadel is the premier 'online community' (i.e. Bulletin Board System)\n" "software. It runs on all POSIX-compliant systems, including Linux. It is an\n" "advanced client/server application, and is being actively maintained.\n" diff --git a/textclient/src/messages.c b/textclient/src/messages.c index c800b7f90..1337b029c 100644 --- a/textclient/src/messages.c +++ b/textclient/src/messages.c @@ -1,7 +1,7 @@ /* * Text client functions for reading and writing of messages * - * Copyright (c) 1987-2016 by the citadel.org team + * Copyright (c) 1987-2017 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -1211,7 +1211,9 @@ int entmsg(CtdlIPC *ipc, /* If the user is a dumbass, tell them how to type. */ if ((userflags & US_EXPERT) == 0) { - formout(ipc, "entermsg"); + scr_printf("Entering message. Word wrap will give you soft linebreaks. Pressing the\n"); + scr_printf("'enter' key will give you a hard linebreak and an indent. Press 'enter' twice\n"); + scr_printf("when finished.\n"); } /* Handle the selection of a recipient, if necessary. */ -- 2.30.2