Date: Fri, 16 Feb 2018 03:12:24 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329349 - head/stand/lua Message-ID: <201802160312.w1G3CO3r085739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Feb 16 03:12:24 2018 New Revision: 329349 URL: https://svnweb.freebsd.org/changeset/base/329349 Log: stand/lua: Reduce magic numbers Enter/backspace values are hardcoded in both the menu and password scripts. Separate these out to core for reuse between the two. Modified: head/stand/lua/core.lua head/stand/lua/menu.lua head/stand/lua/password.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/core.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -28,6 +28,10 @@ local core = {}; +-- Commonly appearing constants +core.KEY_ENTER = 13 +core.KEY_BACKSPACE = 127 + function core.setVerbose(b) if (b == nil) then b = not core.verbose; Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/menu.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -273,9 +273,9 @@ function menu.run(m) local key = io.getchar(); -- Special key behaviors - if (key == 127) and (m ~= menu.welcome) then + if (key == core.KEY_BACKSPACE) and (m ~= menu.welcome) then break - elseif (key == 13) then + elseif (key == core.KEY_ENTER) then core.boot(); -- Should not return end @@ -357,7 +357,7 @@ function menu.autoboot() screen.defcursor(); if io.ischar() then local ch = io.getchar(); - if ch == 13 then + if ch == core.KEY_ENTER then break; else -- prevent autoboot when escaping to interpreter Modified: head/stand/lua/password.lua ============================================================================== --- head/stand/lua/password.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/password.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -37,11 +37,11 @@ function password.read() repeat ch = io.getchar(); - if ch == 13 then + if ch == core.KEY_ENTER then break; end - if ch == 8 then + if ch == core.KEY_BACKSPACE then if n > 0 then n = n - 1; -- loader.printc("\008 \008");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802160312.w1G3CO3r085739>