From 459981ef79ac5b49e6bcdbbf806e9f34da412b96 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Tue, 9 Jul 2024 22:24:04 +0330
Subject: [PATCH] osk-layouts: Fixed Persian OSK

Remove duplicate and unnecessary keys, and add missing ones
(e.g. ZWNJ).

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3409>
---
 data/gnome-shell-icons.gresource.xml          |  1 +
 .../status/keyboard-zwnj-symbolic.svg         |  5 ++
 data/osk-layouts/ir.json                      | 90 +++++++++----------
 3 files changed, 46 insertions(+), 50 deletions(-)
 create mode 100644 data/icons/scalable/status/keyboard-zwnj-symbolic.svg

diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml
index 6ace8f0f1..f15d0c0e8 100644
--- a/data/gnome-shell-icons.gresource.xml
+++ b/data/gnome-shell-icons.gresource.xml
@@ -46,6 +46,7 @@
     <file preprocess="xml-stripblanks">scalable/status/keyboard-hide-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-layout-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/keyboard-shift-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">scalable/status/keyboard-zwnj-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/message-indicator-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/no-notifications-symbolic.svg</file>
     <file preprocess="xml-stripblanks">scalable/status/screen-privacy-disabled-symbolic.svg</file>
diff --git a/data/icons/scalable/status/keyboard-zwnj-symbolic.svg b/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
new file mode 100644
index 000000000..7204f474c
--- /dev/null
+++ b/data/icons/scalable/status/keyboard-zwnj-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
+</svg>
diff --git a/data/osk-layouts/ir.json b/data/osk-layouts/ir.json
index 758485acd..436aa74a6 100644
--- a/data/osk-layouts/ir.json
+++ b/data/osk-layouts/ir.json
@@ -22,16 +22,12 @@
           },
           {
             "strings": [
-              "ق",
-              "ڨ"
+              "ق"
             ]
           },
           {
             "strings": [
-              "ف",
-              "ڤ",
-              "ڢ",
-              "ڥ"
+              "ف"
             ]
           },
           {
@@ -47,7 +43,7 @@
           {
             "strings": [
               "ه",
-              "ه‍"
+              "ة"
             ]
           },
           {
@@ -62,21 +58,25 @@
           },
           {
             "strings": [
-              "ج",
+              "ج"
+            ]
+          },
+          {
+            "strings": [
               "چ"
             ]
           },
           {
             "action": "delete",
             "iconName": "edit-clear-symbolic",
-            "width": 1.5
+            "width": 1
           }
         ],
         [
           {
+            "leftOffset": 0.5,
             "strings": [
-              "ش",
-              "ڜ"
+              "ش"
             ]
           },
           {
@@ -86,24 +86,18 @@
           },
           {
             "strings": [
-              "ي",
-              "ئ",
-              "ى"
+              "ی",
+              "ئ"
             ]
           },
           {
             "strings": [
-              "ب",
-              "پ"
+              "ب"
             ]
           },
           {
             "strings": [
-              "ل",
-              "لا",
-              "لأ",
-              "لإ",
-              "لآ"
+              "ل"
             ]
           },
           {
@@ -133,14 +127,13 @@
           },
           {
             "strings": [
-              "ك",
-              "گ",
-              "ک"
+              "ک",
+              "ك"
             ]
           },
           {
             "strings": [
-              "ط"
+              "گ"
             ]
           },
           {
@@ -151,19 +144,24 @@
         ],
         [
           {
-            "leftOffset": 1,
+            "leftOffset": 1.5,
             "strings": [
-              "ذ"
+              "ظ"
             ]
           },
           {
             "strings": [
-              "ء"
+              "ط"
             ]
           },
           {
             "strings": [
-              "ؤ"
+              "ژ"
+            ]
+          },
+          {
+            "strings": [
+              "ز"
             ]
           },
           {
@@ -173,13 +171,12 @@
           },
           {
             "strings": [
-              "ى",
-              "ئ"
+              "ذ"
             ]
           },
           {
             "strings": [
-              "ة"
+              "د"
             ]
           },
           {
@@ -189,25 +186,14 @@
           },
           {
             "strings": [
-              "ز",
-              "ژ"
-            ]
-          },
-          {
-            "strings": [
-              "ظ"
-            ]
-          },
-          {
-            "strings": [
-              "د"
+              "پ"
             ]
           }
         ],
         [
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 1.5
           },
@@ -220,7 +206,7 @@
             "strings": [
               " "
             ],
-            "width": 6
+            "width": 5.5
           },
           {
             "strings": [
@@ -243,6 +229,10 @@
               "("
             ]
           },
+          {
+            "iconName": "keyboard-zwnj-symbolic",
+            "keyval": "0x100200c"
+          },
           {
             "action": "emoji",
             "iconName": "face-smile-symbolic"
@@ -475,7 +465,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "ABC",
+            "label": "الف‌ب‌پ",
             "level": "default",
             "width": 1.5
           },
@@ -672,7 +662,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 1.5
           },
@@ -713,7 +703,7 @@
           },
           {
             "action": "levelSwitch",
-            "label": "?123",
+            "label": "۱۲۳؟",
             "level": "opt",
             "width": 3
           }
@@ -721,7 +711,7 @@
         [
           {
             "action": "levelSwitch",
-            "label": "ABC",
+            "label": "الف‌ب‌پ",
             "level": "default",
             "width": 1.5
           },