forked from pool/xkeyboard-config
Accepting request 71244 from X11:XOrg
- remove xkeyboard-config.inet.patch:
* There is an entry for KP_Equal in inet(apple) already:
key <KPEQ> { [ KP_Equal ] };
With the macintosh keycodes <KPEQ> has the same value as
<K59> in the xfree86 keycodes file (i.e. 157).
- place all SUSE specific patches into one file:
* add Multi_key for compose.
* add ctrl-alt-backspace server termination key sequence.
- remove xkeyboard-config.macintosh.patch:
This can be handled by adding:
altwin:swap_lalt_lwin,lv3:alt_switch
as option for instance to the keyboard mappings for macintosh.
The xorg-x11 package will be updated accordingly.
- Remove xkeyboard-config.inet.microsoftpro.patch:
This patch is bogus and not needed for evedev keyboards any
more.
For old style keyboard +inet(microsoftprousb) specified the
augmentation used for a specific keyboard model. This this
keyboard model should be set instead ie:
setxkbmap -rules base -model microsfortprousb -layout <lo> -option ""
produces the same results as:
setxkbmap -rules base -model pc104 -layout <lo> -option inet:microsoftpro
(disregarding the geometry part which is rather irrelevant here).
- IBM Space Saver keyboard support was added upstream with
commit b69a8bd.
OBS-URL: https://build.opensuse.org/request/show/71244
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=47
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
47054ae62b
@ -1,56 +0,0 @@
|
|||||||
Index: rules/base.lists.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.lists.part.orig
|
|
||||||
+++ rules/base.lists.part
|
|
||||||
@@ -73,6 +73,8 @@
|
|
||||||
toshiba_s3000 trust trustda \
|
|
||||||
unitekkb1925 yahoo
|
|
||||||
|
|
||||||
+! $specialkbds = ibm_space_saver
|
|
||||||
+
|
|
||||||
// all layouts with 3rd and 4th groups
|
|
||||||
! $threelevellayouts = al az \
|
|
||||||
be br bt \
|
|
||||||
Index: rules/base.m_s.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.m_s.part.orig
|
|
||||||
+++ rules/base.m_s.part
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
a4techKB21 = +inet(media_nav_common)
|
|
||||||
+ $specialkbds = +group(%m)
|
|
||||||
a4techKBS8 = +inet(media_nav_acpi_common)
|
|
||||||
a4_rfkb23 = +inet(media_nav_acpi_common)
|
|
||||||
asus_laptop = +inet(media_common)
|
|
||||||
Index: rules/base.xml.in
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.xml.in.orig
|
|
||||||
+++ rules/base.xml.in
|
|
||||||
@@ -1051,6 +1051,12 @@
|
|
||||||
</model>
|
|
||||||
<model>
|
|
||||||
<configItem>
|
|
||||||
+ <name>ibm_space_saver</name>
|
|
||||||
+ <_description>IBM Space Saver</_description>
|
|
||||||
+ </configItem>
|
|
||||||
+ </model>
|
|
||||||
+ <model>
|
|
||||||
+ <configItem>
|
|
||||||
<name>macintosh</name>
|
|
||||||
<_description>Macintosh</_description>
|
|
||||||
<vendor>Apple</vendor>
|
|
||||||
Index: symbols/group
|
|
||||||
===================================================================
|
|
||||||
--- symbols/group.orig
|
|
||||||
+++ symbols/group
|
|
||||||
@@ -352,6 +352,11 @@ xkb_symbols "rctrl_toggle" {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+// Override broken Numlock key on some IBM keyboards
|
|
||||||
+partial
|
|
||||||
+xkb_symbols "ibm_space_saver" {
|
|
||||||
+ key <NMLK> { [ Num_Lock, Num_Lock ] };
|
|
||||||
+};
|
|
||||||
// using the group(alt_caps_toggle) map, pressing:
|
|
||||||
// Alt+Caps Lock toggles group
|
|
||||||
// Caps Lock toggles caps lock
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
Index: keycodes/nek4k
|
|
||||||
===================================================================
|
|
||||||
--- keycodes/nek4k.orig
|
|
||||||
+++ keycodes/nek4k
|
|
||||||
@@ -2,10 +2,10 @@ default xkb_keycodes "nek4k" {
|
|
||||||
|
|
||||||
<WEB> = 180;
|
|
||||||
<FIND> = 225;
|
|
||||||
- <MAIL> = 223;
|
|
||||||
+ <MAIL> = 163;
|
|
||||||
|
|
||||||
- <ZMUP> = 191;
|
|
||||||
- <ZMDN> = 192;
|
|
||||||
+ //<ZMUP> = 191;
|
|
||||||
+ //<ZMDN> = 192;
|
|
||||||
|
|
||||||
<PREV> = 166;
|
|
||||||
<SUCC> = 167;
|
|
||||||
@@ -21,13 +21,13 @@ default xkb_keycodes "nek4k" {
|
|
||||||
|
|
||||||
<CALC> = 148;
|
|
||||||
|
|
||||||
-alias <BKMK> = <DOWN>;
|
|
||||||
+//alias <BKMK> = <DOWN>;
|
|
||||||
|
|
||||||
- <ONE> = 218;
|
|
||||||
- <TWO> = 219;
|
|
||||||
- <THRE> = 220;
|
|
||||||
- <FOUR> = 221;
|
|
||||||
- <FIVE> = 222;
|
|
||||||
+ <ONE> = 192;
|
|
||||||
+ <TWO> = 193;
|
|
||||||
+ <THRE> = 194;
|
|
||||||
+ <FOUR> = 195;
|
|
||||||
+ <FIVE> = 196;
|
|
||||||
|
|
||||||
<HELP> = 146;
|
|
||||||
<UNDO> = 139;
|
|
||||||
@@ -39,7 +39,7 @@ alias <BKMK> = <DOWN>;
|
|
||||||
<REPL> = 240;
|
|
||||||
<FWD> = 241;
|
|
||||||
<SEND> = 239;
|
|
||||||
- <SPLL> = 193;
|
|
||||||
+ //<SPLL> = 193;
|
|
||||||
<SAVE> = 242;
|
|
||||||
-alias <PRNT> = <ONE>;
|
|
||||||
+//alias <PRNT> = <ONE>;
|
|
||||||
};
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
Index: symbols/inet
|
|
||||||
===================================================================
|
|
||||||
--- symbols/inet.orig
|
|
||||||
+++ symbols/inet
|
|
||||||
@@ -1410,37 +1410,39 @@ xkb_symbols "microsoftmult" {
|
|
||||||
// Microsoft Natural Ergonomic Keyboard 4000
|
|
||||||
partial alphanumeric_keys
|
|
||||||
xkb_symbols "microsoftnek4k" {
|
|
||||||
- key <WEB> { [ XF86WWW ] };
|
|
||||||
- key <FIND> { [ XF86Documents ] };
|
|
||||||
- key <MAIL> { [ XF86Documents ] };
|
|
||||||
- key <ZMUP> { [ XF86Documents ] };
|
|
||||||
- key <ZMDN> { [ XF86Documents ] };
|
|
||||||
- key <PREV> { [ XF86Documents ] };
|
|
||||||
- key <SUCC> { [ XF86Documents ] };
|
|
||||||
- key <EQUL> { [ XF86Documents ] };
|
|
||||||
- key <PARO> { [ XF86Documents ] };
|
|
||||||
- key <PARC> { [ XF86Documents ] };
|
|
||||||
- key <MUTE> { [ XF86Documents ] };
|
|
||||||
- key <VOLU> { [ XF86Documents ] };
|
|
||||||
- key <VOLD> { [ XF86Documents ] };
|
|
||||||
- key <PLAY> { [ XF86Documents ] };
|
|
||||||
- key <CALC> { [ XF86Documents ] };
|
|
||||||
- key <ONE> { [ XF86Documents ] };
|
|
||||||
- key <TWO> { [ XF86Documents ] };
|
|
||||||
- key <THRE> { [ XF86Documents ] };
|
|
||||||
- key <FOUR> { [ XF86Documents ] };
|
|
||||||
- key <FIVE> { [ XF86Documents ] };
|
|
||||||
- key <HELP> { [ XF86Documents ] };
|
|
||||||
- key <UNDO> { [ XF86Documents ] };
|
|
||||||
- key <REDO> { [ XF86Documents ] };
|
|
||||||
- key <NEW> { [ XF86Documents ] };
|
|
||||||
- key <OPEN> { [ XF86Documents ] };
|
|
||||||
- key <CLOS> { [ XF86Documents ] };
|
|
||||||
- key <REPL> { [ XF86Documents ] };
|
|
||||||
- key <FWD> { [ XF86Documents ] };
|
|
||||||
- key <SEND> { [ XF86Documents ] };
|
|
||||||
- key <SPLL> { [ XF86Documents ] };
|
|
||||||
- key <SAVE> { [ XF86Documents ] };
|
|
||||||
+ key <WEB> { [ XF86WWW ] };
|
|
||||||
+ key <FIND> { [ Find ] };
|
|
||||||
+ key <MAIL> { [ XF86Mail ] };
|
|
||||||
+ key <ZMUP> { [ XF86ZoomIn ] };
|
|
||||||
+ key <ZMDN> { [ XF86ZoomOut ] };
|
|
||||||
+ key <PREV> { [ XF86AudioPrev ] };
|
|
||||||
+ key <SUCC> { [ XF86AudioNext ] };
|
|
||||||
+ key <EQUL> { [ equal ] };
|
|
||||||
+ key <PARO> { [ parenleft ] };
|
|
||||||
+ key <PARC> { [ parenright ] };
|
|
||||||
+ key <MUTE> { [ XF86AudioMute ] };
|
|
||||||
+ key <VOLU> { [ XF86AudioRaiseVolume ]};
|
|
||||||
+ key <VOLD> { [ XF86AudioLowerVolume ]};
|
|
||||||
+ key <PLAY> { [ XF86AudioPlay ] };
|
|
||||||
+ key <CALC> { [ XF86Calculator] };
|
|
||||||
+ key <ONE> { [ XF86Launch1 ] };
|
|
||||||
+ key <TWO> { [ XF86Launch2 ] };
|
|
||||||
+ key <THRE> { [ XF86Launch3 ] };
|
|
||||||
+ key <FOUR> { [ XF86Launch4 ] };
|
|
||||||
+ key <FIVE> { [ XF86Launch5 ] };
|
|
||||||
+ key <HELP> { [ Help ] };
|
|
||||||
+ key <UNDO> { [ Undo ] };
|
|
||||||
+ key <REDO> { [ Redo ] };
|
|
||||||
+ key <NEW> { [ XF86New ] };
|
|
||||||
+ key <OPEN> { [ XF86Open ] };
|
|
||||||
+ key <CLOS> { [ XF86Close ] };
|
|
||||||
+ key <REPL> { [ XF86Reply ] };
|
|
||||||
+ key <FWD> { [ XF86MailForward ] };
|
|
||||||
+ key <SEND> { [ XF86Send ] };
|
|
||||||
+ key <SPLL> { [ XF86Spell ] };
|
|
||||||
+ key <SAVE> { [ XF86Save ] };
|
|
||||||
+ key <I164> { [ XF86Favorites ] };
|
|
||||||
+ key <I218> { [ Print ] };
|
|
||||||
};
|
|
||||||
|
|
||||||
// Oretec
|
|
||||||
@ -1,222 +0,0 @@
|
|||||||
Index: geometry/microsoft
|
|
||||||
===================================================================
|
|
||||||
--- geometry/microsoft.orig
|
|
||||||
+++ geometry/microsoft
|
|
||||||
@@ -530,3 +530,43 @@ xkb_geometry "elite" {
|
|
||||||
alias <AC00> = <CAPS>;
|
|
||||||
alias <AA00> = <LCTL>;
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+xkb_geometry "nek4k" {
|
|
||||||
+
|
|
||||||
+ // Approximate layout for a Microsoft Natural Keyboard
|
|
||||||
+ description= "Microsoft Natural Ergonomic Keyboard 4000";
|
|
||||||
+ width= 500;
|
|
||||||
+ height= 260;
|
|
||||||
+
|
|
||||||
+ shape.cornerRadius= 1;
|
|
||||||
+ shape "ZOOM" { { [ 16,15] } };
|
|
||||||
+ shape "MUL1" { { [ 22,10] } };
|
|
||||||
+ shape "MUL2" { { [ 20,10] } };
|
|
||||||
+ shape "MUL3" { { [ 26,10] } };
|
|
||||||
+ shape "DIR" { { [ 17,15] } };
|
|
||||||
+ shape "LDEF" { { [ 18,18] }, { [2,1], [15,16] } };
|
|
||||||
+ shape "FUNC" { { [ 18,15] }, { [3,1], [15,10] } };
|
|
||||||
+ shape "TABK" { { [ 36,18] }, { [3,1], [34,16] } };
|
|
||||||
+ shape "CAPS" { { [ 37,18] }, { [3,1], [33,16] } };
|
|
||||||
+ shape "LFSH" { { [ 23,18] }, { [3,1], [21,16] } };
|
|
||||||
+ shape "KEY~" { { [ 28,18] }, { [3,1], [25,15] } };
|
|
||||||
+ shape "KEY6" { { [ 20,18] }, { [2,1], [16,16] } };
|
|
||||||
+ shape "KEYB" { { [ 19,18] }, { [2,1], [15,16] } };
|
|
||||||
+ shape "KEYT" { { [ 30,18] }, { [2,1], [26,16] } };
|
|
||||||
+ shape "KEYG" { { [ 26,18] }, { [2,1], [22,16] } };
|
|
||||||
+ shape "LCTL" {
|
|
||||||
+ approx= { [ 33, 21 ] },
|
|
||||||
+ { [ 0, 0], [ 33, 0 ], [ 33, 25 ], [ 0, 18 ] },
|
|
||||||
+ { [ 2, 1], [ 30, 1 ], [ 30, 20 ], [ 2, 15 ] }
|
|
||||||
+ };
|
|
||||||
+ shape "LWIN" {
|
|
||||||
+ approx= { [ 26, 26 ] },
|
|
||||||
+ { [ 0, 0], [ 26, 0 ], [ 26, 28 ], [ 0, 25 ] },
|
|
||||||
+ { [ 2, 1], [ 23, 1 ], [ 23, 23 ], [ 2, 21 ] }
|
|
||||||
+ };
|
|
||||||
+ shape "LALT" {
|
|
||||||
+ approx= { [ 27, 29 ] },
|
|
||||||
+ { [ 0, 0], [ 27, 0 ], [ 27, 30 ], [ 0, 28 ] },
|
|
||||||
+ { [ 2, 1], [ 24, 1 ], [ 24, 26 ], [ 2, 24 ] }
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
Index: keycodes/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- keycodes/Makefile.am.orig
|
|
||||||
+++ keycodes/Makefile.am
|
|
||||||
@@ -12,6 +12,7 @@ fujitsu \
|
|
||||||
hp \
|
|
||||||
ibm \
|
|
||||||
macintosh \
|
|
||||||
+nek4k \
|
|
||||||
sony \
|
|
||||||
sun \
|
|
||||||
xfree86 \
|
|
||||||
Index: keycodes/nek4k
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ keycodes/nek4k
|
|
||||||
@@ -0,0 +1,45 @@
|
|
||||||
+default xkb_keycodes "nek4k" {
|
|
||||||
+
|
|
||||||
+ <WEB> = 180;
|
|
||||||
+ <FIND> = 225;
|
|
||||||
+ <MAIL> = 223;
|
|
||||||
+
|
|
||||||
+ <ZMUP> = 191;
|
|
||||||
+ <ZMDN> = 192;
|
|
||||||
+
|
|
||||||
+ <PREV> = 166;
|
|
||||||
+ <SUCC> = 167;
|
|
||||||
+
|
|
||||||
+ <EQUL> = 125;
|
|
||||||
+ <PARO> = 187;
|
|
||||||
+ <PARC> = 188;
|
|
||||||
+
|
|
||||||
+ <MUTE> = 121;
|
|
||||||
+ <VOLD> = 122;
|
|
||||||
+ <VOLU> = 123;
|
|
||||||
+ <PLAY> = 172;
|
|
||||||
+
|
|
||||||
+ <CALC> = 148;
|
|
||||||
+
|
|
||||||
+alias <BKMK> = <DOWN>;
|
|
||||||
+
|
|
||||||
+ <ONE> = 218;
|
|
||||||
+ <TWO> = 219;
|
|
||||||
+ <THRE> = 220;
|
|
||||||
+ <FOUR> = 221;
|
|
||||||
+ <FIVE> = 222;
|
|
||||||
+
|
|
||||||
+ <HELP> = 146;
|
|
||||||
+ <UNDO> = 139;
|
|
||||||
+ <REDO> = 190;
|
|
||||||
+ <NEW> = 189;
|
|
||||||
+ <OPEN> = 142;
|
|
||||||
+
|
|
||||||
+ <CLOS> = 214;
|
|
||||||
+ <REPL> = 240;
|
|
||||||
+ <FWD> = 241;
|
|
||||||
+ <SEND> = 239;
|
|
||||||
+ <SPLL> = 193;
|
|
||||||
+ <SAVE> = 242;
|
|
||||||
+alias <PRNT> = <ONE>;
|
|
||||||
+};
|
|
||||||
Index: rules/base.xml.in
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.xml.in.orig
|
|
||||||
+++ rules/base.xml.in
|
|
||||||
@@ -876,6 +876,13 @@
|
|
||||||
</model>
|
|
||||||
<model>
|
|
||||||
<configItem>
|
|
||||||
+ <name>microsoftnek4k</name>
|
|
||||||
+ <_description>Microsoft Natural Ergonomic Keyboard 4000</_description>
|
|
||||||
+ <vendor>Microsoft Inc.</vendor>
|
|
||||||
+ </configItem>
|
|
||||||
+ </model>
|
|
||||||
+ <model>
|
|
||||||
+ <configItem>
|
|
||||||
<name>oretec</name>
|
|
||||||
<_description>Ortek MCK-800 MM/Internet keyboard</_description>
|
|
||||||
<vendor>Ortek</vendor>
|
|
||||||
Index: symbols/inet
|
|
||||||
===================================================================
|
|
||||||
--- symbols/inet.orig
|
|
||||||
+++ symbols/inet
|
|
||||||
@@ -1423,6 +1423,42 @@ xkb_symbols "microsoftmult" {
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
+// Microsoft Natural Ergonomic Keyboard 4000
|
|
||||||
+partial alphanumeric_keys
|
|
||||||
+xkb_symbols "microsoftnek4k" {
|
|
||||||
+ key <WEB> { [ XF86WWW ] };
|
|
||||||
+ key <FIND> { [ XF86Documents ] };
|
|
||||||
+ key <MAIL> { [ XF86Documents ] };
|
|
||||||
+ key <ZMUP> { [ XF86Documents ] };
|
|
||||||
+ key <ZMDN> { [ XF86Documents ] };
|
|
||||||
+ key <PREV> { [ XF86Documents ] };
|
|
||||||
+ key <SUCC> { [ XF86Documents ] };
|
|
||||||
+ key <EQUL> { [ XF86Documents ] };
|
|
||||||
+ key <PARO> { [ XF86Documents ] };
|
|
||||||
+ key <PARC> { [ XF86Documents ] };
|
|
||||||
+ key <MUTE> { [ XF86Documents ] };
|
|
||||||
+ key <VOLU> { [ XF86Documents ] };
|
|
||||||
+ key <VOLD> { [ XF86Documents ] };
|
|
||||||
+ key <PLAY> { [ XF86Documents ] };
|
|
||||||
+ key <CALC> { [ XF86Documents ] };
|
|
||||||
+ key <ONE> { [ XF86Documents ] };
|
|
||||||
+ key <TWO> { [ XF86Documents ] };
|
|
||||||
+ key <THRE> { [ XF86Documents ] };
|
|
||||||
+ key <FOUR> { [ XF86Documents ] };
|
|
||||||
+ key <FIVE> { [ XF86Documents ] };
|
|
||||||
+ key <HELP> { [ XF86Documents ] };
|
|
||||||
+ key <UNDO> { [ XF86Documents ] };
|
|
||||||
+ key <REDO> { [ XF86Documents ] };
|
|
||||||
+ key <NEW> { [ XF86Documents ] };
|
|
||||||
+ key <OPEN> { [ XF86Documents ] };
|
|
||||||
+ key <CLOS> { [ XF86Documents ] };
|
|
||||||
+ key <REPL> { [ XF86Documents ] };
|
|
||||||
+ key <FWD> { [ XF86Documents ] };
|
|
||||||
+ key <SEND> { [ XF86Documents ] };
|
|
||||||
+ key <SPLL> { [ XF86Documents ] };
|
|
||||||
+ key <SAVE> { [ XF86Documents ] };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
// Oretec
|
|
||||||
|
|
||||||
// Oretec MCK-800 MM/Internet keyboard
|
|
||||||
Index: keycodes/Makefile.in
|
|
||||||
===================================================================
|
|
||||||
--- keycodes/Makefile.in.orig
|
|
||||||
+++ keycodes/Makefile.in
|
|
||||||
@@ -243,6 +243,7 @@ fujitsu \
|
|
||||||
hp \
|
|
||||||
ibm \
|
|
||||||
macintosh \
|
|
||||||
+nek4k \
|
|
||||||
sony \
|
|
||||||
sun \
|
|
||||||
xfree86 \
|
|
||||||
Index: rules/base.lists.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.lists.part.orig
|
|
||||||
+++ rules/base.lists.part
|
|
||||||
@@ -60,6 +60,7 @@
|
|
||||||
logidinovo logidinovoedge \
|
|
||||||
microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
|
|
||||||
microsoftoffice microsoftmult \
|
|
||||||
+ microsoftnek4k \
|
|
||||||
mx1998 mx2500 mx2750 \
|
|
||||||
oretec \
|
|
||||||
pc105 \
|
|
||||||
Index: rules/base.m_g.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.m_g.part.orig
|
|
||||||
+++ rules/base.m_g.part
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
microsoftelite = microsoft(elite)
|
|
||||||
$msmodels = microsoft(natural)
|
|
||||||
+ microsoftnek4k = microsoft(nek4k)
|
|
||||||
dell101 = dell(dell101)
|
|
||||||
dellm65 = dell(dellm65)
|
|
||||||
latitude = dell(latitude)
|
|
||||||
Index: rules/base.m_k.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.m_k.part.orig
|
|
||||||
+++ rules/base.m_k.part
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
sun6 = sun(type6_usb)
|
|
||||||
sun6euro = sun(type6tuv_usb)
|
|
||||||
pc98 = xfree98(pc98)
|
|
||||||
+ microsoftnek4k = evdev+nek4k(nek4k)
|
|
||||||
$applealu = macintosh(alukbd)
|
|
||||||
macintosh_hhk = macintosh(hhk)
|
|
||||||
macintosh_old = macintosh(old)
|
|
||||||
15
p_suse.diff
15
p_suse.diff
@ -1,3 +1,5 @@
|
|||||||
|
- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part
|
||||||
|
|
||||||
Index: symbols/pc
|
Index: symbols/pc
|
||||||
===================================================================
|
===================================================================
|
||||||
--- symbols/pc.orig
|
--- symbols/pc.orig
|
||||||
@ -14,3 +16,16 @@ Index: symbols/pc
|
|||||||
|
|
||||||
key <MENU> { [ Menu ] };
|
key <MENU> { [ Menu ] };
|
||||||
|
|
||||||
|
- Add Support ctrl-alt-backspace Server Termination.
|
||||||
|
|
||||||
|
Index: xkeyboard-config-2.1/rules/evdev.m_s.part
|
||||||
|
===================================================================
|
||||||
|
--- rules/evdev.m_s.part
|
||||||
|
+++ rules/evdev.m_s.part
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
- $evdevkbds = +inet(evdev)+inet(%m)
|
||||||
|
- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
|
||||||
|
- * = +inet(evdev)
|
||||||
|
+ $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp)
|
||||||
|
+ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp)
|
||||||
|
+ * = +inet(evdev)+terminate(ctrl_alt_bksp)
|
||||||
|
|||||||
@ -1,3 +1,55 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 21:51:17 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- remove xkeyboard-config.inet.patch:
|
||||||
|
* There is an entry for KP_Equal in inet(apple) already:
|
||||||
|
key <KPEQ> { [ KP_Equal ] };
|
||||||
|
With the macintosh keycodes <KPEQ> has the same value as
|
||||||
|
<K59> in the xfree86 keycodes file (i.e. 157).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 21:05:24 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- place all SUSE specific patches into one file:
|
||||||
|
* add Multi_key for compose.
|
||||||
|
* add ctrl-alt-backspace server termination key sequence.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 18:52:44 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- remove xkeyboard-config.macintosh.patch:
|
||||||
|
This can be handled by adding:
|
||||||
|
altwin:swap_lalt_lwin,lv3:alt_switch
|
||||||
|
as option for instance to the keyboard mappings for macintosh.
|
||||||
|
The xorg-x11 package will be updated accordingly.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 18:33:23 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- Remove xkeyboard-config.inet.microsoftpro.patch:
|
||||||
|
This patch is bogus and not needed for evedev keyboards any
|
||||||
|
more.
|
||||||
|
For old style keyboard +inet(microsoftprousb) specified the
|
||||||
|
augmentation used for a specific keyboard model. This this
|
||||||
|
keyboard model should be set instead ie:
|
||||||
|
setxkbmap -rules base -model microsfortprousb -layout <lo> -option ""
|
||||||
|
produces the same results as:
|
||||||
|
setxkbmap -rules base -model pc104 -layout <lo> -option inet:microsoftpro
|
||||||
|
(disregarding the geometry part which is rather irrelevant here).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 17:31:03 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- IBM Space Saver keyboard support was added upstream with
|
||||||
|
commit b69a8bd.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 23 15:32:30 UTC 2011 - eich@suse.de
|
||||||
|
|
||||||
|
- Remove special handling for the microsoftnek4k
|
||||||
|
keyboard. This is handled correctly in evdev
|
||||||
|
already.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 7 08:35:16 UTC 2011 - fcrozat@novell.com
|
Thu Apr 7 08:35:16 UTC 2011 - fcrozat@novell.com
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
Index: xkeyboard-config-2.1/rules/evdev.m_s.part
|
|
||||||
===================================================================
|
|
||||||
--- xkeyboard-config-2.1.orig/rules/evdev.m_s.part
|
|
||||||
+++ xkeyboard-config-2.1/rules/evdev.m_s.part
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
- $evdevkbds = +inet(evdev)+inet(%m)
|
|
||||||
- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
|
|
||||||
- * = +inet(evdev)
|
|
||||||
+ $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp)
|
|
||||||
+ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp)
|
|
||||||
+ * = +inet(evdev)+terminate(ctrl_alt_bksp)
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
Index: rules/base.o_s.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.o_s.part.orig
|
|
||||||
+++ rules/base.o_s.part
|
|
||||||
@@ -112,6 +112,9 @@
|
|
||||||
esperanto:qwerty = +epo(qwerty)
|
|
||||||
esperanto:dvorak = +epo(dvorak)
|
|
||||||
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
|
|
||||||
+ inet:microsoftpro = +inet(microsoftprousb)
|
|
||||||
+ inet:media_common = +inet(media_common)
|
|
||||||
+ inet:nav_common = +inet(nav_common)
|
|
||||||
keypad:pointerkeys = +keypad(pointerkeys)
|
|
||||||
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
|
|
||||||
shift:both_capslock = +shift(both_capslock)
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
Index: symbols/inet
|
|
||||||
===================================================================
|
|
||||||
--- symbols/inet.orig
|
|
||||||
+++ symbols/inet
|
|
||||||
@@ -1708,6 +1708,7 @@ xkb_symbols "apple" {
|
|
||||||
key <I58> { [ XF86Launch1 ] };
|
|
||||||
key <I59> { [ XF86Launch2 ] };
|
|
||||||
key <I5E> { [ XF86PowerOff ] };
|
|
||||||
+ key <K59> { [ KP_Equal ] };
|
|
||||||
key <K5D> { [ F13 ] };
|
|
||||||
key <K5E> { [ F14 ] };
|
|
||||||
key <K5F> { [ F15 ] };
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
https://bugs.freedesktop.org/show_bug.cgi?id=8660
|
|
||||||
handle the left contrl/option/apple keys properly.
|
|
||||||
apple+tab switches window
|
|
||||||
alt+e gives euro, alt+l gives @, etc
|
|
||||||
|
|
||||||
================================================================================
|
|
||||||
Index: rules/base.ml_s.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.ml_s.part.orig
|
|
||||||
+++ rules/base.ml_s.part
|
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
$applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v)
|
|
||||||
$applealu * = macintosh_vndr/apple(alukbd)+%l%(v)
|
|
||||||
$macs en_US = pc+macintosh_vndr/us(extended)
|
|
||||||
- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
|
|
||||||
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
|
|
||||||
nokiarx44 * = nokia_vndr/rx-44(%l)
|
|
||||||
nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
|
|
||||||
nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v)
|
|
||||||
Index: rules/base.ml1_s.part
|
|
||||||
===================================================================
|
|
||||||
--- rules/base.ml1_s.part.orig
|
|
||||||
+++ rules/base.ml1_s.part
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)
|
|
||||||
$applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1])
|
|
||||||
$applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1])
|
|
||||||
- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
|
|
||||||
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch)
|
|
||||||
nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
|
|
||||||
nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1])
|
|
||||||
$thinkpads br = pc+%l[1](thinkpad)
|
|
||||||
@ -31,17 +31,9 @@ Version: 2.2.1
|
|||||||
Release: 1
|
Release: 1
|
||||||
Summary: The X Keyboard Extension
|
Summary: The X Keyboard Extension
|
||||||
Source: %name-%version.tar.bz2
|
Source: %name-%version.tar.bz2
|
||||||
Patch40: xkeyboard-config.macintosh.patch
|
|
||||||
Patch100: p_suse.diff
|
Patch100: p_suse.diff
|
||||||
Patch101: ibm_space_saver.diff
|
|
||||||
Patch104: xkeyboard-config.inet.patch
|
|
||||||
Patch106: microsoftnek4k.diff
|
|
||||||
Patch107: microsoftnek4k-symbols.diff
|
|
||||||
Patch108: microsoftnek4k-keycodes.diff
|
|
||||||
Patch109: disable-2xalt_2xctrl-toggle.diff
|
Patch109: disable-2xalt_2xctrl-toggle.diff
|
||||||
Patch110: MDSW-change-keycode.diff
|
Patch110: MDSW-change-keycode.diff
|
||||||
Patch115: xkeyboard-config.inet.microsoftpro.patch
|
|
||||||
Patch118: xkeyboard-config.ctrl_alt_bksp.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -63,17 +55,9 @@ Authors:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
%patch40
|
|
||||||
%patch100
|
%patch100
|
||||||
%patch101
|
|
||||||
%patch104
|
|
||||||
%patch106
|
|
||||||
%patch107
|
|
||||||
%patch108
|
|
||||||
%patch109 -p1
|
%patch109 -p1
|
||||||
%patch110
|
%patch110
|
||||||
%patch115 -p0
|
|
||||||
%patch118 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-xkb-rules-symlink=xfree86,xorg \
|
%configure --with-xkb-rules-symlink=xfree86,xorg \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user