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

sdl2: textinput + terminal

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-05-26 14:05:51 +02:00
parent 363f59d9e4
commit f2335791fd
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ui/sdl2.c
View File

@ -214,6 +214,23 @@ static void sdl_process_key(struct sdl2_state *scon,
int qcode = sdl2_scancode_to_qcode[ev->keysym.scancode]; int qcode = sdl2_scancode_to_qcode[ev->keysym.scancode];
QemuConsole *con = scon ? scon->dcl.con : NULL; QemuConsole *con = scon ? scon->dcl.con : NULL;
if (!qemu_console_is_graphic(con)) {
if (ev->type == SDL_KEYDOWN) {
switch (ev->keysym.scancode) {
case SDL_SCANCODE_RETURN:
kbd_put_keysym_console(con, '\n');
break;
case SDL_SCANCODE_BACKSPACE:
kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE);
break;
default:
kbd_put_qcode_console(con, qcode);
break;
}
}
return;
}
switch (ev->keysym.scancode) { switch (ev->keysym.scancode) {
#if 0 #if 0
case SDL_SCANCODE_NUMLOCKCLEAR: case SDL_SCANCODE_NUMLOCKCLEAR:
@ -309,6 +326,11 @@ static void sdl_show_cursor(void)
static void sdl_grab_start(struct sdl2_state *scon) static void sdl_grab_start(struct sdl2_state *scon)
{ {
QemuConsole *con = scon ? scon->dcl.con : NULL;
if (!con || !qemu_console_is_graphic(con)) {
return;
}
/* /*
* If the application is not active, do not try to enter grab state. This * If the application is not active, do not try to enter grab state. This
* prevents 'SDL_WM_GrabInput(SDL_GRAB_ON)' from blocking all the * prevents 'SDL_WM_GrabInput(SDL_GRAB_ON)' from blocking all the
@ -569,6 +591,17 @@ static void handle_keyup(SDL_Event *ev)
} }
} }
static void handle_textinput(SDL_Event *ev)
{
struct sdl2_state *scon = get_scon_from_window(ev->key.windowID);
QemuConsole *con = scon ? scon->dcl.con : NULL;
if (qemu_console_is_graphic(con)) {
return;
}
kbd_put_string_console(con, ev->text.text, strlen(ev->text.text));
}
static void handle_mousemotion(SDL_Event *ev) static void handle_mousemotion(SDL_Event *ev)
{ {
int max_x, max_y; int max_x, max_y;
@ -705,6 +738,9 @@ static void sdl_refresh(DisplayChangeListener *dcl)
case SDL_KEYUP: case SDL_KEYUP:
handle_keyup(ev); handle_keyup(ev);
break; break;
case SDL_TEXTINPUT:
handle_textinput(ev);
break;
case SDL_QUIT: case SDL_QUIT:
if (!no_quit) { if (!no_quit) {
no_shutdown = 0; no_shutdown = 0;
@ -833,7 +869,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
for (i = 0;; i++) { for (i = 0;; i++) {
QemuConsole *con = qemu_console_lookup_by_index(i); QemuConsole *con = qemu_console_lookup_by_index(i);
if (!con || !qemu_console_is_graphic(con)) { if (!con) {
break; break;
} }
} }
@ -841,6 +877,9 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
sdl2_console = g_new0(struct sdl2_state, sdl2_num_outputs); sdl2_console = g_new0(struct sdl2_state, sdl2_num_outputs);
for (i = 0; i < sdl2_num_outputs; i++) { for (i = 0; i < sdl2_num_outputs; i++) {
QemuConsole *con = qemu_console_lookup_by_index(i); QemuConsole *con = qemu_console_lookup_by_index(i);
if (!qemu_console_is_graphic(con)) {
sdl2_console[i].hidden = true;
}
sdl2_console[i].dcl.ops = &dcl_ops; sdl2_console[i].dcl.ops = &dcl_ops;
sdl2_console[i].dcl.con = con; sdl2_console[i].dcl.con = con;
register_displaychangelistener(&sdl2_console[i].dcl); register_displaychangelistener(&sdl2_console[i].dcl);