Bug 441398

I think Gnome, us+inet is IMHO The Right Thing™ and the issue how to display the
name in Gnome. Reassigning.

*and the issue is ...

I have 

[mclasen@localhost devel]$ xprop -root | grep XKB
_XKB_RULES_NAMES_BACKUP(STRING) = "xorg", "pc105", "us+inet", "", ""
_XKB_RULES_NAMES(STRING) = "xorg", "dellm65", "us,de", ",nodeadkeys",
"compose:ralt,grp:alts_toggle"

And it still shows up as "USA" in the keyboard indicator

I have:
xprop -root | grep XKB
_XKB_RULES_NAMES_BACKUP(STRING) = "xorg", "pc105", "us+inet", "", ""
_XKB_RULES_NAMES(STRING) = "xorg", "pc105", "us+inet", "", ""


So according to svu (on irc):
<svu> mccann: first of all, that patch is wrong. there is no sensible default
variant in inet. and it should not be used like that
...
<mccann> ajax says that us+inet has some "special internet keys" or something?
<svu> mccann: ajax is right BUT these keys depend on the particular model. you
never use them like "us+inet" instead you should specify correct xkb model
<svu> for example
<svu> XkbModel "cymotionlinux"
...
<mccann> so should we translate us+inet to something more understandable perhaps?
<svu> no please
<svu> this is simply incorrect use of xkb
<mccann> oh ok
<svu> technically correct but semantically totally wrong
<svu> in that case all I promise is to do my best not to crash:)
<svu> mccann: if ajax is around, may be he could come here and we could discuss
what's really required

So, the issue here is that this makes the keyboard selector show up in the lock
dialog with two choices of "us+inet" and "?" which is really broken. And the
keyboard indicator applet will show the same brokenness, should the user add it
to his panel config. Note that the problem does only occur if you don't select
your own keyboard layouts in the keyboard capplet (like I did in the example above)

I assume our options here are to

a) go back to "us" and live with broken inet keys

b) patch libgnomekbd or xklavier to treat us+inet like us (might not be trivial,
haven't investigated)

c) take the keyboard selector out of the lock dialog and live with the broken
keyboard indicator applet, since it is not in the default panel config

We fixed a lot of complaints when we went to +inet, I'd hate to revert that.

Ok, so how about this hack instead...
We switch the kbd driver back to use "us", and then we teak the xkb rules to
declare our default keyboard model (pc105) to be an inetkbd ?

I think that is what the patch below does...

Created attachment 301686 [details]
patch

Of course, option c) may still be the safer bet at this time in the cycle.

Here is the alternative hack to make libgnomekbd display "USA" instead of us+inet.
I still have to track down the "?" and how to make that go away.

Created attachment 301734 [details]
alternative hack

Created attachment 301747 [details]
another iteration of the first patch

With this patch I still have my multmedia keys working with pc105 and us.

I think this is a way beyond NEW.

* Wed Apr  9 2008 Matthias Clasen  <mclasen> - 1.2-2
- Make pc105 have inet keys, not 100% correct, but better than
  having the kbd driver report "us+inet" which confused XKB and
  higher layers (#441398)

Created attachment 302078 [details]
enable navigation keys

This simple patch enables web browser navigation keys ('Back' and 'Forward') on
all ThinkPad laptops as well as over 30 other keyboard models which have those
navigation keys.

I tested this patch on 04/10/2008 Fedora rawhide, with Firefox 3 on ThinkPad
X61 and it works pefectly. Please consider applying it before Fedora 9 release.


(Run 'grep nav_common /usr/share/X11/xkb/symbols/inet | wc -l' to find the
number of keyboard models which have navigation keys)

*** Bug 439969 has been marked as a duplicate of this bug. ***

I've added this patch and proposed the build for f9