1 files changed, 56 insertions, 31 deletions
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index dce7cb4c6..536ebbd6a 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -52,8 +52,10 @@
 cat Basics 
 
 ################################################
-## From Scintilla.h
+## For Scintilla.h
 val INVALID_POSITION=-1
+# Define start of Scintilla messages to be greater than all edit (EM_*) messages
+# as many EM_ messages can be used although that use is deprecated.
 val SCI_START=2000
 val SCI_OPTIONAL_START=3000
 val SCI_LEXER_START=4000
@@ -186,6 +188,7 @@ set void SetTabWidth=2036(int tabWidth,)
 get int GetTabWidth=2121(,)
 
 # The SC_CP_UTF8 value can be used to enter Unicode mode.
+# This is the same value as CP_UTF8 in Windows
 val SC_CP_UTF8=65001
 
 # Set the code page used to interpret the bytes of the document as characters.
@@ -269,6 +272,7 @@ val STYLE_LINENUMBER=33
 val STYLE_BRACELIGHT=34
 val STYLE_BRACEBAD=35
 val STYLE_CONTROLCHAR=36
+val STYLE_INDENTGUIDE=37
 val STYLE_MAX=127
 
 # Character set identifiers are used in StyleSetCharacterSet.
@@ -347,6 +351,9 @@ fun void ClearAllCmdKeys=2072(,)
 # Set the styles for a segment of the document.
 fun void SetStylingEx=2073(int length, string styles)
 
+# Set a style to be visible or not.
+set void StyleSetVisible=2074(int style, bool visible)
+
 # Get the time in milliseconds that the caret is on and off. 
 get int GetCaretPeriod=2075(,)
 
@@ -740,6 +747,7 @@ fun void EnsureVisible=2232(int line,)
 # Set some debugging options for folding
 fun void SetFoldFlags=2233(int flags,)
 
+## Start of key messages
 # Move caret down one line.
 fun void LineDown=2300(,)
 
@@ -935,8 +943,12 @@ fun int SearchNext=2367(int flags, string text)
 # Find some text starting at the search anchor and moving backwards.
 fun int SearchPrev=2368(int flags, string text)
 
+# Show caret within N lines of edge when it's scrolled to view
 val CARET_SLOP=0x01
+# Center caret on screen when it's scrolled to view
 val CARET_CENTER=0x02
+# OR this with CARET_CENTER to reposition even when visible, or
+# OR this with CARET_SLOP to reposition whenever outside slop border
 val CARET_STRICT=0x04
 # Set the way the line the caret is on is kept visible.
 fun void SetCaretPolicy=2369(int caretPolicy, int caretSlop)
@@ -969,6 +981,7 @@ fun void ReleaseDocument=2377(, int doc)
 get int GetModEventMask=2378(,)
 
 # Set the focus to this Scintilla widget.
+# GTK+ Specific
 fun void GrabFocus=2400(,)
 
 # Start notifying the container of all key presses and commands.
@@ -992,6 +1005,10 @@ set void SetProperty=4004(string key, string value)
 # Set up the key words used by the lexer.
 set void SetKeyWords=4005(int keywordSet, string keyWords)
 
+# Notifications
+# Type of modification and the action which caused the modification
+# These are defined as a bit mask to make it easy to specify which notifications are wanted.
+# One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
 val SC_MOD_INSERTTEXT=0x1
 val SC_MOD_DELETETEXT=0x2
 val SC_MOD_CHANGESTYLE=0x4
@@ -1004,20 +1021,6 @@ val SC_MOD_CHANGEMARKER=0x200
 val SC_MOD_BEFOREINSERT=0x400
 val SC_MOD_BEFOREDELETE=0x800
 val SC_MODEVENTMASKALL=0xF77
