Attachment 106972 Details for Bug 84404 – proposed patch; update Korean

proposed patch; update Korean

0001-update-Korean.patch (text/plain), 4.63 KB, created by Changwoo Ryu on 2014-09-27 21:44:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Changwoo Ryu

Created: 2014-09-27 21:44:38 UTC

Size: 4.63 KB

patch

obsolete

>From cfd67c463d704419dad99a61b78b188a647ad141 Mon Sep 17 00:00:00 2001
>From: Changwoo Ryu <cwryu@debian.org>
>Date: Sun, 28 Sep 2014 06:07:55 +0900
>Subject: [PATCH] update Korean
>
>- Clear modifier when using RAlt/RCtrl as Hangul/Hanja keys
>  https://bugs.freedesktop.org/show_bug.cgi?id=71696
>- Add a new option, Korean Hangul/Hanja keys
>- Old kr and kr(kr104) layouts still remain, but as preset
>  combinations of above options.
>---
> rules/base.o_s.part |  2 ++
> rules/base.xml.in   | 24 ++++++++++++++++++++++++
> symbols/kr          | 48 +++++++++++++++++++++++++++++++++++++-----------
> symbols/sun_vndr/kr | 28 ++++++++++++++++++++++------
> 4 files changed, 85 insertions(+), 17 deletions(-)
>
>diff --git a/rules/base.o_s.part b/rules/base.o_s.part
>index cda36e4..5e6f664 100644
>--- a/rules/base.o_s.part
>+++ b/rules/base.o_s.part
>@@ -125,6 +125,8 @@
>   nbsp:level4nl         =	+nbsp(level4nl)
>   japan:nicola_f_bs     =	+jp(nicola_f_bs)
>   japan:hztg_escape     =	+jp(hztg_escape)
>+  korean:ralt_rctrl     =	+kr(ralt_hangul)+kr(rctrl_hanja)
>+  korean:rctrl_ralt     =	+kr(rctrl_hangul)+kr(ralt_hanja)
>   kpdl:dot              =	+kpdl(dot)
>   kpdl:comma            =	+kpdl(comma)
>   kpdl:dotoss           =	+kpdl(dotoss)
>diff --git a/rules/base.xml.in b/rules/base.xml.in
>index 3fd0ce4..6a93983 100644
>--- a/rules/base.xml.in
>+++ b/rules/base.xml.in
>@@ -6918,6 +6918,30 @@
>        </configItem>
>       </option>
>     </group>
>+    <group allowMultipleSelection="true">
>+      <configItem>
>+        <name>korean</name>
>+        <_description>Korean Hangul/Hanja keys</_description>
>+      </configItem>
>+      <option>
>+        <configItem>
>+          <name>korean:hw_keys</name>
>+          <_description>Hardware Hangul/Hanja keys</_description>
>+        </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>korean:ralt_rctrl</name>
>+          <_description>Right Alt as Hangul, right Ctrl as Hanja</_description>
>+        </configItem>
>+      </option>
>+      <option>
>+        <configItem>
>+          <name>korean:rctrl_ralt</name>
>+          <_description>Right Ctrl as Hangul, right Alt as Hanja</_description>
>+        </configItem>
>+      </option>
>+    </group>
>     <group allowMultipleSelection="false">
>       <configItem>
>         <name>esperanto</name>
>diff --git a/symbols/kr b/symbols/kr
>index 1ee560b..e554af0 100644
>--- a/symbols/kr
>+++ b/symbols/kr
>@@ -2,27 +2,53 @@ default  alphanumeric_keys
> xkb_symbols "kr106" {
>     include "us"
>     name[Group1]= "Korean";
>-    include "kr(koreankeys)"
>+    include "kr(hw_keys)"
> };
> 
> alphanumeric_keys
> xkb_symbols "kr104" {
>     include "us"
>     name[Group1]= "Korean (101/104 key compatible)";
>-    include "kr(koreankeys)"
>-    include "kr(koreankeys_raltctl)"
>+    include "kr(ralt_hangul)"
>+    include "kr(rctrl_hanja)"
> };
> 
>-hidden partial function_keys
>-xkb_symbols "koreankeys" {
>-    key <K71> { [ Hangul ] };
>-    key <K72> { [ Hangul_Hanja ] };
>+partial function_keys
>+xkb_symbols "hw_keys" {
>+    key <HNGL> { [ Hangul       ] };
>+    key <HJCV> { [ Hangul_Hanja ] };
> };
> 
>-hidden partial function_keys
>-xkb_symbols "koreankeys_raltctl" {
>-    key <RALT> { [ Hangul ] };
>-    key <RCTL> { [ Hangul_Hanja ] };
>+partial function_keys
>+xkb_symbols "ralt_hangul" {
>+    replace key <RALT> {
>+        type[Group1] = "ONE_LEVEL",
>+        symbols[Group1]= [ Hangul ]
>+    };
>+};
>+
>+partial function_keys
>+xkb_symbols "rctrl_hangul" {
>+    replace key <RCTL> {
>+        type[Group1] = "ONE_LEVEL",
>+        symbols[Group1]= [ Hangul ]
>+    };
>+};
>+
>+partial function_keys
>+xkb_symbols "ralt_hanja" {
>+    replace key <RALT> {
>+        type[Group1] = "ONE_LEVEL",
>+        symbols[Group1]= [ Hangul_Hanja ]
>+    };
>+};
>+
>+partial function_keys
>+xkb_symbols "rctrl_hanja" {
>+    replace key <RCTL> {
>+        type[Group1] = "ONE_LEVEL",
>+        symbols[Group1]= [ Hangul_Hanja ]
>+    };
> };
> 
> // EXTRAS:
>diff --git a/symbols/sun_vndr/kr b/symbols/sun_vndr/kr
>index cc6d29e..0cd6a86 100644
>--- a/symbols/sun_vndr/kr
>+++ b/symbols/sun_vndr/kr
>@@ -58,12 +58,28 @@ partial alphanumeric_keys
> 	include "kr(kr104)"
> };
> 
>-partial alphanumeric_keys
>-	xkb_symbols "koreankeys" {
>-	include "kr(koreankeys)"
>+partial function_keys
>+	xkb_symbols "hw_keys" {
>+	include "kr(hw_keys)"
> };
> 
>-partial alphanumeric_keys
>-	xkb_symbols "koreankeys_raltctl" {
>-	include "kr(koreankeys_raltctl)"
>+partial function_keys
>+	xkb_symbols "ralt_hangul" {
>+	include "kr(ralt_hangul)"
> };
>+
>+partial function_keys
>+	xkb_symbols "rctrl_hangul" {
>+	include "kr(rctrl_hangul)"
>+};
>+
>+partial function_keys
>+	xkb_symbols "ralt_hanja" {
>+	include "kr(ralt_hanja)"
>+};
>+
>+partial function_keys
>+	xkb_symbols "rctrl_hanja" {
>+	include "kr(rctrl_hanja)"
>+};
>+
>-- 
>2.1.1
>

Actions: View

Attachments on bug 84404: 106972

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.