From bf2447245dbef69092381ed459a6358746a65520 Mon Sep 17 00:00:00 2001 From: svu Date: Sun, 25 Jun 2006 21:23:53 +0000 Subject: Added Dell Lattitude, b.fd.o#6894 --- ChangeLog | 5 ++ geometry/pc | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++ rules/base.lists.part | 3 + rules/base.m_g.part | 5 +- rules/base.xml.in | 6 ++ symbols/inet | 6 ++ 6 files changed, 206 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d819a086..0b5301bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-25 Sergey Udaltsov + + rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude, + https://bugs.freedesktop.org/show_bug.cgi?id=6894 + 2006-06-25 Sergey Udaltsov symbols/inet, rules/base.xml.in: added 2 new layouts, closing diff --git a/geometry/pc b/geometry/pc index ca9ba3c2..943d22af 100644 --- a/geometry/pc +++ b/geometry/pc @@ -1318,3 +1318,188 @@ xkb_geometry "kr106" { alias = ; }; // End of "kr106" geometry + +// Based on the pc(basic) layout. The keypad, sysreq/ScrLk/Break, and multimedia +// keys are not shown because they are shared with other keys via the key. +// This should not be a problem if the normal symbols are used, as the keys will +// show through normally, they just won't show from xkbprint. For the record, +// + = AudioRaise, +// + = AudioLower, +// + = AudioMute, +// + = Sysreq, +// + = ScrollLock, +// + = , +// +7 = KP_7, +// +8 = KP_8, +// +9 = KP_9, +// +0 = KP_MUL, +// +U = KP_4, +// +I = KP_5, +// +O = KP_6, +// +P = KP_SUB, +// +J = KP_1, +// +K = KP_2, +// +L = KP_3, +// +; = KP_ADD, +// +M = KP_INS, +// +. = KP_DEL, +// +/ = KP_DIV. +// The other FN combinations aren't passed to X, but are handled by BIOS. +// and all keys with level mappings are marked in grey20. +// +// David Cameron Staples 2006-05-12 + +xkb_geometry "latitude" { + + description= "Dell Latitude"; + width= 330; + height= 210; + + shape.cornerRadius= 1; + shape "NORM" { { [ 18 ,18] }, { [2,1 ], [ 16,16] } }; + shape "FUNC" { { [ 16.2,12] }, { [2,0.5], [ 14,10] } }; + shape "ESC" { { [ 18 ,12] }, { [2,0.5], [ 16,10] } }; + shape "BKSP" { { [ 38 ,18] }, { [2,1 ], [ 36,16] } }; + shape "TABK" { { [ 28 ,18] }, { [2,1 ], [ 26,16] } }; + shape "BKSL" { { [ 28 ,18] }, { [2,1 ], [ 26,16] } }; + shape "RTRN" { { [ 42 ,18] }, { [2,1 ], [ 40,16] } }; + shape "CAPS" { { [ 33 ,18] }, { [2,1 ], [ 26,16] } }; + shape "LFSH" { { [ 42 ,18] }, { [2,1 ], [ 40,16] } }; + shape "RTSH" { { [ 52 ,18] }, { [2,1 ], [ 50,16] } }; + shape "SPCE" { { [ 95 ,18] }, { [2,1 ], [ 93,16] } }; + shape "LCTL" { { [ 28 ,14] }, { [2,1 ], [ 26,12] } }; + shape "LALT" { { [ 22 ,14] }, { [2,1 ], [ 20,12] } }; + shape "WIN" { { [ 18 ,14] }, { [2,1 ], [ 16,12] } }; + + shape "LED" { cornerRadius= 0.5, { [ 1, 3 ] } }; + + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 37; + indicator.shape= "LED"; + indicator "Num Lock" { left= 138; }; + indicator "Caps Lock" { left= 150; }; + indicator "Scroll Lock" { left= 162; }; + text.top= 33; + text.color= "black"; + text "NumLockLabel" { left= 140; text="Num\nLock"; }; + text "CapsLockLabel" { left= 152; text="Caps\nLock"; }; + text "ScrollLockLabel" { left= 164; text="Scroll\nLock"; }; + + text "LATITUDE" { left= 19; text="L A T I T U D E"; }; + + section.left= 19; + row.left= 1; + key.shape= "NORM"; + key.gap= 1; + section "Function" { + top= 32; + key.shape= "FUNC"; + key.color= "grey20"; + row { + top= 1; + left= 163.8; + keys { { , color="white" }, , , , + { , 3, color="white" }, + { , color="white"}, + }; + }; + row { + top= 14; + keys { { , "ESC" }, + { , 3 }, + { , color="white" }, , + { , color="white" }, + { , 3 }, + { , color="white" }, , , + { , 3, color="white" }, , + { , color="white" }, + { , color="white" }, + { , 3, color="white" }, , + }; + }; + }; // End of "Function" section + + section "Alpha" { + top= 60; + row { + top= 1; + keys { , , , , , + , , + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, , , + { , "BKSP" } + }; + }; + row { + top= 20; + keys { { , "TABK" }, + , , , , , + , + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, + , , { , "BKSL" } + }; + }; + row { + top= 39; + keys { { , "CAPS" }, + , , , , , + , + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, + { , color="grey20" }, + , { , "RTRN" } + }; + }; + row { + top= 58; + keys { { , "LFSH" }, + , , , , , + , + { , color="grey20" }, , + { , color="grey20" }, + { , color="grey20" }, + { , "RTSH" } + }; + }; + row { + top= 77; + key.shape= "WIN"; + keys { { , "LCTL" }, + { , color="grey20" }, + , + { , "LALT" }, + { , "SPCE" }, + , + { , "LALT" } + }; + }; + }; // End of "Alpha" section + + section "Editing" { + top= 136; + left= 250; + key.shape= "FUNC"; + key.color= "grey20"; + row { + top= 1; + left= 18.2; + keys { }; + }; + row { + top= 14; + keys { , , }; + }; + }; // End of "Editing" section + + alias = ; + alias = ; + +}; // End of "latitude" geometry + diff --git a/rules/base.lists.part b/rules/base.lists.part index 4d0e8b6b..3c20843d 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -6,6 +6,9 @@ // ru scc sy syr tel th tj tam ua uz ! $pcmodels = pc101 pc102 pc104 pc105 + +! $pcgeometries = abnt2 latitude microsoft jp106 kr106 + ! $maclaptop = ibook powerbook ! $mac = macintosh macintosh_old ibook powerbook diff --git a/rules/base.m_g.part b/rules/base.m_g.part index 7c6610fd..2d65238f 100644 --- a/rules/base.m_g.part +++ b/rules/base.m_g.part @@ -1,4 +1,3 @@ - microsoft = microsoft(natural) microsoftpro = microsoft(natural) microsoftprousb = microsoft(natural) microsoftprose = microsoft(natural) @@ -8,11 +7,9 @@ omnikey101 = northgate(omnikey101) thinkpad = ibm_vndr/thinkpad(common) $pcmodels = pc(%m) - jp106 = pc(jp106) - kr106 = pc(kr106) + $pcgeometries = pc(%m) everex = everex(STEPnote) winbook = winbook(XP5) pc98 = nec(pc98) - abnt2 = pc(abnt2) $mac = macintosh(macintosh) * = pc(pc104) diff --git a/rules/base.xml.in b/rules/base.xml.in index aabde16d..785e80ad 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -32,6 +32,12 @@ <_description>Dell 101-key PC + + + latitude + <_description>Dell Latitude series laptop + + everex diff --git a/symbols/inet b/symbols/inet index ad9f476c..19103345 100644 --- a/symbols/inet +++ b/symbols/inet @@ -618,6 +618,12 @@ xkb_symbols "inspiron" { key { [ XF86AudioPlay, XF86AudioPause ] }; }; +partial alphanumeric_keys +xkb_symbols "latitude" { + key { [ XF86AudioMute ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; +}; // Dexxa -- cgit v1.2.3