mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-02-05 15:29:27 +08:00
ncurses 6.1 - patch 20180922
+ ignore interrupted system-call in test/ncurses's command-line, e.g., if the terminal were resized. + add shift/control/alt logic for decoding xterm's 1006 mode (Redhat #1610681, cf: 20141011). + modify rpm test-packages to not use --disable-relink with Redhat, since Fedora 28's tools do not work with that feature.
This commit is contained in:
Thomas E. Dickey
parent
093902b419
commit
b73ae15cdc
10
NEWS
10
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3185 2018/09/08 23:29:00 tom Exp $
|
||||
-- $Id: NEWS,v 1.3190 2018/09/22 21:23:32 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names.
|
||||
Changes through 1.9.9e did not credit all contributions;
|
||||
it is not possible to add this information.
|
||||
|
||||
20180922
|
||||
+ ignore interrupted system-call in test/ncurses's command-line, e.g.,
|
||||
if the terminal were resized.
|
||||
+ add shift/control/alt logic for decoding xterm's 1006 mode (Redhat
|
||||
#1610681, cf: 20141011).
|
||||
+ modify rpm test-packages to not use --disable-relink with Redhat,
|
||||
since Fedora 28's tools do not work with that feature.
|
||||
|
||||
20180908
|
||||
+ document --with-pcre2 configure option in INSTALL.
|
||||
+ improve workaround for special case in PutAttrChar() where a cell is
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1240 2018/09/08 14:15:19 tom Exp $
|
||||
# $Id: dist.mk,v 1.1242 2018/09/22 16:36:59 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# This only needs to be used directly as a makefile by developers, but
|
||||
@ -37,7 +37,7 @@ SHELL = /bin/sh
|
||||
# These define the major/minor/patch versions of ncurses.
|
||||
NCURSES_MAJOR = 6
|
||||
NCURSES_MINOR = 1
|
||||
NCURSES_PATCH = 20180908
|
||||
NCURSES_PATCH = 20180922
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -84,7 +84,7 @@
|
||||
#define CUR SP_TERMTYPE
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.176 2017/11/18 22:12:06 Vassili.Courzakis Exp $")
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.177 2018/09/22 19:54:21 tom Exp $")
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
@ -956,6 +956,7 @@ decode_X10_bstate(SCREEN *sp, MEVENT * eventp, unsigned intro)
|
||||
{
|
||||
bool result;
|
||||
|
||||
_tracef("decode_X10_bstate %#x", intro);
|
||||
eventp->bstate = 0;
|
||||
|
||||
if (!handle_wheel(sp, eventp, (int) intro, (intro & 96) == 96)) {
|
||||
@ -1276,6 +1277,15 @@ decode_xterm_SGR1006(SCREEN *sp, MEVENT * eventp)
|
||||
} else {
|
||||
eventp->bstate = REPORT_MOUSE_POSITION;
|
||||
}
|
||||
if (b & 4) {
|
||||
eventp->bstate |= BUTTON_SHIFT;
|
||||
}
|
||||
if (b & 8) {
|
||||
eventp->bstate |= BUTTON_ALT;
|
||||
}
|
||||
if (b & 16) {
|
||||
eventp->bstate |= BUTTON_CTRL;
|
||||
}
|
||||
}
|
||||
result = (eventp->bstate & REPORT_MOUSE_POSITION) ? TRUE : FALSE;
|
||||
eventp->x = (data.params[1] ? (data.params[1] - 1) : 0);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20180908) unstable; urgency=low
|
||||
ncurses6 (6.1+20180922) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Sep 2018 10:15:19 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Sep 2018 12:36:59 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20180908) unstable; urgency=low
|
||||
ncurses6 (6.1+20180922) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Sep 2018 10:15:19 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Sep 2018 12:36:59 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.1+20180908) unstable; urgency=low
|
||||
ncurses6 (6.1+20180922) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 08 Sep 2018 10:15:19 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Sep 2018 12:36:59 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.287 2018/09/08 14:15:19 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.289 2018/09/22 16:36:59 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "1"
|
||||
!define VERSION_YYYY "2018"
|
||||
!define VERSION_MMDD "0908"
|
||||
!define VERSION_MMDD "0922"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.1
|
||||
Release: 20180908
|
||||
Release: 20180922
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.1
|
||||
Release: 20180908
|
||||
Release: 20180922
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
@ -44,10 +44,16 @@ This package is used for testing ABI %{MY_ABI}.
|
||||
%define _disable_ld_build_id 1
|
||||
%endif
|
||||
|
||||
%if %{is_redhat}
|
||||
# workaround for toolset breakage in Fedora 28
|
||||
%define _test_relink --enable-relink
|
||||
%else
|
||||
%define _test_relink --disable-relink
|
||||
%endif
|
||||
|
||||
%setup -q -n ncurses-%{version}-%{release}
|
||||
|
||||
%build
|
||||
%define my_srcdir ..
|
||||
%define CFG_OPTS \\\
|
||||
--target %{_target_platform} \\\
|
||||
--prefix=%{_prefix} \\\
|
||||
@ -60,7 +66,7 @@ This package is used for testing ABI %{MY_ABI}.
|
||||
--disable-leaks \\\
|
||||
--disable-macros \\\
|
||||
--disable-overwrite \\\
|
||||
--disable-relink \\\
|
||||
%{_test_relink} \\\
|
||||
--disable-termcap \\\
|
||||
--enable-hard-tabs \\\
|
||||
--enable-opaque-curses \\\
|
||||
@ -97,6 +103,7 @@ This package is used for testing ABI %{MY_ABI}.
|
||||
CFLAGS="%{CC_NORMAL}" \
|
||||
RPATH_LIST=../lib:%{_libdir} \
|
||||
%configure %{CFG_OPTS}
|
||||
|
||||
make
|
||||
|
||||
%install
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Curses library with POSIX thread support.
|
||||
Name: ncursest6
|
||||
Version: 6.1
|
||||
Release: 20180908
|
||||
Release: 20180922
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
@ -44,6 +44,13 @@ This package is used for testing ABI %{MY_ABI} with POSIX threads.
|
||||
%define _disable_ld_build_id 1
|
||||
%endif
|
||||
|
||||
%if %{is_redhat}
|
||||
# workaround for toolset breakage in Fedora 28
|
||||
%define _test_relink --enable-relink
|
||||
%else
|
||||
%define _test_relink --disable-relink
|
||||
%endif
|
||||
|
||||
%setup -q -n ncurses-%{version}-%{release}
|
||||
|
||||
%build
|
||||
@ -60,7 +67,7 @@ This package is used for testing ABI %{MY_ABI} with POSIX threads.
|
||||
--disable-leaks \\\
|
||||
--disable-macros \\\
|
||||
--disable-overwrite \\\
|
||||
--disable-relink \\\
|
||||
%{_test_relink} \\\
|
||||
--disable-termcap \\\
|
||||
--enable-hard-tabs \\\
|
||||
--enable-opaque-curses \\\
|
||||
|
||||
@ -40,7 +40,7 @@ AUTHOR
|
||||
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
|
||||
Thomas E. Dickey (beginning revision 1.27 in 1996).
|
||||
|
||||
$Id: ncurses.c,v 1.507 2018/06/23 21:35:06 tom Exp $
|
||||
$Id: ncurses.c,v 1.508 2018/09/22 21:21:43 tom Exp $
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
@ -7775,6 +7775,10 @@ main_menu(bool top)
|
||||
if (read(fileno(stdin), &ch, (size_t) 1) <= 0) {
|
||||
if (command == 0)
|
||||
command = 'q';
|
||||
if (errno == EINTR) {
|
||||
clearerr(stdin);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
} else if (command == 0 && !isspace(UChar(ch))) {
|
||||
command = ch;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user