Some WIDGET-related stuff moved to lib/widget directory

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

configure.ac

@@ -598,8 +598,8 @@ lib/vfs/mc-vfs/extfs/ulha
 lib/vfs/mc-vfs/extfs/urar
 lib/vfs/mc-vfs/extfs/uzip
 lib/vfs/mc-vfs/extfs/uzoo
-
 lib/vfs/mc-vfs/fish/Makefile
+lib/widget/Makefile
 
 misc/syntax/Makefile
 

lib/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = filehighlight mcconfig search skin tty vfs strutil
+SUBDIRS = filehighlight mcconfig search skin tty vfs strutil widget
 
 noinst_LTLIBRARIES = libmc.la
 
@@ -41,4 +41,5 @@ libmc_la_LIBADD = \
 	strutil/libmcstrutil.la \
 	skin/libmcskin.la \
 	tty/libmctty.la \
-	vfs/mc-vfs/libvfs-mc.la
+	vfs/mc-vfs/libvfs-mc.la \
+	widget/libmcwidget.la

lib/lock.c

@@ -56,8 +56,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/util.h"           /* tilde_expand() */
 #include "lib/lock.h"
-
+#include "lib/widget/wtools.h"         /* query_dialog() */
-#include "src/wtools.h"         /* query_dialog() */
 
 /*** global variables ****************************************************************************/
 

lib/utilunix.c

@@ -54,9 +54,9 @@
 #include "lib/global.h"
 #include "lib/strutil.h"        /* str_move() */
 #include "lib/vfs/mc-vfs/vfs.h" /* VFS_ENCODING_PREFIX */
+#include "lib/widget/wtools.h"  /* message() */
 
 #include "src/execute.h"
-#include "src/wtools.h"         /* message() */
 #ifdef HAVE_CHARSET
 #include "src/charsets.h"
 #endif

lib/vfs/mc-vfs/cpio.c

@@ -31,8 +31,7 @@
 
 #include "lib/global.h"
 #include "lib/unixcompat.h"
-
+#include "lib/widget/wtools.h"  /* message() */
-#include "src/wtools.h"         /* message() */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/vfs/mc-vfs/direntry.c

@@ -41,8 +41,8 @@
 
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/util.h"           /* concat_dir_and_file */
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/extfs.c

@@ -48,8 +48,8 @@
 
 #include "lib/global.h"
 #include "lib/fileloc.h"
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* shell */
 #include "src/execute.h"        /* For shell_execute */
 

lib/vfs/mc-vfs/fish.c

@@ -62,8 +62,8 @@
 #include "lib/strescape.h"
 #include "lib/unixcompat.h"
 #include "lib/fileloc.h"
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/ftpfs.c

@@ -89,8 +89,8 @@ What to do with this?
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
 #include "src/history.h"
 #include "src/setup.h"          /* for load_anon_passwd */

lib/vfs/mc-vfs/sfs.c

@@ -42,8 +42,8 @@
 #include <fcntl.h>
 
 #include "lib/global.h"
+#include "lib/widget/wtools.h"  /* D_ERROR, D_NORMAL */
 
-#include "src/wtools.h"         /* D_ERROR, D_NORMAL */
 #include "src/main.h"           /* mc_home */
 #include "src/execute.h"        /* EXECUTE_AS_SHELL */
 

lib/vfs/mc-vfs/tar.c

@@ -41,8 +41,7 @@
 #endif
 
 #include "lib/global.h"
-
+#include "lib/widget/wtools.h"  /* message() */
-#include "src/wtools.h"         /* message() */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/vfs/mc-vfs/utilvfs.c

@@ -37,8 +37,8 @@
 
 #include "lib/global.h"
 #include "lib/unixcompat.h"
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "src/wtools.h"         /* message() */
 #include "src/history.h"
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/vfs.c

@@ -52,11 +52,11 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/widget/wtools.h"  /* message() */
 
 #ifdef HAVE_CHARSET
 #include "src/charsets.h"
 #endif
-#include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* cd_symlinks */
 
 #include "vfs-impl.h"

lib/widget/Makefile.am

@@ -0,0 +1,14 @@
+
+noinst_LTLIBRARIES = libmcwidget.la
+
+libmcwidget_la_SOURCES = \
+	dialog.c dialog.h \
+	dialog-switch.c dialog-switch.h \
+	menu.c menu.h \
+	widget.c widget.h \
+	wtools.c wtools.h
+
+libmcwidget_la_CFLAGS = -I$(top_srcdir) \
+	$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
+	-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" 
+

lib/widget/dialog-switch.c

@@ -31,12 +31,14 @@
 
 #include "dialog.h"
 #include "widget.h"
