* [Qemu-devel] [PULL 0/5] Ui 20190201 patches
@ 2019-02-01 12:30 Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 1/5] hw/display: Move Milkymist specific hardware out of common-obj list Gerd Hoffmann
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:30 UTC (permalink / raw)
To: qemu-devel; +Cc: libvir-list, Michael Walle, Gerd Hoffmann
The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d:
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-01-31 15:40:39 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/ui-20190201-pull-request
for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4:
ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100)
----------------------------------------------------------------
ui: fix build with SDL disabled, drop SDL1 support.
----------------------------------------------------------------
Daniel P. Berrangé (1):
ui: remove support for SDL1.2 in favour of SDL2
Philippe Mathieu-Daudé (4):
hw/display: Move Milkymist specific hardware out of common-obj list
configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of
X11
hw/display/milkymist-tmu2: Explicit the dependency to both X11 /
OpenGL
hw/display/milkymist-tmu2: Move inlined code from header to source
configure | 70 +--
hw/lm32/milkymist-hw.h | 63 ---
include/hw/display/milkymist_tmu2.h | 41 ++
ui/sdl_zoom.h | 25 -
ui/sdl_zoom_template.h | 219 --------
hw/display/milkymist-tmu2.c | 49 ++
hw/lm32/milkymist.c | 1 +
ui/sdl.c | 1027 -----------------------------------
ui/sdl_zoom.c | 93 ----
MAINTAINERS | 1 +
default-configs/lm32-softmmu.mak | 2 +-
hw/display/Makefile.objs | 8 +-
qemu-deprecated.texi | 9 -
ui/Makefile.objs | 5 -
14 files changed, 114 insertions(+), 1499 deletions(-)
create mode 100644 include/hw/display/milkymist_tmu2.h
delete mode 100644 ui/sdl_zoom.h
delete mode 100644 ui/sdl_zoom_template.h
delete mode 100644 ui/sdl.c
delete mode 100644 ui/sdl_zoom.c
--
2.9.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 1/5] hw/display: Move Milkymist specific hardware out of common-obj list
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
@ 2019-02-01 12:30 ` Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 2/5] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 Gerd Hoffmann
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:30 UTC (permalink / raw)
To: qemu-devel
Cc: libvir-list, Michael Walle, Gerd Hoffmann, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The Milkymist specific hardware is only used by the LM32 target,
it is pointless to compile those objects in other targets.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-2-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/Makefile.objs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 97acd5b6cb..5b770817c7 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -25,10 +25,10 @@ common-obj-$(CONFIG_BOCHS_DISPLAY) += edid-region.o
common-obj-$(CONFIG_BLIZZARD) += blizzard.o
common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
-common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
+obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
-common-obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
+obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
milkymist-tmu2.o-cflags := $(X11_CFLAGS)
milkymist-tmu2.o-libs := $(X11_LIBS)
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 2/5] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 1/5] hw/display: Move Milkymist specific hardware out of common-obj list Gerd Hoffmann
@ 2019-02-01 12:30 ` Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 3/5] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL Gerd Hoffmann
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:30 UTC (permalink / raw)
To: qemu-devel
Cc: libvir-list, Michael Walle, Gerd Hoffmann, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit 5f9b1e35060b8 remove the dependency between OpenGL and X11.
However the milkymist-tmu2 device do require X11.
When using SDL, the configure script sets need_x11=yes, so the X11
flags are populated to the makefiles.
When building without SDL, X11 is not pulled and populated, leading
to a link failure:
LINK lm32-softmmu/qemu-system-lm32
hw/lm32/milkymist.o: In function `milkymist_tmu2_create':
hw/lm32/milkymist-hw.h:114: undefined reference to `XOpenDisplay'
hw/lm32/milkymist-hw.h:140: undefined reference to `XFree'
hw/lm32/milkymist-hw.h:141: undefined reference to `XCloseDisplay'
hw/lm32/milkymist-hw.h:130: undefined reference to `XCloseDisplay'
../hw/display/milkymist-tmu2.o: In function `tmu2_glx_init':
hw/display/milkymist-tmu2.c:112: undefined reference to `XOpenDisplay'
hw/display/milkymist-tmu2.c:123: undefined reference to `XFree'
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:199: qemu-system-lm32] Error 1
Enforce the X11 dependency when the LM32 target is built.
This will allow us to build QEMU without SDL.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-3-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/configure b/configure
index b18281c61f..c7024d6662 100755
--- a/configure
+++ b/configure
@@ -4047,6 +4047,16 @@ EOF
fi
fi
+if test "$opengl" = "yes" -a "$have_x11" = "yes"; then
+ for target in $target_list; do
+ case $target in
+ lm32-softmmu) # milkymist-tmu2 requires X11 and OpenGL
+ need_x11=yes
+ ;;
+ esac
+ done
+fi
+
##########################################
# libxml2 probe
if test "$libxml2" != "no" ; then
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 3/5] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 1/5] hw/display: Move Milkymist specific hardware out of common-obj list Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 2/5] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 Gerd Hoffmann
@ 2019-02-01 12:30 ` Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 4/5] hw/display/milkymist-tmu2: Move inlined code from header to source Gerd Hoffmann
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:30 UTC (permalink / raw)
To: qemu-devel
Cc: libvir-list, Michael Walle, Gerd Hoffmann, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The TMU device requires both X11 and OpenGL.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-4-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/lm32/milkymist-hw.h | 4 ++--
default-configs/lm32-softmmu.mak | 2 +-
hw/display/Makefile.objs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h
index d3be0cfb3a..32c344ef9f 100644
--- a/hw/lm32/milkymist-hw.h
+++ b/hw/lm32/milkymist-hw.h
@@ -88,7 +88,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,
return dev;
}
-#ifdef CONFIG_OPENGL
+#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
#include <X11/Xlib.h>
#include <epoxy/gl.h>
#include <epoxy/glx.h>
@@ -103,7 +103,7 @@ static const int glx_fbconfig_attr[] = {
static inline DeviceState *milkymist_tmu2_create(hwaddr base,
qemu_irq irq)
{
-#ifdef CONFIG_OPENGL
+#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
DeviceState *dev;
Display *d;
GLXFBConfig *configs;
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index 4889348a10..4049b23562 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -2,7 +2,7 @@
CONFIG_LM32=y
CONFIG_MILKYMIST=y
-CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL)
+CONFIG_MILKYMIST_TMU2=$(call land,$(CONFIG_X11),$(CONFIG_OPENGL))
CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 5b770817c7..7c4ae9a0fd 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -29,8 +29,8 @@ obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
-milkymist-tmu2.o-cflags := $(X11_CFLAGS)
-milkymist-tmu2.o-libs := $(X11_LIBS)
+milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)
+milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS)
obj-$(CONFIG_OMAP) += omap_dss.o
obj-$(CONFIG_OMAP) += omap_lcdc.o
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 4/5] hw/display/milkymist-tmu2: Move inlined code from header to source
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
` (2 preceding siblings ...)
2019-02-01 12:30 ` [Qemu-devel] [PULL 3/5] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL Gerd Hoffmann
@ 2019-02-01 12:30 ` Gerd Hoffmann
2019-02-01 12:31 ` [Qemu-devel] [PULL 5/5] ui: remove support for SDL1.2 in favour of SDL2 Gerd Hoffmann
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:30 UTC (permalink / raw)
To: qemu-devel
Cc: libvir-list, Michael Walle, Gerd Hoffmann, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Move the complexity of milkymist_tmu2_create() into the
source file. Doing so we avoid to include the X11/OpenGL
headers in all LM32 devices, and we also avoid the duplicate
declaration of glx_fbconfig_attr[] (it is already declared
in hw/display/milkymist-tmu2.c).
Since TYPE_MILKYMIST_TMU2 is now accessible, use it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-5-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/lm32/milkymist-hw.h | 63 -------------------------------------
include/hw/display/milkymist_tmu2.h | 41 ++++++++++++++++++++++++
hw/display/milkymist-tmu2.c | 49 +++++++++++++++++++++++++++++
hw/lm32/milkymist.c | 1 +
MAINTAINERS | 1 +
5 files changed, 92 insertions(+), 63 deletions(-)
create mode 100644 include/hw/display/milkymist_tmu2.h
diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h
index 32c344ef9f..976cf9254d 100644
--- a/hw/lm32/milkymist-hw.h
+++ b/hw/lm32/milkymist-hw.h
@@ -88,69 +88,6 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,
return dev;
}
-#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
-#include <X11/Xlib.h>
-#include <epoxy/gl.h>
-#include <epoxy/glx.h>
-static const int glx_fbconfig_attr[] = {
- GLX_GREEN_SIZE, 5,
- GLX_GREEN_SIZE, 6,
- GLX_BLUE_SIZE, 5,
- None
-};
-#endif
-
-static inline DeviceState *milkymist_tmu2_create(hwaddr base,
- qemu_irq irq)
-{
-#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
- DeviceState *dev;
- Display *d;
- GLXFBConfig *configs;
- int nelements;
- int ver_major, ver_minor;
-
- /* check that GLX will work */
- d = XOpenDisplay(NULL);
- if (d == NULL) {
- return NULL;
- }
-
- if (!glXQueryVersion(d, &ver_major, &ver_minor)) {
- /* Yeah, sometimes getting the GLX version can fail.
- * Isn't X beautiful? */
- XCloseDisplay(d);
- return NULL;
- }
-
- if ((ver_major < 1) || ((ver_major == 1) && (ver_minor < 3))) {
- printf("Your GLX version is %d.%d,"
- "but TMU emulation needs at least 1.3. TMU disabled.\n",
- ver_major, ver_minor);
- XCloseDisplay(d);
- return NULL;
- }
-
- configs = glXChooseFBConfig(d, 0, glx_fbconfig_attr, &nelements);
- if (configs == NULL) {
- XCloseDisplay(d);
- return NULL;
- }
-
- XFree(configs);
- XCloseDisplay(d);
-
- dev = qdev_create(NULL, "milkymist-tmu2");
- qdev_init_nofail(dev);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
-
- return dev;
-#else
- return NULL;
-#endif
-}
-
static inline DeviceState *milkymist_ac97_create(hwaddr base,
qemu_irq crrequest_irq, qemu_irq crreply_irq, qemu_irq dmar_irq,
qemu_irq dmaw_irq)
diff --git a/include/hw/display/milkymist_tmu2.h b/include/hw/display/milkymist_tmu2.h
new file mode 100644
index 0000000000..148a119a1d
--- /dev/null
+++ b/include/hw/display/milkymist_tmu2.h
@@ -0,0 +1,41 @@
+/*
+ * QEMU model of the Milkymist texture mapping unit.
+ *
+ * Copyright (c) 2010 Michael Walle <michael@walle.cc>
+ * Copyright (c) 2010 Sebastien Bourdeauducq
+ * <sebastien.bourdeauducq@lekernel.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Specification available at:
+ * http://milkymist.walle.cc/socdoc/tmu2.pdf
+ *
+ */
+
+#ifndef HW_DISPLAY_MILKYMIST_TMU2_H
+#define HW_DISPLAY_MILKYMIST_TMU2_H
+
+#include "hw/qdev.h"
+
+#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
+DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq);
+#else
+static inline DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)
+{
+ return NULL;
+}
+#endif
+
+#endif /* HW_DISPLAY_MILKYMIST_TMU2_H */
diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index 3ce44fdfce..b33fc234e9 100644
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -31,6 +31,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "hw/display/milkymist_tmu2.h"
#include <X11/Xlib.h>
#include <epoxy/gl.h>
@@ -499,3 +500,51 @@ static void milkymist_tmu2_register_types(void)
}
type_init(milkymist_tmu2_register_types)
+
+DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)
+{
+ DeviceState *dev;
+ Display *d;
+ GLXFBConfig *configs;
+ int nelements;
+ int ver_major, ver_minor;
+
+ /* check that GLX will work */
+ d = XOpenDisplay(NULL);
+ if (d == NULL) {
+ return NULL;
+ }
+
+ if (!glXQueryVersion(d, &ver_major, &ver_minor)) {
+ /*
+ * Yeah, sometimes getting the GLX version can fail.
+ * Isn't X beautiful?
+ */
+ XCloseDisplay(d);
+ return NULL;
+ }
+
+ if ((ver_major < 1) || ((ver_major == 1) && (ver_minor < 3))) {
+ printf("Your GLX version is %d.%d,"
+ "but TMU emulation needs at least 1.3. TMU disabled.\n",
+ ver_major, ver_minor);
+ XCloseDisplay(d);
+ return NULL;
+ }
+
+ configs = glXChooseFBConfig(d, 0, glx_fbconfig_attr, &nelements);
+ if (configs == NULL) {
+ XCloseDisplay(d);
+ return NULL;
+ }
+
+ XFree(configs);
+ XCloseDisplay(d);
+
+ dev = qdev_create(NULL, TYPE_MILKYMIST_TMU2);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
+
+ return dev;
+}
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 63c6894c95..26a2398354 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -32,6 +32,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "milkymist-hw.h"
+#include "hw/display/milkymist_tmu2.h"
#include "lm32.h"
#include "exec/address-spaces.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 234e5c413b..37ceda468f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -185,6 +185,7 @@ F: disas/lm32.c
F: hw/lm32/
F: hw/*/lm32_*
F: hw/*/milkymist-*
+F: include/hw/display/milkymist_tmu2.h
F: include/hw/char/lm32_juart.h
F: include/hw/lm32/
F: tests/tcg/lm32/
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 5/5] ui: remove support for SDL1.2 in favour of SDL2
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
` (3 preceding siblings ...)
2019-02-01 12:30 ` [Qemu-devel] [PULL 4/5] hw/display/milkymist-tmu2: Move inlined code from header to source Gerd Hoffmann
@ 2019-02-01 12:31 ` Gerd Hoffmann
2019-02-01 16:38 ` [Qemu-devel] [PULL 0/5] Ui 20190201 patches Peter Maydell
2019-02-03 14:31 ` [Qemu-devel] [libvirt] " no-reply
6 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-02-01 12:31 UTC (permalink / raw)
To: qemu-devel
Cc: libvir-list, Michael Walle, Gerd Hoffmann, Daniel P. Berrangé
From: Daniel P. Berrangé <berrange@redhat.com>
SDL1.2 was deprecated in the 2.12.0 release with:
commit e52c6ba34149b4f39c3fd60e59ee32b809db2bfa
Author: Daniel P. Berrange <berrange@redhat.com>
Date: Mon Jan 15 14:25:33 2018 +0000
ui: deprecate use of SDL 1.2 in favour of 2.0 series
The SDL 2.0 release was made in Aug, 2013:
https://www.libsdl.org/release/
That will soon be 4 + 1/2 years ago, which is enough time to consider
the 2.0 series widely supported.
Thus we deprecate the SDL 1.2 support, which will allow us to delete it
in the last release of 2018. By this time, SDL 2.0 will be more than 5
years old.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180115142533.24585-1-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
It is thus able to be removed in the 3.1.0 release.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20180822131554.3398-4-berrange@redhat.com>
[ kraxel: rebase ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 60 +--
ui/sdl_zoom.h | 25 --
ui/sdl_zoom_template.h | 219 -----------
ui/sdl.c | 1027 ------------------------------------------------
ui/sdl_zoom.c | 93 -----
qemu-deprecated.texi | 9 -
ui/Makefile.objs | 5 -
7 files changed, 7 insertions(+), 1431 deletions(-)
delete mode 100644 ui/sdl_zoom.h
delete mode 100644 ui/sdl_zoom_template.h
delete mode 100644 ui/sdl.c
delete mode 100644 ui/sdl_zoom.c
diff --git a/configure b/configure
index c7024d6662..b229f43334 100755
--- a/configure
+++ b/configure
@@ -348,7 +348,6 @@ docs=""
fdt=""
netmap="no"
sdl=""
-sdlabi=""
sdl_image=""
virtfs=""
mpath=""
@@ -577,7 +576,6 @@ query_pkg_config() {
"${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
}
pkg_config=query_pkg_config
-sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}"
# If the user hasn't specified ARFLAGS, default to 'rv', just as make does.
@@ -1044,8 +1042,6 @@ for opt do
;;
--enable-sdl) sdl="yes"
;;
- --with-sdlabi=*) sdlabi="$optarg"
- ;;
--disable-sdl-image) sdl_image="no"
;;
--enable-sdl-image) sdl_image="yes"
@@ -1711,7 +1707,6 @@ disabled with --disable-FEATURE, default is enabled if available:
nettle nettle cryptography support
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
@@ -2927,37 +2922,11 @@ fi
sdl_probe ()
{
- sdl_too_old=no
- if test "$sdlabi" = ""; then
- if $pkg_config --exists "sdl2"; then
- sdlabi=2.0
- elif $pkg_config --exists "sdl"; then
- sdlabi=1.2
- else
- sdlabi=2.0
- fi
- fi
-
- if test $sdlabi = "2.0"; then
- sdl_config=$sdl2_config
- sdlname=sdl2
- sdlconfigname=sdl2_config
- elif test $sdlabi = "1.2"; then
- sdlname=sdl
- sdlconfigname=sdl_config
- else
- error_exit "Unknown sdlabi $sdlabi, must be 1.2 or 2.0"
- fi
-
- if test "$(basename $sdl_config)" != $sdlconfigname && ! has ${sdl_config}; then
- sdl_config=$sdlconfigname
- fi
-
- if $pkg_config $sdlname --exists; then
- sdlconfig="$pkg_config $sdlname"
+ if $pkg_config sdl2 --exists; then
+ sdlconfig="$pkg_config sdl2"
sdlversion=$($sdlconfig --modversion 2>/dev/null)
elif has ${sdl_config}; then
- sdlconfig="$sdl_config"
+ sdlconfig="$sdl2_config"
sdlversion=$($sdlconfig --version)
else
if test "$sdl" = "yes" ; then
@@ -2979,8 +2948,8 @@ EOF
sdl_cflags=$($sdlconfig --cflags 2>/dev/null)
sdl_cflags="$sdl_cflags -Wno-undef" # workaround 2.0.8 bug
if test "$static" = "yes" ; then
- if $pkg_config $sdlname --exists; then
- sdl_libs=$($pkg_config $sdlname --static --libs 2>/dev/null)
+ if $pkg_config sdl2 --exists; then
+ sdl_libs=$($pkg_config sdl2 --static --libs 2>/dev/null)
else
sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
fi
@@ -2988,11 +2957,7 @@ EOF
sdl_libs=$($sdlconfig --libs 2>/dev/null)
fi
if compile_prog "$sdl_cflags" "$sdl_libs" ; then
- if test $(echo $sdlversion | sed 's/[^0-9]//g') -lt 121 ; then
- sdl_too_old=yes
- else
- sdl=yes
- fi
+ sdl=yes
# static link with sdl ? (note: sdl.pc's --static --libs is broken)
if test "$sdl" = "yes" -a "$static" = "yes" ; then
@@ -3008,7 +2973,7 @@ EOF
fi # static link
else # sdl not found
if test "$sdl" = "yes" ; then
- feature_not_found "sdl" "Install SDL devel"
+ feature_not_found "sdl" "Install SDL2 devel"
fi
sdl=no
fi # sdl compile test
@@ -6220,16 +6185,6 @@ echo "docker $docker"
echo "libpmem support $libpmem"
echo "libudev $libudev"
-if test "$sdl_too_old" = "yes"; then
-echo "-> Your SDL version is too old - please upgrade to have SDL support"
-fi
-
-if test "$sdlabi" = "1.2"; then
- echo
- echo "WARNING: Use of SDL 1.2 is deprecated and will be removed in"
- echo "WARNING: future releases. Please switch to using SDL 2.0"
-fi
-
if test "$supported_cpu" = "no"; then
echo
echo "WARNING: SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!"
@@ -6434,7 +6389,6 @@ if test "$have_x11" = "yes" -a "$need_x11" = "yes"; then
fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=m" >> $config_host_mak
- 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
diff --git a/ui/sdl_zoom.h b/ui/sdl_zoom.h
deleted file mode 100644
index 39696ddb08..0000000000
--- a/ui/sdl_zoom.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SDL_zoom - surface scaling
- *
- * Copyright (c) 2009 Citrix Systems, Inc.
- *
- * Derived from: SDL_rotozoom, LGPL (c) A. Schiffler from the SDL_gfx library.
- * Modifications by Stefano Stabellini.
- *
- * This work is licensed under the terms of the GNU GPL version 2.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#ifndef SDL_ZOOM_H
-#define SDL_ZOOM_H
-
-#include <SDL.h>
-
-#define SMOOTHING_OFF 0
-#define SMOOTHING_ON 1
-
-int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc,
- int smooth, SDL_Rect *src_rect);
-
-#endif /* SDL_ZOOM_H */
diff --git a/ui/sdl_zoom_template.h b/ui/sdl_zoom_template.h
deleted file mode 100644
index 6a424adfb4..0000000000
--- a/ui/sdl_zoom_template.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * SDL_zoom_template - surface scaling
- *
- * Copyright (c) 2009 Citrix Systems, Inc.
- *
- * Derived from: SDL_rotozoom, LGPL (c) A. Schiffler from the SDL_gfx library.
- * Modifications by Stefano Stabellini.
- *
- * This work is licensed under the terms of the GNU GPL version 2.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#if BPP == 16
-#define SDL_TYPE Uint16
-#elif BPP == 32
-#define SDL_TYPE Uint32
-#else
-#error unsupport depth
-#endif
-
-/*
- * Simple helper functions to make the code looks nicer
- *
- * Assume spf = source SDL_PixelFormat
- * dpf = dest SDL_PixelFormat
- *
- */
-#define getRed(color) (((color) & spf->Rmask) >> spf->Rshift)
-#define getGreen(color) (((color) & spf->Gmask) >> spf->Gshift)
-#define getBlue(color) (((color) & spf->Bmask) >> spf->Bshift)
-#define getAlpha(color) (((color) & spf->Amask) >> spf->Ashift)
-
-#define setRed(r, pcolor) do { \
- *pcolor = ((*pcolor) & (~(dpf->Rmask))) + \
- (((r) & (dpf->Rmask >> dpf->Rshift)) << dpf->Rshift); \
-} while (0)
-
-#define setGreen(g, pcolor) do { \
- *pcolor = ((*pcolor) & (~(dpf->Gmask))) + \
- (((g) & (dpf->Gmask >> dpf->Gshift)) << dpf->Gshift); \
-} while (0)
-
-#define setBlue(b, pcolor) do { \
- *pcolor = ((*pcolor) & (~(dpf->Bmask))) + \
- (((b) & (dpf->Bmask >> dpf->Bshift)) << dpf->Bshift); \
-} while (0)
-
-#define setAlpha(a, pcolor) do { \
- *pcolor = ((*pcolor) & (~(dpf->Amask))) + \
- (((a) & (dpf->Amask >> dpf->Ashift)) << dpf->Ashift); \
-} while (0)
-
-static void glue(sdl_zoom_rgb, BPP)(SDL_Surface *src, SDL_Surface *dst, int smooth,
- SDL_Rect *dst_rect)
-{
- int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy, ex, ey, t1, t2, sstep, sstep_jump;
- SDL_TYPE *c00, *c01, *c10, *c11, *sp, *csp, *dp;
- int d_gap;
- SDL_PixelFormat *spf = src->format;
- SDL_PixelFormat *dpf = dst->format;
-
- if (smooth) {
- /* For interpolation: assume source dimension is one pixel.
- * Smaller here to avoid overflow on right and bottom edge.
- */
- sx = (int) (65536.0 * (float) (src->w - 1) / (float) dst->w);
- sy = (int) (65536.0 * (float) (src->h - 1) / (float) dst->h);
- } else {
- sx = (int) (65536.0 * (float) src->w / (float) dst->w);
- sy = (int) (65536.0 * (float) src->h / (float) dst->h);
- }
-
- sax = g_new(int, dst->w + 1);
- say = g_new(int, dst->h + 1);
-
- sp = csp = (SDL_TYPE *) src->pixels;
- dp = (SDL_TYPE *) (dst->pixels + dst_rect->y * dst->pitch +
- dst_rect->x * dst->format->BytesPerPixel);
-
- csx = 0;
- csax = sax;
- for (x = 0; x <= dst->w; x++) {
- *csax = csx;
- csax++;
- csx &= 0xffff;
- csx += sx;
- }
- csy = 0;
- csay = say;
- for (y = 0; y <= dst->h; y++) {
- *csay = csy;
- csay++;
- csy &= 0xffff;
- csy += sy;
- }
-
- d_gap = dst->pitch - dst_rect->w * dst->format->BytesPerPixel;
-
- if (smooth) {
- csay = say;
- for (y = 0; y < dst_rect->y; y++) {
- csay++;
- sstep = (*csay >> 16) * src->pitch;
- csp = (SDL_TYPE *) ((Uint8 *) csp + sstep);
- }
-
- /* Calculate sstep_jump */
- csax = sax;
- sstep_jump = 0;
- for (x = 0; x < dst_rect->x; x++) {
- csax++;
- sstep = (*csax >> 16);
- sstep_jump += sstep;
- }
-
- for (y = 0; y < dst_rect->h ; y++) {
- /* Setup colour source pointers */
- c00 = csp + sstep_jump;
- c01 = c00 + 1;
- c10 = (SDL_TYPE *) ((Uint8 *) csp + src->pitch) + sstep_jump;
- c11 = c10 + 1;
- csax = sax + dst_rect->x;
-
- for (x = 0; x < dst_rect->w; x++) {
-
- /* Interpolate colours */
- ex = (*csax & 0xffff);
- ey = (*csay & 0xffff);
- t1 = ((((getRed(*c01) - getRed(*c00)) * ex) >> 16) +
- getRed(*c00)) & (dpf->Rmask >> dpf->Rshift);
- t2 = ((((getRed(*c11) - getRed(*c10)) * ex) >> 16) +
- getRed(*c10)) & (dpf->Rmask >> dpf->Rshift);
- setRed((((t2 - t1) * ey) >> 16) + t1, dp);
- t1 = ((((getGreen(*c01) - getGreen(*c00)) * ex) >> 16) +
- getGreen(*c00)) & (dpf->Gmask >> dpf->Gshift);
- t2 = ((((getGreen(*c11) - getGreen(*c10)) * ex) >> 16) +
- getGreen(*c10)) & (dpf->Gmask >> dpf->Gshift);
- setGreen((((t2 - t1) * ey) >> 16) + t1, dp);
- t1 = ((((getBlue(*c01) - getBlue(*c00)) * ex) >> 16) +
- getBlue(*c00)) & (dpf->Bmask >> dpf->Bshift);
- t2 = ((((getBlue(*c11) - getBlue(*c10)) * ex) >> 16) +
- getBlue(*c10)) & (dpf->Bmask >> dpf->Bshift);
- setBlue((((t2 - t1) * ey) >> 16) + t1, dp);
- t1 = ((((getAlpha(*c01) - getAlpha(*c00)) * ex) >> 16) +
- getAlpha(*c00)) & (dpf->Amask >> dpf->Ashift);
- t2 = ((((getAlpha(*c11) - getAlpha(*c10)) * ex) >> 16) +
- getAlpha(*c10)) & (dpf->Amask >> dpf->Ashift);
- setAlpha((((t2 - t1) * ey) >> 16) + t1, dp);
-
- /* Advance source pointers */
- csax++;
- sstep = (*csax >> 16);
- c00 += sstep;
- c01 += sstep;
- c10 += sstep;
- c11 += sstep;
- /* Advance destination pointer */
- dp++;
- }
- /* Advance source pointer */
- csay++;
- csp = (SDL_TYPE *) ((Uint8 *) csp + (*csay >> 16) * src->pitch);
- /* Advance destination pointers */
- dp = (SDL_TYPE *) ((Uint8 *) dp + d_gap);
- }
-
-
- } else {
- csay = say;
-
- for (y = 0; y < dst_rect->y; y++) {
- csay++;
- sstep = (*csay >> 16) * src->pitch;
- csp = (SDL_TYPE *) ((Uint8 *) csp + sstep);
- }
-
- /* Calculate sstep_jump */
- csax = sax;
- sstep_jump = 0;
- for (x = 0; x < dst_rect->x; x++) {
- csax++;
- sstep = (*csax >> 16);
- sstep_jump += sstep;
- }
-
- for (y = 0 ; y < dst_rect->h ; y++) {
- sp = csp + sstep_jump;
- csax = sax + dst_rect->x;
-
- for (x = 0; x < dst_rect->w; x++) {
-
- /* Draw */
- *dp = *sp;
-
- /* Advance source pointers */
- csax++;
- sstep = (*csax >> 16);
- sp += sstep;
-
- /* Advance destination pointer */
- dp++;
- }
- /* Advance source pointers */
- csay++;
- sstep = (*csay >> 16) * src->pitch;
- csp = (SDL_TYPE *) ((Uint8 *) csp + sstep);
-
- /* Advance destination pointer */
- dp = (SDL_TYPE *) ((Uint8 *) dp + d_gap);
- }
- }
-
- g_free(sax);
- g_free(say);
-}
-
-#undef SDL_TYPE
-
diff --git a/ui/sdl.c b/ui/sdl.c
deleted file mode 100644
index 190b16f575..0000000000
--- a/ui/sdl.c
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*
- * QEMU SDL display driver
- *
- * Copyright (c) 2003 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
-#undef WIN32_LEAN_AND_MEAN
-
-#include "qemu/osdep.h"
-#include <SDL.h>
-#include <SDL_syswm.h>
-
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "qemu/cutils.h"
-#include "ui/console.h"
-#include "ui/input.h"
-#include "sysemu/sysemu.h"
-#ifndef WIN32
-#include "x_keymap.h"
-#endif
-#include "sdl_zoom.h"
-
-static DisplayChangeListener *dcl;
-static DisplaySurface *surface;
-static DisplayOptions *opts;
-static SDL_Surface *real_screen;
-static SDL_Surface *guest_screen = NULL;
-static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
-static int last_vm_running;
-static bool gui_saved_scaling;
-static int gui_saved_width;
-static int gui_saved_height;
-static int gui_saved_grab;
-static int gui_fullscreen;
-static int gui_key_modifier_pressed;
-static int gui_keysym;
-static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
-static uint8_t modifiers_state[256];
-static SDL_Cursor *sdl_cursor_normal;
-static SDL_Cursor *sdl_cursor_hidden;
-static int absolute_enabled = 0;
-static int guest_cursor = 0;
-static int guest_x, guest_y;
-static SDL_Cursor *guest_sprite = NULL;
-static SDL_PixelFormat host_format;
-static int scaling_active = 0;
-static Notifier mouse_mode_notifier;
-static int idle_counter;
-static const guint16 *keycode_map;
-static size_t keycode_maplen;
-
-#define SDL_REFRESH_INTERVAL_BUSY 10
-#define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \
- / SDL_REFRESH_INTERVAL_BUSY + 1)
-
-#if 0
-#define DEBUG_SDL
-#endif
-
-static void sdl_update(DisplayChangeListener *dcl,
- int x, int y, int w, int h)
-{
- SDL_Rect rec;
- rec.x = x;
- rec.y = y;
- rec.w = w;
- rec.h = h;
-
-#ifdef DEBUG_SDL
- printf("SDL: Updating x=%d y=%d w=%d h=%d (scaling: %d)\n",
- x, y, w, h, scaling_active);
-#endif
-
- if (guest_screen) {
- if (!scaling_active) {
- SDL_BlitSurface(guest_screen, &rec, real_screen, &rec);
- } else {
- if (sdl_zoom_blit(guest_screen, real_screen, SMOOTHING_ON, &rec) < 0) {
- fprintf(stderr, "Zoom blit failed\n");
- exit(1);
- }
- }
- }
- SDL_UpdateRect(real_screen, rec.x, rec.y, rec.w, rec.h);
-}
-
-static void do_sdl_resize(int width, int height, int bpp)
-{
- int flags;
- SDL_Surface *tmp_screen;
-
-#ifdef DEBUG_SDL
- printf("SDL: Resizing to %dx%d bpp %d\n", width, height, bpp);
-#endif
-
- flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
- if (gui_fullscreen) {
- flags |= SDL_FULLSCREEN;
- } else {
- flags |= SDL_RESIZABLE;
- }
- if (no_frame) {
- flags |= SDL_NOFRAME;
- }
-
- tmp_screen = SDL_SetVideoMode(width, height, bpp, flags);
- if (!real_screen) {
- if (!tmp_screen) {
- fprintf(stderr, "Could not open SDL display (%dx%dx%d): %s\n",
- width, height, bpp, SDL_GetError());
- exit(1);
- }
- } else {
- /*
- * Revert to the previous video mode if the change of resizing or
- * resolution failed.
- */
- if (!tmp_screen) {
- fprintf(stderr, "Failed to set SDL display (%dx%dx%d): %s\n",
- width, height, bpp, SDL_GetError());
- return;
- }
- }
-
- real_screen = tmp_screen;
-}
-
-static void sdl_switch(DisplayChangeListener *dcl,
- DisplaySurface *new_surface)
-{
- PixelFormat pf;
-
- /* temporary hack: allows to call sdl_switch to handle scaling changes */
- if (new_surface) {
- surface = new_surface;
- }
- pf = qemu_pixelformat_from_pixman(surface->format);
-
- if (!scaling_active) {
- do_sdl_resize(surface_width(surface), surface_height(surface), 0);
- } else if (real_screen->format->BitsPerPixel !=
- surface_bits_per_pixel(surface)) {
- do_sdl_resize(real_screen->w, real_screen->h,
- surface_bits_per_pixel(surface));
- }
-
- if (guest_screen != NULL) {
- SDL_FreeSurface(guest_screen);
- }
-
-#ifdef DEBUG_SDL
- printf("SDL: Creating surface with masks: %08x %08x %08x %08x\n",
- pf.rmask, pf.gmask, pf.bmask, pf.amask);
-#endif
-
- guest_screen = SDL_CreateRGBSurfaceFrom
- (surface_data(surface),
- surface_width(surface), surface_height(surface),
- surface_bits_per_pixel(surface), surface_stride(surface),
- pf.rmask, pf.gmask,
- pf.bmask, pf.amask);
-}
-
-static bool sdl_check_format(DisplayChangeListener *dcl,
- pixman_format_code_t format)
-{
- /*
- * We let SDL convert for us a few more formats than,
- * the native ones. Thes are the ones I have tested.
- */
- return (format == PIXMAN_x8r8g8b8 ||
- format == PIXMAN_b8g8r8x8 ||
- format == PIXMAN_x1r5g5b5 ||
- format == PIXMAN_r5g6b5);
-}
-
-/* generic keyboard conversion */
-
-#include "sdl_keysym.h"
-
-static kbd_layout_t *kbd_layout = NULL;
-
-static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev)
-{
- bool shift = modifiers_state[0x2a] || modifiers_state[0x36];
- bool altgr = modifiers_state[0xb8];
- bool ctrl = modifiers_state[0x1d] || modifiers_state[0x9d];
- int keysym;
- /* workaround for X11+SDL bug with AltGR */
- keysym = ev->keysym.sym;
- if (keysym == 0 && ev->keysym.scancode == 113)
- keysym = SDLK_MODE;
- /* For Japanese key '\' and '|' */
- if (keysym == 92 && ev->keysym.scancode == 133) {
- keysym = 0xa5;
- }
- return keysym2scancode(kbd_layout, keysym,
- shift, altgr, ctrl) & SCANCODE_KEYMASK;
-}
-
-
-static const guint16 *sdl_get_keymap(size_t *maplen)
-{
-#if defined(WIN32)
- *maplen = qemu_input_map_atset1_to_qcode_len;
- return qemu_input_map_atset1_to_qcode;
-#else
-#if defined(SDL_VIDEO_DRIVER_X11)
- SDL_SysWMinfo info;
-
- SDL_VERSION(&info.version);
- if (SDL_GetWMInfo(&info) > 0) {
- return qemu_xkeymap_mapping_table(
- info.info.x11.display, maplen);
- }
-#endif
- g_warning("Unsupported SDL video driver / platform.\n"
- "Assuming Linux KBD scancodes, but probably wrong.\n"
- "Please report to qemu-devel@nongnu.org\n"
- "including the following information:\n"
- "\n"
- " - Operating system\n"
- " - SDL video driver\n");
- *maplen = qemu_input_map_xorgkbd_to_qcode_len;
- return qemu_input_map_xorgkbd_to_qcode;
-#endif
-}
-
-static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
-{
- int qcode;
- if (!keycode_map) {
- return 0;
- }
- if (ev->keysym.scancode > keycode_maplen) {
- return 0;
- }
-
- qcode = keycode_map[ev->keysym.scancode];
-
- if (qcode > qemu_input_map_qcode_to_qnum_len) {
- return 0;
- }
-
- return qemu_input_map_qcode_to_qnum[qcode];
-}
-
-static void reset_keys(void)
-{
- int i;
- for(i = 0; i < 256; i++) {
- if (modifiers_state[i]) {
- qemu_input_event_send_key_number(dcl->con, i, false);
- modifiers_state[i] = 0;
- }
- }
-}
-
-static void sdl_process_key(SDL_KeyboardEvent *ev)
-{
- int keycode;
-
- if (ev->keysym.sym == SDLK_PAUSE) {
- /* specific case */
- qemu_input_event_send_key_qcode(dcl->con, Q_KEY_CODE_PAUSE,
- ev->type == SDL_KEYDOWN);
- return;
- }
-
- if (kbd_layout) {
- keycode = sdl_keyevent_to_keycode_generic(ev);
- } else {
- keycode = sdl_keyevent_to_keycode(ev);
- }
-
- switch(keycode) {
- case 0x00:
- /* sent when leaving window: reset the modifiers state */
- reset_keys();
- return;
- case 0x2a: /* Left Shift */
- case 0x36: /* Right Shift */
- case 0x1d: /* Left CTRL */
- case 0x9d: /* Right CTRL */
- case 0x38: /* Left ALT */
- case 0xb8: /* Right ALT */
- if (ev->type == SDL_KEYUP)
- modifiers_state[keycode] = 0;
- else
- modifiers_state[keycode] = 1;
- break;
-#define QEMU_SDL_VERSION ((SDL_MAJOR_VERSION << 8) + SDL_MINOR_VERSION)
-#if QEMU_SDL_VERSION < 0x102 || QEMU_SDL_VERSION == 0x102 && SDL_PATCHLEVEL < 14
- /* SDL versions before 1.2.14 don't support key up for caps/num lock. */
- case 0x45: /* num lock */
- case 0x3a: /* caps lock */
- /* SDL does not send the key up event, so we generate it */
- qemu_input_event_send_key_number(dcl->con, keycode, true);
- qemu_input_event_send_key_number(dcl->con, keycode, false);
- return;
-#endif
- }
-
- /* now send the key code */
- qemu_input_event_send_key_number(dcl->con, keycode,
- ev->type == SDL_KEYDOWN);
-}
-
-static void sdl_update_caption(void)
-{
- char win_title[1024];
- char icon_title[1024];
- const char *status = "";
-
- if (!runstate_is_running())
- status = " [Stopped]";
- else if (gui_grab) {
- if (alt_grab)
- status = " - Press Ctrl-Alt-Shift-G to exit mouse grab";
- else if (ctrl_grab)
- status = " - Press Right-Ctrl-G to exit mouse grab";
- else
- status = " - Press Ctrl-Alt-G to exit mouse grab";
- }
-
- if (qemu_name) {
- snprintf(win_title, sizeof(win_title), "QEMU (%s)%s", qemu_name, status);
- snprintf(icon_title, sizeof(icon_title), "QEMU (%s)", qemu_name);
- } else {
- snprintf(win_title, sizeof(win_title), "QEMU%s", status);
- snprintf(icon_title, sizeof(icon_title), "QEMU");
- }
-
- SDL_WM_SetCaption(win_title, icon_title);
-}
-
-static void sdl_hide_cursor(void)
-{
- if (!cursor_hide)
- return;
-
- if (qemu_input_is_absolute()) {
- SDL_ShowCursor(1);
- SDL_SetCursor(sdl_cursor_hidden);
- } else {
- SDL_ShowCursor(0);
- }
-}
-
-static void sdl_show_cursor(void)
-{
- if (!cursor_hide)
- return;
-
- if (!qemu_input_is_absolute() || !qemu_console_is_graphic(NULL)) {
- SDL_ShowCursor(1);
- if (guest_cursor &&
- (gui_grab || qemu_input_is_absolute() || absolute_enabled))
- SDL_SetCursor(guest_sprite);
- else
- SDL_SetCursor(sdl_cursor_normal);
- }
-}
-
-static void sdl_grab_start(void)
-{
- /*
- * If the application is not active, do not try to enter grab state. This
- * prevents 'SDL_WM_GrabInput(SDL_GRAB_ON)' from blocking all the
- * application (SDL bug).
- */
- if (!(SDL_GetAppState() & SDL_APPINPUTFOCUS)) {
- return;
- }
- if (guest_cursor) {
- SDL_SetCursor(guest_sprite);
- if (!qemu_input_is_absolute() && !absolute_enabled) {
- SDL_WarpMouse(guest_x, guest_y);
- }
- } else
- sdl_hide_cursor();
- SDL_WM_GrabInput(SDL_GRAB_ON);
- gui_grab = 1;
- sdl_update_caption();
-}
-
-static void sdl_grab_end(void)
-{
- SDL_WM_GrabInput(SDL_GRAB_OFF);
- gui_grab = 0;
- sdl_show_cursor();
- sdl_update_caption();
-}
-
-static void absolute_mouse_grab(void)
-{
- int mouse_x, mouse_y;
-
- SDL_GetMouseState(&mouse_x, &mouse_y);
- if (mouse_x > 0 && mouse_x < real_screen->w - 1 &&
- mouse_y > 0 && mouse_y < real_screen->h - 1) {
- sdl_grab_start();
- }
-}
-
-static void sdl_mouse_mode_change(Notifier *notify, void *data)
-{
- if (qemu_input_is_absolute()) {
- if (!absolute_enabled) {
- absolute_enabled = 1;
- if (qemu_console_is_graphic(NULL)) {
- absolute_mouse_grab();
- }
- }
- } else if (absolute_enabled) {
- if (!gui_fullscreen) {
- sdl_grab_end();
- }
- absolute_enabled = 0;
- }
-}
-
-static void sdl_send_mouse_event(int dx, int dy, int x, int y, int state)
-{
- static uint32_t bmap[INPUT_BUTTON__MAX] = {
- [INPUT_BUTTON_LEFT] = SDL_BUTTON(SDL_BUTTON_LEFT),
- [INPUT_BUTTON_MIDDLE] = SDL_BUTTON(SDL_BUTTON_MIDDLE),
- [INPUT_BUTTON_RIGHT] = SDL_BUTTON(SDL_BUTTON_RIGHT),
- [INPUT_BUTTON_WHEEL_UP] = SDL_BUTTON(SDL_BUTTON_WHEELUP),
- [INPUT_BUTTON_WHEEL_DOWN] = SDL_BUTTON(SDL_BUTTON_WHEELDOWN),
- };
- static uint32_t prev_state;
-
- if (prev_state != state) {
- qemu_input_update_buttons(dcl->con, bmap, prev_state, state);
- prev_state = state;
- }
-
- if (qemu_input_is_absolute()) {
- qemu_input_queue_abs(dcl->con, INPUT_AXIS_X, x,
- 0, real_screen->w);
- qemu_input_queue_abs(dcl->con, INPUT_AXIS_Y, y,
- 0, real_screen->h);
- } else {
- if (guest_cursor) {
- x -= guest_x;
- y -= guest_y;
- guest_x += x;
- guest_y += y;
- dx = x;
- dy = y;
- }
- qemu_input_queue_rel(dcl->con, INPUT_AXIS_X, dx);
- qemu_input_queue_rel(dcl->con, INPUT_AXIS_Y, dy);
- }
- qemu_input_event_sync();
-}
-
-static void sdl_scale(int width, int height)
-{
- int bpp = real_screen->format->BitsPerPixel;
-
-#ifdef DEBUG_SDL
- printf("SDL: Scaling to %dx%d bpp %d\n", width, height, bpp);
-#endif
-
- if (bpp != 16 && bpp != 32) {
- bpp = 32;
- }
- do_sdl_resize(width, height, bpp);
- scaling_active = 1;
-}
-
-static void toggle_full_screen(void)
-{
- int width = surface_width(surface);
- int height = surface_height(surface);
- int bpp = surface_bits_per_pixel(surface);
-
- gui_fullscreen = !gui_fullscreen;
- if (gui_fullscreen) {
- gui_saved_width = real_screen->w;
- gui_saved_height = real_screen->h;
- gui_saved_scaling = scaling_active;
-
- do_sdl_resize(width, height, bpp);
- scaling_active = 0;
-
- gui_saved_grab = gui_grab;
- sdl_grab_start();
- } else {
- if (gui_saved_scaling) {
- sdl_scale(gui_saved_width, gui_saved_height);
- } else {
- do_sdl_resize(width, height, 0);
- }
- if (!gui_saved_grab || !qemu_console_is_graphic(NULL)) {
- sdl_grab_end();
- }
- }
- graphic_hw_invalidate(NULL);
- graphic_hw_update(NULL);
-}
-
-static void handle_keydown(SDL_Event *ev)
-{
- int mod_state;
- int keycode;
-
- if (alt_grab) {
- mod_state = (SDL_GetModState() & (gui_grab_code | KMOD_LSHIFT)) ==
- (gui_grab_code | KMOD_LSHIFT);
- } else if (ctrl_grab) {
- mod_state = (SDL_GetModState() & KMOD_RCTRL) == KMOD_RCTRL;
- } else {
- mod_state = (SDL_GetModState() & gui_grab_code) == gui_grab_code;
- }
- gui_key_modifier_pressed = mod_state;
-
- if (gui_key_modifier_pressed) {
- keycode = sdl_keyevent_to_keycode(&ev->key);
- switch (keycode) {
- case 0x21: /* 'f' key on US keyboard */
- toggle_full_screen();
- gui_keysym = 1;
- break;
- case 0x22: /* 'g' key */
- if (!gui_grab) {
- if (qemu_console_is_graphic(NULL)) {
- sdl_grab_start();
- }
- } else if (!gui_fullscreen) {
- sdl_grab_end();
- }
- gui_keysym = 1;
- break;
- case 0x16: /* 'u' key on US keyboard */
- if (scaling_active) {
- scaling_active = 0;
- sdl_switch(dcl, NULL);
- graphic_hw_invalidate(NULL);
- graphic_hw_update(NULL);
- }
- gui_keysym = 1;
- break;
- case 0x02 ... 0x0a: /* '1' to '9' keys */
- /* Reset the modifiers sent to the current console */
- reset_keys();
- console_select(keycode - 0x02);
- gui_keysym = 1;
- if (gui_fullscreen) {
- break;
- }
- if (!qemu_console_is_graphic(NULL)) {
- /* release grab if going to a text console */
- if (gui_grab) {
- sdl_grab_end();
- } else if (absolute_enabled) {
- sdl_show_cursor();
- }
- } else if (absolute_enabled) {
- sdl_hide_cursor();
- absolute_mouse_grab();
- }
- break;
- case 0x1b: /* '+' */
- case 0x35: /* '-' */
- if (!gui_fullscreen) {
- int width = MAX(real_screen->w + (keycode == 0x1b ? 50 : -50),
- 160);
- int height = (surface_height(surface) * width) /
- surface_width(surface);
-
- sdl_scale(width, height);
- graphic_hw_invalidate(NULL);
- graphic_hw_update(NULL);
- gui_keysym = 1;
- }
- default:
- break;
- }
- } else if (!qemu_console_is_graphic(NULL)) {
- int keysym = 0;
-
- if (ev->key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
- switch (ev->key.keysym.sym) {
- case SDLK_UP:
- keysym = QEMU_KEY_CTRL_UP;
- break;
- case SDLK_DOWN:
- keysym = QEMU_KEY_CTRL_DOWN;
- break;
- case SDLK_LEFT:
- keysym = QEMU_KEY_CTRL_LEFT;
- break;
- case SDLK_RIGHT:
- keysym = QEMU_KEY_CTRL_RIGHT;
- break;
- case SDLK_HOME:
- keysym = QEMU_KEY_CTRL_HOME;
- break;
- case SDLK_END:
- keysym = QEMU_KEY_CTRL_END;
- break;
- case SDLK_PAGEUP:
- keysym = QEMU_KEY_CTRL_PAGEUP;
- break;
- case SDLK_PAGEDOWN:
- keysym = QEMU_KEY_CTRL_PAGEDOWN;
- break;
- default:
- break;
- }
- } else {
- switch (ev->key.keysym.sym) {
- case SDLK_UP:
- keysym = QEMU_KEY_UP;
- break;
- case SDLK_DOWN:
- keysym = QEMU_KEY_DOWN;
- break;
- case SDLK_LEFT:
- keysym = QEMU_KEY_LEFT;
- break;
- case SDLK_RIGHT:
- keysym = QEMU_KEY_RIGHT;
- break;
- case SDLK_HOME:
- keysym = QEMU_KEY_HOME;
- break;
- case SDLK_END:
- keysym = QEMU_KEY_END;
- break;
- case SDLK_PAGEUP:
- keysym = QEMU_KEY_PAGEUP;
- break;
- case SDLK_PAGEDOWN:
- keysym = QEMU_KEY_PAGEDOWN;
- break;
- case SDLK_BACKSPACE:
- keysym = QEMU_KEY_BACKSPACE;
- break;
- case SDLK_DELETE:
- keysym = QEMU_KEY_DELETE;
- break;
- default:
- break;
- }
- }
- if (keysym) {
- kbd_put_keysym(keysym);
- } else if (ev->key.keysym.unicode != 0) {
- kbd_put_keysym(ev->key.keysym.unicode);
- }
- }
- if (qemu_console_is_graphic(NULL) && !gui_keysym) {
- sdl_process_key(&ev->key);
- }
-}
-
-static void handle_keyup(SDL_Event *ev)
-{
- int mod_state;
-
- if (!alt_grab) {
- mod_state = (ev->key.keysym.mod & gui_grab_code);
- } else {
- mod_state = (ev->key.keysym.mod & (gui_grab_code | KMOD_LSHIFT));
- }
- if (!mod_state && gui_key_modifier_pressed) {
- gui_key_modifier_pressed = 0;
- gui_keysym = 0;
- }
- if (qemu_console_is_graphic(NULL) && !gui_keysym) {
- sdl_process_key(&ev->key);
- }
-}
-
-static void handle_mousemotion(SDL_Event *ev)
-{
- int max_x, max_y;
-
- if (qemu_console_is_graphic(NULL) &&
- (qemu_input_is_absolute() || absolute_enabled)) {
- max_x = real_screen->w - 1;
- max_y = real_screen->h - 1;
- if (gui_grab && (ev->motion.x == 0 || ev->motion.y == 0 ||
- ev->motion.x == max_x || ev->motion.y == max_y)) {
- sdl_grab_end();
- }
- if (!gui_grab &&
- (ev->motion.x > 0 && ev->motion.x < max_x &&
- ev->motion.y > 0 && ev->motion.y < max_y)) {
- sdl_grab_start();
- }
- }
- if (gui_grab || qemu_input_is_absolute() || absolute_enabled) {
- sdl_send_mouse_event(ev->motion.xrel, ev->motion.yrel,
- ev->motion.x, ev->motion.y, ev->motion.state);
- }
-}
-
-static void handle_mousebutton(SDL_Event *ev)
-{
- int buttonstate = SDL_GetMouseState(NULL, NULL);
- SDL_MouseButtonEvent *bev;
-
- if (!qemu_console_is_graphic(NULL)) {
- return;
- }
-
- bev = &ev->button;
- if (!gui_grab && !qemu_input_is_absolute()) {
- if (ev->type == SDL_MOUSEBUTTONUP && bev->button == SDL_BUTTON_LEFT) {
- /* start grabbing all events */
- sdl_grab_start();
- }
- } else {
- if (ev->type == SDL_MOUSEBUTTONDOWN) {
- buttonstate |= SDL_BUTTON(bev->button);
- } else {
- buttonstate &= ~SDL_BUTTON(bev->button);
- }
- sdl_send_mouse_event(0, 0, bev->x, bev->y, buttonstate);
- }
-}
-
-static void handle_activation(SDL_Event *ev)
-{
-#ifdef _WIN32
- /* Disable grab if the window no longer has the focus
- * (Windows-only workaround) */
- if (gui_grab && ev->active.state == SDL_APPINPUTFOCUS &&
- !ev->active.gain && !gui_fullscreen) {
- sdl_grab_end();
- }
-#endif
- if (!gui_grab && ev->active.gain && qemu_console_is_graphic(NULL) &&
- (qemu_input_is_absolute() || absolute_enabled)) {
- absolute_mouse_grab();
- }
- if (ev->active.state & SDL_APPACTIVE) {
- if (ev->active.gain) {
- /* Back to default interval */
- update_displaychangelistener(dcl, GUI_REFRESH_INTERVAL_DEFAULT);
- } else {
- /* Sleeping interval. Not using the long default here as
- * sdl_refresh does not only update the guest screen, but
- * also checks for gui events. */
- update_displaychangelistener(dcl, 500);
- }
- }
-}
-
-static void sdl_refresh(DisplayChangeListener *dcl)
-{
- SDL_Event ev1, *ev = &ev1;
- bool allow_close = true;
- int idle = 1;
-
- if (last_vm_running != runstate_is_running()) {
- last_vm_running = runstate_is_running();
- sdl_update_caption();
- }
-
- graphic_hw_update(NULL);
- SDL_EnableUNICODE(!qemu_console_is_graphic(NULL));
-
- while (SDL_PollEvent(ev)) {
- switch (ev->type) {
- case SDL_VIDEOEXPOSE:
- sdl_update(dcl, 0, 0, real_screen->w, real_screen->h);
- break;
- case SDL_KEYDOWN:
- idle = 0;
- handle_keydown(ev);
- break;
- case SDL_KEYUP:
- idle = 0;
- handle_keyup(ev);
- break;
- case SDL_QUIT:
- if (opts->has_window_close && !opts->window_close) {
- allow_close = false;
- }
- if (allow_close) {
- no_shutdown = 0;
- qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI);
- }
- break;
- case SDL_MOUSEMOTION:
- idle = 0;
- handle_mousemotion(ev);
- break;
- case SDL_MOUSEBUTTONDOWN:
- case SDL_MOUSEBUTTONUP:
- idle = 0;
- handle_mousebutton(ev);
- break;
- case SDL_ACTIVEEVENT:
- handle_activation(ev);
- break;
- case SDL_VIDEORESIZE:
- sdl_scale(ev->resize.w, ev->resize.h);
- graphic_hw_invalidate(NULL);
- graphic_hw_update(NULL);
- break;
- default:
- break;
- }
- }
-
- if (idle) {
- if (idle_counter < SDL_MAX_IDLE_COUNT) {
- idle_counter++;
- if (idle_counter >= SDL_MAX_IDLE_COUNT) {
- dcl->update_interval = GUI_REFRESH_INTERVAL_DEFAULT;
- }
- }
- } else {
- idle_counter = 0;
- dcl->update_interval = SDL_REFRESH_INTERVAL_BUSY;
- }
-}
-
-static void sdl_mouse_warp(DisplayChangeListener *dcl,
- int x, int y, int on)
-{
- if (on) {
- if (!guest_cursor)
- sdl_show_cursor();
- if (gui_grab || qemu_input_is_absolute() || absolute_enabled) {
- SDL_SetCursor(guest_sprite);
- if (!qemu_input_is_absolute() && !absolute_enabled) {
- SDL_WarpMouse(x, y);
- }
- }
- } else if (gui_grab)
- sdl_hide_cursor();
- guest_cursor = on;
- guest_x = x, guest_y = y;
-}
-
-static void sdl_mouse_define(DisplayChangeListener *dcl,
- QEMUCursor *c)
-{
- uint8_t *image, *mask;
- int bpl;
-
- if (guest_sprite)
- SDL_FreeCursor(guest_sprite);
-
- bpl = cursor_get_mono_bpl(c);
- image = g_malloc0(bpl * c->height);
- mask = g_malloc0(bpl * c->height);
- cursor_get_mono_image(c, 0x000000, image);
- cursor_get_mono_mask(c, 0, mask);
- guest_sprite = SDL_CreateCursor(image, mask, c->width, c->height,
- c->hot_x, c->hot_y);
- g_free(image);
- g_free(mask);
-
- if (guest_cursor &&
- (gui_grab || qemu_input_is_absolute() || absolute_enabled))
- SDL_SetCursor(guest_sprite);
-}
-
-static void sdl_cleanup(void)
-{
- if (guest_sprite)
- SDL_FreeCursor(guest_sprite);
- SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-static const DisplayChangeListenerOps dcl_ops = {
- .dpy_name = "sdl",
- .dpy_gfx_update = sdl_update,
- .dpy_gfx_switch = sdl_switch,
- .dpy_gfx_check_format = sdl_check_format,
- .dpy_refresh = sdl_refresh,
- .dpy_mouse_set = sdl_mouse_warp,
- .dpy_cursor_define = sdl_mouse_define,
-};
-
-static void sdl1_display_init(DisplayState *ds, DisplayOptions *o)
-{
- int flags;
- uint8_t data = 0;
- const SDL_VideoInfo *vi;
- SDL_SysWMinfo info;
- char *filename;
-
- assert(o->type == DISPLAY_TYPE_SDL);
- opts = o;
-#if defined(__APPLE__)
- /* always use generic keymaps */
- if (!keyboard_layout)
- keyboard_layout = "en-us";
-#endif
- if(keyboard_layout) {
- kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,
- &error_fatal);
- }
-
- g_printerr("Running QEMU with SDL 1.2 is deprecated, and will be removed\n"
- "in a future release. Please switch to SDL 2.0 instead\n");
-
- if (opts->has_full_screen && opts->full_screen) {
- setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
- }
-#ifdef __linux__
- /* on Linux, SDL may use fbcon|directfb|svgalib when run without
- * accessible $DISPLAY to open X11 window. This is often the case
- * when qemu is run using sudo. But in this case, and when actually
- * run in X11 environment, SDL fights with X11 for the video card,
- * making current display unavailable, often until reboot.
- * So make x11 the default SDL video driver if this variable is unset.
- * This is a bit hackish but saves us from bigger problem.
- * Maybe it's a good idea to fix this in SDL instead.
- */
- setenv("SDL_VIDEODRIVER", "x11", 0);
-#endif
-
- /* Enable normal up/down events for Caps-Lock and Num-Lock keys.
- * This requires SDL >= 1.2.14. */
- setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
-
- flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE;
- if (SDL_Init (flags)) {
- fprintf(stderr, "Could not initialize SDL(%s) - exiting\n",
- SDL_GetError());
- exit(1);
- }
- vi = SDL_GetVideoInfo();
- host_format = *(vi->vfmt);
-
- keycode_map = sdl_get_keymap(&keycode_maplen);
-
- /* 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_SRCCOLORKEY, colorkey);
- SDL_WM_SetIcon(image, NULL);
- }
- g_free(filename);
- }
-
- if (opts->has_full_screen && opts->full_screen) {
- gui_fullscreen = 1;
- sdl_grab_start();
- }
-
- dcl = g_new0(DisplayChangeListener, 1);
- dcl->ops = &dcl_ops;
- register_displaychangelistener(dcl);
-
- mouse_mode_notifier.notify = sdl_mouse_mode_change;
- qemu_add_mouse_mode_change_notifier(&mouse_mode_notifier);
-
- sdl_update_caption();
- SDL_EnableKeyRepeat(250, 50);
- gui_grab = 0;
-
- sdl_cursor_hidden = SDL_CreateCursor(&data, &data, 8, 1, 0, 0);
- sdl_cursor_normal = SDL_GetCursor();
-
- memset(&info, 0, sizeof(info));
- SDL_VERSION(&info.version);
- if (SDL_GetWMInfo(&info)) {
- int i;
- for (i = 0; ; i++) {
- /* All consoles share the same window */
- QemuConsole *con = qemu_console_lookup_by_index(i);
- if (con) {
-#if defined(SDL_VIDEO_DRIVER_X11)
- qemu_console_set_window_id(con, info.info.x11.wmwindow);
-#elif defined(SDL_VIDEO_DRIVER_NANOX) || \
- defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || \
- defined(SDL_VIDEO_DRIVER_GAPI) || \
- defined(SDL_VIDEO_DRIVER_RISCOS)
- qemu_console_set_window_id(con, (int) (uintptr_t) info.window);
-#else
- qemu_console_set_window_id(con, info.data);
-#endif
- } else {
- break;
- }
- }
- }
-
- atexit(sdl_cleanup);
-}
-
-static QemuDisplay qemu_display_sdl1 = {
- .type = DISPLAY_TYPE_SDL,
- .init = sdl1_display_init,
-};
-
-static void register_sdl1(void)
-{
- qemu_display_register(&qemu_display_sdl1);
-}
-
-type_init(register_sdl1);
diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c
deleted file mode 100644
index b96196bac5..0000000000
--- a/ui/sdl_zoom.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * SDL_zoom - surface scaling
- *
- * Copyright (c) 2009 Citrix Systems, Inc.
- *
- * Derived from: SDL_rotozoom, LGPL (c) A. Schiffler from the SDL_gfx library.
- * Modifications by Stefano Stabellini.
- *
- * This work is licensed under the terms of the GNU GPL version 2.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "sdl_zoom.h"
-
-static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth,
- SDL_Rect *dst_rect);
-static void sdl_zoom_rgb32(SDL_Surface *src, SDL_Surface *dst, int smooth,
- SDL_Rect *dst_rect);
-
-#define BPP 32
-#include "sdl_zoom_template.h"
-#undef BPP
-#define BPP 16
-#include "sdl_zoom_template.h"
-#undef BPP
-
-int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc, int smooth,
- SDL_Rect *in_rect)
-{
- SDL_Rect zoom, src_rect;
- int extra;
-
- /* Grow the size of the modified rectangle to avoid edge artefacts */
- src_rect.x = (in_rect->x > 0) ? (in_rect->x - 1) : 0;
- src_rect.y = (in_rect->y > 0) ? (in_rect->y - 1) : 0;
-
- src_rect.w = in_rect->w + 1;
- if (src_rect.x + src_rect.w > src_sfc->w)
- src_rect.w = src_sfc->w - src_rect.x;
-
- src_rect.h = in_rect->h + 1;
- if (src_rect.y + src_rect.h > src_sfc->h)
- src_rect.h = src_sfc->h - src_rect.y;
-
- /* (x,y) : round down */
- zoom.x = (int)(((float)(src_rect.x * dst_sfc->w)) / (float)(src_sfc->w));
- zoom.y = (int)(((float)(src_rect.y * dst_sfc->h)) / (float)(src_sfc->h));
-
- /* (w,h) : round up */
- zoom.w = (int)( ((double)((src_rect.w * dst_sfc->w) + (src_sfc->w - 1))) /
- (double)(src_sfc->w));
-
- zoom.h = (int)( ((double)((src_rect.h * dst_sfc->h) + (src_sfc->h - 1))) /
- (double)(src_sfc->h));
-
- /* Account for any (x,y) rounding by adding one-source-pixel's worth
- * of destination pixels and then edge checking.
- */
-
- extra = ((dst_sfc->w-1) / src_sfc->w) + 1;
-
- if ((zoom.x + zoom.w) < (dst_sfc->w - extra))
- zoom.w += extra;
- else
- zoom.w = dst_sfc->w - zoom.x;
-
- extra = ((dst_sfc->h-1) / src_sfc->h) + 1;
-
- if ((zoom.y + zoom.h) < (dst_sfc->h - extra))
- zoom.h += extra;
- else
- zoom.h = dst_sfc->h - zoom.y;
-
- /* The rectangle (zoom.x, zoom.y, zoom.w, zoom.h) is the area on the
- * destination surface that needs to be updated.
- */
- if (src_sfc->format->BitsPerPixel == 32)
- sdl_zoom_rgb32(src_sfc, dst_sfc, smooth, &zoom);
- else if (src_sfc->format->BitsPerPixel == 16)
- sdl_zoom_rgb16(src_sfc, dst_sfc, smooth, &zoom);
- else {
- fprintf(stderr, "pixel format not supported\n");
- return -1;
- }
-
- /* Return the rectangle of the update to the caller */
- *in_rect = zoom;
-
- return 0;
-}
-
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 219206a836..dfb278a377 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -17,15 +17,6 @@ they were first deprecated in the 2.10.0 release.
What follows is a list of all features currently marked as
deprecated.
-@section Build options
-
-@subsection SDL 1.2
-
-Previously QEMU has supported building against both SDL 1.2
-and 2.0 series APIs. Support for the SDL 1.2 builds will be
-discontinued, so maintainers should switch to using SDL 2.0,
-which is the default.
-
@section System emulator command line arguments
@subsection -machine enforce-config-section=on|off (since 3.1)
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 00f6976c30..9b6f0c6b67 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -17,15 +17,10 @@ common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
# ui-sdl module
common-obj-$(CONFIG_SDL) += sdl.mo
-ifeq ($(CONFIG_SDLABI),1.2)
-sdl.mo-objs := sdl.o sdl_zoom.o
-endif
-ifeq ($(CONFIG_SDLABI),2.0)
sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o
ifeq ($(CONFIG_OPENGL),y)
sdl.mo-objs += sdl2-gl.o
endif
-endif
sdl.mo-cflags := $(SDL_CFLAGS)
sdl.mo-libs := $(SDL_LIBS)
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL 0/5] Ui 20190201 patches
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
` (4 preceding siblings ...)
2019-02-01 12:31 ` [Qemu-devel] [PULL 5/5] ui: remove support for SDL1.2 in favour of SDL2 Gerd Hoffmann
@ 2019-02-01 16:38 ` Peter Maydell
2019-02-03 14:31 ` [Qemu-devel] [libvirt] " no-reply
6 siblings, 0 replies; 8+ messages in thread
From: Peter Maydell @ 2019-02-01 16:38 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers, Libvirt, Michael Walle
On Fri, 1 Feb 2019 at 12:35, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d:
>
> Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-01-31 15:40:39 +0000)
>
> are available in the git repository at:
>
> git://git.kraxel.org/qemu tags/ui-20190201-pull-request
>
> for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4:
>
> ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100)
>
> ----------------------------------------------------------------
> ui: fix build with SDL disabled, drop SDL1 support.
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [libvirt] [PULL 0/5] Ui 20190201 patches
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
` (5 preceding siblings ...)
2019-02-01 16:38 ` [Qemu-devel] [PULL 0/5] Ui 20190201 patches Peter Maydell
@ 2019-02-03 14:31 ` no-reply
6 siblings, 0 replies; 8+ messages in thread
From: no-reply @ 2019-02-03 14:31 UTC (permalink / raw)
To: kraxel; +Cc: fam, qemu-devel, libvir-list, michael
Patchew URL: https://patchew.org/QEMU/20190201123100.27419-1-kraxel@redhat.com/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14
=== TEST SCRIPT END ===
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
ERROR: unknown option --with-sdlabi=2.0
Try '/tmp/qemu-test/src/configure --help' for more information
# QEMU configure log Sun Feb 3 14:31:05 UTC 2019
# Configured with: '/tmp/qemu-test/src/configure' '--enable-werror' '--target-list=x86_64-softmmu,aarch64-softmmu' '--prefix=/tmp/qemu-test/install' '--python=/usr/bin/python3' '--cross-prefix=x86_64-w64-mingw32-' '--enable-trace-backends=simple' '--enable-gnutls' '--enable-nettle' '--enable-curl' '--enable-vnc' '--enable-bzip2' '--enable-guest-agent' '--with-sdlabi=2.0'
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 634 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __linux__ not defined
#error __linux__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 686 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __i386__ not defined
#error __i386__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 689 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __ILP32__ not defined
#error __ILP32__ not defined
^~~~~
---
lines: 92 128 920 0
x86_64-w64-mingw32-gcc -mthreads -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -o config-temp/qemu-conf.exe config-temp/qemu-conf.c -g -liberty
/usr/lib/gcc/x86_64-w64-mingw32/8.2.0/../../../../x86_64-w64-mingw32/bin/ld: cannot find -liberty
collect2: error: ld returned 1 exit status
Failed to run 'configure'
Traceback (most recent call last):
File "./tests/docker/docker.py", line 563, in <module>
The full log is available at
http://patchew.org/logs/20190201123100.27419-1-kraxel@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-02-03 14:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-01 12:30 [Qemu-devel] [PULL 0/5] Ui 20190201 patches Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 1/5] hw/display: Move Milkymist specific hardware out of common-obj list Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 2/5] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 3/5] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL Gerd Hoffmann
2019-02-01 12:30 ` [Qemu-devel] [PULL 4/5] hw/display/milkymist-tmu2: Move inlined code from header to source Gerd Hoffmann
2019-02-01 12:31 ` [Qemu-devel] [PULL 5/5] ui: remove support for SDL1.2 in favour of SDL2 Gerd Hoffmann
2019-02-01 16:38 ` [Qemu-devel] [PULL 0/5] Ui 20190201 patches Peter Maydell
2019-02-03 14:31 ` [Qemu-devel] [libvirt] " no-reply
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.