-val SCN_STYLENEEDED=2000
-val SCN_CHARADDED=2001
-val SCN_SAVEPOINTREACHED=2002
-val SCN_SAVEPOINTLEFT=2003
-val SCN_MODIFYATTEMPTRO=2004
-val SCN_KEY=2005
-val SCN_DOUBLECLICK=2006
-val SCN_UPDATEUI=2007
-val SCN_CHECKBRACE=2007
-val SCN_MODIFIED=2008
-val SCN_MACRORECORD=2009
-val SCN_MARGINCLICK=2010
-val SCN_NEEDSHOWN=2011
-val SCN_POSCHANGED=2012
 
 # For compatibility, these go through the COMMAND notification rather than NOTIFY
 # and have exactly the same values as the EN_* constants.
@@ -1052,7 +1055,7 @@ val SCMOD_CTRL=2
 val SCMOD_ALT=4
 
 ################################################
-# From SciLexer.h
+# For SciLexer.h
 val SCLEX_CONTAINER=0
 val SCLEX_NULL=1
 val SCLEX_PYTHON=2
@@ -1070,6 +1073,7 @@ val SCLEX_XCODE=13
 val SCLEX_LATEX=14
 val SCLEX_LUA=15
 val SCLEX_DIFF=16
+# Lexical states for SCLEX_PYTHON
 val SCE_P_DEFAULT=0
 val SCE_P_COMMENTLINE=1
 val SCE_P_NUMBER=2
@@ -1084,6 +1088,7 @@ val SCE_P_OPERATOR=10
 val SCE_P_IDENTIFIER=11
 val SCE_P_COMMENTBLOCK=12
 val SCE_P_STRINGEOL=13
+# Lexical states for SCLEX_CPP, SCLEX_VB
 val SCE_C_DEFAULT=0
 val SCE_C_COMMENT=1
 val SCE_C_COMMENTLINE=2
@@ -1098,6 +1103,7 @@ val SCE_C_OPERATOR=10
 val SCE_C_IDENTIFIER=11
 val SCE_C_STRINGEOL=12
 val SCE_C_VERBATIM=13
+# Lexical states for SCLEX_HTML, SCLEX_XML
 val SCE_H_DEFAULT=0
 val SCE_H_TAG=1
 val SCE_H_TAGUNKNOWN=2
@@ -1109,6 +1115,7 @@ val SCE_H_SINGLESTRING=7
 val SCE_H_OTHER=8
 val SCE_H_COMMENT=9
 val SCE_H_ENTITY=10
+# XML and ASP
 val SCE_H_TAGEND=11
 val SCE_H_XMLSTART=12
 val SCE_H_XMLEND=13
@@ -1117,7 +1124,9 @@ val SCE_H_ASP=15
 val SCE_H_ASPAT=16
 val SCE_H_CDATA=17
 val SCE_H_QUESTION=18
+# More HTML
 val SCE_H_VALUE=19
+# Embedded Javascript
 val SCE_HJ_START=40
 val SCE_HJ_DEFAULT=41
 val SCE_HJ_COMMENT=42
@@ -1130,6 +1139,7 @@ val SCE_HJ_DOUBLESTRING=48
 val SCE_HJ_SINGLESTRING=49
 val SCE_HJ_SYMBOLS=50
 val SCE_HJ_STRINGEOL=51
+# ASP Javascript
 val SCE_HJA_START=55
 val SCE_HJA_DEFAULT=56
 val SCE_HJA_COMMENT=57
@@ -1142,6 +1152,7 @@ val SCE_HJA_DOUBLESTRING=63
 val SCE_HJA_SINGLESTRING=64
 val SCE_HJA_SYMBOLS=65
 val SCE_HJA_STRINGEOL=66
+# Embedded VBScript
 val SCE_HB_START=70
 val SCE_HB_DEFAULT=71
 val SCE_HB_COMMENTLINE=72
@@ -1150,6 +1161,7 @@ val SCE_HB_WORD=74
 val SCE_HB_STRING=75
 val SCE_HB_IDENTIFIER=76
 val SCE_HB_STRINGEOL=77
+# ASP VBScript
 val SCE_HBA_START=80
 val SCE_HBA_DEFAULT=81
 val SCE_HBA_COMMENTLINE=82
