From dbc716fc8d0323e9e37a6c5f24c079232b3b0b92 Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Tue, 21 Feb 2023 02:00:47 +0100 Subject: [PATCH] +enh: add Unicode point display (status bar) of current (caret pos) character --- Build/Notepad3.ini | 2 +- language/np3_af_za/strings_af_za.rc | 4 ++-- language/np3_be_by/strings_be_by.rc | 4 ++-- language/np3_de_de/strings_de_de.rc | 4 ++-- language/np3_el_gr/strings_el_gr.rc | 4 ++-- language/np3_en_gb/strings_en_gb.rc | 4 ++-- language/np3_en_us/strings_en_us.rc | 4 ++-- language/np3_es_es/strings_es_es.rc | 4 ++-- language/np3_es_mx/strings_es_mx.rc | 4 ++-- language/np3_fr_fr/strings_fr_fr.rc | 4 ++-- language/np3_hi_in/strings_hi_in.rc | 4 ++-- language/np3_hu_hu/strings_hu_hu.rc | 4 ++-- language/np3_id_id/strings_id_id.rc | 4 ++-- language/np3_it_it/strings_it_it.rc | 4 ++-- language/np3_ja_jp/strings_ja_jp.rc | 4 ++-- language/np3_ko_kr/strings_ko_kr.rc | 4 ++-- language/np3_nl_nl/strings_nl_nl.rc | 4 ++-- language/np3_pl_pl/strings_pl_pl.rc | 4 ++-- language/np3_pt_br/strings_pt_br.rc | 4 ++-- language/np3_pt_pt/strings_pt_pt.rc | 4 ++-- language/np3_ru_ru/strings_ru_ru.rc | 4 ++-- language/np3_sk_sk/strings_sk_sk.rc | 4 ++-- language/np3_sv_se/strings_sv_se.rc | 4 ++-- language/np3_tr_tr/strings_tr_tr.rc | 4 ++-- language/np3_vi_vn/strings_vi_vn.rc | 4 ++-- language/np3_zh_cn/strings_zh_cn.rc | 4 ++-- language/np3_zh_tw/strings_zh_tw.rc | 4 ++-- src/Notepad3.c | 30 +++++++++++++++++++++++++++++ src/TypeDefs.h | 11 +++++------ 29 files changed, 88 insertions(+), 59 deletions(-) diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini index 3061d75de..54c86caa1 100644 --- a/Build/Notepad3.ini +++ b/Build/Notepad3.ini @@ -70,7 +70,7 @@ SettingsVersion=5 ;HyperlinkFileProtocolVerb="" (ShellExecuteEx()::lpVerb (""=default, "edit", "explore", "find", "open", "print", "properties", "runas") [Statusbar Settings] ;VisibleSections=0 1 12 14 2 4 5 6 7 8 9 10 11 -;SectionPrefixes=Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval , +;SectionPrefixes=Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+, ;SectionPostfixes=,,,,,,,,,,,,,,, ;SectionWidthSpecs=30 20 20 20 20 20 0 0 0 0 0 0 20 20 20 ;ZeroBasedColumnIndex=0 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 41e0fc881..800775f63 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Skema-versameling" IDM_THEMES_FACTORY_RESET "&Fabriek Verstek" IDM_THEMES_STD_CFG "&Standaard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Maak alles skoon" IDS_MUI_CLEAR_FIND_HISTORY "Vee geskiedenis uit" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 06d215942..879fc927e 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Калекцыя схем" IDM_THEMES_FACTORY_RESET "&Завадскія налады" IDM_THEMES_STD_CFG "&Стандартны канфіг" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Ачысціць усё" IDS_MUI_CLEAR_FIND_HISTORY "Ачысціць гісторыю пошуку" diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 70e4563f9..e9e8dad77 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Schema Sammlung" IDM_THEMES_FACTORY_RESET "&Zurücksetzen auf Fabrik Schema" IDM_THEMES_STD_CFG "&Standard Config Schema" - IDS_MUI_STATUSBAR_PREFIXES "Z ,Sp ,Sel ,GrB ,SelZ ,Vork ,,,,,,,Zch ,Ersz ,Ergb ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Z ,Sp ,Sel ,GrB ,SelZ ,Vork ,,,,,,,Zch ,Ersz ,Ergb ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Alle löschen" IDS_MUI_CLEAR_FIND_HISTORY "Suchen-Historie löschen" diff --git a/language/np3_el_gr/strings_el_gr.rc b/language/np3_el_gr/strings_el_gr.rc index ed1b6d764..8564354b7 100644 --- a/language/np3_el_gr/strings_el_gr.rc +++ b/language/np3_el_gr/strings_el_gr.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Συλλογή συνδυασμών" IDM_THEMES_FACTORY_RESET "&Προεπιλεγμένη" IDM_THEMES_STD_CFG "&Τυπική Config" - IDS_MUI_STATUSBAR_PREFIXES "Γρ. ,Στήλη ,Επιλ. ,Επιλb ,ΕπιλΓρ. ,Εμφ. ,,,,,,,Χαρ. ,Αντικ. ,Βαθμ. ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Γρ. ,Στήλη ,Επιλ. ,Επιλb ,ΕπιλΓρ. ,Εμφ. ,,,,,,,Χαρ. ,Αντικ. ,Βαθμ. ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Απαλοιφή όλων" IDS_MUI_CLEAR_FIND_HISTORY "Απαλοιφή ιστορικού αναζήτησης" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index cbac112d2..d0b190fbc 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_FACTORY_RESET "&Factory Reset" IDM_THEMES_STD_CFG "&Standard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Clear All" IDS_MUI_CLEAR_FIND_HISTORY "Clear Find History" diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 0d5ceb849..7fdd75a0f 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_FACTORY_RESET "&Factory Reset" IDM_THEMES_STD_CFG "&Standard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Clear All" IDS_MUI_CLEAR_FIND_HISTORY "Clear Find History" diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index d0e2177ce..f6c34f821 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Colección de Esquemas" IDM_THEMES_FACTORY_RESET "&Defecto de fábrica" IDM_THEMES_STD_CFG "Config. &Estándar" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Borrar todo" IDS_MUI_CLEAR_FIND_HISTORY "Borrar historial de búsqueda" diff --git a/language/np3_es_mx/strings_es_mx.rc b/language/np3_es_mx/strings_es_mx.rc index 460ad5b2f..a63a81b11 100644 --- a/language/np3_es_mx/strings_es_mx.rc +++ b/language/np3_es_mx/strings_es_mx.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Colección de Esquemas" IDM_THEMES_FACTORY_RESET "&Defecto de fábrica" IDM_THEMES_STD_CFG "Config. &Estándar" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Borrar todo" IDS_MUI_CLEAR_FIND_HISTORY "Borrar historial de búsqueda" diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index ae6749cd2..05374e4f6 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Collection de thèmes" IDM_THEMES_FACTORY_RESET "Réinitialisation d’&usine" IDM_THEMES_STD_CFG "Configuration &standard" - IDS_MUI_STATUSBAR_PREFIXES "Lgn ,Col ,Sel ,Sb ,SLgn ,Occ ,,,,,,,Car ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Lgn ,Col ,Sel ,Sb ,SLgn ,Occ ,,,,,,,Car ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Effacer tout" IDS_MUI_CLEAR_FIND_HISTORY "Effacer l'historique de recherche" diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc index 086e54aa2..e0d9d0188 100644 --- a/language/np3_hi_in/strings_hi_in.rc +++ b/language/np3_hi_in/strings_hi_in.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "स्कीम संग्रह (&S)" IDM_THEMES_FACTORY_RESET "फैक्ट्री डिफ़ॉल्ट (&F)" IDM_THEMES_STD_CFG "सामान्य Config (&S)" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "सारा साफ करें" IDS_MUI_CLEAR_FIND_HISTORY "ढूँढी हुई फ़ाइलों की जानकारी हटाएं" diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index def6fa460..9dbf94ab5 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Sablon gyűjtemény" IDM_THEMES_FACTORY_RESET "&Gyári érték" IDM_THEMES_STD_CFG "&Standard konfiguráció" - IDS_MUI_STATUSBAR_PREFIXES "Sor ,Oszl ,Kij ,Sb ,SKij ,Tal ,,,,,,,Ch ,Csere ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Sor ,Oszl ,Kij ,Sb ,SKij ,Tal ,,,,,,,Ch ,Csere ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Mind törlése" IDS_MUI_CLEAR_FIND_HISTORY "Keresési előzmények törlése" diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc index 938bc1fbf..531424bb5 100644 --- a/language/np3_id_id/strings_id_id.rc +++ b/language/np3_id_id/strings_id_id.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_FACTORY_RESET "&Factory Default" IDM_THEMES_STD_CFG "&Standard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Clear All" IDS_MUI_CLEAR_FIND_HISTORY "Clear Find History" diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index f8e2e4794..7bc0bb2a7 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Collezione di Schemi" IDM_THEMES_FACTORY_RESET "Impostazioni di &fabbrica" IDM_THEMES_STD_CFG "&Standard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Car ,Sost ,Ris ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Car ,Sost ,Ris ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Pulisci tutto" IDS_MUI_CLEAR_FIND_HISTORY "Pulisci Cronologia Ricerche" diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 311cb7da1..85ade35ef 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "配色テーマ(&S)" IDM_THEMES_FACTORY_RESET "初期設定(&F)" IDM_THEMES_STD_CFG "標準設定 (&S)" // Keep blank space before (&S) - IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,選 ,選B ,選行 ,見 ,,,,,,,字 ,置 ,式 ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,選 ,選B ,選行 ,見 ,,,,,,,字 ,置 ,式 ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "すべて削除" IDS_MUI_CLEAR_FIND_HISTORY "検索履歴を消去" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index cf911768c..8be65050e 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "구성표 모음(&S)" IDM_THEMES_FACTORY_RESET "기본값(&F)" IDM_THEMES_STD_CFG "표준 구성 (&S)" // 앞에 공백을 유지(&S) - IDS_MUI_STATUSBAR_PREFIXES "줄 ,열 ,선택 ,블럭 ,줄선택 ,일치 ,,,,,,,글자 ,교체 ,유형 ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "줄 ,열 ,선택 ,블럭 ,줄선택 ,일치 ,,,,,,,글자 ,교체 ,유형 ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "모두 지우기" IDS_MUI_CLEAR_FIND_HISTORY "찾기 내역 지우기" diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 21c485a9b..e8a784179 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Schema's" IDM_THEMES_FACTORY_RESET "&Standaardinstelling" IDM_THEMES_STD_CFG "&Standaard Config" - IDS_MUI_STATUSBAR_PREFIXES "Rg ,Kol ,Sel ,Sb ,SRg ,Occ ,,,,,,,Ch ,Verv ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Rg ,Kol ,Sel ,Sb ,SRg ,Occ ,,,,,,,Ch ,Verv ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Alles wissen" IDS_MUI_CLEAR_FIND_HISTORY "Zoekgeschiedenis wissen" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index e5d61547f..a79ac335e 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "Wybór &schematów" IDM_THEMES_FACTORY_RESET "&Domyślne" IDM_THEMES_STD_CFG "&Standardowa konfiguracja" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,kol ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Podn ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,kol ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Podn ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Wyczyść wszystko" IDS_MUI_CLEAR_FIND_HISTORY "Wyczyść Znajdź Historię" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index e6221718c..1ef45e72b 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Coleção de Esquemas" IDM_THEMES_FACTORY_RESET "&Padrão de Fábrica" IDM_THEMES_STD_CFG "Config. &Padrão" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Limpar Tudo" IDS_MUI_CLEAR_FIND_HISTORY "Limpar Histórico Localizar" diff --git a/language/np3_pt_pt/strings_pt_pt.rc b/language/np3_pt_pt/strings_pt_pt.rc index 8c22ce033..ace352103 100644 --- a/language/np3_pt_pt/strings_pt_pt.rc +++ b/language/np3_pt_pt/strings_pt_pt.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "Colecção de e&squemas" IDM_THEMES_FACTORY_RESET "&Padrão da fabrico" IDM_THEMES_STD_CFG "&Padrão Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Limpar tudo" IDS_MUI_CLEAR_FIND_HISTORY "Limpar histórico de localizar" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 0f96c93b1..70ecabfb9 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Коллекция схем" IDM_THEMES_FACTORY_RESET "&Заводские настройки" IDM_THEMES_STD_CFG "&Стандартный конфиг" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Очистить всё" IDS_MUI_CLEAR_FIND_HISTORY "Очистить историю поиска" diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc index 2cf7924f6..1149ecfec 100644 --- a/language/np3_sk_sk/strings_sk_sk.rc +++ b/language/np3_sk_sk/strings_sk_sk.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Výber motívu" IDM_THEMES_FACTORY_RESET "&Predvolené nastavenia" IDM_THEMES_STD_CFG "&Štandardná konfigurácia" - IDS_MUI_STATUSBAR_PREFIXES "Riadok ,Stĺpec ,Výber ,Sb ,SLn ,Occ ,,,,,,,Znaky ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Riadok ,Stĺpec ,Výber ,Sb ,SLn ,Occ ,,,,,,,Znaky ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Vymazať všetko" IDS_MUI_CLEAR_FIND_HISTORY "Vymazať históriu vyhľadávania" diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc index 385c144aa..b3fd70043 100644 --- a/language/np3_sv_se/strings_sv_se.rc +++ b/language/np3_sv_se/strings_sv_se.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "Schemasamling" IDM_THEMES_FACTORY_RESET "&Fabriksåterställning" IDM_THEMES_STD_CFG "&Standard Konfig" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Rensa alla" IDS_MUI_CLEAR_FIND_HISTORY "Rensa sökhistorik" diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc index f7440a4f6..5810480f6 100644 --- a/language/np3_tr_tr/strings_tr_tr.rc +++ b/language/np3_tr_tr/strings_tr_tr.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "Şema &teması" IDM_THEMES_FACTORY_RESET "&Fabrika ayarları" IDM_THEMES_STD_CFG "Standart yapılandırma" - IDS_MUI_STATUSBAR_PREFIXES "Sat ,Süt ,Seç ,Haz ,SSat ,Kop ,,,,,,,Krk ,Değ ,Dene ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Sat ,Süt ,Seç ,Haz ,SSat ,Kop ,,,,,,,Krk ,Değ ,Dene ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Tümünü temizle" IDS_MUI_CLEAR_FIND_HISTORY "Arama geçmişini temizle" diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc index 8b1575287..7b06be08e 100644 --- a/language/np3_vi_vn/strings_vi_vn.rc +++ b/language/np3_vi_vn/strings_vi_vn.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_FACTORY_RESET "&Factory Default" IDM_THEMES_STD_CFG "&Standard Config" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "Clear All" IDS_MUI_CLEAR_FIND_HISTORY "Clear Find History" diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 689e573e4..34df60fa3 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "语法高亮方案集(&S)" IDM_THEMES_FACTORY_RESET "工厂默认(&F)" IDM_THEMES_STD_CFG "标准配置 (&S)" // Keep blank space before (&S) - IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,选定 ,字节 ,选行 ,匹配 ,,,,,,,字符 ,改写 ,求值 ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,选定 ,字节 ,选行 ,匹配 ,,,,,,,字符 ,改写 ,求值 ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "清除全部" IDS_MUI_CLEAR_FIND_HISTORY "清除查找历史" diff --git a/language/np3_zh_tw/strings_zh_tw.rc b/language/np3_zh_tw/strings_zh_tw.rc index 6380c0144..53e3f87f5 100644 --- a/language/np3_zh_tw/strings_zh_tw.rc +++ b/language/np3_zh_tw/strings_zh_tw.rc @@ -266,8 +266,8 @@ BEGIN IDS_MUI_MENU_THEMES "語法高亮方案(&S)" IDM_THEMES_FACTORY_RESET "工廠預設(&F)" IDM_THEMES_STD_CFG "標準設定 (&S)" // Keep blank space before (&S) - IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,選定 ,位元組 ,選行 ,符合 ,,,,,,,字元 ,改寫 ,求值 ," - IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," + IDS_MUI_STATUSBAR_PREFIXES "行 ,列 ,選定 ,位元組 ,選行 ,符合 ,,,,,,,字元 ,改寫 ,求值 ,U+," + IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,," IDS_CLEAR_ALL "全部清除" IDS_MUI_CLEAR_FIND_HISTORY "清除尋找歷程記錄" diff --git a/src/Notepad3.c b/src/Notepad3.c index bb242aaf6..1ba292241 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -10027,6 +10027,36 @@ static void _UpdateStatusbarDelayed(bool bForceRedraw) } // ------------------------------------------------------ + if (g_iStatusbarVisible[STATUS_UNICODEPT]) { + + static WCHAR tchChr[32] = { L'\0' }; + static unsigned s_wChr = L'\0'; + int const len = sizeof(int) / sizeof(WCHAR); + + DocPos const iPosAfter = SciCall_PositionAfter(iPos); + + char chChrs[8] = { '\0' }; + struct Sci_TextRangeFull tr = { { iPos, iPosAfter }, chChrs }; + SciCall_GetTextRangeFull(&tr); + + unsigned wChr = L'\0'; + MultiByteToWideChar(Encoding_SciCP, 0, chChrs, (int)strlen(chChrs), (LPWSTR)&wChr, len); + + if (bForceRedraw || (s_wChr != wChr)) { + if (wChr <= 0xFFFF) + StringCchPrintf(tchChr, COUNTOF(tchChr), L"%.4X", wChr); + else + StringCchPrintf(tchChr, COUNTOF(tchChr), L"0x%.4X0x%.4X", LOWORD(wChr), HIWORD(wChr)); + } + if (s_wChr != wChr) { + StringCchPrintf(tchStatusBar[STATUS_UNICODEPT], txtWidth, L"%s%s%s", + g_mxSBPrefix[STATUS_UNICODEPT], tchChr, g_mxSBPostfix[STATUS_UNICODEPT]); + s_wChr = wChr; + bIsUpdateNeeded = true; + } + } + // ------------------------------------------------------ + static WCHAR tchSel[32] = { L'\0' }; // number of selected chars in statusbar diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 364ce42d2..fac71a793 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -229,17 +229,16 @@ typedef enum STATUS_SECTOR_T { STATUS_DOCLINE = 0, STATUS_DOCCOLUMN, STATUS_SELECTION, STATUS_SELCTBYTES, STATUS_SELCTLINES, STATUS_OCCURRENCE, STATUS_DOCSIZE, STATUS_CODEPAGE, STATUS_EOLMODE, STATUS_OVRMODE, STATUS_2ND_DEF, - STATUS_LEXER, STATUS_DOCCHAR, STATUS_OCCREPLACE, STATUS_TINYEXPR, + STATUS_LEXER, STATUS_DOCCHAR, STATUS_OCCREPLACE, STATUS_TINYEXPR, STATUS_UNICODEPT, STATUS_SECTOR_COUNT, STATUS_HELP = SB_SIMPLEID // (!) } STATUS_SECTOR_T; -#define SBS_INIT_ZERO { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } -#define SBS_INIT_MINUS { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } -#define SBS_INIT_ORDER { 0, 1, 2, 3, 4, 5, 6, 7. 8. 9, 10, 11, 12, 13, 14 } +#define SBS_INIT_ZERO { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +#define SBS_INIT_MINUS { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } -#define STATUSBAR_DEFAULT_IDS L"0 1 12 14 2 4 5 6 7 8 9 10 11" -#define STATUSBAR_SECTION_WIDTH_SPECS L"30 20 20 20 20 20 0 0 0 0 0 0 20 20 20" +#define STATUSBAR_DEFAULT_IDS L"0 1 12 16 14 2 4 5 6 7 8 9 10 11" +#define STATUSBAR_SECTION_WIDTH_SPECS L"30 20 20 20 20 20 20 0 0 0 0 0 0 20 20 20" #define STAUSBAR_RIGHT_MARGIN 20 #define MB_ICONSHIELD 0x000000B0L