From owner-svn-src-head@freebsd.org Wed Mar 21 15:09:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2065AF4B992; Wed, 21 Mar 2018 15:09:50 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E08A74665; Wed, 21 Mar 2018 15:09:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF9B52C3A4; Wed, 21 Mar 2018 15:09:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2LF9mlZ002704; Wed, 21 Mar 2018 15:09:48 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2LF9m8I002701; Wed, 21 Mar 2018 15:09:48 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803211509.w2LF9m8I002701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Mar 2018 15:09:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331304 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 331304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 15:09:50 -0000 Author: kevans Date: Wed Mar 21 15:09:47 2018 New Revision: 331304 URL: https://svnweb.freebsd.org/changeset/base/331304 Log: lualoader: Clear up some possible naming confusion In the original lualoader project, 'escapef' and 'escapeb' were chosen for 'escape fg' and 'escape bg'. We've carried on this naming convention, and as our use of attributes grow the likeliness of 'escapeb'/'resetb' being confused upon glance for 'escape bold'/'reset bold' increases. Fix this by renaming these four functions to {escape,reset}{fg,bg} rather than {escape,reset}{f,b} for clarity. Reported by: dteske Modified: head/stand/lua/color.lua head/stand/lua/menu.lua head/stand/lua/screen.lua Modified: head/stand/lua/color.lua ============================================================================== --- head/stand/lua/color.lua Wed Mar 21 15:09:41 2018 (r331303) +++ head/stand/lua/color.lua Wed Mar 21 15:09:47 2018 (r331304) @@ -58,28 +58,28 @@ end color.disabled = not color.isEnabled() -function color.escapef(color_value) +function color.escapefg(color_value) if color.disabled then return color_value end return core.KEYSTR_CSI .. "3" .. color_value .. "m" end -function color.resetf() +function color.resetfg() if color.disabled then return '' end return core.KEYSTR_CSI .. "39m" end -function color.escapeb(color_value) +function color.escapebg(color_value) if color.disabled then return color_value end return core.KEYSTR_CSI .. "4" .. color_value .. "m" end -function color.resetb() +function color.resetbg() if color.disabled then return '' end Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Wed Mar 21 15:09:41 2018 (r331303) +++ head/stand/lua/menu.lua Wed Mar 21 15:09:47 2018 (r331304) @@ -46,11 +46,11 @@ local return_menu_entry = { local function OnOff(str, value) if value then - return str .. color.escapef(color.GREEN) .. "On" .. - color.escapef(color.WHITE) + return str .. color.escapefg(color.GREEN) .. "On" .. + color.escapefg(color.WHITE) else - return str .. color.escapef(color.RED) .. "off" .. - color.escapef(color.WHITE) + return str .. color.escapefg(color.RED) .. "off" .. + color.escapefg(color.WHITE) end end @@ -115,12 +115,12 @@ menu.boot_environments = { local bootenv_name = "" local name_color if is_default then - name_color = color.escapef(color.GREEN) + name_color = color.escapefg(color.GREEN) else - name_color = color.escapef(color.BLUE) + name_color = color.escapefg(color.BLUE) end bootenv_name = bootenv_name .. name_color .. - choice .. color.resetf() + choice .. color.resetfg() return color.highlight("A").."ctive: " .. bootenv_name .. " (" .. idx .. " of " .. #all_choices .. ")" @@ -300,13 +300,13 @@ menu.welcome = { local kernel_name = "" local name_color if is_default then - name_color = color.escapef(color.GREEN) + name_color = color.escapefg(color.GREEN) kernel_name = "default/" else - name_color = color.escapef(color.BLUE) + name_color = color.escapefg(color.BLUE) end kernel_name = kernel_name .. name_color .. - choice .. color.resetf() + choice .. color.resetfg() return color.highlight("K") .. "ernel: " .. kernel_name .. " (" .. idx .. " of " .. #all_choices .. ")" Modified: head/stand/lua/screen.lua ============================================================================== --- head/stand/lua/screen.lua Wed Mar 21 15:09:41 2018 (r331303) +++ head/stand/lua/screen.lua Wed Mar 21 15:09:47 2018 (r331304) @@ -56,14 +56,14 @@ function screen.setforeground(color_value) if color.disabled then return color_value end - printc(color.escapef(color_value)) + printc(color.escapefg(color_value)) end function screen.setbackground(color_value) if color.disabled then return color_value end - printc(color.escapeb(color_value)) + printc(color.escapebg(color_value)) end function screen.defcolor()