svn merge ^/branches/released .

5 files changed, 497 insertions, 443 deletions

diff --git a/xorg-server/dbe/midbe.c b/xorg-server/dbe/midbe.c
index 15ae85b36..76d2e00aa 100644
--- a/xorg-server/dbe/midbe.c
+++ b/xorg-server/dbe/midbe.c
@@ -202,12 +202,6 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
             return (rc == Success) ? BadAlloc : rc;

         }

 

-

-        /* Attach the priv priv to the priv. */

-	dixSetPrivate(&pDbeWindowPriv->devPrivates, miDbeWindowPrivPrivKey,

-		      pDbeWindowPrivPriv);

-

-

         /* Clear the back buffer. */

         pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);

         if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC))

diff --git a/xorg-server/dbe/midbestr.h b/xorg-server/dbe/midbestr.h
index ae9f206fc..efbe9b28e 100644
--- a/xorg-server/dbe/midbestr.h
+++ b/xorg-server/dbe/midbestr.h
@@ -1,95 +1,79 @@
-/******************************************************************************
- * 
- * Copyright (c) 1994, 1995  Hewlett-Packard Company
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- * Except as contained in this notice, the name of the Hewlett-Packard
- * Company shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the Hewlett-Packard Company.
- * 
- *     Header file for users of machine-independent DBE code
- * 
- *****************************************************************************/
-
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef MIDBE_STRUCT_H
-#define MIDBE_STRUCT_H
-
-
-/* DEFINES */
-
-#define MI_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv) \
-    (!(pDbeWindowPriv) ? NULL : (MiDbeWindowPrivPrivPtr) \
-     dixLookupPrivate(&(pDbeWindowPriv)->devPrivates, miDbeWindowPrivPrivKey))
-
-#define MI_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin)\
-    MI_DBE_WINDOW_PRIV_PRIV(DBE_WINDOW_PRIV(pWin))
-
-#define MI_DBE_SCREEN_PRIV_PRIV(pDbeScreenPriv) \
-    (!(pDbeScreenPriv) ? NULL : (MiDbeScreenPrivPrivPtr) \
-     dixLookupPrivate(&(pDbeScreenPriv)->devPrivates, miDbeScreenPrivPrivKey))
-
-
-/* TYPEDEFS */
-
-typedef struct _MiDbeWindowPrivPrivRec
-{
-    /* Place machine-specific fields in here.
-     * Since this is mi code, we do not really have machine-specific fields.
-     */
-
-    /* Pointer to a drawable that contains the contents of the back buffer.
-     */
-    PixmapPtr		pBackBuffer;
-
-    /* Pointer to a drawable that contains the contents of the front buffer.
-     * This pointer is only used for the XdbeUntouched swap action.  For that
-     * swap action, we need to copy the front buffer (window) contents into
-     * this drawable, copy the contents of current back buffer drawable (the
-     * back buffer) into the window, swap the front and back drawable pointers,
-     * and then swap the drawable/resource associations in the resource
-     * database.
-     */
-    PixmapPtr		pFrontBuffer;
-
-    /* Pointer back to our window private with which we are associated. */
-    DbeWindowPrivPtr	pDbeWindowPriv;
-
-} MiDbeWindowPrivPrivRec, *MiDbeWindowPrivPrivPtr;
-
-typedef struct _MiDbeScreenPrivPrivRec
-{
-    /* Place machine-specific fields in here.
-     * Since this is mi code, we do not really have machine-specific fields.
-     */
-
-    /* Pointer back to our screen private with which we are associated. */
-    DbeScreenPrivPtr	pDbeScreenPriv;
-
-} MiDbeScreenPrivPrivRec, *MiDbeScreenPrivPrivPtr;
-
-#endif /* MIDBE_STRUCT_H */
-
+/******************************************************************************

+ * 

+ * Copyright (c) 1994, 1995  Hewlett-Packard Company

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sublicense, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+ * IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,

+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ * Except as contained in this notice, the name of the Hewlett-Packard

+ * Company shall not be used in advertising or otherwise to promote the

+ * sale, use or other dealings in this Software without prior written

+ * authorization from the Hewlett-Packard Company.

+ * 

+ *     Header file for users of machine-independent DBE code

+ * 

+ *****************************************************************************/

+

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef MIDBE_STRUCT_H

+#define MIDBE_STRUCT_H

+

+

+/* DEFINES */

+

+#define MI_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv) \

+    (!(pDbeWindowPriv) ? NULL : (MiDbeWindowPrivPrivPtr) \

+     dixLookupPrivate(&(pDbeWindowPriv)->devPrivates, miDbeWindowPrivPrivKey))

+

+#define MI_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin)\

+    MI_DBE_WINDOW_PRIV_PRIV(DBE_WINDOW_PRIV(pWin))

+

+/* TYPEDEFS */

+

+typedef struct _MiDbeWindowPrivPrivRec

+{

+    /* Place machine-specific fields in here.

+     * Since this is mi code, we do not really have machine-specific fields.

+     */

+

+    /* Pointer to a drawable that contains the contents of the back buffer.

+     */

+    PixmapPtr		pBackBuffer;

+

+    /* Pointer to a drawable that contains the contents of the front buffer.

+     * This pointer is only used for the XdbeUntouched swap action.  For that

+     * swap action, we need to copy the front buffer (window) contents into

+     * this drawable, copy the contents of current back buffer drawable (the

+     * back buffer) into the window, swap the front and back drawable pointers,

+     * and then swap the drawable/resource associations in the resource

+     * database.

+     */

+    PixmapPtr		pFrontBuffer;

+

+    /* Pointer back to our window private with which we are associated. */

+    DbeWindowPrivPtr	pDbeWindowPriv;

+

+} MiDbeWindowPrivPrivRec, *MiDbeWindowPrivPrivPtr;

+

