Attachment 8294 Details for Bug 8852 – Proposed patch

[patch] Proposed patch

xkeyboard-config-20070104-wang.patch (text/plain), 9.51 KB, created by Nicolas Mailhot on 2007-01-04 12:59:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Mailhot

Created: 2007-01-04 12:59:29 UTC

Size: 9.51 KB

patch

obsolete

>diff -uNr xkeyboard-config-20070104.orig/rules/base.xml.in xkeyboard-config-20070104.wang/rules/base.xml.in
>--- xkeyboard-config-20070104.orig/rules/base.xml.in	2007-01-02 21:56:55.000000000 +0100
>+++ xkeyboard-config-20070104.wang/rules/base.xml.in	2007-01-04 21:25:57.000000000 +0100
>@@ -3252,10 +3252,22 @@
>       </option>
>       <option>
>         <configItem>
>+          <name>keypad:legacy_wang</name>
>+          <description>Use Wang 724 legacy keypad</description>
>+       </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>           <name>keypad:oss</name>
>           <description>Use keypad with unicode additions (arrows and math operators)</description>
>        </configItem>
>       </option>
>+      <option>
>+        <configItem>
>+          <name>keypad:oss_wang</name>
>+          <description>Use Wang 724 keypad with unicode additions (arrows and math operators)</description>
>+       </configItem>
>+      </option>
>     </group>
>     <group allowMultipleSelection="false">
>       <!-- CapsLock tweaks. 
>diff -uNr xkeyboard-config-20070104.orig/symbols/be xkeyboard-config-20070104.wang/symbols/be
>--- xkeyboard-config-20070104.orig/symbols/be	2006-04-02 22:07:45.000000000 +0200
>+++ xkeyboard-config-20070104.wang/symbols/be	2007-01-04 21:27:53.000000000 +0100
>@@ -106,31 +106,10 @@
> xkb_symbols "wang" {
> 
>     include "be(basic)"
>+    include "keypad(legacy_wang)"
>     name[Group1]="Belgium - Wang model 724 azerty";
> 
>     // Engravings on Wang 725-3771-ae
>     key <TLDE> { [ twosuperior, threesuperior,   notsign, asciitilde ] };
>     key <LSGT> { [        less,       greater, backslash,  brokenbar ] };
>-
>-    // Keypad geometry for Wang 725-3771-ae and 725-3771-uk:
>-    //   NmLck Erase/DecTab PrntScrn/SysRq  /
>-    //   7<    8>           9^              *
>-    //   4[    5]           6$              -
>-    //   1&    2@           3#              +
>-    //   0'------           .,              ret
>-    //key.type[Group1] = "FOUR_LEVEL_KEYPAD";
>-    key  <KP7> {  [   KP_Home,       KP_7,         less,         less ]  };
>-    key  <KP8> {  [     KP_Up,       KP_8,      greater,      greater ]  };
>-    key  <KP9> {  [  KP_Prior,       KP_9,  asciicircum,  asciicircum ]  };
>-
>-    key  <KP4> {  [   KP_Left,       KP_4,  bracketleft,  bracketleft ]  };
>-    key  <KP5> {  [  KP_Begin,       KP_5, bracketright, bracketright ]  };
>-    key  <KP6> {  [  KP_Right,       KP_6,       dollar,       dollar ]  };
>-
>-    key  <KP1> {  [    KP_End,       KP_1,    ampersand,    ampersand ]  };
>-    key  <KP2> {  [   KP_Down,       KP_2,           at,           at ]  };
>-    key  <KP3> {  [   KP_Next,       KP_3,   numbersign,   numbersign ]  };
>-
>-    key  <KP0> {  [ KP_Insert,       KP_0,   apostrophe,   apostrophe ]  };
>-    key <KPDL> {  [ KP_Delete, KP_Decimal, KP_Separator, KP_Separator ]  };
> };
>diff -uNr xkeyboard-config-20070104.orig/symbols/keypad xkeyboard-config-20070104.wang/symbols/keypad
>--- xkeyboard-config-20070104.orig/symbols/keypad	2006-09-24 22:07:00.000000000 +0200
>+++ xkeyboard-config-20070104.wang/symbols/keypad	2007-01-04 21:52:51.000000000 +0100
>@@ -150,6 +150,17 @@
> };
> 
> 
>+// Legacy Wang 725-3771-ae and 725-3771-uk keypad definition
>+// Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+keypad_keys
>+xkb_symbols "legacy_wang" {
>+
>+    include "keypad(core)"
>+    include "keypad(legacymath)"
>+    include "keypad(legacynumber_wang)"
>+};
>+
>+
> // Complete new keypad definition
> // Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> keypad_keys
>@@ -161,6 +172,17 @@
> };
> 
> 
>+// Wang 725-3771-ae and 725-3771-uk keypad variant of oss keypad
>+// Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+keypad_keys
>+xkb_symbols "oss_wang" {
>+
>+    include "keypad(core)"
>+    include "keypad(ossmath)"
>+    include "keypad(ossnumber_wang)"
>+};
>+
>+
> // Latin9 restriction of new keypad definition
> // Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> keypad_keys
>@@ -308,6 +330,51 @@
> };
> 
> 
>+// Legacy Wang 725-3771-ae and 725-3771-uk keypad number area
>+// Copyright Â© 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+// This is actually a three-level keypad, declared as four-level
>+// to avoid defining a new type
>+//
>+// âââââââ±                   â± Home
>+// âNum  â                   â² End
>+// âLockââ                   â Page up
>+// â¡ââââââââââââ¼ââââââ¼       â Page down
>+// â 7   â 8   â 9   â       â Page up
>+// â â± < â â§ > â â ^ â       â Insert
>+// âââââââ¼ââââââ¼ââââââ¤       â¥ Delete
>+// â 4   â 5   â 6   â       â¦â§â¨â© Directions
>+// â â¦ [ â   ] â â¨ $ â
>+// âââââââ¼ââââââ¼ââââââââââââª
>+// â 1   â 2   â 3   âEnterâ
>+// â â² & â â© @ â â # â  â  â 1 None
>+// âââââââ´ââââââ¼ââââââ¨     â 2 Num Lock â
>+// â 0         â .   â     â 3 Level3 â®
>+// â â         â â¥   â     â
>+// âââââââââââââ´ââââââºââââââ
>+partial keypad_keys
>+xkb_symbols "legacynumber_wang" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KP7>  { [   KP_Home,   KP_7,         less ] }; //   <home> 7 <
>+    key <KP8>  { [     KP_Up,   KP_8,      greater ] }; //     <up> 8 >
>+    key <KP9>  { [  KP_Prior,   KP_9,  asciicircum ] }; //  <prior> 9 ^
>+ 
>+    key <KP4>  { [   KP_Left,   KP_4,  bracketleft ] }; //   <left> 4 [
>+    key <KP5>  { [  KP_Begin,   KP_5, bracketright ] }; //  <begin> 5 ]
>+    key <KP6>  { [  KP_Right,   KP_6,       dollar ] }; //  <right> 6 $
>+
>+    key <KP1>  { [    KP_End,   KP_1,    ampersand ] }; //    <end> 1 &
>+    key <KP2>  { [   KP_Down,   KP_2,           at ] }; //   <down> 2 @
>+    key <KP3>  { [   KP_Next,   KP_3,   numbersign ] }; //   <next> 3 #
>+
>+    key <KP0>  { [ KP_Insert,   KP_0,   apostrophe ] }; // <insert> 0 '
>+    // We could use KP_Decimal and KP_Separator but we do not want the locale
>+    // decimal and separator symbol but locale-insensitive dot and comma
>+    key <KPDL> { [ KP_Delete, period,        comma ] }; // <delete> . ,
>+};
>+
>+
> // Keypad number area with arrow symbols
> // Copyright Â© 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
> //
>@@ -318,8 +385,8 @@
> // â 7 â â 8 â â 9 â â       â Page up
> // â â± â â â§ â â â â â       â Insert
> // âââââââ¼ââââââ¼ââââââ¤       â¥ Delete
>-// â 4 â â 5 â â 6 â â       â¦â§â¨â© Directions
>-// â â¦ â â   â â â¨ â â       â½ narrow no-break space
>+// â 4 â â 5 â â 6 â â       â¦â§â¨â© Directions
>+// â â¦ â â   â â â¨ â â       â½ narrow no-break space
> // âââââââ¼ââââââ¼ââââââââââââª
> // â 1 â â 2 â â 3 â âEnterâ
> // â â² â â â© â â â â â  â  â 1 None
>@@ -349,3 +416,46 @@
>     // decimal and separator symbol but locale-insensitive dot and comma
>     key <KPDL> { [ KP_Delete, period,     comma, 0x100202F ] }; // <delete> . , â½ (narrow no-break space)
> };
>+
>+
>+// Wang 725-3771-ae and 725-3771-uk keypad number area with additional arrow symbols
>+// Copyright Â© 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
>+//
>+// âââââââ±                   â± Home
>+// âNum  â                   â² End
>+// âLockââ                   â Page up
>+// â¡ââââââââââââ¼ââââââ¼       â Page down
>+// â 7 â â 8 â â 9 â â       â Page up
>+// â â± < â â§ > â â ^ â       â Insert
>+// âââââââ¼ââââââ¼ââââââ¤       â¥ Delete
>+// â 4 â â 5 â â 6 â â       â¦â§â¨â© Directions
>+// â â¦ [ â   ] â â¨ $ â       â½ narrow no-break space
>+// âââââââ¼ââââââ¼ââââââââââââª
>+// â 1 â â 2 â â 3 â âEnterâ
>+// â â² & â â© @ â â # â  â  â 1 None
>+// âââââââ´ââââââ¼ââââââ¨     â 2 Num Lock â
>+// â 0       â â . â½ â     â 3 Level3 â®
>+// â â       ' â â¥ , â     â 4 Shift+Level3 â§â®
>+// âââââââââââââ´ââââââºââââââ
>+partial keypad_keys
>+xkb_symbols "ossnumber_wang" {
>+
>+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
>+
>+    key <KP7>  { [   KP_Home,   KP_7,         less, 0x1002196 ] }; //   <home> 7 < â
>+    key <KP8>  { [     KP_Up,   KP_8,      greater, 0x1002191 ] }; //     <up> 8 > â
>+    key <KP9>  { [  KP_Prior,   KP_9,  asciicircum, 0x1002197 ] }; //  <prior> 9 ^ â
>+ 
>+    key <KP4>  { [   KP_Left,   KP_4,  bracketleft, 0x1002190 ] }; //   <left> 4 [ â
>+    key <KP5>  { [  KP_Begin,   KP_5, bracketright, 0x1002194 ] }; //  <begin> 5 ] â
>+    key <KP6>  { [  KP_Right,   KP_6,       dollar, 0x1002192 ] }; //  <right> 6 $ â
>+
>+    key <KP1>  { [    KP_End,   KP_1,    ampersand, 0x1002199 ] }; //    <end> 1 & â
>+    key <KP2>  { [   KP_Down,   KP_2,           at, 0x1002193 ] }; //   <down> 2 @ â
>+    key <KP3>  { [   KP_Next,   KP_3,   numbersign, 0x1002198 ] }; //   <next> 3 # â
>+
>+    key <KP0>  { [ KP_Insert,   KP_0,   apostrophe, 0x1002195 ] }; // <insert> 0 ' â
>+    // We could use KP_Decimal and KP_Separator but we do not want the locale
>+    // decimal and separator symbol but locale-insensitive dot and comma
>+    key <KPDL> { [ KP_Delete, period,        comma, 0x100202F ] }; // <delete> . , â½ (narrow no-break space)
>+};

Actions: View | Splinter Review

Attachments on bug 8852: 7619 | 8294 | 10738 | 10741

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.