forked from pool/xkeyboard-config
Stefan Dirsch
245641052a
- 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.
- Remove special handling for the microsoftnek4k
keyboard. This is handled correctly in evdev
already.
OBS-URL: https://build.opensuse.org/request/show/71186
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=70
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part
|
|
|
|
Index: symbols/pc
|
|
===================================================================
|
|
--- symbols/pc.orig
|
|
+++ symbols/pc
|
|
@@ -34,9 +34,9 @@ xkb_symbols "pc105" {
|
|
key <LWIN> { [ Super_L ] };
|
|
|
|
key <RTSH> { [ Shift_R ] };
|
|
- key <RCTL> { [ Control_R ] };
|
|
+ key <RCTL> { [ Control_R, Multi_key ] };
|
|
|
|
- key <RWIN> { [ Super_R ] };
|
|
+ key <RWIN> { [ Super_R, Multi_key ] };
|
|
|
|
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)
|