aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-21 09:28:15 +0200
committermarha <marha@users.sourceforge.net>2012-05-21 09:28:15 +0200
commitd4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (patch)
treedb56fe01d61a824e4bd975cbf8603b11e9c5ecdf /xorg-server/xkeyboard-config
parentd2dacc6bc44f7dc245dee6e66723013afb49cfb5 (diff)
parentf543ceaca6820260f15a4eff86938214cf43c7d2 (diff)
downloadvcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.gz
vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.bz2
vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/symbols/fr18
1 files changed, 11 insertions, 7 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 85bcd5564..45ef6a475 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -48,13 +48,17 @@ xkb_symbols "olpc" {
name[Group1]="French";
- key <AD02> { [ z, Z, VoidSymbol, guillemotleft ] };
-
- key <AC02> { [ s, S, VoidSymbol, ssharp ] };
-
- key <AB02> { [ x, X, VoidSymbol, guillemotright ] };
-
- key <I219> { [ less, greater ] };
+ key <I219> { [ less, greater ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis, notsign, dead_abovering ] };
+ key <AB08> { [ semicolon, period, underscore, multiply ] };
+ key <TLDE> { [ twosuperior, asciitilde, VoidSymbol, VoidSymbol ] };
+
+ // Some keys only have the Shift+AltGr character printed on them (alongside
+ // the unmodified one). Make such keys shift-invariant so that the printed
+ // value is achieved by pressing AltGr or Shift+AltGr.
+ key <AB02> { [ x, X, guillemotright, guillemotright ] };
+ key <AC02> { [ s, S, ssharp, ssharp ] };
+ key <AD02> { [ z, Z, guillemotleft, guillemotleft ] };
};
partial alphanumeric_keys