Skip to contentSkip to conversation

Fix & improve icon display on GTK and SDL frontends

PATCH In review Daniel P. Berrangé 3 participants 7 messages Jan 10, 2019 – Jan 11, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

v2 cover Fix & improve icon display on GTK and SDL frontends

This series improves the GTK and SDL frontends so that they display the high quality QEMU logo.

Changed in v2:

- Add a 'regenerate' make target in ui/icons to rebuild icons from SVG using inkscape.
- Allow use of SDL_Image to be disabled with --enable-sdl-image configure arg
- Reduce number of conditionals in SDL code
- Fix variable name typo in SDL code

Daniel P. Berrangé (3):
ui: install logo icons to $prefix/share/icons
ui: fix icon display for GTK frontend under GNOME Shell with Wayland
sdl: add support for high resolution window icon

 Makefile                                      |  16 +++++-
 configure                                     |  47 ++++++++++++++++++
 include/ui/sdl2.h                             |   3 ++
 pc-bios/qemu-icon.bmp                         | Bin 630 -> 0 bytes
 ui/gtk.c                                      |  18 +++----
 ui/icons/Makefile                             |  13 +++++
 .../icons/qemu.svg                            |   0
 ui/icons/qemu_128x128.png                     | Bin 0 -> 8286 bytes
 ui/icons/qemu_16x16.png                       | Bin 0 -> 765 bytes
 ui/icons/qemu_24x24.png                       | Bin 0 -> 1201 bytes
 ui/icons/qemu_256x256.png                     | Bin 0 -> 17572 bytes
 ui/icons/qemu_32x32.bmp                       | Bin 0 -> 4234 bytes
 ui/icons/qemu_32x32.png                       | Bin 0 -> 1696 bytes
 ui/icons/qemu_48x48.png                       | Bin 0 -> 2694 bytes
 ui/icons/qemu_512x512.png                     | Bin 0 -> 38007 bytes
 ui/icons/qemu_64x64.png                       | Bin 0 -> 3807 bytes
 ui/qemu.desktop                               |   8 +++
 ui/sdl2.c                                     |  22 ++++----
 18 files changed, 104 insertions(+), 23 deletions(-)
 delete mode 100644 pc-bios/qemu-icon.bmp
 create mode 100644 ui/icons/Makefile
 rename pc-bios/qemu_logo_no_text.svg => ui/icons/qemu.svg (100%)
 create mode 100644 ui/icons/qemu_128x128.png
 create mode 100644 ui/icons/qemu_16x16.png
 create mode 100644 ui/icons/qemu_24x24.png
 create mode 100644 ui/icons/qemu_256x256.png
 create mode 100644 ui/icons/qemu_32x32.bmp
 create mode 100644 ui/icons/qemu_32x32.png
 create mode 100644 ui/icons/qemu_48x48.png
 create mode 100644 ui/icons/qemu_512x512.png
 create mode 100644 ui/icons/qemu_64x64.png
 create mode 100644 ui/qemu.desktop
Signature · 1 line
2.19.2
#1 lore raw

PATCH v2 1/3 ui: install logo icons to $prefix/share/icons

QEMU currently installs loogs to $prefix/share/qemu/ which means no GUI toolkit or applications can find them by default.

The accepted standards for desktop applications declare that application logos / icons should be installed under $prefix/share/icons, so use this directory location.

Pre-rendered icons are provided at the standard sizes expected for GUI applications, along with the scalable SVG, to ensure maximum portability.

The PNGs are rendered from the SVG using inkscape, however, this is not wired up into the default make rules to avoid requiring inkscape as a mandatory tool in build systems / developer workstations..

