From nobody Tue Sep 24 20:18:14 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 4XCrlW0LZsz5YFDH; Tue, 24 Sep 2024 20:18:15 +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 4XCrlV5L2hz3xZH; Tue, 24 Sep 2024 20:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727209094; 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=2lID23N98dCVk7PJQaEBAzf3RVJJGqVMDGFKl5YRH3Q=; b=EmFhyf6HKkvbDLeTxZbnetf0Z1AKeGxBNFM4K0PEGC/WGLb/5PShSghRz75yXrM3dQVZjq klPjvU/oLKtqWLMWFYTzDtxO3DEJdxwuAFjD/rSkxOFO3qAb6fNMgjFfyJcpq5vi4CpInt 5NpLessw6aEIR9B9wqOUMmulvkixEqk/KDbHwjOmvCqMKFah3qcyUw80ZQSfyTwtZmNpGn Czi68CeoaEVtzCMNcfAKltwiaIkGKHU33v1JvLw/JrTLrQovSzPFhLXLLa531AvDpXm3ru +NUbo4gQceGTnDJf5rKcrMU5265daaWuIod+tUTZf6CRForXZLCXnWnm4JxT9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727209094; a=rsa-sha256; cv=none; b=SzNQRhM/8I5rn7SGuCW6tpyOSFtnq/Yw1pZ0q0UpGQ/jEoo+HB2m0CqECIqcZiAcHYDRIE HslE/8K7tET1IQjcq2q3vUjglrGolKwzI9L4psVabSVmvjYbDzDdA0QbOVNDGM2aFTksPK h+IrBjFpwmhCfr/KCxHqCKndnTu6OK5QDdpGZIJLxZf31O1TvCN2DA3vjqxrrQuhVimKiu W0G5utKyL/qkT/f/CmG9XXhwu+035pqm2vOKiZ2QzYFmytV0klEXC8Zgy8/mvlsLb/N9hS r6JtE+CdRDgp19cbowAeWG09xIaZgXe9vJeKP9rAHfCT4+e1ZOqutLJxyNLmOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727209094; 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=2lID23N98dCVk7PJQaEBAzf3RVJJGqVMDGFKl5YRH3Q=; b=IdmpAMS3dBOg6yHDHqv8nUOwcHMtAXx8Cly0LEsWhUAUkk86g14JkuItNzb71NeJHKF0KV 3S6PBt9miEQV1BMPAGu1JPG5GQ1ByWdIO0IgHSwGUzGXBqddSRgCo5nb3iob5KUInl1NsX ZzfhSp5uHuom+pQT1UI8Io6lxNlg8Gh1B/x3P9xIB2dmtsJs2IoJkOomOLV8WGRGFacuzE LWYtG5QBn371KBV9kX1VN+gkUHnIUPGOGvgntWhMYQBIDA6vI594s/lrlQZcXcVNYVrUV2 DENO2USclFOJkCvoEpSr1G4fhkzV1ecj0DTa9cOjvlrxMZc5M4WtV9iCi5ppbQ== 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 4XCrlV4y8qzk28; Tue, 24 Sep 2024 20:18:14 +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 48OKIE0l000608; Tue, 24 Sep 2024 20:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OKIEvQ000605; Tue, 24 Sep 2024 20:18:14 GMT (envelope-from git) Date: Tue, 24 Sep 2024 20:18:14 GMT Message-Id: <202409242018.48OKIEvQ000605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 604919c47fa4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 604919c47fa4092db08dadd282851afc9cba0a90 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=604919c47fa4092db08dadd282851afc9cba0a90 commit 604919c47fa4092db08dadd282851afc9cba0a90 Author: Warner Losh AuthorDate: 2024-09-24 19:54:56 +0000 Commit: Warner Losh CommitDate: 2024-09-24 20:18:42 +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 --- 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 5820d80532b5..72f5648cae91 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()