Detect screen dimensions _before_ attaching to the server.

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

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index 6cdf6dec93a3c82a7e1a74388a19c269507bc2d7..c79d693fd8e1599fba5e534fd5b816a83a96640e 100644 (file)
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -1,7 +1,24 @@
 /*
  * 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>
@@ -10,6 +27,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include "sysdep.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -21,22 +39,45 @@
 #include "commands.h"
 #include "screen.h"
 
+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 -- ";
 
-extern int screenheight;
-extern int screenwidth;
+int screenheight = 24;
+int screenwidth = 80;
 int lines_printed = 0;
 int cols_printed = 0;
 
 extern int rc_ansi_color;
 extern int rc_prompt_control;
-extern void check_screen_dims(void);
-
 void do_keepalive(void);
 
+/*
+ * Attempt to discover the screen dimensions. 
+ * WARNING: This is sometimes called from a signal handler.
+ */
+void check_screen_dims(void)
+{
+#ifdef TIOCGWINSZ
+       struct {
+               unsigned short height;  /* rows */
+               unsigned short width;   /* columns */
+               unsigned short xpixels;
+               unsigned short ypixels; /* pixels */
+       } xwinsz;
+
+       if (ioctl(0, TIOCGWINSZ, &xwinsz) == 0) {
+               if (xwinsz.height)
+                       screenheight = (int) xwinsz.height;
+               if (xwinsz.width)
+                       screenwidth = (int) xwinsz.width;
+       }
+#endif
+}
+
+
 /*
  * Initialize the screen
  */
@@ -165,7 +206,7 @@ int scr_putc(int c)
        /* 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)) ? (3) : (2) ) ;
+       int height_offset = ( ((enable_color) && (screenwidth > 0) && (enable_status_line)) ? (3) : (2) ) ;
 
        /* Ok, go check it.  Stop and display the paginator prompt if necessary. */
        if ((screenheight > 0) && (lines_printed > (screenheight-height_offset))) {
@@ -180,7 +221,7 @@ int scr_putc(int c)
 
 void scr_flush(void)
 {
-       if ((enable_color) && (screenwidth > 0)) {
+       if ((enable_color) && (screenwidth > 0) && (enable_status_line)) {
                if (strlen(status_line) < screenwidth) {
                        memset(&status_line[strlen(status_line)], 32, screenwidth - strlen(status_line));
                }
@@ -204,7 +245,6 @@ RETSIGTYPE scr_winch(int signum)
        /* if we receive this signal, we must be running
         * in a terminal that supports resizing.
         */
-       have_xterm = 1;
        caught_sigwinch = 1;
        check_screen_dims();
        signal(SIGWINCH, scr_winch);
@@ -218,6 +258,8 @@ RETSIGTYPE scr_winch(int signum)
 void scr_wait_indicator(int state) {
        int sp = (screenwidth - 2);
 
+       if (!enable_status_line) return;
+
        if (screenwidth > 0) {
                switch (state) {
                        default: