From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26433 invoked by alias); 1 Oct 2002 14:03:23 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 26328 invoked from network); 1 Oct 2002 14:03:19 -0000 Received: from unknown (HELO primx.cistron.nl) (62.216.31.74) by sources.redhat.com with SMTP; 1 Oct 2002 14:03:19 -0000 Received: from picard.cistron.nl ([62.216.31.70] ident=mail) by primx.cistron.nl with esmtp (Exim 4.10 #1) id 17wNcM-0002Km-00; Tue, 01 Oct 2002 16:03:18 +0200 Received: from v-overbeek (helo=localhost) by picard.cistron.nl with local-esmtp (Exim 3.35 #1 (Debian)) id 17wNcM-0001QU-00; Tue, 01 Oct 2002 16:03:18 +0200 Date: Tue, 01 Oct 2002 07:03:00 -0000 From: Ton van Overbeek To: , Subject: [PATCH]: TUI, secondary prompts do not work Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-667007457-603214394-1033480997=:4999" X-SW-Source: 2002-10/txt/msg00000.txt.bz2 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. ---667007457-603214394-1033480997=:4999 Content-Type: TEXT/PLAIN; charset=US-ASCII Content-length: 1712 I have been following the TUI developments on the gdb-5.3 branch. My interest is in using TUI for a cross debugger (m68k-palmos, see http://prc-tools.sourceforge.net). I found some problems with the current state of the TUI. This post is concerned with secondary prompts. When tui is active, secondary prompts do not work. Try to do a command with many lines of output, i.e. 'show copying'. You will not get the '---Type to continue, or q to quit---' prompt, but just the normal (gdb) prompt. Same is true when prompting for commands in the 'commands' command for commands to be executed at a breakpoint. Tui relies on the prompt stack. However this stack is not used for these cases. I 'fixed' it by adding a push_prompt/pop_prompt pair around the readline() call in gdb_readline_wrapper. Also had to fix the pop_prompt logic for the changing annotation level case as a consequence. I do not know if this has repercussions in other areas of gdb, so I happily accept criticisms or proposals to fix this in a better way. Here is the Changelog entry for my fix (and patch attached). Diff is against the branch snapshot from today (2002-10-01). 2002-10-01 Ton van Overbeek (v-overbeek@cistron.nl) * event-top.h: Introduced change_annotation_level parameter to pop_prompt (). * event-top.c (pop_prompt): Added change_annotation_level parameter. (change_annotation_level, async_enable_stdin, command_line_handler): Use new parameter in pop_prompt. * top.c (gdb_readline_wrapper): Added push-prompt/pop_prompt pair around readline call for tui secondary prompts to work. I hope this patch is accepted. If I need to complete a copyright assignment for this, let me know. Ton van Overbeek ---667007457-603214394-1033480997=:4999 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="tui-sec-prompts.diff" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="tui-sec-prompts.diff" Content-length: 3579 LS0tIGV2ZW50LXRvcC5jLm9yaWcJMjAwMi0wNy0wMyAyMjoyNzoxMi4wMDAw MDAwMDAgKzAyMDANCisrKyBldmVudC10b3AuYwkyMDAyLTA5LTIyIDEyOjM5 OjU0LjAwMDAwMDAwMCArMDIwMA0KQEAgLTM1MCw3ICszNTAsNyBAQCBjaGFu Z2VfYW5ub3RhdGlvbl9sZXZlbCAodm9pZCkNCiAgICAgICBpZiAoc3RyY21w IChQUkVGSVggKDApLCAiIikgJiYgc3RyY21wIChTVUZGSVggKDApLCAiIikp DQogCXsNCiAJICAvKiBQb3AgdGhlIHRvcCBvZiB0aGUgc3RhY2ssIHdlIGFy ZSBnb2luZyBiYWNrIHRvIGFubm90YXRpb24gPCAxLiAqLw0KLQkgIHBvcF9w cm9tcHQgKCk7DQorCSAgcG9wX3Byb21wdCAoMSk7DQogCX0NCiAgICAgfQ0K IH0NCkBAIC0zNzgsMTEgKzM3OCwxMSBAQCBwdXNoX3Byb21wdCAoY2hhciAq cHJlZml4LCBjaGFyICpwcm9tcHQsDQogDQogLyogUG9wcyB0aGUgdG9wIG9m IHRoZSBwcm9tcHQgc3RhY2ssIGFuZCBmcmVlcyB0aGUgbWVtb3J5IGFsbG9j YXRlZCBmb3IgaXQuICovDQogdm9pZA0KLXBvcF9wcm9tcHQgKHZvaWQpDQor cG9wX3Byb21wdCAoaW50IGNoYW5nZV9hbm5vdGF0aW9uX2xldmVsKQ0KIHsN CiAgIC8qIElmIHdlIGFyZSBub3QgZHVyaW5nIGEgJ3N5bmNocm9ub3VzJyBl eGVjdXRpb24gY29tbWFuZCwgaW4gd2hpY2gNCiAgICAgIGNhc2UsIHRoZSB0 b3AgcHJvbXB0IHdvdWxkIGJlIGVtcHR5LiAqLw0KLSAgaWYgKHN0cmNtcCAo UFJPTVBUICgwKSwgIiIpKQ0KKyAgaWYgKGNoYW5nZV9hbm5vdGF0aW9uX2xl dmVsICYmIHN0cmNtcCAoUFJPTVBUICgwKSwgIiIpKQ0KICAgICAvKiBUaGlz IGlzIGZvciB0aGUgY2FzZSBpbiB3aGljaCB0aGUgcHJvbXB0IGlzIHNldCB3 aGlsZSB0aGUNCiAgICAgICAgYW5ub3RhdGlvbiBsZXZlbCBpcyAyLiBUaGUg dG9wIHByb21wdCB3aWxsIGJlIGNoYW5nZWQsIGJ1dCB3aGVuDQogICAgICAg IHdlIHJldHVybiB0byBhbm5vdGF0aW9uIGxldmVsIDwgMiwgd2Ugd2FudCB0 aGF0IG5ldyBwcm9tcHQgdG8gYmUNCkBAIC00MzAsNyArNDMwLDcgQEAgYXN5 bmNfZW5hYmxlX3N0ZGluICh2b2lkICpkdW1teSkNCiAgICAgIHN5bmNfZXhl Y3V0aW9uLiAgQ3VycmVudCB0YXJnZXRfdGVybWluYWxfb3VycygpIGltcGxl bWVudGF0aW9ucw0KICAgICAgY2hlY2sgZm9yIHN5bmNfZXhlY3V0aW9uIGJl Zm9yZSBzd2l0Y2hpbmcgdGhlIHRlcm1pbmFsLiAqLw0KICAgdGFyZ2V0X3Rl cm1pbmFsX291cnMgKCk7DQotICBwb3BfcHJvbXB0ICgpOw0KKyAgcG9wX3By b21wdCAoMCk7DQogICBzeW5jX2V4ZWN1dGlvbiA9IDA7DQogfQ0KIA0KQEAg LTYzNiw3ICs2MzYsNyBAQCBjb21tYW5kX2xpbmVfaGFuZGxlciAoY2hhciAq cmwpDQogICAgICAgcCA9IHJlYWRsaW5lX2lucHV0X3N0YXRlLmxpbmVidWZm ZXJfcHRyOw0KICAgICAgIHhmcmVlIChyZWFkbGluZV9pbnB1dF9zdGF0ZS5s aW5lYnVmZmVyKTsNCiAgICAgICBtb3JlX3RvX2NvbWUgPSAwOw0KLSAgICAg IHBvcF9wcm9tcHQgKCk7DQorICAgICAgcG9wX3Byb21wdCAoMCk7DQogICAg IH0NCiANCiAjaWZkZWYgU1RPUF9TSUdOQUwNCi0tLSBldmVudC10b3AuaC5v cmlnCTIwMDEtMTEtMjcgMDU6MTU6MTAuMDAwMDAwMDAwICswMTAwDQorKysg ZXZlbnQtdG9wLmgJMjAwMi0wOS0yMiAxMjozNzo0NC4wMDAwMDAwMDAgKzAy MDANCkBAIC04OCw3ICs4OCw3IEBAIGV4dGVybiB2b2lkIGhhbmRsZV9zdG9w X3NpZyAoaW50IHNpZyk7DQogI2VuZGlmDQogI2VuZGlmDQogZXh0ZXJuIHZv aWQgaGFuZGxlX3NpZ2ludCAoaW50IHNpZyk7DQotZXh0ZXJuIHZvaWQgcG9w X3Byb21wdCAodm9pZCk7DQorZXh0ZXJuIHZvaWQgcG9wX3Byb21wdCAoaW50 IGNoYW5nZV9hbm5vdGF0aW9uX2xldmVsKTsNCiBleHRlcm4gdm9pZCBwdXNo X3Byb21wdCAoY2hhciAqcHJlZml4LCBjaGFyICpwcm9tcHQsIGNoYXIgKnN1 ZmZpeCk7DQogZXh0ZXJuIHZvaWQgZ2RiX3JlYWRsaW5lMiAodm9pZCAqY2xp ZW50X2RhdGEpOw0KIGV4dGVybiB2b2lkIG1hcmtfYXN5bmNfc2lnbmFsX2hh bmRsZXJfd3JhcHBlciAodm9pZCAqdG9rZW4pOw0KLS0tIHRvcC5jLm9yaWcJ MjAwMi0wOS0xNSAwMTozMjowMC4wMDAwMDAwMDAgKzAyMDANCisrKyB0b3Au YwkyMDAyLTA5LTIyIDEyOjQyOjE2LjAwMDAwMDAwMCArMDIwMA0KQEAgLTk2 MCw2ICs5NjAsOCBAQCBzdGF0aWMgY2hhciAqaGlzdG9yeV9maWxlbmFtZTsN CiBjaGFyICoNCiBnZGJfcmVhZGxpbmVfd3JhcHBlciAoY2hhciAqcHJvbXB0 KQ0KIHsNCisgIGNoYXIgKnJldDsNCisNCiAgIC8qIFNldCB0aGUgaG9vayB0 aGF0IHdvcmtzIGluIHRoaXMgY2FzZS4gICovDQogICBpZiAoZXZlbnRfbG9v cF9wICYmIGFmdGVyX2NoYXJfcHJvY2Vzc2luZ19ob29rKQ0KICAgICB7DQpA QCAtOTY3LDcgKzk2OSwxMSBAQCBnZGJfcmVhZGxpbmVfd3JhcHBlciAoY2hh ciAqcHJvbXB0KQ0KICAgICAgIGFmdGVyX2NoYXJfcHJvY2Vzc2luZ19ob29r ID0gTlVMTDsNCiAgICAgfQ0KIA0KLSAgcmV0dXJuIHJlYWRsaW5lIChwcm9t cHQpOw0KKyAgcHVzaF9wcm9tcHQgKCIiLCBwcm9tcHQsICIiKTsNCisgIHJl dCA9IHJlYWRsaW5lIChwcm9tcHQpOw0KKyAgcG9wX3Byb21wdCAoMCk7DQor DQorICByZXR1cm4gcmV0Ow0KIH0NCiANCiAMDQo= ---667007457-603214394-1033480997=:4999--