[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] sdl2: Use the same pointer show/hide logic for a
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/5] sdl2: Use the same pointer show/hide logic for absolute and relative mode |
Date: |
Fri, 17 Nov 2017 11:06:50 +0100 |
From: Jindrich Makovicka <address@hidden>
Also use a proper enum parameter for SDL_ShowCursor
Signed-off-by: Jindrich Makovicka <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl2.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 05729af971..d0f16f60f4 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -169,10 +169,10 @@ static void sdl_hide_cursor(void)
return;
}
- if (qemu_input_is_absolute()) {
- SDL_ShowCursor(1);
- SDL_SetCursor(sdl_cursor_hidden);
- } else {
+ SDL_ShowCursor(SDL_DISABLE);
+ SDL_SetCursor(sdl_cursor_hidden);
+
+ if (!qemu_input_is_absolute()) {
SDL_SetRelativeMouseMode(SDL_TRUE);
}
}
@@ -185,14 +185,16 @@ 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)) {
- SDL_SetCursor(guest_sprite);
- } else {
- SDL_SetCursor(sdl_cursor_normal);
- }
}
+
+ if (guest_cursor &&
+ (gui_grab || qemu_input_is_absolute() || absolute_enabled)) {
+ SDL_SetCursor(guest_sprite);
+ } else {
+ SDL_SetCursor(sdl_cursor_normal);
+ }
+
+ SDL_ShowCursor(SDL_ENABLE);
}
static void sdl_grab_start(struct sdl2_console *scon)
--
2.9.3
- [Qemu-devel] [PULL 0/5] Ui 20171117 patches, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PULL 2/5] sdl2: Use the same pointer show/hide logic for absolute and relative mode,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/5] sdl2: Fix broken display updating after the window is hidden, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PULL 3/5] sdl2: Fix dead keyboard after fullsceen, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PULL 4/5] sdl2: Do not leave grab when fullscreen, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PULL 1/5] sdl2: Do not quit the emulator when an auxilliary window is closed, Gerd Hoffmann, 2017/11/17
- Re: [Qemu-devel] [PULL 0/5] Ui 20171117 patches, Peter Maydell, 2017/11/17