Removed more vestiges of curses mode

diff --git a/citadel/textclient/citadel.c b/citadel/textclient/citadel.c
index f96c64fe20c60580fbfd6ca7be8bc9d9d6791cc3..2d42a33f298a494f841b70b1d28d8d70c3d79069 100644 (file)
--- a/citadel/textclient/citadel.c
+++ b/citadel/textclient/citadel.c
@@ -1482,9 +1482,6 @@ int main(int argc, char **argv)
 #ifdef HAVE_OPENSSL
        arg_encrypt = RC_DEFAULT;
 #endif
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-       arg_screen = RC_DEFAULT;
-#endif
 
        /* 
         * Handle command line options as if we were called like /bin/login
@@ -1510,18 +1507,6 @@ int main(int argc, char **argv)
                        return 1;
 #endif
                }
-               if (!strcmp(argv[a], "-s")) {
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-                       arg_screen = RC_NO;
-#endif
-                       argc = shift(argc, argv, a, 1);
-               }
-               if (!strcmp(argv[a], "-S")) {
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-                       arg_screen = RC_YES;
-#endif
-                       argc = shift(argc, argv, a, 1);
-               }
                if (!strcmp(argv[a], "-p")) {
                        struct stat st;
                
@@ -1576,9 +1561,6 @@ int main(int argc, char **argv)
                scr_printf("Connected to %s [%s].\n", ipc->ip_hostname, ipc->ip_address);
        }
 
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-       CtdlIPC_SetNetworkStatusCallback(ipc, wait_indicator);
-#endif
        ipc_for_signal_handlers = ipc;  /* KLUDGE cover your eyes */
 
        CtdlIPC_chat_recv(ipc, aaa);

diff --git a/citadel/textclient/commands.c b/citadel/textclient/commands.c
index 9ab121e00cbfd7e7bd5774435ec036d3c69ae918..9c3c56c01e2eb6c9d6b7e3f911a58ceb6435b552 100644 (file)
--- a/citadel/textclient/commands.c
+++ b/citadel/textclient/commands.c
@@ -527,15 +527,6 @@ int inkey(void)
                        a = 0;
                }
  */
-
-#ifndef DISABLE_CURSES
-#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
-               if (a == ERR) {
-                       logoff(NULL, 3);
-               }
-#endif
-#endif
-
        } while (a == 0);
        return (a);
 }
@@ -779,9 +770,6 @@ void load_command_set(void)
        strcpy(rc_gotmail_cmd, "");
 #ifdef HAVE_OPENSSL
        rc_encrypt = RC_DEFAULT;
-#endif
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-       rc_screen = RC_DEFAULT;
 #endif
        rc_alt_semantics = 0;
 
@@ -828,15 +816,6 @@ void load_command_set(void)
 #endif
                }
 
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-               if (!strncasecmp(buf, "fullscreen=", 11)) {
-                       if (!strcasecmp(&buf[11], "yes"))
-                               rc_screen = RC_YES;
-                       else if (!strcasecmp(&buf[11], "no"))
-                               rc_screen = RC_NO;
-               }
-#endif
-
                if (!strncasecmp(buf, "editor=", 7))
                        strcpy(editor_paths[0], &buf[7]);
 
@@ -1521,10 +1500,6 @@ void color(int colornum)
 
        current_color = colornum;
        if (enable_color) {
-#if defined(HAVE_CURSES_H) && !defined(DISABLE_CURSES)
-               if (scr_color(colornum))
-                       return;
-#endif
                /* When switching to dim white, actually output an 'original
                 * pair' sequence -- this looks better on black-on-white
                 * terminals. - Changed to ORIGINAL_PAIR as this actually

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index dfc38a4ab943fb12c386aaa26f93f70633a3db84..6b4243d8dc155298d1504b281bf976f3a2a8391e 100644 (file)
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -118,15 +118,6 @@ int scr_putc(int c)
 }
 
 
-/*
- * scr_color() sets the window color for mainwindow
- */
-int scr_color(int colornum)
-{
-       return 0;
-}
-
-
 void scr_flush(void)
 {
        fflush(stdout);

diff --git a/citadel/textclient/screen.h b/citadel/textclient/screen.h
index 77cabc6b7c76398ea37b19e855d8272df0feccea..7b03798e1ed07d0a6721ec425164db317302ed0a 100644 (file)
--- a/citadel/textclient/screen.h
+++ b/citadel/textclient/screen.h
@@ -6,15 +6,14 @@ void screen_delete(void);
 int screen_set(void);
 int screen_reset(void);
 int scr_printf(char *fmt, ...);
+int scr_set_windowsize(CtdlIPC* ipc);
 
 #define SCR_NOBLOCK 0
 #define SCR_BLOCK -1
 int scr_getc(int delay);
 
 int scr_putc(int c);
-int scr_color(int colornum);
 void scr_flush(void);
-int scr_set_windowsize(CtdlIPC* ipc);
 int scr_blockread(void);
 RETSIGTYPE scr_winch(int signum);
 void wait_indicator(int state);