-#include "layout.h"             /* repaint_screen() */
-#include "main-widgets.h"       /* midnight_dlg */
-#include "main.h"               /* midnight_shutdown */
 #include "wtools.h"             /* Listbox */
 #include "dialog-switch.h"
 
+/* TODO: these includes should be removed! */
+#include "src/layout.h"             /* repaint_screen() */
+#include "src/main-widgets.h"       /* midnight_dlg */
+#include "src/main.h"               /* midnight_shutdown */
+
 
 /*** global variables ****************************************************************************/
 

lib/widget/dialog-switch.h

@@ -4,7 +4,6 @@
 
 #include <sys/types.h>
 
-
 /*** typedefs(not structures) and defined constants **********************************************/
 
 /*** enums ***************************************************************************************/

lib/widget/dialog.c

@@ -37,15 +37,17 @@
 #include "lib/tty/key.h"
 #include "lib/strutil.h"
 
-#include "help.h"               /* interactive_display() */
-#include "layout.h"
-#include "execute.h"            /* suspend_cmd() */
-#include "cmddef.h"
-#include "keybind.h"
-#include "main.h"               /* fast_refresh */
-#include "setup.h"              /* mouse_close_dialog */
 #include "dialog.h"
 
+/* TODO: these includes should be removed! */
+#include "src/help.h"               /* interactive_display() */
+#include "src/layout.h"
+#include "src/execute.h"            /* suspend_cmd() */
+#include "src/cmddef.h"
+#include "src/keybind.h"
+#include "src/main.h"               /* fast_refresh */
+#include "src/setup.h"              /* mouse_close_dialog */
+
 #include "dialog-switch.h"
 
 /*** global variables ****************************************************************************/

lib/widget/menu.c

@@ -34,13 +34,15 @@
 #include "lib/tty/key.h"        /* key macros */
 #include "lib/strutil.h"
 
-#include "cmddef.h"             /* CK_Ignore_Key */
-#include "help.h"
 #include "dialog.h"
 #include "widget.h"
-#include "main.h"               /* is_right */
 #include "menu.h"
 
+/* TODO: these includes should be removed! */
+#include "src/cmddef.h"             /* CK_Ignore_Key */
+#include "src/help.h"
+#include "src/main.h"               /* is_right */
+
 /*** global variables ****************************************************************************/
 
 int menubar_visible = 1;        /* This is the new default */

lib/widget/widget.c

@@ -56,12 +56,13 @@
 #include "widget.h"
 #include "wtools.h"
 
-#include "cmddef.h"             /* CK_ cmd name const */
+/* TODO: these includes should be removed! */
-#include "keybind.h"            /* global_keymap_t */
+#include "src/cmddef.h"             /* CK_ cmd name const */
-#include "panel.h"              /* current_panel */
+#include "src/keybind.h"            /* global_keymap_t */
-#include "main.h"               /* confirm_history_cleanup */
+#include "src/panel.h"              /* current_panel */
-#include "setup.h"              /* num_history_items_recorded */
+#include "src/main.h"               /* confirm_history_cleanup */
-#include "clipboard.h"          /* copy_file_to_ext_clip, paste_to_file_from_ext_clip */
+#include "src/setup.h"              /* num_history_items_recorded */
+#include "src/clipboard.h"          /* copy_file_to_ext_clip, paste_to_file_from_ext_clip */
 
 static void
 widget_selectcolor (Widget * w, gboolean focused, gboolean hotkey)

lib/widget/wtools.c

@@ -42,7 +42,9 @@
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
-#include "background.h"         /* parent_call */
+
+/* TODO: these includes should be removed! */
+#include "src/background.h"         /* parent_call */
 
 /*** global variables ****************************************************************************/
 

src/Makefile.am

@@ -54,13 +54,8 @@ mc_LDADD += ../lib/vfs/mc-vfs/samba/libsamba.a
 endif
 
 SRC_mc_widgets = \
-	dialog.c dialog.h \
-	dialog-switch.c dialog-switch.h \
-	menu.c menu.h \
-	screen.c panel.h \
 	tree.c tree.h \
-	widget.c widget.h \
+	screen.c panel.h
-	wtools.c wtools.h
 
 SRC_mc_conssaver = \
 	cons.handler.c consaver/cons.saver.h

src/achown.c

@@ -40,10 +40,9 @@
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
-
+#include "lib/widget/dialog.h"
-#include "dialog.h"
+#include "lib/widget/widget.h"
-#include "widget.h"
+#include "lib/widget/wtools.h"  /* For init_box_colors() */
-#include "wtools.h"             /* For init_box_colors() */
 
 #include "dir.h"
 #include "panel.h"              /* Needed for the externs */

src/background.c

