ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: keyboard: switch sdl ui to new core 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-11-28 12:17:35 +01:00
parent af98ba92ac
commit a25f545d68
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/sdl.c
View File

@ -30,6 +30,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "ui/console.h" #include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "x_keymap.h" #include "x_keymap.h"
#include "sdl_zoom.h" #include "sdl_zoom.h"
@ -261,9 +262,7 @@ static void reset_keys(void)
int i; int i;
for(i = 0; i < 256; i++) { for(i = 0; i < 256; i++) {
if (modifiers_state[i]) { if (modifiers_state[i]) {
if (i & SCANCODE_GREY) qemu_input_event_send_key_number(dcl->con, i, false);
kbd_put_keycode(SCANCODE_EMUL0);
kbd_put_keycode(i | SCANCODE_UP);
modifiers_state[i] = 0; modifiers_state[i] = 0;
} }
} }
@ -271,16 +270,12 @@ static void reset_keys(void)
static void sdl_process_key(SDL_KeyboardEvent *ev) static void sdl_process_key(SDL_KeyboardEvent *ev)
{ {
int keycode, v; int keycode;
if (ev->keysym.sym == SDLK_PAUSE) { if (ev->keysym.sym == SDLK_PAUSE) {
/* specific case */ /* specific case */
v = 0; qemu_input_event_send_key_qcode(dcl->con, Q_KEY_CODE_PAUSE,
if (ev->type == SDL_KEYUP) ev->type == SDL_KEYDOWN);
v |= SCANCODE_UP;
kbd_put_keycode(0xe1);
kbd_put_keycode(0x1d | v);
kbd_put_keycode(0x45 | v);
return; return;
} }
@ -312,19 +307,15 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)
case 0x45: /* num lock */ case 0x45: /* num lock */
case 0x3a: /* caps lock */ case 0x3a: /* caps lock */
/* SDL does not send the key up event, so we generate it */ /* SDL does not send the key up event, so we generate it */
kbd_put_keycode(keycode); qemu_input_event_send_key_number(dcl->con, keycode, true);
kbd_put_keycode(keycode | SCANCODE_UP); qemu_input_event_send_key_number(dcl->con, keycode, false);
return; return;
#endif #endif
} }
/* now send the key code */ /* now send the key code */
if (keycode & SCANCODE_GREY) qemu_input_event_send_key_number(dcl->con, keycode,
kbd_put_keycode(SCANCODE_EMUL0); ev->type == SDL_KEYDOWN);
if (ev->type == SDL_KEYUP)
kbd_put_keycode(keycode | SCANCODE_UP);
else
kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
} }
static void sdl_update_caption(void) static void sdl_update_caption(void)