+#endif /* MIDBE_STRUCT_H */

+

diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part
index ba4dd779b..4cf47331a 100644
--- a/xorg-server/xkbdata.src/rules/base.lists.part
+++ b/xorg-server/xkbdata.src/rules/base.lists.part
@@ -52,6 +52,7 @@
               hp250x hp5xx hp500fa hpdv5 \

               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \

               ibm_spacesaver ipaq inspiron intel \

+              kinesis \

               logiaccess logicda logicink \

               logiex110 logiclx300 \

               logiinkse logiinkseusb logiitc logiik \

diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index 1e68bb6ca..0372ed4a8 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -449,6 +449,13 @@
     </model>

     <model>

       <configItem>

+        <name>kinesis</name>

+        <_description>Kinesis</_description>

+        <vendor>Kinesis</vendor>

+      </configItem>

+    </model>

+    <model>

+      <configItem>

         <name>logitech_base</name>

         <_description>Logitech Generic Keyboard</_description>

         <vendor>Logitech</vendor>

@@ -556,42 +563,42 @@
       <configItem>

         <name>rapidaccess</name>

         <_description>IBM Rapid Access</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

       <configItem>

         <name>rapidaccess2</name>

         <_description>IBM Rapid Access II</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

       <configItem>

         <name>thinkpad</name>

         <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

       <configItem>

         <name>thinkpad60</name>

         <_description>IBM ThinkPad R60/T60/R61/T61</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

       <configItem>

         <name>thinkpadz60</name>

         <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

       <configItem>

         <name>ibm_spacesaver</name>

         <_description>IBM Space Saver</_description>

-        <vendor>IBM</vendor>

+        <vendor>Lenovo (previously IBM)</vendor>

       </configItem>

     </model>

     <model>

@@ -4271,6 +4278,13 @@
             <languageList><iso639Id>ara</iso639Id></languageList>

           </configItem>

         </variant>

+        <variant>

+          <configItem>

+            <name>snd</name>

+            <_description>Sindhi</_description>

+            <languageList><iso639Id>sd</iso639Id></languageList>

+          </configItem>

+        </variant>

       </variantList>

     </layout>

     <layout>

diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkbdata.src/symbols/pk
index 320e1c2a7..da1198772 100644
--- a/xorg-server/xkbdata.src/symbols/pk
+++ b/xorg-server/xkbdata.src/symbols/pk
@@ -1,336 +1,397 @@
-// $XKeyboardConfig$
-
-// Urdu keymap
-// Developed by:
-// Zaeem Arshad <zaeem@linux.net.pk>
-// Last update: 2004-03-12
-//Notice:
-//Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.
-
-// based on a keyboard map from an 'xkb/symbols/ur' file
-// $XFree86$
-
-partial default alphanumeric_keys
-xkb_symbols "urd-phonetic" {
-
-   name[Group1]= "Pakistan";
-
-   key <TLDE> {  [     0x100064b  ,       0x100007E, 0x100200C     ]     };
-   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
-   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
-   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
-   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
-   key <AE05> {  [     0x1000035  ,       0x1000025      ]     };
-   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
-   key <AE07> {  [     0x1000037  ,       0x1000026      ]     };
-   key <AE08> {  [     0x1000038  ,       0x100002A      ]     };
-   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
-   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
-   key <AE11> {  [     0x100002D  ,       0x100005F      ]     };
-   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
-   key <AD01> {  [     0x1000642  ,       0x1000652, 0x100200D     ]     };
-   key <AD02> {  [     0x1000648  ,       0x1000624, 0x100200C     ]     };
-   key <AD03> {  [     0x1000639  ,       0x1000670      ]     };
-   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };
-   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };
-   key <AD06> {  [     0x10006d2  ,       0x100064E      ]     };
-   key <AD07> {  [     0x1000621  ,       0x1000626      ]     };
-   key <AD08> {  [     0x10006cc  ,       0x1000650      ]     };
-   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
-   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };
-   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
-   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
-
-   key <AC01> {  [     0x1000627  ,       0x1000622    ]     };
-   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };
-   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };
-   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
-   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
-   key <AC06> {  [     0x100062D,       0x10006BE      ]     };
-   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };
-   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
-   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
-   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
-   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
-   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
-
-   key <LSGT> {  [            bar ,       brokenbar      ]     };
-   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100200E    ]     };
-   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100202A      ]     };
-   key <AB03> {  [     0x1000686  ,       0x100062b, 0x100202D     ]     };
-   key <AB04> {  [     0x1000637  ,       0x1000638, 0x100202C      ]     };
-   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100202E      ]     };
-   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x100202B      ]     };
-   key <AB07> {  [     0x1000645  ,       0x1000658, 0x100200F     ]     };
-   key <AB08> {  [     0x100060c  ,       0x100003c      ]     };
-   key <AB09> {  [     0x10006d4  ,       0x100003E      ]     };
-   key <AB10> {  [     0x100002f  ,       0x100061f      ]     };
-
-//   key <RALT> {  [ Mode_switch, Multi_key ] };
-
-   include "level3(ralt_switch)"
-
-   // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "urd-crulp" {
-
-   name[Group1]= "Pakistan - CRULP";
-// www.crulp.org phonetic v1.1
-
-   key <TLDE> {  [     0x100007E  ,       0x100064B      ]     };
-   key <AE01> {  [     0x10006F1  ,       0x1000031, 0x1000021   ]     };
-   key <AE02> {  [     0x10006F2  ,       0x1000032, 0x1000040      ]     };
-   key <AE03> {  [     0x10006F3  ,       0x1000033, 0x1000023      ]     };
-   key <AE04> {  [     0x10006F4  ,       0x1000034      ]     };
-   key <AE05> {  [     0x10006F5  ,       0x1000035, 0x100066A      ]     };
-   key <AE06> {  [     0x10006F6  ,       0x1000036     ]     };
-   key <AE07> {  [     0x10006F7  ,       0x1000037, 0x1000026       ]     };
-   key <AE08> {  [     0x10006F8  ,       0x1000038, 0x100002A      ]     };
-   key <AE09> {  [     0x10006F9  ,       0x1000039, 0x1000029      ]     };
-   key <AE10> {  [     0x10006F0  ,       0x1000030, 0x1000028      ]     };
-   key <AE11> {  [     0x100002D  ,       0x100005F 	     ]     };
-   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };   
-   key <AD01> {  [     0x1000642  ,       0x1000652  ]     };
-   key <AD02> {  [     0x1000648  ,       0x1000651, 0x1000602    ]     };
-   key <AD03> {  [     0x1000639  ,       0x1000670, 0x1000656      ]     };
-   key <AD04> {  [     0x1000631  ,       0x1000691, 0x1000613      ]     };
-   key <AD05> {  [     0x100062a  ,       0x1000679, 0x1000614      ]     };
-   key <AD06> {  [     0x10006d2  ,       0x100064E, 0x1000601      ]     };
-   key <AD07> {  [     0x1000621  ,       0x1000626, 0x1000654      ]     };
-   key <AD08> {  [     0x10006cc  ,       0x1000650,  0x1000611      ]     };
-   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
-   key <AD10> {  [     0x100067e  ,       0x100064f,  0x1000657      ]     };
-   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
-   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
-
-   key <AC01> {  [     0x1000627  ,       0x1000622, 0x100FDF2    ]     };
-   key <AC02> {  [     0x1000633  ,       0x1000635, 0x1000610    ]     };
-   key <AC03> {  [     0x100062f  ,       0x1000688, 0x100FDFA     ]     };
-   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
-   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
-   key <AC06> {  [     0x100062D,       0x10006BE, 0x1000612      ]     };
-   key <AC07> {  [     0x100062c  ,       0x1000636, 0x100FDFB      ]     };
-   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
-   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
-   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
-   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
-   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
-
-   key <LSGT> {  [            bar ,       brokenbar      ]     };
-   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100060F    ]     };
-   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100060E      ]     };
-   key <AB03> {  [     0x1000686  ,       0x100062b, 0x1000603	     ]     };
-   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };
-   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100FDFD	      ]     };
-   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x1000600	      ]     };
-   key <AB07> {  [     0x1000645  ,       0x1000658    ]     };
-   key <AB08> {  [     0x100060c  ,       0x100003c, 0x100003C      ]     };
-   key <AB09> {  [     0x10006d4  ,       0x100066B, 0x100003E      ]     };
-   key <AB10> {  [     0x100002f   ,       0x100061F      ]     };
-
-//   key <RALT> {  [ Mode_switch, Multi_key ] };
-
-   include "level3(ralt_switch)"
-
-   // End alphanumeric section
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "urd-nla" {
-   name[Group1]= "Pakistan - NLA";
-// www.nla.gov.pk
-
-   key <TLDE> {  [     0x1000060  ,       0x100007E, 0x100200C     ]     };
-   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
-   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
-   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
-   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
-   key <AE05> {  [     0x1000035  ,       0x100066A      ]     };
-   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
-   key <AE07> {  [     0x1000037  ,       0x10006D6      ]     };
-   key <AE08> {  [     0x1000038  ,       0x100066D      ]     };
-   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
-   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
-   key <AE11> {  [     0x100002D ,        0x100005F      ]     };
-   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
-   key <AD01> {  [     0x1000637  ,       0x1000638, 0x100200D      ]     };
-   key <AD02> {  [     0x1000635  ,       0x1000636, 0x100200C     ]     };
-   key <AD03> {  [     0x10006BE  ,       0x1000630      ]     };
-   key <AD04> {  [     0x100062F ,        0x1000688     ]     };
-   key <AD05> {  [     0x1000679  ,       0x100062B      ]     };
-   key <AD06> {  [     0x100067E  ,       0x1000651      ]     };
-   key <AD07> {  [     0x100062A  ,       0x10006C3      ]     };
-   key <AD08> {  [     0x1000628  ,       0x1000640      ]     };
-   key <AD09> {  [     0x100062C  ,       0x1000686      ]     };
-   key <AD10> {  [     0x100062D  ,       0x100062E      ]     };
-   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
-   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
-
-   key <AC01> {  [     0x1000645  ,       0x1000698      ]     };
-   key <AC02> {  [     0x1000648  ,       0x1000632      ]     };
-   key <AC03> {  [     0x1000631  ,       0x1000691      ]     };
-   key <AC04> {  [     0x1000646  ,       0x10006BA      ]     };
-   key <AC05> {  [     0x1000644  ,       0x10006C2      ]     };
-   key <AC06> {  [     0x10006C1  ,       0x1000621      ]     };
-   key <AC07> {  [     0x1000627  ,       0x1000622      ]     };
-   key <AC08> {  [     0x10006a9  ,       0x10006AF      ]     };
-   key <AC09> {  [     0x10006CC  ,       0x100064A      ]     };
-   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
-   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
-   key <BKSL> {  [     0x100005C ,        0x100007C      ]     };
-
-   key <LSGT> {  [            bar ,       brokenbar      ]     };
-   key <AB01> {  [     0x1000642  ,       0x100200D, 0x100200E     ]     };
-   key <AB02> {  [     0x1000641  ,       0x100200C, 0x100202A      ]     };
-   key <AB03> {  [     0x10006D2  ,       0x10006D3, 0x100202D     ]     };
-   key <AB04> {  [     0x1000633  ,       0x100200E, 0x100202C      ]     };
-   key <AB05> {  [     0x1000634  ,       0x1000624, 0x100202E      ]     };
-   key <AB06> {  [     0x100063A  ,       0x1000626, 0x100202B      ]     };
-   key <AB07> {  [     0x1000639  ,       0x100200F, 0x100200F      ]     };
-   key <AB08> {  [     0x100060c  ,       0x100003E      ]     };
-   key <AB09> {  [     0x10006d4  ,       0x100003C      ]     };
-   key <AB10> {  [     0x100002F  ,       0x100061f      ]     };
-
-   
-   include "level3(ralt_switch)"
-
-   // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "ara" {
-   name[Group1]= "Pakistan - Arabic";
-
-// NOTES:
-//
-// there is also combined shadda diacritis in AltGr position of simple
-// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
-// should a third state be added to Group2 ?
-//
-// How is this different from ara(basic)? --bernie
-
-   key <TLDE> {  [     0x100064d  ,       0x100064b      ]     };
-   key <AE01> {  [     0x10006F1  ,       0x1000021      ]     };
-   key <AE02> {  [     0x10006F2  ,       0x1000003      ]     };
-   key <AE03> {  [     0x10006F3  ,       0x100002f      ]     };
-   key <AE04> {  [     0x10006F4  ,       0x1000626      ]     };
-   key <AE05> {  [     0x10006F5  ,       0x1000003      ]     };
-   key <AE06> {  [     0x10006F6  ,       0x10006d6      ]     };
-   key <AE07> {  [     0x10006F7  ,       0x1000654      ]     };
-   key <AE08> {  [     0x10006F8  ,       0x100064c      ]     };
-   key <AE09> {  [     0x10006F9  ,       0x1000029      ]     };
-   key <AE10> {  [     0x10006F0  ,       0x1000028      ]     };
-   key <AE11> {  [     0x1000623  ,       0x1000651      ]     };
-   key <AE12> {  [     0x1000624  ,       0x1000622      ]     };
-   key <AD01> {  [     0x1000642  ,       0x1000652      ]     };
-   key <AD02> {  [     0x1000648  ,       0x10000a3      ]     };
-   key <AD03> {  [     0x1000639  ,       0x10000a5      ]     };
-   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };
-   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };
-   key <AD06> {  [     0x10006d2  ,       0x1000601      ]     };
-   key <AD07> {  [     0x1000621  ,       0x100060c      ]     };
-   key <AD08> {  [     0x10006cc  ,       0x1000670      ]     };
-   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
-   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };
-   key <AD11> {  [     0x100005d  ,       0x1000670      ]     };
-   key <AD12> {  [     0x100005b  ,       0x1000670      ]     };
-
-   key <AC01> {  [     0x1000627  ,       0x1000653      ]     };
-   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };
-   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };
-   key <AC04> {  [     0x1000641  ,       0x1000003      ]     };
-   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
-   key <AC06> {  [     0x10006be  ,       0x100062d      ]     };
-   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };
-   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
-   key <AC09> {  [     0x1000644  ,       0x1000613      ]     };
-   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
-   key <AC11> {  [     0x1000670  ,       0x1000022       ]     };
-   key <BKSL> {  [     0x100060e ,        0x1000614      ]     };
-
-   key <LSGT> {  [            bar ,       brokenbar      ]     };
-   key <AB01> {  [     0x1000632  ,       0x1000630      ]     };
-   key <AB02> {  [     0x1000634  ,       0x1000698      ]     };
-   key <AB03> {  [     0x1000686  ,       0x100062b      ]     };
-   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };
-   key <AB05> {  [     0x1000628  ,       0x1000612      ]     };
-   key <AB06> {  [     0x1000646  ,       0x10006ba      ]     };
-   key <AB07> {  [     0x1000645  ,       0x1000003      ]     };
-   key <AB08> {  [     0x100060c  ,       0x1000650      ]     };
-   key <AB09> {  [     0x10006d4  ,       0x100064e      ]     };
-   key <AB10> {  [     0x1000003  ,       0x100061f      ]     };
-
-   // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-// Contact: Walter Bender <walter@laptop.org>
-
-   include "pk(ara)"
-
-   name[Group1]= "Pakistan";
-
-   // Keys '~' - '='
-   key <TLDE> {  [ 0x1000654, 0x100064B ] };
-   key <AE01> {  [ 0x10006F1, 0x1000603 ] };
-   key <AE02> {  [ 0x10006F2, 0x1000602 ] };
-   key <AE03> {  [ 0x10006F3, 0x1000601 ] };
-   key <AE04> {  [ 0x10006F4, 0x1000600 ] };
-   key <AE05> {  [ 0x10006F5, 0x100060F ] };
-   key <AE06> {  [ 0x10006F6, 0x100060E ] };
-   key <AE07> {  [ 0x10006F7, 0x1000614 ] };
-   key <AE08> {  [ 0x10006F8, 0x1000612 ] };
-   key <AE09> {  [ 0x10006F9, 0x1000611 ] };
-   key <AE10> {  [ 0x10006F0, 0x1000613 ] };
-   key <AE11> {  [ minus,     0x1000610 ] };
-   key <AE12> {  [ equal, plus ] };
-
-   //Keys 'Q' - ']'
-   key <AD01> {  [ 0x1000642, 0x1000652 ] };
-   key <AD02> {  [ 0x1000648, 0x1000651 ] };
-   key <AD03> {  [ 0x1000639, 0x1000670 ] };
-   key <AD04> {  [ 0x1000631, 0x1000691 ] };
-   key <AD05> {  [ 0x100062A, 0x1000679 ] };
-   key <AD06> {  [ 0x10006D2, 0x100064E ] };
-   key <AD07> {  [ 0x1000621, 0x1000626 ] };
-   key <AD08> {  [ 0x10006CC, 0x1000650 ] };
-   key <AD09> {  [ 0x10006C1, 0x10006C3 ] };
-   key <AD10> {  [ 0x100067E, 0x100064F ] };
-   key <AD12> {  [ 0x100FDFD, 0x100FDFA ] };
-   key <AD11> {  [ 0x100FDF2, 0x100FDFB ] };
-
-   // Keys 'A' - '''
-   key <AC01> {  [ 0x1000627, 0x1000622 ] };
-   key <AC02> {  [ 0x1000633, 0x1000635 ] };
-   key <AC03> {  [ 0x100062F, 0x1000688 ] };
-   key <AC04> {  [ 0x1000641 ] }; //shift key not available
-   key <AC05> {  [ 0x10006AF, 0x100063A ] };
-   key <AC06> {  [ 0x100062D, 0x10006BE ] };
-   key <AC07> {  [ 0x100062C, 0x1000636 ] };
-   key <AC08> {  [ 0x10006A9, 0x100062E ] };
-   key <AC09> {  [ 0x1000644, 0x1000656 ] };
-   key <AC10> {  [ 0x100061B, colon ] };
-   key <AC11> {  [ quote, doublequote  ] };
-
-   key <BKSL> { [  backslash, bar  ] };
-   key <SPCE> { [  space  ] };
-
-   // Keys: 'Z' - '/'
-   key <AB01> {  [ 0x1000632, 0x1000622 ] };
-   key <AB02> {  [ 0x1000634, 0x1000635 ] };
-   key <AB03> {  [ 0x1000686, 0x1000688 ] };
-   key <AB04> {  [ 0x1000637 ] }; //shift key unavailable
-   key <AB05> {  [ 0x1000628, 0x100063A ] };
-   key <AB06> {  [ 0x1000646, 0x10006BE ] };
-   key <AB07> {  [ 0x1000645, 0x1000636 ] };
-   key <AB08> {  [ 0x100060C, 0x100062E ] };
-   key <AB09> {  [ 0x10006D4, 0x1000656 ] };
-   key <AB10> {  [ slash,     0x100061F ] };
-
-   include "group(olpc)"
-};
+// $XKeyboardConfig$

