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>
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>
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>
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>
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>
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>
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>
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>
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>
* Improve support for EPOCH
* Add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG
* Add support for VERIFYSCRIPTPROG
* Add support for TRIGGERSCRIPTS/TRIGGERSCRIPTPROG
Thanks Arkadiusz Miśkiewicz <arekm@maven.pl> for the original patch.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
MC already has its own half-ready trick: when pasting with Shift-Insert,
using the X11 extension, the newline ("Enter" as mc calls it) with the
Shift modifier pressed gets converted to a "Return", and in the editor
the Return character inserts a non-indenting newline. This makes pasting
better in terminals not supporting bracketed paste, however, it has some
problems that this commit addresses:
* Shift+newline gets this special treatment, but Ctrl+newline gets
dropped. Hence e.g. when pasting in Gnome-terminal with Ctrl+Shift+V
all the newlines will be missing. This commit adds the same
non-indenting newline behavior to Ctrl+Newline and Ctrl+Shift+Newline.
* The code forgets about Tab that also needs special treatment:
- Most terminals send \e[Z on Shift+Tab, this is not handled by MC
at all, moreover it causes a hang for about a second. This commit
teaches this sequence to MC. This is especially useful when no X11
is available, because there Ctrl+Tab is identical to Tab, so the
backwards tab feature is not available. With this commit Shift+Tab
becomes a backwards tab too on all terminals that emit \e[Z.
- When pasting to the editor, Shift+Tab, Ctrl+Tab and Ctrl+Shift+Tab
should all insert a tab for the same reason mentioned at the newline.
- It would look inconsistent in the keymap files to have logical code
such as "backtab" instead of "shift-tab" and friends, hence get rid
of KEY_BTAB and use KEY_M_SHIFT | '\t' instead.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Extfs urar helper doesn't allow to see the whole filename if it
contains spaces and is unpacked by unrar v5. This commit should fix that.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
How to reproduce:
Changes to the text file inside nested .zip file are lost.
echo "hello, world" >hello.txt
zip message.zip hello.txt
zip wrapper.zip message.zip
rm -v hello.txt message.zip
Using mc enter to wrapper.zip/message.zip and edit (F4) "hello.txt",
save, then exit mc.
unzip wrapper.zip
unzip message.zip
Result: changes were not saved to "hello.txt".
Expected result: changes are saved.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
...if file encoding and locale are different.
Example: locale is KOI8-R, file encoding is UTF-8. Note: those encodings
are not same.
File content is following (in Russian):
йцукен
Йцукен
The difference is in first line char only: Й (lowercase letter) and й
(uppercase letter). The search of Ê gives the result Й independently of
case sensitivity. й isn't found.
If switch "All charsets" on, nothing is found.
The main idea of fix is modification of search API to allow set of search
pattern charset and use if within search engine.
Old API:
mc_search_new (pattern, pattern_len);
New API:
mc_search_new (pattern, pattern_len, pattern_charset);
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
mc always expects to see cpio payload inside rpm packages. However, it
is also possible for rpm packages to contain tar payload (ustar, to be
more precise).
rpm2cpio works correctly for such files (but it produces tar archives,
not cpio ones).
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Following cases from command line are possible:
* 'mc' (no arguments):
active panel uses current directory
passive panel uses "other_dir" from panels.ini
* 'mc dir1 dir2' (two arguments):
active panel uses dir1
right panel uses dir2
* 'mc dir1' (single argument):
active panel uses dir1
passive panel uses "other_dir" from panels.ini
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Switching between vertical and horizontal layouts doesn't properly
activate or deactivate the < and > widget buttons in the layout dialog
according to the setting of the mode being switched to.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit does some rpm extfs facelift and adds dependency version
output; since this shifts the semantics from "name" to "name and maybe
a version", the generated virtual file has been renamed either (REQUIRES
instead of REQUIRENAME, more in a line with PROVIDES).
It is esteemed that nothing worse than a passing surprise for some users
would happen while improving the overall usefulness.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Alt+Shift+Left_arrow and Alt+Shift+Right_arrow directly influence the
divider position, but the < and > layout dialog buttons have the
reverse effect, which is unintuitive behavior. Reverse the direction of
< and > influence so that clicking left moves the divider left, and
clicking right moves the divider right.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Update the panel split display while adjusting the layout dialog,
because the user should not be expected to know what number of columns
or rows is reasonable without being able to see the effects. Cancel
reverts previous settings.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Following cases from command line are possible:
* 'mc' (no arguments):
active panel uses current directory
passive panel uses "other_dir" from ini
* 'mc dir1 dir2' (two arguments):
left panel uses dir1
right panel uses dir2
* 'mc dir1' (single argument):
active panel uses current directory
passive panel uses dir1
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
...in 'Directory hotlist' and 'Active VFS directories' windows.
Previously, the 'Right' key was used for:
1) move to the selected directory in the 'Directory hotlist' window;
2) enter into the selected group in the 'Directory hotlist' window;
3) move to the selected VFS in the 'Active VFS directories' window.
1) and 2) cases look as inconsistent bevavior because only two these
dialogs are closed after 'Right' key pressing.
Now 'Right' key is used only for 2) case and ignored in 1) and 2) cases.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
How to reproduce:
1. Create archive: touch a.txt && zip a.zip a.txt && tar cf a.tar a.zip
2. Press "Enter" on a.tar to enter into archive. Success.
3. Press "Enter" on a.zip to enter into archive. Nothing happens.
(regex_check_type): don't remove temporary file before read data from it.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Add "editor_filesize_threshold" ini option to ask open file if it size
is larger than specified threshold. Supported string value formats are:
"640000000", "64000K", "64M". Default value is 64M.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
