Moved rxvt.c, win.[ch] and x11con.[ch] from src to src/tty directory.

Fixed includes.
Fixed library order in src/Makefile.am due to --as-needed linking option.
This commit is contained in:
Andrew Borodin 2009-05-09 19:17:57 +04:00
parent f3730bdc41
commit 389e5bf613
29 changed files with 131 additions and 82 deletions

View File

@ -39,8 +39,12 @@ VFSLIB = ../vfs/libvfs-mc.a
endif
endif
MCCONFIGLIB = mcconfig/libmcconfig.la
SEARCHLIB = search/libsearch.la
TTYLIB = tty/libmctty.la
mc_LDADD = $(EDITLIB) $(VFSLIB) \
search/libsearch.la mcconfig/libmcconfig.la \
$(MCCONFIGLIB) $(SEARCHLIB) $(TTYLIB) \
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
@ -62,9 +66,9 @@ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
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 \
user.h util.c util.h utilunix.c view.c view.h vfsdummy.h \
widget.c widget.h wtools.c wtools.h unixcompat.h \
ecs.h ecs.c \
strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c \
search/search.h strescape.c strescape.h

View File

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

View File

@ -35,15 +35,17 @@
#include <sys/stat.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "win.h" /* Our window tools */
#include "../src/tty/color.h" /* Color definitions */
#include "../src/tty/key.h" /* XCTRL and ALT macros */
#include "../src/tty/win.h" /* Our window tools */
#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 "../src/tty/key.h" /* XCTRL and ALT macros */
#include "command.h" /* For cmdline */
#include "dir.h"
#include "panel.h"

View File

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

View File

@ -46,6 +46,13 @@
#include <sys/time.h>
#include "global.h"
#include "../src/tty/tty.h" /* LINES */
#include "../src/tty/key.h" /* application_keypad_mode() */
#include "../src/tty/win.h" /* do_enter_ca_mode() */
#include "../src/search/search.h"
#include "cmd.h" /* Our definitions */
#include "fileopctx.h"
#include "file.h" /* file operation routines */
@ -54,13 +61,10 @@
#include "tree.h" /* tree_chdir() */
#include "subshell.h" /* use_subshell */
#include "cons.saver.h" /* console_flag */
#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 "../src/tty/key.h" /* application_keypad_mode() */
#include "win.h" /* do_enter_ca_mode() */
#include "main.h" /* change_panel() */
#include "panel.h" /* current_panel */
#include "help.h" /* interactive_display() */
@ -74,10 +78,8 @@
#include "execute.h" /* toggle_panels() */
#include "history.h"
#include "strutil.h"
#include "../src/search/search.h"
#include "dir.h"
#ifndef MAP_FILE
# define MAP_FILE 0
#endif

View File

@ -37,16 +37,18 @@
#include <unistd.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "win.h"
#include "../src/tty/color.h"
#include "../src/tty/key.h" /* XCTRL and ALT macros */
#include "../src/tty/win.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 "../src/tty/key.h" /* XCTRL and ALT macros */
#include "strutil.h"
typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags);

View File

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

View File

@ -57,10 +57,15 @@
#include <sys/time.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "setup.h"
#include "../src/tty/color.h"
#include "win.h"
#include "../src/tty/key.h"
#include "../src/tty/win.h"
#include "../src/search/search.h"
#include "setup.h"
#include "dialog.h"
#include "widget.h"
#include "main.h" /* cmd_buf */
@ -70,7 +75,6 @@
#include "background.h" /* we_are_background */
#include "../src/strescape.h"
#include "strutil.h"
#include "../src/search/search.h"
/* Needed for current_panel, other_panel and WTree */
#include "dir.h"
@ -78,7 +82,6 @@
#include "file.h"
#include "filegui.h"
#include "tree.h"
#include "../src/tty/key.h"
#include "../vfs/vfs-impl.h"
/* }}} */

View File

