From b989292a7afcead8c51272895aab029df9213067 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 2 Sep 2010 07:38:31 -0400
Subject: [PATCH] Removed more vestiges of curses mode

---
 citadel/textclient/citadel.c  | 18 ------------------
 citadel/textclient/commands.c | 25 -------------------------
 citadel/textclient/screen.c   |  9 ---------
 citadel/textclient/screen.h   |  3 +--
 4 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/citadel/textclient/citadel.c b/citadel/textclient/citadel.c
index f96c64fe2..2d42a33f2 100644
--- 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 9ab121e00..9c3c56c01 100644
--- 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 dfc38a4ab..6b4243d8d 100644
--- 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 77cabc6b7..7b03798e1 100644
--- 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);
-- 
2.39.2