@@ -44,8 +44,9 @@
 #include <fcntl.h>
 
 #include "lib/global.h"
+#include "lib/widget/wtools.h"
+
 #include "background.h"
-#include "wtools.h"
 #include "layout.h"             /* repaint_screen() */
 #include "fileopctx.h"          /* FileOpContext */
 #include "lib/tty/key.h"        /* add_select_channel(), delete_select_channel() */

src/boxes.c

@@ -50,9 +50,10 @@
 #include "lib/vfs/mc-vfs/smbfs.h"
 #endif /* ENABLE_VFS_SMB */
 
-#include "dialog.h"             /* The nice dialog manager */
+#include "lib/widget/dialog.h"  /* The nice dialog manager */
-#include "widget.h"             /* The widgets for the nice dialog manager */
+#include "lib/widget/widget.h"  /* The widgets for the nice dialog manager */
-#include "wtools.h"
+#include "lib/widget/wtools.h"
+
 #include "setup.h"              /* For profile_name */
 #include "command.h"            /* For cmdline */
 #include "dir.h"

src/chmod.c

@@ -37,10 +37,10 @@
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"  /* add_widget() */
+#include "lib/widget/widget.h"  /* NORMAL_BUTTON */
+#include "lib/widget/wtools.h"  /* message() */
 
-#include "dialog.h"             /* add_widget() */
-#include "widget.h"             /* NORMAL_BUTTON */
-#include "wtools.h"             /* message() */
 #include "panel.h"              /* do_file_mark() */
 #include "main.h"               /* update_panels() */
 #include "layout.h"             /* repaint_screen() */

src/chown.c

@@ -38,16 +38,15 @@
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
-
+#include "lib/widget/dialog.h"
-#include "dialog.h"
+#include "lib/widget/widget.h"
-#include "widget.h"
+#include "lib/widget/wtools.h"  /* init_box_colors() */
 
 /* Needed for the extern declarations of integer parameters */
 #include "chmod.h"
 #include "main.h"               /* update_panels() */
 #include "layout.h"             /* repaint_screen() */
 #include "chown.h"
-#include "wtools.h"             /* init_box_colors() */
 #include "setup.h"              /* panels_options */
 
 /*** global variables ****************************************************************************/

src/cmd.c

@@ -57,6 +57,9 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"  /* Widget */
+#include "lib/widget/dialog-switch.h"
+#include "lib/widget/wtools.h"  /* message() */
 
 #include "cmd.h"                /* Our definitions */
 #include "fileopctx.h"
@@ -66,9 +69,6 @@
 #include "tree.h"               /* tree_chdir() */
 #include "subshell.h"           /* use_subshell */
 #include "consaver/cons.saver.h"        /* console_flag */
-#include "dialog.h"             /* Widget */
-#include "dialog-switch.h"
-#include "wtools.h"             /* message() */
 #include "main.h"               /* change_panel() */
 #include "panel.h"              /* current_panel */
 #include "help.h"               /* interactive_display() */

src/command.c

@@ -36,17 +36,17 @@
 #include "lib/tty/tty.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strescape.h"
+#include "lib/skin.h"           /* DEFAULT_COLOR */
+#include "lib/widget/widget.h"  /* WInput */
+#include "lib/widget/wtools.h"  /* message () */
 
-#include "widget.h"             /* WInput */
 #include "command.h"
-#include "wtools.h"             /* message () */
 #include "panel.h"              /* view_tree enum. Also, needed by main.h */
 #include "main.h"               /* do_cd */
 #include "layout.h"             /* for command_prompt variable */
 #include "user.h"               /* expand_format */
 #include "subshell.h"           /* SUBSHELL_EXIT */
 #include "tree.h"               /* for tree_chdir */
-#include "lib/skin.h"           /* DEFAULT_COLOR */
 #include "execute.h"            /* shell_execute */
 
 /*** global variables ****************************************************************************/

src/command.h

@@ -5,7 +5,7 @@
 #ifndef MC__COMMAND_H
 #define MC__COMMAND_H
 
-#include "widget.h"
+#include "lib/widget/widget.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/complete.c

@@ -43,10 +43,10 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strescape.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
-#include "dialog.h"
-#include "widget.h"
-#include "wtools.h"
 #include "main.h"               /* show_all_if_ambiguous */
 
 /*** global variables ****************************************************************************/

src/diffviewer/internal.h

@@ -5,8 +5,7 @@
 #include "lib/mcconfig.h"
 #include "lib/search.h"
 #include "lib/tty/color.h"
-
+#include "lib/widget/widget.h"
-#include "src/widget.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/diffviewer/search.c

@@ -31,9 +31,9 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/tty/key.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/wtools.h"
 
