[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#363525: xserver-xorg-input-kbd: macintosh XkbModel is broken



forwarded 363525 https://bugs.freedesktop.org/show_bug.cgi?id=6670
tags 363525 upstream
thanks

On Wed, Apr 19, 2006 at 05:04:58PM +0100, Roger Leigh wrote:
> Package: xserver-xorg-input-kbd
> Version: 1:1.0.1.3-2
> Severity: important
> 
> Section "InputDevice"
> 	Identifier	"Generic Keyboard"
>         Driver		"kbd"
>         Option		"CoreKeyboard"
>         Option		"XkbRules"	"xorg"
>         Option		"XkbModel"	"pc105"
>         Option		"XkbLayout"	"gb"
> EndSection
> 
> This works just fine (albeit with some key positions being wrong for an
> Apple Macintosh USB keyboard), but setting
> 
> 	Option		"XkbModel"	"macintosh"
> 
> results in a non-functional setup.  The alphabet keys do not work, and
> some of the symbol keys do not work.  However, all the numeric, and most
> of the symbol keys do work.  This did not happen with the older version
> of Xorg.

You are right, your bug report has been forwarded upstream.
Can you please tell whether the attached patch fixes it?

Denis
--- /usr/share/X11/xkb/rules/xorg.orig	2006-04-19 23:45:27.000000000 +0200
+++ /usr/share/X11/xkb/rules/xorg	2006-04-19 23:47:04.000000000 +0200
@@ -349,7 +349,7 @@
   old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
  $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
- $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
+ $mac		$macvendorlayouts	=	pc(pc105)+macintosh/us(extended)+macintosh_vndr/%l%(v)
  $pcmodels      intl   			=       us(%mcompose)
   *		intl			=	us(pc104compose)
   *		jp			=	pc(pc102)+jp(latin)+jp:2

Reply to: