Commit Graph

12606 Commits

Author SHA1 Message Date
Andrew Borodin
f949a29422 Merge branch '2290_find_file_speedup'
* 2290_find_file_speedup:
  Refactoring of WListbox widget.
  Optimize updates of status bar during search.
  Ticket #2290: make file find faster.
2014-01-14 14:15:54 +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
Andrew Borodin
e65954d5b0 Merge branch '3093_keep_symlink_cwd_startup_fix'
* 3093_keep_symlink_cwd_startup_fix:
  Ticket #3093: fix sefault in case of run "mcedit relative/path/to/file".
2014-01-09 13:39:42 +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
Andrew Borodin
87e97f5083 Merge branch '3125_zsh_precmd'
* 3125_zsh_precmd:
  Ticket #3125: don't override precmd on Zsh
2014-01-09 13:34:31 +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
Andrew Borodin
11108180ba Merge branch '3124_zsh_escape_history'
* 3124_zsh_escape_history:
  Ticket #3124: really escape Zsh history
2014-01-04 16:23:27 +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
Andrew Borodin
18dcddf16b Merge branch '3093_keep_symlink_cwd_startup'
* 3093_keep_symlink_cwd_startup:
  Add tests for check that symlinks in cwd are handled correctly.
  Ticket #3093: keep symlinks in cwd at startup.
2013-12-27 19:08:20 +04:00
Slava Zanko
4449cfb3c5 Add tests for check that symlinks in cwd are handled correctly.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-12-27 19:07:58 +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
Andrew Borodin
56b76cecdf Merge branch '3111_mcedit_reset_selection'
* 3111_mcedit_reset_selection:
  Ticket #3111: configurable selection reset on CK_Store.
2013-12-20 09:33: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
Andrew Borodin
4ad5b134dc Merge branch '3114_ncurses_build'
* 3114_ncurses_build:
  Ticket #3114: fix broken build with NCurses.
2013-12-04 15:14:49 +04:00
Andrew Borodin
d870aedad1 Ticket #3114: fix broken build with NCurses.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-12-04 15:14:07 +04:00
Slava Zanko
a8ffc26817 Updated doc/NEWS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 21:42:56 +03:00
Slava Zanko
9c76ec340c Updated translations from Transifex
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 17:03:59 +03:00
Slava Zanko
6df3e6c8b4 Updated the hints translations from Transifex
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 17:01:14 +03:00
Slava Zanko
af99dafd77 Fix for running TR-utilities under source root
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 17:00:46 +03:00
Slava Zanko
b75bf0cf11 Fix TX-address for getting hint-files
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-11-29 16:48:31 +03:00
Andrew Borodin
2903009ec7 Merge branch '3073_urar5_spaces_fix'
* 3073_urar5_spaces_fix:
  Ticket #3073: urar helper: fix handling filenames with spaces for unrar v5.
2013-11-29 14:11:43 +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
4e6dc8cbc9 Ticket #3044: invalid order of filename and line number for external editor.
Most applications require the line number to precede the filename,
with apparently 'vim' and 'mcedit' being the only exceptions
(they accept both possible orders). E.g. 'emacs +10 /etc/services'
opens that file at line 10, but 'emacs /etc/services +10' simply
ignores the line number.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-29 14:03:53 +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
50b599a6a7 Merge branch '3051_cleanup'
* 3051_cleanup: (27 commits)
  Use AC_HEADER_MAJOR.
  Don't use g_memmove().
  Fix use of uninitialized memory in sigaction structure.
  Clarify usage of MSG_IDLE in mcedit.
  Fix search in internal viewer in case of nroff mode.
  Use g_list_free_full().
  Use g_slist_free_full().
  Fix directory content counting before file operation.
  (me_remote): don't use undefined _GL_UNUSED.
  (file_mask_dialog): don't call tilde_expand() because vfs_path_from_str() returns an absolute path.
  Fix reloading of the root directory.
  Reduce cppcheck warnings (style) in src subdirectory.
  Clarify usage of WPanel widget.
  Rename structures:
  Reduce cppcheck warnings (style) in lib subdirectory.
  cppcheck: reduce variable scope.
  Use UTF8_CHAR_LEN instead of a magic number
  (lcsubstr): fix memory deallocation.
  (panel_get_field_by_title): fix memory leak.
  (sftpfs_open_file): fix memory leak.
  ...
2013-11-25 13:49:02 +04:00
Andrew Borodin
14973bfe79 Use AC_HEADER_MAJOR.
Instead of checking for sys/mkdev.h headerfile, there is the
AC_HEADER_MAJOR helper for how to get major(), minor(), makedev().

Sinc with GLib efb1701bf3baf6f5b05fd1a7a5a4ff990a7dc460.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-11-25 13:47:40 +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
377807c5de Fix search in internal viewer in case of nroff mode.
(mc_search__run_regex): fix conditions.

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