loader: implement framebuffer console

Draw console on efi.
Add vbe framebuffer for BIOS loader (vbe off, vbe on, vbe list,
vbe set xxx).
autoload font (/boot/fonts) based on resolution and font size.
Add command loadfont (set font by file) and
variable screen.font (set font by size). Pass loaded font to kernel.

Export variables:
screen.height
screen.width
screen.depth

Add gfx primitives to draw the screen and put png image on the screen.
Rework menu draw to iterate list of consoles to enamble device specific
output.

Probably something else I forgot...

Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D27420

8 files changed, 152 insertions, 31 deletions

diff --git a/stand/forth/beastie.4th b/stand/forth/beastie.4th
index 752cce22a4ff..f64cf9f8720b 100644
--- a/stand/forth/beastie.4th
+++ b/stand/forth/beastie.4th
@@ -82,6 +82,10 @@ variable logoY
 	then
 ;
 
+: draw-beastie
+	['] draw-beastie console-iterate
+;
+
 also support-functions
 
 : beastie-start ( -- ) \ starts the menu
diff --git a/stand/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th
index 9cd017f84a3f..b8e43e601c96 100644
--- a/stand/forth/brand-fbsd.4th
+++ b/stand/forth/brand-fbsd.4th
@@ -34,6 +34,18 @@
 
 : brand ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns)
 
+	framebuffer? if
+		s" term-putimage" sfind if
+			\ note, we use 0, 0 for image upper left as origin,
+			\ and 0, 7 for lower right to preserve aspect ratio
+			>r 0 0 0 0 7
+			s" /boot/images/freebsd-brand-rev.png"
+			r> execute if 2drop exit then
+		else
+			drop
+		then
+	then
+
 	s"  ______               ____   _____ _____  " brand+
 	s" |  ____|             |  _ \ / ____|  __ \ " brand+
 	s" | |___ _ __ ___  ___ | |_) | (___ | |  | |" brand+
diff --git a/stand/forth/brand.4th b/stand/forth/brand.4th
index 39a9bfae753c..034e4eb40445 100644
--- a/stand/forth/brand.4th
+++ b/stand/forth/brand.4th
@@ -72,3 +72,7 @@ variable brandY
 		else drop then
 	then
 ;
