diff options
| -rw-r--r-- | data-boot/gfxboot.cfg | 12 | ||||
| -rw-r--r-- | data-install/gfxboot.cfg | 12 | ||||
| -rw-r--r-- | src/common.inc | 115 | ||||
| -rw-r--r-- | src/dia_about.inc | 2 | ||||
| -rw-r--r-- | src/main.bc | 3 | ||||
| -rw-r--r-- | src/menu.inc | 2 | ||||
| -rw-r--r-- | src/timeout.inc | 2 |
7 files changed, 3 insertions, 145 deletions
diff --git a/data-boot/gfxboot.cfg b/data-boot/gfxboot.cfg index 8b7376e..b24203d 100644 --- a/data-boot/gfxboot.cfg +++ b/data-boot/gfxboot.cfg @@ -16,8 +16,6 @@ theme=Mandriva Linux ; other sections to read layout=800x600,boot -; penguin theme likelihood (in percent, -1 = auto) -penguin=-1 ; activate speech output talk=0 ; sound volume (0..100) @@ -86,16 +84,6 @@ mainmenu.pos=130,122 ; boot option input field position bootopt.pos=263,380 -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - [install] ; show welcome animation welcome=1 diff --git a/data-install/gfxboot.cfg b/data-install/gfxboot.cfg index 64d5edc..a331b82 100644 --- a/data-install/gfxboot.cfg +++ b/data-install/gfxboot.cfg @@ -16,8 +16,6 @@ theme=Mandriva Linux ; other sections to read layout=800x600,install -; penguin theme likelihood (in percent, -1 = auto) -penguin=-1 ; activate speech output talk=0 ; sound volume (0..100) @@ -86,16 +84,6 @@ mainmenu.pos=130,122 ; boot option input field position bootopt.pos=263,380 -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - [install] ; show welcome animation welcome=1 diff --git a/src/common.inc b/src/common.inc index 53f616d..e7ee848 100644 --- a/src/common.inc +++ b/src/common.inc @@ -145,24 +145,6 @@ 500 20 moveto dup print " " print } if - ptheme { - % reverse direction - /p.xmas.dx p.xmas.dx neg def - - key keyF9 eq - key keyF7 eq or { - % call super penguin - p.call.super - } { - key keyF1 ge - key keyF10 le and { - % read something - /p.read.timer rand 0x31 and neg -30 add def - } if - } ifelse - - } if - % some special keys debug.input @@ -1015,8 +997,6 @@ /init { 0 0 moveto currentpoint clip.size image - ptheme { ptheme.init } if - % set default language "lang" findfile dup { /tmp over length 1 add 2 max string def @@ -1069,36 +1049,6 @@ moveto setcolor } if - dup keyF8 eq syslinux and { - kroete.file .undef eq { /kroete.file "kroete.dat" findfile def } if - kroete.file kroete.dir idle - /kroete.dir kroete.dir 1 xor def - } if - - dup keyF9 eq syslinux and { - /v_impaired inc - - v_impaired 1 eq config.talk not and { - /config.talk true def - load_talk_dialog - menu.texts menu.idx get menuitemmap speak - } { - sound.getsamplerate { sound.getsamplerate sound.setsamplerate } if - } ifelse - - config.livecd not { - xmenu.video .xm_current 0 put - % redraw unless another menu is still open - window.current { - window.current .xmenu get .undef eq { video.update } if - } if - } if - - .undef 0 idle - kroete.file free /kroete.file .undef def - pop 0 - } if - dup keyShiftF3 eq syslinux and debug 3 ge and { currentcolor black setcolor currentpoint 0 0 moveto @@ -1147,39 +1097,6 @@ /debug debug 1 add def } if - dup keyShiftF11 eq { - 400 0 moveto "ani_%04d.jpg" play_movie - } if - - dup keyShiftF1 eq { - /transp transp 0x10 sub 0 max def - - /player 0 def - player "hapysuse.mod" findfile dup - { - mod.load - config.volume sound.setvolume - player 0 mod.play - /player player 1 add 3 and def - } { - pop - } ifelse - - pop 0 - } if - - dup keyShiftF3 eq { - "fsfsong.wav" findfile dup - { - config.volume sound.setvolume - wav.play - } { - pop - } ifelse - - pop 0 - } if - dup keyShiftF4 eq { % sound test XXXXXXXX @@ -1414,37 +1331,7 @@ screen.fallback { } if -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Figure out whether to use penguin theme. -% - -/config.penguin "penguin" 0 gfxconfig.set.int - -% more likely during winter... -config.penguin -1 eq { - date - 0 - - over month 12 eq { 5 add } if - over month 1 le { 5 add } if - over weekday 5 eq { 2 mul } if - over weekday 6 eq { 4 mul } if - over dup month 12 eq exch day dup 24 ge exch 6 eq or and { pop 100 } if - over dup month 1 eq exch day 1 eq and { pop 100 } if - - /config.penguin exch def - pop -} if - -/ptheme rand pop rand 100 mod config.penguin lt def - -0x417 cvp getbyte 0x40 and 0 ne { /ptheme true def } if -0x417 cvp getbyte 0x10 and 0 ne { /ptheme false def } if - -% prepend penguin section to layout section list -ptheme { - /gfxconfig.layout [ "penguin" gfxconfig.layout { } forall ] gfxconfig.layout free def -} if +/ptheme false def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/dia_about.inc b/src/dia_about.inc index 2055ea6..a754d29 100644 --- a/src/dia_about.inc +++ b/src/dia_about.inc @@ -64,7 +64,7 @@ /about.msg { /about.msg - ptheme { "pabout.txt" } { "about.txt" } ifelse findfile dup .undef ne { + "about.txt" findfile dup .undef ne { dup length string dup cvp rot dup length memcpy } if def diff --git a/src/main.bc b/src/main.bc index abbb584..fa1b98b 100644 --- a/src/main.bc +++ b/src/main.bc @@ -25,6 +25,3 @@ %% include keytables.inc %% include locale.inc %% include speech.inc - -%% include penguin.inc - diff --git a/src/menu.inc b/src/menu.inc index 2f957c1..7426cb4 100644 --- a/src/menu.inc +++ b/src/menu.inc @@ -343,7 +343,7 @@ 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.width screen.size pop boot.pos.x boot.pos.y pop sub 20 sub def /boot.ed.height fontheight 2 add def /boot.window window.current def diff --git a/src/timeout.inc b/src/timeout.inc index f1bb716..bc75bc2 100644 --- a/src/timeout.inc +++ b/src/timeout.inc @@ -15,8 +15,6 @@ % first time timeout.current .undef eq { over timeout.init } if - ptheme { over over p.timeout.animate } if - % no counter timeout.steps .undef eq { return } if |