svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

5 files changed, 163 insertions, 1 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part
index a18585680..a0fecdff1 100644
--- a/xorg-server/xkeyboard-config/rules/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/base.lists.part
@@ -50,7 +50,7 @@
               genius geniuscomfy2 \

               gyration honeywell_euroboard \

               hp250x hp5xx hp500fa hpdv5 \

-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \

+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \

               ibm_spacesaver ipaq inspiron intel \

               logiaccess logicda logicink \

               logiex110 logiclx300 \

@@ -104,3 +104,4 @@
                    lt lv nl no pl pt ro ru \

                    se sk tr tw ua

 

+! $htcdreamlayouts = us it de

diff --git a/xorg-server/xkeyboard-config/rules/base.m_g.part b/xorg-server/xkeyboard-config/rules/base.m_g.part
index eab19eb9d..978aac0c7 100644
--- a/xorg-server/xkeyboard-config/rules/base.m_g.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_g.part
@@ -8,6 +8,7 @@
   hpmini110	=	hp(mini110)

   hpdv5		=	hp(dv5)

   omnikey101	=	northgate(omnikey101)

+  sanwaskbkg3	=	sanwa(sanwaskbkg3)

  $pcmodels	=	pc(%m)

  $pcgeometries	=	pc(%m)

   everex	=	everex(STEPnote)

diff --git a/xorg-server/xkeyboard-config/rules/base.ml_s.part b/xorg-server/xkeyboard-config/rules/base.ml_s.part
index d59c54f26..22bf49a92 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_s.part
@@ -36,5 +36,7 @@
   olpc		$olpclayouts		=	olpc+%l%(m)

   olpc		*			=	olpc+%l%(v)

  $thinkpads   	br			=	pc+br(thinkpad)

+  htcdream	$htcdreamlayouts	=	%l(htcdream)

   *	   	$nonlatin		=	pc+us+%l%(v):2

   *		*			=	pc+%l%(v)

+  htcdream	us de it		=	%l(htcdream)

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 95e81ddb3..2b400e634 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -111,6 +111,7 @@
   esperanto:qwerty      =	+epo(qwerty)

   esperanto:dvorak      =	+epo(dvorak)

   terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)

+  keypad:pointerkeys	=	+keypad(pointerkeys)

   apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)

   shift:both_capslock                =       +shift(both_capslock)

   shift:lshift_both_capslock         =       +shift(lshift_both_capslock)

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 8c9b23d82..27cf6e6ff 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -449,6 +449,13 @@
     </model>

     <model>

       <configItem>

+        <name>htcdream</name>

+        <_description>HTC Dream</_description>

+        <vendor>HTC</vendor>

+      </configItem>

+    </model>

+    <model>

+      <configItem>

         <name>kinesis</name>

         <_description>Kinesis</_description>

         <vendor>Kinesis</vendor>

@@ -897,6 +904,13 @@
     </model>

     <model>

       <configItem>

+        <name>sanwaskbkg3</name>

+        <description>Sanwa Supply SKB-KG3</description>

+        <vendor>Sanwa Supply Inc.</vendor>

+      </configItem>

+    </model>

+    <model>

+      <configItem>

         <name>sk1300</name>

         <_description>SK-1300</_description>

 	<vendor>NEC</vendor>

@@ -1210,6 +1224,13 @@
         <vendor>Creative</vendor>

       </configItem>

     </model>

+    <model>

+      <configItem>

+       <name>htcdream</name>

+       <_description>Htc Dream phone</_description>

+       <vendor>htc</vendor>

+     </configItem>

+    </model>

   </modelList>

   <layoutList>

     <layout>

@@ -2954,6 +2975,12 @@
         </variant>

 	<variant>

           <configItem>

+            <name>kana86</name>

+            <_description>Kana 86</_description>

+          </configItem>

+	</variant>

+	<variant>

+          <configItem>

             <name>OADG109A</name>

             <_description>OADG 109A</_description>

           </configItem>

@@ -4518,6 +4545,130 @@
         <languageList><iso639Id>tsn</iso639Id></languageList>

       </configItem>

     </layout>

+    <layout>

+      <configItem>

+        <name>ph</name>

+        <_shortDescription>Phi</_shortDescription>

+        <_description>Philippines</_description>

+        <languageList><iso639Id>eng</iso639Id>

+                     <iso639Id>bik</iso639Id>

+                      <iso639Id>ceb</iso639Id>

