Commit Graph

13525 Commits

Author SHA1 Message Date
Mooffie
17706ad9f3 Configure summary omits "S-Lang" when used as screen library.
When using slang, 'configure' prints blank in the "Screen library" name:

    ...
    File system:                Midnight Commander Virtual Filesystem
                                cpio, extfs, fish, ftp, sfs, sftp, smb, tar
    Screen library:
    Mouse support:              gpm and xterm
    X11 events support:         yes
    ...

This occurs when slang is found using pkg-config (as opposed to explicit path
search). The patch fixes this by moving the 'screen_msg' assignment one level
up, to the controlling function (mc_WITH_SLANG) so that it's effective for
however method the library was found.

The problem was mentioned on our mailing list:

    https://mail.gnome.org/archives/mc-devel/2016-March/msg00021.html

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andreas Mohr
284a19aff1 (find_widget_type): Make Solaris Studio happy
Make Solaris Studio 12.4 happy.

"dialog.c", line 1029: warning: argument #2 is incompatible with prototype:
        prototype: pointer to const void
        argument : pointer to function (...) returning enum (...)

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andreas Mohr
72258dcca6 args.c: Make Solaris Studio happy
Make Solaris Studio 12.4 & 12.5 happy.

"args.c", line 180: warning: initialization type mismatch
"args.c", line 188: warning: initialization type mismatch

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
9f97274120 doc/README: use https.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
042ece84cb Ticket #3615: doc/README: fix URL.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
874be2de1e mcedit: rename functions:
edit_buffer_move_forward -> edit_buffer_get_forward_offset
edit_buffer_move_backward -> edit_buffer_get_backward_offset

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
2b8b1c56ea edit_buffer: clarify of buffer size update.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
954af9fec9 Ticket #3607: code cleanup bebore 4.8.17 release.
Clarify include of fileloc.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-07 16:19:02 +03:00
Andrew Borodin
7fd0f172ef Merge branch '3640_subshell_cursor_position'
* 3640_subshell_cursor_position:
  Do not duplicate alternate screen switching.
  Ticket #3640: Subshell cursor position lost after window resizing.
2016-05-05 10:01:47 +03:00
Yuri Khan
c1975a3a35 Do not duplicate alternate screen switching.
S-Lang already handles that in SLsmg_init_smg() and SLsmg_reset_smg().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-05 10:01:13 +03:00
Yuri Khan
abb4996589 Ticket #3640: Subshell cursor position lost after window resizing.
Refactoring: rename functions:

do_enter_ca_mode -> tty_enter_ca_mode
do_exit_ca_mode -> tty_exit_ca_mode

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-05 10:01:13 +03:00
Andrew Borodin
c4a8882b13 Merge branch '3639_subshell_output_lost'
* 3639_subshell_output_lost:
  Ticket #3639: fix window resizing when panels are hidden.
2016-05-05 09:56:56 +03:00
Yuri Khan
f278eaec99 Ticket #3639: fix window resizing when panels are hidden.
Calling tty_change_screen_size() causes a switch to the alternate screen:

   * Resizing the window causes a SIGWINCH sent to the mc process.
   * sigwinch_handler() sets the flag mc_global.tty.winch_flag to 1.
   * The select() call in feed_subshell() is interrupted.
   * feed_subshell() notices the winch_flag and calls tty_change_screen_size().
   * tty_change_screen_size() calls SLsmg_reinit_smg().
   * SLsmg_reinit_smg() sees that Smg_Mode is currently SMG_MODE_NONE
     (because it was set that way back in reset_smg() that was called
     when panels were hidden).
   * SLsmg_reinit_smg() calls SLsmg_init_smg().
   * SLsmg_init_smg() calls init_smg_for_mode(SMG_MODE_FULLSCREEN).
   * init_smg_for_mode() calls SLtt_init_video().
   * SLtt_init_video() sends the smcup terminfo sequence to the terminal.
   * SLtt_init_video() calls SLtt_init_keypad().
   * SLtt_init_keypad() sends the smkx terminfo sequence to the terminal
     and flushes the output buffer. (If $TERM starts with xterm or exactly
     matches screen, this function returns immediately without flushing the
     buffer, so the issue will not be visible.) The terminal switches to
     alternate screen and clears it.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-05-05 09:56:21 +03:00
