From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LtKQB-000582-Ra
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 07:33:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LtKQ9-00057q-FD
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 07:33:50 -0400
Received: from [199.232.76.173] (port=44678 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LtKQ9-00057n-7e
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 07:33:49 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59366 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 <balrogg@gmail.com>) id 1LtKQ8-0004GU-KO
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 07:33:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <balrogg@gmail.com>) id 1LtKQ7-0007XI-Gr
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 11:33:47 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <balrog@savannah.gnu.org>) id 1LtKQ7-0007XE-8I
	for qemu-devel@nongnu.org; Mon, 13 Apr 2009 11:33:47 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1LtKQ7-0007XE-8I@cvs.savannah.gnu.org>
Date: Mon, 13 Apr 2009 11:33:47 +0000
Subject: [Qemu-devel] [7097] 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: 7097
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7097
Author:   balrog
Date:     2009-04-13 11:33:46 +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).

Modified Paths:
--------------
    trunk/sdl.c

Modified: trunk/sdl.c
===================================================================
--- trunk/sdl.c	2009-04-13 08:53:12 UTC (rev 7096)
+++ trunk/sdl.c	2009-04-13 11:33:46 UTC (rev 7097)
@@ -251,9 +251,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);