OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

offer right-ctrl as a grab option 

Add support for -ctrl-grab to use the right-ctrl button to grab/release
the mouse in SDL.

The multi-button ctrl-alt and ctrl-alt-shift grab buttons present an
accessibility problem to users who cannot press more than one button
at a time.

https://bugs.edge.launchpad.net/ubuntu/+source/qemu-kvm/+bug/237635

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Dustin Kirkland 2009-09-17 15:48:04 -05:00 committed by Anthony Liguori
parent a6af8e5f96
commit 0ca9f8a42d
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu-options.hx
View File

@ -477,6 +477,16 @@ STEXI
Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt).
ETEXI ETEXI
#ifdef CONFIG_SDL
DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
"-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n")
#endif
STEXI
@item -ctrl-grab
Use Right-Ctrl to grab mouse (instead of Ctrl-Alt).
ETEXI
#ifdef CONFIG_SDL #ifdef CONFIG_SDL
DEF("no-quit", 0, QEMU_OPTION_no_quit, DEF("no-quit", 0, QEMU_OPTION_no_quit,
"-no-quit disable SDL window close capability\n") "-no-quit disable SDL window close capability\n")

18
sdl.c
View File

@ -414,10 +414,12 @@ static void sdl_update_caption(void)
if (!vm_running) if (!vm_running)
status = " [Stopped]"; status = " [Stopped]";
else if (gui_grab) { else if (gui_grab) {
if (!alt_grab) if (alt_grab)
status = " - Press Ctrl-Alt to exit grab";
else
status = " - Press Ctrl-Alt-Shift to exit grab"; status = " - Press Ctrl-Alt-Shift to exit grab";
else if (ctrl_grab)
status = " - Press Right-Ctrl to exit grab";
else
status = " - Press Ctrl-Alt to exit grab";
} }
if (qemu_name) { if (qemu_name) {
@ -557,12 +559,14 @@ static void sdl_refresh(DisplayState *ds)
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: case SDL_KEYUP:
if (ev->type == SDL_KEYDOWN) { if (ev->type == SDL_KEYDOWN) {
if (!alt_grab) { if (alt_grab) {
mod_state = (SDL_GetModState() & gui_grab_code) ==
gui_grab_code;
} else {
mod_state = (SDL_GetModState() & (gui_grab_code | KMOD_LSHIFT)) == mod_state = (SDL_GetModState() & (gui_grab_code | KMOD_LSHIFT)) ==
(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; gui_key_modifier_pressed = mod_state;
if (gui_key_modifier_pressed) { if (gui_key_modifier_pressed) {

1
sysemu.h
View File

@ -126,6 +126,7 @@ extern const char *keyboard_layout;
extern int win2k_install_hack; extern int win2k_install_hack;
extern int rtc_td_hack; extern int rtc_td_hack;
extern int alt_grab; extern int alt_grab;
extern int ctrl_grab;
extern int usb_enabled; extern int usb_enabled;
extern int smp_cpus; extern int smp_cpus;
extern int max_cpus; extern int max_cpus;

4
vl.c
View File

@ -247,6 +247,7 @@ int old_param = 0;
#endif #endif
const char *qemu_name; const char *qemu_name;
int alt_grab = 0; int alt_grab = 0;
int ctrl_grab = 0;
#if defined(TARGET_SPARC) || defined(TARGET_PPC) #if defined(TARGET_SPARC) || defined(TARGET_PPC)
unsigned int nb_prom_envs = 0; unsigned int nb_prom_envs = 0;
const char *prom_envs[MAX_PROM_ENVS]; const char *prom_envs[MAX_PROM_ENVS];
@ -5310,6 +5311,9 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_alt_grab: case QEMU_OPTION_alt_grab:
alt_grab = 1; alt_grab = 1;
break; break;
case QEMU_OPTION_ctrl_grab:
ctrl_grab = 1;
break;
case QEMU_OPTION_no_quit: case QEMU_OPTION_no_quit:
no_quit = 1; no_quit = 1;
break; break;