Date: Thu, 22 Aug 2024 20:03:06 -0600 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 101afbc6ee2f - main - loader/menu: tweak for added line Message-ID: <CANCZdfr9C7zrba1d09W5zfQDhaknGXVCZvPYcVmA%2BAkeCXxpCA@mail.gmail.com> In-Reply-To: <895EA850-1C39-40F6-9710-524C4B7342CA@freebsd.org> References: <202408222337.47MNbMeJ041064@gitrepo.freebsd.org> <895EA850-1C39-40F6-9710-524C4B7342CA@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000ca83c00620502dc3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Aug 22, 2024 at 5:52=E2=80=AFPM Jessica Clarke <jrtc27@freebsd.org>= wrote: > On 23 Aug 2024, at 00:37, Warner Losh <imp@FreeBSD.org> wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f06f77e6886f1f3ffe11= 5c579967c > > > > commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2024-08-22 23:28:51 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-08-22 23:28:51 +0000 > > > > loader/menu: tweak for added line > > > > I added a line to the menu, but didn't adjust so things were a > > line off. Make the necessary adjustments. > > > > Fixes: 7cb65be96d47 > > Sponsored by: Netflix > > MFC After: 3 days > > --- > > stand/lua/drawer.lua | 2 +- > > stand/lua/menu.lua | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua > > index a009b78164df..3a462930b86b 100644 > > --- a/stand/lua/drawer.lua > > +++ b/stand/lua/drawer.lua > > @@ -472,7 +472,7 @@ logodefs =3D { > > brand_position =3D {x =3D 2, y =3D 1} > > logo_position =3D {x =3D 46, y =3D 4} > > menu_position =3D {x =3D 5, y =3D 10} > > -frame_size =3D {w =3D 42, h =3D 13} > > +frame_size =3D {w =3D 42, h =3D 14} > > default_shift =3D {x =3D 0, y =3D 0} > > shift =3D default_shift > > > > diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua > > index 0587e5ae6586..ed84360d93b0 100644 > > --- a/stand/lua/menu.lua > > +++ b/stand/lua/menu.lua > > @@ -535,7 +535,7 @@ end > > > > function menu.autoboot(delay) > > local x =3D loader.getenv("loader_menu_timeout_x") or 4 > > - local y =3D loader.getenv("loader_menu_timeout_y") or 23 > > + local y =3D loader.getenv("loader_menu_timeout_y") or 24 > > local endtime =3D loader.time() + delay > > local time > > local last > > Does this mean we no longer fit a standard 80x24 terminal, or does this > place it on the 24th row so just fits? > I've not tested that configuration, so I don't know. It's my guess it will be fine. I wonder if this configuration is relevant, though. 80x25 is the smallest text console in common use in FreeBSD these days. 80x24 used to be very relevant for Serial, first as the typical terminal in the 70s and 80s, then in the default for xterm in the 90s and 2000s. But in 2024, I'm not sure there's many people still confining themselves to that, but maybe I'm ignorant of why my breaking it might be relevant. I'll test it this weekend... Warner --000000000000ca83c00620502dc3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Thu, Aug 22, 2024 at 5:52=E2=80=AF= PM Jessica Clarke <<a href=3D"mailto:jrtc27@freebsd.org">jrtc27@freebsd.= org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg= in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e= x">On 23 Aug 2024, at 00:37, Warner Losh <imp@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by imp:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f= 06f77e6886f1f3ffe115c579967c" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3D101afbc6ee2f06f77e6886f1f3ffe115c579967c<= /a><br> > <br> > commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2024-08-22 23:28:51 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2024-08-22 23:28:51 +0000<br> > <br> >=C2=A0 =C2=A0 loader/menu: tweak for added line<br> > <br> >=C2=A0 =C2=A0 I added a line to the menu, but didn't adjust so thin= gs were a<br> >=C2=A0 =C2=A0 line off. Make the necessary adjustments.<br> > <br> >=C2=A0 =C2=A0 Fixes: 7cb65be96d47<br> >=C2=A0 =C2=A0 Sponsored by: Netflix<br> >=C2=A0 =C2=A0 MFC After: 3 days<br> > ---<br> > stand/lua/drawer.lua | 2 +-<br> > stand/lua/menu.lua=C2=A0 =C2=A0| 2 +-<br> > 2 files changed, 2 insertions(+), 2 deletions(-)<br> > <br> > diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua<br> > index a009b78164df..3a462930b86b 100644<br> > --- a/stand/lua/drawer.lua<br> > +++ b/stand/lua/drawer.lua<br> > @@ -472,7 +472,7 @@ logodefs =3D {<br> > brand_position =3D {x =3D 2, y =3D 1}<br> > logo_position =3D {x =3D 46, y =3D 4}<br> > menu_position =3D {x =3D 5, y =3D 10}<br> > -frame_size =3D {w =3D 42, h =3D 13}<br> > +frame_size =3D {w =3D 42, h =3D 14}<br> > default_shift =3D {x =3D 0, y =3D 0}<br> > shift =3D default_shift<br> > <br> > diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua<br> > index 0587e5ae6586..ed84360d93b0 100644<br> > --- a/stand/lua/menu.lua<br> > +++ b/stand/lua/menu.lua<br> > @@ -535,7 +535,7 @@ end<br> > <br> > function menu.autoboot(delay)<br> > local x =3D loader.getenv("loader_menu_timeout_x") or 4<br> > - local y =3D loader.getenv("loader_menu_timeout_y") or 23<b= r> > + local y =3D loader.getenv("loader_menu_timeout_y") or 24<b= r> > local endtime =3D loader.time() + delay<br> > local time<br> > local last<br> <br> Does this mean we no longer fit a standard 80x24 terminal, or does this<br> place it on the 24th row so just fits?<br></blockquote><div><br></div><div>= I've not tested that configuration,=C2=A0so I don't know. It's = my guess it will be fine.</div><div><br></div><div>I wonder if this configu= ration is relevant, though. 80x25 is the smallest text</div><div>console in= common use in FreeBSD these days. 80x24 used to be very relevant</div><div= >for Serial, first as the typical terminal in the 70s and 80s, then in the = default</div><div>for xterm in the 90s and 2000s. But in 2024, I'm not = sure there's many people</div><div>still confining themselves to that, = but maybe I'm ignorant of why my breaking</div><div>it might be relevan= t.</div><div><br></div><div>I'll test it this weekend...</div><div><br>= </div><div>Warner<br></div></div></div> --000000000000ca83c00620502dc3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr9C7zrba1d09W5zfQDhaknGXVCZvPYcVmA%2BAkeCXxpCA>