mc: bump version

switch to gentoo patch for mouse extended sequence
This commit is contained in:
Jerome Duval
2022-04-07 09:28:49 +02:00
parent ba67427dc2
commit 6b7890f465
3 changed files with 19 additions and 27 deletions

View File

@@ -8,10 +8,10 @@ archives to be manipulated like real files."
HOMEPAGE="https://www.midnight-commander.org/"
COPYRIGHT="1994-2019, Free Software Foundation"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
CHECKSUM_SHA256="31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4"
PATCHES="0001-reset-xmouse_seq-when-setting-xmouse_extended_seq.patch"
CHECKSUM_SHA256="e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803"
PATCHES="mc-4.8.26-ncurses-mouse.patch"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,24 +0,0 @@
From b81f77d8d57d72bddf8aab1139203a5b86575c55 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Apr 2022 16:16:47 +0200
Subject: [PATCH] reset xmouse_seq when setting xmouse_extended_seq
---
lib/tty/tty.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/tty/tty.c b/lib/tty/tty.c
index 05b3a49..b72c935 100644
--- a/lib/tty/tty.c
+++ b/lib/tty/tty.c
@@ -405,6 +405,7 @@ tty_init_xterm_support (gboolean is_xterm)
xmouse_seq = ESC_STR "[M";
xmouse_extended_seq = ESC_STR "[<";
+ xmouse_seq = NULL;
}
}
--
2.30.2

View File

@@ -0,0 +1,16 @@
Fix mouse-key input with ncurses6 in terminals without basic X10 mouse
support, at the cost of breaking it with ncurses5. See discussion in
https://midnight-commander.org/ticket/4144 .
--- a/lib/tty/key.c
+++ b/lib/tty/key.c
@@ -2124,8 +2124,7 @@
gboolean extended = c == MCKEY_EXTENDED_MOUSE;
#ifdef KEY_MOUSE
- extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL
- && xmouse_extended_seq != NULL);
+ extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL);
#endif /* KEY_MOUSE */
xmouse_get_event (event, extended);