-#include "src/dialog.h"
-#include "src/wtools.h"
 #include "src/history.h"
 #include "src/charsets.h"
 

src/diffviewer/ydiff.c

@@ -37,16 +37,15 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/color.h"
 #include "lib/tty/key.h"
-
 #include "lib/skin.h"           /* EDITOR_NORMAL_COLOR */
 #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
+#include "lib/widget/dialog.h"
+#include "lib/widget/wtools.h"
 
 #include "src/cmddef.h"
 #include "src/keybind.h"
 #include "src/cmd.h"
-#include "src/dialog.h"
 #include "src/help.h"
-#include "src/wtools.h"
 #include "src/charsets.h"
 #include "src/history.h"
 #include "src/panel.h"          /* Needed for current_panel and other_panel */

src/dir.c

@@ -33,8 +33,8 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fs.h"
 #include "lib/strutil.h"
+#include "lib/widget/wtools.h"
 
-#include "wtools.h"
 #include "treestore.h"
 #include "dir.h"
 #include "setup.h"              /* panels_options */

src/editor/choosesyntax.c

@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #include "lib/global.h"
-#include "src/wtools.h"
+#include "lib/widget/wtools.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/editor/edit-impl.h

@@ -33,7 +33,7 @@
 #include <stdio.h>
 
 #include "lib/search.h"         /* mc_search_type_t */
-#include "src/dialog.h"         /* cb_ret_t */
+#include "lib/widget/dialog.h"  /* cb_ret_t */
 #include "src/editor/edit.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/

src/editor/edit-widget.h

@@ -5,7 +5,7 @@
 #ifndef MC__EDIT_WIDGET_H
 #define MC__EDIT_WIDGET_H
 
-#include "src/dialog.h"         /* Widget */
+#include "lib/widget/dialog.h"  /* Widget */
 #include "lib/search.h"         /* mc_search_t */
 
 #include "edit-impl.h"

src/editor/edit.c

@@ -50,11 +50,11 @@
 #include "lib/util.h"           /* load_file_position(), save_file_position() */
 #include "lib/timefmt.h"        /* time formatting */
 #include "lib/lock.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"  /* query_dialog() */
 
-#include "src/widget.h"
 #include "src/cmd.h"            /* view_other_cmd() */
 #include "src/user.h"           /* user_menu_cmd() */
-#include "src/wtools.h"         /* query_dialog() */
 #include "src/charsets.h"       /* get_codepage_id */
 #include "src/main.h"           /* source_codepage */
 #include "src/setup.h"          /* option_tab_spacing */

src/editor/editcmd.c

@@ -54,14 +54,14 @@
 #include "lib/lock.h"
 #include "lib/util.h"           /* tilde_expand() */
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/widget.h"         /* listbox_new() */
+#include "lib/widget/wtools.h"         /* message() */
 
 #include "src/history.h"
-#include "src/widget.h"         /* listbox_new() */
 #include "src/layout.h"         /* clr_scr() */
 #include "src/main.h"           /* mc_home, midnight_shutdown */
 #include "src/setup.h"          /* option_tab_spacing */
 #include "src/help.h"           /* interactive_display() */
-#include "src/wtools.h"         /* message() */
 #include "src/charsets.h"
 #include "src/selcodepage.h"
 #include "src/cmddef.h"

src/editor/editcmd_dialogs.c

@@ -32,10 +32,10 @@
 #include "lib/tty/key.h"
 #include "lib/search.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
-#include "src/dialog.h"
-#include "src/widget.h"
-#include "src/wtools.h"
 #include "src/main.h"
 #include "src/history.h"
 #include "src/charsets.h"

src/editor/editdraw.c

@@ -43,8 +43,8 @@
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/skin.h"
 #include "lib/strutil.h"        /* utf string functions */
+#include "lib/widget/widget.h"  /* buttonbar_redraw() */
 
-#include "src/widget.h"         /* buttonbar_redraw() */
 #include "src/charsets.h"
 #include "src/main.h"           /* source_codepage */
 #include "src/setup.h"          /* edit_tab_spacing */

src/editor/editmenu.c

@@ -43,10 +43,10 @@
 
 #include "lib/tty/tty.h"        /* KEY_F */
 #include "lib/tty/key.h"        /* XCTRL */
+#include "lib/widget/dialog.h"  /* cb_ret_t */
+#include "lib/widget/menu.h"    /* menu_entry */
 
-#include "src/menu.h"           /* menu_entry */
 #include "src/main.h"           /* drop_menus */
-#include "src/dialog.h"         /* cb_ret_t */
 #include "src/cmddef.h"
 
 #include "edit-impl.h"

src/editor/editoptions.c

