Draw splash background with drivers.

Avoids cairo conflicts and allows user to see post-processing changes.

gtk/Makefile.am

@@ -49,7 +49,7 @@ snes9x_gtk_SOURCES = \
     src/gtk_s9xwindow.h \
     src/gtk_sound.cpp \
     src/gtk_sound.h \
-    src/gtk_splash.h \
+    src/gtk_splash.cpp \
     src/snes_ntsc_config.h \
     src/snes_ntsc.h \
     src/snes_ntsc_impl.h \
@@ -127,8 +127,8 @@ endif
 
 # APU
 snes9x_gtk_SOURCES += \
-    ../apu/apu.cpp 
+    ../apu/apu.cpp
-    
+
 # Byuu's APU
 snes9x_gtk_SOURCES += \
     ../apu/bapu/dsp/sdsp.cpp \
@@ -142,7 +142,7 @@ snes9x_gtk_SOURCES += \
     ../dsp1.cpp \
     ../dsp2.cpp \
     ../dsp3.cpp \
-    ../dsp4.cpp 
+    ../dsp4.cpp
 
 # Base
 snes9x_gtk_SOURCES += \

gtk/src/gtk_s9xwindow.cpp

@@ -15,7 +15,6 @@
 #include "gtk_s9x.h"
 #include "gtk_preferences.h"
 #include "gtk_icon.h"
-#include "gtk_splash.h"
 #include "gtk_display.h"
 #include "gtk_file.h"
 #include "gtk_sound.h"
@@ -140,7 +139,7 @@ event_drawingarea_draw (GtkWidget *widget,
                         cairo_t   *cr,
                         gpointer  data)
 {
-    ((Snes9xWindow *) data)->expose (NULL, cr);
+    ((Snes9xWindow *) data)->expose ();
 
     return FALSE;
 }
@@ -153,7 +152,7 @@ event_drawingarea_expose (GtkWidget      *widget,
                           GdkEventExpose *event,
                           gpointer       data)
 {
-    ((Snes9xWindow *) data)->expose (event, NULL);
+    ((Snes9xWindow *) data)->expose ();
 
     return FALSE;
 }
@@ -601,8 +600,6 @@ Snes9xWindow::Snes9xWindow (Snes9xConfig *config) :
     focused                = 1;
     paused_from_focus_loss = 0;
 
-    splash = gdk_pixbuf_new_from_inline (-1, image_splash, FALSE, NULL);
-
     if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), "snes9x"))
     {
         gtk_window_set_default_icon_name ("snes9x");
@@ -669,8 +666,10 @@ Snes9xWindow::Snes9xWindow (Snes9xConfig *config) :
     return;
 }
 
+extern const gtk_splash_t gtk_splash;
+
 void
-Snes9xWindow::expose (GdkEventExpose *event, cairo_t *cr)
+Snes9xWindow::expose (void)
 {
     if ((!config->rom_loaded || last_width < 0) && last_width != SIZE_FLAG_DIRTY)
     {
@@ -680,13 +679,28 @@ Snes9xWindow::expose (GdkEventExpose *event, cairo_t *cr)
             config->window_height = get_height ();
         }
 
-        if (!cr)
+        /* Load splash image (RGB24) into Snes9x buffer (RGB15) */
-            draw_background (event->area.x,
+        last_width = 256;
-                             event->area.y,
+        last_height = 224;
-                             event->area.width,
+
-                             event->area.height);
+        uint16 *screen_ptr = GFX.Screen;
-        else
+        const unsigned char *splash_ptr = gtk_splash.pixel_data;
-            draw_background (cr);
+
+        for (int y = 0; y < 224; y++, screen_ptr += (GFX.Pitch / 2))
+        {
+            for (int x = 0; x < 256; x++)
+            {
+                unsigned int red = *splash_ptr++;
+                unsigned int green = *splash_ptr++;
+                unsigned int blue = *splash_ptr++;
+
+                screen_ptr[x] = ((red   & 0xF8) << 7) +
+                                ((green & 0xF8) << 2) +
+                                ((blue  & 0xF8) >> 3);
+            }
+        }
+
+        S9xDeinitUpdate (last_width, last_height);
     }
     else
     {
@@ -1625,109 +1639,6 @@ Snes9xWindow::leave_fullscreen_mode (void)
     return;
 }
 
