Initial step to move TTY layer of MC to separate library.

configure.ac

@@ -560,6 +560,7 @@ misc/mc.ext
 src/Makefile
 src/mcconfig/Makefile
 src/search/Makefile
+src/tty/Makefile
 
 edit/Makefile
 syntax/Makefile

edit/choosesyntax.c

@@ -26,10 +26,11 @@
 
 #include <stdlib.h>
 
-#include "edit-impl.h"
 #include "../src/global.h"
 #include "../src/wtools.h"
 
+#include "edit-impl.h"
+
 #define MAX_ENTRY_LEN 40
 #define LIST_LINES 14
 #define N_DFLT_ENTRIES 2

edit/editcmd.c

@@ -46,14 +46,15 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/history.h"
 
-#include "../src/tty.h"		/* LINES */
+#include "../src/tty/tty.h"	/* COLS */
+#include "../src/tty/key.h"	/* XCTRL */
+
+#include "../src/history.h"
 #include "../src/widget.h"	/* listbox_new() */
 #include "../src/layout.h"	/* clr_scr() */
 #include "../src/main.h"	/* mc_home source_codepage */
 #include "../src/help.h"	/* interactive_display() */
-#include "../src/key.h"		/* XCTRL */
 #include "../src/wtools.h"	/* message() */
 #include "../src/charsets.h"
 #include "../src/selcodepage.h"

edit/editcmd_dialogs.c

@@ -28,21 +28,22 @@
 
 #include "../src/global.h"
 
-#include "edit-widget.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
+#include "../src/tty/key.h"
+
+#include "../src/search/search.h"
 
 #include "../src/strutil.h"
-#include "../src/tty.h"
 #include "../src/widget.h"
-#include "../src/color.h"
 #include "../src/wtools.h"
 #include "../src/dialog.h"      /* do_refresh() */
-#include "../src/key.h"
 #include "../src/main.h"
-#include "../src/search/search.h"
 #include "../src/history.h"
 
+#include "../edit/edit-widget.h"
 #include "../edit/etags.h"
-#include "editcmd_dialogs.h"
+#include "../edit/editcmd_dialogs.h"
 
 
 /*** global variables **************************************************/

edit/editcmd_dialogs.h

@@ -1,6 +1,8 @@
 #ifndef MC__EDITCMD_DIALOGS_H
 #define MC__EDITCMD_DIALOGS_H
 
+#include "../edit/edit.h"
+
 /*** typedefs(not structures) and defined constants **********************************************/
 
 struct etags_hash_struct;

edit/editdraw.c

@@ -45,13 +45,14 @@
 
 #define MAX_LINE_LEN 1024
 
-#include "../src/color.h"	/* EDITOR_NORMAL_COLOR */
-#include "../src/tty.h"		/* attrset() */
-#include "../src/widget.h"	/* buttonbar_redraw() */
-#include "../src/key.h"		/* is_idle() */
+#include "../src/tty/tty.h"		/* attrset() */
+#include "../src/tty/color.h"		/* EDITOR_NORMAL_COLOR */
+#include "../src/tty/key.h"		/* is_idle() */
+
+#include "../src/widget.h"		/* buttonbar_redraw() */
 #include "../src/charsets.h"
-#include "../src/strutil.h"	/* utf string functions */
-#include "../src/main.h"	/* source_codepage */
+#include "../src/strutil.h"		/* utf string functions */
+#include "../src/main.h"		/* source_codepage */
 
 /* Text styles */
 #define MOD_ABNORMAL		(1 << 8)

edit/editkeys.c

@@ -45,8 +45,10 @@
 #include "edit-widget.h"	/* edit->macro_i */
 #include "editcmd_dialogs.h"
 #include "editcmddef.h"		/* list of commands */
-#include "../src/key.h"		/* KEY_M_SHIFT */
-#include "../src/tty.h"		/* keys */
+
+#include "../src/tty/tty.h"	/* keys */
+#include "../src/tty/key.h"	/* KEY_M_SHIFT */
+
 #include "../src/charsets.h"	/* convert_from_input_c() */
 #include "../src/main.h"	/* display_codepage */
 #include "../src/strutil.h"	/* str_isutf8 () */

edit/editmenu.c

@@ -37,23 +37,23 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
-
 #include <stdlib.h>
 
 #include "../src/global.h"
 
 #include "edit-impl.h"