@ -33,9 +33,14 @@
#include <sys/stat.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "win.h"
#include "../src/tty/color.h"
#include "../src/tty/key.h"
#include "../src/tty/win.h"
#include "../src/search/search.h"
#include "setup.h"
#include "find.h"
#include "strutil.h"
@ -47,8 +52,6 @@
#include "wtools.h"
#include "cmd.h" /* view_file_at_line */
#include "boxes.h"
#include "../src/tty/key.h"
#include "../src/search/search.h"
#include "history.h" /* MC_HISTORY_SHARED_SEARCH */
/* Size of the find parameters window */

View File

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

View File

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

View File

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

View File

@ -41,21 +41,23 @@
#include <pwd.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "dir.h"
#include "../src/tty/color.h"
#include "../src/tty/mouse.h"
#include "../src/tty/key.h" /* For init_key() and mi_getch() */
#include "../src/tty/win.h"
#include "dir.h"
#include "dialog.h"
#include "menu.h"
#include "panel.h"
#include "main.h"
#include "win.h"
#include "../src/tty/mouse.h"
#include "option.h"
#include "tree.h"
#include "treestore.h"
#include "cons.saver.h"
#include "subshell.h"
#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() */

View File

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

View File

@ -31,20 +31,22 @@
#include <unistd.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "win.h"
#include "../src/tty/color.h"
#include "../src/tty/win.h"
#include "dialog.h"
#include "widget.h"
#include "setup.h" /* For save_setup() */
#include "main.h"
#include "../src/mcconfig/mcconfig.h" /* For mc_config_save_file */
#include "strutil.h"
#include "panel.h" /* Needed for the externs */
#include "file.h" /* safe_delete */
#include "layout.h" /* For nice_rotating_dash */
#include "option.h"
static Dlg_head *conf_dlg;
#define TOGGLE_VARIABLE 0

View File

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

View File

@ -32,18 +32,20 @@
#include <unistd.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "../src/tty/color.h"
#include "../src/tty/mouse.h" /* For Gpm_Event */
#include "../src/tty/key.h" /* XCTRL and ALT macros */
#include "../src/tty/win.h"
#include "dir.h"
#include "panel.h"
#include "../src/tty/color.h"
#include "tree.h"
#include "win.h"
#include "ext.h" /* regexp_command */
#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 "../src/tty/key.h" /* XCTRL and ALT macros */
#include "setup.h" /* For loading/saving panel options */
#include "user.h"
#include "../src/mcconfig/mcconfig.h"

View File

@ -29,21 +29,23 @@
#include <sys/stat.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "../src/tty/key.h" /* For the externs */
#include "../src/tty/mouse.h" /* To make view.h happy */
#include "../src/tty/win.h" /* lookup_key */
#include "dir.h"
#include "panel.h"
#include "main.h"
#include "tree.h" /* xtree_mode */
#include "../src/mcconfig/mcconfig.h"
#include "setup.h"
#include "../src/tty/mouse.h" /* To make view.h happy */
#include "view.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"
#include "menu.h" /* menubar_visible declaration */
#include "win.h" /* lookup_key */
#include "cmd.h"
#include "file.h" /* safe_delete */

View File

@ -5,7 +5,10 @@ libmctty_la_SOURCES = \
key.c key.h keyxdef.c \
mouse.c mouse.h \
myslang.h slint.c \
tty.c tty.h
rxvt.c \
tty.c tty.h \
win.c win.h \
x11conn.c x11conn.h
libmctty_la_CFLAGS = -I../ -I$(top_srcdir)/src \
$(GLIB_CFLAGS) \

View File

@ -42,10 +42,10 @@
#include "../../src/tty/tty.h"
#include "../../src/tty/mouse.h"
#include "../../src/tty/key.h"
#include "../../src/tty/win.h"
#include "../../src/layout.h" /* winch_flag */
#include "../../src/main.h"
#include "../../src/win.h"
#include "../../src/layout.h" /* winch_flag */
#include "../../src/cons.saver.h"
#ifdef USE_VFS

View File

