xkbdesc/symbols keypad,1.2,1.3 pc,1.4,1.5 us,1.17,1.18
Sergey V. Oudaltsov
xlibs-commit at pdx.freedesktop.org
Sun Sep 17 13:03:36 PDT 2006
- Previous message: xkbdesc ChangeLog,1.195,1.196
- Next message: xkbdesc/symbols/macintosh_vndr apple, 1.1, 1.2 ch, 1.5, 1.6 de, 1.3,
1.4 dk, 1.2, 1.3 es, 1.2, 1.3 fi, 1.3, 1.4 fr, 1.3, 1.4 gb,
1.1, 1.2 is, 1.3, 1.4 it, 1.2, 1.3 nl, 1.2, 1.3 no, 1.2,
1.3 pt, 1.2, 1.3 se, 1.3, 1.4 us, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: svu
Update of /cvs/xlibs/xkbdesc/symbols
In directory kemper:/tmp/cvs-serv18470/symbols
Modified Files:
keypad pc us
Log Message:
b.fd.o#8280,b.fd.o#8312
Index: keypad
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/keypad,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- keypad 14 Sep 2004 19:14:36 -0000 1.2
+++ keypad 17 Sep 2006 20:03:34 -0000 1.3
@@ -82,8 +82,58 @@
// End "Keypad" section
};
+partial hidden default keypad_keys
+xkb_symbols "x11" {
+// Ungrab cancels server/keyboard/pointer grabs
+ key <KPDV> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ KP_Divide, XF86_Ungrab ]
+ };
+
+// ClsGrb kills whichever client has a grab in effect
+ key <KPMU> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ]
+ };
+
+// -VMode switches to the previous video mode
+ key <KPSU> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ]
+ };
+
+ key <KP7> { [ KP_Home, KP_7 ] };
+ key <KP8> { [ KP_Up, KP_8 ] };
+ key <KP9> { [ KP_Prior, KP_9 ] };
+
+// +VMode switches to the next video mode
+ key <KPAD> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ KP_Add, XF86_Next_VMode ]
+ };
+
+ key <KP4> { [ KP_Left, KP_4 ] };
+ key <KP5> { [ KP_Begin, KP_5 ] };
+ key <KP6> { [ KP_Right, KP_6 ] };
+
+ key <KP1> { [ KP_End, KP_1 ] };
+ key <KP2> { [ KP_Down, KP_2 ] };
+ key <KP3> { [ KP_Next, KP_3 ] };
+ key <KPEN> { [ KP_Enter ] };
+ key <KPEQ> { [ KP_Equal ] };
+
+ key <KP0> { [ KP_Insert, KP_0 ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+};
+
// Some national standards use comma on the keypad instead of decimal dot
partial keypad_keys
xkb_symbols "comma" {
key <KPDL> { [ KP_Delete, KP_Separator ] };
};
+
+// Default is decimal dot
+partial keypad_keys
+xkb_symbols "dot" {
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+};
Index: pc
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/pc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pc 11 Aug 2005 05:46:54 -0000 1.4
+++ pc 17 Sep 2006 20:03:34 -0000 1.5
@@ -8,45 +8,86 @@
key <ESC> { [ Escape ] };
- // Alphanumeric section
- key <TLDE> { [ grave, asciitilde ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, at ] };
- key <AE03> { [ 3, numbersign ] };
- key <AE04> { [ 4, dollar ] };
- key <AE05> { [ 5, percent ] };
- key <AE06> { [ 6, asciicircum ] };
- key <AE07> { [ 7, ampersand ] };
- key <AE08> { [ 8, asterisk ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
+ // the extra key on most European keyboards
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
+
+ // these keys are common to all layouts
+ key <BKSL> { [ backslash, bar ] };
+ key <SPCE> { [ space ] };
+
+ include "pc(function)"
+ include "pc(editing)"
+ include "keypad(x11)"
key <BKSP> {
type="CTRL+ALT",
symbols[Group1]= [ BackSpace, Terminate_Server ]
};
- key <TAB> { [ Tab, ISO_Left_Tab ] };
- key <RTRN> { [ Return ] };
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <RTRN> { [ Return ] };
- key <CAPS> { [ Caps_Lock ] };
+ key <CAPS> { [ Caps_Lock ] };
- key <LFSH> { [ Shift_L ] };
- key <BKSL> { [ backslash, bar ] };
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
- key <LCTL> { [ Control_L ] };
- key <SPCE> { [ space ] };
+ key <LFSH> { [ Shift_L ] };
+ key <LCTL> { [ Control_L ] };
+ key <LALT> { [ Alt_L, Meta_L ] };
+ key <LWIN> { [ Super_L ] };
- key <RTSH> { [ Shift_R ] };
- key <LALT> { [ Alt_L ] };
- key <RCTL> { [ Control_R ] };
- key <RALT> { [ Alt_R ] };
+ key <RTSH> { [ Shift_R ] };
+ key <RCTL> { [ Control_R ] };
+ key <RALT> { [ Alt_R, Meta_R ] };
+ key <RWIN> { [ Super_R ] };
- // End alphanumeric section
+ key <MENU> { [ Menu ] };
- // Begin "Function" section
+ // begin modifier mappings
+ modifier_map Shift { Shift_L, Shift_R };
+ modifier_map Lock { Caps_Lock, ISO_Lock };
+ modifier_map Control{ Control_L, Control_R };
+ modifier_map Mod2 { Num_Lock };
+
+ // Fake keys for virtual<->real modifiers mapping
+ key <LVL3> { [ ISO_Level3_Shift ] };
+ key <MDSW> { [ Mode_switch ] };
+ modifier_map Mod5 { <LVL3>, <MDSW> };
+
+ key <ALT> { [ NoSymbol, Alt_L ] };
+ modifier_map Mod1 { <ALT>, <LALT> };
+
+ key <META> { [ NoSymbol, Meta_L ] };
+ modifier_map Mod1 { <META> };
+
+ key <SUPR> { [ NoSymbol, Super_L ] };
+ modifier_map Mod4 { <SUPR> };
+
+ key <HYPR> { [ NoSymbol, Hyper_L ] };
+ modifier_map Mod4 { <HYPR> };
+};
+
+// definition for all PC-AT type keyboard, all extra keys are
+// defined in pc(basic).
+xkb_symbols "pc101" {
+ include "pc(basic)"
+};
+
+xkb_symbols "pc102" {
+ include "pc(basic)"
+};
+
+default
+xkb_symbols "pc104" {
+ include "pc(basic)"
+};
+
+xkb_symbols "pc105" {
+ include "pc(pc104)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "function" {
key <FK01> {
type="CTRL+ALT",
symbols[Group1]= [ F1, XF86_Switch_VT_1 ]
@@ -95,9 +136,10 @@
type="CTRL+ALT",
symbols[Group1]= [ F12, XF86_Switch_VT_12 ]
};
- // End "Function" section
+};
- // Begin "Editing" section
+partial hidden alphanumeric_keys
+xkb_symbols "editing" {
key <PRSC> {
type= "PC_SYSRQ",
symbols[Group1]= [ Print, Sys_Req ]
@@ -118,138 +160,5 @@
key <LEFT> { [ Left ] };
key <DOWN> { [ Down ] };
key <RGHT> { [ Right ] };
-
- // End "Editing" section, begin "Keypad"
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
-
-// Ungrab cancels server/keyboard/pointer grabs
- key <KPDV> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Divide, XF86_Ungrab ]
- };
-
-// ClsGrb kills whichever client has a grab in effect
- key <KPMU> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ]
- };
-
-// -VMode switches to the previous video mode
- key <KPSU> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ]
- };
-
- key <KP7> { [ KP_Home, KP_7 ] };
- key <KP8> { [ KP_Up, KP_8 ] };
- key <KP9> { [ KP_Prior, KP_9 ] };
-
-// +VMode switches to the next video mode
- key <KPAD> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Add, XF86_Next_VMode ]
- };
-
- key <KP4> { [ KP_Left, KP_4 ] };
- key <KP5> { [ KP_Begin, KP_5 ] };
- key <KP6> { [ KP_Right, KP_6 ] };
-
- key <KP1> { [ KP_End, KP_1 ] };
- key <KP2> { [ KP_Down, KP_2 ] };
- key <KP3> { [ KP_Next, KP_3 ] };
- key <KPEN> { [ KP_Enter ] };
- key <KPEQ> { [ KP_Equal ] };
-
- key <KP0> { [ KP_Insert, KP_0 ] };
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
- // End "Keypad" section
-
- // begin modifier mappings
- modifier_map Shift { Shift_L, Shift_R };
- modifier_map Lock { Caps_Lock, ISO_Lock };
- modifier_map Control{ Control_L, Control_R };
- modifier_map Mod2 { Num_Lock };
-
- // Fake keys for virtual<->real modifiers mapping
- key <LVL3> { [ ISO_Level3_Shift ] };
- key <MDSW> { [ Mode_switch ] };
- modifier_map Mod5 { <LVL3>, <MDSW> };
-
- key <ALT> { [ NoSymbol, Alt_L ] };
- modifier_map Mod1 { <ALT>, <LALT> };
-
- key <META> { [ NoSymbol, Meta_L ] };
- modifier_map Mod1 { <META> };
-
- key <SUPR> { [ NoSymbol, Super_L ] };
- modifier_map Mod4 { <SUPR> };
-
- key <HYPR> { [ NoSymbol, Hyper_L ] };
- modifier_map Mod4 { <HYPR> };
-};
-
-// definition for the PC-AT type 101 key keyboard
-xkb_symbols "pc101" {
- include "pc(basic)"
- key <LALT> { [ Alt_L, Meta_L ] };
- key <RALT> { [ Alt_R, Meta_R ] };
-
-};
-
-// definition for the extra key on 102-key keyboards
-xkb_symbols "pc102" {
- include "pc(pc101)"
- key <LSGT> { [ less, greater, bar, brokenbar ] };
};
-// definition for the extra keys on 104-key "Windows95" keyboards
-default
-xkb_symbols "pc104" {
- include "pc(basic)"
- key <LALT> { [ Alt_L, Meta_L ] };
- key <RALT> { [ Alt_R, Meta_R ] };
- key <LWIN> { [ Super_L ] };
- key <RWIN> { [ Super_R ] };
- key <MENU> { [ Menu ] };
-
-};
-
-// defintion which includes both the Windows95 keyboards _and_
-// the extra key on most European keyboards.
-xkb_symbols "pc105" {
- include "pc(pc104)"
- key <LSGT> { [ less, greater, bar, brokenbar ] };
-};
-
-// common keys which can be overwritten in some layouts
-xkb_symbols "common" {
-
- // Alphanumeric section
- key <TLDE> { [ grave, asciitilde ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, at ] };
- key <AE03> { [ 3, numbersign ] };
- key <AE04> { [ 4, dollar ] };
- key <AE05> { [ 5, percent ] };
- key <AE06> { [ 6, asciicircum ] };
- key <AE07> { [ 7, ampersand ] };
- key <AE08> { [ 8, asterisk ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
-
- key <BKSL> { [ backslash, bar ] };
- key <SPCE> { [ space ] };
-
- // "Keypad" section
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
-
- // extra keys on 104-key "Windows95" keyboards
- key <LWIN> { [ Super_L ] };
- key <RWIN> { [ Super_R ] };
- key <MENU> { [ Menu ] };
-
- // the extra key on most European keyboards
- key <LSGT> { [ less, greater, bar, brokenbar ] };
-};
Index: us
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/us,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- us 29 Jul 2006 20:58:44 -0000 1.17
+++ us 17 Sep 2006 20:03:34 -0000 1.18
@@ -10,8 +10,6 @@
name[Group1]= "U.S. English";
- include "pc(common)"
-
// Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
@@ -63,7 +61,6 @@
key <AB09> { [ period, greater ] };
key <AB10> { [ slash, question ] };
- key <BKSL> { [ backslash, bar ] };
// End alphanumeric section
};
- Previous message: xkbdesc ChangeLog,1.195,1.196
- Next message: xkbdesc/symbols/macintosh_vndr apple, 1.1, 1.2 ch, 1.5, 1.6 de, 1.3,
1.4 dk, 1.2, 1.3 es, 1.2, 1.3 fi, 1.3, 1.4 fr, 1.3, 1.4 gb,
1.1, 1.2 is, 1.3, 1.4 it, 1.2, 1.3 nl, 1.2, 1.3 no, 1.2,
1.3 pt, 1.2, 1.3 se, 1.3, 1.4 us, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xlibs-commit
mailing list