From b59fa8df26c02a1e41fe564536a872e354421aa7 Mon Sep 17 00:00:00 2001 From: arakiken Date: Mon, 17 Jan 2022 00:20:31 +0900 Subject: [PATCH] * 3.9.2 released. (tag "rel-3_9_2") * configure.in, mlterm.spec, main/version.h.in, mlterm.c, android/jni/version.h, vt_parser.c: updated for 3.9.2. * README, man/mlterm.1, doc/en/PROTOCOL, etc/main, etc/main.ja, gtk/README, doc/en/README.win32, doc/ja/README.win32 : Updated. --- ChangeLog | 12 ++++++++++++ README | 4 ++-- android/jni/version.h | 2 +- configure | 2 +- configure.in | 2 +- doc/en/PROTOCOL | 2 +- doc/en/README.win32 | 2 +- doc/en/ReleaseNote | 1 + doc/ja/README.win32 | 2 +- etc/main | 2 ++ etc/main.ja | 3 +++ gtk/README | 17 +++++++++++------ main/version.h.in | 4 ++-- man/mlterm.1 | 2 +- mlterm.spec | 5 ++++- vtemu/vt_parser.c | 2 +- 16 files changed, 45 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3305606bc..2b18923d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2022-01-16 Araki Ken + + * 3.9.2 released. + (tag "rel-3_9_2") + + * configure.in, mlterm.spec, main/version.h.in, + mlterm.c, android/jni/version.h, vt_parser.c: + updated for 3.9.2. + + * README, man/mlterm.1, doc/en/PROTOCOL, etc/main, etc/main.ja, + gtk/README, doc/en/README.win32, doc/ja/README.win32 : Updated. + 2021-12-31 Araki Ken * gtk/vte.c: vte_terminal_{set|get}_scroll_unit_is_pixels() are added. diff --git a/README b/README index 0fbcb13ac..30a3b8fc7 100644 --- a/README +++ b/README @@ -254,8 +254,8 @@ Supported platforms * FreeBSD 2.2.9 / X (x86) * FreeBSD(98) 4.11 / framebuffer (np21w ver.0.86 rev.42) * OpenBSD 5.3 / framebuffer (x86) - * MS Windows 10 + Cygwin 3.1.4 / GDI, SDL2 (CC=gcc, CC="i686-pc-mingw32-gcc") (x86_64) - * MS Windows 10 + MSYS2 3.0.6 / GDI (x86) + * MS Windows 10 + Cygwin 3.1.7 / GDI, SDL2 (CC=gcc, CC="i686-pc-mingw32-gcc") (x86_64) + * MS Windows 10 + MSYS2 3.1.7 / GDI (x86) * MacOSX 10.6.8 / X, Cocoa, SDL2 (x86) * MacOSX 10.8.5 / X, Cocoa, SDL2 (x86) * iOS Simulator 4.3 / CocoaTouch (x86) diff --git a/android/jni/version.h b/android/jni/version.h index b31e2ea43..675d86d55 100644 --- a/android/jni/version.h +++ b/android/jni/version.h @@ -7,7 +7,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 9 -#define REVISION 1 +#define REVISION 2 #define PATCH_LEVEL 0 #if 0 diff --git a/configure b/configure index 932fe5aea..269e8feea 100755 --- a/configure +++ b/configure @@ -20044,7 +20044,7 @@ fi # Define the identity of the package. PACKAGE=mlterm - VERSION=3.9.1 + VERSION=3.9.2 cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index 9baeeebdc..944b00710 100644 --- a/configure.in +++ b/configure.in @@ -1050,7 +1050,7 @@ if test "$enable_use_tools" = "no" ; then fi AC_SUBST(TOOLS_CFLAGS) -AM_INIT_AUTOMAKE(mlterm,3.9.1) +AM_INIT_AUTOMAKE(mlterm,3.9.2) for tool in ${tools} ; do case ${tool} in diff --git a/doc/en/PROTOCOL b/doc/en/PROTOCOL index 7491d1227..8f8f17b6e 100644 --- a/doc/en/PROTOCOL +++ b/doc/en/PROTOCOL @@ -1,7 +1,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*- mlterm configuration protocol -version 20201108 +version 20220116 * Protocol exec = "\x1b]5379;" "\x07" diff --git a/doc/en/README.win32 b/doc/en/README.win32 index 269b49e2c..1c3652f7d 100644 --- a/doc/en/README.win32 +++ b/doc/en/README.win32 @@ -3,7 +3,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*- Memo about WIN32 native GUI. * Tested environments. - MS Windows 10 + MSYS2 3.0.6 or Cygwin 3.0.7 + MS Windows 10 + MSYS2 3.1.7 or Cygwin 3.1.7 + libssh2 1.9.0(win32 native) + Fribidi 0.19.2(win32 native) diff --git a/doc/en/ReleaseNote b/doc/en/ReleaseNote index 4405fb8ac..52eda8b84 100644 --- a/doc/en/ReleaseNote +++ b/doc/en/ReleaseNote @@ -1,3 +1,4 @@ +ver 3.9.2 * Support Fcitx5. * Support GTK4 for mlconfig. (./configure --with-gtk=4.0) * Support CSI > Ps q (XTVERSION). (Response: DCS>|mlterm(3.9.2)ST) diff --git a/doc/ja/README.win32 b/doc/ja/README.win32 index 4ca6aa1f1..559c80c6e 100644 --- a/doc/ja/README.win32 +++ b/doc/ja/README.win32 @@ -3,7 +3,7 @@ comment -*- mode: text; tab-width:2; indent-tabs-mode:nil -*- WIN32 native GUI 対応に関するメモ * テスト環境 - MS Windows 10 + MSYS2 3.0.6 or Cygwin 3.0.7 + MS Windows 10 + MSYS2 3.1.7 or Cygwin 3.1.7 + libssh2 1.9.0(win32 native) + Fribidi 0.19.2(win32 native) diff --git a/etc/main b/etc/main index f69463c45..e7a68fb36 100644 --- a/etc/main +++ b/etc/main @@ -284,6 +284,8 @@ # receive_directory = +# format_other_keys = false + # (Available for Android) # start_with_local_pty = false diff --git a/etc/main.ja b/etc/main.ja index 90a2441fa..3c8419074 100644 --- a/etc/main.ja +++ b/etc/main.ja @@ -412,6 +412,9 @@ scrollbar_view_name = sample # zmodem や scp で受信したファイルを保存するディレクトリ # receive_directory = +# xterm の formatOtherKeys と同じ +# format_other_keys = false + # default_server オプションが指定されていない場合に、起動時の SSH 接続ダイ # アログを表示しないようにします。 # (mlterm-fb on NetBSD/x68k or OpenBSD 用) diff --git a/gtk/README b/gtk/README index 16d400a00..0017d94e4 100644 --- a/gtk/README +++ b/gtk/README @@ -9,7 +9,7 @@ How to build & install libvte compatible library using mlterm engine. (gnome-terminal, roxterm, synaptic or etc) * Supported API - vte 0.62 + vte 0.66 * Build $ ./configure (--with-type-engine=cairo --with-imagelib=gdk-pixbuf --enable-pty-helper \ @@ -188,15 +188,16 @@ How to build & install libvte compatible library using mlterm engine. "visible-bell" * Tested terminals using vte. - o gnome-terminal 3.38.1 on Arch Linux ... OK except transparency + o gnome-terminal 3.42.1 on Arch Linux ... OK except transparency o gnome-terminal 2.16.0 on CentOS 5 ... OK - o roxterm 3.3.2 on Arch Linux ... OK - o lxterminal 0.3.2 on Arch Linux ... OK - o sakura 3.7.1 on Arch Linux ... OK - o terminator 1.92 on Arch Linux ... OK + o roxterm 3.11.1 on Arch Linux ... OK + o lxterminal 0.4.0 on Arch Linux ... OK + o sakura 3.8.3 on Arch Linux ... OK + o terminator 2.1.1 on Arch Linux ... OK Following platforms are not actually tested by developers, but were tested in the past. + o gnome-terminal 3.38.1 on Arch Linux ... OK except transparency o gnome-terminal 3.34.2 on Arch Linux ... OK except transparency o gnome-terminal 3.32.2 on Arch Linux ... OK except transparency o gnome-terminal 3.30.2 on Arch Linux ... OK except transparency @@ -215,6 +216,8 @@ How to build & install libvte compatible library using mlterm engine. o gnome-terminal 2.32.0 on Ubuntu 10.10 o gnome-terminal 3.22.0 on Fedora 25 o gnome-terminal 3.20.2 on Fedora 24 + o lxterminal 0.3.2 on Arch Linux + o roxterm 3.3.2 on Arch Linux o roxterm 3.1.4 on Ubuntu 15.10 o roxterm 2.9.5 on Ubuntu 15.04 o roxterm 2.8.2 on Ubuntu 14.10 @@ -236,6 +239,7 @@ How to build & install libvte compatible library using mlterm engine. o evilvte 0.5.0-1 on Ubuntu 12.04 o evilvte 0.4.8 on Ubuntu 11.10 o evilvte 0.4.9pre4 on NetBSD 3.0.1 + o sakura 3.7.1 on Arch Linux o sakura 3.6.0 on Arch Linux o sakura 3.1.5 on Ubuntu 15.04 o sakura 3.1.0 on Ubuntu 13.10 @@ -248,4 +252,5 @@ How to build & install libvte compatible library using mlterm engine. o lxterminal 0.1.11-2ubuntu1 on Ubuntu 12.04 o lxterminal 0.1.11 on Ubuntu 11.10 o gtkterm2 0.2.3 on NetBSD 3.0.1 + o terminator 1.92 on Arch Linux o terminator 1.91 on Arch Linux diff --git a/main/version.h.in b/main/version.h.in index 7045e2398..675d86d55 100644 --- a/main/version.h.in +++ b/main/version.h.in @@ -7,12 +7,12 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 9 -#define REVISION 1 +#define REVISION 2 #define PATCH_LEVEL 0 #if 0 #define CHANGE_DATE "pre/@CHANGE_DATE@" -#elif 1 +#elif 0 #define CHANGE_DATE "post/@CHANGE_DATE@" #else #define CHANGE_DATE "" diff --git a/man/mlterm.1 b/man/mlterm.1 index 34d39d50b..e6c7a1fba 100644 --- a/man/mlterm.1 +++ b/man/mlterm.1 @@ -1,5 +1,5 @@ .\" mlterm.1 -*- nroff -*- -.TH MLTERM 1 "2020-11-08" +.TH MLTERM 1 "2022-01-16" .SH NAME mlterm \- Multi Lingual TERMinal emulator on X .SH SYNOPSIS diff --git a/mlterm.spec b/mlterm.spec index 8197dd10b..fc887ff44 100644 --- a/mlterm.spec +++ b/mlterm.spec @@ -1,5 +1,5 @@ %define name mlterm -%define version 3.9.1 +%define version 3.9.2 %define release 1 %define prefix /usr %define bindir /usr/bin @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %{datadir}/mlterm/scrollbars/sample3/ %changelog +* Sun Jan 16 2022 Araki Ken +- Source version 3.9.2 + * Sun Nov 08 2020 Araki Ken - Source version 3.9.1 diff --git a/vtemu/vt_parser.c b/vtemu/vt_parser.c index bfc68670d..96097e2f3 100644 --- a/vtemu/vt_parser.c +++ b/vtemu/vt_parser.c @@ -4921,7 +4921,7 @@ inline static int parse_vt100_escape_sequence( } else if (*str_p == 'q') { /* "CSI > q" XTVERSION */ - char xtversion[] = "\x1bP>|mlterm(3.9.1)\x1b\\"; + char xtversion[] = "\x1bP>|mlterm(3.9.2)\x1b\\"; vt_write_to_pty(vt_parser->pty, xtversion, sizeof(xtversion) - 1); } else if (*str_p == 't') {