Branch: refs/heads/master Author: xiota xiota@users.noreply.github.com Committer: GitHub noreply@github.com Date: Sun, 09 Jan 2022 12:20:44 UTC Commit: 5e130960bc6b9f3b3158cdb35d27f6bba03ba3c5 https://github.com/geany/geany-plugins/commit/5e130960bc6b9f3b3158cdb35d27f6...
Log Message: ----------- GeanyLua: Update for Scintilla 5.1.4 (#1123)
* GeanyLua: Remove no-longer supported Scintilla signals:
* SCI_GETTWOPHASEDRAW * SCI_SETTWOPHASEDRAW * SCI_SETLEXERLANGUAGE * SCI_LOADLEXERLIBRARY
Change SCI_SETLEXER to SCI_SETILEXER.
* GeanyLua: Add scintilla parameter types to glspi_sci.c
* GeanyLua: Remove unnecessary break statements
Modified Paths: -------------- geanylua/glspi_sci.c geanylua/glspi_sci.h
Modified: geanylua/glspi_sci.c 243 lines changed, 193 insertions(+), 50 deletions(-) =================================================================== @@ -609,6 +609,98 @@ static gint glspi_fail_arg_count(lua_State* L, const gchar*funcname, const gchar
#define FAIL_ARGC glspi_fail_arg_count(L,__FUNCTION__,he->name)
+static uptr_t glspi_scintilla_param(lua_State* L, int ptype, int pnum, SciCmdHashEntry *he) +{ + switch (ptype) { + case SLT_VOID: + return 0; + case SLT_BOOL: + if (!lua_isboolean(L,pnum)) { return FAIL_BOOL_ARG(pnum); }; + return lua_toboolean(L,pnum); + case SLT_STRING: + if (!lua_isstring(L,pnum)) { return FAIL_STRING_ARG(pnum); }; + return (uptr_t)lua_tostring(L,pnum); + + /* treat most parameters as number */ + case SLT_ACCESSIBILITY: + case SLT_ALPHA: + case SLT_ANNOTATIONVISIBLE: + case SLT_AUTOCOMPLETEOPTION: + case SLT_AUTOMATICFOLD: + case SLT_BIDIRECTIONAL: + case SLT_CARETPOLICY: + case SLT_CARETSTICKY: + case SLT_CARETSTYLE: + case SLT_CASEINSENSITIVEBEHAVIOUR: + case SLT_CASEVISIBLE: + case SLT_CELLS: + case SLT_CHARACTERSET: + case SLT_COLOURALPHA: + case SLT_CURSORSHAPE: + case SLT_DOCUMENTOPTION: + case SLT_EDGEVISUALSTYLE: + case SLT_ELEMENT: + case SLT_ENDOFLINE: + case SLT_EOLANNOTATIONVISIBLE: + case SLT_FINDOPTION: + case SLT_FINDTEXT: + case SLT_FOLDACTION: + case SLT_FOLDDISPLAYTEXTSTYLE: + case SLT_FOLDFLAG: + case SLT_FOLDLEVEL: + case SLT_FONTQUALITY: + case SLT_FONTWEIGHT: + case SLT_FORMATRANGE: + case SLT_IDLESTYLING: + case SLT_IMEINTERACTION: + case SLT_INDENTVIEW: + case SLT_INDICATORSTYLE: + case SLT_INDICFLAG: + case SLT_LAST: + case SLT_LAYER: + case SLT_LINE: + case SLT_LINECACHE: + case SLT_LINECHARACTERINDEXTYPE: + case SLT_LINEENDTYPE: + case SLT_MARGINOPTION: + case SLT_MARGINTYPE: + case SLT_MARKERSYMBOL: + case SLT_MODIFICATIONFLAGS: + case SLT_MULTIAUTOCOMPLETE: + case SLT_MULTIPASTE: + case SLT_ORDERING: + case SLT_PHASESDRAW: + case SLT_POINTER: + case SLT_POPUP: + case SLT_PRINTOPTION: + case SLT_REPRESENTATIONAPPEARANCE: + case SLT_SELECTIONMODE: + case SLT_STATUS: + case SLT_SUPPORTS: + case SLT_TABDRAWMODE: + case SLT_TECHNOLOGY: + case SLT_TEXTRANGE: + case SLT_TYPEPROPERTY: + case SLT_UNDOFLAGS: + case SLT_VIRTUALSPACE: + case SLT_VISIBLEPOLICY: + case SLT_WHITESPACE: + case SLT_WRAP: + case SLT_WRAPINDENTMODE: + case SLT_WRAPVISUALFLAG: + case SLT_WRAPVISUALLOCATION: + case SLT_INT: + if (!lua_isnumber(L,pnum)) { return FAIL_NUMERIC_ARG(pnum); }; + return lua_tonumber(L,pnum); + + case SLT_STRINGRESULT: + default: + return FAIL_API; + } + + return FAIL_API; +} + static gint glspi_scintilla(lua_State* L) { uptr_t wparam=0; @@ -641,54 +733,31 @@ static gint glspi_scintilla(lua_State* L) return 0; }
- if (((he->wparam==SLT_INT)&&(he->lparam==SLT_STRINGRESULT))) { - /* We can allow missing wparam (length) for some string result types */ + /* Don't allow lexer changes, but allow getting lexer info */ + switch (he->msgid) { + case SCI_CHANGELEXERSTATE: + case SCI_PRIVATELEXERCALL: + case SCI_SETILEXER: + return FAIL_STRING_ARG(1); + + case SCI_GETLEXER: + case SCI_GETLEXERLANGUAGE: + default: + break; + } + + if (he->lparam==SLT_STRINGRESULT) { + /* We can allow missing wparam (length) for some string result types */ } else { if ((he->lparam!=SLT_VOID)&&(argc<3)) { return FAIL_ARGC; } - if (((he->wparam!=SLT_VOID)&&(argc<2))) { return FAIL_ARGC; } - } - switch (he->wparam) { - case SLT_VOID: - break; - case SLT_INT: - if (argc>=2) { - if (!lua_isnumber(L,2)) {return FAIL_NUMERIC_ARG(2); }; - wparam=lua_tonumber(L,2); - } - break; - case SLT_STRING: - if (!lua_isstring(L,2)) {return FAIL_STRING_ARG(2); }; - wparam=(uptr_t)lua_tostring(L,2); - break; - case SLT_CELLS: return FAIL_API; - case SLT_BOOL: - if (!lua_isboolean(L,2)) {return FAIL_BOOL_ARG(2); }; - wparam=lua_toboolean(L,2); - break; - case SLT_TEXTRANGE: return FAIL_API; - case SLT_STRINGRESULT: return FAIL_API; - case SLT_FINDTEXT: return FAIL_API; - case SLT_FORMATRANGE: return FAIL_API; - default:return FAIL_API; + if ((he->wparam!=SLT_VOID)&&(argc<2)) { return FAIL_ARGC; } }
+ /* first scintilla parameter */ + wparam = glspi_scintilla_param(L, he->wparam, 2, he); + + /* second scintilla parameter */ switch (he->lparam) { - case SLT_VOID: - break; - case SLT_INT: - if (!lua_isnumber(L,3)) { return FAIL_NUMERIC_ARG(2); }; - lparam=lua_tonumber(L,3); - break; - case SLT_STRING: - if (!lua_isstring(L,3)) {return FAIL_STRING_ARG(2); }; - lparam=(sptr_t)lua_tostring(L,3); - break; - case SLT_CELLS: return FAIL_API; - case SLT_BOOL: - if (!lua_isboolean(L,3)) {return FAIL_BOOL_ARG(3); }; - lparam=lua_toboolean(L,3); - break; - case SLT_TEXTRANGE: return FAIL_API; case SLT_STRINGRESULT: if ((he->msgid==SCI_GETTEXT)&&(wparam==0)) { wparam=scintilla_send_message(doc->editor->sci, SCI_GETLENGTH, 0,0); @@ -712,15 +781,88 @@ static gint glspi_scintilla(lua_State* L) return 1; } break; - case SLT_FINDTEXT: return FAIL_API; - case SLT_FORMATRANGE: return FAIL_API; - default:return FAIL_API; + default: + lparam = (sptr_t)glspi_scintilla_param(L, he->lparam, 3, he); + break; } + + /* send scintilla message and process result */ switch (he->result) { case SLT_VOID: scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam); lua_pushnil(L); return 1; + case SLT_BOOL: + lua_pushboolean(L, scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam)); + return 1; + + case SLT_ACCESSIBILITY: + case SLT_ALPHA: + case SLT_ANNOTATIONVISIBLE: + case SLT_AUTOCOMPLETEOPTION: + case SLT_AUTOMATICFOLD: + case SLT_BIDIRECTIONAL: + case SLT_CARETPOLICY: + case SLT_CARETSTICKY: + case SLT_CARETSTYLE: + case SLT_CASEINSENSITIVEBEHAVIOUR: + case SLT_CASEVISIBLE: + case SLT_CELLS: + case SLT_CHARACTERSET: + case SLT_COLOURALPHA: + case SLT_CURSORSHAPE: + case SLT_DOCUMENTOPTION: + case SLT_EDGEVISUALSTYLE: + case SLT_ELEMENT: + case SLT_ENDOFLINE: + case SLT_EOLANNOTATIONVISIBLE: + case SLT_FINDOPTION: + case SLT_FINDTEXT: + case SLT_FOLDACTION: + case SLT_FOLDDISPLAYTEXTSTYLE: + case SLT_FOLDFLAG: + case SLT_FOLDLEVEL: + case SLT_FONTQUALITY: + case SLT_FONTWEIGHT: + case SLT_FORMATRANGE: + case SLT_IDLESTYLING: + case SLT_IMEINTERACTION: + case SLT_INDENTVIEW: + case SLT_INDICATORSTYLE: + case SLT_INDICFLAG: + case SLT_LAST: + case SLT_LAYER: + case SLT_LINE: + case SLT_LINECACHE: + case SLT_LINECHARACTERINDEXTYPE: + case SLT_LINEENDTYPE: + case SLT_MARGINOPTION: + case SLT_MARGINTYPE: + case SLT_MARKERSYMBOL: + case SLT_MODIFICATIONFLAGS: + case SLT_MULTIAUTOCOMPLETE: + case SLT_MULTIPASTE: + case SLT_ORDERING: + case SLT_PHASESDRAW: + case SLT_POINTER: + case SLT_POPUP: + case SLT_PRINTOPTION: + case SLT_REPRESENTATIONAPPEARANCE: + case SLT_SELECTIONMODE: + case SLT_STATUS: + case SLT_SUPPORTS: + case SLT_TABDRAWMODE: + case SLT_TECHNOLOGY: + case SLT_TEXTRANGE: + case SLT_TYPEPROPERTY: + case SLT_UNDOFLAGS: + case SLT_VIRTUALSPACE: + case SLT_VISIBLEPOLICY: + case SLT_WHITESPACE: + case SLT_WRAP: + case SLT_WRAPINDENTMODE: + case SLT_WRAPVISUALFLAG: + case SLT_WRAPVISUALLOCATION: case SLT_INT: if (he->lparam==SLT_STRINGRESULT) { scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam); @@ -730,10 +872,11 @@ static gint glspi_scintilla(lua_State* L) push_number(L, scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam)); } return 1; - case SLT_BOOL: - lua_pushboolean(L, scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam)); - return 1; - default:return FAIL_API; + + case SLT_STRING: + case SLT_STRINGRESULT: + default: + return FAIL_API; } }
Modified: geanylua/glspi_sci.h 513 lines changed, 317 insertions(+), 196 deletions(-) =================================================================== @@ -17,9 +17,71 @@ typedef enum { SLT_CELLS, SLT_BOOL, SLT_TEXTRANGE, + SLT_LINE, + SLT_WHITESPACE, + SLT_TABDRAWMODE, SLT_STRINGRESULT, + SLT_ENDOFLINE, + SLT_IMEINTERACTION, + SLT_MARKERSYMBOL, + SLT_COLOURALPHA, + SLT_ALPHA, + SLT_LAYER, + SLT_MARGINTYPE, + SLT_CURSORSHAPE, + SLT_CASEVISIBLE, + SLT_CHARACTERSET, + SLT_FONTWEIGHT, + SLT_ELEMENT, + SLT_INDICATORSTYLE, + SLT_INDICFLAG, + SLT_AUTOCOMPLETEOPTION, + SLT_INDENTVIEW, + SLT_PRINTOPTION, + SLT_FINDOPTION, SLT_FINDTEXT, SLT_FORMATRANGE, + SLT_POINTER, + SLT_FOLDLEVEL, + SLT_FOLDDISPLAYTEXTSTYLE, + SLT_FOLDACTION, + SLT_AUTOMATICFOLD, + SLT_FOLDFLAG, + SLT_IDLESTYLING, + SLT_WRAP, + SLT_WRAPVISUALFLAG, + SLT_WRAPVISUALLOCATION, + SLT_WRAPINDENTMODE, + SLT_LINECACHE, + SLT_PHASESDRAW, + SLT_FONTQUALITY, + SLT_MULTIPASTE, + SLT_ACCESSIBILITY, + SLT_MODIFICATIONFLAGS, + SLT_EDGEVISUALSTYLE, + SLT_POPUP, + SLT_DOCUMENTOPTION, + SLT_STATUS, + SLT_VISIBLEPOLICY, + SLT_CARETPOLICY, + SLT_SELECTIONMODE, + SLT_CASEINSENSITIVEBEHAVIOUR, + SLT_MULTIAUTOCOMPLETE, + SLT_ORDERING, + SLT_CARETSTICKY, + SLT_CARETSTYLE, + SLT_MARGINOPTION, + SLT_ANNOTATIONVISIBLE, + SLT_UNDOFLAGS, + SLT_VIRTUALSPACE, + SLT_TECHNOLOGY, + SLT_LINEENDTYPE, + SLT_REPRESENTATIONAPPEARANCE, + SLT_EOLANNOTATIONVISIBLE, + SLT_SUPPORTS, + SLT_LINECHARACTERINDEXTYPE, + SLT_TYPEPROPERTY, + SLT_BIDIRECTIONAL, SLT_LAST } GlspiType;
@@ -52,59 +114,71 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETSAVEPOINT", SLT_VOID, SCI_SETSAVEPOINT, SLT_VOID, SLT_VOID}, {"GETSTYLEDTEXT", SLT_INT, SCI_GETSTYLEDTEXT, SLT_VOID, SLT_TEXTRANGE}, {"CANREDO", SLT_BOOL, SCI_CANREDO, SLT_VOID, SLT_VOID}, - {"MARKERLINEFROMHANDLE", SLT_INT, SCI_MARKERLINEFROMHANDLE, SLT_INT, SLT_VOID}, + {"MARKERLINEFROMHANDLE", SLT_LINE, SCI_MARKERLINEFROMHANDLE, SLT_INT, SLT_VOID}, {"MARKERDELETEHANDLE", SLT_VOID, SCI_MARKERDELETEHANDLE, SLT_INT, SLT_VOID}, + {"MARKERHANDLEFROMLINE", SLT_INT, SCI_MARKERHANDLEFROMLINE, SLT_LINE, SLT_INT}, + {"MARKERNUMBERFROMLINE", SLT_INT, SCI_MARKERNUMBERFROMLINE, SLT_LINE, SLT_INT}, {"GETUNDOCOLLECTION", SLT_BOOL, SCI_GETUNDOCOLLECTION, SLT_VOID, SLT_VOID}, - {"GETVIEWWS", SLT_INT, SCI_GETVIEWWS, SLT_VOID, SLT_VOID}, - {"SETVIEWWS", SLT_VOID, SCI_SETVIEWWS, SLT_INT, SLT_VOID}, - {"GETTABDRAWMODE", SLT_INT, SCI_GETTABDRAWMODE, SLT_VOID, SLT_VOID}, - {"SETTABDRAWMODE", SLT_VOID, SCI_SETTABDRAWMODE, SLT_INT, SLT_VOID}, + {"GETVIEWWS", SLT_WHITESPACE, SCI_GETVIEWWS, SLT_VOID, SLT_VOID}, + {"SETVIEWWS", SLT_VOID, SCI_SETVIEWWS, SLT_WHITESPACE, SLT_VOID}, + {"GETTABDRAWMODE", SLT_TABDRAWMODE, SCI_GETTABDRAWMODE, SLT_VOID, SLT_VOID}, + {"SETTABDRAWMODE", SLT_VOID, SCI_SETTABDRAWMODE, SLT_TABDRAWMODE, SLT_VOID}, {"POSITIONFROMPOINT", SLT_INT, SCI_POSITIONFROMPOINT, SLT_INT, SLT_INT}, {"POSITIONFROMPOINTCLOSE", SLT_INT, SCI_POSITIONFROMPOINTCLOSE, SLT_INT, SLT_INT}, - {"GOTOLINE", SLT_VOID, SCI_GOTOLINE, SLT_INT, SLT_VOID}, + {"GOTOLINE", SLT_VOID, SCI_GOTOLINE, SLT_LINE, SLT_VOID}, {"GOTOPOS", SLT_VOID, SCI_GOTOPOS, SLT_INT, SLT_VOID}, {"SETANCHOR", SLT_VOID, SCI_SETANCHOR, SLT_INT, SLT_VOID}, {"GETCURLINE", SLT_INT, SCI_GETCURLINE, SLT_INT, SLT_STRINGRESULT}, {"GETENDSTYLED", SLT_INT, SCI_GETENDSTYLED, SLT_VOID, SLT_VOID}, - {"CONVERTEOLS", SLT_VOID, SCI_CONVERTEOLS, SLT_INT, SLT_VOID}, - {"GETEOLMODE", SLT_INT, SCI_GETEOLMODE, SLT_VOID, SLT_VOID}, - {"SETEOLMODE", SLT_VOID, SCI_SETEOLMODE, SLT_INT, SLT_VOID}, + {"CONVERTEOLS", SLT_VOID, SCI_CONVERTEOLS, SLT_ENDOFLINE, SLT_VOID}, + {"GETEOLMODE", SLT_ENDOFLINE, SCI_GETEOLMODE, SLT_VOID, SLT_VOID}, + {"SETEOLMODE", SLT_VOID, SCI_SETEOLMODE, SLT_ENDOFLINE, SLT_VOID}, {"STARTSTYLING", SLT_VOID, SCI_STARTSTYLING, SLT_INT, SLT_INT}, {"SETSTYLING", SLT_VOID, SCI_SETSTYLING, SLT_INT, SLT_INT}, {"GETBUFFEREDDRAW", SLT_BOOL, SCI_GETBUFFEREDDRAW, SLT_VOID, SLT_VOID}, {"SETBUFFEREDDRAW", SLT_VOID, SCI_SETBUFFEREDDRAW, SLT_BOOL, SLT_VOID}, {"SETTABWIDTH", SLT_VOID, SCI_SETTABWIDTH, SLT_INT, SLT_VOID}, {"GETTABWIDTH", SLT_INT, SCI_GETTABWIDTH, SLT_VOID, SLT_VOID}, - {"CLEARTABSTOPS", SLT_VOID, SCI_CLEARTABSTOPS, SLT_INT, SLT_VOID}, - {"ADDTABSTOP", SLT_VOID, SCI_ADDTABSTOP, SLT_INT, SLT_INT}, - {"GETNEXTTABSTOP", SLT_INT, SCI_GETNEXTTABSTOP, SLT_INT, SLT_INT}, + {"SETTABMINIMUMWIDTH", SLT_VOID, SCI_SETTABMINIMUMWIDTH, SLT_INT, SLT_VOID}, + {"GETTABMINIMUMWIDTH", SLT_INT, SCI_GETTABMINIMUMWIDTH, SLT_VOID, SLT_VOID}, + {"CLEARTABSTOPS", SLT_VOID, SCI_CLEARTABSTOPS, SLT_LINE, SLT_VOID}, + {"ADDTABSTOP", SLT_VOID, SCI_ADDTABSTOP, SLT_LINE, SLT_INT}, + {"GETNEXTTABSTOP", SLT_INT, SCI_GETNEXTTABSTOP, SLT_LINE, SLT_INT}, {"SETCODEPAGE", SLT_VOID, SCI_SETCODEPAGE, SLT_INT, SLT_VOID}, - {"GETIMEINTERACTION", SLT_INT, SCI_GETIMEINTERACTION, SLT_VOID, SLT_VOID}, - {"SETIMEINTERACTION", SLT_VOID, SCI_SETIMEINTERACTION, SLT_INT, SLT_VOID}, - {"MARKERDEFINE", SLT_VOID, SCI_MARKERDEFINE, SLT_INT, SLT_INT}, + {"SETFONTLOCALE", SLT_VOID, SCI_SETFONTLOCALE, SLT_VOID, SLT_STRING}, + {"GETFONTLOCALE", SLT_INT, SCI_GETFONTLOCALE, SLT_VOID, SLT_STRINGRESULT}, + {"GETIMEINTERACTION", SLT_IMEINTERACTION, SCI_GETIMEINTERACTION, SLT_VOID, SLT_VOID}, + {"SETIMEINTERACTION", SLT_VOID, SCI_SETIMEINTERACTION, SLT_IMEINTERACTION, SLT_VOID}, + {"MARKERDEFINE", SLT_VOID, SCI_MARKERDEFINE, SLT_INT, SLT_MARKERSYMBOL}, {"MARKERSETFORE", SLT_VOID, SCI_MARKERSETFORE, SLT_INT, SLT_INT}, {"MARKERSETBACK", SLT_VOID, SCI_MARKERSETBACK, SLT_INT, SLT_INT}, {"MARKERSETBACKSELECTED", SLT_VOID, SCI_MARKERSETBACKSELECTED, SLT_INT, SLT_INT}, + {"MARKERSETFORETRANSLUCENT", SLT_VOID, SCI_MARKERSETFORETRANSLUCENT, SLT_INT, SLT_COLOURALPHA}, + {"MARKERSETBACKTRANSLUCENT", SLT_VOID, SCI_MARKERSETBACKTRANSLUCENT, SLT_INT, SLT_COLOURALPHA}, + {"MARKERSETBACKSELECTEDTRANSLUCENT", SLT_VOID, SCI_MARKERSETBACKSELECTEDTRANSLUCENT, SLT_INT, SLT_COLOURALPHA}, + {"MARKERSETSTROKEWIDTH", SLT_VOID, SCI_MARKERSETSTROKEWIDTH, SLT_INT, SLT_INT}, {"MARKERENABLEHIGHLIGHT", SLT_VOID, SCI_MARKERENABLEHIGHLIGHT, SLT_BOOL, SLT_VOID}, - {"MARKERADD", SLT_INT, SCI_MARKERADD, SLT_INT, SLT_INT}, - {"MARKERDELETE", SLT_VOID, SCI_MARKERDELETE, SLT_INT, SLT_INT}, + {"MARKERADD", SLT_INT, SCI_MARKERADD, SLT_LINE, SLT_INT}, + {"MARKERDELETE", SLT_VOID, SCI_MARKERDELETE, SLT_LINE, SLT_INT}, {"MARKERDELETEALL", SLT_VOID, SCI_MARKERDELETEALL, SLT_INT, SLT_VOID}, - {"MARKERGET", SLT_INT, SCI_MARKERGET, SLT_INT, SLT_VOID}, - {"MARKERNEXT", SLT_INT, SCI_MARKERNEXT, SLT_INT, SLT_INT}, - {"MARKERPREVIOUS", SLT_INT, SCI_MARKERPREVIOUS, SLT_INT, SLT_INT}, + {"MARKERGET", SLT_INT, SCI_MARKERGET, SLT_LINE, SLT_VOID}, + {"MARKERNEXT", SLT_LINE, SCI_MARKERNEXT, SLT_LINE, SLT_INT}, + {"MARKERPREVIOUS", SLT_LINE, SCI_MARKERPREVIOUS, SLT_LINE, SLT_INT}, {"MARKERDEFINEPIXMAP", SLT_VOID, SCI_MARKERDEFINEPIXMAP, SLT_INT, SLT_STRING}, - {"MARKERADDSET", SLT_VOID, SCI_MARKERADDSET, SLT_INT, SLT_INT}, - {"MARKERSETALPHA", SLT_VOID, SCI_MARKERSETALPHA, SLT_INT, SLT_INT}, - {"SETMARGINTYPEN", SLT_VOID, SCI_SETMARGINTYPEN, SLT_INT, SLT_INT}, - {"GETMARGINTYPEN", SLT_INT, SCI_GETMARGINTYPEN, SLT_INT, SLT_VOID}, + {"MARKERADDSET", SLT_VOID, SCI_MARKERADDSET, SLT_LINE, SLT_INT}, + {"MARKERSETALPHA", SLT_VOID, SCI_MARKERSETALPHA, SLT_INT, SLT_ALPHA}, + {"MARKERGETLAYER", SLT_LAYER, SCI_MARKERGETLAYER, SLT_INT, SLT_VOID}, + {"MARKERSETLAYER", SLT_VOID, SCI_MARKERSETLAYER, SLT_INT, SLT_LAYER}, + {"SETMARGINTYPEN", SLT_VOID, SCI_SETMARGINTYPEN, SLT_INT, SLT_MARGINTYPE}, + {"GETMARGINTYPEN", SLT_MARGINTYPE, SCI_GETMARGINTYPEN, SLT_INT, SLT_VOID}, {"SETMARGINWIDTHN", SLT_VOID, SCI_SETMARGINWIDTHN, SLT_INT, SLT_INT}, {"GETMARGINWIDTHN", SLT_INT, SCI_GETMARGINWIDTHN, SLT_INT, SLT_VOID}, {"SETMARGINMASKN", SLT_VOID, SCI_SETMARGINMASKN, SLT_INT, SLT_INT}, {"GETMARGINMASKN", SLT_INT, SCI_GETMARGINMASKN, SLT_INT, SLT_VOID}, {"SETMARGINSENSITIVEN", SLT_VOID, SCI_SETMARGINSENSITIVEN, SLT_INT, SLT_BOOL}, {"GETMARGINSENSITIVEN", SLT_BOOL, SCI_GETMARGINSENSITIVEN, SLT_INT, SLT_VOID}, - {"SETMARGINCURSORN", SLT_VOID, SCI_SETMARGINCURSORN, SLT_INT, SLT_INT}, - {"GETMARGINCURSORN", SLT_INT, SCI_GETMARGINCURSORN, SLT_INT, SLT_VOID}, + {"SETMARGINCURSORN", SLT_VOID, SCI_SETMARGINCURSORN, SLT_INT, SLT_CURSORSHAPE}, + {"GETMARGINCURSORN", SLT_CURSORSHAPE, SCI_GETMARGINCURSORN, SLT_INT, SLT_VOID}, {"SETMARGINBACKN", SLT_VOID, SCI_SETMARGINBACKN, SLT_INT, SLT_INT}, {"GETMARGINBACKN", SLT_INT, SCI_GETMARGINBACKN, SLT_INT, SLT_VOID}, {"SETMARGINS", SLT_VOID, SCI_SETMARGINS, SLT_INT, SLT_VOID}, @@ -127,24 +201,38 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"STYLEGETFONT", SLT_INT, SCI_STYLEGETFONT, SLT_INT, SLT_STRINGRESULT}, {"STYLEGETEOLFILLED", SLT_BOOL, SCI_STYLEGETEOLFILLED, SLT_INT, SLT_VOID}, {"STYLEGETUNDERLINE", SLT_BOOL, SCI_STYLEGETUNDERLINE, SLT_INT, SLT_VOID}, - {"STYLEGETCASE", SLT_INT, SCI_STYLEGETCASE, SLT_INT, SLT_VOID}, - {"STYLEGETCHARACTERSET", SLT_INT, SCI_STYLEGETCHARACTERSET, SLT_INT, SLT_VOID}, + {"STYLEGETCASE", SLT_CASEVISIBLE, SCI_STYLEGETCASE, SLT_INT, SLT_VOID}, + {"STYLEGETCHARACTERSET", SLT_CHARACTERSET, SCI_STYLEGETCHARACTERSET, SLT_INT, SLT_VOID}, {"STYLEGETVISIBLE", SLT_BOOL, SCI_STYLEGETVISIBLE, SLT_INT, SLT_VOID}, {"STYLEGETCHANGEABLE", SLT_BOOL, SCI_STYLEGETCHANGEABLE, SLT_INT, SLT_VOID}, {"STYLEGETHOTSPOT", SLT_BOOL, SCI_STYLEGETHOTSPOT, SLT_INT, SLT_VOID}, - {"STYLESETCASE", SLT_VOID, SCI_STYLESETCASE, SLT_INT, SLT_INT}, + {"STYLESETCASE", SLT_VOID, SCI_STYLESETCASE, SLT_INT, SLT_CASEVISIBLE}, {"STYLESETSIZEFRACTIONAL", SLT_VOID, SCI_STYLESETSIZEFRACTIONAL, SLT_INT, SLT_INT}, {"STYLEGETSIZEFRACTIONAL", SLT_INT, SCI_STYLEGETSIZEFRACTIONAL, SLT_INT, SLT_VOID}, - {"STYLESETWEIGHT", SLT_VOID, SCI_STYLESETWEIGHT, SLT_INT, SLT_INT}, - {"STYLEGETWEIGHT", SLT_INT, SCI_STYLEGETWEIGHT, SLT_INT, SLT_VOID}, - {"STYLESETCHARACTERSET", SLT_VOID, SCI_STYLESETCHARACTERSET, SLT_INT, SLT_INT}, + {"STYLESETWEIGHT", SLT_VOID, SCI_STYLESETWEIGHT, SLT_INT, SLT_FONTWEIGHT}, + {"STYLEGETWEIGHT", SLT_FONTWEIGHT, SCI_STYLEGETWEIGHT, SLT_INT, SLT_VOID}, + {"STYLESETCHARACTERSET", SLT_VOID, SCI_STYLESETCHARACTERSET, SLT_INT, SLT_CHARACTERSET}, {"STYLESETHOTSPOT", SLT_VOID, SCI_STYLESETHOTSPOT, SLT_INT, SLT_BOOL}, + {"STYLESETCHECKMONOSPACED", SLT_VOID, SCI_STYLESETCHECKMONOSPACED, SLT_INT, SLT_BOOL}, + {"STYLEGETCHECKMONOSPACED", SLT_BOOL, SCI_STYLEGETCHECKMONOSPACED, SLT_INT, SLT_VOID}, + {"SETELEMENTCOLOUR", SLT_VOID, SCI_SETELEMENTCOLOUR, SLT_ELEMENT, SLT_COLOURALPHA}, + {"GETELEMENTCOLOUR", SLT_COLOURALPHA, SCI_GETELEMENTCOLOUR, SLT_ELEMENT, SLT_VOID}, + {"RESETELEMENTCOLOUR", SLT_VOID, SCI_RESETELEMENTCOLOUR, SLT_ELEMENT, SLT_VOID}, + {"GETELEMENTISSET", SLT_BOOL, SCI_GETELEMENTISSET, SLT_ELEMENT, SLT_VOID}, + {"GETELEMENTALLOWSTRANSLUCENT", SLT_BOOL, SCI_GETELEMENTALLOWSTRANSLUCENT, SLT_ELEMENT, SLT_VOID}, + {"GETELEMENTBASECOLOUR", SLT_COLOURALPHA, SCI_GETELEMENTBASECOLOUR, SLT_ELEMENT, SLT_VOID}, {"SETSELFORE", SLT_VOID, SCI_SETSELFORE, SLT_BOOL, SLT_INT}, {"SETSELBACK", SLT_VOID, SCI_SETSELBACK, SLT_BOOL, SLT_INT}, - {"GETSELALPHA", SLT_INT, SCI_GETSELALPHA, SLT_VOID, SLT_VOID}, - {"SETSELALPHA", SLT_VOID, SCI_SETSELALPHA, SLT_INT, SLT_VOID}, + {"GETSELALPHA", SLT_ALPHA, SCI_GETSELALPHA, SLT_VOID, SLT_VOID}, + {"SETSELALPHA", SLT_VOID, SCI_SETSELALPHA, SLT_ALPHA, SLT_VOID}, {"GETSELEOLFILLED", SLT_BOOL, SCI_GETSELEOLFILLED, SLT_VOID, SLT_VOID}, {"SETSELEOLFILLED", SLT_VOID, SCI_SETSELEOLFILLED, SLT_BOOL, SLT_VOID}, + {"GETSELECTIONLAYER", SLT_LAYER, SCI_GETSELECTIONLAYER, SLT_VOID, SLT_VOID}, + {"SETSELECTIONLAYER", SLT_VOID, SCI_SETSELECTIONLAYER, SLT_LAYER, SLT_VOID}, + {"GETCARETLINELAYER", SLT_LAYER, SCI_GETCARETLINELAYER, SLT_VOID, SLT_VOID}, + {"SETCARETLINELAYER", SLT_VOID, SCI_SETCARETLINELAYER, SLT_LAYER, SLT_VOID}, + {"GETCARETLINEHIGHLIGHTSUBLINE", SLT_BOOL, SCI_GETCARETLINEHIGHLIGHTSUBLINE, SLT_VOID, SLT_VOID}, + {"SETCARETLINEHIGHLIGHTSUBLINE", SLT_VOID, SCI_SETCARETLINEHIGHLIGHTSUBLINE, SLT_BOOL, SLT_VOID}, {"SETCARETFORE", SLT_VOID, SCI_SETCARETFORE, SLT_INT, SLT_VOID}, {"ASSIGNCMDKEY", SLT_VOID, SCI_ASSIGNCMDKEY, SLT_INT, SLT_INT}, {"CLEARCMDKEY", SLT_VOID, SCI_CLEARCMDKEY, SLT_INT, SLT_VOID}, @@ -155,26 +243,30 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETCARETPERIOD", SLT_VOID, SCI_SETCARETPERIOD, SLT_INT, SLT_VOID}, {"SETWORDCHARS", SLT_VOID, SCI_SETWORDCHARS, SLT_VOID, SLT_STRING}, {"GETWORDCHARS", SLT_INT, SCI_GETWORDCHARS, SLT_VOID, SLT_STRINGRESULT}, + {"SETCHARACTERCATEGORYOPTIMIZATION", SLT_VOID, SCI_SETCHARACTERCATEGORYOPTIMIZATION, SLT_INT, SLT_VOID}, + {"GETCHARACTERCATEGORYOPTIMIZATION", SLT_INT, SCI_GETCHARACTERCATEGORYOPTIMIZATION, SLT_VOID, SLT_VOID}, {"BEGINUNDOACTION", SLT_VOID, SCI_BEGINUNDOACTION, SLT_VOID, SLT_VOID}, {"ENDUNDOACTION", SLT_VOID, SCI_ENDUNDOACTION, SLT_VOID, SLT_VOID}, - {"INDICSETSTYLE", SLT_VOID, SCI_INDICSETSTYLE, SLT_INT, SLT_INT}, - {"INDICGETSTYLE", SLT_INT, SCI_INDICGETSTYLE, SLT_INT, SLT_VOID}, + {"INDICSETSTYLE", SLT_VOID, SCI_INDICSETSTYLE, SLT_INT, SLT_INDICATORSTYLE}, + {"INDICGETSTYLE", SLT_INDICATORSTYLE, SCI_INDICGETSTYLE, SLT_INT, SLT_VOID}, {"INDICSETFORE", SLT_VOID, SCI_INDICSETFORE, SLT_INT, SLT_INT}, {"INDICGETFORE", SLT_INT, SCI_INDICGETFORE, SLT_INT, SLT_VOID}, {"INDICSETUNDER", SLT_VOID, SCI_INDICSETUNDER, SLT_INT, SLT_BOOL}, {"INDICGETUNDER", SLT_BOOL, SCI_INDICGETUNDER, SLT_INT, SLT_VOID}, - {"INDICSETHOVERSTYLE", SLT_VOID, SCI_INDICSETHOVERSTYLE, SLT_INT, SLT_INT}, - {"INDICGETHOVERSTYLE", SLT_INT, SCI_INDICGETHOVERSTYLE, SLT_INT, SLT_VOID}, + {"INDICSETHOVERSTYLE", SLT_VOID, SCI_INDICSETHOVERSTYLE, SLT_INT, SLT_INDICATORSTYLE}, + {"INDICGETHOVERSTYLE", SLT_INDICATORSTYLE, SCI_INDICGETHOVERSTYLE, SLT_INT, SLT_VOID}, {"INDICSETHOVERFORE", SLT_VOID, SCI_INDICSETHOVERFORE, SLT_INT, SLT_INT}, {"INDICGETHOVERFORE", SLT_INT, SCI_INDICGETHOVERFORE, SLT_INT, SLT_VOID}, - {"INDICSETFLAGS", SLT_VOID, SCI_INDICSETFLAGS, SLT_INT, SLT_INT}, - {"INDICGETFLAGS", SLT_INT, SCI_INDICGETFLAGS, SLT_INT, SLT_VOID}, + {"INDICSETFLAGS", SLT_VOID, SCI_INDICSETFLAGS, SLT_INT, SLT_INDICFLAG}, + {"INDICGETFLAGS", SLT_INDICFLAG, SCI_INDICGETFLAGS, SLT_INT, SLT_VOID}, + {"INDICSETSTROKEWIDTH", SLT_VOID, SCI_INDICSETSTROKEWIDTH, SLT_INT, SLT_INT}, + {"INDICGETSTROKEWIDTH", SLT_INT, SCI_INDICGETSTROKEWIDTH, SLT_INT, SLT_VOID}, {"SETWHITESPACEFORE", SLT_VOID, SCI_SETWHITESPACEFORE, SLT_BOOL, SLT_INT}, {"SETWHITESPACEBACK", SLT_VOID, SCI_SETWHITESPACEBACK, SLT_BOOL, SLT_INT}, {"SETWHITESPACESIZE", SLT_VOID, SCI_SETWHITESPACESIZE, SLT_INT, SLT_VOID}, {"GETWHITESPACESIZE", SLT_INT, SCI_GETWHITESPACESIZE, SLT_VOID, SLT_VOID}, - {"SETLINESTATE", SLT_VOID, SCI_SETLINESTATE, SLT_INT, SLT_INT}, - {"GETLINESTATE", SLT_INT, SCI_GETLINESTATE, SLT_INT, SLT_VOID}, + {"SETLINESTATE", SLT_VOID, SCI_SETLINESTATE, SLT_LINE, SLT_INT}, + {"GETLINESTATE", SLT_INT, SCI_GETLINESTATE, SLT_LINE, SLT_VOID}, {"GETMAXLINESTATE", SLT_INT, SCI_GETMAXLINESTATE, SLT_VOID, SLT_VOID}, {"GETCARETLINEVISIBLE", SLT_BOOL, SCI_GETCARETLINEVISIBLE, SLT_VOID, SLT_VOID}, {"SETCARETLINEVISIBLE", SLT_VOID, SCI_SETCARETLINEVISIBLE, SLT_BOOL, SLT_VOID}, @@ -202,6 +294,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"USERLISTSHOW", SLT_VOID, SCI_USERLISTSHOW, SLT_INT, SLT_STRING}, {"AUTOCSETAUTOHIDE", SLT_VOID, SCI_AUTOCSETAUTOHIDE, SLT_BOOL, SLT_VOID}, {"AUTOCGETAUTOHIDE", SLT_BOOL, SCI_AUTOCGETAUTOHIDE, SLT_VOID, SLT_VOID}, + {"AUTOCSETOPTIONS", SLT_VOID, SCI_AUTOCSETOPTIONS, SLT_AUTOCOMPLETEOPTION, SLT_VOID}, + {"AUTOCGETOPTIONS", SLT_AUTOCOMPLETEOPTION, SCI_AUTOCGETOPTIONS, SLT_VOID, SLT_VOID}, {"AUTOCSETDROPRESTOFWORD", SLT_VOID, SCI_AUTOCSETDROPRESTOFWORD, SLT_BOOL, SLT_VOID}, {"AUTOCGETDROPRESTOFWORD", SLT_BOOL, SCI_AUTOCGETDROPRESTOFWORD, SLT_VOID, SLT_VOID}, {"REGISTERIMAGE", SLT_VOID, SCI_REGISTERIMAGE, SLT_INT, SLT_STRING}, @@ -216,19 +310,19 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETINDENT", SLT_INT, SCI_GETINDENT, SLT_VOID, SLT_VOID}, {"SETUSETABS", SLT_VOID, SCI_SETUSETABS, SLT_BOOL, SLT_VOID}, {"GETUSETABS", SLT_BOOL, SCI_GETUSETABS, SLT_VOID, SLT_VOID}, - {"SETLINEINDENTATION", SLT_VOID, SCI_SETLINEINDENTATION, SLT_INT, SLT_INT}, - {"GETLINEINDENTATION", SLT_INT, SCI_GETLINEINDENTATION, SLT_INT, SLT_VOID}, - {"GETLINEINDENTPOSITION", SLT_INT, SCI_GETLINEINDENTPOSITION, SLT_INT, SLT_VOID}, + {"SETLINEINDENTATION", SLT_VOID, SCI_SETLINEINDENTATION, SLT_LINE, SLT_INT}, + {"GETLINEINDENTATION", SLT_INT, SCI_GETLINEINDENTATION, SLT_LINE, SLT_VOID}, + {"GETLINEINDENTPOSITION", SLT_INT, SCI_GETLINEINDENTPOSITION, SLT_LINE, SLT_VOID}, {"GETCOLUMN", SLT_INT, SCI_GETCOLUMN, SLT_INT, SLT_VOID}, {"COUNTCHARACTERS", SLT_INT, SCI_COUNTCHARACTERS, SLT_INT, SLT_INT}, {"COUNTCODEUNITS", SLT_INT, SCI_COUNTCODEUNITS, SLT_INT, SLT_INT}, {"SETHSCROLLBAR", SLT_VOID, SCI_SETHSCROLLBAR, SLT_BOOL, SLT_VOID}, {"GETHSCROLLBAR", SLT_BOOL, SCI_GETHSCROLLBAR, SLT_VOID, SLT_VOID}, - {"SETINDENTATIONGUIDES", SLT_VOID, SCI_SETINDENTATIONGUIDES, SLT_INT, SLT_VOID}, - {"GETINDENTATIONGUIDES", SLT_INT, SCI_GETINDENTATIONGUIDES, SLT_VOID, SLT_VOID}, + {"SETINDENTATIONGUIDES", SLT_VOID, SCI_SETINDENTATIONGUIDES, SLT_INDENTVIEW, SLT_VOID}, + {"GETINDENTATIONGUIDES", SLT_INDENTVIEW, SCI_GETINDENTATIONGUIDES, SLT_VOID, SLT_VOID}, {"SETHIGHLIGHTGUIDE", SLT_VOID, SCI_SETHIGHLIGHTGUIDE, SLT_INT, SLT_VOID}, {"GETHIGHLIGHTGUIDE", SLT_INT, SCI_GETHIGHLIGHTGUIDE, SLT_VOID, SLT_VOID}, - {"GETLINEENDPOSITION", SLT_INT, SCI_GETLINEENDPOSITION, SLT_INT, SLT_VOID}, + {"GETLINEENDPOSITION", SLT_INT, SCI_GETLINEENDPOSITION, SLT_LINE, SLT_VOID}, {"GETCODEPAGE", SLT_INT, SCI_GETCODEPAGE, SLT_VOID, SLT_VOID}, {"GETCARETFORE", SLT_INT, SCI_GETCARETFORE, SLT_VOID, SLT_VOID}, {"GETREADONLY", SLT_BOOL, SCI_GETREADONLY, SLT_VOID, SLT_VOID}, @@ -240,13 +334,14 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETEMPTYSELECTION", SLT_VOID, SCI_SETEMPTYSELECTION, SLT_INT, SLT_VOID}, {"SETPRINTMAGNIFICATION", SLT_VOID, SCI_SETPRINTMAGNIFICATION, SLT_INT, SLT_VOID}, {"GETPRINTMAGNIFICATION", SLT_INT, SCI_GETPRINTMAGNIFICATION, SLT_VOID, SLT_VOID}, - {"SETPRINTCOLOURMODE", SLT_VOID, SCI_SETPRINTCOLOURMODE, SLT_INT, SLT_VOID}, - {"GETPRINTCOLOURMODE", SLT_INT, SCI_GETPRINTCOLOURMODE, SLT_VOID, SLT_VOID}, - {"FINDTEXT", SLT_INT, SCI_FINDTEXT, SLT_INT, SLT_FINDTEXT}, + {"SETPRINTCOLOURMODE", SLT_VOID, SCI_SETPRINTCOLOURMODE, SLT_PRINTOPTION, SLT_VOID}, + {"GETPRINTCOLOURMODE", SLT_PRINTOPTION, SCI_GETPRINTCOLOURMODE, SLT_VOID, SLT_VOID}, + {"FINDTEXT", SLT_INT, SCI_FINDTEXT, SLT_FINDOPTION, SLT_FINDTEXT}, {"FORMATRANGE", SLT_INT, SCI_FORMATRANGE, SLT_BOOL, SLT_FORMATRANGE}, - {"GETFIRSTVISIBLELINE", SLT_INT, SCI_GETFIRSTVISIBLELINE, SLT_VOID, SLT_VOID}, - {"GETLINE", SLT_INT, SCI_GETLINE, SLT_INT, SLT_STRINGRESULT}, - {"GETLINECOUNT", SLT_INT, SCI_GETLINECOUNT, SLT_VOID, SLT_VOID}, + {"GETFIRSTVISIBLELINE", SLT_LINE, SCI_GETFIRSTVISIBLELINE, SLT_VOID, SLT_VOID}, + {"GETLINE", SLT_INT, SCI_GETLINE, SLT_LINE, SLT_STRINGRESULT}, + {"GETLINECOUNT", SLT_LINE, SCI_GETLINECOUNT, SLT_VOID, SLT_VOID}, + {"ALLOCATELINES", SLT_VOID, SCI_ALLOCATELINES, SLT_LINE, SLT_VOID}, {"SETMARGINLEFT", SLT_VOID, SCI_SETMARGINLEFT, SLT_VOID, SLT_INT}, {"GETMARGINLEFT", SLT_INT, SCI_GETMARGINLEFT, SLT_VOID, SLT_VOID}, {"SETMARGINRIGHT", SLT_VOID, SCI_SETMARGINRIGHT, SLT_VOID, SLT_INT}, @@ -258,9 +353,9 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"HIDESELECTION", SLT_VOID, SCI_HIDESELECTION, SLT_BOOL, SLT_VOID}, {"POINTXFROMPOSITION", SLT_INT, SCI_POINTXFROMPOSITION, SLT_VOID, SLT_INT}, {"POINTYFROMPOSITION", SLT_INT, SCI_POINTYFROMPOSITION, SLT_VOID, SLT_INT}, - {"LINEFROMPOSITION", SLT_INT, SCI_LINEFROMPOSITION, SLT_INT, SLT_VOID}, - {"POSITIONFROMLINE", SLT_INT, SCI_POSITIONFROMLINE, SLT_INT, SLT_VOID}, - {"LINESCROLL", SLT_VOID, SCI_LINESCROLL, SLT_INT, SLT_INT}, + {"LINEFROMPOSITION", SLT_LINE, SCI_LINEFROMPOSITION, SLT_INT, SLT_VOID}, + {"POSITIONFROMLINE", SLT_INT, SCI_POSITIONFROMLINE, SLT_LINE, SLT_VOID}, + {"LINESCROLL", SLT_VOID, SCI_LINESCROLL, SLT_INT, SLT_LINE}, {"SCROLLCARET", SLT_VOID, SCI_SCROLLCARET, SLT_VOID, SLT_VOID}, {"SCROLLRANGE", SLT_VOID, SCI_SCROLLRANGE, SLT_INT, SLT_INT}, {"REPLACESEL", SLT_VOID, SCI_REPLACESEL, SLT_VOID, SLT_STRING}, @@ -277,25 +372,30 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETTEXT", SLT_VOID, SCI_SETTEXT, SLT_VOID, SLT_STRING}, {"GETTEXT", SLT_INT, SCI_GETTEXT, SLT_INT, SLT_STRINGRESULT}, {"GETTEXTLENGTH", SLT_INT, SCI_GETTEXTLENGTH, SLT_VOID, SLT_VOID}, - {"GETDIRECTFUNCTION", SLT_INT, SCI_GETDIRECTFUNCTION, SLT_VOID, SLT_VOID}, - {"GETDIRECTPOINTER", SLT_INT, SCI_GETDIRECTPOINTER, SLT_VOID, SLT_VOID}, + {"GETDIRECTFUNCTION", SLT_POINTER, SCI_GETDIRECTFUNCTION, SLT_VOID, SLT_VOID}, + {"GETDIRECTSTATUSFUNCTION", SLT_POINTER, SCI_GETDIRECTSTATUSFUNCTION, SLT_VOID, SLT_VOID}, + {"GETDIRECTPOINTER", SLT_POINTER, SCI_GETDIRECTPOINTER, SLT_VOID, SLT_VOID}, {"SETOVERTYPE", SLT_VOID, SCI_SETOVERTYPE, SLT_BOOL, SLT_VOID}, {"GETOVERTYPE", SLT_BOOL, SCI_GETOVERTYPE, SLT_VOID, SLT_VOID}, {"SETCARETWIDTH", SLT_VOID, SCI_SETCARETWIDTH, SLT_INT, SLT_VOID}, {"GETCARETWIDTH", SLT_INT, SCI_GETCARETWIDTH, SLT_VOID, SLT_VOID}, {"SETTARGETSTART", SLT_VOID, SCI_SETTARGETSTART, SLT_INT, SLT_VOID}, {"GETTARGETSTART", SLT_INT, SCI_GETTARGETSTART, SLT_VOID, SLT_VOID}, + {"SETTARGETSTARTVIRTUALSPACE", SLT_VOID, SCI_SETTARGETSTARTVIRTUALSPACE, SLT_INT, SLT_VOID}, + {"GETTARGETSTARTVIRTUALSPACE", SLT_INT, SCI_GETTARGETSTARTVIRTUALSPACE, SLT_VOID, SLT_VOID}, {"SETTARGETEND", SLT_VOID, SCI_SETTARGETEND, SLT_INT, SLT_VOID}, {"GETTARGETEND", SLT_INT, SCI_GETTARGETEND, SLT_VOID, SLT_VOID}, + {"SETTARGETENDVIRTUALSPACE", SLT_VOID, SCI_SETTARGETENDVIRTUALSPACE, SLT_INT, SLT_VOID}, + {"GETTARGETENDVIRTUALSPACE", SLT_INT, SCI_GETTARGETENDVIRTUALSPACE, SLT_VOID, SLT_VOID}, {"SETTARGETRANGE", SLT_VOID, SCI_SETTARGETRANGE, SLT_INT, SLT_INT}, {"GETTARGETTEXT", SLT_INT, SCI_GETTARGETTEXT, SLT_VOID, SLT_STRINGRESULT}, {"TARGETFROMSELECTION", SLT_VOID, SCI_TARGETFROMSELECTION, SLT_VOID, SLT_VOID}, {"TARGETWHOLEDOCUMENT", SLT_VOID, SCI_TARGETWHOLEDOCUMENT, SLT_VOID, SLT_VOID}, {"REPLACETARGET", SLT_INT, SCI_REPLACETARGET, SLT_INT, SLT_STRING}, {"REPLACETARGETRE", SLT_INT, SCI_REPLACETARGETRE, SLT_INT, SLT_STRING}, {"SEARCHINTARGET", SLT_INT, SCI_SEARCHINTARGET, SLT_INT, SLT_STRING}, - {"SETSEARCHFLAGS", SLT_VOID, SCI_SETSEARCHFLAGS, SLT_INT, SLT_VOID}, - {"GETSEARCHFLAGS", SLT_INT, SCI_GETSEARCHFLAGS, SLT_VOID, SLT_VOID}, + {"SETSEARCHFLAGS", SLT_VOID, SCI_SETSEARCHFLAGS, SLT_FINDOPTION, SLT_VOID}, + {"GETSEARCHFLAGS", SLT_FINDOPTION, SCI_GETSEARCHFLAGS, SLT_VOID, SLT_VOID}, {"CALLTIPSHOW", SLT_VOID, SCI_CALLTIPSHOW, SLT_INT, SLT_STRING}, {"CALLTIPCANCEL", SLT_VOID, SCI_CALLTIPCANCEL, SLT_VOID, SLT_VOID}, {"CALLTIPACTIVE", SLT_BOOL, SCI_CALLTIPACTIVE, SLT_VOID, SLT_VOID}, @@ -307,31 +407,34 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"CALLTIPSETFOREHLT", SLT_VOID, SCI_CALLTIPSETFOREHLT, SLT_INT, SLT_VOID}, {"CALLTIPUSESTYLE", SLT_VOID, SCI_CALLTIPUSESTYLE, SLT_INT, SLT_VOID}, {"CALLTIPSETPOSITION", SLT_VOID, SCI_CALLTIPSETPOSITION, SLT_BOOL, SLT_VOID}, - {"VISIBLEFROMDOCLINE", SLT_INT, SCI_VISIBLEFROMDOCLINE, SLT_INT, SLT_VOID}, - {"DOCLINEFROMVISIBLE", SLT_INT, SCI_DOCLINEFROMVISIBLE, SLT_INT, SLT_VOID}, - {"WRAPCOUNT", SLT_INT, SCI_WRAPCOUNT, SLT_INT, SLT_VOID}, - {"SETFOLDLEVEL", SLT_VOID, SCI_SETFOLDLEVEL, SLT_INT, SLT_INT}, - {"GETFOLDLEVEL", SLT_INT, SCI_GETFOLDLEVEL, SLT_INT, SLT_VOID}, - {"GETLASTCHILD", SLT_INT, SCI_GETLASTCHILD, SLT_INT, SLT_INT}, - {"GETFOLDPARENT", SLT_INT, SCI_GETFOLDPARENT, SLT_INT, SLT_VOID}, - {"SHOWLINES", SLT_VOID, SCI_SHOWLINES, SLT_INT, SLT_INT}, - {"HIDELINES", SLT_VOID, SCI_HIDELINES, SLT_INT, SLT_INT}, - {"GETLINEVISIBLE", SLT_BOOL, SCI_GETLINEVISIBLE, SLT_INT, SLT_VOID}, + {"VISIBLEFROMDOCLINE", SLT_LINE, SCI_VISIBLEFROMDOCLINE, SLT_LINE, SLT_VOID}, + {"DOCLINEFROMVISIBLE", SLT_LINE, SCI_DOCLINEFROMVISIBLE, SLT_LINE, SLT_VOID}, + {"WRAPCOUNT", SLT_LINE, SCI_WRAPCOUNT, SLT_LINE, SLT_VOID}, + {"SETFOLDLEVEL", SLT_VOID, SCI_SETFOLDLEVEL, SLT_LINE, SLT_FOLDLEVEL}, + {"GETFOLDLEVEL", SLT_FOLDLEVEL, SCI_GETFOLDLEVEL, SLT_LINE, SLT_VOID}, + {"GETLASTCHILD", SLT_LINE, SCI_GETLASTCHILD, SLT_LINE, SLT_FOLDLEVEL}, + {"GETFOLDPARENT", SLT_LINE, SCI_GETFOLDPARENT, SLT_LINE, SLT_VOID}, + {"SHOWLINES", SLT_VOID, SCI_SHOWLINES, SLT_LINE, SLT_LINE}, + {"HIDELINES", SLT_VOID, SCI_HIDELINES, SLT_LINE, SLT_LINE}, + {"GETLINEVISIBLE", SLT_BOOL, SCI_GETLINEVISIBLE, SLT_LINE, SLT_VOID}, {"GETALLLINESVISIBLE", SLT_BOOL, SCI_GETALLLINESVISIBLE, SLT_VOID, SLT_VOID}, - {"SETFOLDEXPANDED", SLT_VOID, SCI_SETFOLDEXPANDED, SLT_INT, SLT_BOOL}, - {"GETFOLDEXPANDED", SLT_BOOL, SCI_GETFOLDEXPANDED, SLT_INT, SLT_VOID}, - {"TOGGLEFOLD", SLT_VOID, SCI_TOGGLEFOLD, SLT_INT, SLT_VOID}, - {"TOGGLEFOLDSHOWTEXT", SLT_VOID, SCI_TOGGLEFOLDSHOWTEXT, SLT_INT, SLT_STRING}, - {"FOLDDISPLAYTEXTSETSTYLE", SLT_VOID, SCI_FOLDDISPLAYTEXTSETSTYLE, SLT_INT, SLT_VOID}, - {"FOLDLINE", SLT_VOID, SCI_FOLDLINE, SLT_INT, SLT_INT}, - {"FOLDCHILDREN", SLT_VOID, SCI_FOLDCHILDREN, SLT_INT, SLT_INT}, - {"EXPANDCHILDREN", SLT_VOID, SCI_EXPANDCHILDREN, SLT_INT, SLT_INT}, - {"FOLDALL", SLT_VOID, SCI_FOLDALL, SLT_INT, SLT_VOID}, - {"ENSUREVISIBLE", SLT_VOID, SCI_ENSUREVISIBLE, SLT_INT, SLT_VOID}, - {"SETAUTOMATICFOLD", SLT_VOID, SCI_SETAUTOMATICFOLD, SLT_INT, SLT_VOID}, - {"GETAUTOMATICFOLD", SLT_INT, SCI_GETAUTOMATICFOLD, SLT_VOID, SLT_VOID}, - {"SETFOLDFLAGS", SLT_VOID, SCI_SETFOLDFLAGS, SLT_INT, SLT_VOID}, - {"ENSUREVISIBLEENFORCEPOLICY", SLT_VOID, SCI_ENSUREVISIBLEENFORCEPOLICY, SLT_INT, SLT_VOID}, + {"SETFOLDEXPANDED", SLT_VOID, SCI_SETFOLDEXPANDED, SLT_LINE, SLT_BOOL}, + {"GETFOLDEXPANDED", SLT_BOOL, SCI_GETFOLDEXPANDED, SLT_LINE, SLT_VOID}, + {"TOGGLEFOLD", SLT_VOID, SCI_TOGGLEFOLD, SLT_LINE, SLT_VOID}, + {"TOGGLEFOLDSHOWTEXT", SLT_VOID, SCI_TOGGLEFOLDSHOWTEXT, SLT_LINE, SLT_STRING}, + {"FOLDDISPLAYTEXTSETSTYLE", SLT_VOID, SCI_FOLDDISPLAYTEXTSETSTYLE, SLT_FOLDDISPLAYTEXTSTYLE, SLT_VOID}, + {"FOLDDISPLAYTEXTGETSTYLE", SLT_FOLDDISPLAYTEXTSTYLE, SCI_FOLDDISPLAYTEXTGETSTYLE, SLT_VOID, SLT_VOID}, + {"SETDEFAULTFOLDDISPLAYTEXT", SLT_VOID, SCI_SETDEFAULTFOLDDISPLAYTEXT, SLT_VOID, SLT_STRING}, + {"GETDEFAULTFOLDDISPLAYTEXT", SLT_INT, SCI_GETDEFAULTFOLDDISPLAYTEXT, SLT_VOID, SLT_STRINGRESULT}, + {"FOLDLINE", SLT_VOID, SCI_FOLDLINE, SLT_LINE, SLT_FOLDACTION}, + {"FOLDCHILDREN", SLT_VOID, SCI_FOLDCHILDREN, SLT_LINE, SLT_FOLDACTION}, + {"EXPANDCHILDREN", SLT_VOID, SCI_EXPANDCHILDREN, SLT_LINE, SLT_FOLDLEVEL}, + {"FOLDALL", SLT_VOID, SCI_FOLDALL, SLT_FOLDACTION, SLT_VOID}, + {"ENSUREVISIBLE", SLT_VOID, SCI_ENSUREVISIBLE, SLT_LINE, SLT_VOID}, + {"SETAUTOMATICFOLD", SLT_VOID, SCI_SETAUTOMATICFOLD, SLT_AUTOMATICFOLD, SLT_VOID}, + {"GETAUTOMATICFOLD", SLT_AUTOMATICFOLD, SCI_GETAUTOMATICFOLD, SLT_VOID, SLT_VOID}, + {"SETFOLDFLAGS", SLT_VOID, SCI_SETFOLDFLAGS, SLT_FOLDFLAG, SLT_VOID}, + {"ENSUREVISIBLEENFORCEPOLICY", SLT_VOID, SCI_ENSUREVISIBLEENFORCEPOLICY, SLT_LINE, SLT_VOID}, {"SETTABINDENTS", SLT_VOID, SCI_SETTABINDENTS, SLT_BOOL, SLT_VOID}, {"GETTABINDENTS", SLT_BOOL, SCI_GETTABINDENTS, SLT_VOID, SLT_VOID}, {"SETBACKSPACEUNINDENTS", SLT_VOID, SCI_SETBACKSPACEUNINDENTS, SLT_BOOL, SLT_VOID}, @@ -341,47 +444,45 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"WORDSTARTPOSITION", SLT_INT, SCI_WORDSTARTPOSITION, SLT_INT, SLT_BOOL}, {"WORDENDPOSITION", SLT_INT, SCI_WORDENDPOSITION, SLT_INT, SLT_BOOL}, {"ISRANGEWORD", SLT_BOOL, SCI_ISRANGEWORD, SLT_INT, SLT_INT}, - {"SETIDLESTYLING", SLT_VOID, SCI_SETIDLESTYLING, SLT_INT, SLT_VOID}, - {"GETIDLESTYLING", SLT_INT, SCI_GETIDLESTYLING, SLT_VOID, SLT_VOID}, - {"SETWRAPMODE", SLT_VOID, SCI_SETWRAPMODE, SLT_INT, SLT_VOID}, - {"GETWRAPMODE", SLT_INT, SCI_GETWRAPMODE, SLT_VOID, SLT_VOID}, - {"SETWRAPVISUALFLAGS", SLT_VOID, SCI_SETWRAPVISUALFLAGS, SLT_INT, SLT_VOID}, - {"GETWRAPVISUALFLAGS", SLT_INT, SCI_GETWRAPVISUALFLAGS, SLT_VOID, SLT_VOID}, - {"SETWRAPVISUALFLAGSLOCATION", SLT_VOID, SCI_SETWRAPVISUALFLAGSLOCATION, SLT_INT, SLT_VOID}, - {"GETWRAPVISUALFLAGSLOCATION", SLT_INT, SCI_GETWRAPVISUALFLAGSLOCATION, SLT_VOID, SLT_VOID}, + {"SETIDLESTYLING", SLT_VOID, SCI_SETIDLESTYLING, SLT_IDLESTYLING, SLT_VOID}, + {"GETIDLESTYLING", SLT_IDLESTYLING, SCI_GETIDLESTYLING, SLT_VOID, SLT_VOID}, + {"SETWRAPMODE", SLT_VOID, SCI_SETWRAPMODE, SLT_WRAP, SLT_VOID}, + {"GETWRAPMODE", SLT_WRAP, SCI_GETWRAPMODE, SLT_VOID, SLT_VOID}, + {"SETWRAPVISUALFLAGS", SLT_VOID, SCI_SETWRAPVISUALFLAGS, SLT_WRAPVISUALFLAG, SLT_VOID}, + {"GETWRAPVISUALFLAGS", SLT_WRAPVISUALFLAG, SCI_GETWRAPVISUALFLAGS, SLT_VOID, SLT_VOID}, + {"SETWRAPVISUALFLAGSLOCATION", SLT_VOID, SCI_SETWRAPVISUALFLAGSLOCATION, SLT_WRAPVISUALLOCATION, SLT_VOID}, + {"GETWRAPVISUALFLAGSLOCATION", SLT_WRAPVISUALLOCATION, SCI_GETWRAPVISUALFLAGSLOCATION, SLT_VOID, SLT_VOID}, {"SETWRAPSTARTINDENT", SLT_VOID, SCI_SETWRAPSTARTINDENT, SLT_INT, SLT_VOID}, {"GETWRAPSTARTINDENT", SLT_INT, SCI_GETWRAPSTARTINDENT, SLT_VOID, SLT_VOID}, - {"SETWRAPINDENTMODE", SLT_VOID, SCI_SETWRAPINDENTMODE, SLT_INT, SLT_VOID}, - {"GETWRAPINDENTMODE", SLT_INT, SCI_GETWRAPINDENTMODE, SLT_VOID, SLT_VOID}, - {"SETLAYOUTCACHE", SLT_VOID, SCI_SETLAYOUTCACHE, SLT_INT, SLT_VOID}, - {"GETLAYOUTCACHE", SLT_INT, SCI_GETLAYOUTCACHE, SLT_VOID, SLT_VOID}, + {"SETWRAPINDENTMODE", SLT_VOID, SCI_SETWRAPINDENTMODE, SLT_WRAPINDENTMODE, SLT_VOID}, + {"GETWRAPINDENTMODE", SLT_WRAPINDENTMODE, SCI_GETWRAPINDENTMODE, SLT_VOID, SLT_VOID}, + {"SETLAYOUTCACHE", SLT_VOID, SCI_SETLAYOUTCACHE, SLT_LINECACHE, SLT_VOID}, + {"GETLAYOUTCACHE", SLT_LINECACHE, SCI_GETLAYOUTCACHE, SLT_VOID, SLT_VOID}, {"SETSCROLLWIDTH", SLT_VOID, SCI_SETSCROLLWIDTH, SLT_INT, SLT_VOID}, {"GETSCROLLWIDTH", SLT_INT, SCI_GETSCROLLWIDTH, SLT_VOID, SLT_VOID}, {"SETSCROLLWIDTHTRACKING", SLT_VOID, SCI_SETSCROLLWIDTHTRACKING, SLT_BOOL, SLT_VOID}, {"GETSCROLLWIDTHTRACKING", SLT_BOOL, SCI_GETSCROLLWIDTHTRACKING, SLT_VOID, SLT_VOID}, {"TEXTWIDTH", SLT_INT, SCI_TEXTWIDTH, SLT_INT, SLT_STRING}, {"SETENDATLASTLINE", SLT_VOID, SCI_SETENDATLASTLINE, SLT_BOOL, SLT_VOID}, {"GETENDATLASTLINE", SLT_BOOL, SCI_GETENDATLASTLINE, SLT_VOID, SLT_VOID}, - {"TEXTHEIGHT", SLT_INT, SCI_TEXTHEIGHT, SLT_INT, SLT_VOID}, + {"TEXTHEIGHT", SLT_INT, SCI_TEXTHEIGHT, SLT_LINE, SLT_VOID}, {"SETVSCROLLBAR", SLT_VOID, SCI_SETVSCROLLBAR, SLT_BOOL, SLT_VOID}, {"GETVSCROLLBAR", SLT_BOOL, SCI_GETVSCROLLBAR, SLT_VOID, SLT_VOID}, {"APPENDTEXT", SLT_VOID, SCI_APPENDTEXT, SLT_INT, SLT_STRING}, - {"GETTWOPHASEDRAW", SLT_BOOL, SCI_GETTWOPHASEDRAW, SLT_VOID, SLT_VOID}, - {"SETTWOPHASEDRAW", SLT_VOID, SCI_SETTWOPHASEDRAW, SLT_BOOL, SLT_VOID}, - {"GETPHASESDRAW", SLT_INT, SCI_GETPHASESDRAW, SLT_VOID, SLT_VOID}, - {"SETPHASESDRAW", SLT_VOID, SCI_SETPHASESDRAW, SLT_INT, SLT_VOID}, - {"SETFONTQUALITY", SLT_VOID, SCI_SETFONTQUALITY, SLT_INT, SLT_VOID}, - {"GETFONTQUALITY", SLT_INT, SCI_GETFONTQUALITY, SLT_VOID, SLT_VOID}, - {"SETFIRSTVISIBLELINE", SLT_VOID, SCI_SETFIRSTVISIBLELINE, SLT_INT, SLT_VOID}, - {"SETMULTIPASTE", SLT_VOID, SCI_SETMULTIPASTE, SLT_INT, SLT_VOID}, - {"GETMULTIPASTE", SLT_INT, SCI_GETMULTIPASTE, SLT_VOID, SLT_VOID}, + {"GETPHASESDRAW", SLT_PHASESDRAW, SCI_GETPHASESDRAW, SLT_VOID, SLT_VOID}, + {"SETPHASESDRAW", SLT_VOID, SCI_SETPHASESDRAW, SLT_PHASESDRAW, SLT_VOID}, + {"SETFONTQUALITY", SLT_VOID, SCI_SETFONTQUALITY, SLT_FONTQUALITY, SLT_VOID}, + {"GETFONTQUALITY", SLT_FONTQUALITY, SCI_GETFONTQUALITY, SLT_VOID, SLT_VOID}, + {"SETFIRSTVISIBLELINE", SLT_VOID, SCI_SETFIRSTVISIBLELINE, SLT_LINE, SLT_VOID}, + {"SETMULTIPASTE", SLT_VOID, SCI_SETMULTIPASTE, SLT_MULTIPASTE, SLT_VOID}, + {"GETMULTIPASTE", SLT_MULTIPASTE, SCI_GETMULTIPASTE, SLT_VOID, SLT_VOID}, {"GETTAG", SLT_INT, SCI_GETTAG, SLT_INT, SLT_STRINGRESULT}, {"LINESJOIN", SLT_VOID, SCI_LINESJOIN, SLT_VOID, SLT_VOID}, {"LINESSPLIT", SLT_VOID, SCI_LINESSPLIT, SLT_INT, SLT_VOID}, {"SETFOLDMARGINCOLOUR", SLT_VOID, SCI_SETFOLDMARGINCOLOUR, SLT_BOOL, SLT_INT}, {"SETFOLDMARGINHICOLOUR", SLT_VOID, SCI_SETFOLDMARGINHICOLOUR, SLT_BOOL, SLT_INT}, - {"SETACCESSIBILITY", SLT_VOID, SCI_SETACCESSIBILITY, SLT_INT, SLT_VOID}, - {"GETACCESSIBILITY", SLT_INT, SCI_GETACCESSIBILITY, SLT_VOID, SLT_VOID}, + {"SETACCESSIBILITY", SLT_VOID, SCI_SETACCESSIBILITY, SLT_ACCESSIBILITY, SLT_VOID}, + {"GETACCESSIBILITY", SLT_ACCESSIBILITY, SCI_GETACCESSIBILITY, SLT_VOID, SLT_VOID}, {"LINEDOWN", SLT_VOID, SCI_LINEDOWN, SLT_VOID, SLT_VOID}, {"LINEDOWNEXTEND", SLT_VOID, SCI_LINEDOWNEXTEND, SLT_VOID, SLT_VOID}, {"LINEUP", SLT_VOID, SCI_LINEUP, SLT_VOID, SLT_VOID}, @@ -442,67 +543,69 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"VCHOMEWRAPEXTEND", SLT_VOID, SCI_VCHOMEWRAPEXTEND, SLT_VOID, SLT_VOID}, {"LINECOPY", SLT_VOID, SCI_LINECOPY, SLT_VOID, SLT_VOID}, {"MOVECARETINSIDEVIEW", SLT_VOID, SCI_MOVECARETINSIDEVIEW, SLT_VOID, SLT_VOID}, - {"LINELENGTH", SLT_INT, SCI_LINELENGTH, SLT_INT, SLT_VOID}, + {"LINELENGTH", SLT_INT, SCI_LINELENGTH, SLT_LINE, SLT_VOID}, {"BRACEHIGHLIGHT", SLT_VOID, SCI_BRACEHIGHLIGHT, SLT_INT, SLT_INT}, {"BRACEHIGHLIGHTINDICATOR", SLT_VOID, SCI_BRACEHIGHLIGHTINDICATOR, SLT_BOOL, SLT_INT}, {"BRACEBADLIGHT", SLT_VOID, SCI_BRACEBADLIGHT, SLT_INT, SLT_VOID}, {"BRACEBADLIGHTINDICATOR", SLT_VOID, SCI_BRACEBADLIGHTINDICATOR, SLT_BOOL, SLT_INT}, {"BRACEMATCH", SLT_INT, SCI_BRACEMATCH, SLT_INT, SLT_INT}, + {"BRACEMATCHNEXT", SLT_INT, SCI_BRACEMATCHNEXT, SLT_INT, SLT_INT}, {"GETVIEWEOL", SLT_BOOL, SCI_GETVIEWEOL, SLT_VOID, SLT_VOID}, {"SETVIEWEOL", SLT_VOID, SCI_SETVIEWEOL, SLT_BOOL, SLT_VOID}, - {"GETDOCPOINTER", SLT_INT, SCI_GETDOCPOINTER, SLT_VOID, SLT_VOID}, - {"SETDOCPOINTER", SLT_VOID, SCI_SETDOCPOINTER, SLT_VOID, SLT_INT}, - {"SETMODEVENTMASK", SLT_VOID, SCI_SETMODEVENTMASK, SLT_INT, SLT_VOID}, + {"GETDOCPOINTER", SLT_POINTER, SCI_GETDOCPOINTER, SLT_VOID, SLT_VOID}, + {"SETDOCPOINTER", SLT_VOID, SCI_SETDOCPOINTER, SLT_VOID, SLT_POINTER}, + {"SETMODEVENTMASK", SLT_VOID, SCI_SETMODEVENTMASK, SLT_MODIFICATIONFLAGS, SLT_VOID}, {"GETEDGECOLUMN", SLT_INT, SCI_GETEDGECOLUMN, SLT_VOID, SLT_VOID}, {"SETEDGECOLUMN", SLT_VOID, SCI_SETEDGECOLUMN, SLT_INT, SLT_VOID}, - {"GETEDGEMODE", SLT_INT, SCI_GETEDGEMODE, SLT_VOID, SLT_VOID}, - {"SETEDGEMODE", SLT_VOID, SCI_SETEDGEMODE, SLT_INT, SLT_VOID}, + {"GETEDGEMODE", SLT_EDGEVISUALSTYLE, SCI_GETEDGEMODE, SLT_VOID, SLT_VOID}, + {"SETEDGEMODE", SLT_VOID, SCI_SETEDGEMODE, SLT_EDGEVISUALSTYLE, SLT_VOID}, {"GETEDGECOLOUR", SLT_INT, SCI_GETEDGECOLOUR, SLT_VOID, SLT_VOID}, {"SETEDGECOLOUR", SLT_VOID, SCI_SETEDGECOLOUR, SLT_INT, SLT_VOID}, {"MULTIEDGEADDLINE", SLT_VOID, SCI_MULTIEDGEADDLINE, SLT_INT, SLT_INT}, {"MULTIEDGECLEARALL", SLT_VOID, SCI_MULTIEDGECLEARALL, SLT_VOID, SLT_VOID}, + {"GETMULTIEDGECOLUMN", SLT_INT, SCI_GETMULTIEDGECOLUMN, SLT_INT, SLT_VOID}, {"SEARCHANCHOR", SLT_VOID, SCI_SEARCHANCHOR, SLT_VOID, SLT_VOID}, - {"SEARCHNEXT", SLT_INT, SCI_SEARCHNEXT, SLT_INT, SLT_STRING}, - {"SEARCHPREV", SLT_INT, SCI_SEARCHPREV, SLT_INT, SLT_STRING}, - {"LINESONSCREEN", SLT_INT, SCI_LINESONSCREEN, SLT_VOID, SLT_VOID}, - {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_INT, SLT_VOID}, + {"SEARCHNEXT", SLT_INT, SCI_SEARCHNEXT, SLT_FINDOPTION, SLT_STRING}, + {"SEARCHPREV", SLT_INT, SCI_SEARCHPREV, SLT_FINDOPTION, SLT_STRING}, + {"LINESONSCREEN", SLT_LINE, SCI_LINESONSCREEN, SLT_VOID, SLT_VOID}, + {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_POPUP, SLT_VOID}, {"SELECTIONISRECTANGLE", SLT_BOOL, SCI_SELECTIONISRECTANGLE, SLT_VOID, SLT_VOID}, {"SETZOOM", SLT_VOID, SCI_SETZOOM, SLT_INT, SLT_VOID}, {"GETZOOM", SLT_INT, SCI_GETZOOM, SLT_VOID, SLT_VOID}, - {"CREATEDOCUMENT", SLT_INT, SCI_CREATEDOCUMENT, SLT_INT, SLT_INT}, - {"ADDREFDOCUMENT", SLT_VOID, SCI_ADDREFDOCUMENT, SLT_VOID, SLT_INT}, - {"RELEASEDOCUMENT", SLT_VOID, SCI_RELEASEDOCUMENT, SLT_VOID, SLT_INT}, - {"GETDOCUMENTOPTIONS", SLT_INT, SCI_GETDOCUMENTOPTIONS, SLT_VOID, SLT_VOID}, - {"GETMODEVENTMASK", SLT_INT, SCI_GETMODEVENTMASK, SLT_VOID, SLT_VOID}, + {"CREATEDOCUMENT", SLT_POINTER, SCI_CREATEDOCUMENT, SLT_INT, SLT_DOCUMENTOPTION}, + {"ADDREFDOCUMENT", SLT_VOID, SCI_ADDREFDOCUMENT, SLT_VOID, SLT_POINTER}, + {"RELEASEDOCUMENT", SLT_VOID, SCI_RELEASEDOCUMENT, SLT_VOID, SLT_POINTER}, + {"GETDOCUMENTOPTIONS", SLT_DOCUMENTOPTION, SCI_GETDOCUMENTOPTIONS, SLT_VOID, SLT_VOID}, + {"GETMODEVENTMASK", SLT_MODIFICATIONFLAGS, SCI_GETMODEVENTMASK, SLT_VOID, SLT_VOID}, {"SETCOMMANDEVENTS", SLT_VOID, SCI_SETCOMMANDEVENTS, SLT_BOOL, SLT_VOID}, {"GETCOMMANDEVENTS", SLT_BOOL, SCI_GETCOMMANDEVENTS, SLT_VOID, SLT_VOID}, {"SETFOCUS", SLT_VOID, SCI_SETFOCUS, SLT_BOOL, SLT_VOID}, {"GETFOCUS", SLT_BOOL, SCI_GETFOCUS, SLT_VOID, SLT_VOID}, - {"SETSTATUS", SLT_VOID, SCI_SETSTATUS, SLT_INT, SLT_VOID}, - {"GETSTATUS", SLT_INT, SCI_GETSTATUS, SLT_VOID, SLT_VOID}, + {"SETSTATUS", SLT_VOID, SCI_SETSTATUS, SLT_STATUS, SLT_VOID}, + {"GETSTATUS", SLT_STATUS, SCI_GETSTATUS, SLT_VOID, SLT_VOID}, {"SETMOUSEDOWNCAPTURES", SLT_VOID, SCI_SETMOUSEDOWNCAPTURES, SLT_BOOL, SLT_VOID}, {"GETMOUSEDOWNCAPTURES", SLT_BOOL, SCI_GETMOUSEDOWNCAPTURES, SLT_VOID, SLT_VOID}, {"SETMOUSEWHEELCAPTURES", SLT_VOID, SCI_SETMOUSEWHEELCAPTURES, SLT_BOOL, SLT_VOID}, {"GETMOUSEWHEELCAPTURES", SLT_BOOL, SCI_GETMOUSEWHEELCAPTURES, SLT_VOID, SLT_VOID}, - {"SETCURSOR", SLT_VOID, SCI_SETCURSOR, SLT_INT, SLT_VOID}, - {"GETCURSOR", SLT_INT, SCI_GETCURSOR, SLT_VOID, SLT_VOID}, + {"SETCURSOR", SLT_VOID, SCI_SETCURSOR, SLT_CURSORSHAPE, SLT_VOID}, + {"GETCURSOR", SLT_CURSORSHAPE, SCI_GETCURSOR, SLT_VOID, SLT_VOID}, {"SETCONTROLCHARSYMBOL", SLT_VOID, SCI_SETCONTROLCHARSYMBOL, SLT_INT, SLT_VOID}, {"GETCONTROLCHARSYMBOL", SLT_INT, SCI_GETCONTROLCHARSYMBOL, SLT_VOID, SLT_VOID}, {"WORDPARTLEFT", SLT_VOID, SCI_WORDPARTLEFT, SLT_VOID, SLT_VOID}, {"WORDPARTLEFTEXTEND", SLT_VOID, SCI_WORDPARTLEFTEXTEND, SLT_VOID, SLT_VOID}, {"WORDPARTRIGHT", SLT_VOID, SCI_WORDPARTRIGHT, SLT_VOID, SLT_VOID}, {"WORDPARTRIGHTEXTEND", SLT_VOID, SCI_WORDPARTRIGHTEXTEND, SLT_VOID, SLT_VOID}, - {"SETVISIBLEPOLICY", SLT_VOID, SCI_SETVISIBLEPOLICY, SLT_INT, SLT_INT}, + {"SETVISIBLEPOLICY", SLT_VOID, SCI_SETVISIBLEPOLICY, SLT_VISIBLEPOLICY, SLT_INT}, {"DELLINELEFT", SLT_VOID, SCI_DELLINELEFT, SLT_VOID, SLT_VOID}, {"DELLINERIGHT", SLT_VOID, SCI_DELLINERIGHT, SLT_VOID, SLT_VOID}, {"SETXOFFSET", SLT_VOID, SCI_SETXOFFSET, SLT_INT, SLT_VOID}, {"GETXOFFSET", SLT_INT, SCI_GETXOFFSET, SLT_VOID, SLT_VOID}, {"CHOOSECARETX", SLT_VOID, SCI_CHOOSECARETX, SLT_VOID, SLT_VOID}, {"GRABFOCUS", SLT_VOID, SCI_GRABFOCUS, SLT_VOID, SLT_VOID}, - {"SETXCARETPOLICY", SLT_VOID, SCI_SETXCARETPOLICY, SLT_INT, SLT_INT}, - {"SETYCARETPOLICY", SLT_VOID, SCI_SETYCARETPOLICY, SLT_INT, SLT_INT}, - {"SETPRINTWRAPMODE", SLT_VOID, SCI_SETPRINTWRAPMODE, SLT_INT, SLT_VOID}, - {"GETPRINTWRAPMODE", SLT_INT, SCI_GETPRINTWRAPMODE, SLT_VOID, SLT_VOID}, + {"SETXCARETPOLICY", SLT_VOID, SCI_SETXCARETPOLICY, SLT_CARETPOLICY, SLT_INT}, + {"SETYCARETPOLICY", SLT_VOID, SCI_SETYCARETPOLICY, SLT_CARETPOLICY, SLT_INT}, + {"SETPRINTWRAPMODE", SLT_VOID, SCI_SETPRINTWRAPMODE, SLT_WRAP, SLT_VOID}, + {"GETPRINTWRAPMODE", SLT_WRAP, SCI_GETPRINTWRAPMODE, SLT_VOID, SLT_VOID}, {"SETHOTSPOTACTIVEFORE", SLT_VOID, SCI_SETHOTSPOTACTIVEFORE, SLT_BOOL, SLT_INT}, {"GETHOTSPOTACTIVEFORE", SLT_INT, SCI_GETHOTSPOTACTIVEFORE, SLT_VOID, SLT_VOID}, {"SETHOTSPOTACTIVEBACK", SLT_VOID, SCI_SETHOTSPOTACTIVEBACK, SLT_BOOL, SLT_INT}, @@ -521,11 +624,11 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"POSITIONRELATIVECODEUNITS", SLT_INT, SCI_POSITIONRELATIVECODEUNITS, SLT_INT, SLT_INT}, {"COPYRANGE", SLT_VOID, SCI_COPYRANGE, SLT_INT, SLT_INT}, {"COPYTEXT", SLT_VOID, SCI_COPYTEXT, SLT_INT, SLT_STRING}, - {"SETSELECTIONMODE", SLT_VOID, SCI_SETSELECTIONMODE, SLT_INT, SLT_VOID}, - {"GETSELECTIONMODE", SLT_INT, SCI_GETSELECTIONMODE, SLT_VOID, SLT_VOID}, + {"SETSELECTIONMODE", SLT_VOID, SCI_SETSELECTIONMODE, SLT_SELECTIONMODE, SLT_VOID}, + {"GETSELECTIONMODE", SLT_SELECTIONMODE, SCI_GETSELECTIONMODE, SLT_VOID, SLT_VOID}, {"GETMOVEEXTENDSSELECTION", SLT_BOOL, SCI_GETMOVEEXTENDSSELECTION, SLT_VOID, SLT_VOID}, - {"GETLINESELSTARTPOSITION", SLT_INT, SCI_GETLINESELSTARTPOSITION, SLT_INT, SLT_VOID}, - {"GETLINESELENDPOSITION", SLT_INT, SCI_GETLINESELENDPOSITION, SLT_INT, SLT_VOID}, + {"GETLINESELSTARTPOSITION", SLT_INT, SCI_GETLINESELSTARTPOSITION, SLT_LINE, SLT_VOID}, + {"GETLINESELENDPOSITION", SLT_INT, SCI_GETLINESELENDPOSITION, SLT_LINE, SLT_VOID}, {"LINEDOWNRECTEXTEND", SLT_VOID, SCI_LINEDOWNRECTEXTEND, SLT_VOID, SLT_VOID}, {"LINEUPRECTEXTEND", SLT_VOID, SCI_LINEUPRECTEXTEND, SLT_VOID, SLT_VOID}, {"CHARLEFTRECTEXTEND", SLT_VOID, SCI_CHARLEFTRECTEXTEND, SLT_VOID, SLT_VOID}, @@ -550,27 +653,28 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETCHARSDEFAULT", SLT_VOID, SCI_SETCHARSDEFAULT, SLT_VOID, SLT_VOID}, {"AUTOCGETCURRENT", SLT_INT, SCI_AUTOCGETCURRENT, SLT_VOID, SLT_VOID}, {"AUTOCGETCURRENTTEXT", SLT_INT, SCI_AUTOCGETCURRENTTEXT, SLT_VOID, SLT_STRINGRESULT}, - {"AUTOCSETCASEINSENSITIVEBEHAVIOUR", SLT_VOID, SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, SLT_INT, SLT_VOID}, - {"AUTOCGETCASEINSENSITIVEBEHAVIOUR", SLT_INT, SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR, SLT_VOID, SLT_VOID}, - {"AUTOCSETMULTI", SLT_VOID, SCI_AUTOCSETMULTI, SLT_INT, SLT_VOID}, - {"AUTOCGETMULTI", SLT_INT, SCI_AUTOCGETMULTI, SLT_VOID, SLT_VOID}, - {"AUTOCSETORDER", SLT_VOID, SCI_AUTOCSETORDER, SLT_INT, SLT_VOID}, - {"AUTOCGETORDER", SLT_INT, SCI_AUTOCGETORDER, SLT_VOID, SLT_VOID}, + {"AUTOCSETCASEINSENSITIVEBEHAVIOUR", SLT_VOID, SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, SLT_CASEINSENSITIVEBEHAVIOUR, SLT_VOID}, + {"AUTOCGETCASEINSENSITIVEBEHAVIOUR", SLT_CASEINSENSITIVEBEHAVIOUR, SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR, SLT_VOID, SLT_VOID}, + {"AUTOCSETMULTI", SLT_VOID, SCI_AUTOCSETMULTI, SLT_MULTIAUTOCOMPLETE, SLT_VOID}, + {"AUTOCGETMULTI", SLT_MULTIAUTOCOMPLETE, SCI_AUTOCGETMULTI, SLT_VOID, SLT_VOID}, + {"AUTOCSETORDER", SLT_VOID, SCI_AUTOCSETORDER, SLT_ORDERING, SLT_VOID}, + {"AUTOCGETORDER", SLT_ORDERING, SCI_AUTOCGETORDER, SLT_VOID, SLT_VOID}, {"ALLOCATE", SLT_VOID, SCI_ALLOCATE, SLT_INT, SLT_VOID}, {"TARGETASUTF8", SLT_INT, SCI_TARGETASUTF8, SLT_VOID, SLT_STRINGRESULT}, {"SETLENGTHFORENCODE", SLT_VOID, SCI_SETLENGTHFORENCODE, SLT_INT, SLT_VOID}, {"ENCODEDFROMUTF8", SLT_INT, SCI_ENCODEDFROMUTF8, SLT_STRING, SLT_STRINGRESULT}, - {"FINDCOLUMN", SLT_INT, SCI_FINDCOLUMN, SLT_INT, SLT_INT}, - {"GETCARETSTICKY", SLT_INT, SCI_GETCARETSTICKY, SLT_VOID, SLT_VOID}, - {"SETCARETSTICKY", SLT_VOID, SCI_SETCARETSTICKY, SLT_INT, SLT_VOID}, + {"FINDCOLUMN", SLT_INT, SCI_FINDCOLUMN, SLT_LINE, SLT_INT}, + {"GETCARETSTICKY", SLT_CARETSTICKY, SCI_GETCARETSTICKY, SLT_VOID, SLT_VOID}, + {"SETCARETSTICKY", SLT_VOID, SCI_SETCARETSTICKY, SLT_CARETSTICKY, SLT_VOID}, {"TOGGLECARETSTICKY", SLT_VOID, SCI_TOGGLECARETSTICKY, SLT_VOID, SLT_VOID}, {"SETPASTECONVERTENDINGS", SLT_VOID, SCI_SETPASTECONVERTENDINGS, SLT_BOOL, SLT_VOID}, {"GETPASTECONVERTENDINGS", SLT_BOOL, SCI_GETPASTECONVERTENDINGS, SLT_VOID, SLT_VOID}, + {"REPLACERECTANGULAR", SLT_VOID, SCI_REPLACERECTANGULAR, SLT_INT, SLT_STRING}, {"SELECTIONDUPLICATE", SLT_VOID, SCI_SELECTIONDUPLICATE, SLT_VOID, SLT_VOID}, - {"SETCARETLINEBACKALPHA", SLT_VOID, SCI_SETCARETLINEBACKALPHA, SLT_INT, SLT_VOID}, - {"GETCARETLINEBACKALPHA", SLT_INT, SCI_GETCARETLINEBACKALPHA, SLT_VOID, SLT_VOID}, - {"SETCARETSTYLE", SLT_VOID, SCI_SETCARETSTYLE, SLT_INT, SLT_VOID}, - {"GETCARETSTYLE", SLT_INT, SCI_GETCARETSTYLE, SLT_VOID, SLT_VOID}, + {"SETCARETLINEBACKALPHA", SLT_VOID, SCI_SETCARETLINEBACKALPHA, SLT_ALPHA, SLT_VOID}, + {"GETCARETLINEBACKALPHA", SLT_ALPHA, SCI_GETCARETLINEBACKALPHA, SLT_VOID, SLT_VOID}, + {"SETCARETSTYLE", SLT_VOID, SCI_SETCARETSTYLE, SLT_CARETSTYLE, SLT_VOID}, + {"GETCARETSTYLE", SLT_CARETSTYLE, SCI_GETCARETSTYLE, SLT_VOID, SLT_VOID}, {"SETINDICATORCURRENT", SLT_VOID, SCI_SETINDICATORCURRENT, SLT_INT, SLT_VOID}, {"GETINDICATORCURRENT", SLT_INT, SCI_GETINDICATORCURRENT, SLT_VOID, SLT_VOID}, {"SETINDICATORVALUE", SLT_VOID, SCI_SETINDICATORVALUE, SLT_INT, SLT_VOID}, @@ -584,44 +688,44 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETPOSITIONCACHE", SLT_VOID, SCI_SETPOSITIONCACHE, SLT_INT, SLT_VOID}, {"GETPOSITIONCACHE", SLT_INT, SCI_GETPOSITIONCACHE, SLT_VOID, SLT_VOID}, {"COPYALLOWLINE", SLT_VOID, SCI_COPYALLOWLINE, SLT_VOID, SLT_VOID}, - {"GETCHARACTERPOINTER", SLT_INT, SCI_GETCHARACTERPOINTER, SLT_VOID, SLT_VOID}, - {"GETRANGEPOINTER", SLT_INT, SCI_GETRANGEPOINTER, SLT_INT, SLT_INT}, + {"GETCHARACTERPOINTER", SLT_POINTER, SCI_GETCHARACTERPOINTER, SLT_VOID, SLT_VOID}, + {"GETRANGEPOINTER", SLT_POINTER, SCI_GETRANGEPOINTER, SLT_INT, SLT_INT}, {"GETGAPPOSITION", SLT_INT, SCI_GETGAPPOSITION, SLT_VOID, SLT_VOID}, - {"INDICSETALPHA", SLT_VOID, SCI_INDICSETALPHA, SLT_INT, SLT_INT}, - {"INDICGETALPHA", SLT_INT, SCI_INDICGETALPHA, SLT_INT, SLT_VOID}, - {"INDICSETOUTLINEALPHA", SLT_VOID, SCI_INDICSETOUTLINEALPHA, SLT_INT, SLT_INT}, - {"INDICGETOUTLINEALPHA", SLT_INT, SCI_INDICGETOUTLINEALPHA, SLT_INT, SLT_VOID}, + {"INDICSETALPHA", SLT_VOID, SCI_INDICSETALPHA, SLT_INT, SLT_ALPHA}, + {"INDICGETALPHA", SLT_ALPHA, SCI_INDICGETALPHA, SLT_INT, SLT_VOID}, + {"INDICSETOUTLINEALPHA", SLT_VOID, SCI_INDICSETOUTLINEALPHA, SLT_INT, SLT_ALPHA}, + {"INDICGETOUTLINEALPHA", SLT_ALPHA, SCI_INDICGETOUTLINEALPHA, SLT_INT, SLT_VOID}, {"SETEXTRAASCENT", SLT_VOID, SCI_SETEXTRAASCENT, SLT_INT, SLT_VOID}, {"GETEXTRAASCENT", SLT_INT, SCI_GETEXTRAASCENT, SLT_VOID, SLT_VOID}, {"SETEXTRADESCENT", SLT_VOID, SCI_SETEXTRADESCENT, SLT_INT, SLT_VOID}, {"GETEXTRADESCENT", SLT_INT, SCI_GETEXTRADESCENT, SLT_VOID, SLT_VOID}, {"MARKERSYMBOLDEFINED", SLT_INT, SCI_MARKERSYMBOLDEFINED, SLT_INT, SLT_VOID}, - {"MARGINSETTEXT", SLT_VOID, SCI_MARGINSETTEXT, SLT_INT, SLT_STRING}, - {"MARGINGETTEXT", SLT_INT, SCI_MARGINGETTEXT, SLT_INT, SLT_STRINGRESULT}, - {"MARGINSETSTYLE", SLT_VOID, SCI_MARGINSETSTYLE, SLT_INT, SLT_INT}, - {"MARGINGETSTYLE", SLT_INT, SCI_MARGINGETSTYLE, SLT_INT, SLT_VOID}, - {"MARGINSETSTYLES", SLT_VOID, SCI_MARGINSETSTYLES, SLT_INT, SLT_STRING}, - {"MARGINGETSTYLES", SLT_INT, SCI_MARGINGETSTYLES, SLT_INT, SLT_STRINGRESULT}, + {"MARGINSETTEXT", SLT_VOID, SCI_MARGINSETTEXT, SLT_LINE, SLT_STRING}, + {"MARGINGETTEXT", SLT_INT, SCI_MARGINGETTEXT, SLT_LINE, SLT_STRINGRESULT}, + {"MARGINSETSTYLE", SLT_VOID, SCI_MARGINSETSTYLE, SLT_LINE, SLT_INT}, + {"MARGINGETSTYLE", SLT_INT, SCI_MARGINGETSTYLE, SLT_LINE, SLT_VOID}, + {"MARGINSETSTYLES", SLT_VOID, SCI_MARGINSETSTYLES, SLT_LINE, SLT_STRING}, + {"MARGINGETSTYLES", SLT_INT, SCI_MARGINGETSTYLES, SLT_LINE, SLT_STRINGRESULT}, {"MARGINTEXTCLEARALL", SLT_VOID, SCI_MARGINTEXTCLEARALL, SLT_VOID, SLT_VOID}, {"MARGINSETSTYLEOFFSET", SLT_VOID, SCI_MARGINSETSTYLEOFFSET, SLT_INT, SLT_VOID}, {"MARGINGETSTYLEOFFSET", SLT_INT, SCI_MARGINGETSTYLEOFFSET, SLT_VOID, SLT_VOID}, - {"SETMARGINOPTIONS", SLT_VOID, SCI_SETMARGINOPTIONS, SLT_INT, SLT_VOID}, - {"GETMARGINOPTIONS", SLT_INT, SCI_GETMARGINOPTIONS, SLT_VOID, SLT_VOID}, - {"ANNOTATIONSETTEXT", SLT_VOID, SCI_ANNOTATIONSETTEXT, SLT_INT, SLT_STRING}, - {"ANNOTATIONGETTEXT", SLT_INT, SCI_ANNOTATIONGETTEXT, SLT_INT, SLT_STRINGRESULT}, - {"ANNOTATIONSETSTYLE", SLT_VOID, SCI_ANNOTATIONSETSTYLE, SLT_INT, SLT_INT}, - {"ANNOTATIONGETSTYLE", SLT_INT, SCI_ANNOTATIONGETSTYLE, SLT_INT, SLT_VOID}, - {"ANNOTATIONSETSTYLES", SLT_VOID, SCI_ANNOTATIONSETSTYLES, SLT_INT, SLT_STRING}, - {"ANNOTATIONGETSTYLES", SLT_INT, SCI_ANNOTATIONGETSTYLES, SLT_INT, SLT_STRINGRESULT}, - {"ANNOTATIONGETLINES", SLT_INT, SCI_ANNOTATIONGETLINES, SLT_INT, SLT_VOID}, + {"SETMARGINOPTIONS", SLT_VOID, SCI_SETMARGINOPTIONS, SLT_MARGINOPTION, SLT_VOID}, + {"GETMARGINOPTIONS", SLT_MARGINOPTION, SCI_GETMARGINOPTIONS, SLT_VOID, SLT_VOID}, + {"ANNOTATIONSETTEXT", SLT_VOID, SCI_ANNOTATIONSETTEXT, SLT_LINE, SLT_STRING}, + {"ANNOTATIONGETTEXT", SLT_INT, SCI_ANNOTATIONGETTEXT, SLT_LINE, SLT_STRINGRESULT}, + {"ANNOTATIONSETSTYLE", SLT_VOID, SCI_ANNOTATIONSETSTYLE, SLT_LINE, SLT_INT}, + {"ANNOTATIONGETSTYLE", SLT_INT, SCI_ANNOTATIONGETSTYLE, SLT_LINE, SLT_VOID}, + {"ANNOTATIONSETSTYLES", SLT_VOID, SCI_ANNOTATIONSETSTYLES, SLT_LINE, SLT_STRING}, + {"ANNOTATIONGETSTYLES", SLT_INT, SCI_ANNOTATIONGETSTYLES, SLT_LINE, SLT_STRINGRESULT}, + {"ANNOTATIONGETLINES", SLT_INT, SCI_ANNOTATIONGETLINES, SLT_LINE, SLT_VOID}, {"ANNOTATIONCLEARALL", SLT_VOID, SCI_ANNOTATIONCLEARALL, SLT_VOID, SLT_VOID}, - {"ANNOTATIONSETVISIBLE", SLT_VOID, SCI_ANNOTATIONSETVISIBLE, SLT_INT, SLT_VOID}, - {"ANNOTATIONGETVISIBLE", SLT_INT, SCI_ANNOTATIONGETVISIBLE, SLT_VOID, SLT_VOID}, + {"ANNOTATIONSETVISIBLE", SLT_VOID, SCI_ANNOTATIONSETVISIBLE, SLT_ANNOTATIONVISIBLE, SLT_VOID}, + {"ANNOTATIONGETVISIBLE", SLT_ANNOTATIONVISIBLE, SCI_ANNOTATIONGETVISIBLE, SLT_VOID, SLT_VOID}, {"ANNOTATIONSETSTYLEOFFSET", SLT_VOID, SCI_ANNOTATIONSETSTYLEOFFSET, SLT_INT, SLT_VOID}, {"ANNOTATIONGETSTYLEOFFSET", SLT_INT, SCI_ANNOTATIONGETSTYLEOFFSET, SLT_VOID, SLT_VOID}, {"RELEASEALLEXTENDEDSTYLES", SLT_VOID, SCI_RELEASEALLEXTENDEDSTYLES, SLT_VOID, SLT_VOID}, {"ALLOCATEEXTENDEDSTYLES", SLT_INT, SCI_ALLOCATEEXTENDEDSTYLES, SLT_INT, SLT_VOID}, - {"ADDUNDOACTION", SLT_VOID, SCI_ADDUNDOACTION, SLT_INT, SLT_INT}, + {"ADDUNDOACTION", SLT_VOID, SCI_ADDUNDOACTION, SLT_INT, SLT_UNDOFLAGS}, {"CHARPOSITIONFROMPOINT", SLT_INT, SCI_CHARPOSITIONFROMPOINT, SLT_INT, SLT_INT}, {"CHARPOSITIONFROMPOINTCLOSE", SLT_INT, SCI_CHARPOSITIONFROMPOINTCLOSE, SLT_INT, SLT_INT}, {"SETMOUSESELECTIONRECTANGULARSWITCH", SLT_VOID, SCI_SETMOUSESELECTIONRECTANGULARSWITCH, SLT_BOOL, SLT_VOID}, @@ -652,7 +756,9 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETSELECTIONNANCHORVIRTUALSPACE", SLT_INT, SCI_GETSELECTIONNANCHORVIRTUALSPACE, SLT_INT, SLT_VOID}, {"SETSELECTIONNSTART", SLT_VOID, SCI_SETSELECTIONNSTART, SLT_INT, SLT_INT}, {"GETSELECTIONNSTART", SLT_INT, SCI_GETSELECTIONNSTART, SLT_INT, SLT_VOID}, + {"GETSELECTIONNSTARTVIRTUALSPACE", SLT_INT, SCI_GETSELECTIONNSTARTVIRTUALSPACE, SLT_INT, SLT_VOID}, {"SETSELECTIONNEND", SLT_VOID, SCI_SETSELECTIONNEND, SLT_INT, SLT_INT}, + {"GETSELECTIONNENDVIRTUALSPACE", SLT_INT, SCI_GETSELECTIONNENDVIRTUALSPACE, SLT_INT, SLT_VOID}, {"GETSELECTIONNEND", SLT_INT, SCI_GETSELECTIONNEND, SLT_INT, SLT_VOID}, {"SETRECTANGULARSELECTIONCARET", SLT_VOID, SCI_SETRECTANGULARSELECTIONCARET, SLT_INT, SLT_VOID}, {"GETRECTANGULARSELECTIONCARET", SLT_INT, SCI_GETRECTANGULARSELECTIONCARET, SLT_VOID, SLT_VOID}, @@ -662,22 +768,22 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETRECTANGULARSELECTIONCARETVIRTUALSPACE", SLT_INT, SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE, SLT_VOID, SLT_VOID}, {"SETRECTANGULARSELECTIONANCHORVIRTUALSPACE", SLT_VOID, SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE, SLT_INT, SLT_VOID}, {"GETRECTANGULARSELECTIONANCHORVIRTUALSPACE", SLT_INT, SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE, SLT_VOID, SLT_VOID}, - {"SETVIRTUALSPACEOPTIONS", SLT_VOID, SCI_SETVIRTUALSPACEOPTIONS, SLT_INT, SLT_VOID}, - {"GETVIRTUALSPACEOPTIONS", SLT_INT, SCI_GETVIRTUALSPACEOPTIONS, SLT_VOID, SLT_VOID}, + {"SETVIRTUALSPACEOPTIONS", SLT_VOID, SCI_SETVIRTUALSPACEOPTIONS, SLT_VIRTUALSPACE, SLT_VOID}, + {"GETVIRTUALSPACEOPTIONS", SLT_VIRTUALSPACE, SCI_GETVIRTUALSPACEOPTIONS, SLT_VOID, SLT_VOID}, {"SETRECTANGULARSELECTIONMODIFIER", SLT_VOID, SCI_SETRECTANGULARSELECTIONMODIFIER, SLT_INT, SLT_VOID}, {"GETRECTANGULARSELECTIONMODIFIER", SLT_INT, SCI_GETRECTANGULARSELECTIONMODIFIER, SLT_VOID, SLT_VOID}, {"SETADDITIONALSELFORE", SLT_VOID, SCI_SETADDITIONALSELFORE, SLT_INT, SLT_VOID}, {"SETADDITIONALSELBACK", SLT_VOID, SCI_SETADDITIONALSELBACK, SLT_INT, SLT_VOID}, - {"SETADDITIONALSELALPHA", SLT_VOID, SCI_SETADDITIONALSELALPHA, SLT_INT, SLT_VOID}, - {"GETADDITIONALSELALPHA", SLT_INT, SCI_GETADDITIONALSELALPHA, SLT_VOID, SLT_VOID}, + {"SETADDITIONALSELALPHA", SLT_VOID, SCI_SETADDITIONALSELALPHA, SLT_ALPHA, SLT_VOID}, + {"GETADDITIONALSELALPHA", SLT_ALPHA, SCI_GETADDITIONALSELALPHA, SLT_VOID, SLT_VOID}, {"SETADDITIONALCARETFORE", SLT_VOID, SCI_SETADDITIONALCARETFORE, SLT_INT, SLT_VOID}, {"GETADDITIONALCARETFORE", SLT_INT, SCI_GETADDITIONALCARETFORE, SLT_VOID, SLT_VOID}, {"ROTATESELECTION", SLT_VOID, SCI_ROTATESELECTION, SLT_VOID, SLT_VOID}, {"SWAPMAINANCHORCARET", SLT_VOID, SCI_SWAPMAINANCHORCARET, SLT_VOID, SLT_VOID}, {"MULTIPLESELECTADDNEXT", SLT_VOID, SCI_MULTIPLESELECTADDNEXT, SLT_VOID, SLT_VOID}, {"MULTIPLESELECTADDEACH", SLT_VOID, SCI_MULTIPLESELECTADDEACH, SLT_VOID, SLT_VOID}, {"CHANGELEXERSTATE", SLT_INT, SCI_CHANGELEXERSTATE, SLT_INT, SLT_INT}, - {"CONTRACTEDFOLDNEXT", SLT_INT, SCI_CONTRACTEDFOLDNEXT, SLT_INT, SLT_VOID}, + {"CONTRACTEDFOLDNEXT", SLT_LINE, SCI_CONTRACTEDFOLDNEXT, SLT_LINE, SLT_VOID}, {"VERTICALCENTRECARET", SLT_VOID, SCI_VERTICALCENTRECARET, SLT_VOID, SLT_VOID}, {"MOVESELECTEDLINESUP", SLT_VOID, SCI_MOVESELECTEDLINESUP, SLT_VOID, SLT_VOID}, {"MOVESELECTEDLINESDOWN", SLT_VOID, SCI_MOVESELECTEDLINESDOWN, SLT_VOID, SLT_VOID}, @@ -690,41 +796,58 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"REGISTERRGBAIMAGE", SLT_VOID, SCI_REGISTERRGBAIMAGE, SLT_INT, SLT_STRING}, {"SCROLLTOSTART", SLT_VOID, SCI_SCROLLTOSTART, SLT_VOID, SLT_VOID}, {"SCROLLTOEND", SLT_VOID, SCI_SCROLLTOEND, SLT_VOID, SLT_VOID}, - {"SETTECHNOLOGY", SLT_VOID, SCI_SETTECHNOLOGY, SLT_INT, SLT_VOID}, - {"GETTECHNOLOGY", SLT_INT, SCI_GETTECHNOLOGY, SLT_VOID, SLT_VOID}, - {"CREATELOADER", SLT_INT, SCI_CREATELOADER, SLT_INT, SLT_INT}, + {"SETTECHNOLOGY", SLT_VOID, SCI_SETTECHNOLOGY, SLT_TECHNOLOGY, SLT_VOID}, + {"GETTECHNOLOGY", SLT_TECHNOLOGY, SCI_GETTECHNOLOGY, SLT_VOID, SLT_VOID}, + {"CREATELOADER", SLT_POINTER, SCI_CREATELOADER, SLT_INT, SLT_DOCUMENTOPTION}, {"FINDINDICATORSHOW", SLT_VOID, SCI_FINDINDICATORSHOW, SLT_INT, SLT_INT}, {"FINDINDICATORFLASH", SLT_VOID, SCI_FINDINDICATORFLASH, SLT_INT, SLT_INT}, {"FINDINDICATORHIDE", SLT_VOID, SCI_FINDINDICATORHIDE, SLT_VOID, SLT_VOID}, {"VCHOMEDISPLAY", SLT_VOID, SCI_VCHOMEDISPLAY, SLT_VOID, SLT_VOID}, {"VCHOMEDISPLAYEXTEND", SLT_VOID, SCI_VCHOMEDISPLAYEXTEND, SLT_VOID, SLT_VOID}, {"GETCARETLINEVISIBLEALWAYS", SLT_BOOL, SCI_GETCARETLINEVISIBLEALWAYS, SLT_VOID, SLT_VOID}, {"SETCARETLINEVISIBLEALWAYS", SLT_VOID, SCI_SETCARETLINEVISIBLEALWAYS, SLT_BOOL, SLT_VOID}, - {"SETLINEENDTYPESALLOWED", SLT_VOID, SCI_SETLINEENDTYPESALLOWED, SLT_INT, SLT_VOID}, - {"GETLINEENDTYPESALLOWED", SLT_INT, SCI_GETLINEENDTYPESALLOWED, SLT_VOID, SLT_VOID}, - {"GETLINEENDTYPESACTIVE", SLT_INT, SCI_GETLINEENDTYPESACTIVE, SLT_VOID, SLT_VOID}, + {"SETLINEENDTYPESALLOWED", SLT_VOID, SCI_SETLINEENDTYPESALLOWED, SLT_LINEENDTYPE, SLT_VOID}, + {"GETLINEENDTYPESALLOWED", SLT_LINEENDTYPE, SCI_GETLINEENDTYPESALLOWED, SLT_VOID, SLT_VOID}, + {"GETLINEENDTYPESACTIVE", SLT_LINEENDTYPE, SCI_GETLINEENDTYPESACTIVE, SLT_VOID, SLT_VOID}, {"SETREPRESENTATION", SLT_VOID, SCI_SETREPRESENTATION, SLT_STRING, SLT_STRING}, {"GETREPRESENTATION", SLT_INT, SCI_GETREPRESENTATION, SLT_STRING, SLT_STRINGRESULT}, {"CLEARREPRESENTATION", SLT_VOID, SCI_CLEARREPRESENTATION, SLT_STRING, SLT_VOID}, + {"CLEARALLREPRESENTATIONS", SLT_VOID, SCI_CLEARALLREPRESENTATIONS, SLT_VOID, SLT_VOID}, + {"SETREPRESENTATIONAPPEARANCE", SLT_VOID, SCI_SETREPRESENTATIONAPPEARANCE, SLT_STRING, SLT_REPRESENTATIONAPPEARANCE}, + {"GETREPRESENTATIONAPPEARANCE", SLT_REPRESENTATIONAPPEARANCE, SCI_GETREPRESENTATIONAPPEARANCE, SLT_STRING, SLT_VOID}, + {"SETREPRESENTATIONCOLOUR", SLT_VOID, SCI_SETREPRESENTATIONCOLOUR, SLT_STRING, SLT_COLOURALPHA}, + {"GETREPRESENTATIONCOLOUR", SLT_COLOURALPHA, SCI_GETREPRESENTATIONCOLOUR, SLT_STRING, SLT_VOID}, + {"EOLANNOTATIONSETTEXT", SLT_VOID, SCI_EOLANNOTATIONSETTEXT, SLT_LINE, SLT_STRING}, + {"EOLANNOTATIONGETTEXT", SLT_INT, SCI_EOLANNOTATIONGETTEXT, SLT_LINE, SLT_STRINGRESULT}, + {"EOLANNOTATIONSETSTYLE", SLT_VOID, SCI_EOLANNOTATIONSETSTYLE, SLT_LINE, SLT_INT}, + {"EOLANNOTATIONGETSTYLE", SLT_INT, SCI_EOLANNOTATIONGETSTYLE, SLT_LINE, SLT_VOID}, + {"EOLANNOTATIONCLEARALL", SLT_VOID, SCI_EOLANNOTATIONCLEARALL, SLT_VOID, SLT_VOID}, + {"EOLANNOTATIONSETVISIBLE", SLT_VOID, SCI_EOLANNOTATIONSETVISIBLE, SLT_EOLANNOTATIONVISIBLE, SLT_VOID}, + {"EOLANNOTATIONGETVISIBLE", SLT_EOLANNOTATIONVISIBLE, SCI_EOLANNOTATIONGETVISIBLE, SLT_VOID, SLT_VOID}, + {"EOLANNOTATIONSETSTYLEOFFSET", SLT_VOID, SCI_EOLANNOTATIONSETSTYLEOFFSET, SLT_INT, SLT_VOID}, + {"EOLANNOTATIONGETSTYLEOFFSET", SLT_INT, SCI_EOLANNOTATIONGETSTYLEOFFSET, SLT_VOID, SLT_VOID}, + {"SUPPORTSFEATURE", SLT_BOOL, SCI_SUPPORTSFEATURE, SLT_SUPPORTS, SLT_VOID}, + {"GETLINECHARACTERINDEX", SLT_LINECHARACTERINDEXTYPE, SCI_GETLINECHARACTERINDEX, SLT_VOID, SLT_VOID}, + {"ALLOCATELINECHARACTERINDEX", SLT_VOID, SCI_ALLOCATELINECHARACTERINDEX, SLT_LINECHARACTERINDEXTYPE, SLT_VOID}, + {"RELEASELINECHARACTERINDEX", SLT_VOID, SCI_RELEASELINECHARACTERINDEX, SLT_LINECHARACTERINDEXTYPE, SLT_VOID}, + {"LINEFROMINDEXPOSITION", SLT_LINE, SCI_LINEFROMINDEXPOSITION, SLT_INT, SLT_LINECHARACTERINDEXTYPE}, + {"INDEXPOSITIONFROMLINE", SLT_INT, SCI_INDEXPOSITIONFROMLINE, SLT_LINE, SLT_LINECHARACTERINDEXTYPE}, {"STARTRECORD", SLT_VOID, SCI_STARTRECORD, SLT_VOID, SLT_VOID}, {"STOPRECORD", SLT_VOID, SCI_STOPRECORD, SLT_VOID, SLT_VOID}, - {"SETLEXER", SLT_VOID, SCI_SETLEXER, SLT_INT, SLT_VOID}, {"GETLEXER", SLT_INT, SCI_GETLEXER, SLT_VOID, SLT_VOID}, {"COLOURISE", SLT_VOID, SCI_COLOURISE, SLT_INT, SLT_INT}, {"SETPROPERTY", SLT_VOID, SCI_SETPROPERTY, SLT_STRING, SLT_STRING}, {"SETKEYWORDS", SLT_VOID, SCI_SETKEYWORDS, SLT_INT, SLT_STRING}, - {"SETLEXERLANGUAGE", SLT_VOID, SCI_SETLEXERLANGUAGE, SLT_VOID, SLT_STRING}, - {"LOADLEXERLIBRARY", SLT_VOID, SCI_LOADLEXERLIBRARY, SLT_VOID, SLT_STRING}, {"GETPROPERTY", SLT_INT, SCI_GETPROPERTY, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYEXPANDED", SLT_INT, SCI_GETPROPERTYEXPANDED, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_INT}, {"GETLEXERLANGUAGE", SLT_INT, SCI_GETLEXERLANGUAGE, SLT_VOID, SLT_STRINGRESULT}, - {"PRIVATELEXERCALL", SLT_INT, SCI_PRIVATELEXERCALL, SLT_INT, SLT_INT}, + {"PRIVATELEXERCALL", SLT_POINTER, SCI_PRIVATELEXERCALL, SLT_INT, SLT_POINTER}, {"PROPERTYNAMES", SLT_INT, SCI_PROPERTYNAMES, SLT_VOID, SLT_STRINGRESULT}, - {"PROPERTYTYPE", SLT_INT, SCI_PROPERTYTYPE, SLT_STRING, SLT_VOID}, + {"PROPERTYTYPE", SLT_TYPEPROPERTY, SCI_PROPERTYTYPE, SLT_STRING, SLT_VOID}, {"DESCRIBEPROPERTY", SLT_INT, SCI_DESCRIBEPROPERTY, SLT_STRING, SLT_STRINGRESULT}, {"DESCRIBEKEYWORDSETS", SLT_INT, SCI_DESCRIBEKEYWORDSETS, SLT_VOID, SLT_STRINGRESULT}, - {"GETLINEENDTYPESSUPPORTED", SLT_INT, SCI_GETLINEENDTYPESSUPPORTED, SLT_VOID, SLT_VOID}, + {"GETLINEENDTYPESSUPPORTED", SLT_LINEENDTYPE, SCI_GETLINEENDTYPESSUPPORTED, SLT_VOID, SLT_VOID}, {"ALLOCATESUBSTYLES", SLT_INT, SCI_ALLOCATESUBSTYLES, SLT_INT, SLT_INT}, {"GETSUBSTYLESSTART", SLT_INT, SCI_GETSUBSTYLESSTART, SLT_INT, SLT_VOID}, {"GETSUBSTYLESLENGTH", SLT_INT, SCI_GETSUBSTYLESLENGTH, SLT_INT, SLT_VOID}, @@ -738,10 +861,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"NAMEOFSTYLE", SLT_INT, SCI_NAMEOFSTYLE, SLT_INT, SLT_STRINGRESULT}, {"TAGSOFSTYLE", SLT_INT, SCI_TAGSOFSTYLE, SLT_INT, SLT_STRINGRESULT}, {"DESCRIPTIONOFSTYLE", SLT_INT, SCI_DESCRIPTIONOFSTYLE, SLT_INT, SLT_STRINGRESULT}, - {"GETLINECHARACTERINDEX", SLT_INT, SCI_GETLINECHARACTERINDEX, SLT_VOID, SLT_VOID}, - {"ALLOCATELINECHARACTERINDEX", SLT_VOID, SCI_ALLOCATELINECHARACTERINDEX, SLT_INT, SLT_VOID}, - {"RELEASELINECHARACTERINDEX", SLT_VOID, SCI_RELEASELINECHARACTERINDEX, SLT_INT, SLT_VOID}, - {"LINEFROMINDEXPOSITION", SLT_INT, SCI_LINEFROMINDEXPOSITION, SLT_INT, SLT_INT}, - {"INDEXPOSITIONFROMLINE", SLT_INT, SCI_INDEXPOSITIONFROMLINE, SLT_INT, SLT_INT}, + {"SETILEXER", SLT_VOID, SCI_SETILEXER, SLT_VOID, SLT_POINTER}, + {"GETBIDIRECTIONAL", SLT_BIDIRECTIONAL, SCI_GETBIDIRECTIONAL, SLT_VOID, SLT_VOID}, + {"SETBIDIRECTIONAL", SLT_VOID, SCI_SETBIDIRECTIONAL, SLT_BIDIRECTIONAL, SLT_VOID}, {NULL, SLT_LAST, 0, SLT_LAST, SLT_LAST} };
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).