svn commit: r456605 - in branches/2017Q4/misc/mc: . files

[Ben Woods]

Author: woodsb02
Date: Mon Dec 18 10:47:45 2017
New Revision: 456605
URL: https://svnweb.freebsd.org/changeset/ports/456605

Log:
  MFH: r456522
  
  misc/mc: Fix SUBSHELL blank terminal upon opening in xterm with Slang
  
  Note: Unfortunately this does not fix this issue on the FreeBSD console.
  
  PR:		217758
  Submitted by:	Alexander Moisseev <moiseev at mezonplus.ru>
  Reported by:	Dron <dron_2 at ua.fm>
  Reported by:	danfe
  
  Approved by:	ports-secteam (delphij)

Added:
  branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c
     - copied unchanged from r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c
Modified:
  branches/2017Q4/misc/mc/Makefile
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/misc/mc/Makefile
==============================================================================
--- branches/2017Q4/misc/mc/Makefile	Mon Dec 18 09:04:34 2017	(r456604)
+++ branches/2017Q4/misc/mc/Makefile	Mon Dec 18 10:47:45 2017	(r456605)
@@ -4,6 +4,7 @@
 PORTNAME=	mc
 PORTVERSION=	4.8.19
 PORTREVISION=	3
+PORTREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		http://ftp.osuosl.org/pub/midnightcommander/

Copied: branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c (from r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c	Mon Dec 18 10:47:45 2017	(r456605, copy of r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c)
@@ -0,0 +1,28 @@
+--- lib/tty/tty-slang.c.orig	2017-03-04 17:51:38 UTC
++++ lib/tty/tty-slang.c
+@@ -373,7 +373,11 @@ tty_shutdown (void)
+ void
+ tty_enter_ca_mode (void)
+ {
+-    /* S-Lang handles alternate screen switching and cursor position saving */
++    if (mc_global.tty.xterm_flag)
++    {
++        fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
++        fflush (stdout);
++    }
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */
+@@ -381,7 +385,11 @@ tty_enter_ca_mode (void)
+ void
+ tty_exit_ca_mode (void)
+ {
+-    /* S-Lang handles alternate screen switching and cursor position restoring */
++    if (mc_global.tty.xterm_flag)
++    {
++        fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m");
++        fflush (stdout);
++    }
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */