From nobody Thu Aug 4 14:12:28 2022 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lz9fd30fMz4Xx1l for ; Thu, 4 Aug 2022 14:12:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x929.google.com (mail-ua1-x929.google.com [IPv6:2607:f8b0:4864:20::929]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lz9fc4vKMz3CNP for ; Thu, 4 Aug 2022 14:12:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x929.google.com with SMTP id z5so4331988uav.0 for ; Thu, 04 Aug 2022 07:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=/ao4SX/JZprj1fyiTz0RI+wL0oJ75ElAnKcDj49PjNg=; b=0lOBIzHMiUlz2Utx5ThZiKqJAaTpgFQN3If4DGVTRhmH9Hx2Umdk0ndr0LxXUBrhiX R9+ju0QNWAIeqZKYY7ASAoknHd7A8AYXG1UNtX+be0QcPSXDCm/q7aeQA9iMh9rqQ/Gx u2dsbFoYo1UrJKmXOHQsR5LUQEkpjmV7MM4hWnOPNEvVerFcY79hLXTomBqPiJfp04Kg 0VbaRuQ+bpJiFpmXIbx1iVo/QT4dEFTTYXx0y3SB1f734QZCmxRrJPGhGZRAf/QXKNU0 1CWEUHdJ40kyhDs9BxpHJ59FnjyREFxFuXAUBVOY5OCiiFYhf/3l/DRo5fYVLi4us85g aT5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=/ao4SX/JZprj1fyiTz0RI+wL0oJ75ElAnKcDj49PjNg=; b=ruMC/PQiJGfdP55davshqaRCFy2jvM0clFf+CRebpFldbe+Qr0W8tFM/39+JiTyb9S nTjUeMwj3aSql68YpCll7RHcChkTzNSTfcjEJ0cfThNh54PZk8dAXLKlG8KHAMJuQX8r 93fPGohj+5zPUufifGC7fHoTYqe0LZ+9bTUQ/HuOD74LurB9Ax8JkZ4AGRUywWWDaFwR ssEihES26mJoqsJBmR3DAKoX2HZOP1qIokmwLsxPTNybI6DGRISekVYv8tVfU+mb6dEC cfebcRMMd7X+Uy/S4hbxdT1LCjknhzHytmORQlzbY2+yYsvSbVDPsb8W/4cUO11mGsHp fDNQ== X-Gm-Message-State: ACgBeo1mLMF/n6x1gWjeu5Mrg8kUr9ejnmc24GsaWpXRYwa/m4T4iAU4 1VH5Fe7UnyAuVe6SEPc0yvI0rbYQX/iFaFlEk51P/g== X-Google-Smtp-Source: AA6agR6GO+Qp/orCNetvJWE6efAgDpQGec0EISkKUO+V92QY2JgTMVbEfAXDhPt3aRKdhx3ZglKg2kAF3Y1NATUNDvE= X-Received: by 2002:ab0:7341:0:b0:382:30b9:be20 with SMTP id k1-20020ab07341000000b0038230b9be20mr940679uap.95.1659622359785; Thu, 04 Aug 2022 07:12:39 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <41ef5c38-515f-739a-cb47-7cab0e609526@selasky.org> <20220623014847.067b18a5ba388639cf6009ce@dec.sakura.ne.jp> In-Reply-To: From: Warner Losh Date: Thu, 4 Aug 2022 08:12:28 -0600 Message-ID: Subject: Re: vt newcons 3 clicks mouse paste issue FIXED To: Ivan Quitschal Cc: Hans Petter Selasky , "freebsd-current@freebsd.org" Content-Type: multipart/alternative; boundary="00000000000037742205e56af1ac" X-Rspamd-Queue-Id: 4Lz9fc4vKMz3CNP X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=0lOBIzHM; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::929) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; FREEMAIL_TO(0.00)[hotmail.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::929:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --00000000000037742205e56af1ac Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 4, 2022 at 8:04 AM Ivan Quitschal wrote: > Hi Hans > > D36042 created > How can I include more patch files in the same defect number? D36042 > https://reviews.freebsd.org/D36042 > > Its missing the vt.h.diff and vt_core.diff > Both attached > > Should i have put all three in the raw patch creation combo box when I wa= s > creating the defect? > Sorry my dumbness , never used that phabricator > Generate the diff with 'git diff -U99999' to pick up all the changes at once and to give reviewers enough context. Either don't specify any files, or specify all the ones in the change (depending on the state of your tree). Upload that diff. you can use the web interface to 'update' the diff to include everything, no need to make a new one. Warner > --tzk > > > > > > > -----Mensagem original----- > > De: Ivan Quitschal > > Enviada em: ter=C3=A7a-feira, 2 de agosto de 2022 09:34 > > Para: Hans Petter Selasky > > Cc: Tomoaki AOKI ; Ivan Quitschal > > ; freebsd-current@freebsd.org; Kurt Jaeger > > > > Assunto: vt newcons 3 clicks mouse paste issue FIXED > > > > > > Hi guys > > > > Currently , if you click 3 times in order to select the entire row, its > just not > > working as it should. > > i fixed that please find below and attached the patches > > > > With this change now we can do a 3 clicks and paste , i dont know, in > some > > command, and it will be executed just fine, like it was in syscons, and > still is in > > xterm/ linux etc > > > > now if the event is a 3 mouse clickss select, the space trim is made on > the right > > and an is included > > > > thanks > > > > --tzk > > > > > > -------------------- > > --- sys/dev/vt/vt_buf.c.orig 2022-08-02 08:44:27.229782000 -0300 > > +++ sys/dev/vt/vt_buf.c 2022-08-02 08:45:02.703697000 -0300 > > @@ -771,7 +771,7 @@ > > } > > > > void > > -vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz) > > +vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz, int > > +mark) > > { > > int i, j, r, c, cs, ce; > > term_pos_t s, e; > > @@ -799,7 +799,7 @@ > > buf[i++] =3D vb->vb_rows[r][c]; > > > > /* For all rows, but the last one. */ > > - if (r !=3D e.tp_row) { > > + if (r !=3D e.tp_row || mark =3D=3D VTB_MARK_ROW) { > > /* Trim trailing word separators, if any. */ > > for (; i !=3D j; i--) { > > if (!tchar_is_word_separator(buf[i - > 1])) > > -------------------- > > > > --- sys/dev/vt/vt_core.c.orig 2022-08-02 08:43:15.436415000 -0300 > > +++ sys/dev/vt/vt_core.c 2022-08-02 08:43:49.120096000 -0300 > > @@ -2287,7 +2287,7 @@ > > VD_PASTEBUFSZ(vd) =3D len; > > } > > /* Request copy/paste buffer data, no more than `len' = */ > > - vtbuf_extract_marked(&vw->vw_buf, VD_PASTEBUF(vd), len)= ; > > + vtbuf_extract_marked(&vw->vw_buf, VD_PASTEBUF(vd), len, > > + mark); > > > > VD_PASTEBUFLEN(vd) =3D len; > > > > --------------------- > > > > --- sys/dev/vt/vt.h.orig 2022-08-02 08:41:23.888584000 -0300 > > +++ sys/dev/vt/vt.h 2022-08-02 08:41:54.504309000 -0300 > > @@ -238,7 +238,7 @@ > > #ifndef SC_NO_CUTPASTE > > int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row); > > int vtbuf_get_marked_len(struct vt_buf *vb); -void > > vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz); > > +void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz, > > +int > > mark); > > #endif > > > > #define VTB_MARK_NONE 0 > > -------------------------- > --00000000000037742205e56af1ac Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Aug 4, 2022 at 8:04 AM Ivan Q= uitschal <tezeka@hotmail.com&g= t; wrote:
Hi Han= s

D36042 created
How can I include more patch files in the same defect number? D36042
https://reviews.freebsd.org/D36042

Its missing the vt.h.diff and vt_core.diff
Both attached

Should i have put all three in the raw patch creation combo box when I was = creating the defect?
Sorry my dumbness=C2=A0 , never used that phabricator
=
Generate the diff with 'git diff -U99999' to pick up= all the changes at once and to give reviewers
enough context. Ei= ther don't specify any files, or specify all the ones in the change (de= pending
on the state of your tree). Upload that diff. you can use= the web interface to 'update' the diff to
include everyt= hing, no need to make a new one.

