Another splash option.

gtk/src/gtk_config.cpp

@@ -87,7 +87,7 @@ int Snes9xConfig::load_defaults ()
     save_sram_after_secs = 0;
     rom_loaded = false;
     multithreading = false;
-    splash_image = SPLASH_IMAGE_PATTERN;
+    splash_image = SPLASH_IMAGE_COMBO;
     hw_accel = 0;
     allow_opengl = false;
     allow_xv = false;
@@ -247,7 +247,7 @@ int Snes9xConfig::save_config_file ()
     cf.SetInt   (z"NumberOfThreads", num_threads);
     cf.SetInt   (z"HardwareAcceleration", hw_accel, "0: None, 1: OpenGL, 2: XVideo");
     outbool (cf, z"BilinearFilter", Settings.BilinearFilter, "Smoothes scaled image");
-    cf.SetInt   (z"SplashBackground", splash_image, "0: Black, 1: Color bars, 2: Pattern, 3: Blue");
+    cf.SetInt   (z"SplashBackground", splash_image, "0: Black, 1: Color bars, 2: Pattern, 3: Blue, 4: Default");
 
 #undef z
 #define z "NTSC::"

gtk/src/gtk_config.h

@@ -43,7 +43,8 @@ enum {
     SPLASH_IMAGE_BLACK = 0,
     SPLASH_IMAGE_SMTPE = 1,
     SPLASH_IMAGE_PATTERN = 2,
-    SPLASH_IMAGE_BLUE = 3
+    SPLASH_IMAGE_BLUE = 3,
+    SPLASH_IMAGE_COMBO = 4
 };
 
 class Snes9xConfig

gtk/src/gtk_s9xwindow.cpp

@@ -688,6 +688,8 @@ Snes9xWindow::Snes9xWindow (Snes9xConfig *config) :
 
 extern int gtk_splash_smtpe_size;
 extern unsigned char gtk_splash_smtpe[];
+extern int gtk_splash_combo_size;
+extern unsigned char gtk_splash_combo[];
 extern int gtk_splash_pattern_size;
 extern unsigned char gtk_splash_pattern[];
 