-#include "../src/cmd.h"
-#include "../src/wtools.h"	/* query_dialog() */
-#include "../src/menu.h"	/* menu_entry */
-#include "../src/tty.h"		/* KEY_F */
-#include "../src/key.h"		/* XCTRL */
-#include "../src/main.h"	/* drop_menus */
-#include "../src/learn.h"	/* learn_keys */
-
 #include "edit-widget.h"
 #include "editcmddef.h"
 
+#include "../src/tty/tty.h"	/* KEY_F */
+#include "../src/tty/key.h"	/* XCTRL */
+
+#include "../src/cmd.h"		/* save_setup_cmd() */
+#include "../src/wtools.h"	/* query_dialog() */
+#include "../src/menu.h"	/* menu_entry */
+#include "../src/main.h"	/* drop_menus */
+#include "../src/learn.h"	/* learn_keys */
+
 static void
 menu_cmd (int command)
 {

edit/editwidget.c

@@ -41,13 +41,14 @@
 
 #include "../src/global.h"
 
+#include "../src/tty/tty.h"		/* LINES, COLS */
+#include "../src/tty/key.h"		/* is_idle() */
+
 #include "edit-impl.h"
 #include "edit-widget.h"
 
-#include "../src/tty.h"		/* LINES */
-#include "../src/widget.h"	/* buttonbar_redraw() */
-#include "../src/menu.h"	/* menubar_new() */
-#include "../src/key.h"		/* is_idle() */
+#include "../src/widget.h"		/* buttonbar_redraw() */
+#include "../src/menu.h"		/* menubar_new() */
 
 WEdit *wedit;
 struct WMenu *edit_menubar;

edit/syntax.c

@@ -51,11 +51,16 @@
 #include "edit-impl.h"
 #include "edit-widget.h"
 
-#include "../src/color.h"	/* use_colors */
-#include "../src/main.h"	/* mc_home */
-#include "../src/wtools.h"	/* message() */
-#include "../src/strutil.h"	/* utf string functions */
-#include "../src/search/search.h" /* search engine */
+#include "../src/search/search.h"	/* search engine */
+
+#include "../src/tty/color.h"		/* use_colors */
+
+#include "edit-impl.h"
+#include "edit-widget.h"
+
+#include "../src/main.h"		/* mc_home */
+#include "../src/wtools.h"		/* message() */
+#include "../src/strutil.h"		/* utf string functions */
 
 /* bytes */
 #define SYNTAX_MARKER_DENSITY 512

edit/usermap.c

@@ -38,12 +38,14 @@
 
 #include "../src/global.h"
 
+#include "../src/tty/tty.h"	/* keys */
+#include "../src/tty/key.h"	/* KEY_M_* */
+
 #include "edit-impl.h"
 #include "edit-widget.h"
 #include "editcmddef.h"		/* list of commands */
 #include "usermap.h"
-#include "../src/key.h"		/* KEY_M_* */
-#include "../src/tty.h"		/* keys */
+
 #include "../src/wtools.h"
 #include "../src/widget.h"	/* buttonbar_redraw() */
 

src/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = mcconfig search
+SUBDIRS = mcconfig search tty
 
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
@@ -46,27 +46,26 @@ mc_LDADD = $(EDITLIB) $(VFSLIB) \
 CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
 
 SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
-	chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h	\
-	command.c command.h complete.c cons.handler.c	\
+	chmod.c chmod.h chown.c chown.h cmd.c cmd.h			\
+	command.c command.h complete.c cons.handler.c			\
 	cons.saver.h dialog.c dialog.h dir.c dir.h			\
-	execute.c execute.h ext.c ext.h file.c filegui.c	\
+	execute.c execute.h ext.c ext.h file.c filegui.c		\
 	filegui.h file.h filenot.c fileopctx.c fileopctx.h find.c	\
 	find.h findme.c	findme.h fs.h					\
 	glibcompat.c glibcompat.h global.h help.c help.h hotlist.c	\
-	hotlist.h info.c info.h key.c key.h keyxdef.c layout.c		\
+	hotlist.h info.c info.h layout.c				\
 	layout.h learn.c learn.h listmode.c listmode.h history.h	\
-	logging.h logging.c						\
-	main.c main.h main-widgets.h					\
-	menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h	\
+	logging.h logging.c main.c main.h main-widgets.h		\
+	menu.c menu.h mountlist.c mountlist.h				\
 	option.c option.h panel.h panelize.c panelize.h poptalloca.h	\
 	popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c	\
-	rxvt.c screen.c setup.c setup.h	\
-	slint.c	subshell.c subshell.h textconf.c textconf.h		\
-	tree.c tree.h treestore.c treestore.h timefmt.h tty.c tty.h user.c	\
+	screen.c setup.c setup.h					\
+	subshell.c subshell.h textconf.c textconf.h			\
+	tree.c tree.h treestore.c treestore.h timefmt.h user.c		\
 	user.h util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c	\
 	widget.h win.c win.h wtools.c wtools.h unixcompat.h		\
-	x11conn.h x11conn.c ecs.h ecs.c \
-	strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c \
+	x11conn.h x11conn.c ecs.h ecs.c					\
+	strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c	\
 	search/search.h strescape.c strescape.h
 
 if CHARSET

src/achown.c

@@ -34,13 +34,13 @@
 #include <grp.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"		/* For init_box_colors() */
-#include "key.h"		/* XCTRL and ALT macros */
+#include "../src/tty/key.h"		/* XCTRL and ALT macros */
 #include "strutil.h"
 
 #include "dir.h"

src/background.c

@@ -45,11 +45,11 @@
 
 #include "global.h"
 #include "background.h"
-#include "tty.h"	/* doupdate() */
+#include "../src/tty/tty.h"	/* doupdate() */
 #include "dialog.h"	/* do_refresh() */
 #include "wtools.h"
 #include "fileopctx.h"	/* FileOpContext */
-#include "key.h"	/* add_select_channel(), delete_select_channel() */
+#include "../src/tty/key.h"	/* add_select_channel(), delete_select_channel() */
 
 enum ReturnType {
     Return_String,

src/boxes.c

@@ -35,15 +35,15 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"		/* Our window tools */
-#include "color.h"		/* Color definitions */
+#include "../src/tty/color.h"		/* Color definitions */
 #include "dialog.h"		/* The nice dialog manager */
 #include "widget.h"		/* The widgets for the nice dialog manager */
 #include "wtools.h"
 #include "setup.h"		/* For profile_name */
 #include "../src/mcconfig/mcconfig.h"	/* Load/save user formats */
-#include "key.h"		/* XCTRL and ALT macros  */
+#include "../src/tty/key.h"		/* XCTRL and ALT macros  */
 #include "command.h"		/* For cmdline */
 #include "dir.h"
 #include "panel.h"

src/chmod.c

@@ -32,8 +32,8 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"	/* A_REVERSE */
-#include "color.h"	/* dialog_colors */
+#include "../src/tty/tty.h"	/* A_REVERSE */
+#include "../src/tty/color.h"	/* dialog_colors */
 #include "dialog.h"	/* add_widget() */
 #include "widget.h"	/* NORMAL_BUTTON */
 #include "wtools.h"	/* message() */

src/chown.c

@@ -33,9 +33,9 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "strutil.h"

src/cmd.c

@@ -54,12 +54,12 @@
 #include "tree.h"		/* tree_chdir() */
 #include "subshell.h"		/* use_subshell */
 #include "cons.saver.h"		/* console_flag */
-#include "tty.h"		/* LINES */
+#include "../src/tty/tty.h"		/* LINES */
 #include "dialog.h"		/* Widget */
 #include "view.h"		/* mc_internal_viewer() */
 #include "wtools.h"		/* message() */
 #include "widget.h"		/* push_history() */
-#include "key.h"		/* application_keypad_mode() */
+#include "../src/tty/key.h"		/* application_keypad_mode() */
 #include "win.h"		/* do_enter_ca_mode() */
 #include "main.h"		/* change_panel() */
 #include "panel.h"		/* current_panel */

src/command.c

@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "global.h"		/* home_dir */
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "widget.h"		/* WInput */
 #include "command.h"
 #include "wtools.h"		/* message () */
@@ -43,7 +43,7 @@
 #include "user.h"		/* expand_format */
 #include "subshell.h"		/* SUBSHELL_EXIT */
 #include "tree.h"		/* for tree_chdir */
-#include "color.h"		/* DEFAULT_COLOR */
+#include "../src/tty/color.h"		/* DEFAULT_COLOR */
 #include "execute.h"		/* shell_execute */
 #include "../src/strescape.h"
 

src/complete.c

@@ -37,15 +37,16 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"
+#include "../src/tty/tty.h"
+#include "win.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
 #include "main.h"		/* show_all_if_ambiguous */
 #include "util.h"
 #include "../src/strescape.h"
-#include "key.h"		/* XCTRL and ALT macros */
+#include "../src/tty/key.h"		/* XCTRL and ALT macros */
 #include "strutil.h"
 
 typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags);

src/cons.handler.c

@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "cons.saver.h"
 
 signed char console_flag = 0;

src/dialog.c

@@ -30,10 +30,12 @@
 #include <string.h>
 
 #include "global.h"
-#include "tty.h"
-#include "mouse.h"
+
+#include "../src/tty/tty.h"
+#include "../src/tty/mouse.h"
+#include "../src/tty/key.h"	/* mi_getch() */
+
 #include "help.h"	/* interactive_display() */
-#include "key.h"	/* mi_getch() */
 #include "dialog.h"
 #include "layout.h"	/* winch_flag */
 #include "execute.h"	/* suspend_cmd() */

src/dialog.h

@@ -23,7 +23,7 @@
 #ifndef MC_DIALOG_H
 #define MC_DIALOG_H
 
-#include "mouse.h"
+#include "../src/tty/mouse.h"
 #include "util.h" /* Hook */
 
 /* Color constants */

src/dir.c

@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "dir.h"
 #include "wtools.h"
 #include "treestore.h"

src/execute.c

@@ -26,9 +26,9 @@
 #include <sys/time.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "key.h"
+#include "../src/tty/key.h"
 #include "main.h"
 #include "cons.saver.h"
 #include "subshell.h"

src/ext.c

@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "user.h"
 #include "main.h"
 #include "wtools.h"

src/file.c

@@ -57,9 +57,9 @@
 #include <sys/time.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "setup.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "win.h"
 #include "dialog.h"
 #include "widget.h"
@@ -78,7 +78,7 @@
 #include "file.h"
 #include "filegui.h"
 #include "tree.h"
-#include "key.h"
+#include "../src/tty/key.h"
 #include "../vfs/vfs-impl.h"
 
 /* }}} */

src/filegui.c

@@ -75,7 +75,7 @@
 #include "global.h"
 #include "setup.h"		/* verbose */
 #include "dialog.h"		/* do_refresh() */
-#include "color.h"		/* dialog_colors */
+#include "../src/tty/color.h"		/* dialog_colors */
 #include "widget.h"		/* WLabel */
 #include "main-widgets.h"
 #include "main.h"		/* the_hint */
@@ -83,7 +83,7 @@
 #include "panel.h"		/* current_panel */
 #include "fileopctx.h"		/* FILE_CONT */
 #include "filegui.h"
-#include "key.h"		/* get_event */
+#include "../src/tty/key.h"		/* get_event */
 #include "util.h"               /* strip_password() */
 #include "strutil.h"
 #include "../src/search/search.h"

src/find.c

@@ -33,9 +33,9 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "setup.h"
 #include "find.h"
 #include "strutil.h"
@@ -47,7 +47,7 @@
 #include "wtools.h"
 #include "cmd.h"		/* view_file_at_line */
 #include "boxes.h"
-#include "key.h"
+#include "../src/tty/key.h"
 #include "../src/search/search.h"
 #include "history.h"		/* MC_HISTORY_SHARED_SEARCH */
 

src/help.c

@@ -52,11 +52,11 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
 #include "win.h"
-#include "mouse.h"
-#include "key.h"		/* For mi_getch() */
+#include "../src/tty/mouse.h"
+#include "../src/tty/key.h"		/* For mi_getch() */
 #include "help.h"
 #include "dialog.h"		/* For Dlg_head */
 #include "widget.h"		/* For Widget */

src/hotlist.c

@@ -41,8 +41,8 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"		/* COLS */
-#include "color.h"		/* dialog_colors */
+#include "../src/tty/tty.h"		/* COLS */
+#include "../src/tty/color.h"		/* dialog_colors */
 #include "dialog.h"
 #include "widget.h"
 #include "setup.h"		/* For profile_bname */
@@ -51,7 +51,7 @@
 #include "panel.h"		/* current_panel */
 #include "main.h"		/* repaint_screen */
 #include "hotlist.h"
-#include "key.h"		/* KEY_M_CTRL */
+#include "../src/tty/key.h"		/* KEY_M_CTRL */
 #include "command.h"		/* cmdline */
 #include "glibcompat.h"		/* g_strlcpy for glib < 2.0 */
 #include "history.h"

src/info.c

@@ -25,9 +25,9 @@
 #include <stdio.h>
 
 #include "global.h"
-#include "tty.h"
-#include "mouse.h"		/* Gpm_Event */
-#include "color.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/mouse.h"		/* Gpm_Event */
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "info.h"
 #include "dir.h"		/* required by panel */
@@ -35,7 +35,7 @@
 #include "main.h"		/* other_panel, current_panel definitions */
 #include "util.h"		/* size_trunc_len */
 #include "layout.h"
-#include "key.h"		/* is_idle() */
+#include "../src/tty/key.h"		/* is_idle() */
 #include "mountlist.h"
 #include "unixcompat.h"
 #include "strutil.h"

src/layout.c

@@ -47,15 +47,15 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"		/* COLS */
+#include "../src/tty/tty.h"		/* COLS */
 #include "win.h"
-#include "color.h"
-#include "key.h"
+#include "../src/tty/color.h"
+#include "../src/tty/key.h"
 #include "dialog.h"
 #include "widget.h"
 #include "command.h"
 #include "../src/mcconfig/mcconfig.h"
-#include "mouse.h"
+#include "../src/tty/mouse.h"
 #include "main-widgets.h"
 #include "main.h"
 #include "subshell.h"	/* For use_subshell and resize_subshell() */

src/learn.c

@@ -35,13 +35,13 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "../src/mcconfig/mcconfig.h"	/* Save profile */
-#include "key.h"
+#include "../src/tty/key.h"
 #include "setup.h"
 #include "main.h"
 #include "learn.h"

src/main.c

@@ -41,21 +41,21 @@
 #include <pwd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "dir.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "menu.h"
 #include "panel.h"
 #include "main.h"
 #include "win.h"
-#include "mouse.h"
+#include "../src/tty/mouse.h"
 #include "option.h"
 #include "tree.h"
 #include "treestore.h"
 #include "cons.saver.h"
 #include "subshell.h"
-#include "key.h"		/* For init_key() and mi_getch() */
+#include "../src/tty/key.h"		/* For init_key() and mi_getch() */
 #include "setup.h"		/* save_setup() */
 #include "../src/mcconfig/mcconfig.h"
 #include "boxes.h"		/* sort_box() */

src/menu.c

@@ -28,15 +28,15 @@
 #include <sys/types.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "menu.h"
 #include "help.h"
 #include "dialog.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "main.h"
-#include "mouse.h"
+#include "../src/tty/mouse.h"
 #include "win.h"
-#include "key.h"	/* For mi_getch() */
+#include "../src/tty/key.h"	/* For mi_getch() */
 #include "strutil.h"
 
 int menubar_visible = 1;	/* This is the new default */

src/option.c

@@ -31,9 +31,9 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "setup.h"		/* For save_setup() */

src/panelize.c

@@ -34,9 +34,9 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"		/* attrset() */
+#include "../src/tty/tty.h"		/* attrset() */
 #include "win.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"		/* For common_dialog_repaint() */

src/rxvt.c

@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"	/* move, addch */
+#include "../src/tty/tty.h"	/* move, addch */
 #include "cons.saver.h"
 
 static int rxvt_extensions = 0;

src/screen.c

@@ -32,18 +32,18 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "dir.h"
 #include "panel.h"
-#include "color.h"
+#include "../src/tty/color.h"
 #include "tree.h"
 #include "win.h"
 #include "ext.h"		/* regexp_command */
-#include "mouse.h"		/* For Gpm_Event */
+#include "../src/tty/mouse.h"		/* For Gpm_Event */
 #include "layout.h"		/* Most layout variables are here */
 #include "wtools.h"		/* for message (...) */
 #include "cmd.h"
-#include "key.h"		/* XCTRL and ALT macros  */
+#include "../src/tty/key.h"		/* XCTRL and ALT macros  */
 #include "setup.h"		/* For loading/saving panel options */
 #include "user.h"
 #include "../src/mcconfig/mcconfig.h"

src/setup.c

@@ -29,16 +29,16 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "dir.h"
 #include "panel.h"
 #include "main.h"
 #include "tree.h"		/* xtree_mode */
 #include "../src/mcconfig/mcconfig.h"
 #include "setup.h"
-#include "mouse.h"		/* To make view.h happy */
+#include "../src/tty/mouse.h"		/* To make view.h happy */
 #include "view.h"		/* For the externs */
-#include "key.h"		/* For the externs */
+#include "../src/tty/key.h"		/* For the externs */
 #include "hotlist.h"		/* load/save/done hotlist */
 #include "panelize.h"		/* load/save/done panelize */
 #include "layout.h"

src/subshell.c

@@ -50,12 +50,12 @@
 #endif /* HAVE_STROPTS_H */
 
 #include "global.h"
-#include "tty.h"	/* LINES */
+#include "../src/tty/tty.h"	/* LINES */
 #include "panel.h"	/* current_panel */
 #include "wtools.h"	/* query_dialog() */
 #include "main.h"	/* do_update_prompt() */
 #include "cons.saver.h"	/* handle_console() */
-#include "key.h"	/* XCTRL */
+#include "../src/tty/key.h"	/* XCTRL */
 #include "subshell.h"
 #include "strutil.h"
 

src/tree.c

@@ -39,18 +39,18 @@
 #include <string.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
 #include "wtools.h"	/* message() */
 #include "dir.h"
 #include "dialog.h"
 #include "widget.h"
 #include "panel.h"
-#include "mouse.h"
+#include "../src/tty/mouse.h"
 #include "main.h"
 #include "file.h"	/* For copy_dir_dir(), move_dir_dir(), erase_dir() */
 #include "help.h"
-#include "key.h"	/* For mi_getch() */
+#include "../src/tty/key.h"	/* For mi_getch() */
 #include "tree.h"
 #include "treestore.h"
 #include "cmd.h"

src/tty/Makefile.am

@@ -0,0 +1,12 @@
+noinst_LTLIBRARIES = libmctty.la
+
+libmctty_la_SOURCES = \
+	color.c color.h \
+	key.c key.h keyxdef.c \
+	mouse.c mouse.h \
+	myslang.h slint.c \
+	tty.c tty.h
+
+libmctty_la_CFLAGS = -I../ -I$(top_srcdir)/src \
+	$(GLIB_CFLAGS) \
+	-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

src/tty/color.c

@@ -26,13 +26,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "global.h"
-#include "tty.h"
-#include "setup.h"		/* For the externs */
-#include "color.h"
+#include "../../src/global.h"
+
+#include "../../src/tty/tty.h"
+#include "../../src/setup.h"		/* For the externs */
+#include "../../src/tty/color.h"
 
 /* Set to force black and white display at program startup */
-int   disable_colors = 0;
+int disable_colors = 0;
 
 /* Set if we are actually using colors */
 int use_colors = 0;

src/tty/key.c

@@ -37,21 +37,23 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "global.h"
-#include "tty.h"
-#include "mouse.h"
-#include "key.h"
-#include "layout.h"	/* winch_flag */
-#include "main.h"
-#include "win.h"
-#include "cons.saver.h"
+#include "../../src/global.h"
+
+#include "../../src/tty/tty.h"
+#include "../../src/tty/mouse.h"
+#include "../../src/tty/key.h"
+
+#include "../../src/layout.h"	/* winch_flag */
+#include "../../src/main.h"
+#include "../../src/win.h"
+#include "../../src/cons.saver.h"
 
 #ifdef USE_VFS
-#include "../vfs/gc.h"
+#include "../../vfs/gc.h"
 #endif
 
 #ifdef HAVE_TEXTMODE_X11_SUPPORT
-#    include "x11conn.h"
+#    include "../src/x11conn.h"
 #endif
 
 #ifdef __linux__

src/tty/keyxdef.c

@@ -41,10 +41,11 @@
 
 #include <config.h>
 
-#include "global.h"
-#include "mouse.h" /* required before key.h */
-#include "key.h"
-#include "tty.h"
+#include "../../src/global.h"
+
+#include "../../src/tty/tty.h"
+#include "../../src/tty/mouse.h" /* required before key.h */
+#include "../../src/tty/key.h"
 
 #if defined (__QNX__) && !defined (__QNXNTO__)
 #define HAVE_QNX_KEYS

src/tty/mouse.c

@@ -29,10 +29,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "global.h"
-#include "tty.h"
-#include "mouse.h"
-#include "key.h"		/* define sequence */
+#include "../../src/global.h"
+
+#include "../../src/tty/tty.h"
+#include "../../src/tty/mouse.h"
+#include "../../src/tty/key.h"		/* define sequence */
 
 int mouse_enabled = 0;
 const char *xmouse_seq;

src/tty/slint.c

@@ -38,15 +38,17 @@
 #endif
 #include <unistd.h>
 
-#include "global.h"
-#include "tty.h"
-#include "color.h"
-#include "mouse.h"		/* Gpm_Event is required in key.h */
-#include "key.h"		/* define_sequence */
-#include "main.h"		/* extern: force_colors */
-#include "win.h"		/* do_exit_ca_mode */
-#include "setup.h"
-#include "background.h"		/* we_are_background */
+#include "../../src/global.h"
+
+#include "../../src/tty/tty.h"
+#include "../../src/tty/color.h"
+#include "../../src/tty/mouse.h"	/* Gpm_Event is required in key.h */
+#include "../../src/tty/key.h"		/* define_sequence */
+
+#include "../../src/main.h"		/* extern: force_colors */
+#include "../../src/win.h"		/* do_exit_ca_mode */
+#include "../../src/setup.h"
+#include "../../src/background.h"		/* we_are_background */
 
 #ifdef HAVE_SLANG
 

src/tty/tty.c

@@ -33,15 +33,16 @@
 #include <signal.h>
 #include <stdarg.h>
 
-#include "global.h"
-#include "color.h"
-#include "main.h"		/* for slow_terminal */
-#include "strutil.h"
+#include "../../src/global.h"
 
+#include "../../src/tty/color.h"
 #if defined(USE_NCURSES) || defined(USE_NCURSESW)
 #define WANT_TERM_H
 #endif
-#include "tty.h"
+#include "../../src/tty/tty.h"
+
+#include "../../src/main.h"		/* for slow_terminal */
+#include "../../src/strutil.h"
 
 /*** file scope macro definitions **************************************/
 

src/tty/tty.h

@@ -13,7 +13,7 @@
 
 
 #ifdef HAVE_SLANG
-#   include "myslang.h"
+#   include "../../src/tty/myslang.h"
 #endif
 
 #ifdef USE_NCURSES

src/user.c

@@ -29,8 +29,8 @@
 #include <string.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
 #include "dir.h"
 #include "panel.h"
 #include "main.h"

src/view.c

@@ -48,14 +48,14 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "tty.h"
+#include "../src/tty/tty.h"
 #include "cmd.h"		/* For view_other_cmd */
 #include "dialog.h"		/* Needed by widget.h */
 #include "widget.h"		/* Needed for buttonbar_new */
-#include "color.h"
-#include "mouse.h"
+#include "../src/tty/color.h"
+#include "../src/tty/mouse.h"
 #include "help.h"
-#include "key.h"		/* For mi_getch() */
+#include "../src/tty/key.h"		/* For mi_getch() */
 #include "layout.h"
 #include "setup.h"
 #include "wtools.h"		/* For query_set_sel() */

src/widget.c

@@ -41,12 +41,14 @@
 #include <sys/types.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"
-#include "mouse.h"
+
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
+#include "../src/tty/mouse.h"
+#include "../src/tty/key.h"	/* XCTRL and ALT macros  */
+
 #include "dialog.h"
 #include "widget.h"
-#include "key.h"	/* XCTRL and ALT macros  */
 #include "../src/mcconfig/mcconfig.h"	/* for history loading and saving */
 #include "wtools.h"	/* For common_dialog_repaint() */
 #include "main.h"	/* for `slow_terminal' */

src/win.c

@@ -23,10 +23,20 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <string.h>
 
-#include "global.h"		/* glib.h */
-#include "tty.h"		/* raw(), noraw() */
-#include "key.h"		/* XCTRL and ALT macros  */
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
+#include "global.h"
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"
+#include "../src/tty/mouse.h"
+#include "dialog.h"
+#include "widget.h"
+#include "win.h"
+#include "../src/tty/key.h"		/* XCTRL and ALT macros  */
 #include "layout.h"
 #include "strutil.h"
 #include "win.h"

src/wtools.c

@@ -34,12 +34,12 @@
 #include <string.h>
 
 #include "global.h"
-#include "tty.h"
-#include "color.h"		/* dialog_colors */
+#include "../src/tty/tty.h"
+#include "../src/tty/color.h"		/* dialog_colors */
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
-#include "key.h"		/* mi_getch() */
+#include "../src/tty/key.h"		/* mi_getch() */
 #include "background.h"		/* parent_call */
 #include "strutil.h"
 

vfs/cpio.c

@@ -30,14 +30,17 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+#include "../src/unixcompat.h"
+
 #include "utilvfs.h"
 #include "vfs-impl.h"
-#include "gc.h"		/* vfs_rmstamp */
+#include "gc.h"			/* vfs_rmstamp */
 #include "xdirentry.h"
-#include "../src/unixcompat.h"
 
 enum {
     STATUS_START,

vfs/direntry.c

@@ -37,12 +37,15 @@
 #include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+
 #include "utilvfs.h"
 #include "vfs-impl.h"
-#include "gc.h"		/* vfs_rmstamp */
+#include "gc.h"			/* vfs_rmstamp */
 #include "xdirentry.h"
 
 #define CALL(x) if (MEDATA->x) MEDATA->x

vfs/extfs.c

@@ -46,14 +46,17 @@
 #include <sys/wait.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
-#include "utilvfs.h"
 #include "../src/execute.h"	/* For shell_execute */
+
+#include "utilvfs.h"
 #include "vfs.h"
 #include "vfs-impl.h"
-#include "gc.h"		/* vfs_rmstamp */
+#include "gc.h"			/* vfs_rmstamp */
 
 #undef ERRNOR
 #define ERRNOR(x,y) do { my_errno = x; return y; } while(0)

vfs/fish.c

@@ -53,7 +53,9 @@
 #include <string.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
 #include "../src/util.h"

vfs/ftpfs.c

@@ -81,17 +81,20 @@ What to do with this?
 #include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
 #include "../src/history.h"
+#include "../src/setup.h"	/* for load_anon_passwd */
+
 #include "utilvfs.h"
 #include "xdirentry.h"
 #include "vfs.h"
 #include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "tcputil.h"
-#include "../src/setup.h"	/* for load_anon_passwd */
 #include "ftpfs.h"
 #ifndef MAXHOSTNAMELEN
 #    define MAXHOSTNAMELEN 64

vfs/gc.c

@@ -43,9 +43,14 @@
 #include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
+#include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+#include "../src/panel.h"	/* get_current_panel() */
 #include "../src/layout.h"	/* get_current_type() */
+
 #include "utilvfs.h"
 #include "vfs-impl.h"
 #include "vfs.h"

vfs/local.c

@@ -13,9 +13,12 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+
 #include "utilvfs.h"
 #include "vfs.h"
 #include "local.h"

vfs/sfs.c

@@ -42,15 +42,18 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+#include "../src/execute.h"	/* EXECUTE_AS_SHELL */
+
 #include "utilvfs.h"
 #include "vfs.h"
 #include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "local.h"
-#include "../src/execute.h"	/* EXECUTE_AS_SHELL */
 
 struct cachedfile {
     char *name, *cache;

vfs/smbfs.c

@@ -35,12 +35,16 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#undef	USE_NCURSES	/* Don't include *curses.h */
+#undef USE_NCURSES	/* Don't include *curses.h */
 #undef  USE_NCURSESW
+
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+
 #include "utilvfs.h"
 
 #undef	PACKAGE_BUGREPORT

vfs/tar.c

@@ -41,9 +41,12 @@
 #endif
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+
 #include "utilvfs.h"
 #include "gc.h"		/* vfs_rmstamp */
 #include "xdirentry.h"

vfs/utilvfs.c

@@ -34,14 +34,17 @@
 #include <stdlib.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
-#include "utilvfs.h"
-#include "vfs.h"
 #include "../src/unixcompat.h"
 #include "../src/history.h"
 
+#include "vfs.h"
+#include "utilvfs.h"
+
 /* Extract the hostname and username from the path */
 /* path is in the form: [user@]hostname:port/remote-dir, e.g.:
  *

vfs/vfs.c

@@ -38,7 +38,7 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <stdlib.h>	/* For atol() */
+#include <stdlib.h>		/* For atol() */
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
@@ -51,13 +51,15 @@
 #include <dirent.h>
 
 #include "../src/global.h"
-#include "../src/tty.h"		/* enable/disable interrupt key */
+
+#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
 #include "../src/strutil.h"
+
 #include "utilvfs.h"
 #include "gc.h"
-
 #include "vfs.h"
 #ifdef USE_NETCODE
 #   include "tcputil.h"