Moved filemanager-related stuff to src/filemanager directory

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

configure.ac

@@ -561,6 +561,7 @@ src/editor/Makefile
 src/man2hlp/Makefile
 src/viewer/Makefile
 src/diffviewer/Makefile
+src/filemanager/Makefile
 
 lib/Makefile
 lib/filehighlight/Makefile

lib/filehighlight.h

@@ -3,7 +3,8 @@
 
 #include "lib/mcconfig.h"
 #include "lib/search.h"
-#include "src/dir.h"
+
+#include "src/filemanager/dir.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/fs.h

@@ -16,33 +16,33 @@
 
 /* Replacement for permission bits missing in sys/stat.h */
 #ifndef S_ISLNK
-#   define S_ISLNK(x) 0
+#define S_ISLNK(x) 0
 #endif
 
 #ifndef S_ISSOCK
-#   define S_ISSOCK(x) 0
+#define S_ISSOCK(x) 0
 #endif
 
 #ifndef S_ISFIFO
-#   define S_ISFIFO(x) 0
+#define S_ISFIFO(x) 0
 #endif
 
 #ifndef S_ISCHR
-#   define S_ISCHR(x) 0
+#define S_ISCHR(x) 0
 #endif
 
 #ifndef S_ISBLK
-#   define S_ISBLK(x) 0
+#define S_ISBLK(x) 0
 #endif
 
 /* Door is something that only exists on Solaris */
 #ifndef S_ISDOOR
-#   define S_ISDOOR(x) 0
+#define S_ISDOOR(x) 0
 #endif
 
 /* Special named files are widely used in QNX6 */
 #ifndef S_ISNAM
-#   define S_ISNAM(x) 0
+#define S_ISNAM(x) 0
 #endif
 
 #ifndef PATH_MAX
@@ -58,9 +58,9 @@
 #endif
 
 #ifndef MAXPATHLEN
-#   define MC_MAXPATHLEN 4096
+#define MC_MAXPATHLEN 4096
 #else
-#   define MC_MAXPATHLEN MAXPATHLEN
+#define MC_MAXPATHLEN MAXPATHLEN
 #endif
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
@@ -68,9 +68,9 @@
 #define DIRENT_LENGTH_COMPUTED 1
 
 #ifndef MAXNAMLEN
-#   define MC_MAXFILENAMELEN 256
+#define MC_MAXFILENAMELEN 256
 #else
-#   define MC_MAXFILENAMELEN MAXNAMLEN
+#define MC_MAXFILENAMELEN MAXNAMLEN
 #endif
 
 /*** enums ***************************************************************************************/

lib/keybind/keymap.c

@@ -1,2 +0,0 @@
-
-

lib/tty/key.c

@@ -49,7 +49,7 @@
 #include "win.h"                /* xterm_flag */
 
 #include "src/main.h"
-#include "src/layout.h"         /* winch_flag, mc_refresh() */
+#include "src/filemanager/layout.h"     /* winch_flag, mc_refresh() */
 #include "src/consaver/cons.saver.h"
 
 

lib/util.c

@@ -48,8 +48,8 @@
 #include "lib/strutil.h"
 #include "lib/util.h"
 
-#include "src/filegui.h"
-#include "src/file.h"           /* copy_file_file() */
+#include "src/filemanager/filegui.h"
+#include "src/filemanager/file.h"       /* copy_file_file() */
 #include "src/main.h"           /* home_dir, eight_bit_clean */
 
 /*** global variables ****************************************************************************/

lib/util.h

@@ -166,10 +166,10 @@ GList *list_append_unique (GList * list, char *text);
 /* Position saving and restoring */
 /* Load position for the given filename */
 void load_file_position (const char *filename, long *line, long *column, off_t * offset,
-                         GArray **bookmarks);
+                         GArray ** bookmarks);
 /* Save position for the given filename */
 void save_file_position (const char *filename, long line, long column, off_t offset,
-                         GArray *bookmarks);
+                         GArray * bookmarks);
 
 
 /* if ch is in [A-Za-z], returns the corresponding control character,

lib/vfs/mc-vfs/direntry.c

@@ -45,7 +45,7 @@
 #include "lib/widget.h"         /* message() */
 #endif
 
-#include "src/layout.h"           /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/vfs/mc-vfs/fish.c

@@ -62,7 +62,7 @@
 #include "lib/unixcompat.h"
 #include "lib/fileloc.h"
 
-#include "src/layout.h"         /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 #include "src/execute.h"        /* pre_exec, post_exec */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/ftpfs.c

@@ -92,7 +92,7 @@ What to do with this?
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/widget.h"         /* message() */
 
-#include "src/layout.h"         /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 #include "src/history.h"
 #include "src/setup.h"          /* for load_anon_passwd */
 

lib/vfs/mc-vfs/gc.c

@@ -44,8 +44,8 @@
 
 #include "lib/global.h"
 
-#include "src/midnight.h"       /* current_panel */
-#include "src/layout.h"         /* get_current_type(), get_other_type() */
+#include "src/filemanager/midnight.h"   /* current_panel */
+#include "src/filemanager/layout.h"     /* get_current_type(), get_other_type() */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/vfs/mc-vfs/tar.c

