Commit Graph

4905 Commits

Author SHA1 Message Date
Andrew Borodin
736279aa8a Ticket #3119: fix format paragrap formatting.
(word_start): remove extra decrement.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:38:16 +04:00
Andrew Borodin
9757d53cf4 Launching external editor/viewer with F4/F3 w/o passing line number.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
cef5286fce Allow launch external editor/viewer w/o line number.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
9d83d55d84 Ticket #3117: Launching editor with CK_Edit shouldn't pass line number.
When pressing F4 to start the editor, a "+1" argument is passed to open
the file at the first line.

For some editor this is absolutely unnecessary since they open the file
there anyways. For some others (at least "joe", but probably others too)
this is harmful: joe has a convenience feature that by default it opens
the file where it was last open, unless of course overridden from
command line. Currently mc forces joe to open the file at the first
line, although opening it where it was last open would be much more
desired.

The right solution would be to consult mc.lib only when opening the
viewer/editor through the "word search in files (M-?)" feature, and
not when F3/F4 is pressed on a file, in the latter case $VIEWER or
$EDITOR should simply be launched with the filename but no additional
parameters.

Initial step: minor refactoring:
(do_edit_at_line): rename to edit_file_at_line.
(edit_file_at_line): changed type of arguments from int to gboolean.
(view_file_at_line): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:23:02 +04:00
Andrew Borodin
7df67031a2 Refactoring of WListbox widget.
Use GQueue instead of GList to store listbox entries.

g_list_append() function is slow because it uses g_list_last()
internally to traverse from the beginning to the end of a list, so
forming a list of results has O(n*n) complexity instead of O(n).
GQueue contains pointers to head and tail of list and list length.
So in this case we don't need seach end of list every time when we
want append listbox entry to the listbox.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Sergey Naumov
8aa3c77ecf Optimize updates of status bar during search.
Optimization is based on examining file size and time of the last status
update. This is synchronous and is based on assumption that relatively
small files are quickly processed even on slow hardware so if refresh
timeout expires during their processing, the delay couldn't be noticed
by human. Therefore only rather big files have to be reported
unconditionally, and others - only if there is a match in this file or
if timeout expires.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Sergey Naumov
8ae1de5b02 Ticket #2290: make file find faster.
Gets rid of get_line_at() function that was called only at one place and
was tightly coupled with caller function. It allows to perform some
minor optimizations, and as a result improve search time by 8%.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-14 14:13:38 +04:00
Andrew Borodin
7abd8a1297 src/subshell.c: indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:42:54 +04:00
Egmont Koblinger
ad5246c6ef Ticket #3093: fix sefault in case of run "mcedit relative/path/to/file".
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:39:12 +04:00
Igor Urazov
75073307b9 Ticket #3125: don't override precmd on Zsh
Do not override global precmd() funcation on Zsh. Define new _mc_precmd()
function and add it to precmd_functions array instead. This also effectively
fixes race condition with pwd call on Zsh, which may lead to empty prompt in mc.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-09 13:33:49 +04:00
Igor Urazov
72544cec5f Ticket #3124: really escape Zsh history
Per Zsh documentation last command prefixed with space lingers in the
internal history until the next command is entered before it vanishes.
To make it vanish right away, type a space and press return.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2014-01-04 16:22:38 +04:00
Andrew Borodin
dcedeaba1a (load_setup): clarify usage of internal variable.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-28 08:50:30 +04:00
Egmont Koblinger
7866bf7342 Ticket #3093: keep symlinks in cwd at startup.
If you navigate in your shell to a directory containing symlinks and
then start mc, mc will show the canonical path instead. It would be nice
to make it show the directory with the symlinks.

Example: in your shell execute these:

user:~$ mkdir -p /tmp/a/b /tmp/x ; ln -s /tmp/a/b /tmp/x/y
user:~$ cd /tmp/x/y
user:/tmp/x/y$ mc

In mc you'll find yourself in /tmp/a/b, though it'd be nicer to see
/tmp/x/y at the top, and correspondingly navigating to the parent would
take you to /tmp/x.

If you start bash or zsh from /tmp/x/y, the new instance will start
displaying the working directory as such. They do this via the PWD env
variable. On one hand, they set and maintain PWD to point to the current
directory, using the path as specified by the user (possibly containing
symbolic links). On the other hand, they check its value at startup. If
$PWD points to the same physical directory as the actual working
directory then they use this value. If $PWD points somewhere else then
it's simply ignored (so it's a hint only as to which symlinks to use to
get to the working directory, but never alters the actual cwd).

