From: Kitae Kim Date: Wed, 14 Nov 2012 05:23:52 +0000 (+0900) Subject: virtio-keyboard: enable VirtIO Keyboard Menu. X-Git-Tag: TizenStudio_2.0_p2.3~1225 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f35769007defd543ad1ae2cdb5981aba44acfbe7;p=sdk%2Femulator%2Fqemu.git virtio-keyboard: enable VirtIO Keyboard Menu. As converting a way to use a host keyboard from usb to virtio, disable usb keyboard menu and enable virtio keyboard menu. Signed-off-by: Kitae Kim --- diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java index f34fffd..714f33c 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1812,6 +1812,7 @@ public class EmulatorSkin { } } ); + /* // USB Keyboard menu final MenuItem usbKeyboardItem = new MenuItem(menu, SWT.CASCADE); usbKeyboardItem.setText("&USB Keyboard"); @@ -1857,8 +1858,8 @@ public class EmulatorSkin { usbOffItem.addSelectionListener(usbSelectionAdaptor); usbKeyboardItem.setMenu(usbKeyBoardMenu); + */ - /* // VirtIO Keyboard Menu final MenuItem hostKeyboardItem = new MenuItem(menu, SWT.CASCADE); hostKeyboardItem.setText("&Host Keyboard"); @@ -1904,7 +1905,6 @@ public class EmulatorSkin { kbdOffItem.addSelectionListener(kbdSelectionAdaptor); hostKeyboardItem.setMenu(hostKeyboardMenu); - */ /* Diagnosis menu */ if (SwtUtil.isLinuxPlatform()) { //TODO: windows diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c index 749320e..01f9fa6 100644 --- a/tizen/src/skin/maruskin_operation.c +++ b/tizen/src/skin/maruskin_operation.c @@ -189,10 +189,12 @@ void do_key_event(int event_type, int keycode, int state_mask, int key_location) } #endif +#if 0 if (!mloop_evcmd_get_usbkbd_status()) { TRACE("ignore keyboard input because usb keyboard is dettached.\n"); return; } +#endif scancode = javakeycode_to_scancode(event_type, keycode, state_mask, key_location);