Bug 11908

Created attachment 11051 [details] [review]
Includes ABNT2 Thinkpad variant

This patch includes the "thinkpad" variant to "br" layout.
Only one key is changed.

Sorry. I am a bit confused. How happend that RCTL is used for usual characters? Do you have a picture displaying engraving on that keyboard?

Also, would it make sense to add the rule like "if the layout is Brazillian and the model is Thinkpad, use br(thinkpad) by default"?

(In reply to comment #2)
> Sorry. I am a bit confused. How happend that RCTL is used for usual 
> characters?
> Do you have a picture displaying engraving on that keyboard?

I am not with the thinkpad with me now. The engraving is "/ ?" (slash 
question degree). How happened RCTL to be used for usual caracteres?
well... i think some manager at IBM/Lenovo thinks one extra key is very
expensive. Something like:

MANAGER1: "Damn! ABNT2 keyboard needs an extra-key! What i do now?"
MANAGER2: "Hey! This keyboard have two controls! Who need both?"
MANAGER1: "Great idea! We can use that second control to be the extra key" 

> Also, would it make sense to add the rule like "if the layout is Brazillian 
> and
> the model is Thinkpad, use br(thinkpad) by default"?

Yes. this is the correct. ABNT2+thinkpad=br(thinkpad)
More questions? -;)

Ok. Kind of strange, but that's life. Committed, thanks.

Sergey, the committed patch needs the following update,

diff --git a/symbols/br b/symbols/br
index 75ec082..8e06eac 100644
--- a/symbols/br
+++ b/symbols/br
@@ -72,7 +72,7 @@ partial alphanumeric_keys
 xkb_symbols "thinkpad" {
 
     include "br(abnt2)" // for consistent naming
-    name[Group1]="Brazil";
+    name[Group1]="Brazil - Thinkpad";
 
     key <RCTL> { [     slash,   question,       degree, questiondown ] };
 };

Without the name 'Brazil - Thinkpad', the entry does not appear in the Keyboard settings, and users end up having to configure the layout with either gconf or through xorg.conf.

See also
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-input-keyboard/+bug/359719

The fix is incorrect. The name in symbols/br does not affect layout configuration tools - it is base.xml.in that is used. But I do not want to have it there, I'll tell you why. If user chooses one of thinkpad xkb models, the default layout should automatically become br(thinkpad). That's the way rules should work.

setxkbmap -model thinkpad -layout br -print -option ''
xkb_keymap {
	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
	xkb_types     { include "complete"	};
	xkb_compat    { include "complete"	};
	xkb_symbols   { include "pc+br(thinkpad)+inet(evdev)"	};
	xkb_geometry  { include "thinkpad(intl)"	};
};