From nobody Sat Dec 28 18:54:59 2024 X-Original-To: dev-commits-src-all@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 4YLBPb5mB1z5j3Gv; Sat, 28 Dec 2024 18:54:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPb3SqWz50DH; Sat, 28 Dec 2024 18:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412099; 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=vb8g0GGYSp5vugD0sUpHI6aOHT08tcCXl56uLIS/0Ys=; b=O2VqBhMbznLmhhuMVo0KFcDxV/O9oVZxaUKWc9844xkxujGcm/UegjgVxQ+x2kXQjkU5xj Sqwh681mBfFhBK9jMHCFh5JjVX3pB/5Hc88eZ815n+BpfySxVmcwmIjmfmuLyZiHWWeApI 4EugwVo7gIQZCl9umu7y6Hq9MAnYznubk7kJMPOgHeHSQJJmNx7y7vhwe6IhV9BLO4X8O6 TAT3N7f/8bgNlO8Mov+++u5iNyC6oGwXRUZBblae2k77bu+jxSbL+0x2WcpRtxKw4JFfsl kM65F21hZnEC3vZTIhkghqQ5xfq6KtFoLrVA1k7HSZDCUnWau/V+tejCOXEZdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412099; 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=vb8g0GGYSp5vugD0sUpHI6aOHT08tcCXl56uLIS/0Ys=; b=dmN+V1NjxDZo/DhTFHux2IrpEMkKpNc+YZCsVtxOlQBrsB/N/6P3+rl+RXkVGjd3ENIpBe icYMNu22yemCNKpKGl0xlvI+I5beHHFjouLFBqt4ECGLgSWp3cFzCM+lVQ+6+8exaXxzKi uLrNw8XuU0gQpp+wkquLV42I32GwANTkLXY7J7Uyxx8+zfcJm33IR8A+ZX3aTV0aM7PO/l 79zUZTB/gM2xCYiCR6ZJIPLIZruXtr17BOabFkRrVo0lKtDdGU8YSqYaKYxi8aEscgA8yd ugX4SDWaMsyElq39rZn0NMLYh75Z1Esck4gWodA8Yr6+CA1+xD3/wQoeMIMK8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412099; a=rsa-sha256; cv=none; b=MjfJTBBYi8MDMTSzWnoIuce1wmfNyVZpA3FSy/UykhZ7vblEX/4J0ijcYu9zFLpEC4xOuF CJKOyWaISPXE/58WtZAM8bXSUMFwf+gfjYYIefV9jUkg9SDoRXlnTpW2uGaXxkj/EY4rvB XAFamMt5P4JD24Wmeh81MN2xFO8jqrpuOdF2wUgqfmQrGWLsvHWWVxuoDZTqo7m1+gu110 SZOV2SJ9U8yXtblTBjqIdSAAacFO14nkHOI2abbe+ukY6fE/VV5PXbdY5q5+Cg+N36IVC0 RbBDd4l4/QqcwniuDi3J3xjGxrWR0hUG+IND0Xo8vj467WiDoqnEKGq60WDVjA== 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 4YLBPb2kSSzcQd; Sat, 28 Dec 2024 18:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSIsxHb037582; Sat, 28 Dec 2024 18:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIsxfh037579; Sat, 28 Dec 2024 18:54:59 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:54:59 GMT Message-Id: <202412281854.4BSIsxfh037579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 65e3190d627f - stable/13 - loader: Fix 0 vs 1 confusion for column numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65e3190d627feee3911f7aaf44d83c4368135795 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65e3190d627feee3911f7aaf44d83c4368135795 commit 65e3190d627feee3911f7aaf44d83c4368135795 Author: Warner Losh AuthorDate: 2024-09-24 19:54:56 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:45 +0000 loader: Fix 0 vs 1 confusion for column numbers In two places we use '0' for a column number. However, the upper left hand corner of the screen is 1, 1. Fix those two confusions. Also, fix a comment that flipped the coordinates in a comment (I'm used to the vt100 convention where it's row, column (eg y, x)) and didn't notice the rest of the code uses x, y. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46777 (cherry picked from commit 604919c47fa4092db08dadd282851afc9cba0a90) --- stand/lua/menu.lua | 4 ++-- stand/lua/screen.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 1d4c203bef40..9d228df1a9ad 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -556,9 +556,9 @@ function menu.autoboot(delay) else -- Erase autoboot msg. While real VT100s -- wouldn't scroll when receiving a char with - -- the cursor at (24, 79), bad emulators do. + -- the cursor at (79, 24), bad emulators do. -- Avoid the issue by stopping at 79. - screen.setcursor(0, y) + screen.setcursor(1, y) printc(string.rep(" ", 79)) screen.defcursor() return ch diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 4437a34f95f1..89d5416815fd 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -32,7 +32,7 @@ local core = require("core") local screen = {} -- Module exports -screen.default_x = 0 +screen.default_x = 1 screen.default_y = 25 function screen.clear()