Updated to use Scintillua 2.03.

4 files changed, 101 insertions, 15 deletions

diff --git a/core/iface.lua b/core/iface.lua
index 45e042be..046ceb14 100644
--- a/core/iface.lua
+++ b/core/iface.lua
@@ -67,6 +67,11 @@ local constants = {
   SCI_CALLTIPSETFORE = 2206,
   SCI_CALLTIPSETFOREHLT = 2207,
   SCI_CALLTIPUSESTYLE = 2212,
+  SCI_GETADDITIONALCARETFORE = 2605,
+  SCI_GETADDITIONALCARETSBLINK = 2568,
+  SCI_GETADDITIONALCARETSVISIBLE = 2609,
+  SCI_GETADDITIONALSELALPHA = 2603,
+  SCI_GETADDITIONALSELECTIONTYPING = 2566,
   SCI_GETANCHOR = 2009,
   SCI_GETBACKSPACEUNINDENTS = 2263,
   SCI_GETBUFFEREDDRAW = 2034,
@@ -101,6 +106,7 @@ local constants = {
   SCI_GETFOLDEXPANDED = 2230,
   SCI_GETFOLDLEVEL = 2223,
   SCI_GETFOLDPARENT = 2225,
+  SCI_GETFONTQUALITY = 2612,
   SCI_GETHIGHLIGHTGUIDE = 2135,
   SCI_GETHOTSPOTACTIVEUNDERLINE = 2496,
   SCI_GETHOTSPOTSINGLELINE = 2497,
@@ -119,6 +125,7 @@ local constants = {
   SCI_GETLINEINDENTPOSITION = 2128,
   SCI_GETLINESTATE = 2093,
   SCI_GETLINEVISIBLE = 2228,
+  SCI_GETMAINSELECTION = 2575,
   SCI_GETMARGINLEFT = 2156,
   SCI_GETMARGINMASKN = 2245,
   SCI_GETMARGINRIGHT = 2158,
@@ -130,6 +137,7 @@ local constants = {
   SCI_GETMODIFY = 2159,
   SCI_GETMOUSEDOWNCAPTURES = 2385,
   SCI_GETMOUSEDWELLTIME = 2265,
+  SCI_GETMULTIPLESELECTION = 2564,
   SCI_GETOVERTYPE = 2187,
   SCI_GETPASTECONVERTENDINGS = 2468,
   SCI_GETPOSITIONCACHE = 2515,
@@ -138,12 +146,24 @@ local constants = {
   SCI_GETPRINTWRAPMODE = 2407,
   SCI_GETPROPERTYINT = 4010,
   SCI_GETREADONLY = 2140,
+  SCI_GETRECTANGULARSELECTIONANCHOR = 2591,
+  SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE = 2595,
+  SCI_GETRECTANGULARSELECTIONCARET = 2589,
+  SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE = 2593,
+  SCI_GETRECTANGULARSELECTIONMODIFIER = 2599,
   SCI_GETSCROLLWIDTH = 2275,
   SCI_GETSCROLLWIDTHTRACKING = 2517,
   SCI_GETSEARCHFLAGS = 2199,
   SCI_GETSELALPHA = 2477,
   SCI_GETSELECTIONEND = 2145,
   SCI_GETSELECTIONMODE = 2423,
+  SCI_GETSELECTIONNANCHOR = 2579,
+  SCI_GETSELECTIONNANCHORVIRTUALSPACE = 2583,
+  SCI_GETSELECTIONNCARET = 2577,
+  SCI_GETSELECTIONNCARETVIRTUALSPACE = 2581,
+  SCI_GETSELECTIONNEND = 2587,
+  SCI_GETSELECTIONNSTART = 2585,
+  SCI_GETSELECTIONS = 2570,
   SCI_GETSELECTIONSTART = 2143,
   SCI_GETSELEOLFILLED = 2479,
   SCI_GETSTATUS = 2383,
@@ -161,7 +181,9 @@ local constants = {
   SCI_GETUSETABS = 2125,
   SCI_GETVIEWEOL = 2355,
   SCI_GETVIEWWS = 2020,
+  SCI_GETVIRTUALSPACEOPTIONS = 2597,
   SCI_GETVSCROLLBAR = 2281,
+  SCI_GETWHITESPACESIZE = 2087,
   SCI_GETWRAPINDENTMODE = 2473,
   SCI_GETWRAPMODE = 2269,
   SCI_GETWRAPSTARTINDENT = 2465,
@@ -185,6 +207,13 @@ local constants = {
   SCI_MARGINSETSTYLEOFFSET = 2537,
   SCI_OPTIONAL_START = 3000,
   SCI_SELECTIONISRECTANGLE = 2372,
+  SCI_SETADDITIONALCARETFORE = 2604,
+  SCI_SETADDITIONALCARETSBLINK = 2567,
+  SCI_SETADDITIONALCARETSVISIBLE = 2608,
+  SCI_SETADDITIONALSELALPHA = 2602,
+  SCI_SETADDITIONALSELBACK = 2601,
+  SCI_SETADDITIONALSELECTIONTYPING = 2565,
+  SCI_SETADDITIONALSELFORE = 2600,
   SCI_SETANCHOR = 2026,
   SCI_SETBACKSPACEUNINDENTS = 2262,
   SCI_SETBUFFEREDDRAW = 2035,
@@ -208,9 +237,11 @@ local constants = {
   SCI_SETEOLMODE = 2031,
   SCI_SETEXTRAASCENT = 2525,
   SCI_SETEXTRADESCENT = 2527,
+  SCI_SETFIRSTVISIBLELINE = 2613,
   SCI_SETFOCUS = 2380,
   SCI_SETFOLDEXPANDED = 2229,
   SCI_SETFOLDLEVEL = 2222,
+  SCI_SETFONTQUALITY = 2611,
   SCI_SETHIGHLIGHTGUIDE = 2134,
   SCI_SETHOTSPOTACTIVEUNDERLINE = 2412,
   SCI_SETHOTSPOTSINGLELINE = 2421,
@@ -225,6 +256,7 @@ local constants = {
   SCI_SETLEXER = 4001,
   SCI_SETLINEINDENTATION = 2126,
   SCI_SETLINESTATE = 2092,
+  SCI_SETMAINSELECTION = 2574,
   SCI_SETMARGINLEFT = 2155,
   SCI_SETMARGINMASKN = 2244,
   SCI_SETMARGINRIGHT = 2157,
@@ -234,6 +266,7 @@ local constants = {
   SCI_SETMODEVENTMASK = 2359,
   SCI_SETMOUSEDOWNCAPTURES = 2384,
   SCI_SETMOUSEDWELLTIME = 2264,
+  SCI_SETMULTIPLESELECTION = 2563,
   SCI_SETOVERTYPE = 2186,
   SCI_SETPASTECONVERTENDINGS = 2467,
   SCI_SETPOSITIONCACHE = 2514,
@@ -242,12 +275,23 @@ local constants = {
   SCI_SETPRINTWRAPMODE = 2406,
   SCI_SETPROPERTY = 4004,
   SCI_SETREADONLY = 2171,
+  SCI_SETRECTANGULARSELECTIONANCHOR = 2590,
+  SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE = 2594,
+  SCI_SETRECTANGULARSELECTIONCARET = 2588,
+  SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE = 2592,
+  SCI_SETRECTANGULARSELECTIONMODIFIER = 2598,
   SCI_SETSCROLLWIDTH = 2274,
   SCI_SETSCROLLWIDTHTRACKING = 2516,
   SCI_SETSEARCHFLAGS = 2198,
   SCI_SETSELALPHA = 2478,
   SCI_SETSELECTIONEND = 2144,
   SCI_SETSELECTIONMODE = 2422,
+  SCI_SETSELECTIONNANCHOR = 2578,
+  SCI_SETSELECTIONNANCHORVIRTUALSPACE = 2582,
+  SCI_SETSELECTIONNCARET = 2576,
+  SCI_SETSELECTIONNCARETVIRTUALSPACE = 2580,
+  SCI_SETSELECTIONNEND = 2586,
+  SCI_SETSELECTIONNSTART = 2584,
   SCI_SETSELECTIONSTART = 2142,
   SCI_SETSELEOLFILLED = 2480,
   SCI_SETSTATUS = 2382,
@@ -262,8 +306,10 @@ local constants = {
   SCI_SETUSETABS = 2124,
   SCI_SETVIEWEOL = 2356,
   SCI_SETVIEWWS = 2021,
+  SCI_SETVIRTUALSPACEOPTIONS = 2596,
   SCI_SETVSCROLLBAR = 2280,
   SCI_SETWHITESPACECHARS = 2443,
+  SCI_SETWHITESPACESIZE = 2086,
   SCI_SETWORDCHARS = 2077,
   SCI_SETWRAPINDENTMODE = 2472,
   SCI_SETWRAPMODE = 2268,
@@ -326,6 +372,10 @@ local constants = {
   SCMOD_CTRL = 2,
   SCMOD_NORM = 0,
   SCMOD_SHIFT = 1,
+  SCMOD_SUPER = 8,
+  SCVS_NONE = 0,
+  SCVS_RECTANGULARSELECTION = 1,
+  SCVS_USERACCESSIBLE = 2,
   SCWS_INVISIBLE = 0,
   SCWS_VISIBLEAFTERINDENT = 2,
   SCWS_VISIBLEALWAYS = 1,
@@ -364,6 +414,11 @@ local constants = {
   SC_CP_UTF8 = 65001,
   SC_CURSORNORMAL = -1,
   SC_CURSORWAIT = 4,
+  SC_EFF_QUALITY_ANTIALIASED = 2,
+  SC_EFF_QUALITY_DEFAULT = 0,
+  SC_EFF_QUALITY_LCD_OPTIMIZED = 3,
+  SC_EFF_QUALITY_MASK = 0xF,
+  SC_EFF_QUALITY_NON_ANTIALIASED = 1,
   SC_EOL_CR = 1,
   SC_EOL_CRLF = 0,
   SC_EOL_LF = 2,
@@ -452,6 +507,7 @@ local constants = {
   SC_SEL_LINES = 2,
   SC_SEL_RECTANGLE = 1,
   SC_SEL_STREAM = 0,
+  SC_SEL_THIN = 3,
   SC_STARTACTION = 0x2000,
   SC_STATUS_BADALLOC = 2,
   SC_STATUS_FAILURE = 1,
@@ -510,6 +566,7 @@ rawset(textadept, 'constants', constants)
 
 local buffer_functions = {
   add_ref_document = {2376, 0, 0, 1},
+  add_selection = {2573, 1, 1, 1},
   add_styled_text = {2002, 0, 2, 9},
   add_text = {2001, 0, 2, 7},
   add_undo_action = {2560, 0, 1, 1},
@@ -525,6 +582,7 @@ local buffer_functions = {
   auto_c_cancel = {2101, 0, 0, 0},
   auto_c_complete = {2104, 0, 0, 0},
   auto_c_get_current = {2445, 1, 0, 0},
+  auto_c_get_current_text = {2610, 1, 0, 8},
   auto_c_pos_start = {2103, 3, 0, 0},
   auto_c_select = {2108, 0, 0, 7},
   auto_c_show = {2100, 0, 1, 7},
@@ -558,6 +616,7 @@ local buffer_functions = {
   clear_cmd_key = {2071, 0, 6, 0},
   clear_document_style = {2005, 0, 0, 0},
   clear_registered_images = {2408, 0, 0, 0},
+  clear_selections = {2571, 0, 0, 0},
   colourise = {4003, 0, 3, 3},
   convert_eo_ls = {2029, 0, 1, 0},
   copy = {2178, 0, 0, 0},
@@ -696,6 +755,7 @@ local buffer_functions = {
   replace_sel = {2170, 0, 0, 7},
   replace_target = {2194, 1, 2, 7},
   replace_target_re = {2195, 1, 2, 7},
+  rotate_selection = {2606, 0, 0, 0},
   scroll_caret = {2169, 0, 0, 0},
   search_anchor = {2366, 0, 0, 0},
   search_in_target = {2197, 1, 2, 7},
@@ -715,6 +775,7 @@ local buffer_functions = {
   set_sel = {2160, 0, 3, 3},
   set_sel_back = {2068, 0, 5, 4},
   set_sel_fore = {2067, 0, 5, 4},
+  set_selection = {2572, 1, 1, 1},
   set_styling = {2033, 0, 2, 1},
   set_styling_ex = {2073, 0, 2, 7},
   set_text = {2181, 0, 0, 7},
@@ -734,6 +795,7 @@ local buffer_functions = {
   style_clear_all = {2050, 0, 0, 0},
   style_get_font = {2486, 1, 1, 8},
   style_reset_default = {2058, 0, 0, 0},
+  swap_main_anchor_caret = {2607, 0, 0, 0},
   tab = {2327, 0, 0, 0},
   target_as_utf8 = {2447, 1, 0, 8},
   target_from_selection = {2287, 0, 0, 0},
@@ -772,6 +834,13 @@ local buffer_functions = {
 rawset(textadept, 'buffer_functions', buffer_functions)
 
 local buffer_properties = {
+  additional_caret_fore = {2605, 2604, 4, 0},
+  additional_carets_blink = {2568, 2567, 5, 0},
+  additional_carets_visible = {2609, 2608, 5, 0},
+  additional_sel_alpha = {2603, 2602, 1, 0},
+  additional_sel_back = {0, 2601, 4, 0},
+  additional_sel_fore = {0, 2600, 4, 0},
+  additional_selection_typing = {2566, 2565, 5, 0},
   anchor = {2009, 2026, 3, 0},
   annotation_lines = {2546, 0, 1, 1},
   annotation_style = {2543, 2542, 1, 1},
@@ -819,11 +888,12 @@ local buffer_properties = {
   end_styled = {2028, 0, 3, 0},
   extra_ascent = {2526, 2525, 1, 0},
   extra_descent = {2528, 2527, 1, 0},
-  first_visible_line = {2152, 0, 1, 0},
+  first_visible_line = {2152, 2613, 1, 0},
   focus = {2381, 2380, 5, 0},
   fold_expanded = {2230, 2229, 5, 1},
   fold_level = {2223, 2222, 1, 1},
   fold_parent = {2225, 0, 1, 1},
+  font_quality = {2612, 2611, 1, 0},
   h_scroll_bar = {2131, 2130, 5, 0},
   highlight_guide = {2135, 2134, 1, 0},
   hotspot_active_underline = {2496, 2412, 5, 0},
@@ -848,6 +918,7 @@ local buffer_properties = {
   line_state = {2093, 2092, 1, 1},
   line_visible = {2228, 0, 5, 1},
   lines_on_screen = {2370, 0, 1, 0},
+  main_selection = {2575, 2574, 1, 0},
   margin_left = {2156, 2155, 1, 0},
   margin_mask_n = {2245, 2244, 1, 1},
   margin_right = {2158, 2157, 1, 0},
@@ -861,6 +932,7 @@ local buffer_properties = {
   modify = {2159, 0, 5, 0},
   mouse_down_captures = {2385, 2384, 5, 0},
   mouse_dwell_time = {2265, 2264, 1, 0},
+  multiple_selection = {2564, 2563, 5, 0},
   overtype = {2187, 2186, 5, 0},
   paste_convert_endings = {2468, 2467, 5, 0},
   position_cache = {2515, 2514, 1, 0},
@@ -870,6 +942,11 @@ local buffer_properties = {
   property = {0, 4004, 7, 7},
   property_int = {4010, 0, 1, 7},
   read_only = {2140, 2171, 5, 0},
+  rectangular_selection_anchor = {2591, 2590, 3, 0},
+  rectangular_selection_anchor_virtual_space = {2595, 2594, 1, 0},
+  rectangular_selection_caret = {2589, 2588, 3, 0},
+  rectangular_selection_caret_virtual_space = {2593, 2592, 1, 0},
+  rectangular_selection_modifier = {2599, 2598, 1, 0},
   scroll_width = {2275, 2274, 1, 0},
   scroll_width_tracking = {2517, 2516, 5, 0},
   search_flags = {2199, 2198, 1, 0},
@@ -878,7 +955,14 @@ local buffer_properties = {
   selection_end = {2145, 2144, 3, 0},
   selection_is_rectangle = {2372, 0, 5, 0},
   selection_mode = {2423, 2422, 1, 0},
+  selection_n_anchor = {2579, 2578, 3, 1},
+  selection_n_anchor_virtual_space = {2583, 2582, 1, 1},
+  selection_n_caret = {2577, 2576, 3, 1},
+  selection_n_caret_virtual_space = {2581, 2580, 1, 1},
+  selection_n_end = {2587, 2586, 3, 1},
+  selection_n_start = {2585, 2584, 3, 1},
   selection_start = {2143, 2142, 3, 0},
+  selections = {2570, 0, 1, 0},
   status = {2383, 2382, 1, 0},
   style_at = {2010, 0, 1, 3},
   style_back = {2482, 2052, 4, 1},
@@ -908,7 +992,9 @@ local buffer_properties = {
   v_scroll_bar = {2281, 2280, 5, 0},
   view_eol = {2355, 2356, 5, 0},
   view_ws = {2020, 2021, 1, 0},
+  virtual_space_options = {2597, 2596, 1, 0},
   whitespace_chars = {0, 2443, 7, 0},
+  whitespace_size = {2087, 2086, 1, 0},
   word_chars = {0, 2077, 7, 0},
   wrap_indent_mode = {2473, 2472, 1, 0},
   wrap_mode = {2269, 2268, 1, 0},
diff --git a/scripts/gen_iface.lua b/scripts/gen_iface.lua
index f95eeebd..aa5f8c33 100755
--- a/scripts/gen_iface.lua
+++ b/scripts/gen_iface.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/lua
 -- Copyright 2007-2010 Mitchell mitchell<att>caladbolg.net. See LICENSE.
 
-local f = io.open('../../scite-tools/branches/scite-st/src/scite/src/IFaceTable.cxx')
+local f = io.open('../../scintillua/scite/src/IFaceTable.cxx')
 local contents = f:read('*all')
 f:close()
 
diff --git a/src/Makefile b/src/Makefile
index e382d9e3..977af65e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,7 @@ DEBUG_FLAG = -DNDEBUG
 else
 DEBUG_FLAG = -DDEBUG -g
 endif
-INCLUDEDIRS = -Iscintilla-st/include -Ilua/include -Igcocoadialog
+INCLUDEDIRS = -Iscintillua/include -Ilua/include -Igcocoadialog
 
 # Textadept
 
@@ -54,14 +54,15 @@ GCOCOADIALOG = gcocoadialog.o
 # Scintilla
 
 SCI_CXXFLAGS = $(DEBUG_FLAG) -pedantic -Os $(PLAT_FLAGS) -DSCI_LEXER \
-  $(SCI_THREAD_FLAG) $(INCLUDEDIRS) -Iscintilla-st/src -Iscintilla-st/gtk \
+  $(SCI_THREAD_FLAG) $(INCLUDEDIRS) -Iscintillua/src -Iscintillua/gtk \
   -Wall -Wno-missing-braces -Wno-char-subscripts
 
 SCINTILLA_OBJS = AutoComplete.o CallTip.o CellBuffer.o CharClassify.o \
   ContractionState.o Decoration.o Document.o DocumentAccessor.o Editor.o \
   ExternalLexer.o Indicator.o KeyMap.o KeyWords.o LexLPeg.o LineMarker.o \
   PerLine.o PositionCache.o PropSet.o RESearch.o RunStyles.o ScintillaBase.o \
-  Style.o StyleContext.o UniConversion.o ViewStyle.o WindowAccessor.o XPM.o \
+  Selection.o Style.o StyleContext.o UniConversion.o ViewStyle.o \
+  WindowAccessor.o XPM.o \
   PlatGTK.o ScintillaGTK.o
 SCINTILLA_MARSHALLER = scintilla-marshal.o
 
@@ -69,9 +70,9 @@ SCINTILLA_MARSHALLER = scintilla-marshal.o
 
 all: $(TEXTADEPT)
 
-$(SCINTILLA_OBJS): scintilla-st/gtk/*.cxx scintilla-st/src/*.cxx
+$(SCINTILLA_OBJS): scintillua/gtk/*.cxx scintillua/src/*.cxx
 	$(CPP) $(SCI_CXXFLAGS) $(GTKFLAGS) -c $^
-$(SCINTILLA_MARSHALLER): scintilla-st/gtk/scintilla-marshal.c
+$(SCINTILLA_MARSHALLER): scintillua/gtk/scintilla-marshal.c
 	$(CC) $(SCI_CXXFLAGS) $(GTKFLAGS) -w -c $^
 $(TEXTADEPT_OBJS): *.c
 	$(CC) $(CFLAGS) $(GTKFLAGS) -c $^
@@ -109,8 +110,7 @@ release: ../$(TEXTADEPT) ../$(TEXTADEPT32) ../$(TEXTADEPTWIN32)
 	rm $(RELEASEDIR32)/.hg*
 	sh -c 'cd ../scripts && ./update_doc'
 	cp -r ../doc $(RELEASEDIR32)
-	svn export http://scite-tools.googlecode.com/svn/branches/scite-st/lexers \
-	  $(RELEASEDIR32)/lexers
+	hg clone http://scintillua.googlecode.com/hg/lexers $(RELEASEDIR32)/lexers
 	# Linux x64_64
 	cp -r $(RELEASEDIR32) $(RELEASEDIR64)
 	cp ../$(TEXTADEPT64) $(RELEASEDIR64)
@@ -126,7 +126,7 @@ release: ../$(TEXTADEPT) ../$(TEXTADEPT32) ../$(TEXTADEPTWIN32)
 	tar czf $(PACKAGE32) $(RELEASEDIR32)
 	# Source
 	rm $(RELEASEDIR32)/$(TEXTADEPT)
-	cp -r lua scintilla-st gcocoadialog $(RELEASEDIR32)/src/
+	cp -r lua scintillua gcocoadialog $(RELEASEDIR32)/src/
 	zip -r $(SRCPACKAGE) $(RELEASEDIR32)
 	# Done
 	rm -r $(RELEASEDIR32)
diff --git a/src/textadept.rc b/src/textadept.rc
index c71f34d3..49b5abc0 100644
--- a/src/textadept.rc
+++ b/src/textadept.rc
@@ -3,8 +3,8 @@
 textadept ICON "../core/images/textadept.ico\0"

 

 VS_VERSION_INFO VERSIONINFO

-FILEVERSION	2, 0, 0, 0

-PRODUCTVERSION	2, 0, 0, 0

+FILEVERSION	2, 1, 0, 0

+PRODUCTVERSION	2, 1, 0, 0

 FILEFLAGSMASK	0x3fL

 FILEFLAGS 0

 FILEOS VOS_NT_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 		BEGIN

 			VALUE	"CompanyName",	"Mitchell\0"

 			VALUE	"FileDescription",	"textadept\0"

-			VALUE	"FileVersion",	"2.0\0"

+			VALUE	"FileVersion",	"2.1\0"

 			VALUE	"InternalName",	"textadept\0"

-			VALUE	"LegalCopyright",	"Copyright 2006-2009 by Mitchell\0"

+			VALUE	"LegalCopyright",	"Copyright 2006-2010 by Mitchell\0"

 			VALUE	"OriginalFilename",	"textadept.exe\0"

 			VALUE	"ProductName",	"textadept\0"

-			VALUE	"ProductVersion",	"2.0\0"

+			VALUE	"ProductVersion",	"2.1\0"

 		END

 	END

 END