Commit Graph

12334 Commits

Author SHA1 Message Date
Andrew Borodin
45d8b20ad9 --with-edit: rename to --with-internal-edit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-02 15:29:35 +03:00
Victor Ananjevsky
6a83ddacd3 Fix bug with segfault when we tried to create new file in an external editor (by pressing shift-F4)
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-07-02 15:29:35 +03:00
Slava Zanko
9d081bec5a Ticket #3020: segfault on creating new file in external editor
Fixes for compiling code without warnings and errors when the --disable-editor option is specified

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-07-02 15:29:35 +03:00
Andrew Borodin
3f4397f812 Merge branch '2706_hexview_search_continue'
* 2706_hexview_search_continue:
  Don't adjust viewer parameters twice after search in the hex mode.
  Ticket #2706: hex viewer: continue search doesn't work.
2013-06-28 14:30:26 +04:00
Andrew Borodin
1bb36fd589 Don't adjust viewer parameters twice after search in the hex mode.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 14:30:00 +04:00
Andrew Borodin
24d746ad2b Ticket #2706: hex viewer: continue search doesn't work.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 14:30:00 +04:00
Andrew Borodin
fb7ee43d5b Merge branch '3026_findfile_all_charsets'
* 3026_findfile_all_charsets:
  lib/search/search.c: cosmetics.
  Ticket #3026: Find File: "All charsets" options don't work.
