From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:42204)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UfW3g-0005GA-CJ
	for qemu-devel@nongnu.org; Thu, 23 May 2013 10:00:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UfW3a-0008To-Pc
	for qemu-devel@nongnu.org; Thu, 23 May 2013 09:59:56 -0400
Received: from mx1.redhat.com ([209.132.183.28]:45739)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UfW3a-0008Ti-FK
	for qemu-devel@nongnu.org; Thu, 23 May 2013 09:59:50 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4NDxncI004958
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 23 May 2013 09:59:49 -0400
Date: Thu, 23 May 2013 09:55:52 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130523095552.3a127a7e@redhat.com>
In-Reply-To: <1368681587-10206-1-git-send-email-akong@redhat.com>
References: <1368681587-10206-1-git-send-email-akong@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] ui/input.c: replace magic numbers with
	macros
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Amos Kong <akong@redhat.com>
Cc: qemu-devel@nongnu.org

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;