From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 1k6eBFBFyl80NAAAWB0awg (envelope-from ) for ; Fri, 04 Dec 2020 09:18:56 -0500 Received: by simark.ca (Postfix, from userid 112) id 098031F0AB; Fri, 4 Dec 2020 09:18:56 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 46C111E58D for ; Fri, 4 Dec 2020 09:18:55 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F11E4386EC33; Fri, 4 Dec 2020 14:18:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F11E4386EC33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607091535; bh=NAz9kJocBwS+ni1pTsQkDK7qJsd5w2dEygnoYnBaoJQ=; h=Date:To:Subject:References:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=vEuiOF9FWOJ6MVhocMX+LFPsGWl+N78ooElRfMg0ihigL8bfgBB0L8Cz3nanNmR5f 6Zzv+Zs9Aju9PPZAK66iUOhG6A1WA9cuocZhZMqYWfLL2ulfr+ZhUueDT1k2WcI5qK R/CHbb45T0CXIQCxzwh3Gwn5UrWfmu7iqbIxwYwU= Received: from sonic309-24.consmr.mail.ir2.yahoo.com (sonic309-24.consmr.mail.ir2.yahoo.com [77.238.179.82]) by sourceware.org (Postfix) with ESMTPS id BDFAD3857818 for ; Fri, 4 Dec 2020 14:18:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BDFAD3857818 X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1607091531; bh=hUnDJCj6WvRJmlTEf+PiwMI+1UFtefB1vtatRZWHWQF=; h=Date:From:To:Subject:From:Subject; b=VEv1QKBDcCyWd0Y04BlFYSnMvv891DtW2/gfskE81cy7t9PWRkgrN52+Bij5hfcT7djOp2AAX95XJG9jnBXAVQsQScR+qBxY799OYytgwFLtfmtFitntReYYa04fJF4wqkE436ImGzI+EULMou8Z9/76EnsNt7NIDSGFLZpFZY/7nq2yKZxKLvjN0vdeOC5vubpCxHnp/HxWaZPZnQLE4YS//XOGIuI61vYkW8xlhlsNeJO6ngTFtye8PsR20oWJaIMSsIpSLwbqmkng0BNsgtaO52nrJAAAXKQP/tqdJZbk2gY0wpP0WFKwILii0BQwn1Tw6BJzwxPAfN9Bo46YAw== X-YMail-OSG: IowS1NsVM1mVpc7DEQKUBpEJRCCpYPf.nPbL782.J2m6MWv7fP69wR25mu3HyF0 dVf6fbiqqpUPNtA.Bwg0xmKqLyH5d7jFJalYALHVMx9qoOAPprfsJxc7BB0GkLNoimUSKrTl9fkp omvpSyAfOv3_1_RlmF7_tXtKe9Ei5JsqkMKE2Z7pDTLaRNIDdILKlIz5cGHHGhja60GVSyS9xb4X DhZRapnb1m9Sqz0OJsdXl0dzIF_EX6.OPKBQpSOKv7skJeLDPeT.Ni1N9gPKD5mM9_3RDRmgGT2D er5MeNTTnU0UuPwV9Sa_kiRnAEHywh3IV.fwvkOxCrXjZYk836WGIHeLC4SNzoJ1bNgpbjdx722r We04H8WjDUVWyx.jJSIY6zACwiWPjZjnbKALj9fZbrQppeERbRuu.AvAXQ9BAq553d_QYJirSuZW yLBTfCLcPNbymuywC43ep5JHZsjpfOMhKTFkyl3l.IZJMfEDGLRjPO6P8ns4ZCnEqbQcjDRztDpa 9UL7Yp_lSlEHntaYmUHWNPqGznYuc_vN2WKHCE9_cYrVNo9XtQpPMHSH7LE2_OJSrJhxljU5vK8u OCVXYd50gYLWthc3lWCcu2ie74EzHLmLqV7cnEo771Mcwvz70ytNZBXsASv_mXVevSN2lj6ZpMOC 6sfTeqpgxWO4NWmTL0bw_GD7MQiozujMk9sfuFgxpdVG6bnVpoCWp2vr.sl3azR2imSGJdOOb3tF 5UzwFswwmrwpdxgxUC9Uk6XO8NOXdPfHEv9ukEKOq4r6Dy6Ep.vCoHzt9gc93QDbkkVdtedoXY.9 k6Zplxr2RFMUOwVGD1D1k3.k5F11C1z2wH1ezXjJL3JxrIMVmYrbcE_b_yhoNJQ3uTEya3JotUgT 1qrVNp9LDQjfwXCiZtcPHuXITAvPTSIoBPs1vv9CI2GHcHjLFQPHEJrS93u1dje09EZYwU50qvF3 nFxCzeyOFIBRD1GkMRBGHDdgYQWMhRm9g3M6oBf1tnJk8d7i7lx_JskAUvdxD_8BCjhIDY_ifTl0 SiedYObi45.yPUrurnsHQHB9TXoNrL9Xp6m3vO_yotCIdYlge4UCsEezpdANyQbrWDEdLtvKZ5ew jTff9XUveB1d83LCx5kO7vpnLIKx5Raa_CBwsCVVLP7__kZNw3RHYndtSuBQWZeR1H3mZ21RgYK8 d4GFqfGD9F0F0GbyqXKukj1eMHknHtXL...P.RtAAhTMkushs0jJZRCHDLjYXgV3oPPZ9ITaO_2r 3It5.O6m0UdNrRhO4WpNdpy4ARgkK3dID87HqCk2ZbuFzU9AWI1gSrE8IxqFIKi0RZZCMESh0kGd ..o6sTIvNDKbrs.Zb00Z2DDc_M0hl_KtnWEVDS15rbr2fRt4IhyI24uvXiddlruizuo1MJrSHhr5 dRv5n2h_3TOP9XVqH2T3nVh_AEruggb7J7QUFNSbNTByNOlIWHAf2Uf87sIEetcId7FKVthr_yuK P.BqSPrS6CQ9yOouhzpofIunesAt7ZOSPtsqFYOw0pJfq1vj6nBoazCTki_rrBNyp94MBFBhkDtD inSomTxbvqfhDHPEmDDiKDP5SwsDQfyUuwK1X9mGJzG0o2R9asfT3SXZkwCKCkNM_VtMOBq1CKBi rlknherHqONmSDnNWRWRjfj0Gj61kJqoIWgiH0kagCVftzR4TRg60e2e4BeXRmvRc8_3hhdBVCUl BnkcMSjhDJUUjkOwmE7amKlLW3R1ggxE8g8rEPvjTWKeMG12IXc6pcKbIH1jtvJ03WdgNFWKoZaF APNrRf65uwdM8V0S6t1yt19.WzFjeiQOWJYwgUtSdlPrLkygqDJt0_A3mTCB0fal5cTIYbjOrNXS W0.ni1iMux4GjCRFKNYOWl4ni5HRY_O5sd5B8cbautw11eATCn6I23wtC8BAGVsbP7_05cboep_J gvVfCJCcfdxrGIvnr1guvvj51EqPhWuK4GRXrn1ahCIR7Bugq8N.EsHqtPa9s.29hCEq_XIi8obg AYhvFDcMT5x4JPMCiqyFnQiJTIUEmGYhK97L6bn.zDqlQP7eslcI4TBkKKOTScWSADsmKLUO3jDV .bvcW1KCYI4kIUGLbAqqS5Zsa2ODTLz4trBUSFh5A75SN4U_s_Tv1G1DPtC7W_pYTWkHkfmiFo3z OkAFPA94hpiyyeVf76myLcuCpsv8e9Z33Ee_juT0QfEhicct64XxgWFiRQGdR6oLiXNVrjeAXuxr 66JyF_tMNb0cYxXvA5GKt4iH3bexrdqF9IXustHWUdlviYJiVBeeaLW1g02aAA.DFqXdoAVZyUn_ 4qgmUFhFwe6WxbYXCznx6fwEOef0englLLoCugXINW0RRG5VrJwrCB9Nq4Ym1eJStndIoibZbVwq ExwxrCZDphRpDZi8rPGrYOvdzZ874m4hicFXCLsuyckhU3UXesd_A Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ir2.yahoo.com with HTTP; Fri, 4 Dec 2020 14:18:51 +0000 Date: Fri, 4 Dec 2020 14:18:49 +0000 (UTC) To: "gdb-patches@sourceware.org" Message-ID: <1529224928.468621.1607091529134@mail.yahoo.com> Subject: [PING][PATCH v2] Fix multi-line strings in TuiWindow.write MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable References: <1529224928.468621.1607091529134.ref@mail.yahoo.com> X-Mailer: WebService/1.1.17111 YMailNorrin Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Hannes Domani via Gdb-patches Reply-To: Hannes Domani Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Ping. Am Freitag, 20. November 2020, 01:01:43 MEZ hat Hannes Domani via Gdb-patch= es Folgendes geschrieben: > Currently multi-line strings are all written to the first line. > > Since tui_copy_source_line sets the text variable to the start of the > next line, the check for newline has to be done with the previous charact= er. > > gdb/ChangeLog: > > 2020-11-19=C2=A0 Hannes Domani=C2=A0 > >=C2=A0=C2=A0=C2=A0=C2=A0 * python/py-tui.c (tui_py_window::output): Fix mu= lti-line strings. > --- > v2: > - Don't break multiple TuiWindow.write calls without newline characters. > --- > gdb/python/py-tui.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c > index 95c71f1d2d..306bd7b801 100644 > --- a/gdb/python/py-tui.c > +++ b/gdb/python/py-tui.c > @@ -203,13 +203,13 @@ tui_py_window::output (const char *text) >=C2=A0=C2=A0=C2=A0=C2=A0 { >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 wmove (handle.get (), cursor_y + 1, c= ursor_x + 1); > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 const char *prev_text =3D text; >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 std::string line =3D tui_copy_source_= line (&text, 0, 0, >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 vwidth - cursor_x, 0); >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tui_puts (line.c_str (), handle.get (= )); > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (*text =3D=3D '\n') > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (text > prev_text && (text[-1] =3D=3D = '\n' || text[-1] =3D=3D '\r')) >=C2=A0=C2=A0=C2=A0=C2=A0 { > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ++text; >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ++cursor_y; >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cursor_x =3D 0; >=C2=A0=C2=A0=C2=A0=C2=A0 } > -- > 2.29.2