input: sdl2: Fix relative mode to match SDL1 behavior

Right now relative mode accelerates too fast, and has the 'invisible wall' problem. SDL2 added an explicit API to handle this use case, so let's use it. Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
input: sdl2: Fix guest_cursor logic
2014-04-11 12:19:16 +02:00 · 2014-04-11 12:19:16 +02:00 · 2014-04-10 23:07:56 +01:00 · 2014-04-10 22:17:47 +01:00 · 2014-04-10 19:03:18 +03:00 · 2014-04-09 17:52:08 +03:00
6 changed files with 34 additions and 39 deletions
--- a/2
+++ b/2
@@ -1448,7 +1448,7 @@ done
 if test "$stack_protector" != "no" ; then
  gcc_flags="-fstack-protector-strong -fstack-protector-all"
  for flag in $gcc_flags; do
-    if compile_prog "-Werror $flag" "" ; then
+    if do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC ; then
      QEMU_CFLAGS="$QEMU_CFLAGS $flag"
      LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"
      break
--- a/hw/i386/acpi-dsdt.hex.generated
+++ b/hw/i386/acpi-dsdt.hex.generated
@@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x53,
 0x44,
 0x54,
-0x85,
+0x80,
 0x11,
 0x0,
 0x0,
 0x1,
-0x8b,
+0x60,
 0x42,
 0x58,
 0x50,
@@ -31,8 +31,8 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x4e,
 0x54,
 0x4c,
-0x23,
+0x15,
-0x8,
+0x11,
 0x13,
 0x20,
 0x10,
@@ -4010,7 +4010,7 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x53,
 0x1,
 0x10,
-0x47,
+0x42,
 0x11,
 0x5f,
 0x53,
@@ -4243,7 +4243,7 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x60,
 0x5b,
 0x82,
-0x2e,
+0x29,
 0x50,
 0x52,
 0x45,
@@ -4253,16 +4253,11 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x48,
 0x49,
 0x44,
-0xd,
+0xc,
 0x41,
-0x43,
+0xd0,
-0x50,
+0xa,
-0x49,
+0x6,
 0x30,
 0x30,
 0x30,
 0x34,
 0x0,
 0x8,
 0x5f,
 0x43,
--- a/hw/i386/q35-acpi-dsdt.hex.generated
+++ b/hw/i386/q35-acpi-dsdt.hex.generated
@@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x53,
 0x44,
 0x54,
-0xd7,
+0xd2,
 0x1c,
 0x0,
 0x0,
 0x1,
-0x3e,
+0x13,
 0x42,
 0x58,
 0x50,
@@ -31,8 +31,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x4e,
 0x54,
 0x4c,
-0x23,
+0x15,
-0x8,
+0x11,
 0x13,
 0x20,
 0x10,
@@ -6959,7 +6959,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x53,
 0x1,
 0x10,
-0x47,
+0x42,
 0x11,
 0x5f,
 0x53,
@@ -7192,7 +7192,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x60,
 0x5b,
 0x82,
-0x2e,
+0x29,
 0x50,
 0x52,
 0x45,
@@ -7202,16 +7202,11 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x48,
 0x49,
 0x44,
-0xd,
+0xc,
 0x41,
-0x43,
+0xd0,
-0x50,
+0xa,
-0x49,
+0x6,
 0x30,
 0x30,
 0x30,
 0x34,
 0x0,
 0x8,
 0x5f,
 0x43,
--- a/tests/acpi-test-data/pc/DSDT
+++ b/tests/acpi-test-data/pc/DSDT
--- a/tests/acpi-test-data/q35/DSDT
+++ b/tests/acpi-test-data/q35/DSDT
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -278,7 +278,7 @@ static void sdl_hide_cursor(void)
        SDL_ShowCursor(1);
        SDL_SetCursor(sdl_cursor_hidden);
    } else {
-        SDL_ShowCursor(0);
+        SDL_SetRelativeMouseMode(SDL_TRUE);
    }
 }
@@ -289,6 +289,7 @@ static void sdl_show_cursor(void)
    }
    if (!qemu_input_is_absolute()) {
        SDL_SetRelativeMouseMode(SDL_FALSE);
        SDL_ShowCursor(1);
        if (guest_cursor &&
            (gui_grab || qemu_input_is_absolute() || absolute_enabled)) {
@@ -403,13 +404,17 @@ static void sdl_send_mouse_event(struct sdl2_state *scon, int dx, int dy,
        }
        qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X, off_x + x, max_w);
        qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y, off_y + y, max_h);
