From 305a464106d9481cecafdccf13b01ca9af906fbb Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Fri, 14 Oct 2022 23:31:03 +0200 Subject: [PATCH] +enh: Caret style: allow std caret bar width up to max(20) and define alpha transparency (not below 20) --- language/np3_de_de/lexer_de_de.rc | 4 ++-- language/np3_el_gr/lexer_el_gr.rc | 4 ++-- language/np3_en_gb/lexer_en_gb.rc | 4 ++-- language/np3_en_us/lexer_en_us.rc | 4 ++-- language/np3_es_es/lexer_es_es.rc | 4 ++-- language/np3_es_mx/lexer_es_mx.rc | 4 ++-- language/np3_fr_fr/lexer_fr_fr.rc | 4 ++-- language/np3_id_id/lexer_id_id.rc | 4 ++-- language/np3_it_it/lexer_it_it.rc | 4 ++-- language/np3_pl_pl/lexer_pl_pl.rc | 4 ++-- language/np3_sk_sk/lexer_sk_sk.rc | 4 ++-- language/np3_vi_vn/lexer_vi_vn.rc | 4 ++-- lexilla/lexers_x/todo_lexers.txt | 27 +++++++++++++++++++++++++++ src/Helpers.c | 6 ++---- src/Styles.c | 11 ++++++++--- 15 files changed, 61 insertions(+), 31 deletions(-) diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index 706a9bc56..e8931845f 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Color, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2ter Standard Stil" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colors, Size)" diff --git a/language/np3_el_gr/lexer_el_gr.rc b/language/np3_el_gr/lexer_el_gr.rc index 517d6c863..c9c9ec68f 100644 --- a/language/np3_el_gr/lexer_el_gr.rc +++ b/language/np3_el_gr/lexer_el_gr.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc index 47fcc25e5..f84a3a619 100644 --- a/language/np3_en_gb/lexer_en_gb.rc +++ b/language/np3_en_gb/lexer_en_gb.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 5b187a105..f92b0a42a 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Color, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colors, Size)" diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc index 2012ae8a7..126944c6e 100644 --- a/language/np3_es_es/lexer_es_es.rc +++ b/language/np3_es_es/lexer_es_es.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Color, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2º Defecto Estilo" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colors, Size)" diff --git a/language/np3_es_mx/lexer_es_mx.rc b/language/np3_es_mx/lexer_es_mx.rc index 2b8233df1..e62a0918c 100644 --- a/language/np3_es_mx/lexer_es_mx.rc +++ b/language/np3_es_mx/lexer_es_mx.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Color, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2º Defecto Estilo" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colors, Size)" diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc index 1bd39fc99..94f19580e 100644 --- a/language/np3_fr_fr/lexer_fr_fr.rc +++ b/language/np3_fr_fr/lexer_fr_fr.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colors)" IDS_LEX_STD_WSPC "Whitespace (Colors, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Color, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Color, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colors)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2ème Style par Défaut" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Color, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colors)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colors, Size)" diff --git a/language/np3_id_id/lexer_id_id.rc b/language/np3_id_id/lexer_id_id.rc index e346c96a0..b261d9729 100644 --- a/language/np3_id_id/lexer_id_id.rc +++ b/language/np3_id_id/lexer_id_id.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_it_it/lexer_it_it.rc b/language/np3_it_it/lexer_it_it.rc index 3151eb326..a4700791b 100644 --- a/language/np3_it_it/lexer_it_it.rc +++ b/language/np3_it_it/lexer_it_it.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_pl_pl/lexer_pl_pl.rc b/language/np3_pl_pl/lexer_pl_pl.rc index 04f9a2763..6a2177eef 100644 --- a/language/np3_pl_pl/lexer_pl_pl.rc +++ b/language/np3_pl_pl/lexer_pl_pl.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_sk_sk/lexer_sk_sk.rc b/language/np3_sk_sk/lexer_sk_sk.rc index cb414039d..23c5c00c6 100644 --- a/language/np3_sk_sk/lexer_sk_sk.rc +++ b/language/np3_sk_sk/lexer_sk_sk.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/language/np3_vi_vn/lexer_vi_vn.rc b/language/np3_vi_vn/lexer_vi_vn.rc index 578e1a783..b26a339d9 100644 --- a/language/np3_vi_vn/lexer_vi_vn.rc +++ b/language/np3_vi_vn/lexer_vi_vn.rc @@ -147,7 +147,7 @@ BEGIN IDS_LEX_STD_SEL "Selected Text (Colours)" IDS_LEX_STD_WSPC "Whitespace (Colours, Size 1-12)" IDS_LEX_STD_LN_BACKGR "Highlight Current Line" - IDS_LEX_STD_CARET "Caret (Colour, Size 1-3)" + IDS_LEX_STD_CARET "Caret (Colour, Size 1-20)" IDS_LEX_STD_LONG_LN "Long Line Marker (Colours)" IDS_LEX_STD_X_SPC "Extra Line Spacing (Size)" IDS_LEX_2ND_STYLE "2nd Default Style" @@ -163,7 +163,7 @@ END STRINGTABLE BEGIN IDS_LEX_2ND_LN_BACKGR "2nd Highlight Current Line" - IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-3)" + IDS_LEX_2ND_CARET "2nd Caret (Colour, Size 1-20)" IDS_LEX_2ND_LONG_LN "2nd Long Line Marker (Colours)" IDS_LEX_2ND_X_SPC "2nd Extra Line Spacing (Size)" IDS_LEX_STD_BKMRK "Bookmarks and Folding (Colours, Size)" diff --git a/lexilla/lexers_x/todo_lexers.txt b/lexilla/lexers_x/todo_lexers.txt index 5b12f0420..1a55f2ae4 100644 --- a/lexilla/lexers_x/todo_lexers.txt +++ b/lexilla/lexers_x/todo_lexers.txt @@ -1,3 +1,30 @@ Compare Homebrew with New Origin Lexers ---------------------------------------- - LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx +Compare Homebrew with New Origin Lexers +---------------------------------------- +- LexerMarkdown.cxx diff --git a/src/Helpers.c b/src/Helpers.c index 2f411b6f3..c2e00d460 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -696,10 +696,8 @@ bool VerifyContrast(COLORREF cr1,COLORREF cr2) BYTE r2 = GetRValue(cr2); BYTE g2 = GetGValue(cr2); BYTE b2 = GetBValue(cr2); - - return( - ((abs((3*r1 + 5*g1 + 1*b1) - (3*r2 + 6*g2 + 1*b2))) >= 400) || - ((abs(r1-r2) + abs(b1-b2) + abs(g1-g2)) >= 400)); + return (((abs((3*r1 + 5*g1 + 1*b1) - (3*r2 + 6*g2 + 1*b2))) >= 400) || + ((abs(r1-r2) + abs(b1-b2) + abs(g1-g2)) >= 400)); } diff --git a/src/Styles.c b/src/Styles.c index faac539f3..4a1ef1eb7 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -1607,7 +1607,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew) iValue = 1; // don't allow invisible 0 fValue = 0.0f; if (Style_StrGetSizeFloat(pCurrentStandard->Styles[STY_CARET].szValue, &fValue)) { - iValue = clampi(f2int(fValue), 1, 3); + iValue = clampi(f2int(fValue), 1, 20); if (iValue != 1) { StringCchPrintf(wch, COUNTOF(wch), L"; size:%i", iValue); StringCchCat(wchSpecificStyle, COUNTOF(wchSpecificStyle), wch); @@ -1639,8 +1639,13 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew) rgb = SciCall_StyleGetFore(0); } - SciCall_SetElementColour(SC_ELEMENT_CARET, RGBxA(rgb, SC_ALPHA_OPAQUE)); - SciCall_SetElementColour(SC_ELEMENT_CARET_ADDITIONAL, RGBxA(RGB(220, 0, 0), SC_ALPHA_OPAQUE)); + if (Style_StrGetAlpha(pCurrentStandard->Styles[STY_CARET].szValue, &iValue, true)) { + iValue = clampi(iValue, 20, SC_ALPHA_OPAQUE); // no full transparency + StringCchPrintf(wch, COUNTOF(wch), L"; alpha:%i", iValue); + StringCchCat(wchSpecificStyle, COUNTOF(wchSpecificStyle), wch); + } + SciCall_SetElementColour(SC_ELEMENT_CARET, RGBxA(rgb, iValue)); + SciCall_SetElementColour(SC_ELEMENT_CARET_ADDITIONAL, RGBxA(RGB(220, 0, 0), iValue)); StrTrim(wchSpecificStyle, L" ;"); StringCchCopy(pCurrentStandard->Styles[STY_CARET].szValue,