Yury V. Zaytsev
30cf792a49 Merge branch '3622_fix_unzip_extfs' 2016-05-01 16:30:21 +02:00
Mooffie
a1d2c81d15 Ticket #3622: extfs/uzip: fix date parsing
By default, on Unix systems, unzip gets compiled with MDY date order. Debian
based distros compile it with YMD order, for which this patch adds support.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-05-01 14:23:35 +02:00
Yury V. Zaytsev
db074dd954 Merge branch '3609_keymap_symlink' 2016-05-01 11:20:17 +02:00
Andreas Mohr
284003e838 Ticket #3609: install mc.keymap as a symlink to mc.default.keymap
Save space and fix rpmlint warning found by OBS Framework
(build.opensuse.org).

mc.x86_64: W: files-duplicate /etc/mc/mc.keymap /etc/mc/mc.default.keymap

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-05-01 11:20:07 +02:00
Yury V. Zaytsev
a56511ce1a Merge branch '3610_fish_noexec' 2016-05-01 09:28:32 +02:00
Andreas Mohr
903773ceed Ticket #3610: remove executable bit from FISH helper scripts
Prevent them from getting accidentally run by users and fix rpmlint
warning found by OBS Framework (build.opensuse.org)

mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/append
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/chmod
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/chown
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/fexists
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/get
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/hardlink
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/info
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/ln
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/ls
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/mkdir
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/mv
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/rmdir
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/send
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/unlink
mc.x86_64: W: script-without-shebang /usr/lib/mc/fish/utime

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-04-30 18:02:25 +02:00
Andrew Borodin
61bc352b62 Merge branch '1885_autopoint_without_cvs'
* 1885_autopoint_without_cvs:
  Simplify `autogen.sh` by switching to `autoreconf`
  Ticket #1885: minimal gettext version is 0.18.1.
2016-04-28 09:25:58 +03:00
Andreas Mohr
b6cbac1017 Simplify autogen.sh by switching to autoreconf
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-04-28 09:25:18 +03:00
Andrew Borodin
406765f044 Ticket #1885: minimal gettext version is 0.18.1.
Since 0.18.1, the 'autopoint' program uses the 'git' program instead of
'cvs' one by default.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-28 09:25:18 +03:00
Yury V. Zaytsev
23c00cf33f Merge branch '2742_csh_as_tcsh_fix' 2016-04-25 21:44:15 +02:00
Yury V. Zaytsev
0430ec719b Add csh to the list of fallback shell options
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-04-25 21:44:01 +02:00
Yury V. Zaytsev
6dfbebf71e Ticket #2742: detect csh as tcsh by name
Signed-off-by: Yury V. Zaytsev <yury.zaytsev@traveltainment.de>
2016-04-25 21:44:01 +02:00
Andrew Borodin
7b928e6b94 Merge branch '2193_copy_buffer_size'
* 2193_copy_buffer_size:
  (copy_file_file): reduce variable scopes.
  (copy_file_file): get rid of one goto.
  (copy_file_file): rename variables.
  (copy_file_file): define copy buffer size in depend on destination file system block size.
  (io_blksize): add intermediate variable.
  (ST_BLKSIZE): fix signed and unsigned comparision.
  Ticket #2193: use Coreutils way to define buffer size to copy file.