Now mc also does the same at startup (with respect of "Cd follows
links" option). Relative directories specified in the command line  are
applied after possibly replacing the canonical cwd with $PWD. This way
for example

user:/tmp/x/y$ mc . ..

opens two panels in /tmp/x/y and /tmp/x instead of /tmp/a/b and /tmp/a
(whereas /tmp/x is actually a different directory than /tmp/a).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-27 19:07:58 +04:00
Sergey Naumov
fb9b12c3d2 Ticket #3111: configurable selection reset on CK_Store.
In mc-4.7.x.x selection was reset on CK_Store (copy to buffer).
In mc-4.8.x (4.8.11 and older) it is not.

Now this behavior is configurable using editor_drop_selection_on_copy
key in the ini file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-20 09:33:31 +04:00
David Haller
9d190f66eb Ticket #3073: urar helper: fix handling filenames with spaces for unrar v5.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-29 14:11:08 +04:00
Andrew Borodin
4c3d5df63b (read_file_system_list): remove extra }.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 14:07:51 +04:00
Andrew Borodin
77717b67bb Don't use g_memmove().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
bb65b46790 Fix use of uninitialized memory in sigaction structure.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Egmont Koblinger
255cc340b5 Clarify usage of MSG_IDLE in mcedit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
29f6dd2a84 Use g_list_free_full().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
90dc6fffac Use g_slist_free_full().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
d0a082fbd5 Fix directory content counting before file operation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
dcfba47c8e (me_remote): don't use undefined _GL_UNUSED.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
1b774ac1fe (file_mask_dialog): don't call tilde_expand() because vfs_path_from_str() returns an absolute path.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Andrew Borodin
673d438938 Fix reloading of the root directory.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Slava Zanko
b136b2fa9f Reduce cppcheck warnings (style) in src subdirectory.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:40 +04:00
Andrew Borodin
9fcff743a7 Clarify usage of WPanel widget.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +04:00
Slava Zanko
e351822191 Rename structures:
* FileOpContext -> file_op_context_t
* FileOpContextUI -> file_op_context_ui_t

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:40 +04:00
Slava Zanko
0ed4a91d7d Reduce cppcheck warnings (style) in lib subdirectory.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:39 +04:00
Slava Zanko
0d489acd58 cppcheck: reduce variable scope.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:39 +04:00
Slava Zanko
a3b8a2f005 Use UTF8_CHAR_LEN instead of a magic number
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:39 +04:00
Andrew Borodin
74d4efe871 (lcsubstr): fix memory deallocation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:39 +04:00
Andrew Borodin
e986039142 (panel_get_field_by_title): fix memory leak.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:39 +04:00
Andrew Borodin
917d463d28 (sftpfs_open_file): fix memory leak.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:39 +04:00
Andrew Borodin
6cbb11673c src/vfs/undelfs/undelfs.c: fix memory leaks.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:39 +04:00
Slava Zanko
bd69b8dd31 Suppress cppcheck errors
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-25 13:47:39 +04:00
Andrew Borodin
ef90859a8f Ticket #3096: clarify "Setup saved to ~/.config/mc/ini" message.
The "Options -> Save setup" menu entry tells me "Setup saved to
~/.config/mc/ini".

This information is misleading, since this is not the only file
written, e.g. panels.ini is also updated.

Now this message contains the directory only:
"Setup saved to ~/.config/mc".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-23 14:57:50 +04:00
Andrew Borodin
bae94b7acd Ticket #3105: fix crash when moving directories on different file systems
...in case "Verbose operation" option is off.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-22 14:20:42 +04:00
Slava Zanko
0bc183c842 Ticket #3101: F3 doesn't work on .so files in FreeBSD 9.x
FreeBSD 9.x doesn't accept syntax for viewing lib) files
processed by /usr/local/libexec/mc/ext.d/misc.sh
revealing "/usr/local/libexec/mc/ext.d/misc.sh: 25: Syntax error: | unexpected".

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-22 13:15:53 +03:00
Andrew Borodin
5a04c1ede2 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:27:24 +04:00
Oleksandr Natalenko
97d7bdfd77 Ticket #3091: iso9660: fix truncated filenames.
±1 problem results in truncating filenames in ISO file listing. This
commit fixes the issue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:09 +04:00
Andrew Borodin
50734c0716 Ticket #3089: (load_panelize): drop deprecated "find -perm +xxx" syntax.
Use "find -perm /xxx" instead.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:09 +04:00
Andrew Borodin
c26c3cc4fd (check_file_access): return FALSE if Esc was pressed.
edit_query_dialog2() returns (-1) in this case.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:09 +04:00
Andrew Borodin
c058e92586 Remove input_set_origin(). Use widget_set_size() instead.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
e78b1fdf66 Remove redundant checks for g_strdup().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
20ab79ba00 Use vfs_translate_path() to avoid extra string duplication.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
ae824a3622 src/vfs/extfs/helpers/urar.in: add comment.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
e4747a8c5d (extfs_get_path_int): fix memory leak.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
0fb3e0a3c7 Directory size: rename variables for consistency.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00
Andrew Borodin
01d6801f4e (do_compute_dir_count): display directory name only.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-10-04 09:14:08 +04:00