[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/15] sdl: Consistently avoid grabbing input for te
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 09/15] sdl: Consistently avoid grabbing input for text consoles |
Date: |
Sat, 30 Jul 2011 11:39:12 +0200 |
From: Jan Kiszka <address@hidden>
There were some preexisting bits that released the input when switching
to text console. This patch spreads this logic consistently and also
avoids grabbing the input while a text console is active.
Signed-off-by: Jan Kiszka <address@hidden>
---
ui/sdl.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index f19bae2..27465b2 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -564,8 +564,9 @@ static void toggle_full_screen(DisplayState *ds)
} else {
do_sdl_resize(ds_get_width(ds), ds_get_height(ds), 0);
}
- if (!gui_saved_grab)
+ if (!gui_saved_grab || !is_graphic_console()) {
sdl_grab_end();
+ }
}
vga_hw_invalidate();
vga_hw_update();
@@ -689,8 +690,10 @@ static void sdl_refresh(DisplayState *ds)
'SDL_WM_GrabInput(SDL_GRAB_ON)'
from blocking all the application
(SDL bug). */
- if (SDL_GetAppState() & SDL_APPACTIVE)
+ if (is_graphic_console() &&
+ SDL_GetAppState() & SDL_APPACTIVE) {
sdl_grab_start();
+ }
} else {
sdl_grab_end();
}
@@ -721,7 +724,7 @@ static void sdl_refresh(DisplayState *ds)
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
- {
+ if (is_graphic_console()) {
SDL_MouseButtonEvent *bev = &ev->button;
if (!gui_grab && !kbd_mouse_is_absolute()) {
if (ev->type == SDL_MOUSEBUTTONDOWN &&
--
1.7.3.4
- [Qemu-devel] [PATCH 00/15] sdl: Usability improvements, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 10/15] sdl: Never release input while in full screen mode, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 04/15] sdl: Properly mark modifier+u as hotkey, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 07/15] sdl: Drop bogus gui_fullscreen_initial_grab, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 06/15] sdl: Restore scaling mode on return from full screen, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 09/15] sdl: Consistently avoid grabbing input for text consoles,
Jan Kiszka <=
- [Qemu-devel] [PATCH 13/15] sdl: Add zoom hot keys, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 15/15] sdl: Refactor sdl_send_mouse_event, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 14/15] sdl: Factor out event handlers from sdl_refresh, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 05/15] sdl: Fix full screen toggling from scaled mode, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 01/15] sdl: Fix termination in -no-shutdown mode, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 08/15] sdl: Initialize gui_fullscreen earlier during setup, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 03/15] sdl: Avoid redundant scaling deactivation, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 11/15] sdl: Fix cursor handling when switching consoles in absolute mouse mode, Jan Kiszka, 2011/07/30
- [Qemu-devel] [PATCH 12/15] sdl: Dynamically grab input in absolute mouse mode, Jan Kiszka, 2011/07/30