2016-04-25 13:29:26 +03:00
Andrew Borodin
cedcb28912 (copy_file_file): reduce variable scopes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
f866d41746 (copy_file_file): get rid of one goto.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
abfadbb27f (copy_file_file): rename variables.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
18f6b85005 (copy_file_file): define copy buffer size in depend on destination file system block size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
9523401374 (io_blksize): add intermediate variable.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
ba526badf2 (ST_BLKSIZE): fix signed and unsigned comparision.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:15:12 +03:00
Andrew Borodin
e7c01c7781 Ticket #2193: use Coreutils way to define buffer size to copy file.
m4.include/stat-size.m4, lib/stat-size.h: get these files from Gnulib.
src/filemanager/ioblksize.h: get this file from Coreutils.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-25 13:12:51 +03:00
Yury V. Zaytsev
5ba97897cf Merge branch '3611_fish_ls_perl_fix' 2016-04-24 17:04:39 +02:00
Andreas Mohr
263012123c Ticket #3611: fix FISH ls helper (Perl)
In #3599 a Perl warning was introduced in fish_list_perl(), so
fish_list_perl() was skipped (return code 255) and fallback ls function
was used instead.

Additionally, all % chars must quoted because of g_strconcat() after
reading script file into a string.

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2016-04-21 21:37:35 +02:00
Andrew Borodin
9d0f6e584e Merge branch '3598_wcast_qual'
* 3598_wcast_qual: (27 commits)
  src/setup.c: cleanup -Wcast-qual warning.
  src/clipboard.c: cleanup Wcast-qual warning.
  src/viewer/search.c: cleanup some -Wcast-qual warning.
  src/vfs/extfs.c: cleanup -Wcast-qual warnings.
  src/filemanager/find.c: cleanup -Wcast-qual warning.
  src/filemanager/file.c: cleanup -Wcast-qual warning.
  src/filemanager/file.c: cleanup -Wcast-qual warning.
  src/filemanager/panel.c: cleanup -Wcast-qual warning.
  src/editor/syntax.c: cleanup -Wcast-qual warnings.
  src/editor/editcmd.c: cleanup some -Wcast-qual warnings.
  src/editor/choosesyntax.c: cleanup -Wcast-qual warning.
  src/diffviewer/ydiff.c: cleanup -Wcast-qual warning.
  (dview_get_utf): apply const qualifier to str argument.
  lib/charsets.[ch]: clarify usage of const qualifier.
  lib/widget/input_complete.c: cleanup -Wcast-qual warning.
  lib/widget/input.c: cleanup -Wcast-qual warning.
  lib/widget/dialog.c: cleanup -Wcast-qual warning.
  lib/widget/buttonbar.c: cleanup -Wcast-qual warning.
  lib/vfs/path.c: cleanup some -Wcast-qual warning.
  lib/tty/tty-ncurses.c: cleanup -Wcast-qual warning.
  ...
2016-04-16 10:24:58 +03:00
Andreas Mohr
d033e17a23 src/setup.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
2016-04-16 10:23:45 +03:00
Andreas Mohr
9a48fb4b0c src/clipboard.c: cleanup Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
311ef4c669 src/viewer/search.c: cleanup some -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
f9f08fbfd7 src/vfs/extfs.c: cleanup -Wcast-qual warnings.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
0fae3ded3e src/filemanager/find.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andrew Borodin
8fd2fd69d7 src/filemanager/file.c: cleanup -Wcast-qual warning.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
e9730afef5 src/filemanager/file.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
6005a63cad src/filemanager/panel.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
3e7695619f src/editor/syntax.c: cleanup -Wcast-qual warnings.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
d640a34ada src/editor/editcmd.c: cleanup some -Wcast-qual warnings.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:45 +03:00
Andreas Mohr
edff1cff6f src/editor/choosesyntax.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:44 +03:00
Andreas Mohr
9cb22c41a6 src/diffviewer/ydiff.c: cleanup -Wcast-qual warning.
Signed-off-by: Andreas Mohr <and@gmx.li>
2016-04-16 10:23:44 +03:00
Andrew Borodin
0b46b4690f (dview_get_utf): apply const qualifier to str argument. 2016-04-16 10:23:44 +03:00
Andrew Borodin
fde36f2d1a lib/charsets.[ch]: clarify usage of const qualifier.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2016-04-16 10:23:44 +03:00