@@ -1158,6 +1170,7 @@ val SCE_HBA_WORD=84
 val SCE_HBA_STRING=85
 val SCE_HBA_IDENTIFIER=86
 val SCE_HBA_STRINGEOL=87
+# Embedded Python
 val SCE_HP_START=90
 val SCE_HP_DEFAULT=91
 val SCE_HP_COMMENTLINE=92
@@ -1171,6 +1184,7 @@ val SCE_HP_CLASSNAME=99
 val SCE_HP_DEFNAME=100
 val SCE_HP_OPERATOR=101
 val SCE_HP_IDENTIFIER=102
+# ASP Python
 val SCE_HPA_START=105
 val SCE_HPA_DEFAULT=106
 val SCE_HPA_COMMENTLINE=107
@@ -1184,6 +1198,7 @@ val SCE_HPA_CLASSNAME=114
 val SCE_HPA_DEFNAME=115
 val SCE_HPA_OPERATOR=116
 val SCE_HPA_IDENTIFIER=117
+# PHP
 val SCE_HPHP_DEFAULT=118
 val SCE_HPHP_HSTRING=119
 val SCE_HPHP_SIMPLESTRING=120
@@ -1193,6 +1208,7 @@ val SCE_HPHP_VARIABLE=123
 val SCE_HPHP_COMMENT=124
 val SCE_HPHP_COMMENTLINE=125
 val SCE_HPHP_STRINGEOL=126
+# Lexical states for SCLEX_PERL
 val SCE_PL_DEFAULT=0
 val SCE_PL_HERE=1
 val SCE_PL_COMMENTLINE=2
@@ -1215,11 +1231,13 @@ val SCE_PL_REGSUBST=18
 val SCE_PL_LONGQUOTE=19
 val SCE_PL_BACKTICKS=20
 val SCE_PL_DATASECTION=21
+# Lexical states for SCLEX_LATEX
 val SCE_L_DEFAULT=0
 val SCE_L_COMMAND=1
 val SCE_L_TAG=2
 val SCE_L_MATH=3
 val SCE_L_COMMENT=4
+# Lexical states for SCLEX_LUA
 val SCE_LUA_DEFAULT=0
 val SCE_LUA_COMMENT=1
 val SCE_LUA_COMMENTLINE=2
@@ -1241,6 +1259,28 @@ val SCE_ERR_CMD=4
 val SCE_ERR_BORLAND=5
 val SCE_ERR_PERL=6
 
+# Events
+
+evt void StyleNeeded=2000(int position)
+evt void CharAdded=2001(int ch)
+evt void SavePointReached=2002(void)
+evt void SavePointLeft=2003(void)
+evt void ModifyAttemptRO=2004(void)
+# GTK+ Specific to work around focus and accelerator problems:
+evt void Key=2005(int ch, int modifiers)
+evt void DoubleClick=2006(void)
+evt void UpdateUI=2007(void)
+# The old name for SCN_UPDATEUI
+val SCN_CHECKBRACE=2007
+evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
+# Optional module for macro recording
+evt void MacroRecord=2009(int message, int wParam, int lParam)
+evt void MarginClick=2010(int modifiers, int position, int margin)
+evt void NeedShown=2011(int position, int length)
+evt void PosChanged=2012(int position)
+
+cat Deprecated 
+
 ################################################
 # From WinDefs.h
 
@@ -1405,19 +1445,4 @@ val LEFT_CTRL_PRESSED=2
 val LEFT_ALT_PRESSED=4
 
 #events
-
-evt void StyleNeeded=2000(int position)
-evt void CharAdded=2001(int ch)
-evt void SavePointReached=2002(void)
-evt void SavePointLeft=2003(void)
-evt void ModifyAttemptRO=2004(void)
-evt void Key=2005(int ch, int modifiers)
-evt void DoubleClick=2006(void)
-evt void UpdateUI=2007(void)
-evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
-evt void MacroRecord=2009(int message, int wParam, int lParam)
-evt void MarginClick=2010(int modifiers, int position, int margin)
-evt void NeedShown=2011(int position, int length)
-evt void PosChanged=2012(int position)
 evt void EN_Change=768(void)
-