+

+// Urdu keymap

+// Developed by:

+// Zaeem Arshad <zaeem@linux.net.pk>

+// Last update: 2004-03-12

+//Notice:

+//Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.

+

+// based on a keyboard map from an 'xkb/symbols/ur' file

+// $XFree86$

+

+partial default alphanumeric_keys

+xkb_symbols "urd-phonetic" {

+

+   name[Group1]= "Pakistan";

+

+   key <TLDE> {  [     0x100064b  ,       0x100007E, 0x100200C     ]     };

+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };

+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };

+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };

+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };

+   key <AE05> {  [     0x1000035  ,       0x1000025      ]     };

+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };

+   key <AE07> {  [     0x1000037  ,       0x1000026      ]     };

+   key <AE08> {  [     0x1000038  ,       0x100002A      ]     };

+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };

+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };

+   key <AE11> {  [     0x100002D  ,       0x100005F      ]     };

+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };

+   key <AD01> {  [     0x1000642  ,       0x1000652, 0x100200D     ]     };

+   key <AD02> {  [     0x1000648  ,       0x1000624, 0x100200C     ]     };

+   key <AD03> {  [     0x1000639  ,       0x1000670      ]     };

+   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };

+   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };

+   key <AD06> {  [     0x10006d2  ,       0x100064E      ]     };