-    } else if (guest_cursor) {
+    } else {
-        x -= guest_x;
+        if (guest_cursor) {
-        y -= guest_y;
+            x -= guest_x;
-        guest_x += x;
+            y -= guest_y;
-        guest_y += y;
+            guest_x += x;
-        qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_X, x);
+            guest_y += y;
-        qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_Y, y);
+            dx = x;
            dy = y;
        }
        qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_X, dx);
        qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_Y, dy);
    }
    qemu_input_event_sync();
 }
Author	SHA1	Message	Date
Cole Robinson	2d968ffbae	input: sdl2: Fix relative mode to match SDL1 behavior Right now relative mode accelerates too fast, and has the 'invisible wall' problem. SDL2 added an explicit API to handle this use case, so let's use it. Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-04-11 12:19:16 +02:00
Cole Robinson	afbc0dd649	input: sdl2: Fix guest_cursor logic Unbreaks relative mouse mode with sdl2, just like was done with sdl.c in `c3aa84b6`. Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-04-11 12:19:16 +02:00
Peter Maydell	f516a5cc05	Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi: DSDT update Two fixes here: - Test fix to avoid warning with make check. - Hex file update so people building QEMU without installing iasl get exactly the same ACPI as with. Both should help avoid user confusion. As it's very easy to check that the produced ACPI binary didn't change, I think these are very low risk. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 10 Apr 2014 17:09:43 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: acpi: update generated hex files tests/acpi: update expected DSDT files Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2014-04-10 23:07:56 +01:00
Peter Maydell	0a9077ea14	configure: use do_cc when checking for -fstack-protector support MacOSX clang silently swallows unrecognized -f options when doing a link with '-framework' also on the command line, so to detect support for the various -fstack-protector options we must do a plain .c to .o compile, not a complete compile-and-link. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 1397041487-28477-1-git-send-email-peter.maydell@linaro.org	2014-04-10 22:17:47 +01:00
Michael S. Tsirkin	775478418a	acpi: update generated hex files commit `f2ccc311df` dsdt: tweak ACPI ID for hotplug resource device changes the DSDT, update hex files to match Otherwise the fix is only effective if QEMU is built with iasl. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>	2014-04-10 19:03:18 +03:00
Michael S. Tsirkin	50329d3418	tests/acpi: update expected DSDT files commit `f2ccc311df` dsdt: tweak ACPI ID for hotplug resource device changes the DSDT, update test expected files to match Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reported-by: Igor Mammedov <imammedo@redhat.com>	2014-04-09 17:52:08 +03:00
 x53,
 x44,
 x54,
-x85,
+x80,
 x11,
 x0,
 x0,
 x1,
-x8b,
+x60,
 x42,
 x58,
 x50,
 x4e,
 x54,
 x4c,
-x23,
+x15,
-x8,
+x11,
 x13,
 x20,
 x10,
 x53,
 x1,
 x10,
-x47,
+x42,
 x11,
 x5f,
 x53,
 x60,
 x5b,
 x82,
-x2e,
+x29,
 x50,
 x52,
 x45,
 x48,
 x49,
 x44,
-xd,
+xc,
 x41,
-x43,
+xd0,
-x50,
+xa,
-x49,
+x6,
-x30,
-x30,
-x30,
-x34,
-x0,
 x8,
 x5f,
 x43,
 x53,
 x44,
 x54,
-xd7,
+xd2,
 x1c,
 x0,
 x0,
 x1,
-x3e,
+x13,
 x42,
 x58,
 x50,
 x4e,
 x54,
 x4c,
-x23,
+x15,
-x8,
+x11,
 x13,
 x20,
 x10,
 x53,
 x1,
 x10,
-x47,
+x42,
 x11,
 x5f,
 x53,
 x60,
 x5b,
 x82,
-x2e,
+x29,
 x50,
 x52,
 x45,
 x48,
 x49,
 x44,
-xd,
+xc,
 x41,
-x43,
+xd0,
-x50,
+xa,
-x49,
+x6,
-x30,
-x30,
-x30,
-x34,
-x0,
 x8,
 x5f,
 x43,