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 "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/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"
-
 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