---
 Makefile                                       |  13 ++++++++++++-
 configure                                      |   2 ++
 pc-bios/qemu-icon.bmp                          | Bin 630 -> 0 bytes
 ui/gtk.c                                       |  17 +++++------------
 ui/icons/Makefile                              |  13 +++++++++++++
 .../qemu_logo_no_text.svg => ui/icons/qemu.svg |   0
 ui/icons/qemu_128x128.png                      | Bin 0 -> 8286 bytes
 ui/icons/qemu_16x16.png                        | Bin 0 -> 765 bytes
 ui/icons/qemu_24x24.png                        | Bin 0 -> 1201 bytes
 ui/icons/qemu_256x256.png                      | Bin 0 -> 17572 bytes
 ui/icons/qemu_32x32.bmp                        | Bin 0 -> 4234 bytes
 ui/icons/qemu_32x32.png                        | Bin 0 -> 1696 bytes
 ui/icons/qemu_48x48.png                        | Bin 0 -> 2694 bytes
 ui/icons/qemu_512x512.png                      | Bin 0 -> 38007 bytes
 ui/icons/qemu_64x64.png                        | Bin 0 -> 3807 bytes
 ui/sdl2.c                                      |  16 ++++++----------
 16 files changed, 38 insertions(+), 23 deletions(-)
 delete mode 100644 pc-bios/qemu-icon.bmp
 create mode 100644 ui/icons/Makefile
 rename pc-bios/qemu_logo_no_text.svg => ui/icons/qemu.svg (100%)
 create mode 100644 ui/icons/qemu_128x128.png
 create mode 100644 ui/icons/qemu_16x16.png
 create mode 100644 ui/icons/qemu_24x24.png
 create mode 100644 ui/icons/qemu_256x256.png
 create mode 100644 ui/icons/qemu_32x32.bmp
 create mode 100644 ui/icons/qemu_32x32.png
 create mode 100644 ui/icons/qemu_48x48.png
 create mode 100644 ui/icons/qemu_512x512.png
 create mode 100644 ui/icons/qemu_64x64.png
Makefile +12 -1
index dd53965f77..6dd82f2eb8 100644
@@ -666,7 +666,6 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
 efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
 efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
 efi-e1000e.rom efi-vmxnet3.rom \
-qemu-icon.bmp qemu_logo_no_text.svg \
 bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
 multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \
 s390-ccw.img s390-netboot.img \
@@ -719,6 +718,7 @@ ifneq (,$(findstring qemu-ga,$(TOOLS)))
 endif
 endif
 
+ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
 
 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
 ifneq ($(TOOLS),)
@@ -740,6 +740,17 @@ ifneq ($(BLOBS),)
 		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
 	done
 endif
+	for s in $(ICON_SIZES); do \
+		mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \
+		$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
+			"$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
+	done; \
+	mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \
+	$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
+		"$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
+	mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
+	$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
+		"$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
 ifdef CONFIG_GTK
 	$(MAKE) -C po $@
 endif
configure +2 -0
index 8049b71eef..c1e1e05b5a 100755
@@ -5761,6 +5761,7 @@ qemu_confdir=$sysconfdir$confsuffix
 qemu_moddir=$libdir$confsuffix
 qemu_datadir=$datadir$confsuffix
 qemu_localedir="$datadir/locale"
+qemu_icondir="$datadir/icons"
 
 # We can only support ivshmem if we have eventfd
 if [ "$eventfd" = "yes" ]; then
@@ -6227,6 +6228,7 @@ if test "$mingw32" = "no" ; then
 fi
 echo "qemu_helperdir=$libexecdir" >> $config_host_mak
 echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
+echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
 echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
 echo "GIT=$git" >> $config_host_mak
 echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
pc-bios/qemu-icon.bmp deleted binary +0 -0
deleted file mode 100644
index 72d9a2f561ecbb61e49e75540debf189ee67cdb5..0000000000000000000000000000000000000000
GIT binary patch
ui/gtk.c +5 -12
index 579990b865..ec63befa16 100644
@@ -2214,8 +2214,8 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     VirtualConsole *vc;
 
     GtkDisplayState *s = g_malloc0(sizeof(*s));
-    char *filename;
     GdkDisplay *window_display;
