* [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros
@ 2013-05-16 5:19 Amos Kong
2013-05-16 6:07 ` Lei Li
2013-05-23 13:55 ` Luiz Capitulino
0 siblings, 2 replies; 3+ messages in thread
From: Amos Kong @ 2013-05-16 5:19 UTC (permalink / raw)
To: lcapitulino; +Cc: qemu-devel
It's clearer to use defined macros than magic numbers.
Signed-off-by: Amos Kong <akong@redhat.com>
---
ui/input.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index 8ca1a03..92c44ca 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -28,6 +28,7 @@
#include "qapi/error.h"
#include "qmp-commands.h"
#include "qapi-types.h"
+#include "ui/keymaps.h"
struct QEMUPutMouseEntry {
QEMUPutMouseEvent *qemu_put_mouse_event;
@@ -260,10 +261,10 @@ static void free_keycodes(void)
static void release_keys(void *opaque)
{
while (keycodes_size > 0) {
- if (keycodes[--keycodes_size] & 0x80) {
- kbd_put_keycode(0xe0);
+ if (keycodes[--keycodes_size] & SCANCODE_GREY) {
+ kbd_put_keycode(SCANCODE_EMUL0);
}
- kbd_put_keycode(keycodes[keycodes_size] | 0x80);
+ kbd_put_keycode(keycodes[keycodes_size] | SCANCODE_UP);
}
free_keycodes();
@@ -297,10 +298,10 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
return;
}
- if (keycode & 0x80) {
- kbd_put_keycode(0xe0);
+ if (keycode & SCANCODE_GREY) {
+ kbd_put_keycode(SCANCODE_EMUL0);
}
- kbd_put_keycode(keycode & 0x7f);
+ kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));
keycodes[keycodes_size++] = keycode;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros
2013-05-16 5:19 [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros Amos Kong
@ 2013-05-16 6:07 ` Lei Li
2013-05-23 13:55 ` Luiz Capitulino
1 sibling, 0 replies; 3+ messages in thread
From: Lei Li @ 2013-05-16 6:07 UTC (permalink / raw)
To: Amos Kong; +Cc: qemu-devel, lcapitulino
On 05/16/2013 01:19 PM, Amos Kong wrote:
> It's clearer to use defined macros than magic numbers.
>
> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
> ui/input.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/ui/input.c b/ui/input.c
> index 8ca1a03..92c44ca 100644
> --- a/ui/input.c
> +++ b/ui/input.c
> @@ -28,6 +28,7 @@
> #include "qapi/error.h"
> #include "qmp-commands.h"
> #include "qapi-types.h"
> +#include "ui/keymaps.h"
>
> struct QEMUPutMouseEntry {
> QEMUPutMouseEvent *qemu_put_mouse_event;
> @@ -260,10 +261,10 @@ static void free_keycodes(void)
> static void release_keys(void *opaque)
> {
> while (keycodes_size > 0) {
> - if (keycodes[--keycodes_size] & 0x80) {
> - kbd_put_keycode(0xe0);
> + if (keycodes[--keycodes_size] & SCANCODE_GREY) {
> + kbd_put_keycode(SCANCODE_EMUL0);
> }
> - kbd_put_keycode(keycodes[keycodes_size] | 0x80);
> + kbd_put_keycode(keycodes[keycodes_size] | SCANCODE_UP);
> }
>
> free_keycodes();
> @@ -297,10 +298,10 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
> return;
> }
>
> - if (keycode & 0x80) {
> - kbd_put_keycode(0xe0);
> + if (keycode & SCANCODE_GREY) {
> + kbd_put_keycode(SCANCODE_EMUL0);
> }
> - kbd_put_keycode(keycode & 0x7f);
> + kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
>
> keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));
> keycodes[keycodes_size++] = keycode;
Looks good to me.
Reviewed-by: Lei Li <lilei@linux.vnet.ibm.com>
--
Lei
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros
2013-05-16 5:19 [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros Amos Kong
2013-05-16 6:07 ` Lei Li
@ 2013-05-23 13:55 ` Luiz Capitulino
1 sibling, 0 replies; 3+ messages in thread
From: Luiz Capitulino @ 2013-05-23 13:55 UTC (permalink / raw)
To: Amos Kong; +Cc: qemu-devel
On Thu, 16 May 2013 13:19:47 +0800
Amos Kong <akong@redhat.com> wrote:
> It's clearer to use defined macros than magic numbers.
>
> Signed-off-by: Amos Kong <akong@redhat.com>
Applied to the qmp branch, thanks.
> ---
> ui/input.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/ui/input.c b/ui/input.c
> index 8ca1a03..92c44ca 100644
> --- a/ui/input.c
> +++ b/ui/input.c
> @@ -28,6 +28,7 @@
> #include "qapi/error.h"
> #include "qmp-commands.h"
> #include "qapi-types.h"
> +#include "ui/keymaps.h"
>
> struct QEMUPutMouseEntry {
> QEMUPutMouseEvent *qemu_put_mouse_event;
> @@ -260,10 +261,10 @@ static void free_keycodes(void)
> static void release_keys(void *opaque)
> {
> while (keycodes_size > 0) {
> - if (keycodes[--keycodes_size] & 0x80) {
> - kbd_put_keycode(0xe0);
> + if (keycodes[--keycodes_size] & SCANCODE_GREY) {
> + kbd_put_keycode(SCANCODE_EMUL0);
> }
> - kbd_put_keycode(keycodes[keycodes_size] | 0x80);
> + kbd_put_keycode(keycodes[keycodes_size] | SCANCODE_UP);
> }
>
> free_keycodes();
> @@ -297,10 +298,10 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,
> return;
> }
>
> - if (keycode & 0x80) {
> - kbd_put_keycode(0xe0);
> + if (keycode & SCANCODE_GREY) {
> + kbd_put_keycode(SCANCODE_EMUL0);
> }
> - kbd_put_keycode(keycode & 0x7f);
> + kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK);
>
> keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));
> keycodes[keycodes_size++] = keycode;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-23 14:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-16 5:19 [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with macros Amos Kong
2013-05-16 6:07 ` Lei Li
2013-05-23 13:55 ` Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).