diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-19 20:51:01 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-07-07 00:57:08 +0200 |
| commit | c803400d45535925fb35c373e2d610fde522c546 (patch) | |
| tree | 9828bdc85e8a86b1f94a10a4291c2d3d70abfff9 /android/main-common.c | |
| parent | d02b30ee5bfc925dd8e031c193c17672e500fd18 (diff) | |
| download | external_qemu-c803400d45535925fb35c373e2d610fde522c546.zip external_qemu-c803400d45535925fb35c373e2d610fde522c546.tar.gz external_qemu-c803400d45535925fb35c373e2d610fde522c546.tar.bz2 | |
Move charmap to hardware properties
The name of the emulated charmap must be passed to the guest
kernel because it is used by the guest input handling code to
load the proper charmap files from the system partition.
This mandates that the name becomes a hardware property for
the sake of supporting proper snapshotting and ui/core separation.
From now on, the charmap name found in a skin will be ignored
completely. This shouldn't be a problem in practice because all
skins used the default name (qwerty2) anyway.
The only reason to change the default value would be if emulating
a guest system image that depends on a different charmap during
emulation.
Change-Id: If571684000b159ae9e9849661c9ff18e19b4cc75
Diffstat (limited to 'android/main-common.c')
| -rw-r--r-- | android/main-common.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/android/main-common.c b/android/main-common.c index a0e5f56..a662907 100644 --- a/android/main-common.c +++ b/android/main-common.c @@ -335,9 +335,6 @@ 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, @@ -563,8 +560,6 @@ 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 ); |