From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 39CEC3857C42; Thu, 31 Mar 2022 16:55:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39CEC3857C42 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite/tui: implement _csi_P proc X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 29d210012ab9928bf5ae9243e27f7500085984a8 X-Git-Newrev: 7820b634f74e4df874a00fe08afdb7ecc3d4747c Message-Id: <20220331165540.39CEC3857C42@sourceware.org> Date: Thu, 31 Mar 2022 16:55:40 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2022 16:55:40 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7820b634f74e= 4df874a00fe08afdb7ecc3d4747c commit 7820b634f74e4df874a00fe08afdb7ecc3d4747c Author: Simon Marchi Date: Tue Mar 29 20:58:58 2022 -0400 gdb/testsuite/tui: implement _csi_P proc =20 Since commit 3cd522938792 ("Change the pager to a ui_file"), I see these errors when running gdb.tui/scroll.exp: =20 ERROR: invalid command name "_csi_P" while executing "::gdb_tcl_unknown _csi_P 2" ("uplevel" body line 1) invoked from within "uplevel 1 ::gdb_tcl_unknown $args" (procedure "::unknown" line 5) invoked from within "_csi_P 2" ("eval" body line 1) invoked from within "eval _csi_$cmd $params" =20 It looks like GDB is emitting a CSI that it did not emit before, the "Delete character" one: =20 https://vt100.net/docs/vt510-rm/DCH.html =20 Implement it. =20 Co-Authored-By: Andrew Burgess Change-Id: I5bf86b6104d51b0623a26a69df83d1ca9a4851b7 Diff: --- gdb/testsuite/gdb.tui/tuiterm.exp | 29 +++++++++++++++++++++++++++++ gdb/testsuite/lib/tuiterm.exp | 27 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/gdb/testsuite/gdb.tui/tuiterm.exp b/gdb/testsuite/gdb.tui/tuit= erm.exp index 6b1b044535a..c82db21a92b 100644 --- a/gdb/testsuite/gdb.tui/tuiterm.exp +++ b/gdb/testsuite/gdb.tui/tuiterm.exp @@ -492,6 +492,34 @@ proc test_delete_line { } { } 3 0 } =20 +proc test_delete_character { } { + Term::_move_cursor 2 1 + + Term::_csi_P + check "delete character, default param" { + "abcdefgh" + "ijlmnop " + "qrstuvwx" + "yz01234 " + } 2 1 + + Term::_csi_P 3 + check "delete character, explicit param" { + "abcdefgh" + "ijop " + "qrstuvwx" + "yz01234 " + } 2 1 + + Term::_csi_P 12 + check "delete character, more than number of columns" { + "abcdefgh" + "ij " + "qrstuvwx" + "yz01234 " + } 2 1 +} + proc test_erase_character { } { Term::_move_cursor 3 2 Term::_csi_X @@ -600,6 +628,7 @@ foreach_with_prefix test { test_erase_in_display test_erase_in_line test_delete_line + test_delete_character test_erase_character test_repeat test_vertical_line_position_absolute diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp index 7696fea4c7e..9053f7dba6a 100644 --- a/gdb/testsuite/lib/tuiterm.exp +++ b/gdb/testsuite/lib/tuiterm.exp @@ -349,6 +349,33 @@ namespace eval Term { } } =20 + # Delete Character. + # + # https://vt100.net/docs/vt510-rm/DCH.html + proc _csi_P {args} { + set count [_default [lindex $args 0] 1] + + _log_cur "Delete character ($count)" { + variable _cur_row + variable _cur_col + variable _chars + variable _cols + + # Move all characters right of the cursor N positions left. + set out_col [expr $_cur_col] + set in_col [expr $_cur_col + $count] + + while {$in_col < $_cols} { + set _chars($out_col,$_cur_row) $_chars($in_col,$_cur_row) + incr in_col + incr out_col + } + + # Clear the rest of the line. + _clear_in_line $out_col $_cols $_cur_row + } + } + # Erase chars. # # https://vt100.net/docs/vt510-rm/ECH.html