+                      <iso639Id>fil</iso639Id>

+                      <iso639Id>hil</iso639Id>

+                      <iso639Id>ilo</iso639Id>

+                      <iso639Id>pam</iso639Id>

+                      <iso639Id>pag</iso639Id>

+                      <iso639Id>phi</iso639Id>

+                      <iso639Id>tgl</iso639Id>

+                      <iso639Id>war</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>qwerty-bay</name>

+            <_description>QWERTY (Baybayin)</_description>

+            <languageList><iso639Id>bik</iso639Id>

+                          <iso639Id>ceb</iso639Id>

+                          <iso639Id>fil</iso639Id>

+                          <iso639Id>hil</iso639Id>

+                          <iso639Id>ilo</iso639Id>

+                          <iso639Id>pam</iso639Id>

+                          <iso639Id>pag</iso639Id>

+                          <iso639Id>phi</iso639Id>

+                          <iso639Id>tgl</iso639Id>

+                          <iso639Id>war</iso639Id></languageList>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>capewell-dvorak</name>

+            <_description>Capewell-Dvorak (Latin)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>capewell-dvorak-bay</name>

+            <_description>Capewell-Dvorak (Baybayin)</_description>

+            <languageList><iso639Id>bik</iso639Id>

+                          <iso639Id>ceb</iso639Id>

+                          <iso639Id>fil</iso639Id>

+                          <iso639Id>hil</iso639Id>

+                          <iso639Id>ilo</iso639Id>

+                          <iso639Id>pam</iso639Id>

+                          <iso639Id>pag</iso639Id>

+                          <iso639Id>phi</iso639Id>

+                          <iso639Id>tgl</iso639Id>

+                          <iso639Id>war</iso639Id></languageList>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>capewell-qwerf2k6</name>

+            <_description>Capewell-QWERF 2006 (Latin)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>capewell-qwerf2k6-bay</name>

+            <_description>Capewell-QWERF 2006 (Baybayin)</_description>

+            <languageList><iso639Id>bik</iso639Id>

+                          <iso639Id>ceb</iso639Id>

+                          <iso639Id>fil</iso639Id>

+                          <iso639Id>hil</iso639Id>

+                          <iso639Id>ilo</iso639Id>

+                          <iso639Id>pam</iso639Id>

+                          <iso639Id>pag</iso639Id>

+                          <iso639Id>phi</iso639Id>

+                          <iso639Id>tgl</iso639Id>

+                          <iso639Id>war</iso639Id></languageList>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>colemak</name>

+            <_description>Colemak (Latin)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>colemak-bay</name>

+            <_description>Colemak (Baybayin)</_description>

+            <languageList><iso639Id>bik</iso639Id>

+                          <iso639Id>ceb</iso639Id>

+                          <iso639Id>fil</iso639Id>

+                          <iso639Id>hil</iso639Id>

+                          <iso639Id>ilo</iso639Id>

+                          <iso639Id>pam</iso639Id>

+                          <iso639Id>pag</iso639Id>

+                          <iso639Id>phi</iso639Id>

+                          <iso639Id>tgl</iso639Id>

+                          <iso639Id>war</iso639Id></languageList>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>dvorak</name>

+            <_description>Dvorak (Latin)</_description>

+          </configItem>

+        </variant>

+        <variant>

+          <configItem>

+            <name>dvorak-bay</name>

+            <_description>Dvorak (Baybayin)</_description>

+            <languageList><iso639Id>bik</iso639Id>

+                          <iso639Id>ceb</iso639Id>

+                          <iso639Id>fil</iso639Id>

+                          <iso639Id>hil</iso639Id>

+                          <iso639Id>ilo</iso639Id>

+                          <iso639Id>pam</iso639Id>

+                          <iso639Id>pag</iso639Id>

+                          <iso639Id>phi</iso639Id>

+                          <iso639Id>tgl</iso639Id>

+                          <iso639Id>war</iso639Id></languageList>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

   </layoutList>

   <optionList>

     <group allowMultipleSelection="true">

@@ -5304,6 +5455,12 @@
           <description>Both Shift-Keys together toggle ShiftLock</description>

         </configItem>

       </option>

+      <option>

+        <configItem>

+          <name>keypad:pointerkeys</name>

+          <_description>Toggle PointerKeys with Shift + NumLock.</_description>

+        </configItem>

+      </option>

     </group>

     <group allowMultipleSelection="true">

       <!-- Special shortcuts for the Euro character -->