@@ -32,11 +32,11 @@
 #include <stdlib.h>             /* atoi(), NULL */
 
 #include "lib/global.h"
+#include "lib/widget/dialog.h"  /* B_CANCEL */
+#include "lib/widget/wtools.h"  /* QuickDialog */
 
 #include "edit-widget.h"
 #include "edit-impl.h"
-#include "src/dialog.h"         /* B_CANCEL */
-#include "src/wtools.h"         /* QuickDialog */
 #include "src/setup.h"          /* option_tab_spacing */
 
 /*** global variables ****************************************************************************/

src/editor/editwidget.c

@@ -44,13 +44,13 @@
 #include "lib/tty/tty.h"        /* LINES, COLS */
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/strutil.h"        /* str_term_trim() */
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"  /* ButtonBar */
+#include "lib/widget/menu.h"    /* menubar_new() */
 
 #include "edit-impl.h"
 #include "edit-widget.h"
 
-#include "src/dialog.h"
-#include "src/widget.h"         /* ButtonBar */
-#include "src/menu.h"           /* menubar_new() */
 #include "src/cmddef.h"
 #include "src/keybind.h"
 

src/editor/syntax.c

@@ -52,9 +52,9 @@
 #include "lib/search.h"         /* search engine */
 #include "lib/skin.h"
 #include "lib/strutil.h"        /* utf string functions */
+#include "lib/widget/wtools.h"  /* message() */
 
 #include "src/main.h"           /* mc_home */
-#include "src/wtools.h"         /* message() */
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/execute.c

@@ -30,13 +30,13 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/tty/win.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/wtools.h"
 
 #include "main.h"
 #include "consaver/cons.saver.h"
 #include "subshell.h"
 #include "layout.h"             /* use_dash() */
-#include "dialog.h"
-#include "wtools.h"
 #include "panel.h"              /* update_panels() */
 #include "execute.h"
 #include "lib/vfs/mc-vfs/vfs.h"

src/ext.c

@@ -41,10 +41,11 @@
 #include "viewer/mcviewer.h"
 
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/wtools.h"
+#include "lib/widget/dialog-switch.h"
 
 #include "user.h"
 #include "main.h"
-#include "wtools.h"
 #include "execute.h"
 #include "history.h"
 #include "layout.h"
@@ -52,7 +53,6 @@
 #include "charsets.h"           /* get_codepage_index */
 #include "selcodepage.h"        /* do_set_codepage */
 #endif
-#include "dialog-switch.h"
 #include "ext.h"
 
 /*** global variables ****************************************************************************/

src/file.c

@@ -62,14 +62,13 @@
 #include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
 #include "setup.h"
-#include "dialog.h"
-#include "widget.h"
 #include "main.h"
 #include "layout.h"             /* rotate_dash() */
-#include "widget.h"
-#include "wtools.h"
 #include "background.h"         /* we_are_background */
 
 /* Needed for current_panel, other_panel and WTree */

src/file.h

@@ -9,8 +9,9 @@
 #include <sys/time.h>
 
 #include "lib/global.h"
-#include "dialog.h"             /* Dlg_head */
+#include "lib/widget/dialog.h"  /* Dlg_head */
-#include "widget.h"             /* WLabel */
+#include "lib/widget/widget.h"  /* WLabel */
+
 #include "fileopctx.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/

src/filegui.c

@@ -85,13 +85,13 @@
 #include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/timefmt.h"        /* file_date() */
+#include "lib/widget/dialog.h"             /* do_refresh() */
+#include "lib/widget/widget.h"             /* WLabel */
+#include "lib/widget/wtools.h"             /* QuickDialog */
 
 #include "setup.h"              /* verbose */
-#include "dialog.h"             /* do_refresh() */
-#include "widget.h"             /* WLabel */
 #include "main-widgets.h"
 #include "main.h"               /* the_hint */
-#include "wtools.h"             /* QuickDialog */
 #include "panel.h"              /* current_panel */
 #include "fileopctx.h"          /* FILE_CONT */
 #include "filegui.h"

src/find.c

@@ -42,14 +42,14 @@
 #include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
 #include "setup.h"              /* verbose */
-#include "dialog.h"
-#include "widget.h"
 #include "dir.h"
 #include "panel.h"              /* current_panel */
 #include "main.h"               /* do_cd, try_to_select */
-#include "wtools.h"
 #include "cmd.h"                /* view_file_at_line */
 #include "boxes.h"
 #include "history.h"            /* MC_HISTORY_SHARED_SEARCH */

src/help.c

@@ -58,10 +58,10 @@
 #include "lib/skin.h"
 #include "lib/strutil.h"
 #include "lib/fileloc.h"
