From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id DB72E3858D39 for ; Mon, 1 May 2023 07:44:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB72E3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8F5AB22A6D; Mon, 1 May 2023 07:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682927091; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5GYJhcNvbIvyZHQG6aLixUU5WQk5RJkkUwjHdV+u4iY=; b=RkJenhxiQRwyt7/NGwRaxsG7me7PqkV9WXQdRctm+VW7ZcnhuNAKHcVqpNKtap+gI0q0Fe bIwdUwOyAF3w1/G69SbgiLtOjALh01tX7sCikGkcZ5uCsgH9x0VMDDNkuPJIDyBO6j6YML qmlH3xjnu2cGJSAxS6yhs2z7/VwiAtM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682927091; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5GYJhcNvbIvyZHQG6aLixUU5WQk5RJkkUwjHdV+u4iY=; b=f+MvGe9kCyl9l9+HAu8nIDUoVhhBnFUXw1pVznIPaBkSoWD6bMh+ms/H8l6Z/2QRCn9jCN b1o5cEc7gtGJEoBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7B0A413580; Mon, 1 May 2023 07:44:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id pxzwHPNtT2SfcQAAMHmgww (envelope-from ); Mon, 01 May 2023 07:44:51 +0000 Content-Type: multipart/mixed; boundary="------------8gQd050NyGrys1q6U0kBIgfC" Message-ID: Date: Mon, 1 May 2023 09:45:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH] [gdb/build] Remove dependency on _rl_term_autowrap Content-Language: en-US To: Tom Tromey , Tom de Vries via Gdb-patches References: <20230430110647.975-1-tdevries@suse.de> <878re9mbb2.fsf@tromey.com> From: Tom de Vries In-Reply-To: <878re9mbb2.fsf@tromey.com> X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------8gQd050NyGrys1q6U0kBIgfC Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit [ was: Re: [pushed] [gdb/tui] Fix TUI resizing for TERM=ansi ] On 4/30/23 21:15, Tom Tromey wrote: >>>>>> "Tom" == Tom de Vries via Gdb-patches writes: > > Tom> As it happens, when TERM is set to ansi, readline decides that the terminal > Tom> cannot auto-wrap lines, and reserves one column to deal with that, and as a > Tom> result reports back one less than the actual screen width: > ... > Tom> This is currently not causing trouble in testing because we have a workaround > Tom> in place in proc Term::resize. If we disable the workaround: > > Thank you for tracking this down. > I never even considered this might be a readline issue. > > Tom> + readline_hidden_cols = _rl_term_autowrap ? 0 : 1; > > I hate to have a new dependency on a readline internal variable. Agreed, it's ugly. > Don't some distros mark these as hidden in libreadline.so? > I feel like there was another bug along these lines. > That's probably PR10723 - "Dependency on readline internal variable" ( https://sourceware.org/bugzilla/show_bug.cgi?id=10723 ). > However, I don't see another way to do it. I had an earlier version of the patch that used the COLUMNS env variable instead. It felt a bit hacky, so I went for _rl_term_autowrap, but patch attached below goes back to the COLUMNS approach. WDYT? > Maybe some official API could be added by the upstream readline. > Would you want to bring it up there? > If we commit the patch below, then this is solved for _rl_term_autowrap, but not for the other instances. I expect bringing it up will will need to be done per instance, with a detailed explanation of why we need it, so that sounds like project I don't have time for atm. > Anyway it seems ok to me. Thanks for the review. - Tom --------------8gQd050NyGrys1q6U0kBIgfC Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-build-Remove-dependency-on-_rl_term_autowrap.patch" Content-Disposition: attachment; filename*0="0001-gdb-build-Remove-dependency-on-_rl_term_autowrap.patch" Content-Transfer-Encoding: base64 RnJvbSBkYmI0YTZiNTkyZGYwOGQ2MjYzYWYzOGM0ODU3YzU1YWNiNTQwMzUyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IE1vbiwgMSBNYXkgMjAyMyAwNzoxOTozMyArMDIwMApTdWJqZWN0OiBbUEFUQ0hd IFtnZGIvYnVpbGRdIFJlbW92ZSBkZXBlbmRlbmN5IG9uIF9ybF90ZXJtX2F1dG93cmFwCgpD b21taXQgZGViMWJhNGUzOGIgKCJbZ2RiL3R1aV0gRml4IFRVSSByZXNpemluZyBmb3IgVEVS TT1hbnNpIikgaW50cm9kdWNlZCBhCmRlcGVuZGVuY3kgb24gcmVhZGxpbmUgcHJpdmF0ZSB2 YXJpYWJsZSBfcmxfdGVybV9hdXRvd3JhcC4KClRoZXJlIGlzIHByZWNlZGVudCBmb3IgdGhp cywgYnV0IGl0J3Mgc29tZXRoaW5nIHdlIHdhbnQgdG8gZ2V0IHJpZCBvZgooUFIgYnVpbGQv MTA3MjMpLgoKUmVtb3ZlIHRoZSBkZXBlbmRlbmN5IG9uIF9ybF90ZXJtX2F1dG93cmFwLCBh bmQgaW5zdGVhZCBjYWxjdWxhdGUKcmVhZGxpbmVfaGlkZGVuX2NvbHMgYnkgY29tcGFyaW5n IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBDT0xTIHdpdGggY29scyBhcwpyZXR1cm5lZCBi eSBybF9nZXRfc2NyZWVuX3NpemUuCgpUZXN0ZWQgb24geDg2XzY0LWxpbnV4LgoKQnVnOiBo dHRwczovL3NvdXJjZXdhcmUub3JnL2J1Z3ppbGxhL3Nob3dfYnVnLmNnaT9pZD0xMDcyMwot LS0KIGdkYi91dGlscy5jIHwgMTkgKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ2Ri L3V0aWxzLmMgYi9nZGIvdXRpbHMuYwppbmRleCBlMTAxOThhY2NkMC4uODczOGQzZmM3ZTQg MTAwNjQ0Ci0tLSBhL2dkYi91dGlscy5jCisrKyBiL2dkYi91dGlscy5jCkBAIC0xMTE2LDEw ICsxMTE2LDYgQEAgc3RhdGljIGJvb2wgZmlsdGVyX2luaXRpYWxpemVkID0gZmFsc2U7CiAK IAwKIAotLyogU2VlIHJlYWRsaW5lJ3Mgcmxwcml2YXRlLmguICAqLwotCi1FWFRFUk5fQyBp bnQgX3JsX3Rlcm1fYXV0b3dyYXA7Ci0KIC8qIFNlZSB1dGlscy5oLiAgKi8KIAogaW50IHJl YWRsaW5lX2hpZGRlbl9jb2xzID0gMDsKQEAgLTExNjAsMTAgKzExNTYsMTcgQEAgaW5pdF9w YWdlX2luZm8gKHZvaWQpCiAJICAgKGJlY2F1c2UgcmxfY2hhbmdlX2Vudmlyb25tZW50IGRl ZmF1bHRzIHRvIDEpCiAJIC0gbWF5IHJlcG9ydCBvbmUgbGVzcyB0aGFuIHRoZSBkZXRlY3Rl ZCBzY3JlZW4gd2lkdGggaW4KIAkgICBybF9nZXRfc2NyZWVuX3NpemUgKHdoZW4gX3JsX3Rl cm1fYXV0b3dyYXAgPT0gMCkuCi0JIFdlIGNvdWxkIHNldCByZWFkbGluZV9oaWRkZW5fY29s cyBieSBjb21wYXJpbmcgQ09MVU1OUyB0byBjb2xzIGFzCi0JIHJldHVybmVkIGJ5IHJsX2dl dF9zY3JlZW5fc2l6ZSwgYnV0IGluc3RlYWQgc2ltcGx5IHVzZQotCSBfcmxfdGVybV9hdXRv d3JhcC4gICovCi0gICAgICByZWFkbGluZV9oaWRkZW5fY29scyA9IF9ybF90ZXJtX2F1dG93 cmFwID8gMCA6IDE7CisJIFdlIGNvdWxkIHVzZSBfcmxfdGVybV9hdXRvd3JhcCwgYnV0IHdl IHdhbnQgdG8gYXZvaWQgaW50cm9kdWNpbmcKKwkgYW5vdGhlciBkZXBlbmRlbmN5IG9uIHJl YWRsaW5lIHByaXZhdGUgdmFyaWFibGVzLCBzbyBzZXQKKwkgcmVhZGxpbmVfaGlkZGVuX2Nv bHMgYnkgY29tcGFyaW5nIENPTFVNTlMgdG8gY29scyBhcyByZXR1cm5lZCBieQorCSBybF9n ZXRfc2NyZWVuX3NpemUuICAqLworICAgICAgY2hhciAqY29sdW1uc19lbnZfc3RyID0gZ2V0 ZW52ICgiQ09MVU1OUyIpOworICAgICAgZ2RiX2Fzc2VydCAoY29sdW1uc19lbnZfc3RyICE9 IG51bGxwdHIpOworICAgICAgaW50IGNvbHVtbnNfZW52X3ZhbCA9IGF0b2kgKGNvbHVtbnNf ZW52X3N0cik7CisgICAgICBnZGJfYXNzZXJ0IChjb2x1bW5zX2Vudl92YWwgIT0gMCk7Cisg ICAgICByZWFkbGluZV9oaWRkZW5fY29scyA9IGNvbHVtbnNfZW52X3ZhbCAtIGNvbHM7Cisg ICAgICBnZGJfYXNzZXJ0IChyZWFkbGluZV9oaWRkZW5fY29scyA+PSAwKTsKKyAgICAgIGdk Yl9hc3NlcnQgKHJlYWRsaW5lX2hpZGRlbl9jb2xzIDw9IDEpOwogCiAgICAgICBsaW5lc19w ZXJfcGFnZSA9IHJvd3M7CiAgICAgICBjaGFyc19wZXJfbGluZSA9IGNvbHM7CgpiYXNlLWNv bW1pdDogMDc3YTFmMDg0ODVlODhmM2IyMzRhZjFkYmI4YjkwN2IxNjA0NWU2YQotLSAKMi4z NS4zCgo= --------------8gQd050NyGrys1q6U0kBIgfC--