+   key <AD07> {  [     0x1000621  ,       0x1000626      ]     };

+   key <AD08> {  [     0x10006cc  ,       0x1000650      ]     };

+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };

+   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };

+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };

+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };

+

+   key <AC01> {  [     0x1000627  ,       0x1000622    ]     };

+   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };

+   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };

+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };

+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };

+   key <AC06> {  [     0x100062D,       0x10006BE      ]     };

+   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };

+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };

+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };

+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };

+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };

+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };

+

+   key <LSGT> {  [            bar ,       brokenbar      ]     };

+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100200E    ]     };

+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100202A      ]     };

+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x100202D     ]     };

+   key <AB04> {  [     0x1000637  ,       0x1000638, 0x100202C      ]     };

+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100202E      ]     };

+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x100202B      ]     };

+   key <AB07> {  [     0x1000645  ,       0x1000658, 0x100200F     ]     };

+   key <AB08> {  [     0x100060c  ,       0x100003c      ]     };

+   key <AB09> {  [     0x10006d4  ,       0x100003E      ]     };

+   key <AB10> {  [     0x100002f  ,       0x100061f      ]     };

+

+//   key <RALT> {  [ Mode_switch, Multi_key ] };

+

+   include "level3(ralt_switch)"

+

+   // End alphanumeric section

+};

+

+partial alphanumeric_keys

+xkb_symbols "urd-crulp" {

+

+   name[Group1]= "Pakistan - CRULP";

+// www.crulp.org phonetic v1.1

+

+   key <TLDE> {  [     0x100007E  ,       0x100064B      ]     };

+   key <AE01> {  [     0x10006F1  ,       0x1000031, 0x1000021   ]     };

+   key <AE02> {  [     0x10006F2  ,       0x1000032, 0x1000040      ]     };

+   key <AE03> {  [     0x10006F3  ,       0x1000033, 0x1000023      ]     };

+   key <AE04> {  [     0x10006F4  ,       0x1000034      ]     };

+   key <AE05> {  [     0x10006F5  ,       0x1000035, 0x100066A      ]     };

+   key <AE06> {  [     0x10006F6  ,       0x1000036     ]     };

+   key <AE07> {  [     0x10006F7  ,       0x1000037, 0x1000026       ]     };

+   key <AE08> {  [     0x10006F8  ,       0x1000038, 0x100002A      ]     };

+   key <AE09> {  [     0x10006F9  ,       0x1000039, 0x1000029      ]     };

+   key <AE10> {  [     0x10006F0  ,       0x1000030, 0x1000028      ]     };

+   key <AE11> {  [     0x100002D  ,       0x100005F 	     ]     };

+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };   

+   key <AD01> {  [     0x1000642  ,       0x1000652  ]     };

+   key <AD02> {  [     0x1000648  ,       0x1000651, 0x1000602    ]     };

+   key <AD03> {  [     0x1000639  ,       0x1000670, 0x1000656      ]     };

+   key <AD04> {  [     0x1000631  ,       0x1000691, 0x1000613      ]     };

+   key <AD05> {  [     0x100062a  ,       0x1000679, 0x1000614      ]     };

+   key <AD06> {  [     0x10006d2  ,       0x100064E, 0x1000601      ]     };

+   key <AD07> {  [     0x1000621  ,       0x1000626, 0x1000654      ]     };

+   key <AD08> {  [     0x10006cc  ,       0x1000650,  0x1000611      ]     };

+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };

+   key <AD10> {  [     0x100067e  ,       0x100064f,  0x1000657      ]     };

+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };

+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };

+

+   key <AC01> {  [     0x1000627  ,       0x1000622, 0x100FDF2    ]     };

+   key <AC02> {  [     0x1000633  ,       0x1000635, 0x1000610    ]     };

+   key <AC03> {  [     0x100062f  ,       0x1000688, 0x100FDFA     ]     };

+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };

+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };

+   key <AC06> {  [     0x100062D,       0x10006BE, 0x1000612      ]     };

+   key <AC07> {  [     0x100062c  ,       0x1000636, 0x100FDFB      ]     };

+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };

+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };

+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };

+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };

+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };

+

+   key <LSGT> {  [            bar ,       brokenbar      ]     };

+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100060F    ]     };

+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100060E      ]     };

+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x1000603	     ]     };

+   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };

+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100FDFD	      ]     };

+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x1000600	      ]     };

+   key <AB07> {  [     0x1000645  ,       0x1000658    ]     };

+   key <AB08> {  [     0x100060c  ,       0x100003c, 0x100003C      ]     };

+   key <AB09> {  [     0x10006d4  ,       0x100066B, 0x100003E      ]     };

+   key <AB10> {  [     0x100002f   ,       0x100061F      ]     };

+

+//   key <RALT> {  [ Mode_switch, Multi_key ] };

+

+   include "level3(ralt_switch)"

+

+   // End alphanumeric section

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "urd-nla" {

+   name[Group1]= "Pakistan - NLA";

+// www.nla.gov.pk

+

+   key <TLDE> {  [     0x1000060  ,       0x100007E, 0x100200C     ]     };

+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };

+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };

+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };

+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };

+   key <AE05> {  [     0x1000035  ,       0x100066A      ]     };

+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };

+   key <AE07> {  [     0x1000037  ,       0x10006D6      ]     };

+   key <AE08> {  [     0x1000038  ,       0x100066D      ]     };

+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };

+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };

+   key <AE11> {  [     0x100002D ,        0x100005F      ]     };

+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };

+   key <AD01> {  [     0x1000637  ,       0x1000638, 0x100200D      ]     };

+   key <AD02> {  [     0x1000635  ,       0x1000636, 0x100200C     ]     };

+   key <AD03> {  [     0x10006BE  ,       0x1000630      ]     };

+   key <AD04> {  [     0x100062F ,        0x1000688     ]     };

+   key <AD05> {  [     0x1000679  ,       0x100062B      ]     };

+   key <AD06> {  [     0x100067E  ,       0x1000651      ]     };

+   key <AD07> {  [     0x100062A  ,       0x10006C3      ]     };

+   key <AD08> {  [     0x1000628  ,       0x1000640      ]     };

+   key <AD09> {  [     0x100062C  ,       0x1000686      ]     };

+   key <AD10> {  [     0x100062D  ,       0x100062E      ]     };

+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };

+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };

+

+   key <AC01> {  [     0x1000645  ,       0x1000698      ]     };

+   key <AC02> {  [     0x1000648  ,       0x1000632      ]     };

+   key <AC03> {  [     0x1000631  ,       0x1000691      ]     };

+   key <AC04> {  [     0x1000646  ,       0x10006BA      ]     };

+   key <AC05> {  [     0x1000644  ,       0x10006C2      ]     };

+   key <AC06> {  [     0x10006C1  ,       0x1000621      ]     };

+   key <AC07> {  [     0x1000627  ,       0x1000622      ]     };

+   key <AC08> {  [     0x10006a9  ,       0x10006AF      ]     };

+   key <AC09> {  [     0x10006CC  ,       0x100064A      ]     };

+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };

+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };

+   key <BKSL> {  [     0x100005C ,        0x100007C      ]     };

+

+   key <LSGT> {  [            bar ,       brokenbar      ]     };

+   key <AB01> {  [     0x1000642  ,       0x100200D, 0x100200E     ]     };

+   key <AB02> {  [     0x1000641  ,       0x100200C, 0x100202A      ]     };

+   key <AB03> {  [     0x10006D2  ,       0x10006D3, 0x100202D     ]     };

+   key <AB04> {  [     0x1000633  ,       0x100200E, 0x100202C      ]     };

+   key <AB05> {  [     0x1000634  ,       0x1000624, 0x100202E      ]     };

+   key <AB06> {  [     0x100063A  ,       0x1000626, 0x100202B      ]     };

+   key <AB07> {  [     0x1000639  ,       0x100200F, 0x100200F      ]     };

+   key <AB08> {  [     0x100060c  ,       0x100003E      ]     };

+   key <AB09> {  [     0x10006d4  ,       0x100003C      ]     };

+   key <AB10> {  [     0x100002F  ,       0x100061f      ]     };

+

+   

+   include "level3(ralt_switch)"

+

+   // End alphanumeric section

+};

+

+partial alphanumeric_keys

