From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JzAg9-0002Bf-H1 for qemu-devel@nongnu.org; Thu, 22 May 2008 09:17:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JzAg6-0002A8-Td for qemu-devel@nongnu.org; Thu, 22 May 2008 09:17:56 -0400 Received: from [199.232.76.173] (port=47055 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzAg6-00029w-M8 for qemu-devel@nongnu.org; Thu, 22 May 2008 09:17:54 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:54959) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JzAg6-0001ej-0K for qemu-devel@nongnu.org; Thu, 22 May 2008 09:17:54 -0400 Received: from smtp07.web.de (fmsmtp07.dlan.cinetic.de [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id 95A32DDCD012 for ; Thu, 22 May 2008 15:17:53 +0200 (CEST) Received: from [88.64.5.207] (helo=[192.168.1.198]) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.109 #226) id 1JzAg5-0000WB-00 for qemu-devel@nongnu.org; Thu, 22 May 2008 15:17:53 +0200 Message-ID: <48357281.1090501@web.de> Date: Thu, 22 May 2008 15:17:53 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: jan.kiszka@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/2] Enhance sendkey with key hold time Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Current key injection via the monitor basically generates no key hold time. This is fine for keyboard emulations that have their own queues, but it causes troubles for those how don't (like the MusicPal - it simply does not work with injected keys). Moreover, I would like to use this mechanism to simulate pressed buttons during power-up. Therefore, this patch enhances the key injection with a configurable release delay (by default 100 virtual milliseconds). This feature allows to get rid of the initial sleep() in musicpal_init because one can now simply start qemu with -S and issue "sendkey m 1000" and "continue" in the monitor to achieve the desired effect of a pressed menu button during power-up. So there is no need for a per-musicpal or even qemu-wide "-hold-button" switch. Signed-off-by: Jan Kiszka --- hw/musicpal.c | 6 ------ monitor.c | 57 ++++++++++++++++++++++++++++++++++++++-------------= ------ 2 files changed, 38 insertions(+), 25 deletions(-) Index: b/hw/musicpal.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1504,12 +1504,6 @@ static void musicpal_init(ram_addr_t ram =20 qemu_add_kbd_event_handler(musicpal_key_event, pic[MP_GPIO_IRQ]); =20 - /* - * Wait a bit to catch menu button during U-Boot start-up - * (to trigger emergency update). - */ - sleep(1); - mv88w8618_eth_init(&nd_table[0], MP_ETH_BASE, pic[MP_ETH_IRQ]); =20 mixer_i2c =3D musicpal_audio_init(MP_AUDIO_BASE, pic[MP_AUDIO_IRQ]); Index: b/monitor.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/monitor.c +++ b/monitor.c @@ -35,10 +35,7 @@ #include "audio/audio.h" #include "disas.h" #include - -#ifdef CONFIG_PROFILER -#include "qemu-timer.h" /* for ticks_per_sec */ -#endif +#include "qemu-timer.h" =20 //#define DEBUG //#define DEBUG_COMPLETION @@ -925,14 +922,37 @@ static int get_keycode(const char *key) return -1; } =20 -static void do_sendkey(const char *string) +#define MAX_KEYCODES 16 +static uint8_t keycodes[MAX_KEYCODES]; +static int nb_pending_keycodes; +static QEMUTimer *key_timer; + +static void release_keys(void *opaque) +{ + int keycode; + + while (nb_pending_keycodes > 0) { + keycode =3D keycodes[nb_pending_keycodes-1]; + if (keycode & 0x80) + kbd_put_keycode(0xe0); + kbd_put_keycode(keycode | 0x80); + nb_pending_keycodes--; + } +} + +static void do_sendkey(const char *string, int has_hold_time, int hold_t= ime) { - uint8_t keycodes[16]; - int nb_keycodes =3D 0; char keyname_buf[16]; char *separator; int keyname_len, keycode, i; =20 + if (nb_pending_keycodes > 0) { + qemu_del_timer(key_timer); + release_keys(NULL); + } + if (!has_hold_time) + hold_time =3D 100; + i =3D 0; while (1) { separator =3D strchr(string, '-'); keyname_len =3D separator ? separator-string : strlen(string); @@ -943,7 +963,7 @@ static void do_sendkey(const char *strin term_printf("invalid key: '%s...'\n", keyname_buf); return; } - if (nb_keycodes =3D=3D sizeof(keycodes)) { + if (i =3D=3D MAX_KEYCODES) { term_printf("too many keys\n"); return; } @@ -953,26 +973,22 @@ static void do_sendkey(const char *strin term_printf("unknown key: '%s'\n", keyname_buf); return; } - keycodes[nb_keycodes++] =3D keycode; + keycodes[i++] =3D keycode; } if (!separator) break; string =3D separator + 1; } + nb_pending_keycodes =3D i; /* key down events */ - for(i =3D 0; i < nb_keycodes; i++) { + for (i =3D 0; i < nb_pending_keycodes; i++) { keycode =3D keycodes[i]; if (keycode & 0x80) kbd_put_keycode(0xe0); kbd_put_keycode(keycode & 0x7f); } - /* key up events */ - for(i =3D nb_keycodes - 1; i >=3D 0; i--) { - keycode =3D keycodes[i]; - if (keycode & 0x80) - kbd_put_keycode(0xe0); - kbd_put_keycode(keycode | 0x80); - } + /* delayed key up events */ + qemu_mod_timer(key_timer, qemu_get_clock(vm_clock) + 1000000LL*hold_= time); } =20 static int mouse_button_state; @@ -1359,8 +1375,8 @@ static term_cmd_t term_cmds[] =3D { { "i", "/ii.", do_ioport_read, "/fmt addr", "I/O port read" }, =20 - { "sendkey", "s", do_sendkey, - "keys", "send keys to the VM (e.g. 'sendkey ctrl-alt-f1')" }, + { "sendkey", "si?", do_sendkey, + "keys [hold_ms]", "send keys to the VM (e.g. 'sendkey ctrl-alt-f1'= , default hold time=3D100 ms)" }, { "system_reset", "", do_system_reset, "", "reset the system" }, { "system_powerdown", "", do_system_powerdown, @@ -2644,6 +2660,9 @@ void monitor_init(CharDriverState *hd, i int i; =20 if (is_first_init) { + key_timer =3D qemu_new_timer(vm_clock, release_keys, NULL); + if (!key_timer) + return; for (i =3D 0; i < MAX_MON; i++) { monitor_hd[i] =3D NULL; }