@@ -385,12 +385,12 @@ tar_fill_stat (struct vfs_s_super *archive, struct stat *st, union record *heade
     case TAR_GNU:
         st->st_uid =
             *header->header.uname ? vfs_finduid (header->header.uname) : tar_from_oct (8,
-                                                                                       header->header.
-                                                                                       uid);
+                                                                                       header->
+                                                                                       header.uid);
         st->st_gid =
             *header->header.gname ? vfs_findgid (header->header.gname) : tar_from_oct (8,
-                                                                                       header->header.
-                                                                                       gid);
+                                                                                       header->
+                                                                                       header.gid);
         switch (header->header.linkflag)
         {
         case LF_BLK:

lib/vfs/mc-vfs/undelfs.c

@@ -59,7 +59,7 @@
 #include "lib/global.h"
 
 #include "lib/widget.h"         /* message() */
-#include "src/layout.h"         /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 #include "utilvfs.h"
 #include "vfs-impl.h"
 

lib/vfs/mc-vfs/vfs.c

@@ -58,7 +58,7 @@
 #ifdef HAVE_CHARSET
 #include "lib/charsets.h"
 #endif
-#include "src/setup.h"           /* cd_symlinks */
+#include "src/setup.h"          /* cd_symlinks */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/widget.h

@@ -4,7 +4,7 @@
 #ifndef MC__WIDGET_H
 #define MC__WIDGET_H
 
-#include "lib/global.h"                 /* GLib */
+#include "lib/global.h"         /* GLib */
 
 /* main forward declarations */
 struct Widget;

lib/widget/button.h

@@ -18,9 +18,9 @@ typedef int (*bcback_fn) (struct WButton * button, int action);
 
 typedef enum
 {
-    HIDDEN_BUTTON  = 0,
-    NARROW_BUTTON  = 1,
-    NORMAL_BUTTON  = 2,
+    HIDDEN_BUTTON = 0,
+    NARROW_BUTTON = 1,
+    NORMAL_BUTTON = 2,
     DEFPUSH_BUTTON = 3
 } button_flags_t;
 

lib/widget/check.h

@@ -18,8 +18,8 @@
 typedef struct WCheck
 {
     Widget widget;
-    unsigned int state;  /* check button state */
-    hotkey_t text;       /* text of check button */
+    unsigned int state;         /* check button state */
+    hotkey_t text;              /* text of check button */
 } WCheck;
 
 /*** global variables defined in .c file *********************************************************/

lib/widget/dialog-switch.c

@@ -31,9 +31,9 @@
 #include "lib/widget.h"
 
 /* TODO: these includes should be removed! */
-#include "src/layout.h"             /* repaint_screen() */
-#include "src/midnight.h"           /* midnight_dlg */
-#include "src/main.h"               /* midnight_shutdown */
+#include "src/filemanager/layout.h"     /* repaint_screen() */
+#include "src/filemanager/midnight.h"   /* midnight_dlg */
+#include "src/main.h"           /* midnight_shutdown */
 
 /*** global variables ****************************************************************************/
 

lib/widget/dialog.c

@@ -39,9 +39,9 @@
 #include "lib/widget.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/help.h"           /* interactive_display() */
+#include "src/filemanager/layout.h"
+#include "src/execute.h"        /* suspend_cmd() */
 #include "src/keybind-defaults.h"
 
 /*** global variables ****************************************************************************/

lib/widget/dialog.h

@@ -237,7 +237,7 @@ dlg_widget_active (void *w)
 
 
 static inline unsigned int
-dlg_get_current_widget_id (const struct Dlg_head * h)
+dlg_get_current_widget_id (const struct Dlg_head *h)
 {
     return ((Widget *) h->current->data)->id;
 }

lib/widget/history.c

@@ -50,7 +50,7 @@
 #include "lib/widget.h"
 
 /* TODO: these includes should be removed! */
-#include "src/setup.h"              /* num_history_items_recorded */
+#include "src/setup.h"          /* num_history_items_recorded */
 
 /*** global variables ****************************************************************************/
 

lib/widget/history.h

@@ -17,10 +17,10 @@
 /*** declarations of public functions ************************************************************/
 
 GList *history_get (const char *input_name);
-void history_put (const char *input_name, GList *h);
+void history_put (const char *input_name, GList * h);
 /* for repositioning of history dialog we should pass widget to this
  * function, as position of history dialog depends on widget's position */
-char *history_show (GList **history, Widget *widget);
+char *history_show (GList ** history, Widget * widget);
 
 /*** inline functions ****************************************************************************/
 

lib/widget/input.c

@@ -51,7 +51,7 @@
 #include "lib/widget.h"
 
 #include "src/main.h"           /* home_dir */
-#include "src/midnight.h"       /* current_panel */
+#include "src/filemanager/midnight.h"   /* current_panel */
 #include "src/clipboard.h"      /* copy_file_to_ext_clip, paste_to_file_from_ext_clip */
 #include "src/keybind-defaults.h"   /* input_map */
 
@@ -1149,7 +1149,7 @@ input_handle_char (WInput * in, int key)
         input_execute_cmd (in, command);
         v = MSG_HANDLED;
         if (in->first)
-            input_update (in, TRUE); /* needed to clear in->first */
+            input_update (in, TRUE);    /* needed to clear in->first */
     }
 
     input_update (in, TRUE);
