diff -ur ../xkb.orig/rules/evdev ./rules/evdev --- ../xkb.orig/rules/evdev 2009-04-14 11:00:25.000000000 +0200 +++ ./rules/evdev 2009-04-20 12:41:41.000000000 +0200 @@ -54,7 +54,7 @@ hp250x hp5xx hp500fa hpdv5 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ ibm_spacesaver ipaq inspiron intel \ - logiaccess logicda logicink \ + logiaccess logicda logicink logielite \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ @@ -224,6 +224,7 @@ * tml = pc+in(tam) * yu = pc+srp * fr-latin9 = pc+fr(latin9) + * fr-complete = pc+fr(complete) * us_intl = pc+us(alt-intl) * ben(basic) = pc+in(ben) * ben(probhat) = pc+in(ben_probhat) @@ -798,6 +799,7 @@ * misc:typo = +typo(base):4 ! option = symbols + fixinet:logielite = +inet(logielite) grp:shift_toggle = +group(shifts_toggle) altwin:menu = +altwin(menu) altwin:meta_alt = +altwin(meta_alt) diff -ur ../xkb.orig/rules/evdev.lst ./rules/evdev.lst --- ../xkb.orig/rules/evdev.lst 2009-04-14 11:00:25.000000000 +0200 +++ ./rules/evdev.lst 2009-04-20 12:42:04.000000000 +0200 @@ -101,6 +101,7 @@ logiik Logitech Internet Keyboard itouch Logitech iTouch logicink Logitech Internet Navigator Keyboard + logielite Logitech Elite Keyboard logiex110 Logitech Cordless Desktop EX110 logiinkse Logitech iTouch Internet Navigator Keyboard SE logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB) @@ -379,6 +380,7 @@ oss_latin9 fr: Alternative, latin-9 only oss_nodeadkeys fr: Alternative, eliminate dead keys oss_sundeadkeys fr: Alternative, Sun dead keys + complete fr: Extended latin9 fr: (Legacy) Alternative latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys @@ -713,3 +715,5 @@ esperanto Adding Esperanto circumflexes (supersigno) esperanto:qwerty To the corresponding key in a Qwerty keyboard. esperanto:dvorak To the corresponding key in a Dvorak keyboard. + fixinet Adding fixes to the multimedia keyboards + fixinet:logielite To the Logitech Elite Keyboard diff -ur ../xkb.orig/rules/evdev.xml ./rules/evdev.xml --- ../xkb.orig/rules/evdev.xml 2009-04-14 11:00:25.000000000 +0200 +++ ./rules/evdev.xml 2009-04-20 12:51:46.000000000 +0200 @@ -715,6 +715,13 @@ + logielite + Logitech Elite Keyboard + Logitech + + + + logiex110 Logitech Cordless Desktop EX110 Logitech @@ -2287,6 +2294,12 @@ + complete + Extended + + + + latin9 (Legacy) Alternative @@ -4898,5 +4911,17 @@ + + + fixinet + Adding fixes to the multimedia keyboards + + + - \ Pas de fin de ligne à la fin du fichier. + diff -ur ../xkb.orig/symbols/fr ./symbols/fr --- ../xkb.orig/symbols/fr 2009-04-14 11:00:25.000000000 +0200 +++ ./symbols/fr 2009-04-14 14:31:10.000000000 +0200 @@ -45,6 +45,75 @@ include "level3(ralt_switch)" }; +// Complete Linux French keyboard layout (fr-complete) + +partial default alphanumeric_keys +xkb_symbols "complete" { + + include "latin" + + name[Group1]="France - Extended"; + + key { [ twosuperior, threesuperior, ordfeminine, masculine ] }; + key { [ ampersand, 1, onesuperior, hyphen ] }; + key { [ eacute, 2, asciitilde, Eacute ] }; + key { [ quotedbl, 3, numbersign, Zcaron ] }; + key { [ apostrophe, 4, braceleft, zcaron ] }; + key { [ parenleft, 5, bracketleft, Scaron ] }; + key { [ minus, 6, bar, scaron ] }; + key { [ egrave, 7, grave, Egrave ] }; + key { [ underscore, 8, backslash, macron ] }; + key { [ ccedilla, 9, asciicircum, Ccedilla ] }; + key { [ agrave, 0, at, Agrave ] }; + key { [ parenright, degree, bracketright, Otilde ] }; + key { [ equal, plus, braceright, plusminus ] }; + + key { [ a, A, acircumflex, Acircumflex ] }; + key { [ z, Z, ae, AE ] }; + key { [ e, E, EuroSign, Ecircumflex ] }; + key { [ r, R, registered, ssharp ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, ydiaeresis, Ydiaeresis ] }; + key { [ u, U, ucircumflex, Ucircumflex ] }; + key { [ i, I, icircumflex, Icircumflex ] }; + key { [ o, O, ocircumflex, Ocircumflex ] }; + key { [ p, P, odiaeresis, Odiaeresis ] }; + key { [ dead_circumflex, dead_diaeresis, ograve, Ograve ] }; + key { [ dollar, sterling, currency, yen ] }; + + key { [ q, Q, oe, OE ] }; + key { [ s, S, aacute, Aacute ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F, ediaeresis, Ediaeresis ] }; + key { [ g, G, yacute, Yacute ] }; + key { [ h, H, uacute, Uacute ] }; + key { [ j, J, idiaeresis, Idiaeresis ] }; + key { [ k, K, iacute, Iacute ] }; + key { [ l, L, oacute, Oacute ] }; + key { [ m, M, oslash, Ooblique ] }; + key { [ ugrave, percent, Ograve, Ugrave ] }; + key { [ asterisk, mu, notsign, multiply ] }; + + key { [ less, greater, guillemotleft, guillemotright ] }; + key { [ w, W, aring, Aring ] }; + key { [ x, X, atilde, Atilde ] }; + key { [ c, C, copyright, cent ] }; + key { [ v, V, udiaeresis, Udiaeresis ] }; + key { [ b, B, adiaeresis, Adiaeresis ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ comma, question, questiondown, Igrave ] }; + key { [ semicolon, period, periodcentered, igrave ] }; + key { [ colon, slash, ecircumflex, division ] }; + key { [ exclam, section, paragraph, exclamdown ] }; + key { [ space, space, space, nobreakspace ] }; + + // French uses a comma as decimal separator, but keyboards are labeled with a period + // Will take effect when KP_Decimal is mapped to the locale decimal separator + key { [ KP_Delete, period, KP_Delete, KP_Decimal ] }; + + include "level3(ralt_switch)" +}; + partial alphanumeric_keys xkb_symbols "Sundeadkeys" { diff -ur ../xkb.orig/symbols/inet ./symbols/inet --- ../xkb.orig/symbols/inet 2009-04-14 11:00:25.000000000 +0200 +++ ./symbols/inet 2009-04-20 12:57:41.000000000 +0200 @@ -1040,6 +1040,13 @@ key { [ XF86Start ] }; }; +// Logitech Elite Keyboard +partial alphanumeric_keys +xkb_symbols "logielite" { + key { [ XF86Messenger ] }; + key { [ XF86iTouch ] }; +}; + // Logitech Cordless Desktop EX110 partial alphanumeric_keys xkb_symbols "logiex110" { diff -ur ../xkb.orig/symbols.dir ./symbols.dir --- ../xkb.orig/symbols.dir 2009-04-14 11:00:25.000000000 +0200 +++ ./symbols.dir 2009-04-20 12:58:20.000000000 +0200 @@ -170,6 +170,7 @@ --p----- a------- nl(mac) -dp----- a------- bt(basic) -dp----- a------- fr(basic) +--p----- a------- fr(complete) --p----- a------- fr(Sundeadkeys) --p----- a------- fr(sundeadkeys) --p----- a------- fr(nodeadkeys) @@ -684,6 +685,7 @@ --p----- a------- inet(logiaccess) --p----- a------- inet(logicda) --p----- a------- inet(logicink) +--p----- a------- inet(logielite) --p----- a------- inet(logiex110) --p----- a------- inet(logiinkse) --p----- a------- inet(logiinkseusb)