diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/compat')
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/README | 14 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/accessx | 10 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/basic | 11 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/caps | 15 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/complete | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/iso9995 | 9 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/japan | 24 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/ledcaps | 35 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/lednum | 33 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/ledscroll | 35 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/level5 | 29 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/misc | 68 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/mousekeys | 153 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/olpc | 44 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/pc | 10 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/pc98 | 17 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/xfree86 | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/xtest | 23 |
18 files changed, 271 insertions, 265 deletions
diff --git a/xorg-server/xkeyboard-config/compat/README b/xorg-server/xkeyboard-config/compat/README index 00d591e7b..3c5747bb8 100644 --- a/xorg-server/xkeyboard-config/compat/README +++ b/xorg-server/xkeyboard-config/compat/README @@ -1,7 +1,7 @@ The core protocol interpretation of keyboard modifiers does not include direct support for multiple keyboard groups, so XKB reports the effective keyboard -group to XKB-aware clients using some of reserved bits in the state field of -some core protocol events. This modified state field would not be interpreted +group to XKB-aware clients using some of the reserved bits in the state field +of some core protocol events. This modified state field would not be interpreted correctly by XKB-unaware clients, so XKB provides a group compatibility mapping which remaps the keyboard group into a core modifier mask that has similar effects, when possible. @@ -15,8 +15,8 @@ XKB-unaware clients(*) work as well as possible: - The compatibility grab state which is the nearest core-protocol equivalent of the grab state. -Compatibility state are essentially the corresponding XKB states, but with -keyboard group possibly encoded as one or more modifiers. +Compatibility states are essentially the corresponding XKB states, but with +the keyboard group possibly encoded as one or more modifiers. Modifiers that correspond to each keyboard group are described in this group compatibility map. @@ -25,9 +25,9 @@ group compatibility map. ---- (*) The implementation of XKB invisibly extends the X library to use the keyboard extension if it is present. That means, clients that use library or -toolkit routines to interpret keyboard events automatically use all of XKB -features; clients that directly interpret the state field of core protocol -events or the keymap direcly may be affected by some of the XKB differences. +toolkit routines to interpret keyboard events automatically use all of XKB's +features; clients that directly interpret the state field of core-protocol +events or the keymap directly may be affected by some of the XKB differences. Thus most clients can take all advantages without modification but it also means that XKB state can be reported to clients that have not explicitly requested the keyboard extension. diff --git a/xorg-server/xkeyboard-config/compat/accessx b/xorg-server/xkeyboard-config/compat/accessx index 0ed34ced1..6dd6ca930 100644 --- a/xorg-server/xkeyboard-config/compat/accessx +++ b/xorg-server/xkeyboard-config/compat/accessx @@ -1,17 +1,17 @@ default partial xkb_compatibility "basic" { - interpret AccessX_Enable { - action= LockControls(controls=AccessXKeys); + interpret AccessX_Enable { + action= LockControls(controls=AccessXKeys); }; }; partial xkb_compatibility "full" { interpret AccessX_Enable { - action= LockControls(controls=AccessXKeys); + action= LockControls(controls=AccessXKeys); }; - interpret AccessX_Feedback_Enable { - action= LockControls(controls=AccessXFeedback); + interpret AccessX_Feedback_Enable { + action= LockControls(controls=AccessXFeedback); }; interpret RepeatKeys_Enable { diff --git a/xorg-server/xkeyboard-config/compat/basic b/xorg-server/xkeyboard-config/compat/basic index 393c32445..745cbbaed 100644 --- a/xorg-server/xkeyboard-config/compat/basic +++ b/xorg-server/xkeyboard-config/compat/basic @@ -1,10 +1,11 @@ -// Minimal set of symbol interpretations to provide -// reasonable default behavior (Num lock, shift and -// caps lock and mode switch) and set up the +// Minimal set of symbol interpretations to provide +// reasonable default behavior (Num lock, Shift lock, +// Caps lock, and Mode switch) and set up the // automatic updating of common keyboard LEDs. -default xkb_compatibility "basic" { - virtual_modifiers NumLock,AltGr; +default xkb_compatibility "basic" { + + virtual_modifiers NumLock,AltGr; interpret.repeat= False; setMods.clearLocks= True; diff --git a/xorg-server/xkeyboard-config/compat/caps b/xorg-server/xkeyboard-config/compat/caps index d787ab63d..4793051ec 100644 --- a/xorg-server/xkeyboard-config/compat/caps +++ b/xorg-server/xkeyboard-config/compat/caps @@ -1,11 +1,10 @@ -partial xkb_compatibility "caps_lock" { - // Keysym Caps_Lock locks Lock modifier. - // With this, the keysym Caps_Lock can be used without binding the whole - // key to a real modifier. - // This is essential when you don't want to use caps lock on the first - // level. - // This should not have any compatibility issues when used together with - // other layouts which don't utilize this capability. +partial xkb_compatibility "caps_lock" { + // Keysym Caps_Lock locks the Lock modifier. + // With this definition, the keysym Caps_Lock can be used without binding + // the whole key to a real modifier. This is essential when you don't + // want to use Caps_Lock on the first level. + // This should not have any compatibility issues when used together with + // other layouts which don't utilize this capability. interpret Caps_Lock { action = LockMods(modifiers = Lock); }; diff --git a/xorg-server/xkeyboard-config/compat/complete b/xorg-server/xkeyboard-config/compat/complete index d33c4dbce..8f77538db 100644 --- a/xorg-server/xkeyboard-config/compat/complete +++ b/xorg-server/xkeyboard-config/compat/complete @@ -1,4 +1,4 @@ -default xkb_compatibility "complete" { +default xkb_compatibility "complete" { include "basic" augment "iso9995" augment "mousekeys" diff --git a/xorg-server/xkeyboard-config/compat/iso9995 b/xorg-server/xkeyboard-config/compat/iso9995 index 76188d1f0..0f3025b8c 100644 --- a/xorg-server/xkeyboard-config/compat/iso9995 +++ b/xorg-server/xkeyboard-config/compat/iso9995 @@ -1,8 +1,9 @@ -// Fairly complete set of symbol interpretations -// to provide reasonable default behavior +// Fairly complete set of symbol interpretations +// to provide reasonable default behavior. -default partial xkb_compatibility "default" { - virtual_modifiers LevelThree,AltGr; +default partial xkb_compatibility "default" { + + virtual_modifiers LevelThree,AltGr; interpret.repeat= False; setMods.clearLocks= True; diff --git a/xorg-server/xkeyboard-config/compat/japan b/xorg-server/xkeyboard-config/compat/japan index ab4f85e4c..322bbdb14 100644 --- a/xorg-server/xkeyboard-config/compat/japan +++ b/xorg-server/xkeyboard-config/compat/japan @@ -1,11 +1,11 @@ -// Japanese keyboards need Eisu and Kana shift and -// lock keys, which are typically bound to the -// second shift level for some other modifier key. +// Japanese keyboards need the Eisu and Kana Shift +// and Lock keys, which are typically bound to the +// second shift level of some other modifier key. // These interpretations disable the default // interpretation (which would have these keys set -// the same modifier as the level one symbol). +// to the same modifier as the level one symbol). -default partial xkb_compatibility "japan" { +default partial xkb_compatibility "japan" { interpret.repeat= False; @@ -26,16 +26,16 @@ default partial xkb_compatibility "japan" { }; }; -// Some Japanese keyboards have an explict Kana Lock key & matching LED +// Some Japanese keyboards have an explict +// Kana Lock key and matching LED. +partial xkb_compatibility "kana_lock" { -partial xkb_compatibility "kana_lock" { - - virtual_modifiers Kana_Lock; + virtual_modifiers Kana_Lock; interpret Kana_Lock+AnyOfOrNone(all) { - virtualModifier= Kana_Lock; - useModMapMods=level1; - action= LockGroup(group=+1); + virtualModifier= Kana_Lock; + useModMapMods=level1; + action= LockGroup(group=+1); }; indicator "Kana" { diff --git a/xorg-server/xkeyboard-config/compat/ledcaps b/xorg-server/xkeyboard-config/compat/ledcaps index fc3084eec..f1460ba36 100644 --- a/xorg-server/xkeyboard-config/compat/ledcaps +++ b/xorg-server/xkeyboard-config/compat/ledcaps @@ -1,23 +1,24 @@ -// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state +// Use the Caps Lock LED to show either +// Caps Lock, Group, or Shift Lock state. -default partial xkb_compatibility "caps_lock" { - indicator "Caps Lock" { - !allowExplicit; - whichModState= Locked; - modifiers= Lock; - }; +default partial xkb_compatibility "caps_lock" { + indicator "Caps Lock" { + !allowExplicit; + whichModState= Locked; + modifiers= Lock; + }; }; -partial xkb_compatibility "group_lock" { - indicator "Caps Lock" { - modifiers= None; - groups=All-group1; - }; +partial xkb_compatibility "group_lock" { + indicator "Caps Lock" { + modifiers= None; + groups=All-group1; + }; }; -partial xkb_compatibility "shift_lock" { - indicator "Caps Lock" { - whichModState= Locked; - modifiers= Shift; - }; +partial xkb_compatibility "shift_lock" { + indicator "Caps Lock" { + whichModState= Locked; + modifiers= Shift; + }; }; diff --git a/xorg-server/xkeyboard-config/compat/lednum b/xorg-server/xkeyboard-config/compat/lednum index 24a60a595..bfdcd744e 100644 --- a/xorg-server/xkeyboard-config/compat/lednum +++ b/xorg-server/xkeyboard-config/compat/lednum @@ -1,23 +1,24 @@ -// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state +// Use the Num Lock LED to show either +// Num Lock, Group, or Shift Lock state. -default partial xkb_compatibility "num_lock" { +default partial xkb_compatibility "num_lock" { indicator "Num Lock" { - !allowExplicit; - whichModState= Locked; - modifiers= NumLock; - }; + !allowExplicit; + whichModState= Locked; + modifiers= NumLock; + }; }; -partial xkb_compatibility "group_lock" { - indicator "Num Lock" { - modifiers= None; - groups=All-group1; - }; +partial xkb_compatibility "group_lock" { + indicator "Num Lock" { + modifiers= None; + groups=All-group1; + }; }; -partial xkb_compatibility "shift_lock" { - indicator "Num Lock" { - whichModState= Locked; - modifiers= Shift; - }; +partial xkb_compatibility "shift_lock" { + indicator "Num Lock" { + whichModState= Locked; + modifiers= Shift; + }; }; diff --git a/xorg-server/xkeyboard-config/compat/ledscroll b/xorg-server/xkeyboard-config/compat/ledscroll index ca5a82c4c..a24169827 100644 --- a/xorg-server/xkeyboard-config/compat/ledscroll +++ b/xorg-server/xkeyboard-config/compat/ledscroll @@ -1,23 +1,24 @@ -// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state +// Use the Scroll Lock LED to show either +// Scroll Lock, Group, or Shift Lock state. -default partial xkb_compatibility "scroll_lock" { - indicator "Scroll Lock" { - allowExplicit; - whichModState= Locked; - modifiers= ScrollLock; - }; +default partial xkb_compatibility "scroll_lock" { + indicator "Scroll Lock" { + allowExplicit; + whichModState= Locked; + modifiers= ScrollLock; + }; }; -partial xkb_compatibility "group_lock" { - indicator "Scroll Lock" { - modifiers= None; - groups=All-group1; - }; +partial xkb_compatibility "group_lock" { + indicator "Scroll Lock" { + modifiers= None; + groups=All-group1; + }; }; -partial xkb_compatibility "shift_lock" { - indicator "Scroll Lock" { - whichModState= Locked; - modifiers= Shift; - }; +partial xkb_compatibility "shift_lock" { + indicator "Scroll Lock" { + whichModState= Locked; + modifiers= Shift; + }; }; diff --git a/xorg-server/xkeyboard-config/compat/level5 b/xorg-server/xkeyboard-config/compat/level5 index 8e0cc9c38..54f749d4d 100644 --- a/xorg-server/xkeyboard-config/compat/level5 +++ b/xorg-server/xkeyboard-config/compat/level5 @@ -1,8 +1,9 @@ -// Fairly complete set of symbol interpretations -// to provide reasonable default behavior +// Fairly complete set of symbol interpretations +// to provide reasonable default behavior. -default partial xkb_compatibility "default" { - virtual_modifiers LevelFive; +default partial xkb_compatibility "default" { + + virtual_modifiers LevelFive; interpret.repeat= False; setMods.clearLocks= True; @@ -39,15 +40,17 @@ default partial xkb_compatibility "default" { action= LockMods(modifiers=LevelFive); }; }; -partial xkb_compatibility "level5_lock" { - // This defines a Level5-Lock using the NumLock real modifier in order to - // create arbitrary level-behaviour, which would not be possible with the - // virtual modifier. - // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK - // See also: symbols/level5(lock) - virtual_modifiers NumLock; - + +partial xkb_compatibility "level5_lock" { + // This defines a Level5-Lock using the NumLock real modifier + // in order to create arbitrary level-behaviour, which would + // not be possible with the virtual modifier. + // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK + // See also: symbols/level5(lock) + + virtual_modifiers NumLock; + interpret ISO_Level5_Lock { - action = LockMods(modifiers = NumLock); + action = LockMods(modifiers = NumLock); }; }; diff --git a/xorg-server/xkeyboard-config/compat/misc b/xorg-server/xkeyboard-config/compat/misc index cfe9a39b4..964f47125 100644 --- a/xorg-server/xkeyboard-config/compat/misc +++ b/xorg-server/xkeyboard-config/compat/misc @@ -1,122 +1,122 @@ -default partial xkb_compatibility "misc" { +default partial xkb_compatibility "misc" { - virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock; + virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock; - // Interpretations for some other useful keys + // Interpretations for some other useful keys. interpret Terminate_Server { - action = Terminate(); + action = Terminate(); }; setMods.clearLocks= True; - // Sets the "Alt" virtual modifier + // Sets the "Alt" virtual modifier. - interpret Alt_L+Any { + interpret Alt_L+Any { //useModMapMods= level1; virtualModifier= Alt; action = SetMods(modifiers=modMapMods); }; - interpret Alt_L { + interpret Alt_L { action = SetMods(modifiers=Alt); }; - interpret Alt_R+Any { + interpret Alt_R+Any { //useModMapMods= level1; virtualModifier= Alt; action = SetMods(modifiers=modMapMods); }; - interpret Alt_R { + interpret Alt_R { action = SetMods(modifiers=Alt); }; - // Sets the "Meta" virtual modifier + // Sets the "Meta" virtual modifier. - interpret Meta_L+Any { -// useModMapMods= level1; + interpret Meta_L+Any { + //useModMapMods= level1; virtualModifier= Meta; action = SetMods(modifiers=modMapMods); }; - interpret Meta_L { + interpret Meta_L { action = SetMods(modifiers=Meta); }; - interpret Meta_R+Any { + interpret Meta_R+Any { //useModMapMods= level1; virtualModifier= Meta; action = SetMods(modifiers=modMapMods); }; - interpret Meta_R { + interpret Meta_R { action = SetMods(modifiers=Meta); }; - // Sets the "Super" virtual modifier + // Sets the "Super" virtual modifier. - interpret Super_L+Any { -// useModMapMods= level1; + interpret Super_L+Any { + //useModMapMods= level1; virtualModifier= Super; action = SetMods(modifiers=modMapMods); }; - interpret Super_L { + interpret Super_L { action = SetMods(modifiers=Super); }; - interpret Super_R+Any { + interpret Super_R+Any { //useModMapMods= level1; virtualModifier= Super; action = SetMods(modifiers=modMapMods); }; - interpret Super_R { + interpret Super_R { action = SetMods(modifiers=Super); }; - // Sets the "Hyper" virtual modifier + // Sets the "Hyper" virtual modifier. - interpret Hyper_L+Any { -// useModMapMods= level1; + interpret Hyper_L+Any { + //useModMapMods= level1; virtualModifier= Hyper; action = SetMods(modifiers=modMapMods); }; - interpret Hyper_L { + interpret Hyper_L { action = SetMods(modifiers=Hyper); }; - interpret Hyper_R+Any { + interpret Hyper_R+Any { //useModMapMods= level1; virtualModifier= Hyper; action = SetMods(modifiers=modMapMods); }; - interpret Hyper_R { + interpret Hyper_R { action = SetMods(modifiers=Hyper); }; // Sets the "ScrollLock" virtual modifier and // makes it actually lock when pressed. Sets // up a map for the scroll lock indicator. - interpret Scroll_Lock+Any { + interpret Scroll_Lock+Any { virtualModifier= ScrollLock; action = LockMods(modifiers=modMapMods); }; include "ledscroll" - + include "misc(assign_shift_left_action)" }; -partial xkb_compatibility "assign_shift_left_action" { - // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is - // getting bound to the Lock modifier when using - // symbols/shift(both_capslock), creating unwanted behaviour. +partial xkb_compatibility "assign_shift_left_action" { + // Because of the irrevertable modifier mapping in symbols/pc, + // <LFSH> is getting bound to the Lock modifier when using + // symbols/shift(both_capslock), creating unwanted behaviour. // This is a quirk, to circumvent the problem. interpret Shift_L { - action = SetMods(modifiers = Shift); + action = SetMods(modifiers = Shift); }; }; diff --git a/xorg-server/xkeyboard-config/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys index f60c756c4..6b96fbcf8 100644 --- a/xorg-server/xkeyboard-config/compat/mousekeys +++ b/xorg-server/xkeyboard-config/compat/mousekeys @@ -1,147 +1,147 @@ -// Interpretations for arrow keys and a bunch of other -// common keysyms which make it possible to bind "mouse" -// keys using xmodmap and activate or deactivate them -// from the keyboard. +// Interpretations for arrow keys and a bunch of +// other common keysyms which make it possible to +// bind "mouse" keys using xmodmap and activate or +// deactivate them from the keyboard. default partial xkb_compatibility "mousekeys" { // Keypad actions. - // + interpret.repeat= True; - interpret KP_1 { - action = MovePtr(x=-1,y= +1); + interpret KP_1 { + action = MovePtr(x=-1,y= +1); }; - interpret KP_End { - action = MovePtr(x=-1,y= +1); + interpret KP_End { + action = MovePtr(x=-1,y= +1); }; - interpret KP_2 { - action = MovePtr(x=+0,y= +1); + interpret KP_2 { + action = MovePtr(x=+0,y= +1); }; - interpret KP_Down { - action = MovePtr(x=+0,y= +1); + interpret KP_Down { + action = MovePtr(x=+0,y= +1); }; - interpret KP_3 { - action = MovePtr(x=+1,y=+1); + interpret KP_3 { + action = MovePtr(x=+1,y=+1); }; - interpret KP_Next { - action = MovePtr(x=+1,y=+1); + interpret KP_Next { + action = MovePtr(x=+1,y=+1); }; - interpret KP_4 { - action = MovePtr(x=-1,y=+0); + interpret KP_4 { + action = MovePtr(x=-1,y=+0); }; - interpret KP_Left { - action = MovePtr(x=-1,y=+0); + interpret KP_Left { + action = MovePtr(x=-1,y=+0); }; - interpret KP_6 { - action = MovePtr(x=+1,y=+0); + interpret KP_6 { + action = MovePtr(x=+1,y=+0); }; - interpret KP_Right { - action = MovePtr(x=+1,y=+0); + interpret KP_Right { + action = MovePtr(x=+1,y=+0); }; - interpret KP_7 { - action = MovePtr(x=-1,y=-1); + interpret KP_7 { + action = MovePtr(x=-1,y=-1); }; - interpret KP_Home { - action = MovePtr(x=-1,y=-1); + interpret KP_Home { + action = MovePtr(x=-1,y=-1); }; - interpret KP_8 { - action = MovePtr(x=+0,y=-1); + interpret KP_8 { + action = MovePtr(x=+0,y=-1); }; - interpret KP_Up { - action = MovePtr(x=+0,y=-1); + interpret KP_Up { + action = MovePtr(x=+0,y=-1); }; - interpret KP_9 { - action = MovePtr(x=+1,y=-1); + interpret KP_9 { + action = MovePtr(x=+1,y=-1); }; - interpret KP_Prior { - action = MovePtr(x=+1,y=-1); + interpret KP_Prior { + action = MovePtr(x=+1,y=-1); }; - interpret KP_5 { - action = PointerButton(button=default); + interpret KP_5 { + action = PointerButton(button=default); }; - interpret KP_Begin { - action = PointerButton(button=default); + interpret KP_Begin { + action = PointerButton(button=default); }; - interpret KP_F2 { - action = SetPtrDflt(affect=defaultButton,button=1); + interpret KP_F2 { + action = SetPtrDflt(affect=defaultButton,button=1); }; - interpret KP_Divide { - action = SetPtrDflt(affect=defaultButton,button=1); + interpret KP_Divide { + action = SetPtrDflt(affect=defaultButton,button=1); }; - interpret KP_F3 { - action = SetPtrDflt(affect=defaultButton,button=2); + interpret KP_F3 { + action = SetPtrDflt(affect=defaultButton,button=2); }; - interpret KP_Multiply { - action = SetPtrDflt(affect=defaultButton,button=2); + interpret KP_Multiply { + action = SetPtrDflt(affect=defaultButton,button=2); }; - interpret KP_F4 { - action = SetPtrDflt(affect=defaultButton,button=3); + interpret KP_F4 { + action = SetPtrDflt(affect=defaultButton,button=3); }; - interpret KP_Subtract { - action = SetPtrDflt(affect=defaultButton,button=3); + interpret KP_Subtract { + action = SetPtrDflt(affect=defaultButton,button=3); }; - interpret KP_Separator { - action = PointerButton(button=default,count=2); + interpret KP_Separator { + action = PointerButton(button=default,count=2); }; - interpret KP_Add { + interpret KP_Add { action = PointerButton(button=default,count=2); }; - interpret KP_0 { - action = LockPointerButton(button=default,affect=lock); + interpret KP_0 { + action = LockPointerButton(button=default,affect=lock); }; - interpret KP_Insert { - action = LockPointerButton(button=default,affect=lock); + interpret KP_Insert { + action = LockPointerButton(button=default,affect=lock); }; - interpret KP_Decimal { - action = LockPointerButton(button=default,affect=unlock); + interpret KP_Decimal { + action = LockPointerButton(button=default,affect=unlock); }; - interpret KP_Delete { - action = LockPointerButton(button=default,affect=unlock); + interpret KP_Delete { + action = LockPointerButton(button=default,affect=unlock); }; - // Additional mappings for Solaris keypad compatibility + // Additional mappings for Solaris keypad compatibility. + interpret F25 { // aka KP_Divide - action = SetPtrDflt(affect=defaultButton,button=1); + action = SetPtrDflt(affect=defaultButton,button=1); }; interpret F26 { // aka KP_Multiply - action = SetPtrDflt(affect=defaultButton,button=2); + action = SetPtrDflt(affect=defaultButton,button=2); }; interpret F27 { // aka KP_Home - action = MovePtr(x=-1,y=-1); + action = MovePtr(x=-1,y=-1); }; interpret F29 { // aka KP_Prior - action = MovePtr(x=+1,y=-1); + action = MovePtr(x=+1,y=-1); }; interpret F31 { // aka KP_Begin - action = PointerButton(button=default); + action = PointerButton(button=default); }; interpret F33 { // aka KP_End - action = MovePtr(x=-1,y= +1); + action = MovePtr(x=-1,y= +1); }; interpret F35 { // aka KP_Next - action = MovePtr(x=+1,y=+1); + action = MovePtr(x=+1,y=+1); }; interpret.repeat= False; + // New keysym actions. - // New Keysym Actions. - // interpret Pointer_Button_Dflt { action= PointerButton(button=default); }; @@ -166,7 +166,7 @@ default partial xkb_compatibility "mousekeys" { interpret Pointer_DblClick3 { action= PointerButton(button=3,count=2); }; - interpret Pointer_Drag_Dflt { + interpret Pointer_Drag_Dflt { action= LockPointerButton(button=default); }; interpret Pointer_Drag1 { @@ -192,10 +192,9 @@ default partial xkb_compatibility "mousekeys" { action= SetPtrDflt(affect=defaultButton,button= -1); }; - // Allow an indicator for MouseKeys. indicator "Mouse Keys" { -// !allowExplicit; + //!allowExplicit; indicatorDrivesKeyboard; controls= MouseKeys; }; diff --git a/xorg-server/xkeyboard-config/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc index a7a2cc425..747b444ec 100644 --- a/xorg-server/xkeyboard-config/compat/olpc +++ b/xorg-server/xkeyboard-config/compat/olpc @@ -1,51 +1,51 @@ // -// Created by Bernardo Innocenti <bernie@codewiz.org> +// Map the OLPC game keys to virtual modifiers. // -// Map the OLPC game keys to virtual modifiers +// Created by Bernardo Innocenti <bernie@codewiz.org> // -default xkb_compatibility "olpc" { +default xkb_compatibility "olpc" { include "complete" virtual_modifiers Square,Cross,Triangle,Circle; - interpret KP_Home+Any { + interpret KP_Home+Any { //useModMapMods= level1; - virtualModifier= Square; - action = SetMods(modifiers=modMapMods); + virtualModifier= Square; + action = SetMods(modifiers=modMapMods); }; - interpret KP_Home { - action = SetMods(modifiers=Square); + interpret KP_Home { + action = SetMods(modifiers=Square); }; - interpret KP_Next+Any { + interpret KP_Next+Any { //useModMapMods= level1; - virtualModifier= Cross; - action = SetMods(modifiers=modMapMods); + virtualModifier= Cross; + action = SetMods(modifiers=modMapMods); }; - interpret KP_Next { - action = SetMods(modifiers=Cross); + interpret KP_Next { + action = SetMods(modifiers=Cross); }; - interpret KP_End+Any { + interpret KP_End+Any { //useModMapMods= level1; - virtualModifier= Circle; - action = SetMods(modifiers=modMapMods); + virtualModifier= Circle; + action = SetMods(modifiers=modMapMods); }; - interpret KP_End { - action = SetMods(modifiers=Circle); + interpret KP_End { + action = SetMods(modifiers=Circle); }; - interpret KP_Prior+Any { + interpret KP_Prior+Any { //useModMapMods= level1; - virtualModifier= Triangle; - action = SetMods(modifiers=modMapMods); + virtualModifier= Triangle; + action = SetMods(modifiers=modMapMods); }; interpret KP_Prior { - action = SetMods(modifiers=Triangle); + action = SetMods(modifiers=Triangle); }; }; diff --git a/xorg-server/xkeyboard-config/compat/pc b/xorg-server/xkeyboard-config/compat/pc index e970795c7..f69b54d77 100644 --- a/xorg-server/xkeyboard-config/compat/pc +++ b/xorg-server/xkeyboard-config/compat/pc @@ -1,16 +1,16 @@ -default partial xkb_compatibility "pc" { +default partial xkb_compatibility "pc" { - // Sets the "Alt" virtual modifier + // Sets the "Alt" virtual modifier. - virtual_modifiers Alt; + virtual_modifiers Alt; setMods.clearLocks= True; - interpret Alt_L+Any { + interpret Alt_L+Any { virtualModifier= Alt; action = SetMods(modifiers=modMapMods); }; - interpret Alt_R+Any { + interpret Alt_R+Any { virtualModifier= Alt; action = SetMods(modifiers=modMapMods); }; diff --git a/xorg-server/xkeyboard-config/compat/pc98 b/xorg-server/xkeyboard-config/compat/pc98 index f7e40014a..0abd623ff 100644 --- a/xorg-server/xkeyboard-config/compat/pc98 +++ b/xorg-server/xkeyboard-config/compat/pc98 @@ -1,10 +1,11 @@ -// Minimal set of symbol interpretations to provide -// reasonable default behavior (Num lock, shift and -// caps lock and mode switch) and set up the -// automatic updating of common keyboard LEDs. +// Minimal set of symbol interpretations to provide +// reasonable default behavior (Num lock, Shift lock, +// and Mode switch) and set up the automatic updating +// of common keyboard LEDs. -default xkb_compatibility "basic" { - virtual_modifiers NumLock,AltGr; +default xkb_compatibility "basic" { + + virtual_modifiers NumLock,AltGr; interpret.repeat= False; setMods.clearLocks= True; @@ -17,7 +18,7 @@ default xkb_compatibility "basic" { // interpret Any+Lock { // action= LockMods(modifiers=Lock); -// }; +// }; interpret Num_Lock+Any { virtualModifier= NumLock; @@ -39,7 +40,7 @@ default xkb_compatibility "basic" { group 4 = AltGr; indicator.allowExplicit= False; - indicator "Caps Lock" { + indicator "Caps Lock" { whichModState= Locked; modifiers= Lock; }; diff --git a/xorg-server/xkeyboard-config/compat/xfree86 b/xorg-server/xkeyboard-config/compat/xfree86 index 52e661dce..cc4381974 100644 --- a/xorg-server/xkeyboard-config/compat/xfree86 +++ b/xorg-server/xkeyboard-config/compat/xfree86 @@ -1,6 +1,6 @@ -// XFree86 special keysyms +// XFree86 special keysyms. -default partial xkb_compatibility "basic" { +default partial xkb_compatibility "basic" { interpret.repeat= True; diff --git a/xorg-server/xkeyboard-config/compat/xtest b/xorg-server/xkeyboard-config/compat/xtest index 5ee88ccf8..f2ca6430d 100644 --- a/xorg-server/xkeyboard-config/compat/xtest +++ b/xorg-server/xkeyboard-config/compat/xtest @@ -1,18 +1,17 @@ -default xkb_compatibility "xtest" { +default xkb_compatibility "xtest" { // Minimal set of symbol interpretations to provide - // reasonable behavior for testing. The X Test - // Suite assumes that it can set any modifier by - // simulating a KeyPress and clear it by simulating - // a KeyRelease. Because of the way that XKB - // implements locking/latching modifiers, this - // approach fails in some cases (typically the - // lock or num lock modifiers). These symbol - // interpretations make all modifier keys just - // set the corresponding modifier so that xtest + // reasonable behavior for testing. + // The X Test Suite assumes that it can set any modifier + // by simulating a KeyPress and clear it by simulating a + // KeyRelease. Because of the way that XKB implements + // locking/latching modifiers, this approach fails in + // some cases (typically the Lock or NumLock modifiers). + // These symbol interpretations make all modifier keys + // just set the corresponding modifier so that xtest // will see the behavior it expects. - virtual_modifiers NumLock,AltGr; + virtual_modifiers NumLock,AltGr; interpret.repeat= False; setMods.clearLocks= True; @@ -43,7 +42,7 @@ default xkb_compatibility "xtest" { group 4 = AltGr; indicator.allowExplicit= False; - indicator "Caps Lock" { + indicator "Caps Lock" { modifiers= Lock; }; indicator "Num Lock" { |