From f2b6a7b5347d6a739409aab4f2eb3679f194acc4 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 6 Nov 2026 00:05:54 +0900 Subject: [PATCH] [KEYBOARD][KBDFA][KBDFAR][BOOTDATA][INPUT][INF] Support Persian (Iranian) keyboard (#9767) kbdfa.dll is Persian keyboard layout. kbdfar.dll is Persian Standard keyboard layout. JIRA issue: CORE-13357 See also: https://kbdlayout.info/kbdfa See also: https://kbdlayout.info/kbdfar - Add kbdfa into dll/keyboard. - Add kbdfar into dll/keyboard. - Add Persian items into "Keyboard Layouts". - Enable Perisian keyboard. - Modify intl.inf. - Add IDS_PERSIAN_STANRDARD_LAYOUT into input.dll. Co-authored-by: Stanislav Motylkov --- boot/bootdata/hivesys.inf | 23 +++ boot/bootdata/txtsetup.sif | 3 +- dll/cpl/input/lang/bg-BG.rc | 1 + dll/cpl/input/lang/cs-CZ.rc | 1 + dll/cpl/input/lang/de-DE.rc | 1 + dll/cpl/input/lang/el-GR.rc | 1 + dll/cpl/input/lang/en-US.rc | 1 + dll/cpl/input/lang/es-ES.rc | 1 + dll/cpl/input/lang/fr-FR.rc | 1 + dll/cpl/input/lang/he-IL.rc | 1 + dll/cpl/input/lang/id-ID.rc | 1 + dll/cpl/input/lang/it-IT.rc | 1 + dll/cpl/input/lang/ja-JP.rc | 1 + dll/cpl/input/lang/no-NO.rc | 1 + dll/cpl/input/lang/pl-PL.rc | 1 + dll/cpl/input/lang/pt-BR.rc | 1 + dll/cpl/input/lang/pt-PT.rc | 1 + dll/cpl/input/lang/ro-RO.rc | 1 + dll/cpl/input/lang/ru-RU.rc | 1 + dll/cpl/input/lang/sk-SK.rc | 1 + dll/cpl/input/lang/sq-AL.rc | 1 + dll/cpl/input/lang/tr-TR.rc | 1 + dll/cpl/input/lang/uk-UA.rc | 1 + dll/cpl/input/lang/zh-CN.rc | 1 + dll/cpl/input/lang/zh-HK.rc | 1 + dll/cpl/input/lang/zh-TW.rc | 1 + dll/cpl/input/resource.h | 1 + dll/keyboard/CMakeLists.txt | 2 + dll/keyboard/kbdfa/kbdfa.c | 310 ++++++++++++++++++++++++++++++++ dll/keyboard/kbdfa/kbdfa.rc | 5 + dll/keyboard/kbdfa/kbdfa.spec | 1 + dll/keyboard/kbdfar/kbdfar.c | 310 ++++++++++++++++++++++++++++++++ dll/keyboard/kbdfar/kbdfar.rc | 5 + dll/keyboard/kbdfar/kbdfar.spec | 1 + media/inf/intl.inf | 2 +- 35 files changed, 685 insertions(+), 2 deletions(-) create mode 100644 dll/keyboard/kbdfa/kbdfa.c create mode 100644 dll/keyboard/kbdfa/kbdfa.rc create mode 100644 dll/keyboard/kbdfa/kbdfa.spec create mode 100644 dll/keyboard/kbdfar/kbdfar.c create mode 100644 dll/keyboard/kbdfar/kbdfar.rc create mode 100644 dll/keyboard/kbdfar/kbdfar.spec diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 17233afc97b..1dcc8ca64ce 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -543,6 +543,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout Text",0x00000000,%DANISH% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5007" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000429","Layout File",0x00000000,"kbdfa.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000429","Layout Text",0x00000000,%PERSIAN% +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000429","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5124" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050429","Layout File",0x00000000,"kbdfar.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050429","Layout Id", 0x00000000,"003a" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050429","Layout Text",0x00000000,%PERSIAN_STANDARD% +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050429","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5213" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00060407","Layout File",0x00000000,"kbdgerg.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00060407","Layout Text",0x00000000,%GERMAN_ERGO% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00060407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5139" @@ -2538,6 +2547,8 @@ LITHUANIAN = "Lithuanian" MACEDONIAN = "Macedonian (FYRO)" MALAYALAM = "Malayalam" NORWEGIAN = "Norwegian" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Polish (214)" POLISH_PROGRAMMERS = "Polish (Programmers)" PORTUGESE = "Portuguese (Portugal)" @@ -2698,6 +2709,8 @@ LITHUANIAN = "Lituano" MACEDONIAN = "Macedonia (FYRO)" MALAYALAM = "Malabari" NORWEGIAN = "Noruego" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Polaco (214)" POLISH_PROGRAMMERS = "Polaco (Programmers)" PORTUGESE = "Portugués (Portugal)" @@ -2858,6 +2871,8 @@ LITHUANIAN = "Litewski" MACEDONIAN = "Macedoński (FYRO)" MALAYALAM = "Malajalam" NORWEGIAN = "Norweski" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Polski (214)" POLISH_PROGRAMMERS = "Polski (Programisty)" PORTUGESE = "Portugalski" @@ -3018,6 +3033,8 @@ LITHUANIAN = "Lituano" MACEDONIAN = "Macedonia (FYRO)" MALAYALAM = "Malabari" NORWEGIAN = "Norueguês" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Polaco (214)" POLISH_PROGRAMMERS = "Polaco (Programmers)" PORTUGESE = "Português (Portugal)" @@ -3175,6 +3192,8 @@ LITHUANIAN = "Lituaniană" MACEDONIAN = "Macedonă (FYRO)" MALAYALAM = "Malayalam" NORWEGIAN = "Norvegiană" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Poloneză (214)" POLISH_PROGRAMMERS = "Poloneză (programatori)" PORTUGESE = "Portugheză (Portugalia)" @@ -3335,6 +3354,8 @@ LITHUANIAN = "Литовская" MACEDONIAN = "Македонская (FYROM)" MALAYALAM = "Малаялам" NORWEGIAN = "Норвежская" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Польская (214)" POLISH_PROGRAMMERS = "Польская (программистская)" PORTUGESE = "Португальская (Португалия)" @@ -3495,6 +3516,8 @@ LITHUANIAN = "Litvcanyaca" MACEDONIAN = "Makedonca (FYRO)" MALAYALAM = "Malayalam" NORWEGIAN = "Norveççe" +PERSIAN = "Persian" +PERSIAN_STANDARD = "Persian (Standard)" POLISH_214 = "Polonezce (214)" POLISH_PROGRAMMERS = "Polonezce (Programcılar)" PORTUGESE = "Portekizce (Portekiz)" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index b1b5cb74604..2a829e8111f 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -399,7 +399,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000048F = "Esperanto" 00000425 = "Estonian" 00000438 = "Faeroese" -;00000429 = "Farsi" +00000429 = "Farsi" 0000040B = "Finnish" 00000C0C = "French (Canada)" 0000040C = "French (France)" @@ -587,6 +587,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00000405 = kbdcz.dll 00010405 = kbdcz1.dll 00000406 = kbdda.dll +00000429 = kbdfa.dll 00000407 = kbdgr.dll 00000807 = kbdsg.dll 00010407 = kbdgr1.dll diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 7f15a499cab..76f1d6c01f9 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic" IDS_NORWEGIAN_LAYOUT "Norwegian" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polish (214)" IDS_POLISH_LAYOUT "Polish (Programmers)" IDS_PORTUGUESE_LAYOUT "Portuguese" diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 6cff850d581..5166369e5da 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -223,6 +223,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolština (Cyrilice)" IDS_NORWEGIAN_LAYOUT "Norština" IDS_ORIYA_LAYOUT "Orijština" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polština (214)" IDS_POLISH_LAYOUT "Polština (Programátorská)" IDS_PORTUGUESE_LAYOUT "Portugalština" diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 8ea9aa6595c..8d593faf636 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -226,6 +226,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolisches Kyrillisch" IDS_NORWEGIAN_LAYOUT "Norwegisch" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polnisch (214)" IDS_POLISH_LAYOUT "Polnisch (Programmierer)" IDS_PORTUGUESE_LAYOUT "Portugiesisch" diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index ce7645ade20..b5e41bf5ca0 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Κυριλλικά" IDS_NORWEGIAN_LAYOUT "Νορβηγικά" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Πολωνικά (214)" IDS_POLISH_LAYOUT "Πολωνικά (Προγραμματιστές)" IDS_PORTUGUESE_LAYOUT "Πορτογαλικά" diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 0dc93c01f4e..fd8d2c7dfb2 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic" IDS_NORWEGIAN_LAYOUT "Norwegian" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polish (214)" IDS_POLISH_LAYOUT "Polish (Programmers)" IDS_PORTUGUESE_LAYOUT "Portuguese" diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index a7153e8ceed..6c40f19624e 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -224,6 +224,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongol (cirílico)" IDS_NORWEGIAN_LAYOUT "Noruego" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polaco (214)" IDS_POLISH_LAYOUT "Polaco (programadores)" IDS_PORTUGUESE_LAYOUT "Portugués" diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 6145701d60b..075ba214d2c 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -216,6 +216,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongole Cyrillic" IDS_NORWEGIAN_LAYOUT "Norvégien" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polonais (214)" IDS_POLISH_LAYOUT "Polonais (Programmeurs)" IDS_PORTUGUESE_LAYOUT "Portugais" diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index 9aaae38db14..4367e720bdb 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -217,6 +217,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "מונגולית קירילית" IDS_NORWEGIAN_LAYOUT "נורבגית" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "פולנית (214)" IDS_POLISH_LAYOUT "פולנית (מתכנתים)" IDS_PORTUGUESE_LAYOUT "פורטוגזית" diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc index 4b7e993d911..fb838717c58 100644 --- a/dll/cpl/input/lang/id-ID.rc +++ b/dll/cpl/input/lang/id-ID.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Cyrillic Mongolia" IDS_NORWEGIAN_LAYOUT "Norwegia" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polandia (214)" IDS_POLISH_LAYOUT "Polandia (Programmer)" IDS_PORTUGUESE_LAYOUT "Portugis" diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 0855ae2d0e0..f9992e352d2 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolo cirillico" IDS_NORWEGIAN_LAYOUT "Norvegese" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polacco (214)" IDS_POLISH_LAYOUT "Polacco (programmatori)" IDS_PORTUGUESE_LAYOUT "Portoghese" diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index f5a5cde8c7c..dd6967c8536 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "モンゴル語 キリル" IDS_NORWEGIAN_LAYOUT "ノルウェー語" IDS_ORIYA_LAYOUT "オリヤー語" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "ポーランド語 (214)" IDS_POLISH_LAYOUT "ポーランド語 (プログラマー)" IDS_PORTUGUESE_LAYOUT "ポルトガル語" diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index 566c4df71e1..3225b0b2857 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic" IDS_NORWEGIAN_LAYOUT "Norwegian" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polish (214)" IDS_POLISH_LAYOUT "Polish (Programmers)" IDS_PORTUGUESE_LAYOUT "Portuguese" diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index f21972c6aad..285e19cf5b6 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -224,6 +224,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolski (Cyrylica)" IDS_NORWEGIAN_LAYOUT "Norweski" IDS_ORIYA_LAYOUT "Orija" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polski (214)" IDS_POLISH_LAYOUT "Polski (Programisty)" IDS_PORTUGUESE_LAYOUT "Portugalski" diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 731870b8287..5ddd8a8255c 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongol cirílico" IDS_NORWEGIAN_LAYOUT "Norueguês" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polonês (214)" IDS_POLISH_LAYOUT "Polonês (programadores)" IDS_PORTUGUESE_LAYOUT "Português" diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index b5fd478754c..d6fc1573b90 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -222,6 +222,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongol cirílico" IDS_NORWEGIAN_LAYOUT "Norueguês" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polonês (214)" IDS_POLISH_LAYOUT "Polonês (programadores)" IDS_PORTUGUESE_LAYOUT "Português" diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index 6c3c9887ca7..48a71b95a02 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -223,6 +223,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolă (grafie chirilică)" IDS_NORWEGIAN_LAYOUT "Norvegiană" IDS_ORIYA_LAYOUT "Orisseneză" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Poloneză (214)" IDS_POLISH_LAYOUT "Poloneză (de programare)" IDS_PORTUGUESE_LAYOUT "Portugheză" diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 6fbe6f611f8..701c9e4b7cd 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -215,6 +215,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Монгольская (кириллица)" IDS_NORWEGIAN_LAYOUT "Норвежская" IDS_ORIYA_LAYOUT "Ория" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Польская (214)" IDS_POLISH_LAYOUT "Польская (программистская)" IDS_PORTUGUESE_LAYOUT "Португальская" diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 46bc972b924..d5781b1b3d2 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -220,6 +220,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic" IDS_NORWEGIAN_LAYOUT "Nórske" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Poľské (214)" IDS_POLISH_LAYOUT "Poľské (programátorské)" IDS_PORTUGUESE_LAYOUT "Portugalské" diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index 71667e17f15..48e72797283 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -219,6 +219,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Mongolian Cyrillic" IDS_NORWEGIAN_LAYOUT "Norwegjeze" IDS_ORIYA_LAYOUT "Oriya" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polake (214)" IDS_POLISH_LAYOUT "Polake (Programmers)" IDS_PORTUGUESE_LAYOUT "Portuguze" diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 8021b142b84..b4245eaf893 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -224,6 +224,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Moğolca (Kiril)" IDS_NORWEGIAN_LAYOUT "Norveççe" IDS_ORIYA_LAYOUT "Oriya Dili" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Polonyaca (214)" IDS_POLISH_LAYOUT "Polonyaca Programcılar" IDS_PORTUGUESE_LAYOUT "Portekizce" diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index adf982467c8..e1345526aaa 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -224,6 +224,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "Монгольська (кирилиця)" IDS_NORWEGIAN_LAYOUT "Норвезька" IDS_ORIYA_LAYOUT "Орія" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "Польська (214)" IDS_POLISH_LAYOUT "Польська (програмістська)" IDS_PORTUGUESE_LAYOUT "Португальська" diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index 907ae3dff4e..abae4563003 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -217,6 +217,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "外蒙古西里尔文" IDS_NORWEGIAN_LAYOUT "挪威文" IDS_ORIYA_LAYOUT "奥里雅文" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "波兰文(214)" IDS_POLISH_LAYOUT "波兰文(程序员)" IDS_PORTUGUESE_LAYOUT "葡萄牙文" diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc index d6cb5462637..9096ce9abc8 100644 --- a/dll/cpl/input/lang/zh-HK.rc +++ b/dll/cpl/input/lang/zh-HK.rc @@ -223,6 +223,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "外蒙古西里爾文" IDS_NORWEGIAN_LAYOUT "挪威文" IDS_ORIYA_LAYOUT "奧裡雅文" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "波蘭文(214)" IDS_POLISH_LAYOUT "波蘭文(程式設計師)" IDS_PORTUGUESE_LAYOUT "葡萄牙文" diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 09502ae4ae7..09236d10636 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -223,6 +223,7 @@ BEGIN IDS_MONGOLIAN_CYRILLIC_LAYOUT "外蒙古西里爾文" IDS_NORWEGIAN_LAYOUT "挪威文" IDS_ORIYA_LAYOUT "奧裡雅文" + IDS_PERSIAN_STANRDARD_LAYOUT "Persian (Standard)" IDS_POLISH_214_LAYOUT "波蘭文(214)" IDS_POLISH_LAYOUT "波蘭文(程式設計師)" IDS_PORTUGUESE_LAYOUT "葡萄牙文" diff --git a/dll/cpl/input/resource.h b/dll/cpl/input/resource.h index b6950e538bd..ab478a14f15 100644 --- a/dll/cpl/input/resource.h +++ b/dll/cpl/input/resource.h @@ -205,3 +205,4 @@ #define IDS_GERMAN_EXTENDED2_LAYOUT 5144 #define IDS_COLEMAK_LAYOUT 5145 #define IDS_ROMANIAN_STANDARD_LAYOUT 5175 +#define IDS_PERSIAN_STANRDARD_LAYOUT 5213 diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 05b1dde6316..03e6b71853b 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -29,6 +29,8 @@ list(APPEND _keyboard_layouts kbddv kbdeo kbdest + kbdfa + kbdfar kbdfc kbdfi kbdfo diff --git a/dll/keyboard/kbdfa/kbdfa.c b/dll/keyboard/kbdfa/kbdfa.c new file mode 100644 index 00000000000..63522bc4db5 --- /dev/null +++ b/dll/keyboard/kbdfa/kbdfa.c @@ -0,0 +1,310 @@ +/* + * PROJECT: ReactOS Keyboard Layouts + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Persian keyboard layout + * COPYRIGHT: Copyright 2026 Katayama Hirofumi MZ + */ + +#define WIN32_NO_STATUS +#include +#include +#include + +/* See also: https://kbdlayout.info/kbdfa */ + +#ifdef _M_IA64 + #define ROSDATA static __declspec(allocate(".data")) +#else + #ifdef _MSC_VER + #pragma data_seg(".data") + #define ROSDATA static + #else + #define ROSDATA static __attribute__((section(".data"))) + #endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ +#define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ + +/* ------------------------------------------------------------------ */ +/* Scancode -> virtual key (0x00 .. 0x7e, bMaxVSCtoVK = 0x7f) */ +/* ------------------------------------------------------------------ */ +ROSDATA USHORT scancode_to_vk[] = { + /* 00 */ VK_EMPTY, VK_ESCAPE, '1', '2', + /* 04 */ '3', '4', '5', '6', + /* 08 */ '7', '8', '9', '0', + /* 0C */ VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, VK_TAB, + /* 10 */ 'Q', 'W', 'E', 'R', + /* 14 */ 'T', 'Y', 'U', 'I', + /* 18 */ 'O', 'P', VK_OEM_4, VK_OEM_6, + /* 1C */ VK_RETURN, VK_LCONTROL, 'A', 'S', + /* 20 */ 'D', 'F', 'G', 'H', + /* 24 */ 'J', 'K', 'L', VK_OEM_1, + /* 28 */ VK_OEM_7, VK_OEM_3, VK_LSHIFT, VK_OEM_5, + /* 2C */ 'Z', 'X', 'C', 'V', + /* 30 */ 'B', 'N', 'M', VK_OEM_COMMA, + /* 34 */ VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KBDEXT, + /* 37 */ VK_MULTIPLY | KBDMULTIVK, + /* 38 */ VK_LMENU, VK_SPACE, VK_CAPITAL, + /* 3B */ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, + /* 40 */ VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, + /* 45 */ VK_NUMLOCK | KMEXT, + /* 46 */ VK_SCROLL | KBDMULTIVK, + /* 47 */ VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + /* 4B */ VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + /* 4F */ VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + /* 52 */ VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* 54 */ VK_SNAPSHOT, + /* 55 */ VK_EMPTY, + /* 56 */ VK_OEM_102, VK_F11, VK_F12, + /* 59 */ VK_CLEAR, VK_OEM_WSCTRL, VK_OEM_FINISH, VK_OEM_JUMP, + /* 5D */ VK_EREOF, VK_OEM_BACKTAB, VK_OEM_AUTO, + /* 60 */ VK_EMPTY, VK_EMPTY, VK_ZOOM, VK_HELP, + /* 64 */ VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + /* 6C */ VK_F21, VK_F22, VK_F23, + /* 6F */ VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, VK_EMPTY, + /* 73 */ VK_ABNT_C1, VK_EMPTY, VK_EMPTY, + /* 76 */ VK_F24, + /* 77 */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* 7B */ VK_OEM_PA1, VK_TAB, VK_EMPTY, VK_ABNT_C2, +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, + { 0x1D, VK_RCONTROL | KBDEXT }, + { 0x20, VK_VOLUME_MUTE | KBDEXT }, + { 0x21, VK_LAUNCH_APP2 | KBDEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, + { 0x24, VK_MEDIA_STOP | KBDEXT }, + { 0x2E, VK_VOLUME_DOWN | KBDEXT }, + { 0x30, VK_VOLUME_UP | KBDEXT }, + { 0x32, VK_BROWSER_HOME | KBDEXT }, + { 0x35, VK_DIVIDE | KBDEXT }, + { 0x37, VK_SNAPSHOT | KBDEXT }, + { 0x38, VK_RMENU | KBDEXT }, + { 0x47, VK_HOME | KBDEXT }, + { 0x48, VK_UP | KBDEXT }, + { 0x49, VK_PRIOR | KBDEXT }, + { 0x4B, VK_LEFT | KBDEXT }, + { 0x4D, VK_RIGHT | KBDEXT }, + { 0x4F, VK_END | KBDEXT }, + { 0x50, VK_DOWN | KBDEXT }, + { 0x51, VK_NEXT | KBDEXT }, + { 0x52, VK_INSERT | KBDEXT }, + { 0x53, VK_DELETE | KBDEXT }, + { 0x5B, VK_LWIN | KBDEXT }, + { 0x5C, VK_RWIN | KBDEXT }, + { 0x5D, VK_APPS | KBDEXT }, + { 0x5F, VK_SLEEP | KBDEXT }, + { 0x65, VK_BROWSER_SEARCH | KBDEXT }, + { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, + { 0x67, VK_BROWSER_REFRESH | KBDEXT }, + { 0x68, VK_BROWSER_STOP | KBDEXT }, + { 0x69, VK_BROWSER_FORWARD | KBDEXT }, + { 0x6A, VK_BROWSER_BACK | KBDEXT }, + { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, + { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, + { 0x1C, VK_RETURN | KBDEXT }, + { 0x46, VK_CANCEL | KBDEXT }, + { 0, 0 } +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1D, VK_PAUSE }, + { 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Modifiers: Shift / Ctrl / Alt. No AltGr -> max 3 states used */ +/* ------------------------------------------------------------------ */ +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KBDSHIFT }, + { VK_CONTROL, KBDCTRL }, + { VK_MENU, KBDALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 3 /* SHIFT+CTRL */ + } +}; + +/* ------------------------------------------------------------------ */ +/* VK -> WCHAR tables. No key uses CAPLOK (Persian has no case). */ +/* ------------------------------------------------------------------ */ + +/* Normal, Shift */ +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, 0, {0x00F7, 0x00D7} }, /* DIVISION SIGN, MULTIPLICATION SIGN */ + { '5', 0, {'5', '%'} }, + { '7', 0, {'7', '&'} }, + { '8', 0, {'8', '*'} }, + { '9', 0, {'9', ')'} }, + { VK_OEM_PLUS, 0, {'=', '+'} }, + { 'Q', 0, {0x0636, 0x064B} }, /* DAD , FATHATAN */ + { 'W', 0, {0x0635, 0x064C} }, /* SAD , DAMMATAN */ + { 'E', 0, {0x062B, 0x064D} }, /* THEH , KASRATAN */ + { 'R', 0, {0x0642, WCH_LGTR} },/* QAF , ligature "RIAL" (see below) */ + { 'T', 0, {0x0641, 0x060C} }, /* FEH , ARABIC COMMA */ + { 'Y', 0, {0x063A, 0x061B} }, /* GHAIN , ARABIC SEMICOLON */ + { 'U', 0, {0x0639, ','} }, /* AIN */ + { 'I', 0, {0x0647, ']'} }, /* HEH */ + { 'O', 0, {0x062E, '['} }, /* KHAH */ + { 'P', 0, {0x062D, '\\'} }, /* HAH */ + { 'A', 0, {0x0634, 0x064E} }, /* SHEEN , FATHA */ + { 'S', 0, {0x0633, 0x064F} }, /* SEEN , DAMMA */ + { 'D', 0, {0x06CC, 0x0650} }, /* FARSI YEH, KASRA */ + { 'F', 0, {0x0628, 0x0651} }, /* BEH , SHADDA */ + { 'G', 0, {0x0644, 0x06C0} }, /* LAM , HEH WITH YEH ABOVE */ + { 'H', 0, {0x0627, 0x0622} }, /* ALEF , ALEF WITH MADDA */ + { 'J', 0, {0x062A, 0x0640} }, /* TEH , TATWEEL */ + { 'K', 0, {0x0646, 0x00AB} }, /* NOON , LEFT GUILLEMET */ + { 'L', 0, {0x0645, 0x00BB} }, /* MEEM , RIGHT GUILLEMET */ + { VK_OEM_1, 0, {0x06A9, ':'} }, /* KEHEH */ + { VK_OEM_7, 0, {0x06AF, '\"'} }, /* GAF */ + { 'Z', 0, {0x0638, 0x0629} }, /* ZAH , TEH MARBUTA */ + { 'X', 0, {0x0637, 0x064A} }, /* TAH , ARABIC YEH */ + { 'C', 0, {0x0632, 0x0698} }, /* ZAIN , JEH */ + { 'V', 0, {0x0631, 0x0624} }, /* REH , WAW WITH HAMZA */ + { 'B', 0, {0x0630, 0x0625} }, /* THAL , ALEF WITH HAMZA BELOW */ + { 'N', 0, {0x062F, 0x0623} }, /* DAL , ALEF WITH HAMZA ABOVE */ + { 'M', 0, {0x0626, 0x0621} }, /* YEH WITH HAMZA, HAMZA */ + { VK_OEM_COMMA, 0, {0x0648, '<'} }, /* WAW */ + { VK_OEM_PERIOD, 0, {'.', '>'} }, + { VK_OEM_2, 0, {'/', 0x061F} }, /* ARABIC QUESTION MARK */ + { VK_OEM_102, 0, {0x067E, '|'} }, /* PEH */ + { VK_DECIMAL, 0, {'.', '.'} }, + { VK_TAB, 0, {'\t', '\t'} }, + { VK_ADD, 0, {'+', '+'} }, + { VK_DIVIDE, 0, {'/', '/'} }, + { VK_MULTIPLY, 0, {'*', '*'} }, + { VK_SUBTRACT, 0, {'-', '-'} }, + { 0, 0 } +}; + +/* Normal, Shift, Ctrl */ +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { '0', 0, {'0', '(', 0x06C1 /* HEH GOAL */} }, + { VK_OEM_4, 0, {0x062C /* JEEM */, '}', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {0x0686 /* TCHEH */, '{', 0x1d /* GS */} }, + { VK_OEM_5, 0, {0x067E /* PEH */, '|', 0x1c /* FS */} }, + { VK_BACK, 0, {0x08, 0x08, 0x7F} }, + { VK_ESCAPE, 0, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { VK_SPACE, 0, {' ', ' ', ' '} }, + { VK_CANCEL, 0, {0x03, 0x03, 0x03} }, + { 0, 0 } +}; + +/* Normal, Shift, Ctrl, Ctrl+Shift */ +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '1', 0, {'1', '!', WCH_NONE, 0x200D /* ZWJ */} }, + { '2', 0, {'2', '@', WCH_NONE, 0x200C /* ZWNJ */} }, + { '3', 0, {'3', '#', WCH_NONE, 0x200E /* LRM */} }, + { '4', 0, {'4', '$', WCH_NONE, 0x200F /* RLM */} }, + { '6', 0, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, 0, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +/* Order in the binary: 3, 4, 2, 1 */ +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + vk_master(2, key_to_chars_2mod), + vk_master(1, keypad_numbers), + { 0, 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Ligature: Shift+R (WCH_LGTR) -> U+0631 U+064A U+0627 U+0644 ("ريال") */ +/* ------------------------------------------------------------------ */ +ROSDATA LIGATURE4 ligatures[] = { + { 'R', 1 /* SHIFT */, {0x0631, 0x064A, 0x0627, 0x0644} }, + { 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Key names */ +/* ------------------------------------------------------------------ */ +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, { 0x0e, L"Backspace" }, { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, { 0x1d, L"Ctrl" }, { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" },{ 0x37, L"Num *" }, { 0x38, L"Alt" }, + { 0x39, L"Space" }, { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, { 0x3c, L"F2" }, { 0x3d, L"F3" }, { 0x3e, L"F4" }, + { 0x3f, L"F5" }, { 0x40, L"F6" }, { 0x41, L"F7" }, { 0x42, L"F8" }, + { 0x43, L"F9" }, { 0x44, L"F10" }, + { 0x45, L"Pause" }, { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, { 0x48, L"Num 8" }, { 0x49, L"Num 9" }, { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, { 0x4c, L"Num 5" }, { 0x4d, L"Num 6" }, { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, { 0x50, L"Num 2" }, { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, { 0x53, L"Num Del" },{ 0x54, L"Sys Req" }, + { 0x57, L"F11" }, { 0x58, L"F12" }, + { 0x7c, L"F13" }, { 0x7d, L"F14" }, { 0x7e, L"F15" }, { 0x7f, L"F16" }, + { 0x80, L"F17" }, { 0x81, L"F18" }, { 0x82, L"F19" }, { 0x83, L"F20" }, + { 0x84, L"F21" }, { 0x85, L"F22" }, { 0x86, L"F23" }, { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, { 0x37, L"Prnt Scrn" }, { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, { 0x46, L"Break" }, + { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, { 0x4d, L"Right" }, + { 0x4f, L"End" }, { 0x50, L"Down" }, { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, { 0x53, L"Delete" }, + { 0x54, L"<00>" }, { 0x56, L"Help" }, + { 0x5b, L"Left Windows" },{ 0x5c, L"Right Windows" },{ 0x5d, L"Application" }, + { 0, NULL } +}; + +/* ------------------------------------------------------------------ */ +/* Master table */ +/* ------------------------------------------------------------------ */ +ROSDATA KBDTABLES keyboard_layout_table = { + &modifier_bits, + vk_to_wchar_master_table, + NULL, /* no dead keys */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* no dead key names */ + scancode_to_vk, + RTL_NUMBER_OF(scancode_to_vk), /* 0x7f */ + extcode0_to_vk, + extcode1_to_vk, + MAKELONG(0, 1), /* fLocaleFlags = 0x00010000 (v1.0, no AltGr) */ + 4, /* nLgMax: up to 4 WCHARs per ligature */ + sizeof(LIGATURE4), /* cbLgEntry = 12 */ + (PLIGATURE1)ligatures +}; + +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} diff --git a/dll/keyboard/kbdfa/kbdfa.rc b/dll/keyboard/kbdfa/kbdfa.rc new file mode 100644 index 00000000000..6deaf8afad7 --- /dev/null +++ b/dll/keyboard/kbdfa/kbdfa.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Persian Keyboard Layout" +#define REACTOS_STR_INTERNAL_NAME "kbdfa" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdfa.dll" +#include diff --git a/dll/keyboard/kbdfa/kbdfa.spec b/dll/keyboard/kbdfa/kbdfa.spec new file mode 100644 index 00000000000..12e3bc9c766 --- /dev/null +++ b/dll/keyboard/kbdfa/kbdfa.spec @@ -0,0 +1 @@ +@ stdcall KbdLayerDescriptor() diff --git a/dll/keyboard/kbdfar/kbdfar.c b/dll/keyboard/kbdfar/kbdfar.c new file mode 100644 index 00000000000..9efc5c1fd5a --- /dev/null +++ b/dll/keyboard/kbdfar/kbdfar.c @@ -0,0 +1,310 @@ +/* + * PROJECT: ReactOS Keyboard Layouts + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Persian Standard keyboard layout + * COPYRIGHT: Copyright 2026 Katayama Hirofumi MZ + */ + +#define WIN32_NO_STATUS +#include +#include +#include + +/* See also: https://kbdlayout.info/kbdfar */ + +#ifdef _M_IA64 + #define ROSDATA static __declspec(allocate(".data")) +#else + #ifdef _MSC_VER + #pragma data_seg(".data") + #define ROSDATA static + #else + #define ROSDATA static __attribute__((section(".data"))) + #endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ +#define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ + +/* ------------------------------------------------------------------ */ +/* Scancode -> virtual key (0x00 .. 0x7e, bMaxVSCtoVK = 0x7f) */ +/* ------------------------------------------------------------------ */ +ROSDATA USHORT scancode_to_vk[] = { + /* 00 */ VK_EMPTY, VK_ESCAPE, '1', '2', + /* 04 */ '3', '4', '5', '6', + /* 08 */ '7', '8', '9', '0', + /* 0C */ VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, VK_TAB, + /* 10 */ 'Q', 'W', 'E', 'R', + /* 14 */ 'T', 'Y', 'U', 'I', + /* 18 */ 'O', 'P', VK_OEM_4, VK_OEM_6, + /* 1C */ VK_RETURN, VK_LCONTROL, 'A', 'S', + /* 20 */ 'D', 'F', 'G', 'H', + /* 24 */ 'J', 'K', 'L', VK_OEM_1, + /* 28 */ VK_OEM_7, VK_OEM_3, VK_LSHIFT, VK_OEM_5, + /* 2C */ 'Z', 'X', 'C', 'V', + /* 30 */ 'B', 'N', 'M', VK_OEM_COMMA, + /* 34 */ VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KBDEXT, + /* 37 */ VK_MULTIPLY | KBDMULTIVK, + /* 38 */ VK_LMENU, VK_SPACE, VK_CAPITAL, + /* 3B */ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, + /* 40 */ VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, + /* 45 */ VK_NUMLOCK | KMEXT, + /* 46 */ VK_SCROLL | KBDMULTIVK, + /* 47 */ VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + /* 4B */ VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + /* 4F */ VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + /* 52 */ VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* 54 */ VK_SNAPSHOT, + /* 55 */ VK_EMPTY, + /* 56 */ VK_OEM_102, VK_F11, VK_F12, + /* 59 */ VK_CLEAR, VK_OEM_WSCTRL, VK_OEM_FINISH, VK_OEM_JUMP, + /* 5D */ VK_EREOF, VK_OEM_BACKTAB, VK_OEM_AUTO, + /* 60 */ VK_EMPTY, VK_EMPTY, VK_ZOOM, VK_HELP, + /* 64 */ VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + /* 6C */ VK_F21, VK_F22, VK_F23, + /* 6F */ VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, VK_EMPTY, + /* 73 */ VK_ABNT_C1, VK_EMPTY, VK_EMPTY, + /* 76 */ VK_F24, + /* 77 */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* 7B */ VK_OEM_PA1, VK_TAB, VK_EMPTY, VK_ABNT_C2, +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, + { 0x1D, VK_RCONTROL | KBDEXT }, + { 0x20, VK_VOLUME_MUTE | KBDEXT }, + { 0x21, VK_LAUNCH_APP2 | KBDEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, + { 0x24, VK_MEDIA_STOP | KBDEXT }, + { 0x2E, VK_VOLUME_DOWN | KBDEXT }, + { 0x30, VK_VOLUME_UP | KBDEXT }, + { 0x32, VK_BROWSER_HOME | KBDEXT }, + { 0x35, VK_DIVIDE | KBDEXT }, + { 0x37, VK_SNAPSHOT | KBDEXT }, + { 0x38, VK_RMENU | KBDEXT }, + { 0x47, VK_HOME | KBDEXT }, + { 0x48, VK_UP | KBDEXT }, + { 0x49, VK_PRIOR | KBDEXT }, + { 0x4B, VK_LEFT | KBDEXT }, + { 0x4D, VK_RIGHT | KBDEXT }, + { 0x4F, VK_END | KBDEXT }, + { 0x50, VK_DOWN | KBDEXT }, + { 0x51, VK_NEXT | KBDEXT }, + { 0x52, VK_INSERT | KBDEXT }, + { 0x53, VK_DELETE | KBDEXT }, + { 0x5B, VK_LWIN | KBDEXT }, + { 0x5C, VK_RWIN | KBDEXT }, + { 0x5D, VK_APPS | KBDEXT }, + { 0x5F, VK_SLEEP | KBDEXT }, + { 0x65, VK_BROWSER_SEARCH | KBDEXT }, + { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, + { 0x67, VK_BROWSER_REFRESH | KBDEXT }, + { 0x68, VK_BROWSER_STOP | KBDEXT }, + { 0x69, VK_BROWSER_FORWARD | KBDEXT }, + { 0x6A, VK_BROWSER_BACK | KBDEXT }, + { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, + { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, + { 0x1C, VK_RETURN | KBDEXT }, + { 0x46, VK_CANCEL | KBDEXT }, + { 0, 0 } +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1D, VK_PAUSE }, + { 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Modifiers: Shift / Ctrl / Alt. No AltGr -> max 3 states used */ +/* ------------------------------------------------------------------ */ +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KBDSHIFT }, + { VK_CONTROL, KBDCTRL }, + { VK_MENU, KBDALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 3 /* SHIFT+CTRL */ + } +}; + +/* ------------------------------------------------------------------ */ +/* VK -> WCHAR tables. No key uses CAPLOK (Persian has no case). */ +/* ------------------------------------------------------------------ */ + +/* Normal, Shift */ +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_TAB, 0, {0x0009, 0x0009} }, + { VK_ADD, 0, {'+', '+'} }, + { VK_DIVIDE, 0, {'/', '/'} }, + { VK_MULTIPLY, 0, {'*', '*'} }, + { VK_SUBTRACT, 0, {'-', '-'} }, + { 0, 0 } +}; + +/* Normal, Shift, Ctrl */ +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_BACK, 0, {0x0008, 0x0008, 0x007F} }, + { VK_ESCAPE, 0, {0x001B, 0x001B, 0x001B} }, + { VK_RETURN, 0, {0x000D, 0x000D, 0x000A} }, + { VK_CANCEL, 0, {0x0003, 0x0003, 0x0003} }, + { 0, 0 } +}; + +/* Normal, Shift, Ctrl, Ctrl+Shift (WCH_NONE = no character) */ +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '1', 0, {0x06F1, '!', WCH_NONE, 0x200D} }, + { '2', 0, {0x06F2, 0x066C, WCH_NONE, 0x200C} }, + { '3', 0, {0x06F3, 0x066B, WCH_NONE, 0x200E} }, + { '4', 0, {0x06F4, WCH_LGTR, WCH_NONE, 0x200F} }, + { '5', 0, {0x06F5, 0x066A, WCH_NONE, WCH_NONE} }, + { '6', 0, {0x06F6, 0x00D7, WCH_NONE, WCH_NONE} }, + { '7', 0, {0x06F7, 0x060C, WCH_NONE, WCH_NONE} }, + { '8', 0, {0x06F8, '*', WCH_NONE, WCH_NONE} }, + { '9', 0, {0x06F9, ')', WCH_NONE, WCH_NONE} }, + { '0', 0, {0x06F0, '(', WCH_NONE, WCH_NONE} }, + { VK_OEM_MINUS, 0, {'-', 0x0640, WCH_NONE, WCH_NONE} }, + { VK_OEM_PLUS, 0, {'=', '+', WCH_NONE, WCH_NONE} }, + { 'Q', 0, {0x0636, 0x0652, WCH_NONE, WCH_NONE} }, + { 'W', 0, {0x0635, 0x064C, WCH_NONE, WCH_NONE} }, + { 'E', 0, {0x062B, 0x064D, WCH_NONE, WCH_NONE} }, + { 'R', 0, {0x0642, 0x064B, WCH_NONE, WCH_NONE} }, + { 'T', 0, {0x0641, 0x064F, WCH_NONE, WCH_NONE} }, + { 'Y', 0, {0x063A, 0x0650, WCH_NONE, WCH_NONE} }, + { 'U', 0, {0x0639, 0x064E, WCH_NONE, WCH_NONE} }, + { 'I', 0, {0x0647, 0x0651, WCH_NONE, WCH_NONE} }, + { 'O', 0, {0x062E, ']', WCH_NONE, WCH_NONE} }, + { 'P', 0, {0x062D, '[', WCH_NONE, WCH_NONE} }, + { VK_OEM_4, 0, {0x062C, '}', 0x001B, WCH_NONE} }, + { VK_OEM_6, 0, {0x0686, '{', 0x001D, WCH_NONE} }, + { 'A', 0, {0x0634, 0x0624, WCH_NONE, WCH_NONE} }, + { 'S', 0, {0x0633, 0x0626, WCH_NONE, WCH_NONE} }, + { 'D', 0, {0x06CC, 0x064A, WCH_NONE, WCH_NONE} }, + { 'F', 0, {0x0628, 0x0625, WCH_NONE, WCH_NONE} }, + { 'G', 0, {0x0644, 0x0623, WCH_NONE, WCH_NONE} }, + { 'H', 0, {0x0627, 0x0622, WCH_NONE, WCH_NONE} }, + { 'J', 0, {0x062A, 0x0629, WCH_NONE, WCH_NONE} }, + { 'K', 0, {0x0646, 0x00BB, WCH_NONE, WCH_NONE} }, + { 'L', 0, {0x0645, 0x00AB, WCH_NONE, WCH_NONE} }, + { VK_OEM_1, 0, {0x06A9, ':', WCH_NONE, WCH_NONE} }, + { VK_OEM_7, 0, {0x06AF, 0x061B, WCH_NONE, WCH_NONE} }, + { VK_OEM_3, 0, {0x200D, 0x200D, WCH_NONE, WCH_NONE} }, + { VK_OEM_5, 0, {'\\', '|', 0x001C, WCH_NONE} }, + { 'Z', 0, {0x0638, 0x0643, WCH_NONE, WCH_NONE} }, + { 'X', 0, {0x0637, 0x0637, WCH_NONE, WCH_NONE} }, + { 'C', 0, {0x0632, 0x0698, WCH_NONE, WCH_NONE} }, + { 'V', 0, {0x0631, 0x0670, WCH_NONE, WCH_NONE} }, + { 'B', 0, {0x0630, 0x200C, WCH_NONE, WCH_NONE} }, + { 'N', 0, {0x062F, 0x0654, WCH_NONE, WCH_NONE} }, + { 'M', 0, {0x067E, 0x0621, WCH_NONE, WCH_NONE} }, + { VK_OEM_COMMA, 0, {0x0648, '>', WCH_NONE, WCH_NONE} }, + { VK_OEM_PERIOD, 0, {'.', '<', WCH_NONE, WCH_NONE} }, + { VK_OEM_2, 0, {'/', 0x061F, WCH_NONE, WCH_NONE} }, + { VK_SPACE, 0, {' ', 0x200C, ' ', WCH_NONE} }, + { VK_OEM_102, 0, {'\\', '|', WCH_NONE, WCH_NONE} }, + { VK_DECIMAL, 0, {'.', '.', WCH_NONE, WCH_NONE} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +/* Order in the binary: 3, 4, 2, 1 */ +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + vk_master(2, key_to_chars_2mod), + vk_master(1, keypad_numbers), + { 0, 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Ligature: Shift+4 (WCH_LGTR) -> U+0631 U+06CC U+0627 U+0644 (Rial, with Farsi Yeh) */ +/* ------------------------------------------------------------------ */ +ROSDATA LIGATURE4 ligatures[] = { + { '4', 1 /* SHIFT */, {0x0631, 0x06CC, 0x0627, 0x0644} }, + { 0, 0 } +}; + +/* ------------------------------------------------------------------ */ +/* Key names */ +/* ------------------------------------------------------------------ */ +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, { 0x0e, L"Backspace" }, { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, { 0x1d, L"Ctrl" }, { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" },{ 0x37, L"Num *" }, { 0x38, L"Alt" }, + { 0x39, L"Space" }, { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, { 0x3c, L"F2" }, { 0x3d, L"F3" }, { 0x3e, L"F4" }, + { 0x3f, L"F5" }, { 0x40, L"F6" }, { 0x41, L"F7" }, { 0x42, L"F8" }, + { 0x43, L"F9" }, { 0x44, L"F10" }, + { 0x45, L"Pause" }, { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, { 0x48, L"Num 8" }, { 0x49, L"Num 9" }, { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, { 0x4c, L"Num 5" }, { 0x4d, L"Num 6" }, { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, { 0x50, L"Num 2" }, { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, { 0x53, L"Num Del" },{ 0x54, L"Sys Req" }, + { 0x57, L"F11" }, { 0x58, L"F12" }, + { 0x7c, L"F13" }, { 0x7d, L"F14" }, { 0x7e, L"F15" }, { 0x7f, L"F16" }, + { 0x80, L"F17" }, { 0x81, L"F18" }, { 0x82, L"F19" }, { 0x83, L"F20" }, + { 0x84, L"F21" }, { 0x85, L"F22" }, { 0x86, L"F23" }, { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, { 0x37, L"Prnt Scrn" }, { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, { 0x46, L"Break" }, + { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, { 0x4d, L"Right" }, + { 0x4f, L"End" }, { 0x50, L"Down" }, { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, { 0x53, L"Delete" }, + { 0x54, L"<00>" }, { 0x56, L"Help" }, + { 0x5b, L"Left Windows" },{ 0x5c, L"Right Windows" },{ 0x5d, L"Application" }, + { 0, NULL } +}; + +/* ------------------------------------------------------------------ */ +/* Master table */ +/* ------------------------------------------------------------------ */ +ROSDATA KBDTABLES keyboard_layout_table = { + &modifier_bits, + vk_to_wchar_master_table, + NULL, /* no dead keys */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* no dead key names */ + scancode_to_vk, + RTL_NUMBER_OF(scancode_to_vk), /* 0x7f */ + extcode0_to_vk, + extcode1_to_vk, + MAKELONG(0, 1), /* fLocaleFlags = 0x00010000 (v1.0, no AltGr) */ + 4, /* nLgMax: up to 4 WCHARs per ligature */ + sizeof(LIGATURE4), /* cbLgEntry = 12 */ + (PLIGATURE1)ligatures +}; + +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} diff --git a/dll/keyboard/kbdfar/kbdfar.rc b/dll/keyboard/kbdfar/kbdfar.rc new file mode 100644 index 00000000000..da3f65821f1 --- /dev/null +++ b/dll/keyboard/kbdfar/kbdfar.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Persian Standard Keyboard Layout" +#define REACTOS_STR_INTERNAL_NAME "kbdfar" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdfar.dll" +#include diff --git a/dll/keyboard/kbdfar/kbdfar.spec b/dll/keyboard/kbdfar/kbdfar.spec new file mode 100644 index 00000000000..12e3bc9c766 --- /dev/null +++ b/dll/keyboard/kbdfar/kbdfar.spec @@ -0,0 +1 @@ +@ stdcall KbdLayerDescriptor() diff --git a/media/inf/intl.inf b/media/inf/intl.inf index fcdf87301a3..0eb3aa59443 100644 --- a/media/inf/intl.inf +++ b/media/inf/intl.inf @@ -63,7 +63,7 @@ DriverVer = 05/29/2008,0.1 0000048f = %Esperanto%, 28593,1, , 048f:0000048f 00000425 = %Estonian%, 775, 3, , 0425:00000425 00000438 = %Faeroese%, 850, 1, , 0438:00000406,0409:00000409 -00000429 = %Farsi%, 720, 11, , 0409:00000409,0429:00000429,0429:00000401 +00000429 = %Farsi%, 720, 11, , 0429:00000429,0429:00050429 00000464 = %Filipino%, 437, 1, , 0464:00000409 0000040b = %Finnish%, 850, 1, , 040b:0000040b,0409:00000409 0000040c = %French_France%, 850, 1, , 040c:0000040c,0409:00000409