Dell Precision M65, b.fd.o#7992

6 files changed, 382 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8aeb8c97..d2de28b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-05  Sergey Udaltsov
+
+	* symbols/inet, geometry/dell, rules/base.m_g.part,
+	rules/base.lists.part: adding dell precision m65,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7992
+
 2007-09-04  Sergey Udaltsov
 
 	* symbols/it, rules/base.xml.in: added strange one, it(geo),
diff --git a/geometry/dell b/geometry/dell
index 37008328..76f135e2 100644
--- a/geometry/dell
+++ b/geometry/dell
@@ -181,3 +181,362 @@ default xkb_geometry "dell101" {
     alias <AA00> = <LCTL>;
 
 }; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    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] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+
diff --git a/rules/base.lists.part b/rules/base.lists.part
index b75331f8..b11ce7dc 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -33,7 +33,7 @@
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 \
               cymotionlinux \
-              dell inspiron precision_m dellusbmm dtk2000 \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
               emachines ennyah_dkb1008 evdev \
               genius geniuscomfy geniuscomfy2 geniuskb19e \
               gyration honeywell_euroboard \
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 412d902a..a1b2fb9b 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -1,5 +1,6 @@
  $msmodels	=	microsoft(natural)
   dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 005dc452..e77f127d 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -46,6 +46,12 @@
     </model>
     <model>
       <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>everex</name>
         <_description>Everex STEPnote</_description>
         <vendor>Everex</vendor>
diff --git a/symbols/inet b/symbols/inet
index 35de6415..e3561209 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -754,6 +754,14 @@ xkb_symbols "dell" {
     key <I5F>	{	[ XF86Standby		]	};
 };
 
+// Dell Precision M65
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+    include "inet(media_common)"
+    key <I04>   {       [ XF86PowerOff          ]       };
+    key <LWIN>  {       [ Super_L               ]       };
+};
+
 // Genius KB-19e NB
 partial alphanumeric_keys
 xkb_symbols "geniuskb19e" {
@@ -2186,3 +2194,4 @@ xkb_symbols "classmate" {
     key <I2E>   {       [ XF86AudioLowerVolume  ] };	
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
 };
+