+xkb_symbols "snd" {

+   name[Group1]= "Pakistan - MBSindhi";

+// www.bhurgri.com

+

+     key <TLDE> {  [       0x1002019,       0x1002018                 ]       };

+    key <AE01> {  [               1,          exclam, 0x1000610      ]       };

+    key <AE02> {  [               2,       0x1000670, 0x1000611      ]       };

+    key <AE03> {  [               3,       0x1000621, 0x1000613      ]       };

+    key <AE04> {  [               4,       0x1000621, 0x1000612      ]       };

+    key <AE05> {  [               5,       0x1000621, 0x1002026      ]       };

+    key <AE06> {  [               6,       0x1000621, 0x1002022      ]       };

+    key <AE07> {  [               7,       0x10006FD                 ]       };

+    key <AE08> {  [               8,        asterisk                 ]       };

+    key <AE09> {  [               9,      parenright                 ]       };

+    key <AE10> {  [               0,       parenleft                 ]       };

+    key <AE11> {  [       0x100068F,       0x100005F, 0x100002D      ]       };

+    key <AE12> {  [       0x100068C,            plus, 0x100003D      ]       };

+    key <BKSL> {  [       0x100068D,       0x100067A, 0x100007C      ]       };

+

+    key <AD01> {  [       0x1000642,       0x100064E, 0x100064B      ]       };

+    key <AD02> {  [       0x1000635,       0x1000636, 0x100FDFA      ]       };

+    key <AD03> {  [       0x100064A,       0x1000650, 0x1000656      ]       };

+    key <AD04> {  [       0x1000631,       0x1000699, 0x100FDE6      ]       };

+    key <AD05> {  [       0x100062A,       0x100067D, 0x1000629      ]       };

+    key <AD06> {  [       0x100067F,       0x100062B, 0x100FDE5      ]       };

+    key <AD07> {  [       0x1000639,       0x100063A, 0x100FDE3      ]       };

+    key <AD08> {  [       0x10006B3,       0x10006BE, 0x100FDE4      ]       };

+    key <AD09> {  [       0x1000648,       0x100064F, 0x1000657      ]       };

+    key <AD10> {  [       0x100067E,       0x10006A6                 ]       };

+    key <AD11> {  [       0x1000687,       0x1000683                 ]       };

+    key <AD12> {  [       0x1000686,       0x1000684                 ]       };

+

+    key <AC01> {  [       0x1000627,       0x1000622, 0x1000649      ]       };

+    key <AC02> {  [       0x1000633,       0x1000634                 ]       };

+    key <AC03> {  [       0x100062F,       0x100068A                 ]       };

+    key <AC04> {  [       0x1000641,       0x10006A6                 ]       };

+    key <AC05> {  [       0x10006AF,       0x10006AF                 ]       };

+    key <AC06> {  [       0x1000647,       0x100062D, 0x10006C1      ]       };

+    key <AC07> {  [       0x100062C,       0x100062C, 0x100FDFB      ]       };

+    key <AC08> {  [       0x10006AA,       0x10006E1                 ]       };

+    key <AC09> {  [       0x1000644,       0x100003A                 ]       };

+    key <AC10> {  [       0x10006A9,       0x100061B                 ]       };

+    key <AC11> {  [       0x10006B1,       0x1000640                 ]       };

+

+    key <AB01> {  [       0x1000632,       0x1000630, 0x1000652      ]       };

+    key <AB02> {  [       0x100062E,       0x1000651, 0x100200C      ]       };

+    key <AB03> {  [       0x1000637,       0x1000638, 0x100200D      ]       };

+    key <AB04> {  [       0x1000680,       0x1000621, 0x1000624      ]       };

+    key <AB05> {  [       0x1000628,       0x100067B, 0x100FDE1      ]       };

+    key <AB06> {  [       0x1000646,       0x10006BB, 0x100200E      ]       };

+    key <AB07> {  [       0x1000645,       0x10006FE, 0x100FDF4      ]       };

+    key <AB08> {  [       0x100060C,       0x100201C, 0x100200F      ]       };

+    key <AB09> {  [          period,       0x100201D, 0x10006D4      ]       };

+    key <AB10> {  [       0x1000626, Arabic_question_mark, 0x100002F ]       };

+

+   include "level3(ralt_switch)"

+

+   // End alphanumeric section

+};

+

+partial alphanumeric_keys

+xkb_symbols "ara" {

+   name[Group1]= "Pakistan - Arabic";

+

+// NOTES:

+//

+// there is also combined shadda diacritis in AltGr position of simple

+// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan

+// should a third state be added to Group2 ?

+//

+// How is this different from ara(basic)? --bernie

+

+   key <TLDE> {  [     0x100064d  ,       0x100064b      ]     };

+   key <AE01> {  [     0x10006F1  ,       0x1000021      ]     };

+   key <AE02> {  [     0x10006F2  ,       0x1000003      ]     };

+   key <AE03> {  [     0x10006F3  ,       0x100002f      ]     };

+   key <AE04> {  [     0x10006F4  ,       0x1000626      ]     };

+   key <AE05> {  [     0x10006F5  ,       0x1000003      ]     };

+   key <AE06> {  [     0x10006F6  ,       0x10006d6      ]     };

+   key <AE07> {  [     0x10006F7  ,       0x1000654      ]     };

+   key <AE08> {  [     0x10006F8  ,       0x100064c      ]     };

+   key <AE09> {  [     0x10006F9  ,       0x1000029      ]     };

+   key <AE10> {  [     0x10006F0  ,       0x1000028      ]     };

+   key <AE11> {  [     0x1000623  ,       0x1000651      ]     };

+   key <AE12> {  [     0x1000624  ,       0x1000622      ]     };

+   key <AD01> {  [     0x1000642  ,       0x1000652      ]     };

+   key <AD02> {  [     0x1000648  ,       0x10000a3      ]     };

+   key <AD03> {  [     0x1000639  ,       0x10000a5      ]     };

+   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };

