remove more boot splash stuff; we should be able to chain directly to usplash

boot.config

@@ -12,7 +12,6 @@
 %% include main.inc
 %% include xmenu.inc
 %% include dia_video.inc
-%% include dia_splash.inc
 %% include dia_lang.inc
 %% include dia_help.inc
 %% include dia_profile.inc

common.inc

@@ -361,18 +361,6 @@
 
   } if
 
-  % add splash only if an entry already exists
-%  bc.cmd "splash" bootopt.find dup .undef ne {
-%    % remove existing entry
-%    dup skipnonspaces skipspaces strcpy pop
-%
-%    % append new entry
-%    xmenu.splash .xm_current get splash.options exch get
-%    "%s " bc.cmd dup length add sprintf
-%  } {
-%    pop
-%  } ifelse
-
   xmenu.profile {
     profile.options xmenu.profile .xm_current get get dup "" ne {
       "%s " bc.cmd dup length add sprintf

dia_splash.inc

@@ -1,90 +0,0 @@
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-%
-% Splash mode selection dialog.
-%
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Some global vars.
-%
-/splash.default 2 def
-
-/splash.options [
-  "splash=0"
-  "splash=verbose"
-  "splash=silent"
-] def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Build splash list.
-%
-% ( ) ==> ( )
-%
-/splash.init {
-  /xmenu.splash .xm_size array def
-
-  /xmenu xmenu.splash def
-
-  xmenu .xm_current splash.default put
-  xmenu .xm_list [ "Native" "Verbose" "Silent" ] put
-
-  pmenu.init
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Update splash mode.
-%
-% ( ) ==> ( )
-%
-/splash.update {
-  /xmenu xmenu.splash def
-
-  /window.action actRedrawPanel def
-
-  pmenu.update
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Show splash menu.
-%
-% ( ) => ( )
-%
-/panel.splash {
-  "startup" help.setcontext
-
-  window.xmenu
-  dup .xmenu xmenu.splash put
-  dup .xmenu.update /splash.update put
-  dup window.init
-      window.show
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Return width of panel entry.
-%
-% ( ) => ( width )
-%
-/panel.splash.width {
-  /xmenu xmenu.splash def
-
-  pmenu.width
-} def
-
-
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Redraw panel entry.
-%
-% ( panel ) => ( )
-%
-/panel.splash.update {
-  /xmenu xmenu.splash def
-
-  pmenu.panel.update
-} def
-
-

dia_video.inc

@@ -13,15 +13,6 @@
 /.vm_width  1 def
 /.vm_height 2 def
 
-% We have kernel splash images for at least these sizes.
-/video.splashsizes [
-     0    0	% special: for text mode
-     1    0	% special: for VESA mode
-   800  600
-  1024  768
-  1280 1024
-] def
-
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % Create sort key for video modes.
@@ -51,26 +42,6 @@
 } def
 
 
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Check if we have a splash in that resolution.
-%
-% ( video_mode_list_entry ) ==> ( true|false )
-%
-/video.havesplash {
-  false exch
-
-  0 2 video.splashsizes length 1 sub {
-    over over over
-    .vm_height get rot .vm_width get rot video.splashsizes exch get eq
-    rot 1 add video.splashsizes exch get rot eq and
-    { exch pop true exch exit } if
-  } for
-
-  pop
-
-} def
-
-
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % Build video mode list.
 %
@@ -145,7 +116,7 @@
   video.modes.list {
     dup .vm_width get 3 index le
     over .vm_height get 3 index le and
-    exch video.havesplash and {
+    exch {
       xmenu .xm_current over over get 1 add put
     } {
       exit

install.config

@@ -12,7 +12,6 @@
 %% include main.inc
 %% include xmenu.inc
 %% include dia_video.inc
-%% include dia_splash.inc
 %% include dia_lang.inc
 %% include dia_help.inc
 %% include dia_profile.inc

main.inc

@@ -140,15 +140,6 @@
   redrawmenu
   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

panel.inc

@@ -40,7 +40,6 @@
       livecd {
 
         [ keyF2 0 "F2" /panel.video /panel.video.width /panel.video.update /video.init ]
-        [ keyF3 0 "F3" /panel.splash /panel.splash.width /panel.splash.update /splash.init ]
 
       } {
 

system.inc

@@ -384,21 +384,6 @@ def
 } def
 
 
-% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Generate pseudo random number.
-% Good enough for boot loader splash screen.
-%
-% ( ) ==> ( int )
-%
-/rand {
-  rand.start 59 mul 97 add 0x7fffffff and
-  /rand.start over def
-} def
-
-% start value
-/rand.start time def
-
-
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 %
 % ( date ) ==> ( weekday )