Refactoring to avoid code duplication.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4344 dbcabf3a-b0e7-0310-adc4-f8d773084564

4 files changed, 19 insertions, 33 deletions

diff --git a/src/fe-text/cuix-api.h b/src/fe-text/cuix-api.h
index cc9ec2d3..9dbb7bcf 100644
--- a/src/fe-text/cuix-api.h
+++ b/src/fe-text/cuix-api.h
@@ -1,23 +1,10 @@
 #ifndef __CUIX_API_H
 #define __CUIX_API_H
 
-#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#  include <ncurses.h>
-#else
-#  include <curses.h>
-#endif
-#include <form.h>
-#include <panel.h>
+#include "term-curses.h"
 
 #define MAX_FIELD_SIZE 64
 
-/* Should be updated if the one in term-curses.c changes */
-struct _TERM_WINDOW {
-    int x, y;
-    int width, height;
-    WINDOW *win;
-};
-
 WINDOW *cuix_win;
 PANEL *p_main;
 PANEL *p_cuix;
diff --git a/src/fe-text/cuix-lib.h b/src/fe-text/cuix-lib.h
index e03795c9..1839a5ab 100644
--- a/src/fe-text/cuix-lib.h
+++ b/src/fe-text/cuix-lib.h
@@ -1,13 +1,6 @@
 #ifndef __CUIX_LIB_H
 #define __CUIX_LIB_H
 
-#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#  include <ncurses.h>
-#else
-#  include <curses.h>
-#endif
-#include <form.h>
-#include <panel.h>
 #include "cuix-api.h"
 
 int home_menu (char *);
diff --git a/src/fe-text/term-curses.c b/src/fe-text/term-curses.c
index 9d46af61..e0c991be 100644
--- a/src/fe-text/term-curses.c
+++ b/src/fe-text/term-curses.c
@@ -26,13 +26,9 @@
 #ifdef HAVE_CUIX
 #include "cuix.h"
 #endif
-#include "panel.h"
 
-#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#  include <ncurses.h>
-#else
-#  include <curses.h>
-#endif
+#include "term-curses.h"
+
 #include <termios.h>
 #include <signal.h>
 
@@ -48,12 +44,6 @@
 #  define _POSIX_VDISABLE 0
 #endif
 
-struct _TERM_WINDOW {
-	int x, y;
-        int width, height;
-	WINDOW *win;
-};
-
 TERM_WINDOW *root_window;
 
 static int curs_x, curs_y;
diff --git a/src/fe-text/term-curses.h b/src/fe-text/term-curses.h
new file mode 100644
index 00000000..9d9712b2
--- /dev/null
+++ b/src/fe-text/term-curses.h
@@ -0,0 +1,16 @@
+#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+#  include <ncurses.h>
+#else
+#  include <curses.h>
+#endif
+
+#ifdef HAVE_CUIX
+#include <form.h>
+#include <panel.h>
+#endif
+
+struct _TERM_WINDOW {
+	int x, y;
+        int width, height;
+	WINDOW *win;
+};