+#include "lib/widget/dialog.h"  /* For Dlg_head */
+#include "lib/widget/widget.h"  /* For Widget */
+#include "lib/widget/wtools.h"  /* For common_dialog_repaint() */
 
-#include "dialog.h"             /* For Dlg_head */
-#include "widget.h"             /* For Widget */
-#include "wtools.h"             /* For common_dialog_repaint() */
 #include "cmddef.h"
 #include "keybind.h"
 #include "help.h"

src/hotlist.c

@@ -49,11 +49,11 @@
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"  /* QuickDialog */
 
-#include "dialog.h"
-#include "widget.h"
 #include "setup.h"              /* For profile_bname */
-#include "wtools.h"             /* QuickDialog */
 #include "panel.h"              /* current_panel */
 #include "main.h"               /* update_panels() */
 #include "layout.h"             /* repaint_screen() */

src/info.c

@@ -33,12 +33,12 @@
 #include "lib/skin.h"
 #include "lib/strutil.h"
 #include "lib/timefmt.h"        /* file_date() */
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"  /* default_proc */
+#include "lib/widget/menu.h"    /* menubar_visible */
 
-#include "dialog.h"
-#include "widget.h"             /* default_proc */
 #include "main-widgets.h"       /* the_menubar */
 #include "panel.h"              /* for the panel structure */
-#include "menu.h"               /* menubar_visible */
 #include "layout.h"
 #include "mountlist.h"
 #include "setup.h"              /* panels_options */

src/keybind.c

@@ -39,9 +39,9 @@
 #include "lib/tty/key.h"        /* KEY_M_ */
 #include "lib/tty/tty.h"        /* keys */
 #include "lib/strutil.h"
+#include "lib/widget/wtools.h"
 
 #include "cmddef.h"             /* CK_ cmd name const */
-#include "wtools.h"
 #include "keybind.h"
 
 /*** global variables ****************************************************************************/

src/layout.c

@@ -53,16 +53,16 @@
 #include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h" /* For vfs_translate_url() */
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/dialog-switch.h"   /* dialog_switch_got_winch() */
+#include "lib/widget/widget.h"
+#include "lib/widget/menu.h"
 
-#include "dialog.h"
-#include "dialog-switch.h"      /* dialog_switch_got_winch() */
-#include "widget.h"
 #include "command.h"
 #include "main-widgets.h"
 #include "main.h"
 #include "subshell.h"           /* For use_subshell and resize_subshell() */
 #include "tree.h"
-#include "menu.h"
 #include "background.h"         /* we_are_background */
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"

src/layout.h

@@ -6,8 +6,9 @@
 #define MC__LAYOUT_H
 
 #include "lib/global.h"
+#include "lib/widget/widget.h"
+
 #include "panel.h"
-#include "widget.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/learn.c

@@ -41,13 +41,13 @@
 #include "lib/mcconfig.h"       /* Save profile */
 #include "lib/strescape.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
-#include "dialog.h"
-#include "widget.h"
 #include "setup.h"
 #include "layout.h"             /* repaint_screen() */
 #include "learn.h"
-#include "wtools.h"
 
 /*** global variables ****************************************************************************/
 

src/listmode.c

@@ -36,12 +36,13 @@
 #include <unistd.h>
 
 #include "lib/global.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
+
 #include "tty.h"
 #include "key.h"
 #include "color.h"
-#include "dialog.h"
-#include "widget.h"
-#include "wtools.h"
 
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"

src/main-widgets.h

@@ -5,8 +5,8 @@
 #ifndef MC__MAIN_WIDGETS_H
 #define MC__MAIN_WIDGETS_H
 
-#include "widget.h"
+#include "lib/widget/widget.h"
-#include "dialog.h"
+#include "lib/widget/dialog.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/main.c

@@ -56,10 +56,14 @@
 #include "lib/vfs/mc-vfs/smbfs.h"       /* smbfs_set_debug() */
 #endif /* ENABLE_VFS_SMB */
 
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
+#include "lib/widget/menu.h"
+#include "lib/widget/dialog-switch.h"
+
 #include "args.h"
 #include "dir.h"
-#include "dialog.h"
-#include "menu.h"
 #include "panel.h"
 #include "option.h"
 #include "tree.h"
@@ -76,12 +80,9 @@
 #include "listmode.h"
 #include "execute.h"
 #include "ext.h"                /* For flush_extension_file() */
-#include "widget.h"
 #include "command.h"
-#include "wtools.h"
 #include "cmddef.h"             /* CK_ cmd name const */
 #include "user.h"               /* user_file_menu_cmd() */
-#include "dialog-switch.h"
 
 #include "chmod.h"
 #include "chown.h"

