abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
authorJules Aguillon2023-08-05 19:20:48 +0200
committerJules Aguillon2023-08-05 19:40:13 +0200
commitdcbb4c484cfd73fbd78194c62f2cf9bc5d7e4492 (patch)
treea6e7cc9e3508759da30c241776076c8e680bb522
parent76f01122c2f60a51e5c2d4cdf289e5136cd50752 (diff)
downloadunexpected-keyboard-dcbb4c484cfd73fbd78194c62f2cf9bc5d7e4492.tar.gz
unexpected-keyboard-dcbb4c484cfd73fbd78194c62f2cf9bc5d7e4492.zip
Modify arabic and persian numbers info function keys
And add function keys placeholders in the layouts.
-rw-r--r--check_layout.output5
-rw-r--r--res/xml/arab_pc.xml4
-rw-r--r--res/xml/arab_pc_ir.xml2
-rw-r--r--srcs/juloo.keyboard2/KeyModifier.java25
4 files changed, 28 insertions, 8 deletions
diff --git a/check_layout.output b/check_layout.output
index c4dfee1..b5938d3 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -7,12 +7,11 @@ Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :
1 warnings
# res/xml/arab_pc_ir.xml
Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+Layout doesn't define some important keys, missing: esc, tab
2 warnings
# res/xml/arab_pc.xml
Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
+1 warnings
# res/xml/beng_national.xml
Layout includes some ASCII punctuation but not all, missing: $
Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
diff --git a/res/xml/arab_pc.xml b/res/xml/arab_pc.xml
index 9fb9dad..66a8fbd 100644
--- a/res/xml/arab_pc.xml
+++ b/res/xml/arab_pc.xml
@@ -11,8 +11,8 @@
<key key0="ه" key1="&#0247;" key2="٨" key3="*"/>
<key key0="خ" key1="&#0215;" key2="٩" key3="("/>
<key key0="ح" key1="&#1563;" key2="٠" key3=")"/>
- <key key0="ج" key1="&gt;" key2="-" key3="_"/>
- <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
+ <key key0="ج" key1="&gt;" key2="-" key3="_" key4="f11_placeholder"/>
+ <key key0="د" key1="&lt;" key2="=" key3="ذ" key4="f12_placeholder"/>
<!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
</row>
<row>
diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml
index d761cdb..01d1553 100644
--- a/res/xml/arab_pc_ir.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -11,7 +11,7 @@
<key key0="ه" key2="۸" key3="*"/>
<key key0="خ" key2="۹" key3="(" key4=")"/>
<key key0="ح" key2="۰"/>
- <key key0="ج"/>
+ <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/>
</row>
<row>
<key key0="ش"/>
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 63c774b..7a75494 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -240,6 +240,7 @@ class KeyModifier
case '§': return "¶";
case '†': return "‡";
case '×': return "∙";
+ case ' ': return "nbsp";
// arrows
case '↖': return "⇖";
case '↑': return "⇑";
@@ -356,8 +357,28 @@ class KeyModifier
case 'ं': return "ॕ";
case '़': return "ॎ";
case 'ऽ': return "ॽ";
- // other
- case ' ': return "nbsp";
+ // Persian numbers
+ case '۱': return "f1";
+ case '۲': return "f2";
+ case '۳': return "f3";
+ case '۴': return "f4";
+ case '۵': return "f5";
+ case '۶': return "f6";
+ case '۷': return "f7";
+ case '۸': return "f8";
+ case '۹': return "f9";
+ case '۰': return "f10";
+ // Arabic numbers
+ case '١': return "f1";
+ case '٢': return "f2";
+ case '٣': return "f3";
+ case '٤': return "f4";
+ case '٥': return "f5";
+ case '٦': return "f6";
+ case '٧': return "f7";
+ case '٨': return "f8";
+ case '٩': return "f9";
+ case '٠': return "f10";
default: return null;
}
}