@ -29,9 +29,11 @@
#include <sys/types.h>
#include <unistd.h>
#include "global.h"
#include "../src/tty/tty.h" /* move, addch */
#include "cons.saver.h"
#include "../../src/global.h"
#include "../../src/tty/tty.h" /* move, addch */
#include "../../src/cons.saver.h"
static int rxvt_extensions = 0;
@ -119,4 +121,3 @@ void show_rxvt_contents (int starty, unsigned char y1, unsigned char y2)
}
g_free (k);
}

View File

@ -44,9 +44,9 @@
#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/tty/win.h" /* do_exit_ca_mode */
#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 */

View File

@ -29,23 +29,24 @@
#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"
#include "../../src/global.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 "../../src/tty/win.h"
#include "../../src/dialog.h"
#include "../../src/widget.h"
#include "../../src/layout.h"
#include "../../src/strutil.h"
/*
* Common handler for standard movement keys in a text area. Provided
* functions are called with the "data" argument. backfn and forfn also
* get an argument indicating how many lines to scroll. Return MSG_HANDLED if
* the key was handled, MSG_NOT_HANDLED otherwise.
* get an argument indicating how many lines to scroll. Return MSG_HANDLED
* if the key was handled, MSG_NOT_HANDLED otherwise.
*/
cb_ret_t
check_movement_keys (int key, int page_size, void *data, movefn backfn,

View File

@ -6,12 +6,13 @@
#ifndef MC_WIN_H
#define MC_WIN_H
#include "dialog.h" /* cb_ret_t */
#include "../../src/dialog.h" /* cb_ret_t */
/* Keys management */
typedef void (*movefn) (void *, int);
cb_ret_t check_movement_keys (int key, int page_size, void *data, movefn backfn,
movefn forfn, movefn topfn, movefn bottomfn);
cb_ret_t check_movement_keys (int key, int page_size, void *data,
movefn backfn, movefn forfn,
movefn topfn, movefn bottomfn);
int lookup_key (char *keyname);
/* Terminal management */

View File

@ -34,16 +34,13 @@ typedef int dummy; /* C99 forbids empty compilation unit */
#else
#include <setjmp.h>
#include <X11/Xlib.h>
#include "../src/global.h"
#ifdef HAVE_GMODULE
# include <gmodule.h>
#endif
#include "x11conn.h"
#include "../../src/global.h"
#include "../../src/tty/x11conn.h"
/*** file scope type declarations **************************************/

View File

@ -41,15 +41,18 @@
#include <unistd.h>
#include "global.h"
#include "../src/tty/win.h" /* xterm_flag */
#include "../src/search/search.h"
#include "main.h" /* mc_home */
#include "cmd.h" /* guess_message_value */
#include "mountlist.h"
#include "win.h" /* xterm_flag */
#include "timefmt.h"
#include "strutil.h"
#include "fileopctx.h"
#include "file.h" /* copy_file_file() */
#include "../src/search/search.h"
#ifdef HAVE_CHARSET
#include "charsets.h"

View File

@ -48,20 +48,22 @@
#include <unistd.h>
#include "global.h"
#include "../src/tty/tty.h"
#include "../src/tty/color.h"
#include "../src/tty/key.h" /* For mi_getch() */
#include "../src/tty/mouse.h"
#include "../src/tty/win.h"
#include "cmd.h" /* For view_other_cmd */
#include "dialog.h" /* Needed by widget.h */
#include "widget.h" /* Needed for buttonbar_new */
#include "../src/tty/color.h"
#include "../src/tty/mouse.h"
#include "help.h"
#include "../src/tty/key.h" /* For mi_getch() */
#include "layout.h"
#include "setup.h"
#include "wtools.h" /* For query_set_sel() */
#include "dir.h"
#include "panel.h" /* Needed for current_panel and other_panel */
#include "win.h"
#include "execute.h"
#include "main.h" /* slow_terminal */
#include "view.h"

View File

@ -46,6 +46,7 @@
#include "../src/tty/color.h"
#include "../src/tty/mouse.h"
#include "../src/tty/key.h" /* XCTRL and ALT macros */
#include "../src/tty/win.h"
#include "dialog.h"
#include "widget.h"