xserver libX11 Xextproto mesa Git update 28 Feb 2011

1 files changed, 74 insertions, 62 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 288a1d293..3e0880573 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,62 +1,74 @@
-default partial hidden modifier_keys

-xkb_symbols "capslock" {

-    replace key <CAPS> {	[	Caps_Lock		]	};

-    modifier_map Lock { Caps_Lock };

-};

-

-partial hidden modifier_keys

-xkb_symbols "shiftlock" {

-    replace key <CAPS> {	[	Shift_Lock		]	};

-    modifier_map Shift { Shift_Lock };

-};

-

-partial hidden modifier_keys

-xkb_symbols "grouplock" {

-    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};

-};

-

-partial hidden modifier_keys

-xkb_symbols "swapescape" {

-    key <CAPS> {        [       Escape  ]       };

-    key <ESC>  {        [     Caps_Lock    ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "groupshift" {

-    key <CAPS> {

-       type[Group1]="PC_ALT_LEVEL2",

-       [       Mode_switch,    Caps_Lock       ]

-    };

-};

-

-partial hidden modifier_keys

-xkb_symbols "escape" {

-    key <CAPS> {        [       Escape  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "backspace" {

-    key <CAPS> {        [       BackSpace  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "super" {

-    key <CAPS> {        [       Super_L  ]       };

-    modifier_map Mod4   { <CAPS> };

-};

-

-partial hidden modifier_keys

-xkb_symbols "hyper" {

-    key <CAPS> {        [       Hyper_L  ]       };

-    modifier_map Mod4   { <CAPS> };

-};

-

-partial hidden modifier_keys

-xkb_symbols "none" {

-    key <CAPS> {        [       VoidSymbol  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "numlock" {

-    key <CAPS> {        [       Num_Lock  ]       };

-};

+default partial hidden modifier_keys
+xkb_symbols "capslock" {
+    replace key <CAPS> {	[	Caps_Lock		]	};
+    modifier_map Lock { Caps_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "shiftlock" {
+    replace key <CAPS> {	[	Shift_Lock		]	};
+    modifier_map Shift { Shift_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "grouplock" {
+    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+};
+
+partial hidden modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [     Caps_Lock    ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "groupshift" {
+    key <CAPS> {
+       type[Group1]="PC_ALT_LEVEL2",
+       [       Mode_switch,    Caps_Lock       ]
+    };
+};
+
+partial hidden modifier_keys
+xkb_symbols "escape" {
+    key <CAPS> {        [       Escape  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "backspace" {
+    key <CAPS> {        [       BackSpace  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "super" {
+    key <CAPS> {        [       Super_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "hyper" {
+    key <CAPS> {        [       Hyper_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "none" {
+    key <CAPS> {        [       VoidSymbol  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "numlock" {
+    key <CAPS> {        [       Num_Lock  ]       };
+};
+
+// This changes the modifier behavior of the <CAPS> key.
+// The keysym will be reset to Caps_Lock
+partial hidden modifier_keys
+xkb_symbols "ctrl_modifier" {
+    replace key <CAPS> {
+        type[Group1] = "ONE_LEVEL",
+        symbols[Group1] = [ Caps_Lock ],
+        actions[Group1] = [ SetMods(modifiers=Control) ]    
+    };
+    modifier_map Control { <CAPS> };
+};