+    GtkIconTheme *theme;
 
     if (!gtkinit) {
         fprintf(stderr, "gtk initialization failed\n");
@@ -2224,6 +2224,9 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     assert(opts->type == DISPLAY_TYPE_GTK);
     s->opts = opts;
 
+    theme = gtk_icon_theme_get_default();
+    gtk_icon_theme_prepend_search_path(theme, CONFIG_QEMU_ICONDIR);
+
     s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     s->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     s->notebook = gtk_notebook_new();
@@ -2248,17 +2251,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
     qemu_add_mouse_mode_change_notifier(&s->mouse_mode_notifier);
     qemu_add_vm_change_state_handler(gd_change_runstate, s);
 
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu_logo_no_text.svg");
-    if (filename) {
-        GError *error = NULL;
-        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, &error);
-        if (pixbuf) {
-            gtk_window_set_icon(GTK_WINDOW(s->window), pixbuf);
-        } else {
-            g_error_free(error);
-        }
-        g_free(filename);
-    }
+    gtk_window_set_icon_name(GTK_WINDOW(s->window), "qemu");
 
     gd_create_menus(s);
 
ui/icons/Makefile new file +13 -0
new file mode 100644
index 0000000000..20bd64ccce
@@ -0,0 +1,13 @@
+
+# Regenerate bitmaps from the SVG using inkscape CLI export
+# and ImageMagick. Don't use ImageMagick for the initial
+# SVG conversion, since it merely calls inkscape, but uses
+# 96 DPI res resulting in poor quality output.
+
+regenerate:
+	for s in 16 24 32 48 64 128 256 512; \
+	do \
+	    inkscape --without-gui --export-png=qemu_$${s}x$${s}.png \
+		--export-width=$$s --export-height=$$s qemu.svg ; \
+	done
+	convert qemu_32x32.png qemu_32x32.bmp
ui/icons/qemu.svg renamed from pc-bios/qemu_logo_no_text.svg +0 -0
similarity index 100%
rename from pc-bios/qemu_logo_no_text.svg
rename to ui/icons/qemu.svg
ui/icons/qemu_128x128.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..96831807ba873c9257c1985f43c7618df9128286
GIT binary patch
ui/icons/qemu_16x16.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..ff4f046024ffab8d7c3228caad36c2aafbc52d3d
GIT binary patch
ui/icons/qemu_24x24.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..f039c6e25d98844745ef24fd8114dde843136a2b
GIT binary patch
ui/icons/qemu_256x256.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..a39c0e307e2d8a01f1341a7b3dd7308449633e9c
GIT binary patch
ui/icons/qemu_32x32.bmp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c0daa54abeecc4fee14707c83a59c2085e2eeebd
GIT binary patch
ui/icons/qemu_32x32.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b746096cf8104bccfda8259ee2f75de1bab2e0e5
GIT binary patch
ui/icons/qemu_48x48.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..067281225de66e9b381b23bdd6ee905465c625d2
GIT binary patch
ui/icons/qemu_512x512.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..86aaa6395fc91271562db2b075ddd8e889531680
GIT binary patch
ui/icons/qemu_64x64.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..e00c8b4c9be88a89b091bb967900d18e97d9011b
GIT binary patch
ui/sdl2.c +6 -10
index a10b6e3a08..4c0d5db473 100644
@@ -762,7 +762,6 @@ static void sdl2_display_early_init(DisplayOptions *o)
 static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
 {
     uint8_t data = 0;
-    char *filename;
     int i;
     SDL_SysWMinfo info;
 
@@ -837,15 +836,12 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
     }
 
     /* Load a 32x32x4 image. White pixels are transparent. */
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp");
-    if (filename) {
-        SDL_Surface *image = SDL_LoadBMP(filename);
-        if (image) {
-            uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255);
-            SDL_SetColorKey(image, SDL_TRUE, colorkey);
-            SDL_SetWindowIcon(sdl2_console[0].real_window, image);
-        }
-        g_free(filename);
+    SDL_Surface *image = SDL_LoadBMP(CONFIG_QEMU_ICONDIR
+                                     "/hicolor/32x32/apps/qemu.bmp");
+    if (image) {
+        uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255);
+        SDL_SetColorKey(image, SDL_TRUE, colorkey);
+        SDL_SetWindowIcon(sdl2_console[0].real_window, image);
     }
 
     gui_grab = 0;
Signature · 1 line
2.19.2
#2 lore raw

Re: [Qemu-devel] [PATCH v2 1/3] ui: install logo icons to $prefix/share/icons

Quoted 1 line · Daniel P. Berrangé

QEMU currently installs loogs to $prefix/share/qemu/ which means no GUI