@@ -700,16 +702,20 @@ void Snes9xWindow::setup_splash()
     last_height = 224;
 
     if (config->splash_image == SPLASH_IMAGE_PATTERN ||
-        config->splash_image == SPLASH_IMAGE_SMTPE) {
+        config->splash_image == SPLASH_IMAGE_SMTPE   ||
+        config->splash_image == SPLASH_IMAGE_COMBO) {
         unsigned char *pattern = NULL;
         int pattern_size = 0;
 
         if (config->splash_image == SPLASH_IMAGE_PATTERN) {
             pattern = gtk_splash_pattern;
             pattern_size = gtk_splash_pattern_size;
-        } else {
+        } else if (config->splash_image == SPLASH_IMAGE_SMTPE) {
             pattern = gtk_splash_smtpe;
             pattern_size = gtk_splash_smtpe_size;
+        } else {
+            pattern = gtk_splash_combo;
+            pattern_size = gtk_splash_combo_size;
         }
 
         auto pixbuf_loader = gdk_pixbuf_loader_new_with_type("png", NULL);

gtk/src/gtk_splash.cpp

@@ -1,6 +1,54 @@
+int gtk_splash_combo_size = 1340;
+
+unsigned char gtk_splash_combo[] =
+{
+  137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,1,0,0,0,0,224,8,2,0,0,0,99,35,47,
+  7,0,0,5,3,73,68,65,84,120,218,237,220,203,141,155,90,0,128,97,24,121,53,91,87,144,26,210,128,11,200,46,
+  101,220,202,238,34,171,52,224,74,34,165,128,108,103,25,103,49,10,154,0,7,206,203,199,96,190,79,214,40,119,196,96,
+  108,243,115,120,249,246,215,235,181,107,231,210,53,125,178,167,125,105,215,75,203,151,214,244,213,181,253,212,186,151,14,14,
+  76,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,
+  8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,
+  4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,
+  2,64,0,32,0,56,166,211,229,210,238,201,206,231,115,203,215,118,253,213,238,185,190,182,125,105,151,107,211,181,228,252,
+  181,221,171,187,126,51,2,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,
+  4,0,2,0,1,128,0,96,70,223,125,250,178,133,229,184,253,248,190,145,119,228,115,255,223,70,150,228,231,249,255,141,
+  44,201,219,219,219,234,52,175,175,175,85,166,137,121,46,35,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,
+  8,0,4,0,2,0,1,128,0,64,0,32,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,
+  1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,
+  0,64,0,32,0,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,16,0,228,235,111,93,231,225,177,169,71,87,
+  99,38,191,227,38,51,2,96,23,8,4,0,2,0,1,128,0,64,0,32,0,16,0,8,0,158,77,239,202,187,199,145,
+  31,70,0,236,2,129,0,64,0,32,0,16,0,8,0,4,0,2,0,1,192,179,233,93,13,247,56,242,195,8,128,93,
+  32,16,0,8,0,4,0,2,0,1,128,0,64,0,32,0,120,54,167,219,173,243,240,56,236,195,8,128,93,32,16,0,
+  8,0,4,0,2,0,1,128,0,64,0,32,0,0,0,0,0,0,0,0,128,109,235,83,255,224,118,187,197,206,186,239,
+  203,103,181,58,147,152,89,69,206,100,121,86,73,51,9,205,42,99,38,211,89,101,207,228,227,220,82,103,242,254,39,49,
+  63,83,159,122,245,55,145,79,93,229,157,169,22,192,234,100,181,230,83,241,185,150,167,140,159,201,251,196,179,211,135,126,
+  159,52,171,188,153,140,254,157,58,135,59,173,66,161,119,105,246,55,49,63,15,23,192,6,67,218,90,144,161,181,36,53,
+  233,138,171,224,194,244,161,229,92,253,41,0,33,237,99,4,88,216,204,143,150,115,248,79,35,128,144,74,247,202,10,255,
+  208,8,96,197,125,216,124,166,199,0,37,187,49,15,151,113,12,112,63,190,16,179,3,163,147,27,121,231,58,62,158,45,
+  25,237,102,196,15,71,229,35,192,232,12,207,116,145,26,19,192,33,12,171,221,116,133,139,204,105,248,243,213,159,73,49,
+  71,254,102,168,116,33,215,188,144,4,112,160,181,127,118,163,187,145,253,162,213,229,31,78,249,215,29,52,4,176,131,213,
+  183,112,107,55,93,227,135,30,250,191,154,29,7,135,206,241,47,28,234,188,47,255,176,11,151,113,21,207,65,176,131,224,
+  173,156,253,92,93,254,212,243,57,161,126,140,0,187,63,240,157,110,2,71,219,191,164,109,225,232,86,133,219,191,154,141,
+  0,31,95,90,232,38,136,135,31,25,219,114,23,77,182,193,11,97,169,155,225,135,175,93,179,139,23,58,133,149,148,177,
+  17,32,106,71,57,230,104,242,177,139,212,126,87,184,226,181,176,208,196,211,189,252,209,201,159,209,77,129,195,217,167,118,
+  111,133,155,225,34,231,179,169,155,225,54,53,2,132,158,58,116,168,179,188,151,95,120,12,224,118,232,216,89,61,211,237,
+  208,211,101,139,153,103,149,59,162,99,110,135,110,249,25,1,0,181,78,176,176,35,47,59,93,35,173,160,84,113,106,188,
+  6,151,220,201,56,58,220,185,211,121,192,236,43,77,121,47,36,233,112,48,254,219,177,217,167,4,226,143,116,147,158,52,
+  111,145,134,55,36,233,31,155,222,126,103,127,21,35,99,71,37,227,182,193,200,83,111,217,111,194,234,2,199,188,162,71,
+  125,37,42,254,58,64,232,11,43,33,169,43,79,197,143,233,165,240,227,76,189,5,60,117,107,177,156,245,194,220,242,214,
+  254,217,251,198,226,51,171,248,21,222,242,207,37,99,109,91,94,137,87,71,128,123,148,185,197,109,255,194,119,55,235,238,
+  190,103,95,44,11,125,216,73,119,44,230,93,131,91,184,254,149,100,119,35,64,246,230,63,111,64,174,53,8,156,178,139,
+  28,237,192,133,42,140,223,125,159,254,223,96,146,26,24,93,60,79,26,76,102,175,10,173,126,119,36,180,132,179,47,164,
+  238,209,66,201,86,227,174,199,0,117,179,220,217,1,64,210,200,16,51,44,24,1,28,3,220,245,0,160,242,89,160,161,
+  197,152,45,77,228,12,51,46,173,47,28,27,196,220,94,150,116,121,127,122,143,241,236,148,163,123,155,87,63,236,146,183,
+  174,100,4,88,126,7,218,31,3,60,207,89,160,146,83,67,206,2,29,246,24,160,193,32,112,122,96,0,145,255,75,199,
+  200,99,134,248,77,221,234,105,165,59,93,7,40,63,73,127,180,99,128,167,221,246,151,127,174,109,182,118,112,80,2,0,
+  0,0,0,0,0,216,185,63,153,125,200,254,114,242,175,98,0,0,0,0,73,69,78,68,174,66,96,130
+};
+
 int gtk_splash_smtpe_size = 694;
 
-unsigned char gtk_splash_smtpe[] = 
+unsigned char gtk_splash_smtpe[] =
 {
   137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,1,0,0,0,0,224,8,6,0,0,0,236,65,184,
   80,0,0,2,125,73,68,65,84,120,218,237,214,177,13,194,48,16,64,209,11,162,74,235,9,152,129,5,60,0,93,198,
@@ -27,7 +75,7 @@ unsigned char gtk_splash_smtpe[] =
 };
 
 int gtk_splash_pattern_size = 23985;
-unsigned char gtk_splash_pattern[] = 
+unsigned char gtk_splash_pattern[] =
 {
   137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,1,0,0,0,0,224,8,6,0,0,0,236,65,184,
   80,0,0,32,0,73,68,65,84,120,218,236,157,119,120,28,229,213,246,127,211,182,170,89,150,123,1,27,27,131,13,6,