Commit f6b06fcc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190121-pull-request' into staging 



ui: highres logo for sdl and gtk, bugfixes for vnc and egl.

# gpg: Signature made Mon 21 Jan 2019 14:11:39 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20190121-pull-request:
  egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType
  vnc: detect and optimize pageflips
  sdl: add support for high resolution window icon
  ui: fix icon display for GTK frontend under GNOME Shell with Wayland
  ui: install logo icons to $prefix/share/icons

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fcb700b7 fbd57c75

Makefile

+15 −1
Original line number Diff line number Diff line
@@ -669,7 +669,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 \
@@ -722,6 +721,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),)
@@ -743,6 +743,20 @@ 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"

	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

+47 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ fdt="" 
netmap="no"

sdl=""

sdlabi=""

sdl_image=""

virtfs=""

mpath=""

vnc="yes"
@@ -1045,6 +1046,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"
@@ -1707,6 +1712,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
@@ -3008,10 +3014,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>
@@ -5751,6 +5790,8 @@ qemu_confdir=$sysconfdir$confsuffix 
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
@@ -6037,6 +6078,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)"
@@ -6220,6 +6262,8 @@ 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 "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
@@ -6374,6 +6418,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/egl-helpers.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); 


#endif



EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win);

EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win);



int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode);

int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode);

include/ui/sdl2.h

+3 −0
Original line number Diff line number Diff line
@@ -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"

pc-bios/qemu-icon.bmp

deleted100644 → 0
−630 B
Loading image diff...