@@ -1197,7 +1197,7 @@ input_insert (WInput * in, const char *text, gboolean insert_extra_space)
 {
     input_disable_update (in);
     while (*text != '\0')
-        input_handle_char (in, (unsigned char) *text++);      /* unsigned extension char->int */
+        input_handle_char (in, (unsigned char) *text++);        /* unsigned extension char->int */
     if (insert_extra_space)
         input_handle_char (in, ' ');
     input_enable_update (in);

lib/widget/input.h

@@ -44,24 +44,24 @@ typedef int input_colors_t[WINPUTC_COUNT_COLORS];
 typedef struct
 {
     Widget widget;
-    int point;                          /* cursor position in the input line in characters */
-    int mark;                           /* the mark position in characters */
-    gboolean highlight;                 /* there is a selected block */
-    int term_first_shown;               /* column of the first shown character */
-    size_t current_max_size;            /* maximum length of input line (bytes) */
-    int field_width;                    /* width of the editing field */
+    int point;                  /* cursor position in the input line in characters */
+    int mark;                   /* the mark position in characters */
+    gboolean highlight;         /* there is a selected block */
+    int term_first_shown;       /* column of the first shown character */
+    size_t current_max_size;    /* maximum length of input line (bytes) */
+    int field_width;            /* width of the editing field */
     input_colors_t color;
-    gboolean first;                     /* is first keystroke? */
-    int disable_update;                 /* do we want to skip updates? */
-    gboolean is_password;               /* is this a password input line? */
-    char *buffer;                       /* pointer to editing buffer */
-    GList *history;                     /* the history */
-    gboolean need_push;                      /* need to push the current Input on hist? */
-    char **completions;                 /* possible completions array */
+    gboolean first;             /* is first keystroke? */
+    int disable_update;         /* do we want to skip updates? */
+    gboolean is_password;       /* is this a password input line? */
+    char *buffer;               /* pointer to editing buffer */
+    GList *history;             /* the history */
+    gboolean need_push;         /* need to push the current Input on hist? */
+    char **completions;         /* possible completions array */
     input_complete_t completion_flags;
-    char *history_name;                 /* name of history for loading and saving */
-    char charbuf[MB_LEN_MAX];           /* buffer for multibytes characters */
-    size_t charpoint;                   /* point to end of mulibyte sequence in charbuf */
+    char *history_name;         /* name of history for loading and saving */
+    char charbuf[MB_LEN_MAX];   /* buffer for multibytes characters */
+    size_t charpoint;           /* point to end of mulibyte sequence in charbuf */
 } WInput;
 
 /*** global variables defined in .c file *********************************************************/
@@ -74,7 +74,7 @@ WInput *input_new (int y, int x, const int *input_colors,
                    int len, const char *text, const char *histname,
                    input_complete_t completion_flags);
 /* callbac is public; needed for command line */
-cb_ret_t input_callback (Widget *w, widget_msg_t msg, int parm);
+cb_ret_t input_callback (Widget * w, widget_msg_t msg, int parm);
 const int *input_get_default_colors (void);
 void input_set_origin (WInput * i, int x, int field_width);
 cb_ret_t input_handle_char (WInput * in, int key);

lib/widget/label.h

@@ -12,11 +12,12 @@
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-typedef struct {
+typedef struct
+{
     Widget widget;
-    gboolean auto_adjust_cols;	/* compute widget.cols from strlen(text)? */
+    gboolean auto_adjust_cols;  /* compute widget.cols from strlen(text)? */
     char *text;
-    gboolean transparent;		/* Paint in the default color fg/bg */
+    gboolean transparent;       /* Paint in the default color fg/bg */
 } WLabel;
 
 /*** global variables defined in .c file *********************************************************/
@@ -24,8 +25,8 @@ typedef struct {
 /*** declarations of public functions ************************************************************/
 
 WLabel *label_new (int y, int x, const char *text);
-void label_set_text (WLabel *label, const char *text);
+void label_set_text (WLabel * label, const char *text);
 
 /*** inline functions ****************************************************************************/
 
-#endif  /* MC__WIDGET_LABEL_H */
+#endif /* MC__WIDGET_LABEL_H */

lib/widget/listbox.c

@@ -122,7 +122,9 @@ listbox_draw (WListbox * l, gboolean focused)
     const Dlg_head *h = l->widget.owner;
     const gboolean disabled = (((Widget *) l)->options & W_DISABLED) != 0;
     const int normalc = disabled ? DISABLED_COLOR : h->color[DLG_COLOR_NORMAL];
-    int selc = disabled ? DISABLED_COLOR : focused ? h->color[DLG_COLOR_HOT_FOCUS] : h->color[DLG_COLOR_FOCUS];
+    int selc =
+        disabled ? DISABLED_COLOR : focused ? h->color[DLG_COLOR_HOT_FOCUS] : h->
+        color[DLG_COLOR_FOCUS];
 
     GList *le;
     int pos;
@@ -698,4 +700,5 @@ listbox_add_item (WListbox * l, listbox_append_t pos, int hotkey, const char *te
 
     return entry->text;
 }
+
 /* --------------------------------------------------------------------------------------------- */

lib/widget/menu.c

@@ -36,9 +36,9 @@
 #include "lib/widget.h"
 
 /* TODO: these includes should be removed! */
-#include "src/keybind-defaults.h"             /* CK_Ignore_Key */
+#include "src/keybind-defaults.h"       /* CK_Ignore_Key */
 #include "src/help.h"
-#include "src/midnight.h"           /* is_right */
+#include "src/filemanager/midnight.h"   /* is_right */
 
 /*** global variables ****************************************************************************/
 

lib/widget/widget-common.h

@@ -112,7 +112,7 @@ void release_hotkey (const hotkey_t hotkey);
 /* return width on terminal of hotkey */
 int hotkey_width (const hotkey_t hotkey);
 /* draw hotkey of widget */
-void hotkey_draw (struct Widget * w, const hotkey_t hotkey, gboolean focused);
+void hotkey_draw (struct Widget *w, const hotkey_t hotkey, gboolean focused);
 
 /* widget initialization */
 void init_widget (Widget * w, int y, int x, int lines, int cols,
@@ -121,7 +121,7 @@ void init_widget (Widget * w, int y, int x, int lines, int cols,
 cb_ret_t default_proc (widget_msg_t msg, int parm);
 void widget_set_size (Widget * widget, int y, int x, int lines, int cols);
 /* select color for widget in dependance of state */
-void widget_selectcolor (struct Widget * w, gboolean focused, gboolean hotkey);
+void widget_selectcolor (struct Widget *w, gboolean focused, gboolean hotkey);
 void widget_erase (Widget * w);
 
 /*** inline functions ****************************************************************************/

lib/widget/wtools.c

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

src/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = man2hlp viewer
+SUBDIRS = filemanager man2hlp viewer
 
 if USE_EDIT
 SUBDIRS += editor
@@ -33,14 +33,9 @@ if USE_DIFF
 DIFFLIB = diffviewer/libdiffviewer.la
 endif
 
-SRC_charset = selcodepage.c selcodepage.h
-
-if CHARSET
-    SRC_USE_charset=$(SRC_charset)
-endif
-
 mc_LDADD = \
 	viewer/libmcviewer.la \
+	filemanager/libmcfilemanager.la \
 	$(DIFFLIB) $(EDITLIB) \
 	../lib/libmc.la \
 	$(MCLIBS) $(SLANGLIB) $(GLIB_LIBS) \
@@ -51,59 +46,27 @@ if ENABLE_VFS_SMB
 mc_LDADD += ../lib/vfs/mc-vfs/samba/libsamba.a
 endif
 
-SRC_mc_widgets = \
-	tree.c tree.h \
-	screen.c panel.h
-
 SRC_mc_conssaver = \
 	cons.handler.c consaver/cons.saver.h
 
-SRC_mc_options = \
-	learn.c learn.h \
-	option.c option.h \
-	setup.c setup.h
-
 mc_SOURCES = \
-	$(SRC_USE_charset) \
-	$(SRC_mc_widgets) \
 	$(SRC_mc_conssaver) \
-	$(SRC_mc_options) \
-	achown.c achown.h \
 	args.c args.h \
 	background.c background.h \
-	boxes.c boxes.h \
-	chmod.c chmod.h \
-	chown.c chown.h \
 	clipboard.c clipboard.h \
-	cmd.c cmd.h \
-	command.c command.h \
-	complete.c \
-	dir.c dir.h \
 	execute.c execute.h \
-	ext.c ext.h \
-	file.c file.h \
-	filegui.c filegui.h \
-	filenot.c \
-	fileopctx.c fileopctx.h \
-	find.c find.h \
 	help.c help.h \
 	history.h \
-	hotlist.c hotlist.h \
-	info.c info.h \
 	keybind-defaults.c keybind-defaults.h \
-	layout.c layout.h \
-	listmode.c listmode.h \
+	learn.c learn.h \
 	main.c main.h \
-	midnight.h midnight.c \
-	panelize.c panelize.h \
+	setup.c setup.h \
 	subshell.c subshell.h \
-	textconf.c textconf.h \
-	treestore.c treestore.h \
-	user.c user.h
+	textconf.c textconf.h
 
-#if USE_MOUNTLIST
-mc_SOURCES += mountlist.c mountlist.h
-#endif
+if CHARSET
+    mc_SOURCES += selcodepage.c selcodepage.h
+endif
 
 EXTRA_DIST = $(SRC_maintainer) $(SRC_charset)
 

src/background.c

@@ -47,8 +47,9 @@
 #include "lib/tty/key.h"        /* add_select_channel(), delete_select_channel() */
 #include "lib/widget.h"         /* message() */
 
-#include "layout.h"             /* repaint_screen() */
-#include "fileopctx.h"          /* FileOpContext */
+#include "filemanager/layout.h" /* repaint_screen() */
+#include "filemanager/fileopctx.h"      /* FileOpContext */
+
 #include "background.h"
 
 /*** global variables ****************************************************************************/

src/cons.handler.c

@@ -378,8 +378,8 @@ console_save (void)
     for (i = 0; i < screen_shot.xsize * screen_shot.ysize; i++)
     {
         screen_shot.buf[i] =
-            (screen_shot.buf[i] & 0xff00) | (unsigned char) revmap.scrmap[screen_shot.
-                                                                          buf[i] & 0xff];
+            (screen_shot.buf[i] & 0xff00) | (unsigned char) revmap.
+            scrmap[screen_shot.buf[i] & 0xff];
     }
 }
 

src/diffviewer/search.c

@@ -216,10 +216,11 @@ mcdiffview_do_search_forward (WDiff * dview)
     else if ((size_t) dview->search.last_accessed_num_line >= dview->a[dview->ord]->len)
     {
         dview->search.last_accessed_num_line = (ssize_t) dview->a[dview->ord]->len;
-         return FALSE;
+        return FALSE;
     }
 
-    for (ind = (size_t) ++dview->search.last_accessed_num_line; ind < dview->a[dview->ord]->len; ind++)
+    for (ind = (size_t)++ dview->search.last_accessed_num_line; ind < dview->a[dview->ord]->len;
+         ind++)
     {
         p = (DIFFLN *) & g_array_index (dview->a[dview->ord], DIFFLN, ind);
         if (p->u.len == 0)

src/diffviewer/ydiff.c

@@ -43,12 +43,13 @@
 #include "lib/widget.h"
 #include "lib/charsets.h"
 
+#include "src/filemanager/cmd.h"
+#include "src/filemanager/midnight.h"   /* Needed for current_panel and other_panel */
+#include "src/filemanager/layout.h"     /* Needed for get_current_index and get_other_panel */
+
 #include "src/keybind-defaults.h"
-#include "src/cmd.h"
 #include "src/help.h"
 #include "src/history.h"
-#include "src/midnight.h"       /* Needed for current_panel and other_panel */
-#include "src/layout.h"         /* Needed for get_current_index and get_other_panel */
 #include "src/main.h"           /* mc_run_mode, midnight_shutdown */
 #include "src/selcodepage.h"
 
@@ -2762,7 +2763,7 @@ dview_edit (WDiff * dview, int ord)
     h_modal = h->modal;
 
     get_line_numbers (dview->a[ord], dview->skip_rows, &linenum, &lineofs);
-    h->modal = TRUE; /* not allow edit file in several editors */
+    h->modal = TRUE;            /* not allow edit file in several editors */
     do_edit_at_line (dview->file[ord], use_internal_edit, linenum);
     h->modal = h_modal;
     dview_redo (dview);
@@ -2943,9 +2944,9 @@ dview_ok_to_exit (WDiff * dview)
         return res;
 
     act = query_dialog (_("Quit"), !midnight_shutdown ?
-                                _("File was modified. Save with exit?") :
-                                _("Midnight Commander is being shut down.\nSave modified file?"),
-                          D_NORMAL, 2, _("&Yes"), _("&No"));
+                        _("File was modified. Save with exit?") :
+                        _("Midnight Commander is being shut down.\nSave modified file?"),
+                        D_NORMAL, 2, _("&Yes"), _("&No"));
 
     /* Esc is No */
     if (midnight_shutdown || (act == -1))
@@ -2953,14 +2954,14 @@ dview_ok_to_exit (WDiff * dview)
 
     switch (act)
     {
-    case -1: /* Esc */
+    case -1:                   /* Esc */
         res = FALSE;
         break;
-    case 0: /* Yes */
+    case 0:                    /* Yes */
         (void) dview_save (dview);
         res = TRUE;
         break;
-    case 1: /* No */
+    case 1:                    /* No */
         if (mc_util_restore_from_backup_if_possible (dview->file[0], "~~~"))
             res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~");
         /* fall through */
@@ -3245,7 +3246,7 @@ dview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, v
 /* --------------------------------------------------------------------------------------------- */
 
 static char *
-dview_get_title (const Dlg_head *h, size_t len)
+dview_get_title (const Dlg_head * h, size_t len)
 {
     const WDiff *dview = (const WDiff *) find_widget_type (h, dview_callback);
     const char *modified = dview->merged ? " (*) " : "     ";

src/editor/edit.c

@@ -56,8 +56,9 @@
 #include "lib/charsets.h"       /* get_codepage_id */
 #endif
 
-#include "src/cmd.h"            /* view_other_cmd() */
-#include "src/user.h"           /* user_menu_cmd() */
+#include "src/filemanager/cmd.h"        /* view_other_cmd() */
+#include "src/filemanager/usermenu.h"       /* user_menu_cmd() */
+
 #include "src/main.h"           /* source_codepage */
 #include "src/setup.h"          /* option_tab_spacing */
 #include "src/learn.h"          /* learn_keys */

src/editor/editcmd.c

@@ -57,8 +57,9 @@
 #include "lib/widget.h"
 #include "lib/charsets.h"
 
+#include "src/filemanager/layout.h"     /* clr_scr() */
+
 #include "src/history.h"
-#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() */

src/editor/editkeys.c

@@ -50,8 +50,8 @@
 #include "edit-widget.h"        /* edit->macro_i */
 #include "editcmd_dialogs.h"
 
-#include "src/keybind-defaults.h"/* keybind_lookup_keymap_command() */
-#include "src/main.h"            /* display_codepage */
+#include "src/keybind-defaults.h"       /* keybind_lookup_keymap_command() */
+#include "src/main.h"           /* display_codepage */
 
 /*** global variables ****************************************************************************/
 

src/execute.c

@@ -34,10 +34,10 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "midnight.h"
+#include "filemanager/midnight.h"
+#include "filemanager/layout.h" /* use_dash() */
 #include "consaver/cons.saver.h"
 #include "subshell.h"
-#include "layout.h"             /* use_dash() */
 #include "setup.h"              /* clear_before_exec */
 
 #include "execute.h"

src/filemanager/Makefile.am

@@ -0,0 +1,39 @@
+
+noinst_LTLIBRARIES = libmcfilemanager.la
+
+libmcfilemanager_la_SOURCES = \
+	achown.c achown.h \
+	boxes.c boxes.h \
+	chmod.c chmod.h \
+	chown.c chown.h \
+	cmd.c cmd.h \
+	command.c command.h \
+	complete.c \
+	dir.c dir.h \
+	ext.c ext.h \
+	file.c file.h \
+	filegui.c filegui.h \
+	filenot.c \
+	fileopctx.c fileopctx.h \
+	find.c find.h \
+	hotlist.c hotlist.h \
+	info.c info.h \
+	layout.c layout.h \
+	listmode.c listmode.h \
+	midnight.h midnight.c \
+	option.c option.h \
+	panelize.c panelize.h \
+	panel.c panel.h \
+	tree.c tree.h \
+	treestore.c treestore.h \
+	usermenu.c usermenu.h
+
+#if USE_MOUNTLIST
+libmcfilemanager_la_SOURCES += mountlist.c mountlist.h
+#endif
+
+libmcfilemanager_la_CFLAGS = -I$(top_srcdir) \
+	$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
+	-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
+
+libmcfilemanager_la_LIBADD = ../../lib/libmc.la

src/filemanager/boxes.c

@@ -53,18 +53,19 @@
 #include "lib/util.h"           /* Q_() */
 #include "lib/widget.h"
 
-#include "setup.h"              /* For profile_name */
+#include "src/setup.h"          /* For profile_name */
+#include "src/background.h"     /* task_list */
+
+#ifdef HAVE_CHARSET
+#include "lib/charsets.h"
+#include "src/selcodepage.h"
+#endif
+
 #include "command.h"            /* For cmdline */
 #include "dir.h"
 #include "panel.h"              /* LIST_TYPES */
 #include "tree.h"
 #include "layout.h"             /* for get_nth_panel_name proto */
-#include "background.h"         /* task_list */
-
-#ifdef HAVE_CHARSET
-#include "lib/charsets.h"
-#include "selcodepage.h"
-#endif
 
 #include "boxes.h"
 

src/filemanager/chown.c

@@ -41,11 +41,12 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
+#include "src/setup.h"          /* panels_options */
+
 /* Needed for the extern declarations of integer parameters */
 #include "chmod.h"
 #include "midnight.h"           /* current_panel */
 #include "layout.h"             /* repaint_screen() */
-#include "setup.h"              /* panels_options */
 
 #include "chown.h"
 

src/filemanager/cmd.c

@@ -59,28 +59,14 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "cmd.h"                /* Our definitions */
-#include "fileopctx.h"
-#include "file.h"               /* file operation routines */
-#include "find.h"               /* do_find() */
-#include "hotlist.h"            /* hotlist_cmd() */
-#include "tree.h"               /* tree_chdir() */
-#include "subshell.h"           /* use_subshell */
-#include "consaver/cons.saver.h"        /* console_flag */
-#include "midnight.h"           /* change_panel() */
-#include "help.h"               /* interactive_display() */
-#include "user.h"               /* MC_GLOBAL_MENU */
-#include "command.h"            /* cmdline */
-#include "layout.h"             /* get_current_type() */
-#include "ext.h"                /* regex_command() */
-#include "boxes.h"              /* cd_dialog() */
-#include "setup.h"
-#include "execute.h"            /* toggle_panels() */
-#include "history.h"
-#include "dir.h"
-#include "keybind-defaults.h"             /* CK_InputHistoryShow */
-#include "viewer/mcviewer.h"
-
+#include "src/subshell.h"       /* use_subshell */
+#include "src/consaver/cons.saver.h"    /* console_flag */
+#include "src/viewer/mcviewer.h"
+#include "src/help.h"           /* interactive_display() */
+#include "src/setup.h"
+#include "src/execute.h"        /* toggle_panels() */
+#include "src/history.h"
+#include "src/keybind-defaults.h"       /* CK_InputHistoryShow */
 
 #ifdef USE_INTERNAL_EDIT
 #include "src/editor/edit.h"
@@ -90,6 +76,21 @@
 #include "src/diffviewer/ydiff.h"
 #endif
 
+#include "fileopctx.h"
+#include "file.h"               /* file operation routines */
+#include "find.h"               /* do_find() */
+#include "hotlist.h"            /* hotlist_cmd() */
+#include "tree.h"               /* tree_chdir() */
+#include "midnight.h"           /* change_panel() */
+#include "usermenu.h"           /* MC_GLOBAL_MENU */
+#include "command.h"            /* cmdline */
+#include "layout.h"             /* get_current_type() */
+#include "ext.h"                /* regex_command() */
+#include "boxes.h"              /* cd_dialog() */
+#include "dir.h"
+
+#include "cmd.h"                /* Our definitions */
+
 /*** global variables ****************************************************************************/
 
 int select_flags = SELECT_MATCH_CASE | SELECT_SHELL_PATTERNS;

src/filemanager/command.c

@@ -40,13 +40,14 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
+#include "src/main.h"           /* do_cd */
+#include "src/subshell.h"       /* SUBSHELL_EXIT */
+#include "src/execute.h"        /* shell_execute */
+
 #include "midnight.h"           /* current_panel */
-#include "main.h"               /* do_cd */
 #include "layout.h"             /* for command_prompt variable */
-#include "user.h"               /* expand_format */
-#include "subshell.h"           /* SUBSHELL_EXIT */
+#include "usermenu.h"           /* expand_format */
 #include "tree.h"               /* for tree_chdir */
-#include "execute.h"            /* shell_execute */
 
 #include "command.h"
 

src/filemanager/complete.c

@@ -46,7 +46,7 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "setup.h"              /* show_all_if_ambiguous */
+#include "src/setup.h"          /* show_all_if_ambiguous */
 
 /*** global variables ****************************************************************************/
 

src/filemanager/dir.c

@@ -36,9 +36,10 @@
 #include "lib/util.h"
 #include "lib/widget.h"         /* message() */
 
+#include "src/setup.h"          /* panels_options */
+
 #include "treestore.h"
 #include "dir.h"
-#include "setup.h"              /* panels_options */
 #include "layout.h"             /* rotate_dash() */
 
 /*** global variables ****************************************************************************/

src/filemanager/dir.h

@@ -79,7 +79,7 @@ gboolean if_link_is_exe (const char *full_name, const file_entry * file);
 /*** inline functions ****************************************************************************/
 
 static inline gboolean
-link_isdir (const file_entry *file)
+link_isdir (const file_entry * file)
 {
     return (gboolean) file->f.link_to_dir;
 }

src/filemanager/ext.c

@@ -39,19 +39,22 @@
 #include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget.h"
-#include "lib/charsets.h"           /* get_codepage_index */
+#include "lib/charsets.h"       /* get_codepage_index */
 
-#include "consaver/cons.saver.h"
-#include "viewer/mcviewer.h"
+#include "src/setup.h"          /* use_file_to_check_type */
+#include "src/execute.h"
+#include "src/history.h"
+
+#include "src/consaver/cons.saver.h"
+#include "src/viewer/mcviewer.h"
 
-#include "user.h"
-#include "setup.h"              /* use_file_to_check_type */
-#include "execute.h"
-#include "history.h"
-#include "layout.h"
 #ifdef HAVE_CHARSET
-#include "selcodepage.h"        /* do_set_codepage */
+#include "src/selcodepage.h"    /* do_set_codepage */
 #endif
+
+#include "usermenu.h"
+#include "layout.h"
+
 #include "ext.h"
 
 /*** global variables ****************************************************************************/

src/filemanager/file.c

@@ -65,9 +65,10 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget.h"
 
-#include "setup.h"
+#include "src/setup.h"
+#include "src/background.h"     /* we_are_background */
+
 #include "layout.h"             /* rotate_dash() */
-#include "background.h"         /* we_are_background */
 
 /* Needed for current_panel, other_panel and WTree */
 #include "dir.h"

src/filemanager/filegui.c

@@ -88,7 +88,8 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "setup.h"              /* verbose */
+#include "src/setup.h"          /* verbose */
+
 #include "midnight.h"
 #include "fileopctx.h"          /* FILE_CONT */
 

src/filemanager/find.c

@@ -45,13 +45,14 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "setup.h"              /* verbose */
+#include "src/setup.h"          /* verbose */
+#include "src/history.h"        /* MC_HISTORY_SHARED_SEARCH */
+#include "src/main.h"           /* do_cd */
+
 #include "dir.h"
 #include "cmd.h"                /* view_file_at_line */
 #include "midnight.h"           /* current_panel */
-#include "main.h"               /* do_cd */
 #include "boxes.h"
-#include "history.h"            /* MC_HISTORY_SHARED_SEARCH */
 #include "layout.h"             /* mc_refresh() */
 
 #include "find.h"
@@ -243,26 +244,26 @@ find_load_options (void)
     {
         /* Values like '/foo::/bar: produce holes in list.
            Find and remove them */
-        size_t r = 0, w = 0; /* read and write iterators */
+        size_t r = 0, w = 0;    /* read and write iterators */
 
         for (; find_ignore_dirs[r] != NULL; r++)
         {
-            if (find_ignore_dirs [r][0] == '\0')
+            if (find_ignore_dirs[r][0] == '\0')
             {
                 /* empty entry -- skip it */
-                g_free (find_ignore_dirs [r]);
-                find_ignore_dirs [r] = NULL;
+                g_free (find_ignore_dirs[r]);
+                find_ignore_dirs[r] = NULL;
                 continue;
             }
 
             if (r != w)
             {
                 /* copy entry to the previous free array cell */
-                find_ignore_dirs [w] = find_ignore_dirs [r];
-                find_ignore_dirs [r] = NULL;
+                find_ignore_dirs[w] = find_ignore_dirs[r];
+                find_ignore_dirs[r] = NULL;
             }
 
-            canonicalize_pathname (find_ignore_dirs [w]);
+            canonicalize_pathname (find_ignore_dirs[w]);
             w++;
         }
 
@@ -664,7 +665,7 @@ find_parameters (char **start_dir, char **pattern, char **content)
         options.skip_hidden = skip_hidden_cbox->state & C_BOOL;
 
         *content = (options.content_use && in_with->buffer[0] != '\0')
-                    ? g_strdup (in_with->buffer) : NULL;
+            ? g_strdup (in_with->buffer) : NULL;
         *start_dir = in_start->buffer[0] != '\0' ? in_start->buffer : (char *) ".";
         *pattern = g_strdup (in_name->buffer);
         if (in_start_dir != INPUT_LAST_TEXT)
@@ -1017,10 +1018,10 @@ find_ignore_dir_search (const char *dir)
             const size_t ilen = strlen (*ignore_dir);
 
             if (dlen < ilen)
-                continue; /* ignore dir is too long -- skip it */
+                continue;       /* ignore dir is too long -- skip it */
 
             if (strncmp (dir, *ignore_dir, ilen) != 0)
-                continue; /* strings are different -- skip ignore_dir */
+                continue;       /* strings are different -- skip ignore_dir */
 
             /* be sure than ignore_dir is not a part of dir like:
                ignore_dir is "/h", dir is "/home" */
@@ -1035,7 +1036,7 @@ find_ignore_dir_search (const char *dir)
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-find_rotate_dash (const Dlg_head *h, gboolean finish)
+find_rotate_dash (const Dlg_head * h, gboolean finish)
 {
     static const char rotating_dash[] = "|/-\\";
     static unsigned int pos = 0;
@@ -1053,7 +1054,7 @@ find_rotate_dash (const Dlg_head *h, gboolean finish)
 /* --------------------------------------------------------------------------------------------- */
 
 static int
-do_search (Dlg_head *h)
+do_search (Dlg_head * h)
 {
     static struct dirent *dp = NULL;
     static DIR *dirp = NULL;
@@ -1258,7 +1259,7 @@ view_edit_currently_selected_file (int unparsed_view, int edit)
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
-find_callback (Dlg_head *h, Widget * sender, dlg_msg_t msg, int parm, void *data)
+find_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
 {
     switch (msg)
     {

src/filemanager/hotlist.c

@@ -52,11 +52,12 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "setup.h"              /* For profile_bname */
+#include "src/setup.h"          /* For profile_bname */
+#include "src/history.h"
+
 #include "midnight.h"           /* current_panel */
 #include "layout.h"             /* repaint_screen() */
 #include "command.h"            /* cmdline */
-#include "history.h"
 
 #include "hotlist.h"
 

src/filemanager/info.c

@@ -36,10 +36,11 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
+#include "src/setup.h"          /* panels_options */
+
 #include "midnight.h"           /* the_menubar */
 #include "layout.h"
 #include "mountlist.h"
-#include "setup.h"              /* panels_options */
 #include "info.h"
 
 /*** global variables ****************************************************************************/

src/filemanager/layout.c

@@ -55,20 +55,21 @@
 #include "lib/strutil.h"
 #include "lib/widget.h"
 
+#include "src/main.h"
+#include "src/consaver/cons.saver.h"
+#include "src/viewer/mcviewer.h"        /* The view widget */
+#include "src/setup.h"          /* For save_setup() */
+#include "src/subshell.h"       /* For use_subshell and resize_subshell() */
+#include "src/background.h"     /* we_are_background */
+
 #include "command.h"
 #include "midnight.h"
-#include "main.h"
-#include "subshell.h"           /* For use_subshell and resize_subshell() */
 #include "tree.h"
-#include "background.h"         /* we_are_background */
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"
-#include "consaver/cons.saver.h"
 #include "layout.h"
 #include "info.h"               /* The Info widget */
-#include "src/viewer/mcviewer.h"        /* The view widget */
 
-#include "setup.h"              /* For save_setup() */
 
 /*** global variables ****************************************************************************/
 

src/filemanager/midnight.c

@@ -51,22 +51,23 @@
 
 #include "lib/vfs/mc-vfs/vfs.h" /* vfs_translate_url() */
 
-#include "args.h"
+#include "src/args.h"
+#include "src/subshell.h"
+#include "src/setup.h"          /* variables */
+#include "src/learn.h"          /* learn_keys() */
+#include "src/execute.h"        /* suspend_cmd() */
+#include "src/keybind-defaults.h"
+#include "src/main.h"           /* quit */
+
 #include "option.h"             /* configure_box() */
 #include "tree.h"
-#include "subshell.h"
-#include "setup.h"              /* variables */
 #include "boxes.h"              /* sort_box(), tree_box() */
 #include "layout.h"
 #include "cmd.h"                /* commands */
 #include "hotlist.h"
 #include "panelize.h"
-#include "learn.h"              /* learn_keys() */
-#include "execute.h"            /* suspend_cmd() */
 #include "command.h"            /* cmdline */
-#include "keybind-defaults.h"
 #include "lib/keybind.h"
-#include "main.h"               /* quit */
 
 #include "chmod.h"
 #include "chown.h"
@@ -80,7 +81,7 @@
 #include "src/diffviewer/ydiff.h"
 #endif
 
-#include "consaver/cons.saver.h" /* console_flag */
+#include "src/consaver/cons.saver.h"    /* console_flag */
 
 #include "midnight.h"
 
@@ -1335,7 +1336,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
             size_t i;
 
             for (i = 0; cmdline->buffer[i] != '\0' &&
-                        (cmdline->buffer[i] == ' ' || cmdline->buffer[i] == '\t'); i++)
+                 (cmdline->buffer[i] == ' ' || cmdline->buffer[i] == '\t'); i++)
                 ;
 
             if (cmdline->buffer[i] != '\0')
@@ -1480,7 +1481,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
 void
 update_menu (void)
 {
-    menu_set_name (left_menu,  horizontal_split ? _("&Above") : _("&Left"));
+    menu_set_name (left_menu, horizontal_split ? _("&Above") : _("&Left"));
     menu_set_name (right_menu, horizontal_split ? _("&Below") : _("&Right"));
     menubar_arrange (the_menubar);
 }

src/filemanager/midnight.h

@@ -44,7 +44,7 @@ extern WPanel *current_panel;
 /*** declarations of public functions ************************************************************/
 
 void update_menu (void);
-void midnight_set_buttonbar (WButtonBar *b);
+void midnight_set_buttonbar (WButtonBar * b);
 void load_hint (gboolean force);
 void change_panel (void);
 void save_cwds_stat (void);

src/filemanager/option.c

@@ -37,10 +37,11 @@
 #include "lib/tty/key.h"        /* old_esc_mode_timeout */
 #include "lib/widget.h"
 
-#include "setup.h"              /* variables */
+#include "src/setup.h"          /* variables */
+#include "src/history.h"        /* MC_HISTORY_ESC_TIMEOUT */
+#include "src/execute.h"        /* pause_after_run */
+
 #include "layout.h"             /* nice_rotating_dash */
-#include "history.h"            /* MC_HISTORY_ESC_TIMEOUT */
-#include "execute.h"            /* pause_after_run */
 #include "panel.h"              /* update_panels() */
 
 #include "option.h"

src/filemanager/panel.c

@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/** \file screen.c
+/** \file panel.c
  *  \brief Source: panel managin module
  */
 
@@ -46,9 +46,15 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 #ifdef HAVE_CHARSET
-#include "lib/charsets.h"           /* get_codepage_id () */
+#include "lib/charsets.h"       /* get_codepage_id () */
 #endif
 
+#include "src/setup.h"          /* For loading/saving panel options */
+#include "src/execute.h"
+#include "src/selcodepage.h"    /* select_charset (), SELECT_CHARSET_NO_TRANSLATE */
+#include "src/keybind-defaults.h"       /* global_keymap_t */
+#include "src/subshell.h"       /* use_subshell */
+
 #include "dir.h"
 #include "boxes.h"
 #include "tree.h"
@@ -56,14 +62,9 @@
 #include "layout.h"             /* Most layout variables are here */
 #include "cmd.h"
 #include "command.h"            /* cmdline */
-#include "setup.h"              /* For loading/saving panel options */
-#include "user.h"
-#include "execute.h"
+#include "usermenu.h"
 #include "midnight.h"
-#include "subshell.h"           /* use_subshell */
 #include "mountlist.h"          /* my_statfs */
-#include "selcodepage.h"        /* select_charset (), SELECT_CHARSET_NO_TRANSLATE */
-#include "keybind-defaults.h"   /* global_keymap_t */
 
 #include "panel.h"
 

src/filemanager/panel.h

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

src/filemanager/panelize.c

@@ -42,12 +42,13 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "setup.h"              /* For profile_bname */
+#include "src/setup.h"          /* For profile_bname */
+#include "src/main.h"
+#include "src/history.h"
+
 #include "dir.h"
 #include "midnight.h"           /* current_panel */
 #include "layout.h"             /* repaint_screen() */
-#include "main.h"
-#include "history.h"
 
 #include "panelize.h"
 

src/filemanager/tree.c

@@ -51,16 +51,17 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
+#include "src/setup.h"          /* confirm_delete */
+#include "src/keybind-defaults.h"
+#include "src/history.h"
+#include "src/help.h"
+
 #include "dir.h"
-#include "setup.h"              /* confirm_delete */
 #include "midnight.h"           /* the_menubar */
 #include "file.h"               /* copy_dir_dir(), move_dir_dir(), erase_dir() */
 #include "layout.h"             /* command_prompt */
-#include "help.h"
 #include "treestore.h"
 #include "cmd.h"
-#include "keybind-defaults.h"
-#include "history.h"
 #include "filegui.h"
 
 #include "tree.h"

src/filemanager/treestore.c

@@ -54,8 +54,9 @@
 #include "lib/hook.h"
 #include "lib/util.h"
 
+#include "src/setup.h"
+
 #include "treestore.h"
-#include "setup.h"
 
 /*** global variables ****************************************************************************/
 

src/filemanager/usermenu.c

@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/** \file user.c
+/** \file usermenu.c
  *  \brief Source: user menu implementation
  */
 
@@ -40,14 +40,15 @@
 #include "src/editor/edit.h"    /* WEdit, BLOCK_FILE */
 #include "src/viewer/mcviewer.h"        /* for default_* externs */
 
+#include "src/execute.h"
+#include "src/setup.h"
+#include "src/history.h"
+
 #include "dir.h"
 #include "midnight.h"
 #include "layout.h"
-#include "execute.h"
-#include "setup.h"
-#include "history.h"
 
-#include "user.h"
+#include "usermenu.h"
 
 /*** global variables ****************************************************************************/
 

src/filemanager/usermenu.h

@@ -1,9 +1,9 @@
-/** \file user.h
+/** \file usermenu.h
  *  \brief Header: user menu implementation
  */
 
-#ifndef MC__USER_H
-#define MC__USER_H
+#ifndef MC__USERMENU_H
+#define MC__USERMENU_H
 
 #include "lib/global.h"
 
@@ -26,4 +26,5 @@ int check_format_var (const char *, char **);
 int check_format_cd (const char *);
 
 /*** inline functions ****************************************************************************/
-#endif /* MC__USER_H */
+
+#endif /* MC__USERMENU_H */

src/keybind-defaults.c

@@ -714,4 +714,3 @@ const global_keymap_t default_diff_keymap[] = {
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
-

src/learn.c

@@ -44,8 +44,9 @@
 #include "lib/util.h"           /* convert_controls() */
 #include "lib/widget.h"
 
+#include "filemanager/layout.h" /* repaint_screen() */
+
 #include "setup.h"
-#include "layout.h"             /* repaint_screen() */
 #include "learn.h"
 
 /*** global variables ****************************************************************************/
@@ -367,8 +368,7 @@ learn_save (void)
 
             esc_str = strutils_escape (learnkeys[i].sequence, -1, ";\\", TRUE);
 
-            mc_config_set_string_raw (mc_main_config, section,
-                                      key_name_conv_tab[i].name, esc_str);
+            mc_config_set_string_raw (mc_main_config, section, key_name_conv_tab[i].name, esc_str);
 
             g_free (esc_str);
         }

src/main.c

@@ -51,14 +51,15 @@
 #include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h" /* vfs_init(), vfs_shut() */
 
+#include "filemanager/midnight.h"       /* current_panel */
+#include "filemanager/treestore.h"      /* tree_store_save */
+#include "filemanager/layout.h" /* command_prompt */
+#include "filemanager/ext.h"    /* flush_extension_file() */
+#include "filemanager/command.h"        /* cmdline */
+
 #include "args.h"
-#include "midnight.h"           /* current_panel */
-#include "treestore.h"          /* tree_store_save */
 #include "subshell.h"
 #include "setup.h"              /* save_setup() */
-#include "layout.h"             /* command_prompt */
-#include "ext.h"                /* flush_extension_file() */
-#include "command.h"            /* cmdline */
 
 #ifdef HAVE_CHARSET
 #include "lib/charsets.h"
@@ -560,7 +561,7 @@ main (int argc, char *argv[])
 
         last_wd_fd = open (mc_args__last_wd_file, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
                            S_IRUSR | S_IWUSR);
-         if (last_wd_fd != -1)
+        if (last_wd_fd != -1)
         {
             ssize_t ret1;
             int ret2;

src/setup.c

@@ -51,14 +51,15 @@
 #include "lib/charsets.h"
 #endif
 
+#include "filemanager/dir.h"
+#include "filemanager/midnight.h"
+#include "filemanager/tree.h"   /* xtree_mode */
+#include "filemanager/hotlist.h"        /* load/save/done hotlist */
+#include "filemanager/panelize.h"       /* load/save/done panelize */
+#include "filemanager/layout.h"
+#include "filemanager/cmd.h"
+
 #include "args.h"
-#include "dir.h"
-#include "midnight.h"
-#include "tree.h"               /* xtree_mode */
-#include "hotlist.h"            /* load/save/done hotlist */
-#include "panelize.h"           /* load/save/done panelize */
-#include "layout.h"
-#include "cmd.h"
 #include "execute.h"            /* pause_after_run */
 #include "clipboard.h"
 #include "keybind-defaults.h"   /* keybind_lookup_action */
@@ -1382,9 +1383,8 @@ panels_load_options (void)
         *panels_ini_options[i].opt_addr =
             mc_config_get_int (mc_main_config, CONFIG_APP_SECTION,
                                panels_ini_options[i].opt_old_name != NULL
-                               ? panels_ini_options[i].
-                               opt_old_name : panels_ini_options[i].opt_name,
-                               *panels_ini_options[i].opt_addr);
+                               ? panels_ini_options[i].opt_old_name : panels_ini_options[i].
+                               opt_name, *panels_ini_options[i].opt_addr);
 
     qmode = mc_config_get_int (mc_main_config, CONFIG_APP_SECTION,
                                "quick_search_case_sensitive", (int) panels_options.qsearch_mode);

src/setup.h

@@ -8,7 +8,8 @@
 #include <config.h>
 
 #include "lib/global.h"         /* GError */
-#include "panel.h"  /* WPanel, panel_view_mode_t */
+
+#include "filemanager/panel.h"  /* WPanel, panel_view_mode_t */
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
@@ -109,8 +110,8 @@ char *load_anon_passwd (void);
 void load_keymap_defs (void);
 void free_keymap_defs (void);
 
-void panel_load_setup (WPanel *panel, const char *section);
-void panel_save_setup (WPanel *panel, const char *section);
+void panel_load_setup (WPanel * panel, const char *section);
+void panel_save_setup (WPanel * panel, const char *section);
 void save_panel_types (void);
 
 void panels_load_options (void);

src/subshell.c

@@ -57,8 +57,9 @@
 #include "lib/util.h"
 #include "lib/widget.h"
 
-#include "midnight.h"                   /* current_panel */
-#include "main.h"                       /* home_dir */
+#include "filemanager/midnight.h"       /* current_panel */
+
+#include "main.h"               /* home_dir */
 #include "consaver/cons.saver.h"        /* handle_console() */
 #include "subshell.h"
 

src/viewer/actions_cmd.c

@@ -58,14 +58,15 @@
 #include "lib/widget.h"
 #include "lib/charsets.h"
 
-#include "src/layout.h"
+#include "src/filemanager/layout.h"
+#include "src/filemanager/cmd.h"
+#include "src/filemanager/midnight.h"   /* current_panel */
+
 #include "src/history.h"
-#include "src/cmd.h"
 #include "src/execute.h"
 #include "src/help.h"
 #include "src/keybind-defaults.h"
 #include "src/main.h"           /* midnight_shutdown */
-#include "src/midnight.h"       /* current_panel */
 
 #include "internal.h"
 #include "mcviewer.h"

src/viewer/internal.h

@@ -10,7 +10,7 @@
 #include "lib/search.h"
 #include "lib/widget.h"
 
-#include "src/keybind-defaults.h" /* global_keymap_t */
+#include "src/keybind-defaults.h"       /* global_keymap_t */
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

src/viewer/mcviewer.c

@@ -49,8 +49,9 @@
 #include "lib/charsets.h"
 
 #include "src/main.h"
-#include "src/layout.h"         /* menubar_visible */
-#include "src/midnight.h"       /* the_menubar */
+
+#include "src/filemanager/layout.h"     /* menubar_visible */
+#include "src/filemanager/midnight.h"   /* the_menubar */
 
 #include "internal.h"
 #include "mcviewer.h"