Commit Graph

4869 Commits

Author SHA1 Message Date
Andrew Borodin
f89d862241 Minor otimization of syntax highlightimg engine:
ret rid of extra copying of WEdit::rule.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
7b574f1dbc (compare_word_to_right): use correct upper boundary of scanned text. 2013-06-03 14:21:02 +03:00
Andrew Borodin
412095a562 option_whole_chars_search: unsed variable. Remove it and related code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
1e985bc7df (edit_update_screen): fix of editor frame drawing.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
b9c0b56928 src/editor/editcmd.c: remove unneeded include layout.h.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
57bb2b87c2 (edit_about): update year.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
6d31d85f0d Use tty_draw_box instead of draw_box() to draw frames.
* (draw_box): remove.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
a35ee6aebc (smbfs_fake_share_stat): don't access to free'd memory.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:01 +03:00
Slava Zanko
2640b21bb9 Remove vfs_path_to_str() function for avoid often memory allocations.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 14:21:01 +03:00
Andrew Borodin
31bacf56c9 Use G_N_ELEMENTS macro to calculate of array size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:14 +03:00
Andrew Borodin
9f80eda26e WEdit::labels is unused. Remove.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:14 +03:00
Slava Zanko
80c8d58003 remove the include duplicates from source files
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Andrew Borodin
6d172837f0 (subshell_name_quote): use GString for string forming.
(do_subshell_chdir): changed related to modified subshell_name_quote().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:13 +03:00
Andrew Borodin
923d379d5a Code indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-04-12 09:40:55 +04:00
Andrew Borodin
02265113cd Merge branch '2968_viewer_next_prev_mode'
* 2968_viewer_next_prev_mode:
  Fix mode switch after CK_FileNext/CK_FilePrev.
  (regex_command_for): new function to use regex_command in already created viewer/editor
  (exec_extension): rename variable.
  (exec_extension_view): refactoring: remove temporary file in exec_extension().
  Ticket #2968: mcviewer: broken Raw/Parse and Format/UnformatRaw/Parse and Format/Unformat