-void
-Snes9xWindow::draw_background (cairo_t *cr)
-{
-    GtkWidget       *widget = GTK_WIDGET (drawing_area);
-    GdkColor        sel;
-    GtkAllocation   allocation;
-    cairo_pattern_t *pattern;
-
-    gtk_widget_get_allocation (widget, &allocation);
-
-    cairo_save (cr);
-
-#ifdef USE_GTK3
-    GdkRGBA rgba;
-    gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), GTK_STATE_FLAG_SELECTED, &rgba);
-    sel.red = rgba.red * 65535;
-    sel.green = rgba.green * 65535;
-    sel.blue = rgba.blue * 65535;
-#else
-    sel = gtk_widget_get_style (widget)->bg[GTK_STATE_SELECTED];
-#endif
-
-    pattern = cairo_pattern_create_linear (0.0,
-                                           0.0,
-                                           0.0,
-                                           (double) allocation.height);
-
-    cairo_pattern_add_color_stop_rgb (pattern,
-                                      0.0,
-                                      (double) sel.red   * 1.0 / 65535,
-                                      (double) sel.green * 1.0 / 65535,
-                                      (double) sel.blue  * 1.0 / 65535);
-    cairo_pattern_add_color_stop_rgb (pattern,
-                                      1.0,
-                                      (double) sel.red   * 0.6 / 65535,
-                                      (double) sel.green * 0.6 / 65535,
-                                      (double) sel.blue  * 0.6 / 65535);
-
-    cairo_set_source (cr, pattern);
-
-    cairo_paint (cr);
-
-    cairo_restore (cr);
-
-    /* Put the Snes9x logo in the center */
-    gdk_cairo_set_source_pixbuf (cr, splash,
-                                 (allocation.width - gdk_pixbuf_get_width (splash)) / 2,
-                                 (allocation.height - gdk_pixbuf_get_height (splash)) / 2);
-
-    cairo_rectangle (cr,
-                     (allocation.width - gdk_pixbuf_get_width (splash)) / 2,
-                     (allocation.height - gdk_pixbuf_get_height (splash)) / 2,
-                     gdk_pixbuf_get_width (splash),
-                     gdk_pixbuf_get_height (splash));
-    cairo_fill (cr);
-
-    cairo_pattern_destroy (pattern);
-
-    return;
-}
-
-void
-Snes9xWindow::draw_background (int x, int y, int w, int h)
-{
-    cairo_t         *cr = NULL;
-    GdkWindow       *gdk_window = gtk_widget_get_window (GTK_WIDGET (drawing_area));
-
-    if (x >= 0)
-    {
-        GdkRectangle rect;
-
-        rect.x = x;
-        rect.y = y;
-        rect.width = w;
-        rect.height = h;
-
-        gdk_window_begin_paint_rect (gdk_window, &rect);
-
-        cr = gdk_cairo_create (gdk_window);
-
-        cairo_rectangle (cr,
-                         (double) x,
-                         (double) y,
-                         (double) w,
-                         (double) h);
-
-        cairo_clip (cr);
-
-        draw_background (cr);
-        gdk_window_end_paint (gdk_window);
-    }
-    else
-    {
-        cr = gdk_cairo_create (gdk_window);
-
-        draw_background (cr);
-    }
-
-    cairo_destroy (cr);
-
-    return;
-}
-
 void
 Snes9xWindow::toggle_statusbar (void)
 {

gtk/src/gtk_s9xwindow.h

@@ -54,8 +54,6 @@ class Snes9xWindow : public GtkBuilderWindow
         void show_status_message (const char *message);
         void update_statusbar (void);
         void toggle_statusbar (void);
-        void draw_background (int x = -1, int y = -1, int w = -1, int h = -1);
-        void draw_background (cairo_t *cr);
         void set_menu_item_selected (const char *name);
         void set_mouseable_area (int x, int y, int width, int height);
         void set_menu_item_accel_to_binding (const char *name,
@@ -65,7 +63,7 @@ class Snes9xWindow : public GtkBuilderWindow
         void toggle_ui (void);
         void resize_to_multiple (int factor);
         void resize_viewport (int width, int height);
-        void expose (GdkEventExpose *event, cairo_t *cr);
+        void expose (void);
 
         Snes9xConfig   *config;
         int            user_pause, sys_pause;
@@ -84,4 +82,11 @@ class Snes9xWindow : public GtkBuilderWindow
         GtkWidget      *recent_menu;
 };
 
+typedef struct gtk_splash_t {
+    unsigned int  width;
+    unsigned int  height;
+    unsigned int  bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
+    unsigned char pixel_data[256 * 224 * 3 + 1];
+} gtk_splash_t;
+
 #endif /* __GTK_S9XWINDOW_H */