From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SP67Eb5+yl9lPQAAWB0awg (envelope-from ) for ; Fri, 04 Dec 2020 13:23:58 -0500 Received: by simark.ca (Postfix, from userid 112) id 427E71F0AB; Fri, 4 Dec 2020 13:23:58 -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=unavailable 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 E9A271E552 for ; Fri, 4 Dec 2020 13:23:57 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DEEF3842437; Fri, 4 Dec 2020 18:23:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DEEF3842437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607106237; bh=a+w+xOWuD4D9DRm3u9MVlRgcixZX0JCAnHNc4ONh7/E=; h=Date:To:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yaG+qTsKRJ8N3qeneG3Sr5aRRbnCWT113RHksSTPY9Yx9csfC4NPtktO9zV1K6FeW 8sGcBrhwgIE/oxzqQEyhyFTr2mSfP5D5D4Xi3eXhCcQ6gGyN0HuE7aKn06fkfUsl3Y vfn6cCFrWeZ8e7cFA989vF5eJMubUfbtNuUbBP3M= Received: from sonic310-11.consmr.mail.ir2.yahoo.com (sonic310-11.consmr.mail.ir2.yahoo.com [77.238.177.32]) by sourceware.org (Postfix) with ESMTPS id AC2C7398241D for ; Fri, 4 Dec 2020 18:23:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AC2C7398241D X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1607106232; bh=inD3/gkg8ZgxOcwF3CB0YWTPqh5qUPUDpveUD9adXLy=; h=Date:From:To:Subject:From:Subject; b=d99OzEmDyPusRU9BlmnZu7/Nu8jwxmknuKmw6Un8MsQzrrTQQL+gZcTkkDy76wKO34lR2Ma8+UeBwE8907x/yLYvR1YQh+9jYJ6ji3NP2jg5WuHX9EGK2z8/ZGuq5uYJ8c9ojukftBxBUDwF1zTxtBbdENVbd59EP0i4326OmX+0gB1Bb35AvQHG3HNGZ+apX7oPmCgZ/HyU8j1EZ2J+xJZPRecSq4ASBJiCkaCscsrrbCC+5R+FxUe4NIuJNlkDevEmuH2dHz3k3eqezhrPspa1uCCYdJ5qlvwsaUXNrHHT2NKhB76RnEppY2rB5y5wvp7GTym2aU5VnG9do23xjw== X-YMail-OSG: jHE9IzEVM1mQ5dQP2am_yD0Kt9NuNpMc8fVfCTBpRNNMKGBGrpyc1UCKBitbD_h mLklmdRwI4mWwAQ._Jv3js_pW4qbTx4uUrb1LuzftbCbTlqsKIHQUcrSJWzWZo49VqctfrFztZ72 Czneaczcfe6xtkuGH5vcirTjHd0IjlKVraCVmmw18N9hAjlAu6LehfPm.cENYsyIU2YAYAV64.m2 m9jsNxtjTeO28nh2BtRyeDgpSgczy9RZlBylZCPPaCq_SioRg4YeKAsHdV.Q1gMKAnon9mGTFJwx rOHsMak8awHzB43BbfFELaCx2Q_hHEqI82wxvkIOiiDq8rcn7XypAxxYCa8WmFdFxiSZsx4BTcWP jQTmChGMmmmkdrQCkkTUIwjs979QVBY3aPmxYMr_F7LzN8aCNUAdRQ0gmL25dLRL6Jbvt1D5EQvZ OECwgzgJVrnll6GA5feWAB1Ssn9ze81s1_oOEhWaxdw5ZOFFsAGsdp1SHqAcFcKqHnHE0WokYEMD q9G.H78quxOorZqaa4xyCNW8kXdxvULr0rHDWISW9Qfzztw7Zx5iPKDpHnoEfzZPVD7tUDPxt2en vyYFITwSSabb5GDN2OP2M1IWaKM40bLI3sJKjTbaUaZISmoVcYq8ZXG73mNTvz.ISgLoPKi19uof xIkccE0V1u3ab8KOIOLQgu6a0HBD9_kAqCyIHLXlSHblej_cSNv2tfvrCYSd39l3buKw5vGdxSZ_ bBLhM4.7YzkB2jCG_.PkL667viJRd9OI8UxLSDIEJC5RnY9wwNEpmjHtNewkCClJTZNaPRqYC75k RJu8XGLQSD9PzYAC0Tj.WNnaA5KmcL25oZBGUvyc4bTqD6.9e6R.RnXgWWiIHI.MkLA3mmeBPOzE Ts5ApGQOWpo1T1Nbat3D6_ZX5_Qoz6yKbKn9r2se7UayhNQiH8vdWm.t293OcSEqfvfNL341fElg GaDHj6jCKYmw.jCJZRtGMwmoDd.2mD2qlxDL_Xcz6QNn8B57GntoODEWrsw_CTS2za_kytKTkmeS A5hUq.qfIu5bFeBjdS6QjLgG9Jzin8SzAvDfRY7MOZ_M3Qa5WN6uQ12wZxQC9QM3LY17apLfaUsY jjRU5JyRBkLkKEIUvScO6wC52.HJy1UQlLWfjudrGhfcnhPrh.0079tE8Yo9.2X651MWldU78L7H W3gz2Y_pIOjFCd80H8QDmKOV1fyNBRjZd3kg_vhbHauxjjiDzVjjMZSELgQarD4xKAozZlBPp9.X YWiKWK4JrQO1Jx6I75vG6ncbYuaY0VBgzCuKvEvHAQqLtDMDv31FPny2gV6QbvPxL4SHOsn9IuB. n.R2gwwYR5Qb9mTLY.MtUxK5jePNi56ZRybN7QntJ3FJz8aLQZJqARKEr7241crATfq_ntem8pXL X8jdXPnEMKA34BvB68jUT5ddbTi7dxuJbe_wpnXMlIHaEnzClsdIneiXFmDFWM4DdBLW05Yrromz 8zXsOldnw02uWthWvj5IszP7vY3WkY._ukXSTsRQa1kOi_JfPj2lGHIH1BrW5zGVz8rKV5YwRFxg eUSNdgjksEpJfoIduAWqwZhuWjLFc1aimYkBZcLdq.xrXwaN8b9QZmjA_FPdxsA5C3RLJJHWBkzN WtTMe7EeiLoK52q_Q5t5co8kRLd5XagJCCS0h3OTnD9ATJ9_y0yjOtBlMbHVjVjVx8CRw15D0F7g U0urGOPoLiIlUZxkRHjaOQcyw888HGsqBffDveEVeaAnypqBsamIz672xPeL8KFL.u_fLNxn0H9G DRC.UeIDtxiz7UcOp7QZ_vrT5XvZC63DVHOzgmAftwlwI0miEpo7vrcpPpbvhYdpZM9BYSYiDxPJ ammBz7Xdz3gSiVREGoZaLoWGf5aXiNMRYYegop2aIUfsw2qVa03qcuBL0yYe96dArbcb4mFo1EW6 d7Cfo24Rgyrs3NdUbrAVbCS2bWXtY.4IWS1CnfhBizeKvarW556IzjtK5ZzyhaxmwMEBMcr.N7dt DMTMaMOorI9DZj2NFqwJvuUsVfKdYcW.mVlOAF2jrjO1fZuD3Xa0b1UDlIvJQ8.DWPkW7QncgCCF KpSA_Eb5XqxaR68_JDu2O4yLZiCuupWdoiqA_8eg2L3y0K.am_1_qXLHgFRjAQ1a7vkA9A1zBv2W LqfUBtd6ws.giT_EG_d.CV_Y7L1XYJn1LN_p5R0.wMkX0xeAzWC9nRdTxoTp77e7ROBtLDyoRb26 G.5cXby0V09w8JTHneuSbaLZ.Lrxw0txTX9EafqAb02_K9PxhmYjQrWtUsNkiGGgD9hukguempKu FKXVfNBhCKWdYi9aaAu.C2BO61kmVPywnoCIEYDdeBqJ3Q2TmOnjEizbZy49bn2cGrx2h_._O5oq Gp7MO2H_GP7FbFT94eOfYiobSvnYCKi94cBLf6XK7ehxrF6QdxB7ZZkCfCA0rwydyFizbEllV0S. uFT6oIGvIMfR9WHaSVjyhmSGT7SpMHgblT4KBpoKIC_XOBvnS8Iu6mIQwVw-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.ir2.yahoo.com with HTTP; Fri, 4 Dec 2020 18:23:52 +0000 Date: Fri, 4 Dec 2020 18:23:48 +0000 (UTC) To: "gdb-patches@sourceware.org" , Simon Marchi Message-ID: <606484785.2811164.1607106228551@mail.yahoo.com> In-Reply-To: References: <1529224928.468621.1607091529134.ref@mail.yahoo.com> <1529224928.468621.1607091529134@mail.yahoo.com> Subject: Re: [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 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" Am Freitag, 4. Dezember 2020, 18:22:02 MEZ hat Simon Marchi Folgendes geschrieben: > On 2020-12-04 9:18 a.m., Hannes Domani via Gdb-patches wrote: > > Ping. > > > > Am Freitag, 20. November 2020, 01:01:43 MEZ hat Hannes Domani via Gdb-p= atches 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 char= acter. > >> > >> gdb/ChangeLog: > >> > >> 2020-11-19=C2=A0 Hannes Domani=C2=A0 > >> > >>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * python/py-tui.c (tui_py_window::output= ): Fix multi-line strings. > >> --- > >> v2: > >> - Don't break multiple TuiWindow.write calls without newline character= s. > >> --- > >> 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=C2=A0=C2=A0 wmove (handle.get (), cursor= _y + 1, cursor_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=C2=A0 std::string line =3D tui_cop= y_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=C2=A0 vwidth - cursor_x, 0); > >>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tui_puts (line.c_str (), han= dle.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=C2=A0 ++text; > >>=C2=A0=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=C2=A0 cursor_x =3D 0; > >>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } > >> -- > >> 2.29.2 > > > I tried to apply this and give it a try (although I know nothing about > this code), and it looks like the patch is based on an old commit.=C2=A0 = This > code was changed in September, quite a bit before your original patch: > > https://sourceware.org/git/?p=3Dbinutils-gdb.git;a=3Dcommitdiff;h=3D14983= 0c137f351cb41888f87493cc42a72dbeac7;hp=3D5f278258ccae6a666c72de709a3171975f= baeb05 Oh, I forgot to cherry pick it to current master, sorry about that. > Can you see if the issue still exists in current master?=C2=A0 And if so,= the > fix will have to be adapted to the new code. Yes, looks like this is probably fixed. I'll re-check when I build current master the next time. Hannes