From 070962f6f017c520853e4a8f9642a73e71e51c82 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Fri, 22 Jun 2012 18:48:02 +0400 Subject: [PATCH] Drop gfxboot menu. Use defaut one. It causes ugly graphical artefacts and no one know how to fix it. --- components.mk | 2 - components/bootloader/menu.inc | 509 ---------------------------- components/bootloader/menu_blue.jpg | Bin 828 -> 0 bytes components/bootloader/menu_gray.jpg | Bin 760 -> 0 bytes 4 files changed, 511 deletions(-) delete mode 100644 components/bootloader/menu.inc delete mode 100644 components/bootloader/menu_blue.jpg delete mode 100644 components/bootloader/menu_gray.jpg diff --git a/components.mk b/components.mk index 45f2518..3cabced 100644 --- a/components.mk +++ b/components.mk @@ -22,8 +22,6 @@ ahttpd: boot: cp -a /usr/src/design-bootloader-source ./ cp -a components/bootloader/config design-bootloader-source/ - cp -af components/bootloader/menu.inc design-bootloader-source/src/ - cp -al components/bootloader/menu_*.jpg design-bootloader-source/data-install/ cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/ cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/ for size in 1024x768 800x600 640x480; do \ diff --git a/components/bootloader/menu.inc b/components/bootloader/menu.inc deleted file mode 100644 index de5bdb6..0000000 --- a/components/bootloader/menu.inc +++ /dev/null @@ -1,509 +0,0 @@ -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% -% Main menu (boot entry + boot options + panel). -% -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% max number of boot option input fields -/boot.ed.max 2 def - -% boot option input line separator -/boot.splitchar 1 def -/boot.splitstr 1 string dup 0 boot.splitchar put def - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Create new main window. -% -% ( ) ==> ( window ) -% -/window.main { - widget.size array - dup .type t_main put - dup .font font.normal put - dup .ed.font font.normal put - dup .color.fg boot.text.normal put - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Initialize main window. -% -% ( window ) ==> ( ) -% -/main.init { - pop -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Redraw main window. -% (E.g. after selecting a new language.) -% -% ( window ) ==> ( ) -% -/main.redraw { - - % boot.drawlabels - - main.drawmenu - /keepbootoptions 1 def - menu.entry true MenuSelect - /keepbootoptions .undef def - - panel.show -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Draw boot option input field labels. -% -% ( ) == > ( ) -% -/boot.drawlabels { - boot.show not { return } if - - boot.text.options setcolor - window.current .font get setfont - boot.ed.list { - dup .inp_x get 10 sub over .inp_y get moveto - currentpoint - currentpoint 0 exch moveto - currentpoint rot 1 add fontheight image - moveto - dup .inp_show get { - .inp_label get exec showright - } { pop } ifelse - } forall -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Setup boot option input field. -% -% ( ) == > ( ) -% -/boot.input.setup { - % boot.show not { return } if - - boot.ed.list { - dup .inp_x get over .inp_y get boot.ed.height add moveto - - currentpoint boot.ed.width 2 image - - currentcolor - currenttransparency - - white setcolor - 0xe0 settransparency - - 2 index .inp_show get { - boot.ed.width 2 fillrect - } if - - settransparency - setcolor - - pop - - } forall -} def - - -/boot.input.preinit { - - boot.ed.list { dup .inp_show false put .inp_buf get 0 0 put } forall - - menu.args menu.entry get boot.splitchar split - - 0 1 boot.ed.list length 1 sub { - over over aget dup .undef ne { - boot.ed.list rot get dup .inp_show true put .inp_buf get exch strcpy pop - } { - pop pop exit - } ifelse - } for - - free - - config.nobootoptions menu.texts menu.entry get iselement { - boot.ed.list 0 get .inp_show false put - } if - - boot.ed.list { splitcmdline } forall - -} def - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Activate boot option input field. -% -% ( ) == > ( ) -% -/bootoptions.init { - window.current .color.fg get setcolor - window.current .ed.font get setfont - - boot.ed.list boot.window .ed.focus get get edit.hidecursor - - boot.window .ed.focus 0 put - - boot.show { - boot.ed.list { - dup .inp_show get { - dup - dup dup .inp_buf get exch over edit.init - "" ne { ' ' edit.input } { pop } ifelse - edit.hidecursor - } { - edit.done - } ifelse - } forall - boot.ed.list boot.window .ed.focus get get dup .inp_show get { edit.showcursor } { pop } ifelse - - boot.ed.list { - dup .inp_show get .inp_visible exch put - } forall - - } if -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Redraw boot option input field. -% -% ( ) == > ( ) -% -/bootoptions.redraw { - - % clear old options - - boot.text.options setcolor - window.current .font get setfont - 40 470 boot_parameters restorescreen - boot.ed.list { - dup .inp_x get 10 sub over .inp_y get moveto - currentpoint - currentpoint 0 exch moveto - currentpoint rot 1 add fontheight image - moveto - dup .inp_show get { - .inp_label get exec showright - } { pop } ifelse - } forall - - boot.drawlabels - boot.input.setup - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Draw boot menu. -% -% No entry is marked as selected. -% -% ( ) == > ( ) -% -/main.drawmenu { - - "menu_blue.jpg" findfile setimage - 0 0 16 16 unpackimage - /menu_blue exch def - - "menu_gray.jpg" findfile setimage - 0 0 16 16 unpackimage - /menu_gray exch def - - 40 470 moveto 795 520 savescreen /boot_parameters exch def - - menu.text.normal setcolor - - /x menu.start.x def - /y menu.start.y def - - /menu.bar.width.old menu.bar.width def - - /menu.bar.width - menu.bar.min.width - menu.texts { menuitemmap strsize pop menu.text.xofs 2 mul add 2 add max } forall - def - - 0 1 menu.visible.entries 1 sub { - x y moveto currentpoint menu.bar.width.old menu.bar.height image - -8 6 rmoveto - menu_gray restorescreen - 8 -6 rmoveto - x config.rtl { menu.bar.width menu.text.xofs sub } { menu.text.xofs } ifelse add - y menu.text.yofs add moveto - menu.texts exch menu.shift add get menuitemmap - currentfont exch font.large setfont show.rtl setfont - /y y menu.item.height add def - } for - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Select/deselect menu entry. -% -% If an entry is selected (status = true), the boot options input field is -% initialized. -% -% ( entry status ) ==> ( ) -% -% status: -% false not selected -% true selected -% -% Note: menu.bar.width must be valid even if status = false. -% -/MenuSelect { - /menu.status exch def - - /menu.idx over def - - menu.shift sub - menu.item.height mul menu.start.y add - menu.start.x exch - moveto - - currentpoint - currentpoint menu.bar.width menu.bar.height image - menu.bar.color setcolor - currenttransparency - menu.bar.transparency settransparency - menu.bar.width menu.bar.height - fillrect - settransparency - moveto - - config.rtl { menu.bar.width menu.text.xofs sub } { menu.text.xofs } ifelse - menu.text.yofs rmoveto - menu.status { - -18 3 rmoveto - menu_blue restorescreen - 18 -3 rmoveto - - /font.selected font.large.bold def - menu.text.select - } { - -18 3 rmoveto - menu_gray restorescreen - 18 -3 rmoveto - /font.selected font.large def - menu.text.normal - } ifelse - setcolor - menu.texts menu.idx get menuitemmap - menu.status { config.talk { dup speak } if } if - currentfont exch font.selected setfont show.rtl setfont - - menu.status { - % init boot options - keepbootoptions .undef eq { - - boot.input.preinit - - false - boot.ed.list { - dup .inp_show get exch .inp_visible get xor or - } forall - { - boot.input.setup - boot.drawlabels - } if - - bootoptions.init - } { - bootoptions.redraw - } ifelse - - % set help context - "main" help.setcontext - menu.texts menu.idx get - dup help.findpage "" eq { - pop - } { - help.setcontext - } ifelse - } if - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Draw main window. -% -% ( window ) ==> ( ) -% -/main.show { - window.push - - /menu.shift 0 def - /menu.visible.entries menu.texts length menu.max.entries min def - - % get index of default entry - /menu.entry 0 def - 0 1 menu.texts length 1 sub { - dup menu.texts exch get menu.dentry eq { /menu.entry exch def exit } { pop } ifelse - } for - - menu.entry menu.visible.entries sub 0 ge { - /menu.shift menu.entry menu.texts length menu.visible.entries sub min def - } if - - boot.text.options setcolor - - window.current .font get setfont - - /boot.ed.width screen.size pop boot.pos.x boot.pos.y pop sub ptheme { 60 } { 20 } ifelse sub def - /boot.ed.height fontheight 2 add def - - /boot.window window.current def - - /boot.ed.list [ - 0 1 boot.ed.max 1 sub { - [ - boot.pos.x boot.pos.y exch 10 add exch 1 sub 4 -1 roll boot.ed.height 5 add mul add - over over moveto boot.ed.width boot.ed.height savescreen - cmdlinelength string - cmdlinelength - .undef - cmdlinelength string - "More Options" - false - false - ] - } for - ] def - - boot.ed.list 0 get .inp_label /txt_bootoptions put - - boot.window .ed.list boot.ed.list put - boot.window .ed.focus 0 put - - main.drawmenu - - boot.drawlabels - - menu.entry true MenuSelect - - % find default splash mode - % 0 1 splash.options length 1 sub { - % splash.options over get menu.args menu.entry get exch strstr { - % /splash.default exch def - % } { - % pop - % } ifelse - % } for - - panel.init - - "main" help.setcontext - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Split command line into hidden and normal part. -% -% ( edit_object ) == > ( ) -% -/splitcmdline { - dup length .inp_hidden le { pop return } if - dup .inp_hidden get .undef eq { pop return } if - - dup .inp_hidden get over .inp_buf get strcpy pop - - dup .inp_hidden get "showopts" bootopt.find dup { - dup "showopts" length add skipspaces - 2 index .inp_buf get exch strcpy dropspaces - 0 0 put - .inp_hidden get dropspaces - } { - pop dup .inp_hidden get 0 0 put - .inp_buf get dropspaces - } ifelse -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Handle keyboard input. -% -% ( key_in ) ==> ( key_out ) -% -/main.input { - dup 0 eq { return } if - - % handle panel entries - panel.input - - dup keyF10 eq { - power_off - pop 0 - } if - - dup keyEsc eq { exit_popup pop 0 } if - - dup keyEnter eq { - /window.action actStart def - pop 0 - } if - - dup keyUp eq { - menu.entry 0 gt { - menu.entry false MenuSelect - menu.entry menu.shift eq { - /menu.shift menu.shift 1 sub def main.drawmenu - } if - /menu.entry menu.entry 1 sub def - menu.entry true MenuSelect - } if - pop 0 - } if - - dup keyDown eq { - menu.entry menu.texts length 1 sub lt { - menu.entry false MenuSelect - menu.visible.entries menu.entry menu.shift sub sub 1 eq { - /menu.shift menu.shift 1 add def main.drawmenu - } if - /menu.entry menu.entry 1 add def - menu.entry true MenuSelect - } if - pop 0 - } if - - dup keyPgUp eq { - menu.entry 0 gt { - menu.entry false MenuSelect - /menu.entry 0 def - menu.shift 0 ne { - /menu.shift 0 def main.drawmenu - } if - menu.entry true MenuSelect - } if - pop 0 - } if - - dup keyPgDown eq { - menu.entry menu.texts length 1 sub lt { - menu.entry false MenuSelect - /menu.entry menu.texts length 1 sub def - menu.texts length menu.visible.entries sub dup menu.shift ne { - /menu.shift exch def main.drawmenu - } { - pop - } ifelse - menu.entry true MenuSelect - } if - pop 0 - } if - - dup 0 ne { - "opt" help.setcontext - } if - -} def - - diff --git a/components/bootloader/menu_blue.jpg b/components/bootloader/menu_blue.jpg deleted file mode 100644 index 2b982bcded92367ab5c093c2968376b32fbba3d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmex=LJ%Z3btM5@f){ z1mZC>0Rb~J3kx$4u&}VPvaqlM*{tlWtZX2_!phFh&c+U6f((Hg0My0I#=^`35+)7& zKfoZ!!63jOz|5$`z$D1XEXer(2!lKW10yTMYz8P`WMXDvWn<^y6M4GWKmj7m;PO-s+n%qlJ^Ei136tZHs)ZENr7 z?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G>z(JGL-`{ zvmgtrq9L1*V<3BCp|FxsBZr97#DyCVaw;1KeGpA5y2vG_V)9V+BgkuDpAqM=CbE16 z_ZY%ow-|Vs8G(_petK5;v#e}_MenG zwr1&^22Yg-Ocp91%@54)l~ein_U!ZaJ-Lf-y!`cc?`r?l6)yw#lzlgBW1Mj8XxFZH z!G{G7+vr(-t4%*}PyTxT{J?!%`Ab!@Hd!z~yJcYS!+&V*q6%fl3;K2U6LW-~xSUw$ z@IY?=seKop)u{hlR~wsn|C;W{`*Hc7Ugq7anlH8KpZ0%-h}!+zLJ%Z3btM5@f){ z1mZC>0Rb~J3kx$4u&}VPvaqlM*{tlWtZX2_!phFh&c+U6f((Hg0My0I#=^`35+)7& zKfoZ!!63jOz|5$`z$D1XEXer(2!lKW10yTMYz8P`WMXDvWn<^y6M4GWKmj7m;PO-s+n%qlJ^Ei136tZHs)ZENr7 z?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G>z(JGL-`{ zvmgtrq9L1*V<3BCp|FxsBZr97#DyCVaw;1KeGpA5y2vG_V)9V+BgkuDpAqM=CbE16 z_ZY%ow-|Vs8G(_qOC&sug{2}+wR$>j~SJ~t@ohCpH;dVG#@l^FnlPUbA3}x<}~x7 o%FVZzOv+{0DDxobcILLQNtN5ay_A{lafjVv`GPg?>i^#a0KirLCIA2c