diff options
| author | The Android Open-Source Project <initial-contribution@android.com> | 2011-08-11 18:13:40 -0700 |
|---|---|---|
| committer | The Android Open-Source Project <initial-contribution@android.com> | 2011-08-11 18:13:40 -0700 |
| commit | c462eb94f5e4f8b9dcb101ce4e4fcc714ddd7410 (patch) | |
| tree | 60518c48dcf7f6aac791f58948e6a1bbfaaba948 /android/main-common.c | |
| parent | 9d304115183fffcd5acb0882b70b1a5791ebe1cd (diff) | |
| parent | 852434e616aba0607e71143022e8b7cb2362e639 (diff) | |
| download | external_qemu-c462eb94f5e4f8b9dcb101ce4e4fcc714ddd7410.zip external_qemu-c462eb94f5e4f8b9dcb101ce4e4fcc714ddd7410.tar.gz external_qemu-c462eb94f5e4f8b9dcb101ce4e4fcc714ddd7410.tar.bz2 | |
merge from tools_r13
Change-Id: Iabd0b49a5c3ad991da1b4f636ecdf881b1c271aa
Diffstat (limited to 'android/main-common.c')
| -rw-r--r-- | android/main-common.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android/main-common.c b/android/main-common.c index a662907..a0e5f56 100644 --- a/android/main-common.c +++ b/android/main-common.c @@ -335,6 +335,9 @@ static const struct { { NULL, NULL } }; +/* this is used by hw/events_device.c to send the charmap name to the system */ +const char* android_skin_keycharmap = NULL; + void parse_skin_files(const char* skinDirPath, const char* skinName, @@ -560,6 +563,8 @@ init_sdl_ui(AConfig* skinConfig, exit(1); } + android_skin_keycharmap = skin_keyboard_charmap_name(qemulator_get()->keyboard); + /* add an onion overlay image if needed */ if (opts->onion) { SkinImage* onion = skin_image_find_simple( opts->onion ); |