s/loogs/logos/

Quoted 6 lines

toolkit or applications can find them by default.

The accepted standards for desktop applications declare that application logos / icons should be installed under $prefix/share/icons, so use this directory location.

Quoted 6 lines

Pre-rendered icons are provided at the standard sizes expected for GUI applications, along with the scalable SVG, to ensure maximum portability.

The PNGs are rendered from the SVG using inkscape, however, this is not wired up into the default make rules to avoid requiring inkscape as a mandatory tool in build systems / developer workstations..

double trailing '.'. I like that the rules for automating it are there as a separate make target, and that they are not part of the default build (and hence the generated files must live in git). That said,...

ui/icons/Makefile line 5

Quoted 12 lines

---

+++ b/ui/icons/Makefile

ui/icons/Makefile new file +5 -0
@@ -0,0 +1,13 @@
+
+# Regenerate bitmaps from the SVG using inkscape CLI export
+# and ImageMagick. Don't use ImageMagick for the initial
+# SVG conversion, since it merely calls inkscape, but uses
+# 96 DPI res resulting in poor quality output.

...should this comment mention that it is intentional that this target is not part of 'make all'? Should the target be named 'maint-regenerate' to call attention to the fact that it is a maintainer-specific target?

Quoted 8 lines
ui/icons/Makefile new file +8 -0
+
+regenerate:
+	for s in 16 24 32 48 64 128 256 512; \
+	do \
+	    inkscape --without-gui --export-png=qemu_$${s}x$${s}.png \
+		--export-width=$$s --export-height=$$s qemu.svg ; \
+	done
+	convert qemu_32x32.png qemu_32x32.bmp
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#3 lore raw

Re: [Qemu-devel] [PATCH v2 1/3] ui: install logo icons to $prefix/share/icons

Quoted 14 lines · Eric Blake
Quoted 1 line · Daniel P. Berrangé

QEMU currently installs loogs to $prefix/share/qemu/ which means no GUI

s/loogs/logos/

Quoted 9 lines

toolkit or applications can find them by default.

The accepted standards for desktop applications declare that application logos / icons should be installed under $prefix/share/icons, so use this directory location.

Pre-rendered icons are provided at the standard sizes expected for GUI applications, along with the scalable SVG, to ensure maximum portability.

Quoted 7 lines
Quoted 3 lines

The PNGs are rendered from the SVG using inkscape, however, this is not wired up into the default make rules to avoid requiring inkscape as a mandatory tool in build systems / developer workstations..

double trailing '.'. I like that the rules for automating it are there as a separate make target, and that they are not part of the default build (and hence the generated files must live in git). That said,...

/me can fix that on commit.

Quoted 11 lines

ui/icons/Makefile line 5

Quoted 7 lines

+++ b/ui/icons/Makefile

ui/icons/Makefile new file +5 -0
@@ -0,0 +1,13 @@
+
+# Regenerate bitmaps from the SVG using inkscape CLI export
+# and ImageMagick. Don't use ImageMagick for the initial
+# SVG conversion, since it merely calls inkscape, but uses
+# 96 DPI res resulting in poor quality output.

...should this comment mention that it is intentional that this target is not part of 'make all'? Should the target be named 'maint-regenerate' to call attention to the fact that it is a maintainer-specific target?

roms/Makefile targets (which is basically the same, but for guest firmware) don't have a maint prefix either ...

cheers,
Gerd

#4 lore raw

PATCH v2 2/3 ui: fix icon display for GTK frontend under GNOME Shell with Wayland

In reply to Daniel P. Berrangé

The icon associated with a GtkWindow is just a hint to window managers and not all of them will honour it. Some will instead want to show the icon listed by the .desktop file. The desktop file is located based on the application ID, which is set using g_set_prgname. QEMU has not historically provided a desktop file or set its app ID, so it got a broken icon in GNOME shell, which is now fixed.

---
 Makefile        | 3 +++
 configure       | 2 ++
 ui/gtk.c        | 1 +
 ui/qemu.desktop | 8 ++++++++
 4 files changed, 14 insertions(+)
 create mode 100644 ui/qemu.desktop