+
+: draw-brand
+	['] draw-brand console-iterate
+;
diff --git a/stand/forth/color.4th b/stand/forth/color.4th
index fc5a4d564d0a..e73e8b725c31 100644
--- a/stand/forth/color.4th
+++ b/stand/forth/color.4th
@@ -28,7 +28,7 @@ marker task-color.4th
 
 \ This function returns FALSE if the `loader_color' environment variable is set
 \ to NO, no, or 0. It returns TRUE if `loader_color' is set to any other value.
-\ If `loader_color' is unset, TRUE is returned (unless booting serial).
+\ If `loader_color' is unset, TRUE is returned.
 \ 
 : loader_color? ( -- t )
 
@@ -44,12 +44,8 @@ marker task-color.4th
 			FALSE exit
 		then
 		drop
-		\ It is enabled.
-		TRUE
-	else
-		\ `loader_color' is unset.
-		\ Default to using color unless serial boot is active.
-		drop
-		boot_serial? 0=
 	then
+	drop
+	\ It is enabled.
+	TRUE
 ;
diff --git a/stand/forth/frames.4th b/stand/forth/frames.4th
index ba356cee4acb..8d2421c758d9 100644
--- a/stand/forth/frames.4th
+++ b/stand/forth/frames.4th
@@ -121,6 +121,20 @@ only forth definitions also frame-drawing
 ;
 
 : box	( w h x y -- )	\ Draw a box
+	framebuffer? if
+		s" term-drawrect" sfind if
+			>R
+			rot		( w x y h )
+			over + >R	( w x y -- R: y+h )
+			swap rot	( y x w -- R: y+h )
+			over + >R	( y x -- R: y+h x+w )
+			swap R> R> R> execute
+			exit
+		else
+			drop
+		then
+	then
+	\ Non-framebuffer version
 	2dup 1+ 4 pick 1- -rot
 	vline		\ Draw left vert line
 	2dup 1+ swap 5 pick + swap 4 pick 1- -rot
diff --git a/stand/forth/logo-orb.4th b/stand/forth/logo-orb.4th
index c2a504d1ddf5..289353a46926 100644
--- a/stand/forth/logo-orb.4th
+++ b/stand/forth/logo-orb.4th
@@ -35,6 +35,18 @@
 
 : logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns)
 
+	framebuffer? if
+		s" term-putimage" sfind if
+			>r 2dup			( x y x y )
+			>r 0 swap r>		( x y 0 x y )
+			dup 0 swap 15 +		( x y 0 x y 0 y+15 )
+			s" /boot/images/freebsd-logo-rev.png"
+			r> execute if 2drop exit then
+		else
+			drop
+		then
+	then
+
 	s"  @[31m```                        @[31;1m`@[31m" logo+
 	s" s` `.....---...@[31;1m....--.```   -/@[31m"     logo+
 	s" +o   .--`         @[31;1m/y:`      +.@[31m"     logo+
diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th
index ca166c6d934b..6b0869cfe3b9 100644
--- a/stand/forth/menu.4th
+++ b/stand/forth/menu.4th
@@ -991,6 +991,24 @@ only forth definitions also menu-infrastructure
 	menu-create
 ;
 
+: menu-box
+	f_double	( default frame type )
+	\ Interpret a custom frame type for the menu
+	TRUE ( draw a box? default yes, but might be altered below )
+	s" loader_menu_frame" getenv dup -1 = if ( 1 )
+		drop \ no custom frame type
+	else ( 1 )  2dup s" single" compare-insensitive 0= if ( 2 )
+		f_single ( see frames.4th )
+	else ( 2 )  2dup s" double" compare-insensitive 0= if ( 3 )
+		f_double ( see frames.4th )
+	else ( 3 ) s" none" compare-insensitive 0= if ( 4 )
+		drop FALSE \ don't draw a box
+	( 4 ) then ( 3 ) then ( 2 )  then ( 1 ) then
+	if
+		42 13 menuX @ 3 - menuY @ 1- box \ Draw frame (w,h,x,y)
+	then
+;
+
 \ This function initializes the menu. Call this from your `loader.rc' file
 \ before calling any other menu-related functions.
 \ 
@@ -1021,21 +1039,7 @@ only forth definitions also menu-infrastructure
 	then
 	menuX !
 
-	\ Interpret a custom frame type for the menu
-	TRUE ( draw a box? default yes, but might be altered below )
-	s" loader_menu_frame" getenv dup -1 = if ( 1 )
-		drop \ no custom frame type
-	else ( 1 )  2dup s" single" compare-insensitive 0= if ( 2 )
-		f_single ( see frames.4th )
-	else ( 2 )  2dup s" double" compare-insensitive 0= if ( 3 )
-		f_double ( see frames.4th )
-	else ( 3 ) s" none" compare-insensitive 0= if ( 4 )
-		drop FALSE \ don't draw a box
-	( 4 ) then ( 3 ) then ( 2 )  then ( 1 ) then
-	if
-		42 13 menuX @ 3 - menuY @ 1- box \ Draw frame (w,h,x,y)
-	then
-
+	['] menu-box console-iterate
 	0 25 at-xy \ Move cursor to the bottom for output
 ;
 
diff --git a/stand/forth/support.4th b/stand/forth/support.4th
index e6addfbdf7bb..d87cf16a16dd 100644
--- a/stand/forth/support.4th
+++ b/stand/forth/support.4th
@@ -190,6 +190,25 @@ create last_module_option sizeof module.next allot 0 last_module_option !
   0 0
 ;
 
+: strspn { addr len addr1 len1 | paddr plen -- addr' len' }
+  begin
+    len
+  while
+    addr1 to paddr
+    len1 to plen
+    begin
+       plen
+    while
+       addr c@ paddr c@ = if addr len exit then
+       paddr 1+ to paddr
+       plen 1- to plen
+    repeat
+    addr 1 + to addr
+    len 1 - to len
+  repeat
+  0 0
+;
+
 : s' \ same as s", allows " in the string
   [char] ' parse
   state @ if postpone sliteral then
@@ -201,6 +220,53 @@ create last_module_option sizeof module.next allot 0 last_module_option !
 
 : getenv?  getenv -1 = if false else drop true then ;
 
+\ execute xt for each device listed in console variable.
+\ this allows us to have device specific output for logos, menu frames etc
+: console-iterate { xt | caddr clen taddr tlen -- }
+	\ get current console and save it
+	s" console" getenv
+	['] strdup catch if 2drop exit then
+	to clen to caddr
+
+	clen to tlen
+	caddr to taddr
+	begin
+		tlen
+	while
+		taddr tlen s" , " strspn
+		\ we need to handle 3 cases for addr len pairs on stack:
+		\ addr len are 0 0 - there was no comma nor space
+		\ addr len are x 0 - the first char is either comma or space
+		\ addr len are x y.
+		2dup + 0= if
+			\ there was no comma nor space.
+			2drop
+			taddr tlen s" console" setenv
+			xt execute
+			0 to tlen
+		else dup 0= if
+			2drop
+		else
+			dup                     ( taddr' tlen' tlen' )
+			tlen swap - dup
+			0= if			\ sequence of comma and space?
+				drop
+			else
+				taddr swap s" console" setenv
+				xt execute
+			then
+			to tlen
+			to taddr
+		then then
+		tlen 0> if			\ step over separator
+			tlen 1- to tlen
+			taddr 1+ to taddr
+		then
+	repeat
+	caddr clen s" console" setenv		\ restore console setup
+	caddr free drop
+;
+
 \ determine if a word appears in a string, case-insensitive
 : contains? ( addr1 len1 addr2 len2 -- 0 | -1 )
 	2 pick 0= if 2drop 2drop true exit then
@@ -231,14 +297,23 @@ create last_module_option sizeof module.next allot 0 last_module_option !
 	s" console" getenv dup -1 <> if
 		s" comconsole" 2swap contains?
 	else drop false then
-	s" boot_serial" getenv dup -1 <> if
-		swap drop 0>
-	else drop false then
-	or \ console contains comconsole ( or ) boot_serial
-	s" boot_multicons" getenv dup -1 <> if
-		swap drop 0>
-	else drop false then
-	or \ previous boolean ( or ) boot_multicons
+\	s" boot_serial" getenv dup -1 <> if
+\		swap drop 0>
+\	else drop false then
+\	or \ console contains comconsole ( or ) boot_serial
+\	s" boot_multicons" getenv dup -1 <> if
+\		swap drop 0>
+\	else drop false then
+\	or \ previous boolean ( or ) boot_multicons
+;
+
+: framebuffer? ( -- t )
+	s" console" getenv
+	2dup s" efi" compare 0<> >r
+	s" vidconsole" compare 0<> r> and if
+		FALSE exit
+	then
+	s" screen.depth" getenv?
 ;
 
 \ Private definitions