+   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };

+   key <AD06> {  [     0x10006d2  ,       0x1000601      ]     };

+   key <AD07> {  [     0x1000621  ,       0x100060c      ]     };

+   key <AD08> {  [     0x10006cc  ,       0x1000670      ]     };

+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };

+   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };

+   key <AD11> {  [     0x100005d  ,       0x1000670      ]     };

+   key <AD12> {  [     0x100005b  ,       0x1000670      ]     };

+

+   key <AC01> {  [     0x1000627  ,       0x1000653      ]     };

+   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };

+   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };

+   key <AC04> {  [     0x1000641  ,       0x1000003      ]     };

+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };

+   key <AC06> {  [     0x10006be  ,       0x100062d      ]     };

+   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };

+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };

+   key <AC09> {  [     0x1000644  ,       0x1000613      ]     };

+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };

+   key <AC11> {  [     0x1000670  ,       0x1000022       ]     };

+   key <BKSL> {  [     0x100060e ,        0x1000614      ]     };

+

+   key <LSGT> {  [            bar ,       brokenbar      ]     };

+   key <AB01> {  [     0x1000632  ,       0x1000630      ]     };

+   key <AB02> {  [     0x1000634  ,       0x1000698      ]     };

+   key <AB03> {  [     0x1000686  ,       0x100062b      ]     };

+   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };

+   key <AB05> {  [     0x1000628  ,       0x1000612      ]     };

+   key <AB06> {  [     0x1000646  ,       0x10006ba      ]     };

+   key <AB07> {  [     0x1000645  ,       0x1000003      ]     };

+   key <AB08> {  [     0x100060c  ,       0x1000650      ]     };

+   key <AB09> {  [     0x10006d4  ,       0x100064e      ]     };

+   key <AB10> {  [     0x1000003  ,       0x100061f      ]     };

+

+   // End alphanumeric section

+};

+

+partial alphanumeric_keys

+xkb_symbols "olpc" {

+

+// Contact: Walter Bender <walter@laptop.org>

+

+   include "pk(ara)"

+

+   name[Group1]= "Pakistan";

+

+   // Keys '~' - '='

+   key <TLDE> {  [ 0x1000654, 0x100064B ] };

+   key <AE01> {  [ 0x10006F1, 0x1000603 ] };

+   key <AE02> {  [ 0x10006F2, 0x1000602 ] };

+   key <AE03> {  [ 0x10006F3, 0x1000601 ] };

+   key <AE04> {  [ 0x10006F4, 0x1000600 ] };

+   key <AE05> {  [ 0x10006F5, 0x100060F ] };

+   key <AE06> {  [ 0x10006F6, 0x100060E ] };

+   key <AE07> {  [ 0x10006F7, 0x1000614 ] };

+   key <AE08> {  [ 0x10006F8, 0x1000612 ] };

+   key <AE09> {  [ 0x10006F9, 0x1000611 ] };

+   key <AE10> {  [ 0x10006F0, 0x1000613 ] };

+   key <AE11> {  [ minus,     0x1000610 ] };

+   key <AE12> {  [ equal, plus ] };

+

+   //Keys 'Q' - ']'

+   key <AD01> {  [ 0x1000642, 0x1000652 ] };

+   key <AD02> {  [ 0x1000648, 0x1000651 ] };

+   key <AD03> {  [ 0x1000639, 0x1000670 ] };

+   key <AD04> {  [ 0x1000631, 0x1000691 ] };

+   key <AD05> {  [ 0x100062A, 0x1000679 ] };

+   key <AD06> {  [ 0x10006D2, 0x100064E ] };

+   key <AD07> {  [ 0x1000621, 0x1000626 ] };

+   key <AD08> {  [ 0x10006CC, 0x1000650 ] };

+   key <AD09> {  [ 0x10006C1, 0x10006C3 ] };

+   key <AD10> {  [ 0x100067E, 0x100064F ] };

+   key <AD12> {  [ 0x100FDFD, 0x100FDFA ] };

+   key <AD11> {  [ 0x100FDF2, 0x100FDFB ] };

+

+   // Keys 'A' - '''

+   key <AC01> {  [ 0x1000627, 0x1000622 ] };

+   key <AC02> {  [ 0x1000633, 0x1000635 ] };

+   key <AC03> {  [ 0x100062F, 0x1000688 ] };

+   key <AC04> {  [ 0x1000641 ] }; //shift key not available

+   key <AC05> {  [ 0x10006AF, 0x100063A ] };

+   key <AC06> {  [ 0x100062D, 0x10006BE ] };

+   key <AC07> {  [ 0x100062C, 0x1000636 ] };

+   key <AC08> {  [ 0x10006A9, 0x100062E ] };

+   key <AC09> {  [ 0x1000644, 0x1000656 ] };

+   key <AC10> {  [ 0x100061B, colon ] };

+   key <AC11> {  [ quote, doublequote  ] };

+

+   key <BKSL> { [  backslash, bar  ] };

+   key <SPCE> { [  space  ] };

+

+   // Keys: 'Z' - '/'

+   key <AB01> {  [ 0x1000632, 0x1000622 ] };

+   key <AB02> {  [ 0x1000634, 0x1000635 ] };

+   key <AB03> {  [ 0x1000686, 0x1000688 ] };

+   key <AB04> {  [ 0x1000637 ] }; //shift key unavailable

+   key <AB05> {  [ 0x1000628, 0x100063A ] };

+   key <AB06> {  [ 0x1000646, 0x10006BE ] };

+   key <AB07> {  [ 0x1000645, 0x1000636 ] };

+   key <AB08> {  [ 0x100060C, 0x100062E ] };

+   key <AB09> {  [ 0x10006D4, 0x1000656 ] };

+   key <AB10> {  [ slash,     0x100061F ] };

+

+   include "group(olpc)"

+};