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 <ak...@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 <li...@linux.vnet.ibm.com>


--
Lei


Reply via email to