From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LtMEL-0008Bu-AD
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:29:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LtMEJ-0008Aw-Nk
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:29:44 -0400
Received: from [199.232.76.173] (port=39242 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LtMEJ-0008Ap-3H
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:29:43 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53999 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 <anthony@codemonkey.ws>)
	id 1LtMEI-0005g8-SE
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 09:29:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LtMEH-0004E3-7q
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 13:29:41 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LtMEG-0004Dz-UR
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 13:29:41 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LtMEG-0004Dz-UR@cvs.savannah.gnu.org>
Date: Mon, 13 Apr 2009 13:29:41 +0000
Subject: [Qemu-devel] [7098] Recognise evdev(xx)_aliases(yy) and
 xfree86(xx)_aliases(yy) as keymap names.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 7098
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7098
Author:   aliguori
Date:     2009-04-13 13:29:40 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
Recognise evdev(xx)_aliases(yy) and xfree86(xx)_aliases(yy) as keymap names.

Newer Xorg use these with non-default kemaps (such as the ThinkPad keymap).

aliguori: this is from r7097 in trunk by balrog

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    branches/stable_0_10/sdl.c

Modified: branches/stable_0_10/sdl.c
===================================================================
--- branches/stable_0_10/sdl.c	2009-04-13 11:33:46 UTC (rev 7097)
+++ branches/stable_0_10/sdl.c	2009-04-13 13:29:40 UTC (rev 7098)
@@ -161,9 +161,9 @@
     keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes);
     if (keycodes == NULL)
         fprintf(stderr, "could not lookup keycode name\n");
-    else if (strstart(keycodes, "evdev_", NULL))
+    else if (strstart(keycodes, "evdev", NULL))
         has_evdev = 1;
-    else if (!strstart(keycodes, "xfree86_", NULL))
+    else if (!strstart(keycodes, "xfree86", NULL))
         fprintf(stderr,
                 "unknown keycodes `%s', please report to qemu-devel@nongnu.org\n",
                 keycodes);