From: Art Cancro <ajc@uncensored.citadel.org>
Date: Fri, 23 Mar 2012 17:07:41 +0000 (-0400)
Subject: text client: status line now configurable
X-Git-Tag: v8.11~121
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=064adf6eccfba3d4169af783c61133858137ee06;p=citadel.git

text client: status line now configurable
---

diff --git a/citadel/citadel.rc b/citadel/citadel.rc
index b52515938..351f5b57c 100644
--- a/citadel/citadel.rc
+++ b/citadel/citadel.rc
@@ -42,6 +42,10 @@ ansi_color=user
 #
 use_background=off
 
+# STATUS_LINE will keep an informative status line on the top of the screen,
+# but it doesn't work on all terminals (Mac OS is particularly bad at this).
+status_line=off
+
 # PROMPT_CONTROL should be set to on/off/user to control whether the <N>ext
 # and <S>top keys are active when displaying the paginator prompt.  If it
 # is set to "user" then it's a user-configurable option.
diff --git a/citadel/textclient/commands.c b/citadel/textclient/commands.c
index 525e3ce62..732080658 100644
--- a/citadel/textclient/commands.c
+++ b/citadel/textclient/commands.c
@@ -773,6 +773,10 @@ void load_command_set(void)
 			if (!strncasecmp(&buf[11], "user", 4))
 				rc_ansi_color = 3;	/* user config */
 		}
+		if (!strncasecmp(buf, "status_line=", 12)) {
+			if (!strncasecmp(&buf[12], "on", 2))
+				enable_status_line = 1;
+		}
 		if (!strncasecmp(buf, "use_background=", 15)) {
 			if (!strncasecmp(&buf[15], "on", 2))
 				rc_color_use_bg = 9;
diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index 829e6b730..11d047c6c 100644
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -33,7 +33,7 @@
 #include "commands.h"
 #include "screen.h"
 
-int enable_status_line = 0;	/* FIXME the status line works, but not on Mac.  Make this configurable. */
+int enable_status_line = 0;
 char status_line[1024] = "     ";
 
 /* the default paginator prompt will be replaced by the server's prompt when we learn it */
diff --git a/citadel/textclient/tuiconfig.h b/citadel/textclient/tuiconfig.h
index 1c5094fc3..fd19e3553 100644
--- a/citadel/textclient/tuiconfig.h
+++ b/citadel/textclient/tuiconfig.h
@@ -7,3 +7,4 @@ void do_rssclient_configuration(CtdlIPC *ipc);
 void do_system_configuration(CtdlIPC *ipc);
 
 extern char editor_path[PATH_MAX];
+extern int enable_status_line;