src/option.c

@@ -35,14 +35,14 @@
 #include "lib/mcconfig.h"       /* mc_config_save_file() */
 #include "lib/strutil.h"        /* str_term_width1() */
 #include "lib/tty/key.h"        /* old_esc_mode_timeout */
+#include "lib/widget/dialog.h" /* B_ constants */
+#include "lib/widget/widget.h" /* WCheck */
+#include "lib/widget/wtools.h" /* QuickDialog */
 
-#include "dialog.h"             /* B_ constants */
-#include "widget.h"             /* WCheck */
 #include "setup.h"              /* panels_options */
 #include "main.h"
 #include "file.h"               /* file_op_compute_totals */
 #include "layout.h"             /* nice_rotating_dash */
-#include "wtools.h"             /* QuickDialog */
 #include "history.h"            /* MC_HISTORY_ESC_TIMEOUT */
 
 #include "option.h"

src/panel.h

@@ -8,9 +8,9 @@
 #include "lib/global.h"         /* gboolean */
 #include "lib/fs.h"             /* MC_MAXPATHLEN */
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"  /* Widget */
 
 #include "dir.h"                /* dir_list */
-#include "dialog.h"             /* Widget */
 #include "main.h"               /* cd_enum */
 
 /*** typedefs(not structures) and defined constants **********************************************/

src/panelize.c

@@ -39,10 +39,10 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/mcconfig.h"       /* Load/save directories panelize */
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"  /* For common_dialog_repaint() */
 
-#include "dialog.h"
-#include "widget.h"
-#include "wtools.h"             /* For common_dialog_repaint() */
 #include "setup.h"              /* For profile_bname */
 #include "dir.h"
 #include "panel.h"              /* current_panel */

src/screen.c

@@ -43,6 +43,9 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/unixcompat.h"
 #include "lib/timefmt.h"
+#include "lib/widget/wtools.h"  /* for message (...) */
+#include "lib/widget/widget.h"
+#include "lib/widget/menu.h"    /* menubar_visible */
 
 #include "dir.h"
 #include "panel.h"
@@ -50,14 +53,11 @@
 #include "tree.h"
 #include "ext.h"                /* regexp_command */
 #include "layout.h"             /* Most layout variables are here */
-#include "wtools.h"             /* for message (...) */
 #include "cmd.h"
 #include "command.h"            /* cmdline */
 #include "setup.h"              /* For loading/saving panel options */
 #include "user.h"
 #include "execute.h"
-#include "widget.h"
-#include "menu.h"               /* menubar_visible */
 #include "main-widgets.h"
 #include "main.h"
 #include "mountlist.h"          /* my_statfs */

src/selcodepage.c

@@ -29,9 +29,10 @@
 #include <stdlib.h>
 
 #include "lib/global.h"
-#include "dialog.h"
+#include "lib/widget/dialog.h"
-#include "widget.h"
+#include "lib/widget/widget.h"
-#include "wtools.h"
+#include "lib/widget/wtools.h"
+
 #include "charsets.h"
 #include "selcodepage.h"
 #include "main.h"

src/setup.c

@@ -45,6 +45,9 @@
 #include "lib/vfs/mc-vfs/fish.h"
 #endif
 
+#include "lib/widget/wtools.h"
+#include "lib/widget/menu.h"    /* menubar_visible declaration */
+
 #include "args.h"
 #include "dir.h"
 #include "panel.h"
@@ -53,11 +56,9 @@
 #include "hotlist.h"            /* load/save/done hotlist */
 #include "panelize.h"           /* load/save/done panelize */
 #include "layout.h"
-#include "menu.h"               /* menubar_visible declaration */
 #include "cmd.h"
 #include "file.h"               /* safe_delete */
 #include "keybind.h"            /* lookup_action */
-#include "wtools.h"
 
 #ifdef HAVE_CHARSET
 #include "charsets.h"

src/setup.h

@@ -8,7 +8,7 @@
 #include <config.h>
 
 #include "lib/global.h"         /* GError */
-#include "panel.h"              /* WPanel, panel_view_mode_t */
+#include "panel.h"  /* WPanel, panel_view_mode_t */
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/subshell.c

@@ -53,9 +53,9 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 #include "lib/fileloc.h"
+#include "lib/widget/wtools.h"  /* query_dialog() */
 
 #include "panel.h"              /* current_panel */
-#include "wtools.h"             /* query_dialog() */
 #include "main.h"               /* do_update_prompt() */
 #include "consaver/cons.saver.h"        /* handle_console() */
 #include "subshell.h"

src/tree.c

@@ -48,15 +48,15 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
+#include "lib/widget/wtools.h"  /* message() */
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/menu.h"    /* menubar_visible */
 
