term: fix a bug that VTE based terminals are not recognized

akinomyoga · Dec 8, 2020 · 7e16d9d · 7e16d9d
1 parent ad843b4
commit 7e16d9d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/memo/ChangeLog.md b/memo/ChangeLog.md
@@ -9,6 +9,8 @@
 
 ## Fixes
 
+- term: fix a bug that VTE based terminals are not recognized
+
 ## Internal changes and fixes
 
 <!---------------------------------------------------------------------------->

diff --git a/note.txt b/note.txt
@@ -3680,3 +3680,8 @@ bash_tips
     Done (実装ログ)
 -------------------------------------------------------------------------------
 
+2020-12-08
+
+  * util/term: lxterminal, gnome-terminal で vte の検出に失敗している [#D1427]
+    これはソースコードを確認してみた所、xterm の version 抽出コードを追加した時
+    に動かなくなった物の様に見える。修正した。
diff --git a/src/util.sh b/src/util.sh
@@ -4139,7 +4139,8 @@ function ble/term/DA2/initialize-term {
   if rex='^xterm(-|$)'; [[ $TERM =~ $rex ]]; then
     local version=${da2r[1]}
     if rex='^1;[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then
-      ((version==0||95<=version))
+      # 2000以上は vte
+      ((version==0||95<=version&&version<2000))
     elif rex='^0;[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then
       ((95<=version))
     elif rex='^(2|24|1[89]|41|6[145]);[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then