From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K5TdP-0001dg-RC for qemu-devel@nongnu.org; Sun, 08 Jun 2008 18:45:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K5TdN-0001a9-AY for qemu-devel@nongnu.org; Sun, 08 Jun 2008 18:45:10 -0400 Received: from [199.232.76.173] (port=37415 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K5TdN-0001Zs-4x for qemu-devel@nongnu.org; Sun, 08 Jun 2008 18:45:09 -0400 Received: from savannah.gnu.org ([199.232.41.3]:47389 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1K5TdN-0006k2-EM for qemu-devel@nongnu.org; Sun, 08 Jun 2008 18:45:09 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1K5TdH-00073A-Sm for qemu-devel@nongnu.org; Sun, 08 Jun 2008 22:45:04 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1K5TdH-000733-14 for qemu-devel@nongnu.org; Sun, 08 Jun 2008 22:45:03 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Sun, 08 Jun 2008 22:45:03 +0000 Subject: [Qemu-devel] [4701] Enhance sendkey with key hold time (Jan Kiszka). 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 Revision: 4701 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4701 Author: balrog Date: 2008-06-08 22:45:01 +0000 (Sun, 08 Jun 2008) Log Message: ----------- Enhance sendkey with key hold time (Jan Kiszka). 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 Modified Paths: -------------- trunk/hw/musicpal.c trunk/monitor.c Modified: trunk/hw/musicpal.c =================================================================== --- trunk/hw/musicpal.c 2008-06-08 07:42:23 UTC (rev 4700) +++ trunk/hw/musicpal.c 2008-06-08 22:45:01 UTC (rev 4701) @@ -1504,12 +1504,6 @@ qemu_add_kbd_event_handler(musicpal_key_event, pic[MP_GPIO_IRQ]); - /* - * 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]); mixer_i2c = musicpal_audio_init(MP_AUDIO_BASE, pic[MP_AUDIO_IRQ]); Modified: trunk/monitor.c =================================================================== --- trunk/monitor.c 2008-06-08 07:42:23 UTC (rev 4700) +++ trunk/monitor.c 2008-06-08 22:45:01 UTC (rev 4701) @@ -35,11 +35,8 @@ #include "audio/audio.h" #include "disas.h" #include +#include "qemu-timer.h" -#ifdef CONFIG_PROFILER -#include "qemu-timer.h" /* for ticks_per_sec */ -#endif - //#define DEBUG //#define DEBUG_COMPLETION @@ -920,14 +917,37 @@ return -1; } -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) { - uint8_t keycodes[16]; - int nb_keycodes = 0; + int keycode; + + while (nb_pending_keycodes > 0) { + nb_pending_keycodes--; + keycode = keycodes[nb_pending_keycodes]; + if (keycode & 0x80) + kbd_put_keycode(0xe0); + kbd_put_keycode(keycode | 0x80); + } +} + +static void do_sendkey(const char *string, int has_hold_time, int hold_time) +{ char keyname_buf[16]; char *separator; int keyname_len, keycode, i; + if (nb_pending_keycodes > 0) { + qemu_del_timer(key_timer); + release_keys(NULL); + } + if (!has_hold_time) + hold_time = 100; + i = 0; while (1) { separator = strchr(string, '-'); keyname_len = separator ? separator - string : strlen(string); @@ -937,7 +957,7 @@ term_printf("invalid key: '%s...'\n", keyname_buf); return; } - if (nb_keycodes == sizeof(keycodes)) { + if (i == MAX_KEYCODES) { term_printf("too many keys\n"); return; } @@ -947,26 +967,23 @@ term_printf("unknown key: '%s'\n", keyname_buf); return; } - keycodes[nb_keycodes++] = keycode; + keycodes[i++] = keycode; } if (!separator) break; string = separator + 1; } + nb_pending_keycodes = i; /* key down events */ - for(i = 0; i < nb_keycodes; i++) { + for (i = 0; i < nb_pending_keycodes; i++) { keycode = keycodes[i]; if (keycode & 0x80) kbd_put_keycode(0xe0); kbd_put_keycode(keycode & 0x7f); } - /* key up events */ - for(i = nb_keycodes - 1; i >= 0; i--) { - keycode = 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) + ticks_per_sec * hold_time); } static int mouse_button_state; @@ -1353,8 +1370,8 @@ { "i", "/ii.", do_ioport_read, "/fmt addr", "I/O port read" }, - { "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=100 ms)" }, { "system_reset", "", do_system_reset, "", "reset the system" }, { "system_powerdown", "", do_system_powerdown, @@ -2638,6 +2655,9 @@ int i; if (is_first_init) { + key_timer = qemu_new_timer(vm_clock, release_keys, NULL); + if (!key_timer) + return; for (i = 0; i < MAX_MON; i++) { monitor_hd[i] = NULL; }