Author: dteske
Date: Wed Apr 1 01:14:19 2015
New Revision: 280933
URL: https://svnweb.freebsd.org/changeset/base/280933
Log:
Move beastie to logo-*.4th; brands to brand-*.4th
Suggested by: jkh, alfred
MFC after: 3 days
X-MFC-to: stable/10
Added:
head/sys/boot/forth/brand-fbsd.4th (contents, props changed)
head/sys/boot/forth/logo-beastie.4th (contents, props changed)
head/sys/boot/forth/logo-beastiebw.4th (contents, props changed)
head/sys/boot/forth/logo-fbsdbw.4th (contents, props changed)
head/sys/boot/forth/logo-orb.4th (contents, props changed)
head/sys/boot/forth/logo-orbbw.4th (contents, props changed)
Modified:
head/sys/boot/forth/beastie.4th
head/sys/boot/forth/brand.4th
head/sys/boot/forth/version.4th
Modified: head/sys/boot/forth/beastie.4th
==============================================================================
--- head/sys/boot/forth/beastie.4th Wed Apr 1 01:08:01 2015
(r280932)
+++ head/sys/boot/forth/beastie.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -37,157 +37,13 @@ variable logoY
46 logoX !
4 logoY !
-: beastie-logo ( x y -- ) \ color BSD mascot (19 rows x 34 columns)
-
-2dup at-xy ." [31m, ," 1+
-2dup at-xy ." /( )`" 1+
-2dup at-xy ." \ \___ / |" 1+
-2dup at-xy ." /- [37m_[31m `-/ '" 1+
-2dup at-xy ." ([37m/\/ \[31m \ /\" 1+
-2dup at-xy ." [37m/ / |[31m ` \" 1+
-2dup at-xy ." [34mO O [37m) [31m/ |" 1+
-2dup at-xy ." [37m`-^--'[31m`< '" 1+
-2dup at-xy ." (_.) _ ) /" 1+
-2dup at-xy ." `.___/` /" 1+
-2dup at-xy ." `-----' /" 1+
-2dup at-xy ." [33m<----.[31m __ / __ \" 1+
-2dup at-xy ." [33m<----|====[31mO)))[33m==[31m) \) /[33m====|" 1+
-2dup at-xy ." [33m<----'[31m `--' `.__,' \" 1+
-2dup at-xy ." | |" 1+
-2dup at-xy ." \ / /\" 1+
-2dup at-xy ." [36m______[31m( (_ / \______/" 1+
-2dup at-xy ." [36m,' ,-----' |" 1+
- at-xy ." `--{__________)[37m"
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
-: beastiebw-logo ( x y -- ) \ B/W BSD mascot (19 rows x 34 columns)
-
- 2dup at-xy ." , ," 1+
- 2dup at-xy ." /( )`" 1+
- 2dup at-xy ." \ \___ / |" 1+
- 2dup at-xy ." /- _ `-/ '" 1+
- 2dup at-xy ." (/\/ \ \ /\" 1+
- 2dup at-xy ." / / | ` \" 1+
- 2dup at-xy ." O O ) / |" 1+
- 2dup at-xy ." `-^--'`< '" 1+
- 2dup at-xy ." (_.) _ ) /" 1+
- 2dup at-xy ." `.___/` /" 1+
- 2dup at-xy ." `-----' /" 1+
- 2dup at-xy ." <----. __ / __ \" 1+
- 2dup at-xy ." <----|====O)))==) \) /====|" 1+
- 2dup at-xy ." <----' `--' `.__,' \" 1+
- 2dup at-xy ." | |" 1+
- 2dup at-xy ." \ / /\" 1+
- 2dup at-xy ." ______( (_ / \______/" 1+
- 2dup at-xy ." ,' ,-----' |" 1+
- at-xy ." `--{__________)"
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
-: fbsdbw-logo ( x y -- ) \ "FreeBSD" logo in B/W (13 rows x 21 columns)
-
- \ We used to use the beastie himself as our default... until the
- \ eventual complaint derided his reign of the advanced boot-menu.
- \
- \ This is the replacement of beastie to satiate the haters of our
- \ beloved helper-daemon (ready to track down and spear bugs with
- \ his trident and sporty sneakers; see above).
- \
- \ Since we merely just changed the default and not the default-
- \ location, below is an adjustment to the passed-in coordinates,
- \ forever influenced by the proper location of beastie himself
- \ kept as the default loader_logo_x/loader_logo_y values.
- \
- 5 + swap 6 + swap
-
- 2dup at-xy ." ______" 1+
- 2dup at-xy ." | ____| __ ___ ___ " 1+
- 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+
- 2dup at-xy ." | __|| | | __/ __/" 1+
- 2dup at-xy ." | | | | | | |" 1+
- 2dup at-xy ." |_| |_| \___|\___|" 1+
- 2dup at-xy ." ____ _____ _____" 1+
- 2dup at-xy ." | _ \ / ____| __ \" 1+
- 2dup at-xy ." | |_) | (___ | | | |" 1+
- 2dup at-xy ." | _ < \___ \| | | |" 1+
- 2dup at-xy ." | |_) |____) | |__| |" 1+
- 2dup at-xy ." | | | |" 1+
- at-xy ." |____/|_____/|_____/"
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
-: orb-logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns)
-
- 3 + \ beastie adjustment (see `fbsdbw-logo' comments above)
-
- 2dup at-xy ." [31m``` [31;1m`[31m" 1+
- 2dup at-xy ." s` `.....---...[31;1m....--.``` -/[31m" 1+
- 2dup at-xy ." +o .--` [31;1m/y:` +.[31m" 1+
- 2dup at-xy ." yo`:. [31;1m:o `+-[31m" 1+
- 2dup at-xy ." y/ [31;1m-/` -o/[31m" 1+
- 2dup at-xy ." .- [31;1m::/sy+:.[31m" 1+
- 2dup at-xy ." / [31;1m`-- /[31m" 1+
- 2dup at-xy ." `: [31;1m:`[31m" 1+
- 2dup at-xy ." `: [31;1m:`[31m" 1+
- 2dup at-xy ." / [31;1m/[31m" 1+
- 2dup at-xy ." .- [31;1m-.[31m" 1+
- 2dup at-xy ." -- [31;1m-.[31m" 1+
- 2dup at-xy ." `:` [31;1m`:`" 1+
- 2dup at-xy ." [31;1m.-- `--." 1+
- at-xy ." .---.....----.[37m"
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
-: orbbw-logo ( x y -- ) \ B/W Orb mascot (15 rows x 32 columns)
-
- 3 + \ beastie adjustment (see `fbsdbw-logo' comments above)
-
- 2dup at-xy ." ``` `" 1+
- 2dup at-xy ." s` `.....---.......--.``` -/" 1+
- 2dup at-xy ." +o .--` /y:` +." 1+
- 2dup at-xy ." yo`:. :o `+-" 1+
- 2dup at-xy ." y/ -/` -o/" 1+
- 2dup at-xy ." .- ::/sy+:." 1+
- 2dup at-xy ." / `-- /" 1+
- 2dup at-xy ." `: :`" 1+
- 2dup at-xy ." `: :`" 1+
- 2dup at-xy ." / /" 1+
- 2dup at-xy ." .- -." 1+
- 2dup at-xy ." -- -." 1+
- 2dup at-xy ." `:` `:`" 1+
- 2dup at-xy ." .-- `--." 1+
- at-xy ." .---.....----."
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
\ This function draws any number of beastie logos at (loader_logo_x,
\ loader_logo_y) if defined, else (46,4) (to the right of the menu). To choose
\ your beastie, set the variable `loader_logo' to the respective logo name.
\
-\ Currently available:
-\
-\ NAME DESCRIPTION
-\ beastie Color ``Helper Daemon'' mascot (19 rows x 34 columns)
-\ beastiebw B/W ``Helper Daemon'' mascot (19 rows x 34 columns)
-\ fbsdbw "FreeBSD" logo in B/W (13 rows x 21 columns)
-\ orb Color ``Orb'' mascot (15 rows x 30 columns) (2nd default)
-\ orbbw B/W ``Orb'' mascot (15 rows x 32 columns)
-\ tribute Color ``Tribute'' (must fit 19 rows x 34 columns) (default)
-\ tributebw B/W ``Tribute'' (must fit 19 rows x 34 columns)
-\
-\ NOTE: Setting `loader_logo' to an undefined value (such as "none") will
-\ prevent beastie from being drawn.
+\ NOTE: Each is defined as a logo function in /boot/logo-${loader_logo}.4th
+\ NOTE: If `/boot/logo-${loader_logo}.4th' does not exist or does not define
+\ a `logo' function, no beastie is drawn.
\
: draw-beastie ( -- ) \ at (loader_logo_x,loader_logo_y), else (46,4)
@@ -198,43 +54,32 @@ variable logoY
?number 1 = if logoY ! then
else drop then
- s" loader_logo" getenv dup -1 <> if
- dup 5 + allocate if ENOMEM throw then
- 0 2swap strcat s" -logo" strcat
- over -rot ( a-addr/u -- a-addr a-addr/u )
- sfind ( a-addr a-addr/u -- a-addr xt bool )
- rot ( a-addr xt bool -- xt bool a-addr )
- free ( xt bool a-addr -- xt bool ior )
- if EFREE throw then
+
+ \ If `logo' is defined, execute it
+ s" logo" sfind ( -- xt|0 bool ) if
+ logoX @ logoY @ rot execute
else
- 0 ( cruft -- cruft bool ) \ load the default below
- then
- 0= if
- drop ( cruft -- )
- loader_color? if
- ['] orb-logo
+ \ Not defined; try-include desired logo file
+ drop ( xt = 0 ) \ cruft
+ s" loader_logo" getenv dup -1 = over 0= or if
+ dup 0= if 2drop else drop then \ getenv result unused
+ loader_color? if
+ s" try-include /boot/logo-orb.4th"
+ else
+ s" try-include /boot/logo-orbbw.4th"
+ then
else
- ['] orbbw-logo
+ 2drop ( c-addr/u -- ) \ getenv result unused
+ s" try-include /boot/logo-${loader_logo}.4th"
then
- then
- logoX @ logoY @ rot execute
-;
-
-: clear-beastie ( -- ) \ clears beastie from the screen
- logoX @ logoY @
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 1+ 2dup at-xy 34 spaces 1+
- 2dup at-xy 34 spaces 2drop
+ evaluate
+ 1 spaces
- \ Put the cursor back at the bottom
- 0 25 at-xy
+ \ Execute `logo' if defined now
+ s" logo" sfind if
+ logoX @ logoY @ rot execute
+ else drop then
+ then
;
: beastie-start ( -- ) \ starts the menu
Added: head/sys/boot/forth/brand-fbsd.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/brand-fbsd.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,38 @@
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+2 brandX ! 1 brandY ! \ Initialize brand placement defaults
+
+: brand ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns)
+
+ 2dup at-xy ." ______ ____ _____ _____ " 1+
+ 2dup at-xy ." | ____| | _ \ / ____| __ \ " 1+
+ 2dup at-xy ." | |___ _ __ ___ ___ | |_) | (___ | | | |" 1+
+ 2dup at-xy ." | ___| '__/ _ \/ _ \| _ < \___ \| | | |" 1+
+ 2dup at-xy ." | | | | | __/ __/| |_) |____) | |__| |" 1+
+ 2dup at-xy ." | | | | | | || | | |" 1+
+ at-xy ." |_| |_| \___|\___||____/|_____/|_____/ "
+;
Modified: head/sys/boot/forth/brand.4th
==============================================================================
--- head/sys/boot/forth/brand.4th Wed Apr 1 01:08:01 2015
(r280932)
+++ head/sys/boot/forth/brand.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -33,33 +33,13 @@ variable brandY
2 brandX !
1 brandY !
-: fbsd-logo ( x y -- ) \ "FreeBSD" [wide] logo in B/W (7 rows x 42 columns)
-
- 2dup at-xy ." ______ ____ _____ _____ " 1+
- 2dup at-xy ." | ____| | _ \ / ____| __ \ " 1+
- 2dup at-xy ." | |___ _ __ ___ ___ | |_) | (___ | | | |" 1+
- 2dup at-xy ." | ___| '__/ _ \/ _ \| _ < \___ \| | | |" 1+
- 2dup at-xy ." | | | | | __/ __/| |_) |____) | |__| |" 1+
- 2dup at-xy ." | | | | | | || | | |" 1+
- at-xy ." |_| |_| \___|\___||____/|_____/|_____/ "
-
- \ Put the cursor back at the bottom
- 0 25 at-xy
-;
-
-\ This function draws any number of company logos at (loader_brand_x,
-\ loader_brand_y) if defined, or (2,1) (top-left) if not defined. To choose
-\ your logo, set the variable `loader_brand' to the respective logo name.
-\
-\ Currently available:
-\
-\ NAME DESCRIPTION
-\ fbsd FreeBSD logo
+\ This function draws any number of company brands at (loader_brand_x,
+\ loader_brand_y) if defined, or (2,1) (top-left). To choose your brand, set
+\ the variable `loader_brand' to the respective brand name.
\
-\ NOTE: Setting `loader_brand' to the value of an existing function
-\ (such as "mycustom-brand") will cause that symbol to be executed.
-\ NOTE: Setting `loader_brand' to an undefined value (such as "none") will
-\ prevent any brand from being drawn.
+\ NOTE: Each is defined as a brand function in /boot/brand-${loader_brand}.4th
+\ NOTE: If `/boot/brand-${loader_brand}.4th' does not exist or does not define
+\ a `brand' function, no brand is drawn.
\
: draw-brand ( -- ) \ at (loader_brand_x,loader_brand_y), else (2,1)
@@ -70,24 +50,25 @@ variable brandY
?number 1 = if brandY ! then
else drop then
- s" loader_brand" getenv dup -1 = if
- brandX @ brandY @ fbsd-logo
- drop exit
+ \ If `brand' is defined, execute it
+ s" brand" sfind ( -- xt|0 bool ) if
+ brandX @ brandY @ rot execute
+ else
+ \ Not defined; try-include desired brand file
+ drop ( xt = 0 ) \ cruft
+ s" loader_brand" getenv dup -1 = over 0= or if
+ dup 0= if 2drop else drop then \ getenv result unused
+ s" try-include /boot/brand-fbsd.4th"
+ else
+ 2drop ( c-addr/u -- ) \ getenv result unused
+ s" try-include /boot/brand-${loader_brand}.4th"
+ then
+ evaluate
+ 1 spaces
+
+ \ Execute `brand' if defined now
+ s" brand" sfind if
+ brandX @ brandY @ rot execute
+ else drop then
then
-
- 2dup s" fbsd" compare-insensitive 0= if
- brandX @ brandY @ fbsd-logo
- 2drop exit
- then
-
- \ if it refers to a raw symbol then run that function
- sfind if
- brandX @ brandY @
- 2 roll
- execute
- else
- drop
- then
-
- 2drop
;
Added: head/sys/boot/forth/logo-beastie.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/logo-beastie.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,52 @@
+\ Copyright (c) 2003 Scott Long <sco...@freebsd.org>
+\ Copyright (c) 2003 Aleksander Fafula <a...@fafula.com>
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+46 logoX ! 4 logoY ! \ Initialize logo placement defaults
+
+: logo ( x y -- ) \ color BSD mascot (19 rows x 34 columns)
+
+2dup at-xy ." [31m, ," 1+
+2dup at-xy ." /( )`" 1+
+2dup at-xy ." \ \___ / |" 1+
+2dup at-xy ." /- [37m_[31m `-/ '" 1+
+2dup at-xy ." ([37m/\/ \[31m \ /\" 1+
+2dup at-xy ." [37m/ / |[31m ` \" 1+
+2dup at-xy ." [34mO O [37m) [31m/ |" 1+
+2dup at-xy ." [37m`-^--'[31m`< '" 1+
+2dup at-xy ." (_.) _ ) /" 1+
+2dup at-xy ." `.___/` /" 1+
+2dup at-xy ." `-----' /" 1+
+2dup at-xy ." [33m<----.[31m __ / __ \" 1+
+2dup at-xy ." [33m<----|====[31mO)))[33m==[31m) \) /[33m====|" 1+
+2dup at-xy ." [33m<----'[31m `--' `.__,' \" 1+
+2dup at-xy ." | |" 1+
+2dup at-xy ." \ / /\" 1+
+2dup at-xy ." [36m______[31m( (_ / \______/" 1+
+2dup at-xy ." [36m,' ,-----' |" 1+
+ at-xy ." `--{__________)[37m"
+;
Added: head/sys/boot/forth/logo-beastiebw.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/logo-beastiebw.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,51 @@
+\ Copyright (c) 2003 Scott Long <sco...@freebsd.org>
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+46 logoX ! 4 logoY ! \ Initialize logo placement defaults
+
+: logo ( x y -- ) \ B/W BSD mascot (19 rows x 34 columns)
+
+ 2dup at-xy ." , ," 1+
+ 2dup at-xy ." /( )`" 1+
+ 2dup at-xy ." \ \___ / |" 1+
+ 2dup at-xy ." /- _ `-/ '" 1+
+ 2dup at-xy ." (/\/ \ \ /\" 1+
+ 2dup at-xy ." / / | ` \" 1+
+ 2dup at-xy ." O O ) / |" 1+
+ 2dup at-xy ." `-^--'`< '" 1+
+ 2dup at-xy ." (_.) _ ) /" 1+
+ 2dup at-xy ." `.___/` /" 1+
+ 2dup at-xy ." `-----' /" 1+
+ 2dup at-xy ." <----. __ / __ \" 1+
+ 2dup at-xy ." <----|====O)))==) \) /====|" 1+
+ 2dup at-xy ." <----' `--' `.__,' \" 1+
+ 2dup at-xy ." | |" 1+
+ 2dup at-xy ." \ / /\" 1+
+ 2dup at-xy ." ______( (_ / \______/" 1+
+ 2dup at-xy ." ,' ,-----' |" 1+
+ at-xy ." `--{__________)"
+;
Added: head/sys/boot/forth/logo-fbsdbw.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/logo-fbsdbw.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,45 @@
+\ Copyright (c) 2003 Scott Long <sco...@freebsd.org>
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+52 logoX ! 9 logoY ! \ Initialize logo placement defaults
+
+: logo ( x y -- ) \ "FreeBSD" logo in B/W (13 rows x 21 columns)
+
+ 2dup at-xy ." ______" 1+
+ 2dup at-xy ." | ____| __ ___ ___ " 1+
+ 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+
+ 2dup at-xy ." | __|| | | __/ __/" 1+
+ 2dup at-xy ." | | | | | | |" 1+
+ 2dup at-xy ." |_| |_| \___|\___|" 1+
+ 2dup at-xy ." ____ _____ _____" 1+
+ 2dup at-xy ." | _ \ / ____| __ \" 1+
+ 2dup at-xy ." | |_) | (___ | | | |" 1+
+ 2dup at-xy ." | _ < \___ \| | | |" 1+
+ 2dup at-xy ." | |_) |____) | |__| |" 1+
+ 2dup at-xy ." | | | |" 1+
+ at-xy ." |____/|_____/|_____/"
+;
Added: head/sys/boot/forth/logo-orb.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/logo-orb.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,46 @@
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+46 logoX ! 7 logoY ! \ Initialize logo placement defaults
+
+: logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns)
+
+ 2dup at-xy ." [31m``` [31;1m`[31m" 1+
+ 2dup at-xy ." s` `.....---...[31;1m....--.``` -/[31m" 1+
+ 2dup at-xy ." +o .--` [31;1m/y:` +.[31m" 1+
+ 2dup at-xy ." yo`:. [31;1m:o `+-[31m" 1+
+ 2dup at-xy ." y/ [31;1m-/` -o/[31m" 1+
+ 2dup at-xy ." .- [31;1m::/sy+:.[31m" 1+
+ 2dup at-xy ." / [31;1m`-- /[31m" 1+
+ 2dup at-xy ." `: [31;1m:`[31m" 1+
+ 2dup at-xy ." `: [31;1m:`[31m" 1+
+ 2dup at-xy ." / [31;1m/[31m" 1+
+ 2dup at-xy ." .- [31;1m-.[31m" 1+
+ 2dup at-xy ." -- [31;1m-.[31m" 1+
+ 2dup at-xy ." `:` [31;1m`:`" 1+
+ 2dup at-xy ." [31;1m.-- `--." 1+
+ at-xy ." .---.....----.[37m"
+;
Added: head/sys/boot/forth/logo-orbbw.4th
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/forth/logo-orbbw.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -0,0 +1,46 @@
+\ Copyright (c) 2006-2015 Devin Teske <dte...@freebsd.org>
+\ All rights reserved.
+\
+\ Redistribution and use in source and binary forms, with or without
+\ modification, are permitted provided that the following conditions
+\ are met:
+\ 1. Redistributions of source code must retain the above copyright
+\ notice, this list of conditions and the following disclaimer.
+\ 2. Redistributions in binary form must reproduce the above copyright
+\ notice, this list of conditions and the following disclaimer in the
+\ documentation and/or other materials provided with the distribution.
+\
+\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+\ SUCH DAMAGE.
+\
+\ $FreeBSD$
+
+46 logoX ! 7 logoY ! \ Initialize logo placement defaults
+
+: logo ( x y -- ) \ B/W Orb mascot (15 rows x 32 columns)
+
+ 2dup at-xy ." ``` `" 1+
+ 2dup at-xy ." s` `.....---.......--.``` -/" 1+
+ 2dup at-xy ." +o .--` /y:` +." 1+
+ 2dup at-xy ." yo`:. :o `+-" 1+
+ 2dup at-xy ." y/ -/` -o/" 1+
+ 2dup at-xy ." .- ::/sy+:." 1+
+ 2dup at-xy ." / `-- /" 1+
+ 2dup at-xy ." `: :`" 1+
+ 2dup at-xy ." `: :`" 1+
+ 2dup at-xy ." / /" 1+
+ 2dup at-xy ." .- -." 1+
+ 2dup at-xy ." -- -." 1+
+ 2dup at-xy ." `:` `:`" 1+
+ 2dup at-xy ." .-- `--." 1+
+ at-xy ." .---.....----."
+;
Modified: head/sys/boot/forth/version.4th
==============================================================================
--- head/sys/boot/forth/version.4th Wed Apr 1 01:08:01 2015
(r280932)
+++ head/sys/boot/forth/version.4th Wed Apr 1 01:14:19 2015
(r280933)
@@ -53,18 +53,18 @@ variable versionY
s" loader_logo" getenv dup -1 = if
drop str_loader_version
else
- \ For tributes, do nothing (defer to beastie.4th)
+ \ For tributes, do nothing (defer to logo-*.4th)
2dup s" tribute" compare-insensitive 0= if
2drop
- s" tribute-logo" sfind if
- drop exit \ see beastie tribute-text
+ s" logo" sfind if
+ drop exit \ see logo-tribute.4th
else
drop str_loader_version
then
else 2dup s" tributebw" compare-insensitive 0= if
2drop
- s" tributebw-logo" sfind if
- drop exit \ see beastie tribute-text
+ s" logo" sfind if
+ drop exit \ see logo-tributebw.4th
else
drop str_loader_version
then
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
