]> xenbits.xensource.com Git - qemu-xen-4.6-testing.git/commitdiff
merge from in qemu upstream: do not obey sdl_{show,hide}_cursor if !cursor_hide aka...
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 6 May 2008 11:06:46 +0000 (12:06 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 12 May 2008 11:20:11 +0000 (12:20 +0100)
sdl.c

diff --git a/sdl.c b/sdl.c
index c00cbf074333d8023370041aad9261093d4af475..8792789396a10ea0591f26464c86ec52c1cb8ef3 100644 (file)
--- a/sdl.c
+++ b/sdl.c
@@ -428,6 +428,9 @@ static void sdl_update_caption(void)
 
 static void sdl_hide_cursor(void)
 {
+    if (!cursor_hide)
+        return;
+
     if (kbd_mouse_is_absolute()) {
         SDL_ShowCursor(1);
         SDL_SetCursor(sdl_cursor_hidden);
@@ -438,6 +441,9 @@ static void sdl_hide_cursor(void)
 
 static void sdl_show_cursor(void)
 {
+    if (!cursor_hide)
+        return;
+
     if (!kbd_mouse_is_absolute()) {
         SDL_ShowCursor(1);
         SDL_SetCursor(sdl_cursor_normal);