diff options
| author |  mitchell <70453897+orbitalquark@users.noreply.github.com> | 2021-05-29 23:51:55 -0400 |
|---|---|---|
| committer | mitchell <70453897+orbitalquark@users.noreply.github.com> | 2021-05-29 23:51:55 -0400 |
| commit | 331e8bcb0d5d9e86201c0aa2a75a55b0b12f132c (patch) | |
| tree | 8ac94f9b6d50f4931150d3da54edd866d31242c5 /src | |
| parent | 0153f16c581b0c9ebb4b65913fddac5690dfa81e (diff) | |
Updated to Scintilla 5.0.3.
Updated themes to use new `view.element_color` and treat all colors as opaque if no alpha was given.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/textadept.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index c8163132..d5cb1281 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,10 +99,11 @@ WGET = wget -O $@ sci_flags = -pedantic $(plat_flag) -DSCI_LEXER -DNDEBUG -Iscintilla/include -Iscintilla/src \ -Ilexilla/include -Ilexilla/lexlib -Wall -sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o CellBuffer.o CharClassify.o \ - ContractionState.o Decoration.o Document.o EditModel.o Editor.o EditView.o Geometry.o \ - Indicator.o KeyMap.o LineMarker.o MarginView.o PerLine.o PositionCache.o RESearch.o RunStyles.o \ - ScintillaBase.o Selection.o Style.o UniConversion.o UniqueString.o ViewStyle.o XPM.o +sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o CellBuffer.o CharacterCategoryMap.o \ + CharacterType.o CharClassify.o ContractionState.o Decoration.o Document.o EditModel.o Editor.o \ + EditView.o Geometry.o Indicator.o KeyMap.o LineMarker.o MarginView.o PerLine.o PositionCache.o \ + RESearch.o RunStyles.o ScintillaBase.o Selection.o Style.o UniConversion.o UniqueString.o \ + ViewStyle.o XPM.o sci_lex_objs = Accessor.o CharacterCategory.o CharacterSet.o DefaultLexer.o LexerBase.o \ LexerModule.o LexerNoExceptions.o LexerSimple.o PropSetSimple.o StyleContext.o WordList.o sci_lexer_objs = LexLPeg.o LexLPeg-curses.o @@ -344,7 +345,7 @@ else gtdialog_url = $(root_url)/gtdialog/archive/default.zip endif -scintilla_tgz = scintilla501.tgz +scintilla_tgz = scintilla503.tgz lexilla_tgz = lexilla500.tgz scinterm_zip = 829b0b17c019b5dc5c52470ab10527642027f4b0.zip scintillua_zip = 530a3eb4303745c40aaaf7c3a36e39173688f9af.zip diff --git a/src/textadept.c b/src/textadept.c index 7b530105..cf8f7995 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -1091,6 +1091,10 @@ static sptr_t luaL_checkscintilla(lua_State *L, int *arg, int type) { int i = luaL_checkinteger(L, (*arg)++); return i >= 0 ? i - 1 : i; // do not adjust significant values like -1 } + if (type == SCOLOR) { + int color = luaL_checkinteger(L, (*arg)++); + return color > 0xFFFFFF ? color : color | 0xFF000000; // backward compatibility + } return type >= SINT && type <= SKEYMOD ? luaL_checkinteger(L, (*arg)++) : 0; } |