Makefile +3 -0
index 6dd82f2eb8..f12e935c46 100644
@@ -751,6 +751,9 @@ endif
 	mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
 	$(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
 		"$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
+	mkdir -p "$(DESTDIR)/$(qemu_desktopdir)"
+	$(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
+		"$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop"
 ifdef CONFIG_GTK
 	$(MAKE) -C po $@
 endif
configure +2 -0
index c1e1e05b5a..97918ba09c 100755
@@ -5762,6 +5762,7 @@ qemu_moddir=$libdir$confsuffix
 qemu_datadir=$datadir$confsuffix
 qemu_localedir="$datadir/locale"
 qemu_icondir="$datadir/icons"
+qemu_desktopdir="$datadir/applications"
 
 # We can only support ivshmem if we have eventfd
 if [ "$eventfd" = "yes" ]; then
@@ -6229,6 +6230,7 @@ fi
 echo "qemu_helperdir=$libexecdir" >> $config_host_mak
 echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
 echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
+echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak
 echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
 echo "GIT=$git" >> $config_host_mak
 echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
ui/gtk.c +1 -0
index ec63befa16..87c0e33d2a 100644
@@ -2226,6 +2226,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
 
     theme = gtk_icon_theme_get_default();
     gtk_icon_theme_prepend_search_path(theme, CONFIG_QEMU_ICONDIR);
+    g_set_prgname("qemu");
 
     s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     s->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
ui/qemu.desktop new file +8 -0
new file mode 100644
index 0000000000..20f09f56be
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=QEMU
+Icon=qemu
+Type=Application
+Terminal=false
+Keywords=Emulators;Virtualization;KVM;
+NoDisplay=true
Signature · 1 line
2.19.2
#5 lore raw

PATCH v2 3/3 sdl: add support for high resolution window icon

In reply to Daniel P. Berrangé

Modern desktop environments can render icons at very large sizes, especially with high DPI screens. Providing a 32x32 pixel bitmap is nowhere near sufficient anymore.

When displayed in GNOME shell the QEMU icon looks awful, having been scaled up to at least x4 its base size. This is compounded by the fact that the BMP file doesn't do transparency, so while we've removed white pixels, we still have anti-aliased nearly-white pixels which make the logo look appalling on black backgrounds.

Loading a high resolution PNG icon addresses both problems, but requires use of the extra SDL2_image library.

---
 configure         | 43 +++++++++++++++++++++++++++++++++++++++++++
 include/ui/sdl2.h |  3 +++
 ui/sdl2.c         | 18 ++++++++++++------
 3 files changed, 58 insertions(+), 6 deletions(-)
configure +43 -0
index 97918ba09c..880b38bd45 100755
@@ -346,6 +346,7 @@ fdt=""
 netmap="no"
 sdl=""
 sdlabi=""
+sdl_image=""
 virtfs=""
 mpath=""
 vnc="yes"
@@ -1046,6 +1047,10 @@ for opt do
   ;;
   --with-sdlabi=*) sdlabi="$optarg"
   ;;
+  --disable-sdl-image) sdl_image="no"
+  ;;
+  --enable-sdl-image) sdl_image="yes"
+  ;;
   --disable-qom-cast-debug) qom_cast_debug="no"
   ;;
   --enable-qom-cast-debug) qom_cast_debug="yes"
@@ -1714,6 +1719,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   gcrypt          libgcrypt cryptography support
   sdl             SDL UI
   --with-sdlabi     select preferred SDL ABI 1.2 or 2.0
+  sdl_image       SDL Image support for icons
   gtk             gtk UI
   vte             vte support for the gtk UI
   curses          curses UI
@@ -3018,10 +3024,43 @@ EOF
   fi # sdl compile test
 }
 
+sdl_image_probe ()
+{
+    if test "$sdl_image" != "no" ; then
+        if $pkg_config SDL2_image --exists; then
+            if test "$static" = "yes"; then
+                sdl_image_libs=$($pkg_config SDL2_image --libs --static 2>/dev/null)
+            else
+                sdl_image_libs=$($pkg_config SDL2_image --libs 2>/dev/null)
+            fi
+            sdl_image_cflags=$($pkg_config SDL2_image --cflags 2>/dev/null)
+            sdl_image=yes
+
+            sdl_cflags="$sdl_cflags $sdl_image_cflags"
+            sdl_libs="$sdl_libs $sdl_image_libs"
+        else
+            if test "$sdl_image" = "yes" ; then
+                feature_not_found "sdl_image" "Install SDL Image devel"
+            else
+                sdl_image=no
+            fi
+        fi
+    fi
+}
+
 if test "$sdl" != "no" ; then
   sdl_probe
 fi
 