-#include "wtools.h"             /* message() */
 #include "dir.h"
-#include "dialog.h"
-#include "widget.h"
 #include "panel.h"
 #include "main.h"
 #include "main-widgets.h"       /* the_menubar */
-#include "menu.h"               /* menubar_visible */
 #include "file.h"               /* copy_dir_dir(), move_dir_dir(), erase_dir() */
 #include "layout.h"             /* command_prompt */
 #include "help.h"

src/user.c

@@ -34,6 +34,10 @@
 #include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/dialog-switch.h"
+#include "lib/widget/widget.h"
+#include "lib/widget/wtools.h"
 
 #include "src/editor/edit.h"    /* WEdit, BLOCK_FILE */
 #include "src/viewer/mcviewer.h"        /* for default_* externs */
@@ -47,11 +51,6 @@
 #include "setup.h"
 #include "history.h"
 
-#include "dialog.h"
-#include "dialog-switch.h"
-#include "widget.h"
-#include "wtools.h"
-
 /*** global variables ****************************************************************************/
 
 /*** file scope macro definitions ****************************************************************/

src/viewer/actions_cmd.c

@@ -54,11 +54,11 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/lock.h"           /* lock_file() */
+#include "lib/widget/dialog.h"  /* cb_ret_t */
+#include "lib/widget/wtools.h"
 
-#include "src/dialog.h"         /* cb_ret_t */
 #include "src/panel.h"
 #include "src/layout.h"
-#include "src/wtools.h"
 #include "src/history.h"
 #include "src/charsets.h"
 #include "src/cmd.h"

src/viewer/datasource.c

@@ -57,7 +57,7 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "src/wtools.h"
+#include "lib/widget/wtools.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 
 #include "internal.h"

src/viewer/dialogs.c

@@ -43,8 +43,8 @@
 #include "lib/global.h"
 #include "lib/search.h"
 #include "lib/strutil.h"
+#include "lib/widget/wtools.h"
 
-#include "src/wtools.h"
 #include "src/history.h"
 #include "src/charsets.h"
 

src/viewer/display.c

@@ -43,9 +43,9 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/strutil.h"
+#include "lib/widget/dialog.h"  /* Dlg_head */
+#include "lib/widget/widget.h"  /* WButtonBar */
 
-#include "src/dialog.h"         /* Dlg_head */
-#include "src/widget.h"         /* WButtonBar */
 #include "src/charsets.h"
 #include "src/setup.h"          /* panels_options */
 #include "src/main.h"           /* source_codepage */

src/viewer/growbuf.c

@@ -39,8 +39,7 @@
 #include <errno.h>
 
 #include "lib/global.h"
-#include "src/wtools.h"
+#include "lib/widget/wtools.h"
-
 #include "lib/vfs/mc-vfs/vfs.h"
 
 #include "internal.h"

src/viewer/hex.c

@@ -45,9 +45,9 @@
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/wtools.h"
 
 #include "src/main.h"
-#include "src/wtools.h"
 #include "src/charsets.h"
 
 #include "internal.h"

src/viewer/internal.h

@@ -8,9 +8,9 @@
 #include "lib/global.h"
 
 #include "lib/search.h"
+#include "lib/widget/dialog.h"
+#include "lib/widget/widget.h"
 
-#include "src/dialog.h"
-#include "src/widget.h"
 #include "src/keybind.h"        /* global_keymap_t */
 
 /*** typedefs(not structures) and defined constants **********************************************/

src/viewer/lib.c

@@ -45,8 +45,8 @@
 #include "lib/strutil.h"
 #include "lib/util.h"           /* save_file_position() */
 #include "lib/lock.h"           /* unlock_file() */
+#include "lib/widget/wtools.h"
 
-#include "src/wtools.h"
 #include "src/main.h"
 #include "src/charsets.h"
 #include "src/selcodepage.h"

src/viewer/mcviewer.c

@@ -45,12 +45,12 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 #include "lib/util.h"           /* load_file_position() */
+#include "lib/widget/widget.h"
+#include "lib/widget/menu.h"    /* menubar_visible */
 
 #include "src/main.h"
 #include "src/charsets.h"
 #include "src/main-widgets.h"   /* the_menubar */
-#include "src/menu.h"           /* menubar_visible */
-#include "src/widget.h"
 
 #include "internal.h"
 #include "mcviewer.h"

src/viewer/search.c

@@ -38,9 +38,11 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "src/setup.h"
+#include "lib/widget/wtools.h"
-#include "src/wtools.h"
 #include "lib/tty/tty.h"
+
+#include "src/setup.h"
+
 #include "internal.h"
 
 /*** global variables ****************************************************************************/