[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [4701] Enhance sendkey with key hold time (Jan Kiszka).
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] Re: [4701] Enhance sendkey with key hold time (Jan Kiszka). |
Date: |
Mon, 09 Jun 2008 01:29:04 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Andrzej Zaborowski wrote:
> 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 <address@hidden>
>
> 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 <dirent.h>
> +#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);
Damn. That should have been:
Index: monitor.c
===================================================================
--- monitor.c (Revision 4701)
+++ monitor.c (Arbeitskopie)
@@ -983,7 +983,7 @@ static void do_sendkey(const char *strin
}
/* delayed key up events */
qemu_mod_timer(key_timer,
- qemu_get_clock(vm_clock) + ticks_per_sec * hold_time);
+ qemu_get_clock(vm_clock) + ticks_per_sec/1000 * hold_time);
}
static int mouse_button_state;
[ hold_time is in milliseconds. ]
Please merge.
Jan