2013-06-28 13:20:39 +04:00
Andrew Borodin
de2a934b37 lib/search/search.c: cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 13:20:08 +04:00
Andrew Borodin
4f16d7e8f0 Ticket #3026: Find File: "All charsets" options don't work.
(mc_search_prepare): use cp_display not cp_source to convert text to all
available charsets.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 13:20:08 +04:00
Andrew Borodin
eb917257b1 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:33:03 +04:00
Andrew Borodin
bf1aefea02 Merge branch '2990_cleanup'
* 2990_cleanup:
  Refresh po/*.po files.
  Rename functions:
  (dlg_overlap): rename to widget_overlapped()
  (dlg_replace_widget): rename to widget_replace()
  (dlg_widget_active): rename to widget_is_active()
  (mcview_ok_to_quit): move to actions_cmd.c and make static.
  (dlg_mouse_event): minor refactoring.
  (dlg_default_callback): get rid of extra type cast.
  WTree: fix double-click handling.
  Code reorganization and fixes around the vfs_path_as_str() function
  Ticket #3022: misc/mc.menu contains russian UTF-8 "Ó" instead of English "c".
  (vfs_path_as_string): clarify return value.
  Fix draw of tree mini-status.
  Ticket #2071: a bit cleanup of getting profile name.
  Ticket #2164: clarify cursor position in mcviewer.
  Ticket# 2990: prepare to 4.8.9 release.
2013-06-28 09:22:25 +04:00
Andrew Borodin
da8ce368d9 Refresh po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
48abe8735f Rename functions:
init_widget -> widget_init
create_dlg -> dlg_create
init_dlg -> dlg_init
run_dlg -> dlg_run
destroy_dlg -> dlg_destroy

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
0adf569b54 (dlg_overlap): rename to widget_overlapped()
...and move to lib/widget/widget-common.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
c7da120588 (dlg_replace_widget): rename to widget_replace()
...and move to lib/widget/widget-common.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
1672fa44dd (dlg_widget_active): rename to widget_is_active()
...and move to lib/widget/widget-common.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
405143ba9f (mcview_ok_to_quit): move to actions_cmd.c and make static.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
970cfd881a (dlg_mouse_event): minor refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
01c5cf66a5 (dlg_default_callback): get rid of extra type cast.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
d5b35a7329 WTree: fix double-click handling.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Slava Zanko
d2eac2f5af Code reorganization and fixes around the vfs_path_as_str() function
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-28 09:21:16 +04:00
Andrew Borodin
a467bb4b6e Ticket #3022: misc/mc.menu contains russian UTF-8 "Ó" instead of English "c".
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Andrew Borodin
32bc72a1d7 (vfs_path_as_string): clarify return value.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Andrew Borodin
c45e109515 Fix draw of tree mini-status.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Andrew Borodin
d9b41df7a1 Ticket #2071: a bit cleanup of getting profile name.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Andrew Borodin
e066a25cc5 Ticket #2164: clarify cursor position in mcviewer.
When viewing a file, the cursor's position is different in the slang
and ncurses builds.

With slang, the cursor is in the upper right corner, on the percent sign.

With ncurses, the cursor wraps around to the beginning of the next line,
that is, the top left corner of the actual file contents viewing area.

In this commit, cursor is moved to upper right corner unconditionally
after print of percentage value.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Andrew Borodin
805bb61c2a Ticket# 2990: prepare to 4.8.9 release.
(mcview_load): clarify error message.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:16 +04:00
Slava Zanko
90209d3097 Code indentation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-19 22:56:55 +03:00
Slava Zanko
a3b96d69f1 Merge branch '2923_sftp_aliases'
* 2923_sftp_aliases:
  src/vfs/sftpfs/vfs_subclass.c: add missing includes.
  Fix: sftp: password ask too often if hostname was bring from ~/.ssh/config file
  Ticket #2923: broken aliases in SFTPFS.
2013-06-18 12:53:28 +03:00
Andrew Borodin
fc34675093 src/vfs/sftpfs/vfs_subclass.c: add missing includes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-18 12:52:18 +03:00
Slava Zanko
cb08c1d0bf Fix: sftp: password ask too often if hostname was bring from ~/.ssh/config file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-18 12:52:18 +03:00
Andrew Borodin
f2c94d53d2 Ticket #2923: broken aliases in SFTPFS.
(sftpfs_correct_file_name): fix handling of tilde-starting file names.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-18 12:52:18 +03:00
Andrew Borodin
97e37308b9 Ticket #2737: set of 256-color skins from Oliver Lange <modarin@bloody.in-berlin.de>.
modarin256: a moderate-dark-independent 256-color skin for Midnight Commander.

This skin is using colors independent from the default 16 terminal colors,
i.e., no matter how the 16 standard colors are configured, the appearance
of Midnight Commander will not be affected.

There are 4 variants of this skin:

modarin256
  - default skin, no standard colors used.

modarin256-defbg
  - like modarin256, but using the default background color for core, editor,
    viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
    background colors.

modarin256root
modarin256root-defbg
  - like the other two skins, but for the root user, with red colors used
    instead of green colors for things like select/focus/statusbar etc.,
    to keep reminding the user that mc is running as root.

Fallback skins for 16-color terminals (poor man's skins):

modarcon16
modarcon16-defbg
modarcon16root
modarcon16root-defbg
  - like everything running in a 16-color terminal, these skins look ugly
    and are no subsitute for the 256-color versions. As some terminals don't
    support using dark gray as background color, i used a black background
    and adjusted the remaining colors accordingly.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-17 13:53:14 +04:00
Andrew Borodin
9c927acb48 Update RU translation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-16 16:27:19 +04:00
Andrew Borodin
1b1986a1e5 Refresh po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-15 11:10:48 +04:00
Veres Lajos
805703523d Misspellings fixes by https://github.com/vlajos/misspell_fixer
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-15 11:10:41 +04:00
Slava Zanko
4b1f94e873 Direct commit in master: fix bug with a directory deletion
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-12 15:15:57 +03:00
Slava Zanko
92817a9b60 Merge branch '3016_extfs_segfault'
* 3016_extfs_segfault:
  Ticket #3016: Segfault while entering into extfs archive
2013-06-12 12:02:11 +03:00
Slava Zanko
56520fda0f Ticket #3016: Segfault while entering into extfs archive
Current master (4.8.8-49-g6b64835) segfaults while entering into any extfs archive (zip, rar, etc).
Bad commit is 2640b21bb9.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-12 12:01:33 +03:00
Slava Zanko
fef50bf629 Merge branch '3011_mc_gpm_and_xterm'
* 3011_mc_gpm_and_xterm:
  Ticket #3011: mc under x11 problems with mouse or hang due gpm
2013-06-11 12:10:58 +03:00
André Barros
9699d5dd69 Ticket #3011: mc under x11 problems with mouse or hang due gpm
mc may not detect the gpm mouse under X11 on many x terminals when running together with tmux or screen.

On some cases it can even hang.

It's a small patch to the gpm maintainer to improve its checking.
Seems there is a need also to a small change on mc.

Now everything is working perfectly.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-10 20:08:56 +03:00
Andrew Borodin
ffc536fb5d Merge branch '3001_subshell_prompt_fix'
* 3001_subshell_prompt_fix:
  Cleanup: remove unused 'prompt_pos' variable.
  (strip_ctrl_codes): type accuracy.
  Ticket #3001: fix read and update of subshell prompt.
2013-06-09 16:18:14 +04:00
Andrew Borodin
74ed317f35 Cleanup: remove unused 'prompt_pos' variable.
(do_subshell_chdir): remove 'reset_prompt' argument because of removed
'prompt_pos'.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:55 +04:00
Andrew Borodin
5b1982a6bb (strip_ctrl_codes): type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:55 +04:00
Andrew Borodin
f6684c638d Ticket #3001: fix read and update of subshell prompt.
The bug was introduced in e35f044ccd.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:54 +04:00
Andrew Borodin
61d230e494 Merge branch '3000_incorrect_filesize' 2013-06-07 13:07:21 +04:00
Andrew Borodin
d83902e7fc (size_trunc_len): minor optimization.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 13:06:51 +04:00
Andrew Borodin
ceff7c5922 size_trunc_len() generates incorrect result in some cases.
Revert "(size_trunc_len): support automatic maximum unit for specified size."
This reverts commit ef94b84eaf.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 12:12:34 +04:00
Andrew Borodin
7b5b41147d Ticket #3000: incorrect file size is reported in copy/move overwrite query dialog.
(overwrite_query_dialog): adjust file size.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 12:11:14 +04:00
Slava Zanko
6b64835a7e Merge branch '2990_cleanup'
* 2990_cleanup: (32 commits)
  Remove LC_ALL from info_size. INFO file generate without LC_ALL e.g. in current locale. Size must be computed with same locale, otherwise INFO file will be chopped of
  mceditor: last_bracket: make member of WEdit.
  Use "'" instead of "`" for messages and comments quoting.
  Search callbacks should return mc_search_cbret_t not int.
  Fix filename for msppt in ext.d/doc.sh: use $MC_EXT_FILENAME not %f.
  Fix info for ogg files in sound.sh
  Minor otimization of syntax highlightimg engine:
  (compare_word_to_right): use correct upper boundary of scanned text.
  option_whole_chars_search: unsed variable. Remove it and related code.
  (edit_update_screen): fix of editor frame drawing.
  src/editor/editcmd.c: remove unneeded include layout.h.
  Fix documentation: use actual menu item names.
  (edit_about): update year.
  (vfs_get_encoding): optimization and enhancement:
  (button_set_text): update value of WButton::hotpos.
  Use tty_draw_box instead of draw_box() to draw frames.
  (smbfs_fake_share_stat): don't access to free'd memory.
  Remove vfs_path_to_str() function for avoid often memory allocations.
  Use G_N_ELEMENTS macro to calculate of array size.
  WEdit::labels is unused. Remove.
  ...
2013-06-03 14:21:31 +03:00