+if test "$sdl" = "yes" ; then
+  sdl_image_probe
+else
+  if test "$sdl_image" = "yes"; then
+    echo "warning: SDL Image requested, but SDL is not available, disabling"
+  fi
+  sdl_image=no
+fi
+
 if test "$sdl" = "yes" ; then
   cat > $TMPC <<EOF
 #include <SDL.h>
@@ -6045,6 +6084,7 @@ if test "$darwin" = "yes" ; then
     echo "Cocoa support     $cocoa"
 fi
 echo "SDL support       $sdl $(echo_version $sdl $sdlversion)"
+echo "SDL image support $sdl_image"
 echo "GTK support       $gtk $(echo_version $gtk $gtk_version)"
 echo "GTK GL support    $gtk_gl"
 echo "VTE support       $vte $(echo_version $vte $vteversion)"
@@ -6385,6 +6425,9 @@ if test "$sdl" = "yes" ; then
   echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak
   echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
   echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
+  if test "$sdl_image" = "yes" ; then
+      echo "CONFIG_SDL_IMAGE=y" >> $config_host_mak
+  fi
 fi
 if test "$cocoa" = "yes" ; then
   echo "CONFIG_COCOA=y" >> $config_host_mak
include/ui/sdl2.h +3 -0
index f43eecdbd6..f6db642b65 100644
@@ -6,6 +6,9 @@
 
 #include <SDL.h>
 #include <SDL_syswm.h>
+#ifdef CONFIG_SDL_IMAGE
+# include <SDL_image.h>
+#endif
 
 #ifdef CONFIG_OPENGL
 # include "ui/egl-helpers.h"
ui/sdl2.c +12 -6
index 4c0d5db473..cde7feba91 100644
@@ -764,6 +764,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
     uint8_t data = 0;
     int i;
     SDL_SysWMinfo info;
+    SDL_Surface *icon = NULL;
 
     assert(o->type == DISPLAY_TYPE_SDL);
 
@@ -835,13 +836,18 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
 #endif
     }
 
+#ifdef CONFIG_SDL_IMAGE
+    icon = IMG_Load(CONFIG_QEMU_ICONDIR "/hicolor/128x128/apps/qemu.png");
+#else
     /* Load a 32x32x4 image. White pixels are transparent. */
-    SDL_Surface *image = SDL_LoadBMP(CONFIG_QEMU_ICONDIR
-                                     "/hicolor/32x32/apps/qemu.bmp");
-    if (image) {
-        uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255);
-        SDL_SetColorKey(image, SDL_TRUE, colorkey);
-        SDL_SetWindowIcon(sdl2_console[0].real_window, image);
+    icon = SDL_LoadBMP(CONFIG_QEMU_ICONDIR "/hicolor/32x32/apps/qemu.bmp");
+    if (icon) {
+        uint32_t colorkey = SDL_MapRGB(icon->format, 255, 255, 255);
+        SDL_SetColorKey(icon, SDL_TRUE, colorkey);
+    }
+#endif
+    if (icon) {
+        SDL_SetWindowIcon(sdl2_console[0].real_window, icon);
     }
 
     gui_grab = 0;
Signature · 1 line
2.19.2
#6 lore raw
In reply to Daniel P. Berrangé
Quoted 11 lines · Daniel P. Berrangé

This series improves the GTK and SDL frontends so that they display the high quality QEMU logo.

Changed in v2:

- Add a 'regenerate' make target in ui/icons to rebuild icons from SVG using inkscape.
- Allow use of SDL_Image to be disabled with --enable-sdl-image configure arg
- Reduce number of conditionals in SDL code
- Fix variable name typo in SDL code

Added to ui queue.

thanks,
Gerd