Modified select_on_master() to only have one code path to exit

[citadel.git] / citadel / textclient / screen.c

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index 1e0abb0283c898a1fda0ba2f4d676d6e444d6ab2..67cd2f506e56890c4637ff79552f6dff544464ff 100644 (file)
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -1,13 +1,31 @@
 /*
  * Screen output handling
+ *
+ * Copyright (c) 1987-2011 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 as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include "sysdep.h"
 #ifndef HAVE_SNPRINTF
@@ -20,7 +38,8 @@
 #include "commands.h"
 #include "screen.h"
 
-char arg_screen;
+int enable_status_line = 0;    /* FIXME the status line works, but not on Mac.  Make this configurable. */
+char status_line[1024] = "     ";
 
 /* the default paginator prompt will be replaced by the server's prompt when we learn it */
 char *moreprompt = " -- more -- ";
@@ -161,12 +180,13 @@ int scr_putc(int c)
                }
        }
 
-       //      if we want to do a top status line, this is a reasonable way to do it
-       //      printf("\033[s\033[0;70H");
-       //      printf("\033[K   %d/%d  %d/%d", cols_printed, screenwidth, lines_printed, screenheight);
-       //      printf("\033[u");
+       /* How many lines output before stopping for the paginator?
+        * Depends on whether we are displaying a status line.
+        */
+       int height_offset = ( ((enable_color) && (screenwidth > 0) && (enable_status_line)) ? (3) : (2) ) ;
 
-       if ((screenheight > 0) && (lines_printed > (screenheight-2))) {
+       /* Ok, go check it.  Stop and display the paginator prompt if necessary. */
+       if ((screenheight > 0) && (lines_printed > (screenheight-height_offset))) {
                lines_printed = 0;
                hit_any_key();
                lines_printed = 0;
@@ -176,9 +196,16 @@ int scr_putc(int c)
        return c;
 }
 
-
 void scr_flush(void)
 {
+       if ((enable_color) && (screenwidth > 0) && (enable_status_line)) {
+               if (strlen(status_line) < screenwidth) {
+                       memset(&status_line[strlen(status_line)], 32, screenwidth - strlen(status_line));
+               }
+               printf("\033[s\033[1;1H\033[K\033[7m");
+               fwrite(status_line, screenwidth, 1, stdout);
+               printf("\033[27m\033[u");
+       }
        fflush(stdout);
 }
 
@@ -200,3 +227,34 @@ RETSIGTYPE scr_winch(int signum)
        check_screen_dims();
        signal(SIGWINCH, scr_winch);
 }
+
+
+
+/*
+ * Display a 3270-style "wait" indicator at the bottom of the screen
+ */
+void scr_wait_indicator(int state) {
+       int sp = (screenwidth - 2);
+
+       if (!enable_status_line) return;
+
+       if (screenwidth > 0) {
+               switch (state) {
+                       default:
+                       case 0:  /* Idle */
+                               status_line[sp] = ' ';
+                               break;
+                       case 1:  /* Waiting */
+                               status_line[sp] = 'X';
+                               break;
+                       case 2:  /* Receiving */
+                               status_line[sp] = '<';
+                               break;
+                       case 3:  /* Sending */
+                               status_line[sp] = '>';
+                               break;
+               }
+               scr_flush();
+       }
+}
+