2013-04-12 09:14:12 +04:00
Andrew Borodin
d70f6b5b63 Fix mode switch after CK_FileNext/CK_FilePrev.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-04-05 19:16:41 +04:00
Andrew Borodin
4d0f17e79a (regex_command_for): new function to use regex_command in already created viewer/editor
...and related changes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-04-05 19:16:38 +04:00
Andrew Borodin
bd8ad7e94b (exec_extension): rename variable. 2013-04-05 19:15:31 +04:00
Slava Zanko
4404af92c0 Ticket #2980: Add missing doc/hints french translation
Hints was split by paragraph (by double new line symbol instead of single newline symbol)

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-04-02 11:07:42 +03:00
Andrew Borodin
5c01fea888 (exec_extension_view): refactoring: remove temporary file in exec_extension().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-30 12:20:39 +04:00
Andrew Borodin
b7d42cc1e5 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-29 19:06:27 +04:00
Andrew Borodin
41d5ee716e (editcmd_dialog_completion_show): adjust dialog position.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-28 16:53:04 +04:00
Andrew Borodin
4b9e5f50b1 (edit_complete_word_cmd): don't get bytes directly from editor buffer.
(edit_get_match_keyword_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-28 16:53:04 +04:00
Andrew Borodin
77af739bdd (edit_complete_word_cmd): make correct charset conversion
...before insert autocompletion result.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-28 16:50:22 +04:00
Andrew Borodin
4495957319 Ticket #2968: mcviewer: broken Raw/Parse and Format/UnformatRaw/Parse and Format/Unformat
...after CK_FileNext/CK_FilePrev.

Initial commit: refactoring of mcview_t typedef.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-24 13:37:11 +04:00
Andrew Borodin
7fe85d0bd8 Ticket #2957: broken autocompletion in mcedit
...if system and file charsets are different.

Initial step: refactoring: do actual completion word substitution
outside of editcmd_dialog_completion_show().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-21 09:27:08 +04:00
Gergely Szász
b8208b0514 Ticket #2976: magic mode is broken in mcview.
The bug:
  If we open a file with F3 from panels, then mc uses "file extension"
  style open (e.g. archive.sh) and Format/Raw switching is O.K.

  If we open file in "Raw" mode, or use quick view, mc opens files
  without "file extension" helpers. Format/Raw switching is broken.

  In mcview_load() we check magic_mode and detect "compressed" files.
  If magic mode is on and file is "compressed" we free the current vpath
  and generate a new vpath with "decompress magic", but nothing else.
  So, the file name disappear and we see the raw content.
  After user press F8, mcview reloads the file. Now filename is the "new"
  magic filename. mcview_load() open the file with the decompress "helper"
  (using sfs). We see the uncompressed (parsed) content.
  After user press F8, nothing happend, because original file name is lost.

The solution:
  Remove the old vpath destruction.
  Open the file with "uncopress magic" if magic_mode is on and file is
  "compressed".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-20 17:01:38 +04:00
Andrew Borodin
68609b79b0 Code indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-12 14:05:10 +04:00
Andrew Borodin
2254b24008 Refactoring: use GString instead of "struct selection".
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:51 +04:00
Andrew Borodin
18cc9ac0dd (edit_translate_key): move from editkeys.c into editwidget.c
...and remove editkeys.c since it is empty.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
a85fc3367e Sync with gnulib 62bb7a8bf95807d6339e1e17fc0d21c319b280a2.
* src/filemanager/lib/mountlist.c: port to HP NonStop.
(hasmntopt) [!HAVE_HASMNTOPT]: New function.
(MNT_IGNORE) [MNTOPT_IGNORE]: Use it.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
b3bc856974 Adjust look'n'feel of editor options dialog window.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
6787221c15 (overwrite_query_dialog): adjust dialog size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
30959e0b7d Clarify widget redraw in runtime.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
f1316549a2 (edit_insert_over): move from src/editor/editcmd.c into src/editor/edit.c.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
17ceb233b0 (edit_insert_column_of_text_from_file): refactoring:
* move from src/editor/editcmd.c into src/editor/edit.c and make static;
  * rename to edit_insert_column_from_file;
  * make some refactoring.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
ef35db06d2 (edit_get_byte): refactoring: use edit_get_byte_ptr().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:19 +04:00
Andrew Borodin
556192bd4a (init_panelize): support --disable-nls.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
c52003ec43 More use SELECTED_IS_PANEL define.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
f6a5241e18 (mcview_scroll_to_cursor): make static.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
2f25803ce2 Sync with gnulib 47f4ca8fe9506254200028c8a8c5fffbf1bf1161
Don't consider "devtmpfs" as dummy.

* src/filemanager/mountlist.c (ME_DUMMY_0): Remove "devtmpfs"
as there is storage associcated with it.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
0d26829289 (mc_defines_destroy): use g_strfreev.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Slava Zanko
c984447f8e Rename vfs_path_cmp() to vfs_path_equals()
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-03-09 16:04:18 +04:00
Andrew Borodin
8454f12f8f Ticket #2954: fix typo: occured -> occurred.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
3ecfeb04da Get rid of g_return_* macros in file operation routines
...since they produce warnings about non-created UI and clutter screen
up.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
bbf84a02e4 (check_progress_buttons): redraw file progress dialog
...after step from "Suspend" state to "Skip" one.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:18 +04:00
Andrew Borodin
c521ca12d5 Don't close the file progress dialog after press on "Skip" button.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 16:04:17 +04:00
Andrew Borodin
96d8539e3a While scanning directories, print directory counter and size
...in addition to directory name.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:28 +04:00
Andrew Borodin
b0062fd8cd Refactoring of directory size calculation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:28 +04:00
Andrew Borodin
ad2ca88bb9 Handle "Skip" button in directory scanning status dialog.
Don't show total size, number and time values of file operations
if directory scanning was skipped before.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:27 +04:00
Andrew Borodin
f0d34a2500 Ticket #2101: allow skip directory scanning before file operations.
* (compute_dir_size_create_ui): add "Skip" button to the "Directory
  scanning" progress dialog.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-09 15:42:27 +04:00
Andrew Borodin
27936a4587 Ticket #2493: handle regexp errors in file operation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-03-06 15:21:25 +04:00
Slava Zanko
6777d5044f Code indentation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 18:17:30 +03:00
Slava Zanko
6447c76cca Implementation of getting last editing/viewing position of file.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:40:37 +03:00
Slava Zanko
278178093e Add support of reading parameters for external editor/viewer from main config.
for example, the config file may contain strings:

[External editor or viewer parameters]
    vim = %filename +%lineno
    mcedit = %filename:%lineno

And these external editors will open a file at the previously saved position.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:40:37 +03:00
Slava Zanko
2a2bc56221 Add src/execute.c:execute_external_editor_or_viewer() function.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:39:33 +03:00
Slava Zanko
08a825680b Code refactoring: split src/execute.c:execute_with_vfs_arg() function.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:39:33 +03:00
Slava Zanko
f43b83e7ee Add tests for src/execute.c:execute_with_vfs_arg() function.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:39:33 +03:00
Slava Zanko
d32fefee76 Ticket #2206: Add jump support to target line in some external editors
Added own wrapper for _exit() system call. Useful for testing.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-16 17:39:32 +03:00
Andrew Borodin
a11628da62 Ticket #2964: mouse doesn't select text in subshell in native console.
Steps to Reproduce:

1. Run mc in native console (not in X terminal emulator).
2. Press Ctrl+O to switch to subshell.
3. Try select anything with mouse.
Result: mouse does't select anything.

This bug was introduced in 68468a25ac
commit.

Solution: make mouse initialization after initializaton of subshell.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-02-14 14:26:25 +04:00
Andrew Borodin
8e53d1e423 Fix buttons placement in file find result window.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-02-14 14:21:40 +04:00
Andrew Borodin
8fbdbb75de Ticket #2958: buttons in the 'Directory hotlist' window are placed incorrectly.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-02-14 14:21:40 +04:00
Slava Zanko
f866709186 Concretize the usage of autocompliting in different input fields.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-04 15:48:21 +03:00
Slava Zanko
2d58735deb Extend QUICK_INPUT and QUICK_LABELED_INPUT macros for getting completion flags via parameters instead of using hardcoded value
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-02-04 15:29:15 +03:00
Ilia Maslakov
81cd5dd242 add option "Ask new file name" in the Configuration box
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2013-01-31 14:57:03 +04:00
Ilia Maslakov
6e5b50cb6f Ticket #2585 (Ask filename before create new file)
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2013-01-31 14:56:52 +04:00
Andrew Borodin
f7cbaca925 (insert_spaces_tab): fix floating point exception.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-23 11:13:24 +04:00
Andrew Borodin
e553caecce Ticket #2953: (edit_move_to_prev_col): fix floating point exception.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-23 10:57:18 +04:00
Slava Zanko
ee8aaf6181 Avoid compiler errors like: error: variable 'xxx' set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-01-17 15:21:35 +03:00
Andrew Borodin
3127e8d9ba Clarify usage of use_internal_edit variable
...and disable "Use internal edit" checkbox in case of build
without internal editor.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:34 +04:00
Andrew Borodin
c02fac4af7 Merge src/filemanager/option.[ch] to src/filemanager/boxes.[ch].
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:34 +04:00
Andrew Borodin
6cd19ea6cb Remove irrelevant comments about file_date() function.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:34 +04:00
Andrew Borodin
ae6e647845 (mc_global_t::shell): new member to store user's shell
...instead of global variable "shell".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:11 +04:00
Andrew Borodin
e35f044ccd (subshell_prompt): changed to GString.
(read_subshell_prompt): refactoring to ret rid of low-level memory reallocation.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:11 +04:00
Andrew Borodin
0e7810eb5f (read_subshell_prompt): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:11 +04:00
Andrew Borodin
0e6addcb96 Ticket #2944: code cleanup before 4.8.8 release.
(mc_prompt): move from src/setup.[ch] to src/filemanager/midnight.[ch].

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-16 14:34:11 +04:00
Andrew Borodin
33cac494c0 WHLine: allow draw text over horizontal line.
* (hline_set_text): new function.
  * (file_progress_show_total): use hline_set_text to show processed
  files counter.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-14 16:23:17 +04:00
Andrew Borodin
75d165b7c7 Copy/move/delete progress dialog occupies at least 2/3 of screen width.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-14 16:23:17 +04:00
Andrew Borodin
2176e5f283 Ticket #2076: make copy/move/delete progress dialog wider.
Initial step: get rid of hardcoded width of progress bar.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-01-14 16:23:17 +04:00
Andrew Borodin
8cf9ba1b5c Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-25 08:53:52 +04:00
Ilia Maslakov
4861d06073 Ticket #2914 (disable annoying aspell warnings about spelling language)
Added the aspell param 'spell_language' in ini-file.
    This allow set spelling language. spell_language=NONE - disable aspell support.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-24 13:23:18 +04:00
Andrew Borodin
9862323d11 src/filemanager/find.c: unify i18n resource (button name).
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-21 13:37:49 +04:00
Andrew Borodin
68ee80abb8 Implement pause in copy/move/delete file operation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-21 13:37:44 +04:00
Andrew Borodin
2f74680628 (init_learn): fix discard of "const" qualifier from pointer target type assignment.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 16:38:06 +04:00
Andrew Borodin
5e070286b1 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 16:22:23 +04:00
Andrew Borodin
6c6ce83af7 Sync with gnulib 40f82767840187c20051ca99385f75a42f92de99.
mountlist: recognize more "dummy" file systems
* src/filenamager/mountlist.c (ME_DUMMY_0):
Add these dummy FS names to the list:
  - "debugfs" virtual filesystem for kernel debugging
  - "devpts" PTY slave filesystem
  - "devtmpfs" device filesystem on top of tmpfs/ramfs
  - "fusectl" control filesystem for FUSE
  - "mqueue" enumerates POSIX message queues
  - "rpc_pipefs" kernel <-> userspace bridge for NFS
  - "sysfs" is for exporting kernel objects
  - "devfs" device filesystem for Linux 2.4 and FreeBSD

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:36 +04:00
Slava Zanko
db2c31decc Add extra checks in macro engine.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 15:35:36 +04:00
Andrew Borodin
8a1971026d Ticket #2935: update uc1541 extfs plug-in up to version 2.5.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
d87a0bfe92 (editcmd_dialog_replace_prompt_show): fix string truncations.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
e9f883a3cf Cleanup code related to GLib < 2.12.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
17cadc50ec Portability: use g_ascii_strtoll instead of strtoll, atoll and atof.
Set minimal version of GLib up to 2.12 because of g_ascii_strtoll.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
2eeb950439 Keep some edit window parameters during file reloading.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
d50d1d748d Fix editor crash in "Save as..." command.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
368e250102 Ticket #2841: adjust i18n label sizes in learn key dialog.
Learn keys dialogue shows "smaller buttons" when localized key names
include special chars (as the "á" in "Avanzar página" for es_ES locale).
"%Ns" formats for g_snprintf are not reliable for multibyte encodings.
For larger buttons (> 16 characters), padding size must be zero.

Thanks David Martin for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Ilia Maslakov
f25feaab1f Disable the localized output of utilities such as - ls, git, etc..
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 15:35:35 +04:00
Andrew Borodin
82b1d7bff3 Parenthesis around some -1.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
24f0533432 src/filemanager/mountlist.c: use GLib functions to allocate/free memory.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
eba12456eb Sync with gnulib 613bcb6205cf2b64d835c19074c5a7e7c6cb99eb
...and ab7a2b67b48deb4c253b3b6bd983690d71515265.

* src/filemanager/mountlist: do not classify a bind-mounted dir entry
as "dummy".

(ME_DUMMY_0): Rename from ME_DUMMY, but omit the "none"-testing clause.
(ME_DUMMY) [MOUNTED_GETMNTENT1]: New macro to encapsulate the exception
for bind-mounted directories.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
9903480096 FileOpContext::preserve: make gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
a5efdb67ce FileOpContext::dive_into_subdirs: make gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:34 +04:00
Andrew Borodin
3762269434 Don't create copy/move progress dialog for background operations.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:34 +04:00
Pavel Vasilyev
d4f50f0be5 src/vfs/tar/tar.c: types accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
03fd500c2e src/vfs/cpio/cpio.c: types accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
f84bbd8583 vfs_s_subclass::linear_read: return ssize_t instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
8d71220350 (mcview_search_update_cmd_callback): add type cast for correct condition check.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Andrew Borodin
06e1d21322 (mcview_find): type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:13 +04:00
Andrew Borodin
25689a32bb (edit_find_word_start): type accuracy for word start.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Andrew Borodin
b10fc3ce59 Ticket #2888: code cleanup before 4.8.7 release.
(editcmd_find): remove incorrect type cast.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Ilia Maslakov
77c599be70 place cursor after inserted chars by 'block move' command
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
7a5458fd9b place cursor after inserted chars by 'block copy' command
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
d6a1de5898 added option "Cursor after inserted block" in the options dialog of editor
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
027cc24f28 Ticket #319: place cursor after inserted chars
* Added 'editor_cursor_after_inserted_block' config option (default value is: FALSE)
* Cursor placed at end of inserted chars when extern file is inserted under cursor

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 14:08:36 +03:00
Andrew Borodin
60727b9b79 Clarify usage of AM_CPPFLAGS.
Use AM_CPPFLAGS not AM_CFLAGS for includes. GLIB_CFLAGS are CPPFLAGS, actually.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:27:49 +04:00
Andrew Borodin
7b184ddea4 PCRE_CFLAGS are CPPFLAGS, actually.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:27:49 +04:00
Andrew Borodin
33dbb1338e (copy_dir_dir): get rid of extra string duplication.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:45:18 +04:00
Andrew Borodin
ba6b7ce976 (copy_dir_dir): refactoring: get rid of goto dont_mkdir.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:45:18 +04:00
Slack
82cfece6ae Ticket #2924: attributes of existing directories are never preserved.
If superuser copies a directory tree (e.g. from a safe backup location
(with sane permission, owner, group, timestamp) over an existing tree,
any attributes are not preserved. All destination dirs retain all their
existing attributes instead of change attributes from source.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-29 14:45:18 +04:00
Slava Zanko
a51df499cd Added parameter quotation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-11-29 13:21:09 +03:00
Andrew Borodin
7b8e790de0 src/*/*.[ch]: fix indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-20 13:44:14 +04:00
Andrew Borodin
4e90c1a229 Internal menu structures are opaque now.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:44:14 +04:00
Andrew Borodin
2ec122bc05 Add useful macros for widget type cast.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:44:14 +04:00
Andrew Borodin
665d238ffa Unify widget and dialog message handling.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:44:14 +04:00
Andrew Borodin
497b69c106 Remove DLG_WANT_IDLE. Use W_WANT_IDLE instead.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:44:13 +04:00
Andrew Borodin
843dcd104e Rename Dlg_head to WDialog.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
0078874613 Rename default callbacks of widget and dialog.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
0ccbe2c547 Unify some hotkeys.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
57d17c994b (editcmd_dialog_raw_key_query): adjust sizes and look'n'feel.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
b24b5dd479 (real_query_recursive): refactoring of dialog.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
3fed65e358 "Directory scanning" dialog: adjust look'n'feel.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
45179f48e6 Center text in query owerwrite and delete dialogs.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:47 +04:00
Andrew Borodin
a91682a079 (file_mask_dialog): adjust width calculation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
f14cee4e18 Remove DLG_REVERSE flag.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
40ce25603e Build file operation dialogs in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
d139aa1de2 Build find file dialogs in normal order.
Adjust resize handling.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
a710591b4b Build "Background jobs" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
9845afe083 Build hotlist dialogs in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
c40b5475f5 src/filemanager/hotlist.[ch]: cleanup.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
b406fdceb9 Build "External panelize" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
ce922ea7df Build "Layout" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
d514d186dc Build "Advanced chown command" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
da98101f20 src/filemanager/achown.c: cleanup.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
3f10e7937a Build "Chown command" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
bf38bce6d9 Build "Chmod command" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
51eac41558 Build "Learn keys" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
7b16dbf41f src/learch.c: cleanup.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
9348f70003 (tree_box): don't apply DLG_REVERSE flag.
Adjust resize handling.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
a39e3fe682 (spell_dialog_spell_suggest_show): fixed widget order in the dialog.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
211a3ec502 (edit_about): reimplement using QuickDialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
322bf132d7 (QUICK_BUTTONS_OK_CANCEL): new macro for often-used dialog buttons.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:46 +04:00
Andrew Borodin
ff2d827300 Refactoring of panel format dialog.
(display_box): rename to panel_listing_box. Use QuickDialog engine.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
dfb793ddf3 Reimplement "SMB authentication" dialog using QuckDialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
298201d305 Drop old QuickWidget engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
dca06a6786 mcfilemanager: use new quick dialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
779f111f6d mcedit: use new quick dialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
2fee821a3e mcdiffviewer: use new quick dialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
083e02be31 mcviewer: use new quick dialog engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
c59a14d438 Associate label with input line and enable/disable them as pair.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
1206d156bf (widget_set_options): new function to set/reset widget options.
Adjust enable/disable widgets.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:45 +04:00
Andrew Borodin
c6ddd28366 Unification of widget and dialog callback functions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:44 +04:00
Andrew Borodin
05d7f3c84e Aggressive use WIDGET macro.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:44 +04:00
Andrew Borodin
2a95cb2ffd Ticket #2919: widget system improvements and unifications.
First step: derive dialog from widget.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-19 21:42:44 +04:00
Andrew Borodin
3bde17c5a6 src/main.c: indentation.
src/filemanager/midnight.c: likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:45:28 +04:00
Andrew Borodin
2940b7455d Fix of DOXYGEN docs: @return instead of @returns
...and other minor corrections.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Ilia Maslakov
ff22fa9ca0 src/filemanager/command.c: add DOXYGEN doc little little code cleanup.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-11-09 10:05:13 +04:00
Andrew Borodin
7c415f2ec5 (enter): use GString instead of hand-made memory (re)allocation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
1d3132c08f Clarify of sig_atomic_t usage (got from Mutt).
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
82bb9c39da Define winch_flag as volatile sig_atomic_t.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
794145090d Fixups of SIGWINCH handling.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
f9b6abde52 Don't exit after migration of configuration files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
0ac261de1b Init file highlighting only in full mode.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:13 +04:00
Andrew Borodin
c45a27061b (exit_subshell): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:12 +04:00
Andrew Borodin
07f36b9cf7 (fish_linear_abort): type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:12 +04:00
Ilia Maslakov
489c3e3242 (fish_file_store): remove unnecessary 'was_error' variable.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-11-09 10:05:12 +04:00
Andrew Borodin
2476f281de (fish_file_store): type accuracy to avoid counter overflow while copiyng huge files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:12 +04:00
Andrew Borodin
b968fe0df8 (ftpfs_file_store): type accuracy and simplify conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-09 10:05:12 +04:00
Yury V. Zaytsev
994c432dd5 Ticket #2888: code cleanup before 4.8.7 release.
src/filemanager/dir.c: refactored growing of dir_list into a separate
function.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-11-09 10:05:12 +04:00
Andrew Borodin
1fcf90401a (ftpfs_get_reply): fix condition.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-23 15:18:47 +04:00
Andrew Borodin
56b71ae696 Fixes of indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-22 10:29:43 +04:00
Andrew Borodin
6c94ef16ec Refactoring of endless loops and some type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-21 18:19:52 +04:00
Andrew Borodin
b2f97443e2 Refactoring of subshell support.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-21 18:19:47 +04:00
Slava Zanko
ba0cef24cb make internal library for testing purposes
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-10-21 18:19:46 +04:00
Slava Zanko
7668c09879 remove src/main.h file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-10-21 18:19:46 +04:00
Slava Zanko
80011ad7cb Move global variables to an appropriate place
...and move update_xterm_title_path() and title_path_prepare()
from src/main.c to src/filemanager/layout.c

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-10-21 18:19:12 +04:00
Slava Zanko
6d4c3828af move do_load_prompt() and load_prompt() from src/main.c to src/filemanager/layout.c
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-10-21 18:19:11 +04:00
Slava Zanko
d6478b8b41 move do_cd from src/main.c to src/filemanager/panel.c
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-10-21 18:19:11 +04:00
Andrew Borodin
ede5d55197 mcedit: type accuracy in block operation routines.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-21 18:19:11 +04:00
Andrew Borodin
8ee5c7247c Fix of sys/ioctl.h includes: use HAVE_SYS_IOCTL_H guard.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-21 18:19:11 +04:00
Andrew Borodin
9cfff5ccbf src/filemanager/Makefile.am: cleanup source file list.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
0ffb5b190c Clarify of i18n initialization.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
62d14bd140 Rename _syntax_marker to syntax_marker_t and reimplement it using GSList.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
ee1f657994 (compare_word_to_right): minor refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
576412634f Fix types for line numbers and byte offsets in syntax highlighting engine.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
962259a224 Many editor functions: take editor as constant object.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
7f7a75f988 (get_first_editor_line): minor refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
8883273bdd (edit_get_syntax_color): return color directly.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
ef0dd43430 Rename syntax_rule to edit_syntax_rule_t.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
3c69a2cafb (book_mark_clear): return gboolean instead of int.
(book_mark_query_color): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
15446985bf Rename _book_mark to edit_book_mark_t.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
96e463086b (edit_delete): take gboolean instead of int.
(edit_backspace): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
8b0062ad8a (edit_block_move_cmd): minor cleanup.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00