Warner
= =C2=A0
--tzk





> -----Mensagem original-----
> De: Ivan Quitschal <tezeka@hotmail.com>
> Enviada em: ter=C3=A7a-feira, 2 de agosto de 2022 09:34
> Para: Hans Petter Selasky <hps@selasky.org>
> Cc: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>; Ivan Quitschal
> <tezeka@hot= mail.com>; freebsd-current@freebsd.org; Kurt Jaeger
> <pi@freebsd.org= >
> Assunto: vt newcons 3 clicks mouse paste issue FIXED
>
>
> Hi guys
>
> Currently , if you click 3 times in order to select the entire row, it= s just not
> working as it should.
> i fixed that please find below and attached the patches
>
> With this change now we can do a 3 clicks and paste , i dont know, in = some
> command, and it will be executed just fine, like it was in syscons, an= d still is in
> xterm/ linux etc
>
> now if the event is a 3 mouse clickss select, the space trim is made o= n the right
> and an <enter> is included
>
> thanks
>
> --tzk
>
>
> --------------------
> --- sys/dev/vt/vt_buf.c.orig=C2=A0 =C2=A0 2022-08-02 08:44:27.22978200= 0 -0300
> +++ sys/dev/vt/vt_buf.c 2022-08-02 08:45:02.703697000 -0300
> @@ -771,7 +771,7 @@
>=C2=A0 =C2=A0}
>
>=C2=A0 =C2=A0void
> -vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz)
> +vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz, int=
> +mark)
>=C2=A0 =C2=A0{
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int i, j, r, c, cs, ce;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 term_pos_t s, e;
> @@ -799,7 +799,7 @@
>=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 buf[i++] =3D vb->vb_rows[r][c];
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* For a= ll rows, but the last one. */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (r !=3D e.t= p_row) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (r !=3D e.t= p_row || mark =3D=3D VTB_MARK_ROW) {
>=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 /* Trim trailing word separators, if any. */
>=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 for (; i !=3D j; i--) {
>=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 if (!tchar_is_word_separat= or(buf[i - 1]))
> --------------------
>
> --- sys/dev/vt/vt_core.c.orig=C2=A0 =C2=A02022-08-02 08:43:15.43641500= 0 -0300
> +++ sys/dev/vt/vt_core.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 2022-08-02 08:43:4= 9.120096000 -0300
> @@ -2287,7 +2287,7 @@
>=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 VD_PASTEBUFSZ(vd) =3D len;
>=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 /* Reque= st copy/paste buffer data, no more than `len' */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vtbuf_extract_= marked(&vw->vw_buf, VD_PASTEBUF(vd), len);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vtbuf_extract_= marked(&vw->vw_buf, VD_PASTEBUF(vd), len,
> + mark);
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 VD_PASTE= BUFLEN(vd) =3D len;
>
> ---------------------
>
> --- sys/dev/vt/vt.h.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2022-08-02 08:41:2= 3.888584000 -0300
> +++ sys/dev/vt/vt.h=C2=A0 =C2=A0 =C2=A02022-08-02 08:41:54.504309000 -= 0300
> @@ -238,7 +238,7 @@
>=C2=A0 =C2=A0#ifndef SC_NO_CUTPASTE
>=C2=A0 =C2=A0int vtbuf_set_mark(struct vt_buf *vb, int type, int col, i= nt row);
>=C2=A0 =C2=A0int vtbuf_get_marked_len(struct vt_buf *vb); -void
> vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz);
> +void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz= ,
> +int
> mark);
>=C2=A0 =C2=A0#endif
>
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 VTB_MARK_NONE=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00
> --------------------------
--00000000000037742205e56af1ac--