From nobody Wed Feb 23 15:57:45 2022 X-Original-To: dev-commits-src-main@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 DFDEA19D1B2B; Wed, 23 Feb 2022 15:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3gfd5zB1z4gcV; Wed, 23 Feb 2022 15:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645631865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=apvYOglHJt3JrVAuYTp8/iJZDSoyu/hygxYhVy7g/XU=; b=UsL2ndcakbZQhsioz6M/CwpyYF6he4x44ZPcZrG6+6MnaMy34asHomccwLej+aBgr1Q0oZ L+lxmsOrAK1TO9ckcWlEkLYWfB4cnzLnp46Qm0m+iK61hcrdiItBbQ49bQyjcxM9fXCr9z F4rU9HSmrtNugoGa/MwI+NQ8Z1HpR7vLPo0wzqWo4QAfmet8CoZ6iwzyKOm+8BZkvpTt/m cLIVuDAbR3G0WNf1sR9kxXxi1haggIhna+8BUKj8aYDyUwhb0Q70dSsYMC+7eaSbrxOGFY efY3j5TrfaOa2DMlvLxDuEzYJ+/Far/aLsf0jk+ORNtzE4i3tVYcPxTN+wHQVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD0D61B1C8; Wed, 23 Feb 2022 15:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21NFvj0b040101; Wed, 23 Feb 2022 15:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NFvjh1040100; Wed, 23 Feb 2022 15:57:45 GMT (envelope-from git) Date: Wed, 23 Feb 2022 15:57:45 GMT Message-Id: <202202231557.21NFvjh1040100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 521dbfd6b108 - main - vt: fix double-click word selection for last word on line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 521dbfd6b1085511769c419d44f11842e92067f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645631865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=apvYOglHJt3JrVAuYTp8/iJZDSoyu/hygxYhVy7g/XU=; b=sd/wa1kOyH8UwgagSRAorhbEYhlTRrgcC5GjuwuDdtzC4eQItvqcmOdqjs5lNqhJCtQYUC W+JXBM/UZ3BJyggbOzWw1Wrh81NVqc232QgvpKney06lKkXGBrTeTpXgv/Kqip6+wICqL3 UYVCzDshVKkNfaVsfGSwp9DXZ3yGI4uQcedEzx+Uonknse3zM7eUtLOVd1uVpt8JTWMvd2 gOjoEEjN6SmdmW0Kotp9jGr+QylVEoM0sMaen8CEJkUrBHxTEKWxR00DFjF1PDV+A9NTkB cRgnBbOSJ+7GR8VimYuwIuDJXxEYuSkLU6vmI3HYzJ6QceSDXE6O2uzLFnx9wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645631865; a=rsa-sha256; cv=none; b=IgBtO1ZFgYPZCx5ieSofvGz3zIRt4i5bGo7wyGS9SXDGI5jSae2UymSdf7ZzLBiploeAmz 1NCFuBfSML+L1wGS8ggbw7amxydXO6oNoW0ZMzlUljZ0igkYqPjCO53BxRYUgWulebNkn6 fnEwVU5DrUpsxHfy7MmxFtBFOnbI8N5cUrKDFvso5Wj/g12FRYDH45kOKJvHi/Aeuhjx7/ mUCwjqUZaVJbfsQGewWX5QK7Y3gpw2zuyY5pTRCQBcUamCtcOLYV7U7zD1bGCbp4pod4pZ zW2BTA3oJqMLNXoa8grJNn5dPg75XdCOezt1uWRK3wXTc05UbirXzheYlyQGaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=521dbfd6b1085511769c419d44f11842e92067f5 commit 521dbfd6b1085511769c419d44f11842e92067f5 Author: Ed Maste AuthorDate: 2022-02-21 04:09:36 +0000 Commit: Ed Maste CommitDate: 2022-02-23 15:53:24 +0000 vt: fix double-click word selection for last word on line Previously when double-clicking on the last word on a line we would select from the beginning of the word to the cursor position, because we searched forward for a space character to find the end of a word. Now, use the end of the line if we do not find a space. PR: 261553 Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34339 --- sys/dev/vt/vt_buf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c index a6352ef3c0ee..041c8193ca93 100644 --- a/sys/dev/vt/vt_buf.c +++ b/sys/dev/vt/vt_buf.c @@ -825,6 +825,10 @@ vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row) break; } } + /* No space - word extends to end of line. */ + if (i == vb->vb_scr_size.tp_col) + vb->vb_mark_end.tp_col = i; + if (vb->vb_mark_start.tp_col > vb->vb_mark_end.tp_col) vb->vb_mark_start.tp_col = vb->vb_mark_end.tp_col; break;