This commit was manufactured by cvs2svn to create tag

'BEFORE_LINE_WRAP'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/BEFORE_LINE_WRAP@8716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/src/stc/Makefile.in

@@ -1,47 +0,0 @@
-###############################################################################
-# Purpose: Makefile.in for STC contrib for Unix with autoconf
-# Created: 14.03.00
-# Author:  VZ
-# Version: $Id$
-###############################################################################
-
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-
-this_dir = $(top_srcdir)/src/stc
-scintilla_dir=$(this_dir)/scintilla
-VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
-
-TARGET_LIBNAME=libstc
-
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
-
-OBJECTS=PlatWX.o ScintillaWX.o stc.o \
-        Accessor.o	        \
-        AutoComplete.o	    \
-        CallTip.o	        \
-        CellBuffer.o	    \
-        ContractionState.o  \
-        Document.o	        \
-        Editor.o		    \
-        Indicator.o	        \
-        KeyMap.o		    \
-        KeyWords.o	        \
-	LexCPP.o		\
-	LexHTML.o		\
-	LexOthers.o		\
-	LexPerl.o		\
-	LexPython.o		\
-	LexSQL.o		\
-	LexVB.o			\
-        LineMarker.o	    \
-        PropSet.o	        \
-        ScintillaBase.o	    \
-        Style.o		        \
-        ViewStyle.o
-        
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/include
-
-include $(top_builddir)/src/makelib.env

contrib/src/stc/PlatWX.cpp

@@ -1,597 +0,0 @@
-// Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
-// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
-//                        Robin Dunn <robin@aldunn.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <ctype.h>
-
-#include "Platform.h"
-#include "wx/stc/stc.h"
-
-Point Point::FromLong(long lpoint) {
-    return Point(lpoint & 0xFFFF, lpoint >> 32);
-}
-
-wxRect wxRectFromPRectangle(PRectangle prc) {
-    wxRect rc(prc.left, prc.top,
-              prc.right-prc.left+1, prc.bottom-prc.top+1);
-    return rc;
-}
-
-PRectangle PRectangleFromwxRect(wxRect rc) {
-    return PRectangle(rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom());
-}
-
-Colour::Colour(long lcol) {
-    co.Set(lcol & 0xff, (lcol >> 8) & 0xff, (lcol >> 16) & 0xff);
-}
-
-Colour::Colour(unsigned int red, unsigned int green, unsigned int blue) {
-    co.Set(red, green, blue);
-}
-
-bool Colour::operator==(const Colour &other) const {
-    return co == other.co;
-}
-
-long Colour::AsLong() const {
-    return (((long)co.Blue()  << 16) |
-            ((long)co.Green() <<  8) |
-            ((long)co.Red()));
-}
-
-unsigned int Colour::GetRed() {
-    return co.Red();
-}
-
-unsigned int Colour::GetGreen() {
-    return co.Green();
-}
-
-unsigned int Colour::GetBlue() {
-    return co.Blue();
-}
-
-Palette::Palette() {
-    used = 0;
-    allowRealization = false;
-}
-
-Palette::~Palette() {
-    Release();
-}
-
-void Palette::Release() {
-    used = 0;
-}
-
-// This method either adds a colour to the list of wanted colours (want==true)
-// or retrieves the allocated colour back to the ColourPair.
-// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-void Palette::WantFind(ColourPair &cp, bool want) {
-    if (want) {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired)
-                return;
-        }
-
-        if (used < numEntries) {
-            entries[used].desired = cp.desired;
-            entries[used].allocated = cp.desired;
-            used++;
-        }
-    } else {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired) {
-                cp.allocated = entries[i].allocated;
-                return;
-            }
-        }
-        cp.allocated = cp.desired;
-    }
-}
-
-void Palette::Allocate(Window &) {
-    if (allowRealization) {
-    }
-}
-
-
-Font::Font() {
-    id = 0;
-    ascent = 0;
-}
-
-Font::~Font() {
-}
-
-void Font::Create(const char *faceName, int size, bool bold, bool italic) {
-    Release();
-    id = new wxFont(size,
-                    wxDEFAULT,
-                    italic ? wxITALIC :  wxNORMAL,
-                    bold ? wxBOLD : wxNORMAL,
-                    false,
-                    faceName);
-}
-
-
-void Font::Release() {
-    if (id)
-        delete id;
-    id = 0;
-}
-
-
-Surface::Surface() :
-    hdc(0), hdcOwned(0), bitmap(0),
-    x(0), y(0) {
-}
-
-Surface::~Surface() {
-    Release();
-}
-
-void Surface::Release() {
-    if (bitmap) {
-        ((wxMemoryDC*)hdc)->SelectObject(wxNullBitmap);
-        delete bitmap;
-        bitmap = 0;
-    }
-    if (hdcOwned) {
-        delete hdc;
-        hdc = 0;
-        hdcOwned = false;
-    }
-}
-
-
-bool Surface::Initialised() {
-    return hdc != 0;
-}
-
-void Surface::Init() {
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::Init(SurfaceID hdc_) {
-    Release();
-    hdc = hdc_;
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::InitPixMap(int width, int height, Surface *surface_) {
-    Release();
-    hdc = new wxMemoryDC(surface_->hdc);
-    hdcOwned = true;
-    bitmap = new wxBitmap(width, height);
-    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::PenColour(Colour fore) {
-    hdc->SetPen(wxPen(fore.co, 1, wxSOLID));
-}
-
-void Surface::BrushColor(Colour back) {
-    hdc->SetBrush(wxBrush(back.co, wxSOLID));
-}
-
-void Surface::SetFont(Font &font_) {
-
-  // I think the following check is valid.  
-  // It eliminates a crash for me.  -- eric@sourcegear.com
-
-  if (font_.GetID())
-    {
-      hdc->SetFont(*font_.GetID());
-    }
-}
-
-int Surface::LogPixelsY() {
-    return hdc->GetPPI().y;
-}
-
-void Surface::MoveTo(int x_, int y_) {
-    x = x_;
-    y = y_;
-}
-
-void Surface::LineTo(int x_, int y_) {
-    hdc->DrawLine(x,y, x_,y_);
-    x = x_;
-    y = y_;
-}
-
-void Surface::Polygon(Point *pts, int npts, Colour fore,
-                      Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawPolygon(npts, (wxPoint*)pts);
-}
-
-void Surface::RectangleDraw(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::FillRectangle(PRectangle rc, Colour back) {
-    BrushColor(back);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::FillRectangle(PRectangle rc, Surface &surfacePattern) {
-    wxBrush br;
-    if (surfacePattern.bitmap)
-        br = wxBrush(*surfacePattern.bitmap);
-    else    // Something is wrong so display in red
-        br = wxBrush(*wxRED, wxSOLID);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->SetBrush(br);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::RoundedRectangle(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 8);
-}
-
-void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawEllipse(wxRectFromPRectangle(rc));
-}
-
-void Surface::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
-    hdc->Blit(rc.left, rc.top, rc.Width(), rc.Height(),
-              surfaceSource.hdc, from.x, from.y, wxCOPY);
-}
-
-void Surface::DrawText(PRectangle rc, Font &font, int ybase,
-                       const char *s, int len, Colour fore, Colour back) {
-    SetFont(font);
-    hdc->SetTextForeground(fore.co);
-    hdc->SetTextBackground(back.co);
-    FillRectangle(rc, back);
-
-    // ybase is where the baseline should be, but wxWin uses the upper left
-    // corner, so I need to calculate the real position for the text...
-    hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent);
-}
-
-void Surface::DrawTextClipped(PRectangle rc, Font &font, int ybase, const char *s, int len, Colour fore, Colour back) {
-    SetFont(font);
-    hdc->SetTextForeground(fore.co);
-    hdc->SetTextBackground(back.co);
-    FillRectangle(rc, back);
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-
-    // see comments above
-    hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent);
-    hdc->DestroyClippingRegion();
-}
-
-int Surface::WidthText(Font &font, const char *s, int len) {
-    SetFont(font);
-    int w;
-    int h;
-    hdc->GetTextExtent(wxString(s, len), &w, &h);
-    return w;
-}
-
-void Surface::MeasureWidths(Font &font, const char *s, int len, int *positions) {
-    SetFont(font);
-    int totalWidth = 0;
-    for (int i=0; i<len; i++) {
-        int w;
-        int h;
-        hdc->GetTextExtent(s[i], &w, &h);
-        totalWidth += w;
-        positions[i] = totalWidth;
-    }
-}
-
-int Surface::WidthChar(Font &font, char ch) {
-    SetFont(font);
-    int w;
-    int h;
-    hdc->GetTextExtent(ch, &w, &h);
-    return w;
-}
-
-#define EXTENT_TEST " `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-int Surface::Ascent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    font.ascent = h - d;
-    return font.ascent;
-}
-
-int Surface::Descent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return d;
-}
-
-int Surface::InternalLeading(Font &font) {
-    return 0;
-}
-
-int Surface::ExternalLeading(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return e;
-}
-
-int Surface::Height(Font &font) {
-    SetFont(font);
-    return hdc->GetCharHeight();
-}
-
-int Surface::AverageCharWidth(Font &font) {
-    SetFont(font);
-    return hdc->GetCharWidth();
-}
-
-int Surface::SetPalette(Palette *pal, bool inBackGround) {
-    return 0;  // **** figure out what to do with palettes...
-}
-
-void Surface::SetClip(PRectangle rc) {
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-}
-
-void Surface::FlushCachedState() {
-  // TODO Is there anything we need to do here? eric@sourcegear.com
-  // TODO I had to add this method when I merged new Scintilla code
-  // TODO from Neil.
-}
-
-Window::~Window() {
-}
-
-void Window::Destroy() {
-    if (id)
-        id->Destroy();
-    id = 0;
-}
-
-bool Window::HasFocus() {
-    return wxWindow::FindFocus() == id;
-}
-
-PRectangle Window::GetPosition() {
-    wxRect rc(id->GetPosition(), id->GetSize());
-    return PRectangleFromwxRect(rc);
-}
-
-void Window::SetPosition(PRectangle rc) {
-    id->SetSize(rc.left, rc.top, rc.Width(), rc.Height());
-}
-
-void Window::SetPositionRelative(PRectangle rc, Window) {
-    SetPosition(rc);  // ????
-}
-
-PRectangle Window::GetClientPosition() {
-    wxSize sz = id->GetClientSize();
-    return  PRectangle(0, 0, sz.x - 1, sz.y - 1);
-}
-
-void Window::Show(bool show) {
-    id->Show(show);
-}
-
-void Window::InvalidateAll() {
-    id->Refresh(false);
-}
-
-void Window::InvalidateRectangle(PRectangle rc) {
-    id->Refresh(false, &wxRectFromPRectangle(rc));
-}
-
-void Window::SetFont(Font &font) {
-    id->SetFont(*font.GetID());
-}
-
-void Window::SetCursor(Cursor curs) {
-    int cursorId;
-
-    switch (curs) {
-    case cursorText:
-        cursorId = wxCURSOR_IBEAM;
-        break;
-    case cursorArrow:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    case cursorUp:
-        cursorId = wxCURSOR_ARROW; // ** no up arrow...  wxCURSOR_UPARROW;
-        break;
-    case cursorWait:
-        cursorId = wxCURSOR_WAIT;
-        break;
-    case cursorHoriz:
-        cursorId = wxCURSOR_SIZEWE;
-        break;
-    case cursorVert:
-        cursorId = wxCURSOR_SIZENS;
-        break;
-    case cursorReverseArrow:
-        cursorId = wxCURSOR_POINT_RIGHT;
-        break;
-    default:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    }
-
-    id->SetCursor(wxCursor(cursorId));
-}
-
-
-void Window::SetTitle(const char *s) {
-    id->SetTitle(s);
-}
-
-
-
-ListBox::ListBox() {
-}
-
-ListBox::~ListBox() {
-}
-
-void ListBox::Create(Window &parent, int ctrlID) {
-    id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
-                       0, NULL, wxLB_SINGLE | wxLB_SORT);
-}
-
-void ListBox::Clear() {
-    ((wxListBox*)id)->Clear();
-}
-
-void ListBox::Append(char *s) {
-    ((wxListBox*)id)->Append(s);
-}
-
-int ListBox::Length() {
-    return ((wxListBox*)id)->Number();
-}
-
-void ListBox::Select(int n) {
-    ((wxListBox*)id)->SetSelection(n);
-}
-
-int ListBox::GetSelection() {
-    return ((wxListBox*)id)->GetSelection();
-}
-
-int ListBox::Find(const char *prefix) {
-    return ((wxListBox*)id)->FindString(prefix);
-}
-
-void ListBox::GetValue(int n, char *value, int len) {
-    wxString text = ((wxListBox*)id)->GetString(n);
-    strncpy(value, text.c_str(), len);
-    value[len-1] = '\0';
-}
-
-void ListBox::Sort() {
-    // wxWindows keeps sorted so no need to sort
-}
-
-
-Menu::Menu() : id(0) {
-}
-
-void Menu::CreatePopUp() {
-    Destroy();
-    id = new wxMenu();
-}
-
-void Menu::Destroy() {
-    if (id)
-        delete id;
-    id = 0;
-}
-
-void Menu::Show(Point pt, Window &w) {
-    w.GetID()->PopupMenu(id, pt.x - 4, pt.y);
-    Destroy();
-}
-
-
-Colour Platform::Chrome() {
-    wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    return Colour(c.Red(), c.Green(), c.Blue());
-}
-
-Colour Platform::ChromeHighlight() {
-    wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHIGHLIGHT);
-    return Colour(c.Red(), c.Green(), c.Blue());
-}
-
-const char *Platform::DefaultFont() {
-    return wxNORMAL_FONT->GetFaceName();
-}
-
-int Platform::DefaultFontSize() {
-    return 8;
-}
-
-unsigned int Platform::DoubleClickTime() {
-    return 500;   // **** ::GetDoubleClickTime();
-}
-
-void Platform::DebugDisplay(const char *s) {
-    wxLogDebug(s);
-}
-
-bool Platform::IsKeyDown(int key) {
-    return false;  // I don't think we'll need this.
-}
-
-long Platform::SendScintilla(WindowID w,
-                             unsigned int msg,
-                             unsigned long wParam,
-                             long lParam) {
-
-    wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
-    return stc->SendMsg(msg, wParam, lParam);
-}
-
-
-// These are utility functions not really tied to a platform
-
-int Platform::Minimum(int a, int b) {
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-int Platform::Maximum(int a, int b) {
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-#define TRACE
-
-void Platform::DebugPrintf(const char *format, ...) {
-#ifdef TRACE
-    char buffer[2000];
-    va_list pArguments;
-    va_start(pArguments, format);
-    vsprintf(buffer,format,pArguments);
-    va_end(pArguments);
-    Platform::DebugDisplay(buffer);
-#endif
-}
-
-int Platform::Clamp(int val, int minVal, int maxVal) {
-    if (val > maxVal)
-        val = maxVal;
-    if (val < minVal)
-        val = minVal;
-    return val;
-}
-
-
-
-
-
-

contrib/src/stc/README.txt

@@ -1,47 +0,0 @@
-This contrib is the wxStyledTextCtrl, which is a wrapper around the
-Scintilla edit control.  (See www.scintilla.org)
-
-There is still VERY MUCH to be done, most notable of which is a more
-advanced sample that exercises more of the code.  (I havn't tested
-AutoComplete or CallTips, or most of the event types at all yet.)  And
-also documentation, adding wrappers for some new scintilla
-functionality, building and testing on wxGTK, etc.  Be patient, it all
-will get there soon.
-
-
-
-Let me describe a bit about the architecture I am implementing...
-Obviously there is the Platform layer which implements the varioius
-platform classes by using wxWindows classes and filling in where
-needed.  Then there is a ScintillaWX class that is derived from
-ScintillaBase and implements the necessary virtual methods that
-Scintilla needs to fully funciton.  This class however is not meant to
-ever be used directly by wx programmers.  I call it one end of the
-bridge between the wx and Scintilla worlds.  The other end of the
-bridge is a class called wxStyledTextCtrl that looks, feels and acts
-like other classes in wxWindows.  Here is a diagram:
-
-
- +------------------+          +-------------------+
- | wxStyledTextCtrl |--bridge--|    ScintillaWX    |
- +------------------+          +-------------------+
-                               |   ScintillaBase   |
-                               +-------------------+
-                               |       Editor      |
-                               +-------------------+
-                               |     PlatWX        |
-                               +-------------------+
-
-
-wxStyledTextCtrl derives from wxControl so it has a window that can be
-drawn upon.  When a wxStyledTextCtrl is constructed it constructs a
-ScintillaWX for itself and passes itself to the scintilla object to be
-set as the wMain and wDraw attributes.  All method calls on the STC
-are sent over the bridge in the form of calls to ScintiallWX::WndProc.
-All notifications are sent back over the bridge and turned into
-wxEvents.
-
-
-Robin
-
-

contrib/src/stc/ScintillaWX.cpp

@@ -1,460 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.cxx
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatformWX.cxx  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include <ctype.h>
-
-#include "ScintillaWX.h"
-#include "wx/stc/stc.h"
-
-
-//----------------------------------------------------------------------
-
-const int H_SCROLL_MAX  = 2000;
-const int H_SCROLL_STEP = 20;
-const int H_SCROLL_PAGE = 200;
-
-//----------------------------------------------------------------------
-// Helper classes
-
-class wxSTCTimer : public wxTimer {
-public:
-    wxSTCTimer(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    void Notify() {
-        swx->DoTick();
-    }
-
-private:
-    ScintillaWX* swx;
-};
-
-
-
-bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
-    return swx->DoDropText(x, y, data);
-}
-
-wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragEnter(x, y, def);
-}
-
-wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragOver(x, y, def);
-}
-
-void  wxSTCDropTarget::OnLeave() {
-    swx->DoDragLeave();
-}
-
-
-
-//----------------------------------------------------------------------
-// Constructor/Destructor
-
-
-ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
-    capturedMouse = false;
-    wMain = win;
-    wDraw = win;
-    stc   = win;
-    Initialise();
-}
-
-
-ScintillaWX::~ScintillaWX() {
-    SetTicking(false);
-}
-
-//----------------------------------------------------------------------
-// base class virtuals
-
-
-void ScintillaWX::Initialise() {
-    //ScintillaBase::Initialise();
-    dropTarget = new wxSTCDropTarget;
-    dropTarget->SetScintilla(this);
-    stc->SetDropTarget(dropTarget);
-}
-
-
-void ScintillaWX::Finalise() {
-    ScintillaBase::Finalise();
-}
-
-
-void ScintillaWX::StartDrag() {
-    wxDropSource        source(wMain.GetID());
-    wxTextDataObject    data(dragChars);
-    wxDragResult        result;
-
-    source.SetData(data);
-    result = source.DoDragDrop(TRUE);
-    if (result == wxDragMove && dropWentOutside)
-        ClearSelection();
-    inDragDrop = FALSE;
-    SetDragPosition(invalidPosition);
-}
-
-
-void ScintillaWX::SetTicking(bool on) {
-    wxSTCTimer* steTimer;
-    if (timer.ticking != on) {
-        timer.ticking = on;
-        if (timer.ticking) {
-            steTimer = new wxSTCTimer(this);
-            steTimer->Start(timer.tickSize);
-            timer.tickerID = (int)steTimer;
-        } else {
-            steTimer = (wxSTCTimer*)timer.tickerID;
-            steTimer->Stop();
-            delete steTimer;
-            timer.tickerID = 0;
-        }
-    }
-    timer.ticksToWait = caret.period;
-}
-
-
-void ScintillaWX::SetMouseCapture(bool on) {
-    if (on && !capturedMouse)
-        wMain.GetID()->CaptureMouse();
-    else if (!on && capturedMouse)
-        wMain.GetID()->ReleaseMouse();
-    capturedMouse = on;
-}
-
-
-bool ScintillaWX::HaveMouseCapture() {
-    return capturedMouse;
-}
-
-
-void ScintillaWX::ScrollText(int linesToMove) {
-    int dy = vs.lineHeight * (linesToMove);
-    // TODO: calculate the rectangle to refreshed...
-    wMain.GetID()->ScrollWindow(0, dy);
-}
-
-void ScintillaWX::SetVerticalScrollPos() {
-    wMain.GetID()->SetScrollPos(wxVERTICAL, topLine);
-}
-
-void ScintillaWX::SetHorizontalScrollPos() {
-    wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset);
-}
-
-
-bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
-    bool modified = false;
-    int  sbMax    = wMain.GetID()->GetScrollRange(wxVERTICAL);
-    int  sbThumb  = wMain.GetID()->GetScrollThumb(wxVERTICAL);
-    int  sbPos    = wMain.GetID()->GetScrollPos(wxVERTICAL);
-
-
-    if (sbMax != nMax || sbThumb != nPage) {
-        wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
-        modified = true;
-    }
-
-    sbMax    = wMain.GetID()->GetScrollRange(wxHORIZONTAL);
-    sbThumb  = wMain.GetID()->GetScrollThumb(wxHORIZONTAL);
-    if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-        wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
-        modified = true;
-    }
-    return modified;
-}
-
-
-void ScintillaWX::NotifyChange() {
-    stc->NotifyChange();
-}
-
-
-void ScintillaWX::NotifyParent(SCNotification scn) {
-    stc->NotifyParent(&scn);
-}
-
-
-
-void ScintillaWX::Copy() {
-    if (currentPos != anchor) {
-        char* text = CopySelectionRange();
-        textDO.SetText(text);
-        wxTheClipboard->Open();
-        wxTheClipboard->SetData(&textDO);
-        wxTheClipboard->Close();
-    }
-}
-
-
-void ScintillaWX::Paste() {
-    pdoc->BeginUndoAction();
-    ClearSelection();
-
-    wxTextDataObject data;
-    bool canPaste;
-
-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
-    if (canPaste) {
-        wxString str = data.GetText();
-        int      len = str.Length();
-        pdoc->InsertString(currentPos, str.c_str(), len);
-        SetEmptySelection(currentPos + len);
-    }
-
-    pdoc->EndUndoAction();
-    NotifyChange();
-    Redraw();
-}
-
-
-bool ScintillaWX::CanPaste() {
-    wxTextDataObject data;
-    bool canPaste;
-
-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
-
-    return canPaste;
-}
-
-void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    ct.wCallTip = new wxWindow(wDraw.GetID(), -1);
-    ct.wDraw = ct.wCallTip;
-}
-
-
-void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
-    if (!label[0])
-        popup.GetID()->AppendSeparator();
-    else
-        popup.GetID()->Append(cmd, label);
-
-    if (!enabled)
-        popup.GetID()->Enable(cmd, enabled);
-
-    // TODO:  need to create event handler mappings for the cmd ID
-}
-
-
-void ScintillaWX::ClaimSelection() {
-
-}
-
-
-LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) {
-    return 0;
-}
-
-LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
-    switch (iMessage) {
-    case EM_CANPASTE:
-        return CanPaste();
-    default:
-        return ScintillaBase::WndProc(iMessage, wParam, lParam);
-    }
-    return 0;
-}
-
-
-
-//----------------------------------------------------------------------
-// Event delegates
-
-void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
-
-    paintState = painting;
-    Surface surfaceWindow;
-    surfaceWindow.Init(dc);
-    PRectangle rcPaint = PRectangleFromwxRect(rect);
-    dc->BeginDrawing();
-    Paint(&surfaceWindow, rcPaint);
-    dc->EndDrawing();
-    surfaceWindow.Release();
-    if (paintState == paintAbandoned) {
-        // Painting area was insufficient to cover new styling or brace highlight positions
-        FullPaint();
-    }
-    paintState = notPainting;
-}
-
-
-void ScintillaWX::DoHScroll(int type, int pos) {
-    int xPos = xOffset;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
-        xPos -= H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
-        xPos += H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
-        xPos -= H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
-        xPos += H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_TOP:
-        xPos = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
-        xPos = H_SCROLL_MAX;
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
-        xPos = pos;
-        break;
-    }
-    HorizontalScrollTo(xPos);
-}
-
-void ScintillaWX::DoVScroll(int type, int pos) {
-    int topLineNew = topLine;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
-        topLineNew -= 1;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
-        topLineNew += 1;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
-        topLineNew -= LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
-        topLineNew += LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_TOP:
-        topLineNew = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
-        topLineNew = MaxScrollPos();
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
-        topLineNew = pos;
-        break;
-    }
-    ScrollTo(topLineNew);
-}
-
-void ScintillaWX::DoSize(int width, int height) {
-    PRectangle rcClient(0,0,width,height);
-    SetScrollBarsTo(rcClient);
-    DropGraphics();
-}
-
-void ScintillaWX::DoLoseFocus(){
-    DropCaret();
-}
-
-void ScintillaWX::DoGainFocus(){
-    ShowCaretAtCurrentPosition();
-}
-
-void ScintillaWX::DoSysColourChange() {
-    InvalidateStyleData();
-}
-
-void ScintillaWX::DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-    ButtonDown(pt, curTime, shift, ctrl, alt);
-}
-
-void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-    ButtonUp(pt, curTime, ctrl);
-}
-
-void ScintillaWX::DoButtonMove(Point pt) {
-    ButtonMove(pt);
-}
-
-
-void ScintillaWX::DoAddChar(char ch) {
-    AddChar(ch);
-}
-
-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
-    return KeyDown(key, shift, ctrl, alt);
-}
-
-
-void ScintillaWX::DoCommand(int ID) {
-    Command(ID);
-}
-
-
-void ScintillaWX::DoContextMenu(Point pt) {
-    ContextMenu(pt);
-}
-
-
-//----------------------------------------------------------------------
-
-bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
-    SetDragPosition(invalidPosition);
-    int movePos = PositionFromLocation(Point(x,y));
-    DropAt(movePos, data, dragResult == wxDragMove, FALSE); // TODO: rectangular?
-    return TRUE;
-}
-
-
-wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {
-    return def;
-}
-
-
-wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    SetDragPosition(PositionFromLocation(Point(x, y)));
-    dragResult = def;
-    return def;
-}
-
-
-void ScintillaWX::DoDragLeave() {
-    SetDragPosition(invalidPosition);
-}
-
-//----------------------------------------------------------------------
-
-// Redraw all of text area. This paint will not be abandoned.
-void ScintillaWX::FullPaint() {
-    paintState = painting;
-    rcPaint = GetTextRectangle();
-    wxClientDC dc(wMain.GetID());
-    Surface surfaceWindow;
-    surfaceWindow.Init(&dc);
-    Paint(&surfaceWindow, rcPaint);
-    surfaceWindow.Release();
-    paintState = notPainting;
-}
-
-
-void ScintillaWX::DoScrollToLine(int line) {
-    ScrollTo(line);
-}
-
-
-void ScintillaWX::DoScrollToColumn(int column) {
-    HorizontalScrollTo(column * vs.spaceWidth);
-}
-
-
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------

contrib/src/stc/ScintillaWX.h

@@ -1,148 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatWX.cpp.  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ScintillaWX_h__
-#define __ScintillaWX_h__
-
-//----------------------------------------------------------------------
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#endif
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CallTip.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "AutoComplete.h"
-#include "Document.h"
-#include "Editor.h"
-#include "ScintillaBase.h"
-
-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
-
-//----------------------------------------------------------------------
-
-class wxStyledTextCtrl;           // forward
-class ScintillaWX;
-
-
-//----------------------------------------------------------------------
-// Helper classes
-
-class wxSTCDropTarget : public wxTextDropTarget {
-public:
-    void SetScintilla(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
-    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void OnLeave();
-
-private:
-    ScintillaWX* swx;
-};
-
-
-//----------------------------------------------------------------------
-
-class ScintillaWX : public ScintillaBase {
-public:
-
-    ScintillaWX(wxStyledTextCtrl* win);
-    ~ScintillaWX();
-
-    // base class virtuals
-    virtual void Initialise();
-    virtual void Finalise();
-    virtual void StartDrag();
-    virtual void SetTicking(bool on);
-    virtual void SetMouseCapture(bool on);
-    virtual bool HaveMouseCapture();
-    virtual void ScrollText(int linesToMove);
-    virtual void SetVerticalScrollPos();
-    virtual void SetHorizontalScrollPos();
-    virtual bool ModifyScrollBars(int nMax, int nPage);
-    virtual void Copy();
-    virtual void Paste();
-    virtual void CreateCallTipWindow(PRectangle rc);
-    virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
-    virtual void ClaimSelection();
-
-    virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-    virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-
-    virtual void NotifyChange();
-    virtual void NotifyParent(SCNotification scn);
-
-
-    // Event delegates
-    void DoPaint(wxDC* dc, wxRect rect);
-    void DoHScroll(int type, int pos);
-    void DoVScroll(int type, int pos);
-    void DoSize(int width, int height);
-    void DoLoseFocus();
-    void DoGainFocus();
-    void DoSysColourChange();
-    void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-    void DoButtonUp(Point pt, unsigned int curTime, bool ctrl);
-    void DoButtonMove(Point pt);
-    void DoAddChar(char ch);
-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
-    void DoTick() { Tick(); }
-
-    bool DoDropText(long x, long y, const wxString& data);
-    wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void DoDragLeave();
-
-    void DoCommand(int ID);
-    void DoContextMenu(Point pt);
-
-
-    // helpers
-    void FullPaint();
-    bool CanPaste();
-    bool GetHideSelection() { return hideSelection; }
-    void DoScrollToLine(int line);
-    void DoScrollToColumn(int column);
-
-private:
-    bool                capturedMouse;
-    wxStyledTextCtrl*   stc;
-
-    wxTextDataObject    textDO;
-    wxSTCDropTarget*    dropTarget;
-    wxDragResult        dragResult;
-};
-
-//----------------------------------------------------------------------
-#endif

contrib/src/stc/StcVC.dsp

@@ -1,250 +0,0 @@
-# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=StcVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "StcVC.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-
-!IF  "$(CFG)" == "StcVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c
-# SUBTRACT CPP /YX
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\stc.lib"
-
-!ELSEIF  "$(CFG)" == "StcVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c
-# SUBTRACT CPP /YX
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\stcd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "StcVC - Win32 Release"
-# Name "StcVC - Win32 Debug"
-# Begin Group "Stc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScintillaWX.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stc.cpp
-# End Source File
-# End Group
-# Begin Group "Scintilla"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\scintilla\src\Accessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\AutoComplete.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CallTip.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CellBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ContractionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Document.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Editor.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Indicator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LineMarker.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ScintillaBase.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Style.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\SVector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ViewStyle.h
-# End Source File
-# End Group
-# End Target
-# End Project

contrib/src/stc/StcVC.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "StcVC"=.\StcVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

contrib/src/stc/makefile.b32

@@ -1,79 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds wxMMedia library for 32-bit BC++
-
-# N.B. use:
-# make -f makefile.b32 stc.cfg
-# make -f makefile.b32
-
-WXDIR = $(WXWIN)
-
-SCINTILLA=.\scintilla
-S=$(SCINTILLA)\src
-
-STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
-
-LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
-
-OBJECTS = \
-	Accessor.obj	\
-	AutoComplete.obj	\
-	CallTip.obj	\
-	CellBuffer.obj	\
-	ContractionState.obj\
-	Document.obj	\
-	Editor.obj		\
-	Indicator.obj	\
-	KeyMap.obj		\
-	KeyWords.obj	\
-	LineMarker.obj	\
-	PropSet.obj	\
-	ScintillaBase.obj	\
-	Style.obj		\
-	ViewStyle.obj	\
-				\
-	PlatWX.obj		\
-	ScintillaWX.obj	\
-	stc.obj		\
-
-!include $(WXDIR)\src\makelib.b32
-
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
-
-{$(S)}.cxx.obj:
-	bcc32 $(CPPFLAGS) -P -c {$< }
-
-$(CFG): makefile.b32
-	copy &&!
--H=$(WXDIR)\src\msw\wx32.csm
--3
--d
--a1 # byte alignment
--R-
--X
--w-par
--w-aus
--w-hid # virtual function A hides virtual function B
--WE
--tWM
-
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
--I$(WXDIR)\include\wx\msw\gnuwin32
-
--L$(BCCDIR)\lib
--D__WXWIN__
--D__WXMSW__
--D__WINDOWS__
--DWIN32
-$(OPT)
-$(DEBUG_FLAGS)
-$(WIN95FLAG)
-$(STCEXTRACPPFLAGS)
-! $(CFG)
-

contrib/src/stc/makefile.g95

@@ -1,34 +0,0 @@
-# File:		makefile.g95  For stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-WXDIR = ../../..
-
-SCINTILLA=$(WXDIR)/contrib/src/stc/scintilla
-S=$(SCINTILLA)/src
-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
-
-OBJECTS = \
-	$(S)/Accessor.$(OBJSUFF) \
-	$(S)/AutoComplete.$(OBJSUFF) \
-	$(S)/CallTip.$(OBJSUFF) \
-	$(S)/CellBuffer.$(OBJSUFF) \
-	$(S)/ContractionState.$(OBJSUFF)\
-	$(S)/Document.$(OBJSUFF) \
-	$(S)/Editor.$(OBJSUFF) \
-	$(S)/Indicator.$(OBJSUFF) \
-	$(S)/KeyMap.$(OBJSUFF) \
-	$(S)/KeyWords.$(OBJSUFF) \
-	$(S)/LineMarker.$(OBJSUFF) \
-	$(S)/PropSet.$(OBJSUFF) \
-	$(S)/ScintillaBase.$(OBJSUFF) \
-	$(S)/Style.$(OBJSUFF) \
-	$(S)/ViewStyle.$(OBJSUFF) \
-	PlatWX.$(OBJSUFF) \
-	ScintillaWX.$(OBJSUFF) \
-	stc.$(OBJSUFF)
-
-LIBTARGET = $(WXDIR)/contrib/lib/libstc.a
-
-include $(WXDIR)/src/makelib.g95

contrib/src/stc/makefile.vc

@@ -1,94 +0,0 @@
-# File:		makefile.vc  For stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-SCINTILLA=.\scintilla
-S=$(SCINTILLA)\src
-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)\contrib\include
-NOPCH=1
-
-!include $(WXDIR)\src\makevc.env
-
-OBJECTS = \
-	$(D)\Accessor.obj	\
-	$(D)\AutoComplete.obj	\
-	$(D)\CallTip.obj	\
-	$(D)\CellBuffer.obj	\
-	$(D)\ContractionState.obj\
-	$(D)\Document.obj	\
-	$(D)\Editor.obj		\
-	$(D)\Indicator.obj	\
-	$(D)\KeyMap.obj		\
-	$(D)\KeyWords.obj	\
-	$(D)\LineMarker.obj	\
-	$(D)\PropSet.obj	\
-	$(D)\ScintillaBase.obj	\
-	$(D)\Style.obj		\
-	$(D)\ViewStyle.obj	\
-				\
-	$(D)\PlatWX.obj		\
-	$(D)\ScintillaWX.obj	\
-	$(D)\stc.obj		\
-
-
-
-
-LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
-
-all:    $(D) $(LIBTARGET)
-
-$(D) :
-	mkdir $(D)
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.vc clean
-        cd $(THISDIR)
-
-
-
-
-$(LIBTARGET): $(OBJECTS)
-	-erase $(LIBTARGET)
-	$(implib) @<<
--out:$(LIBTARGET)
--machine:$(CPU)
-$(OBJECTS)
-<<
-
-
-
-{$(S)}.cxx{$(D)}.obj:
-	$(cc) @<<
-$(CPPFLAGS) /c /Fo$@ /Tp $<
-<<
-
-{}.cpp{$(D)}.obj:
-	$(cc) @<<
-$(CPPFLAGS) /c /Fo$@ /Tp $<
-<<
-
-
-show:
-	@echo $(CPPFLAGS)
-
-
-clean:
-        -erase $(D)\*.obj
-        -erase *.sbr
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.pdb
-        -erase $(LIBTARGET)
-

contrib/src/stc/scintilla/README.txt

@@ -1,7 +0,0 @@
-This directory contains copies of the scintilla/src and
-scintilla/include directories from the Scintilla/SCiTE source
-distribution.  All other code needed to implement Scintilla on top of
-wxWindows is located in the directory above this one.
-
-The current version of the Scintilla code is somewhere between 1.22
-and 1.23, (from their CVS.)

contrib/src/stc/scintilla/include/Accessor.h

@@ -1,88 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.h - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8};
-
-class Accessor {
-protected:
-	// bufferSize is a trade off between time taken to copy the characters and SendMessage overhead
-	// slopSize positions the buffer before the desired position in case there is some backtracking
-	enum {bufferSize=4000, slopSize=bufferSize/8};
-	char buf[bufferSize+1];
-	WindowID id;
-	PropSet &props;
-	int startPos;
-	int endPos;
-	int lenDoc;
-	int offset;	// Optional but including an offset makes GCC generate better code 
-	int codePage;	
-	bool InternalIsLeadByte(char ch);
-	void Fill(int position);
-public:
-	Accessor(WindowID id_, PropSet &props_, int offset_=0) : 
-			id(id_), props(props_), startPos(0x7FFFFFFF), endPos(0), 
-			lenDoc(-1), offset(offset_), codePage(0) {
-	}
-	void SetCodePage(int codePage_) { codePage = codePage_; }
-	char operator[](int position) {
-		position += offset;
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-		}
-		return buf[position - startPos];
-	}
-	char SafeGetCharAt(int position, char chDefault=' ') {
-		// Safe version of operator[], returning a defined value for invalid position 
-		position += offset;
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-			if (position < startPos || position >= endPos) {
-				// Position is outside range of document 
-				return chDefault;
-			}
-		}
-		return buf[position - startPos];
-	}
-	bool IsLeadByte(char ch) {
-		return codePage && InternalIsLeadByte(ch);
-	}
-	char StyleAt(int position);
-	int GetLine(int position);
-	int LineStart(int line);
-	int LevelAt(int line);
-	int Length();
-	void Flush() {
-		startPos = 0x7FFFFFFF;
-		lenDoc = -1;
-	}
-	int GetLineState(int line);
-	int SetLineState(int line, int state);
-	PropSet &GetPropSet() { return props; }
-};
-
-class StylingContext;
-
-typedef bool (*PFNIsCommentLeader)(StylingContext &styler, int pos, int len);
-
-class StylingContext : public Accessor {
-	char styleBuf[bufferSize];
-	int validLen;
-	char chFlags;
-	char chWhile;
-	unsigned int startSeg;
-public:
-	StylingContext(WindowID id_, PropSet &props_, int offset_=0) : 
-		Accessor(id_,props_,offset_), validLen(0), chFlags(0) {}
-	void StartAt(unsigned int start, char chMask=31);
-	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
-	unsigned int GetStartSegment() { return startSeg; }
-	void StartSegment(unsigned int pos);
-	void ColourTo(unsigned int pos, int chAttr);
-	int GetLine(int position);
-	void SetLevel(int line, int level);
-	void Flush();
-	int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
-};
-

contrib/src/stc/scintilla/include/KeyWords.h

@@ -1,41 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// KeyWords.h - colourise for particular languages
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
-                  WordList *keywordlists[], StylingContext &styler);
-                  
-class LexerModule {
-	static LexerModule *base;
-	LexerModule *next;
-	int language;
-	LexerFunction fn;
-public:
-	LexerModule(int language_, LexerFunction fn_);
-	static void Colourise(unsigned int startPos, int lengthDoc, int initStyle,
-                  int language, WordList *keywordlists[], StylingContext &styler);
-};
-
-inline bool iswordchar(char ch) {
-	return isalnum(ch) || ch == '.' || ch == '_';
-}
-
-inline bool iswordstart(char ch) {
-	return isalnum(ch) || ch == '_';
-}
-
-inline bool isoperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	return false;
-}
-

contrib/src/stc/scintilla/include/Platform.h

@@ -1,395 +0,0 @@
-// Scintilla source code edit control
-// Platform.h - interface to platform facilities
-// Also includes some basic utilities
-// Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-// PLAT_GTK = GTK+ on Linux, PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
-// Could also have PLAT_GTKWIN = GTK+ on Win32 OS in future
-
-#define PLAT_GTK 0
-#define PLAT_WIN 0
-#define PLAT_WX  0
-
-#if defined(__WX__)
-#undef PLAT_WX
-#define PLAT_WX  1
-
-#elif defined(GTK)
-#undef PLAT_GTK
-#define PLAT_GTK 1
-
-#else
-#undef PLAT_WIN
-#define PLAT_WIN 1
-
-#endif
-
-
-// Include the main header for each platform
-
-#if PLAT_GTK
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#endif
-
-#if PLAT_WIN
-#define _WIN32_WINNT  0x0400 // Otherwise some required stuff gets ifdef'd out
-// Vassili Bourdo: shut up annoying Visual C++ warnings:
-#ifdef _MSC_VER
-#pragma warning(disable: 4800 4244 4309)
-#endif
-#include <windows.h>
-#include <richedit.h>
-#endif
-
-#if PLAT_WX
-#include <wx/wx.h>
-#endif
-
-// Underlying the implementation of the platform classes are platform specific types.
-// Sometimes these need to be passed around by client code so they are defined here
-
-#if PLAT_GTK
-typedef GdkColor ColourID;
-typedef GdkFont* FontID;
-typedef GdkDrawable* SurfaceID;
-typedef GtkWidget* WindowID;
-typedef GtkItemFactory* MenuID;
-#endif
-
-#if PLAT_WIN
-typedef COLORREF ColourID;
-typedef HFONT FontID;
-typedef HDC SurfaceID;
-typedef HWND WindowID;
-typedef HMENU MenuID;
-#endif
-
-#if PLAT_WX
-typedef wxColour ColourID;
-typedef wxFont* FontID;
-typedef wxDC* SurfaceID;
-typedef wxWindow* WindowID;
-typedef wxMenu* MenuID;
-#endif
-
-#if PLAT_GTK || PLAT_WX
-#define SHIFT_PRESSED 1
-#define LEFT_CTRL_PRESSED 2
-#define LEFT_ALT_PRESSED 4
-#endif
-
-// Point is exactly the same as the Win32 POINT and GTK+ GdkPoint so can be used interchangeably
-
-class Point {
-public:
-	int x;
-	int y;
-	
-	Point(int x_=0, int y_=0) : x(x_), y(y_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-	
-	static Point FromLong(long lpoint);
-};
-
-// PRectangle is exactly the same as the Win32 RECT so can be used interchangeably
-// PRectangles contain their top and left sides, but not their right and bottom sides
-class PRectangle {
-public:
-	int left;
-	int top;
-	int right;
-	int bottom;
-
-	PRectangle(int left_=0, int top_=0, int right_=0, int bottom_ = 0) :
-		left(left_), top(top_), right(right_), bottom(bottom_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-
-	bool Contains(Point pt) {
-		return (pt.x >= left) && (pt.x <= right) &&
-			(pt.y >= top) && (pt.y <= bottom);
-	}
-	bool Contains(PRectangle rc) {
-		return (rc.left >= left) && (rc.right <= right) &&
-			(rc.top >= top) && (rc.bottom <= bottom);
-	}
-	bool Intersects(PRectangle other) {
-		return (right >= other.left) && (left <= other.right) &&
-			(bottom >= other.top) && (top <= other.bottom);
-	}
-	int Width() { return right - left; }
-	int Height() { return bottom - top; }
-};
-
-#if PLAT_WX
-wxRect wxRectFromPRectangle(PRectangle prc);
-PRectangle PRectangleFromwxRect(wxRect rc);
-#endif
-
-class Colour {
-	ColourID co;
-public:
-	Colour(long lcol=0);
-	Colour(unsigned int red, unsigned int green, unsigned int blue);
-	bool operator==(const Colour &other) const;
-	long AsLong() const;
-	unsigned int GetRed();
-	unsigned int GetGreen();
-	unsigned int GetBlue();
-	
-	friend class Surface;
-	friend class Palette;
-};
-
-// Colour pairs hold a desired colour and the colour that the graphics engine
-// allocates to approximate the desired colour.
-// To make palette management more automatic, ColourPairs could register at 
-// construction time with a palette management object.
-struct ColourPair {
-	Colour desired;
-	Colour allocated;
-
-	ColourPair(Colour desired_=Colour(0,0,0)) {
-		desired = desired_;
-		allocated = desired;
-	}
-};
-
-class Window;	// Forward declaration for Palette
-
-class Palette {
-	int used;
-	enum {numEntries = 100};
-	ColourPair entries[numEntries];
-#if PLAT_GTK
-	GdkColor *allocatedPalette;
-	int allocatedLen;
-#elif PLAT_WIN
-	HPALETTE hpal;
-#elif PLAT_WX
-	// wxPalette* pal;  // **** Is this needed?
-#endif
-public:
-	bool allowRealization;
-	
-	Palette();
-	~Palette();
-
-	void Release();
-	
-	// This method either adds a colour to the list of wanted colours (want==true)
-	// or retrieves the allocated colour back to the ColourPair.
-	// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-	void WantFind(ColourPair &cp, bool want);
-
-	void Allocate(Window &w);
-	
-	friend class Surface;
-};
-
-class Font {
-	FontID id;
-#if PLAT_WX
-	int ascent;
-#endif
-	// Private so Font objects can not be copied
-	Font(const Font &) {}
-	Font &operator=(const Font &) { id=0; return *this; }
-public:
-	Font();
-	~Font();
-
-	void Create(const char *faceName, int size, bool bold=false, bool italic=false);
-	void Release();
-
-	FontID GetID() { return id; }
-	// Alias another font - caller guarantees not to Release
-	void SetID(FontID id_) { id = id_; }
-	friend class Surface;
-};
-
-// A surface abstracts a place to draw
-class Surface {
-private:
-#if PLAT_GTK
-	GdkDrawable *drawable;
-	GdkGC *gc;
-	GdkPixmap *ppixmap;
-	int x;
-	int y;
-	bool inited;
-	bool createdGC;
-#elif PLAT_WIN
-	HDC hdc;
-	bool hdcOwned;
-	HPEN pen;
-	HPEN penOld;
-	HBRUSH brush;
-	HBRUSH brushOld;
-	HFONT font;
-	HFONT fontOld;
-	HBITMAP bitmap;
-	HBITMAP bitmapOld;
-	HPALETTE paletteOld;
-#elif PLAT_WX
-	wxDC* hdc;
-	bool hdcOwned;
-	wxBitmap* bitmap;
-	int x;
-	int y;
-#endif
-
-	// Private so Surface objects can not be copied
-	Surface(const Surface &) {}
-	Surface &operator=(const Surface &) { return *this; }
-#if PLAT_WIN || PLAT_WX
-	void BrushColor(Colour back);
-	void SetFont(Font &font_);
-#endif
-public:
-	Surface();
-	~Surface();
-	
-	void Init();
-	void Init(SurfaceID hdc_);
-	void InitPixMap(int width, int height, Surface *surface_);
-
-	void Release();
-	bool Initialised();
-	void PenColour(Colour fore);
-	int LogPixelsY();
-	void MoveTo(int x_, int y_);
-	void LineTo(int x_, int y_);
-	void Polygon(Point *pts, int npts, Colour fore, Colour back);
-	void RectangleDraw(PRectangle rc, Colour fore, Colour back);
-	void FillRectangle(PRectangle rc, Colour back);
-	void FillRectangle(PRectangle rc, Surface &surfacePattern);
-	void RoundedRectangle(PRectangle rc, Colour fore, Colour back);
-	void Ellipse(PRectangle rc, Colour fore, Colour back);
-	void Copy(PRectangle rc, Point from, Surface &surfaceSource);
-
-	void DrawText(PRectangle rc, Font &font_, int ybase, const char *s, int len, Colour fore, Colour back);
-	void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, Colour fore, Colour back);
-	void MeasureWidths(Font &font_, const char *s, int len, int *positions);
-	int WidthText(Font &font_, const char *s, int len);
-	int WidthChar(Font &font_, char ch);
-	int Ascent(Font &font_);
-	int Descent(Font &font_);
-	int InternalLeading(Font &font_);
-	int ExternalLeading(Font &font_);
-	int Height(Font &font_);
-	int AverageCharWidth(Font &font_);
-	
-	int SetPalette(Palette *pal, bool inBackGround);
-	void SetClip(PRectangle rc);
-	void FlushCachedState();
-};
-
-// Class to hide the details of window manipulation
-// Does not own the window which will normally have a longer life than this object
-class Window {
-	friend class ListBox;
-protected:
-	WindowID id;
-public:
-	Window() : id(0) {}
-	virtual ~Window();
-	Window &operator=(WindowID id_) {
-		id = id_;
-		return *this;
-	}
-	WindowID GetID() { return id; }
-	bool Created() { return id != 0; }
-	void Destroy();
-	bool HasFocus();
-	PRectangle GetPosition();
-	void SetPosition(PRectangle rc);
-	void SetPositionRelative(PRectangle rc, Window relativeTo);
-	PRectangle GetClientPosition();
-	void Show(bool show=true);
-	void InvalidateAll();
-	void InvalidateRectangle(PRectangle rc);
-	void SetFont(Font &font);
-	enum Cursor { cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow };
-	void SetCursor(Cursor curs);
-	void SetTitle(const char *s);
-#if PLAT_WIN
-	LRESULT SendMessage(UINT msg, WPARAM wParam=0, LPARAM lParam=0);
-	int GetDlgCtrlID();
-	HINSTANCE GetInstance();
-#endif
-};
-
-class ListBox : public Window {
-#if PLAT_GTK
-	WindowID list;
-	WindowID scroller;
-	int current;
-#endif
-public:
-	ListBox();
-	virtual ~ListBox();
-	ListBox &operator=(WindowID id_) {
-		id = id_;
-		return *this;
-	}
-	void Create(Window &parent, int ctrlID);
-	void Clear();
-	void Append(char *s);
-	int Length();
-	void Select(int n);
-	int GetSelection();
-	int Find(const char *prefix);
-	void GetValue(int n, char *value, int len);
-	void Sort();
-};
-
-class Menu {
-	MenuID id;
-public:
-	Menu();
-	MenuID GetID() { return id; }
-	void CreatePopUp();
-	void Destroy();
-	void Show(Point pt, Window &w);
-};
-
-// Platform class used to retrieve system wide parameters such as double click speed
-// and chrome colour. Not a creatable object, more of a module with several functions.
-class Platform {
-	// Private so Platform objects can not be copied
-	Platform(const Platform &) {}
-	Platform &operator=(const Platform &) { return *this; }
-public:
-	// Should be private because no new Platforms are ever created
-	// but gcc warns about this
-	Platform() {}
-	~Platform() {}
-	static Colour Chrome();
-	static Colour ChromeHighlight();
-	static const char *DefaultFont();
-	static int DefaultFontSize();
-	static unsigned int DoubleClickTime();
-	static void DebugDisplay(const char *s);
-	static bool IsKeyDown(int key);
-	static long SendScintilla(
-		WindowID w, unsigned int msg, unsigned long wParam=0, long lParam=0);
-	
-	// These are utility functions not really tied to a platform
-	static int Minimum(int a, int b);
-	static int Maximum(int a, int b);
-	static void DebugPrintf(const char *format, ...);
-	static int Clamp(int val, int minVal, int maxVal);
-};
-
-#endif

contrib/src/stc/scintilla/include/PropSet.h

@@ -1,180 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// PropSet.h - a java style properties file module
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PROPSET_H
-#define PROPSET_H
-
-bool EqualCaseInsensitive(const char *a, const char *b);
-
-// Define another string class.
-// While it would be 'better' to use std::string, that doubles the executable size.
-
-inline char *StringDup(const char *s) {
-	if (!s)
-		return 0;
-	char *sNew = new char[strlen(s) + 1];
-	if (sNew)
-		strcpy(sNew, s);
-	return sNew;
-}
-
-class SString {
-	char *s;
-public:
-	SString() {
-		s = 0;
-	}
-	SString(const SString &source) {
-		s = StringDup(source.s);
-	}
-	SString(const char *s_) {
-		s = StringDup(s_);
-	}
-	SString(int i) {
-		char number[100];
-		sprintf(number, "%0d", i);
-		//itoa(i, number, 10);
-		s = StringDup(number);
-	}
-	~SString() {
-		delete []s;
-		s = 0;
-	}
-	SString &operator=(const SString &source) {
-		if (this != &source) {
-			delete []s;
-			s = StringDup(source.s);
-		}
-		return *this;
-	}
-	bool operator==(const SString &other) const {
-		if ((s == 0) && (other.s == 0))
-			return true;
-		if ((s == 0) || (other.s == 0))
-			return false;
-		return strcmp(s, other.s) == 0;
-	}
-	bool operator==(const char *sother) const {
-		if ((s == 0) && (sother == 0))
-			return true;
-		if ((s == 0) || (sother == 0))
-			return false;
-		return strcmp(s, sother) == 0;
-	}
-	const char *c_str() const {
-		if (s)
-			return s;
-		else
-			return "";
-	}
-	int length() const {
-		if (s)
-			return strlen(s);
-		else
-			return 0;
-	}
-	char operator[](int i) {
-		if (s)
-			return s[i];
-		else
-			return '\0';
-	}
-	SString &operator +=(const char *sother) {
-		int len = length();
-		int lenOther = strlen(sother);
-		char *sNew = new char[len + lenOther + 1];
-		if (sNew) {
-			if (s)
-				memcpy(sNew, s, len);
-			memcpy(sNew + len, sother, lenOther);
-			sNew[len + lenOther] = '\0';
-			delete []s;
-			s = sNew;
-		}
-		return *this;
-	}
-	int value() {
-		if (s)
-			return atoi(s);
-		else 
-			return 0;
-	}
-};
-
-class PropSet {
-private:
-	char **vals;
-	int size;
-	int used;
-public:
-	PropSet *superPS;
-	PropSet();
-	~PropSet();
-	void EnsureCanAddEntry();
-	void Set(const char *key, const char *val);
-	void Set(char *keyval);
-	SString Get(const char *key);
-	int GetInt(const char *key, int defaultValue=0);
-	SString GetWild(const char *keybase, const char *filename);
-	SString GetNewExpand(const char *keybase, const char *filename);
-	void Clear();
-	void ReadFromMemory(const char *data, int len);
-	void Read(const char *filename);
-};
-
-// This is a fixed length list of strings suitable for display  in combo boxes
-// as a memory of user entries
-template<int sz>
-class EntryMemory {
-	SString entries[sz];
-public:
-	void Insert(SString s) {
-		for (int i=0;i<sz;i++) {
-			if (entries[i] == s) {
-				for (int j=i;j>0;j--) {
-					entries[j] = entries[j-1];
-				}
-				entries[0] = s;
-				return;
-			}
-		}
-		for (int k=sz-1;k>0;k--) {
-			entries[k] = entries[k-1];
-		}
-		entries[0] = s;
-	}
-	int Length() const {
-		int len = 0;
-		for (int i=0;i<sz;i++)
-			if (entries[i].length())
-				len++;
-		return len;
-	}
-	SString At(int n) const {
-		return entries[n];
-	}
-};
-
-class WordList {
-public:
-	// Each word contains at least one character - a empty word acts as sentinal at the end.
-	char **words;
-	char *list;
-	int len;
-	bool onlyLineEnds;	// Delimited by any white space or only line ends
-	int starts[256];
-	WordList(bool onlyLineEnds_ = false) : 
-		words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {}
-	~WordList() { Clear(); }
-	operator bool() { return list; }
-	const char *operator[](int ind) { return words[ind]; }
-	void Clear();
-	void Set(const char *s);
-	char *Allocate(int size);
-	void SetFromAllocated();
-	bool InList(const char *s);
-};
-
-#endif

contrib/src/stc/scintilla/include/SciLexer.h

@@ -1,172 +0,0 @@
-// Scintilla source code edit control
-// SciLexer - interface to the added lexer functions in the SciLexer version of the edit control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCILEXER_H
-#define SCILEXER_H
-
-// SciLexer features - not in standard Scintilla
-
-#define SCLEX_CONTAINER 0
-#define SCLEX_NULL 1
-#define SCLEX_PYTHON 2
-#define SCLEX_CPP 3
-#define SCLEX_HTML 4
-#define SCLEX_XML 5
-#define SCLEX_PERL 6
-#define SCLEX_SQL 7
-#define SCLEX_VB 8
-#define SCLEX_PROPERTIES 9
-#define SCLEX_ERRORLIST 10
-#define SCLEX_MAKEFILE 11
-#define SCLEX_BATCH 12
-
-// Lexical states for SCLEX_PYTHON
-#define SCE_P_DEFAULT 0
-#define SCE_P_COMMENTLINE 1
-#define SCE_P_NUMBER 2
-#define SCE_P_STRING 3
-#define SCE_P_CHARACTER 4
-#define SCE_P_WORD 5
-#define SCE_P_TRIPLE 6
-#define SCE_P_TRIPLEDOUBLE 7
-#define SCE_P_CLASSNAME 8
-#define SCE_P_DEFNAME 9
-#define SCE_P_OPERATOR 10
-#define SCE_P_IDENTIFIER 11
-#define SCE_P_COMMENTBLOCK 12
-#define SCE_P_STRINGEOL 13
-
-// Lexical states for SCLEX_CPP, SCLEX_VB
-#define SCE_C_DEFAULT 0
-#define SCE_C_COMMENT 1
-#define SCE_C_COMMENTLINE 2
-#define SCE_C_COMMENTDOC 3
-#define SCE_C_NUMBER 4
-#define SCE_C_WORD 5
-#define SCE_C_STRING 6
-#define SCE_C_CHARACTER 7
-#define SCE_C_UUID 8
-#define SCE_C_PREPROCESSOR 9
-#define SCE_C_OPERATOR 10
-#define SCE_C_IDENTIFIER 11
-#define SCE_C_STRINGEOL 12
-
-// Lexical states for SCLEX_HTML, SCLEX_xML
-#define SCE_H_DEFAULT 0
-#define SCE_H_TAG 1
-#define SCE_H_TAGUNKNOWN 2
-#define SCE_H_ATTRIBUTE 3
-#define SCE_H_ATTRIBUTEUNKNOWN 4
-#define SCE_H_NUMBER 5
-#define SCE_H_DOUBLESTRING 6
-#define SCE_H_SINGLESTRING 7
-#define SCE_H_OTHER 8
-#define SCE_H_COMMENT 9
-#define SCE_H_ENTITY 10
-// XML and ASP
-#define SCE_H_TAGEND 11
-#define SCE_H_XMLSTART 12
-#define SCE_H_XMLEND 13
-#define SCE_H_SCRIPT 14
-#define SCE_H_ASP 15
-#define SCE_H_ASPAT 16
-// Embedded Javascript
-#define SCE_HJ_START 40
-#define SCE_HJ_DEFAULT 41
-#define SCE_HJ_COMMENT 42
-#define SCE_HJ_COMMENTLINE 43
-#define SCE_HJ_COMMENTDOC 44
-#define SCE_HJ_NUMBER 45
-#define SCE_HJ_WORD 46
-#define SCE_HJ_KEYWORD 47
-#define SCE_HJ_DOUBLESTRING 48
-#define SCE_HJ_SINGLESTRING 49
-#define SCE_HJ_SYMBOLS 50
-#define SCE_HJ_STRINGEOL 51
-// ASP Javascript
-#define SCE_HJA_START 55
-#define SCE_HJA_DEFAULT 56
-#define SCE_HJA_COMMENT 57
-#define SCE_HJA_COMMENTLINE 58
-#define SCE_HJA_COMMENTDOC 59
-#define SCE_HJA_NUMBER 60
-#define SCE_HJA_WORD 61
-#define SCE_HJA_KEYWORD 62
-#define SCE_HJA_DOUBLESTRING 63
-#define SCE_HJA_SINGLESTRING 64
-#define SCE_HJA_SYMBOLS 65
-#define SCE_HJA_STRINGEOL 66
-// Embedded VBScript
-#define SCE_HB_START 70
-#define SCE_HB_DEFAULT 71
-#define SCE_HB_COMMENTLINE 72
-#define SCE_HB_NUMBER 73
-#define SCE_HB_WORD 74
-#define SCE_HB_STRING 75
-#define SCE_HB_IDENTIFIER 76
-#define SCE_HB_STRINGEOL 77
-// ASP VBScript
-#define SCE_HBA_START 80
-#define SCE_HBA_DEFAULT 81
-#define SCE_HBA_COMMENTLINE 82
-#define SCE_HBA_NUMBER 83
-#define SCE_HBA_WORD 84
-#define SCE_HBA_STRING 85
-#define SCE_HBA_IDENTIFIER 86
-#define SCE_HBA_STRINGEOL 87
-// Embedded Python
-#define SCE_HP_START 90
-#define SCE_HP_DEFAULT 91
-#define SCE_HP_COMMENTLINE 92
-#define SCE_HP_NUMBER 93
-#define SCE_HP_STRING 94
-#define SCE_HP_CHARACTER 95
-#define SCE_HP_WORD 96
-#define SCE_HP_TRIPLE 97
-#define SCE_HP_TRIPLEDOUBLE 98
-#define SCE_HP_CLASSNAME 99
-#define SCE_HP_DEFNAME 100
-#define SCE_HP_OPERATOR 101
-#define SCE_HP_IDENTIFIER 102
-// ASP Python
-#define SCE_HPA_START 105
-#define SCE_HPA_DEFAULT 106
-#define SCE_HPA_COMMENTLINE 107
-#define SCE_HPA_NUMBER 108
-#define SCE_HPA_STRING 109
-#define SCE_HPA_CHARACTER 110
-#define SCE_HPA_WORD 111
-#define SCE_HPA_TRIPLE 112
-#define SCE_HPA_TRIPLEDOUBLE 113
-#define SCE_HPA_CLASSNAME 114
-#define SCE_HPA_DEFNAME 115
-#define SCE_HPA_OPERATOR 116
-#define SCE_HPA_IDENTIFIER 117
-
-// Lexical states for SCLEX_PERL
-#define SCE_PL_DEFAULT 0
-#define SCE_PL_HERE 1
-#define SCE_PL_COMMENTLINE 2
-#define SCE_PL_POD 3
-#define SCE_PL_NUMBER 4
-#define SCE_PL_WORD 5
-#define SCE_PL_STRING 6
-#define SCE_PL_CHARACTER 7
-#define SCE_PL_PUNCTUATION 8
-#define SCE_PL_PREPROCESSOR 9
-#define SCE_PL_OPERATOR 10
-#define SCE_PL_IDENTIFIER 11
-#define SCE_PL_SCALAR 12
-#define SCE_PL_ARRAY 13
-#define SCE_PL_HASH 14
-#define SCE_PL_SYMBOLTABLE 15
-#define SCE_PL_REF 16
-#define SCE_PL_REGEX 17
-#define SCE_PL_REGSUBST 18
-#define SCE_PL_LONGQUOTE 19
-#define SCE_PL_BACKTICKS 20
-#define SCE_PL_DATASECTION 21
-    
-#endif

contrib/src/stc/scintilla/include/Scintilla.h

@@ -1,423 +0,0 @@
-// Scintilla source code edit control
-// Scintilla.h - interface to the edit control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCINTILLA_H
-#define SCINTILLA_H
-
-// Compile-time configuration options
-#define MACRO_SUPPORT 1  // Comment out to remove macro hooks
-
-#if PLAT_GTK
-#include <gdk/gdk.h>
-#include <gtk/gtkvbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAS	T (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
-
-	typedef struct _ScintillaObject ScintillaObject;
-	typedef struct _ScintillaClass  ScintillaClass;
-
-	struct _ScintillaObject
-	{
-		GtkFixed vbox;
-		void *pscin;
-	};
-
-	struct _ScintillaClass
-	{
-		GtkFixedClass parent_class;
-
-		void (* command) (ScintillaObject *ttt);
-		void (* notify) (ScintillaObject *ttt);
-	};
-
-	guint		scintilla_get_type	(void);
-	GtkWidget*	scintilla_new		(void);
-	void		scintilla_set_id	(ScintillaObject *sci,int id);
-	long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
-
-#include "WinDefs.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#if PLAT_WX
-#include "WinDefs.h"
-#endif
-
-// Both GTK and Windows
-
-#define INVALID_POSITION -1 
-
-// Define start of Scintilla messages to be greater than all edit (EM_*) messages
-// as many EM_ messages can be used.
-#define SCI_START 2000
-#define SCI_OPTIONAL_START 3000
-#define SCI_LEXER_START 4000
-
-#define SCI_ADDTEXT SCI_START + 1
-#define SCI_ADDSTYLEDTEXT SCI_START + 2
-#define SCI_INSERTTEXT SCI_START + 3
-#define SCI_CLEARALL SCI_START + 4
-#define SCI_GETLENGTH SCI_START + 6
-#define SCI_GETCHARAT SCI_START + 7
-#define SCI_GETCURRENTPOS SCI_START + 8
-#define SCI_GETANCHOR SCI_START + 9
-#define SCI_GETSTYLEAT SCI_START + 10
-
-#define SCI_REDO SCI_START + 11
-#define SCI_SETUNDOCOLLECTION SCI_START + 12
-#define SCI_SELECTALL SCI_START + 13
-#define SCI_SETSAVEPOINT SCI_START + 14
-#define SCI_GETSTYLEDTEXT SCI_START + 15
-#define SCI_CANREDO SCI_START + 16
-#define SCI_MARKERLINEFROMHANDLE SCI_START + 17
-#define SCI_MARKERDELETEHANDLE SCI_START + 18
-
-#define SC_UNDOCOLLECT_NONE 0
-#define SC_UNDOCOLLECT_AUTOSTART 1
-
-#define SCI_GETVIEWWS SCI_START + 20
-#define SCI_SETVIEWWS SCI_START + 21
-#define SCI_CHANGEPOSITION SCI_START + 22
-#define SCI_GOTOLINE SCI_START + 24
-#define SCI_GOTOPOS SCI_START + 25
-#define SCI_SETANCHOR SCI_START + 26
-#define SCI_GETCURLINE SCI_START + 27
-#define SCI_GETENDSTYLED SCI_START + 28
-#define SCI_CONVERTEOLS SCI_START + 29
-
-#define SCI_GETEOLMODE SCI_START + 30
-#define SCI_SETEOLMODE SCI_START + 31
-
-#define SC_EOL_CRLF 0
-#define SC_EOL_CR 1
-#define SC_EOL_LF 2
-
-#define SCI_STARTSTYLING SCI_START + 32
-#define SCI_SETSTYLING SCI_START + 33
-
-#define SCI_SETBUFFEREDDRAW SCI_START + 35
-#define SCI_SETTABWIDTH SCI_START + 36
-#define SCI_SETCODEPAGE SCI_START + 37
-#define SCI_SETUSEPALETTE SCI_START + 39
-
-#define MARKER_MAX 31
-
-#define SC_MARK_CIRCLE 0
-#define SC_MARK_ROUNDRECT 1
-#define SC_MARK_ARROW 2
-#define SC_MARK_SMALLRECT 3
-#define SC_MARK_SHORTARROW 4
-#define SC_MARK_EMPTY 5
-#define SC_MARK_ARROWDOWN 6
-#define SC_MARK_MINUS 7
-#define SC_MARK_PLUS 8
-
-#define SCI_MARKERDEFINE SCI_START + 40
-#define SCI_MARKERSETFORE SCI_START + 41
-#define SCI_MARKERSETBACK SCI_START + 42
-#define SCI_MARKERADD SCI_START + 43
-#define SCI_MARKERDELETE SCI_START + 44
-#define SCI_MARKERDELETEALL SCI_START + 45
-#define SCI_MARKERGET SCI_START + 46
-#define SCI_MARKERNEXT SCI_START + 47
-#define SCI_MARKERPREVIOUS SCI_START + 48
-
-#define SC_MARKNUM_FOLDER 30
-#define SC_MARKNUM_FOLDEROPEN 31
-
-#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
-
-#define SC_MARGIN_SYMBOL 0
-#define SC_MARGIN_NUMBER 1
-
-#define SCI_SETMARGINTYPEN SCI_START + 240
-#define SCI_GETMARGINTYPEN SCI_START + 241
-#define SCI_SETMARGINWIDTHN SCI_START + 242
-#define SCI_GETMARGINWIDTHN SCI_START + 243
-#define SCI_SETMARGINMASKN SCI_START + 244
-#define SCI_GETMARGINMASKN SCI_START + 245
-#define SCI_SETMARGINSENSITIVEN SCI_START + 246
-#define SCI_GETMARGINSENSITIVEN SCI_START + 247
-
-#define STYLE_DEFAULT 32
-#define STYLE_LINENUMBER 33
-#define STYLE_BRACELIGHT 34
-#define STYLE_BRACEBAD 35
-#define STYLE_CONTROLCHAR 36
-#define STYLE_MAX 127
-
-#define SCI_STYLECLEARALL SCI_START + 50
-#define SCI_STYLESETFORE SCI_START + 51
-#define SCI_STYLESETBACK SCI_START + 52
-#define SCI_STYLESETBOLD SCI_START + 53
-#define SCI_STYLESETITALIC SCI_START + 54
-#define SCI_STYLESETSIZE SCI_START + 55
-#define SCI_STYLESETFONT SCI_START + 56
-#define SCI_STYLESETEOLFILLED SCI_START + 57
-#define SCI_STYLERESETDEFAULT SCI_START + 58
-
-#define SCI_SETSELFORE SCI_START + 67
-#define SCI_SETSELBACK SCI_START + 68
-#define SCI_SETCARETFORE SCI_START + 69
-
-#define SCI_ASSIGNCMDKEY SCI_START + 70
-#define SCI_CLEARCMDKEY SCI_START + 71
-#define SCI_CLEARALLCMDKEYS SCI_START + 72
-
-#define SCI_SETSTYLINGEX SCI_START + 73
-
-#define SCI_GETCARETPERIOD SCI_START + 75
-#define SCI_SETCARETPERIOD SCI_START + 76
-#define SCI_SETWORDCHARS SCI_START + 77
-
-#define SCI_BEGINUNDOACTION SCI_START + 78
-#define SCI_ENDUNDOACTION SCI_START + 79
-
-#define INDIC_MAX 7
-
-#define INDIC_PLAIN 0
-#define INDIC_SQUIGGLE 1
-#define INDIC_TT 2
-
-#define INDIC0_MASK 32
-#define INDIC1_MASK 64
-#define INDIC2_MASK 128
-#define INDICS_MASK (INDIC0_MASK | INDIC1_MASK | INDIC2_MASK)
-
-#define SCI_INDICSETSTYLE SCI_START + 80
-#define SCI_INDICGETSTYLE SCI_START + 81
-#define SCI_INDICSETFORE SCI_START + 82
-#define SCI_INDICGETFORE SCI_START + 83
-
-#define SCI_SETSTYLEBITS SCI_START + 90
-#define SCI_GETSTYLEBITS SCI_START + 91
-#define SCI_SETLINESTATE SCI_START + 92
-#define SCI_GETLINESTATE SCI_START + 93
-#define SCI_GETMAXLINESTATE SCI_START + 94
-
-#define SCI_AUTOCSHOW SCI_START + 100
-#define SCI_AUTOCCANCEL SCI_START + 101
-#define SCI_AUTOCACTIVE SCI_START + 102
-#define SCI_AUTOCPOSSTART SCI_START + 103
-#define SCI_AUTOCCOMPLETE SCI_START + 104
-#define SCI_AUTOCSTOPS SCI_START + 105
-
-#define SCI_CALLTIPSHOW SCI_START + 200
-#define SCI_CALLTIPCANCEL SCI_START + 201
-#define SCI_CALLTIPACTIVE SCI_START + 202
-#define SCI_CALLTIPPOSSTART SCI_START + 203
-#define SCI_CALLTIPSETHLT SCI_START + 204
-#define SCI_CALLTIPSETBACK SCI_START + 205
-
-#define SC_FOLDLEVELBASE 0x400
-#define SC_FOLDLEVELWHITEFLAG 0x1000
-#define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELNUMBERMASK 0x0FFF
-
-#define SCI_VISIBLEFROMDOCLINE SCI_START + 220
-#define SCI_DOCLINEFROMVISIBLE SCI_START + 221
-#define SCI_SETFOLDLEVEL SCI_START + 222
-#define SCI_GETFOLDLEVEL SCI_START + 223
-#define SCI_GETLASTCHILD SCI_START + 224
-#define SCI_GETFOLDPARENT SCI_START + 225
-#define SCI_SHOWLINES SCI_START + 226
-#define SCI_HIDELINES SCI_START + 227
-#define SCI_GETLINEVISIBLE SCI_START + 228
-#define SCI_SETFOLDEXPANDED SCI_START + 229
-#define SCI_GETFOLDEXPANDED SCI_START + 230
-#define SCI_TOGGLEFOLD SCI_START + 231
-#define SCI_ENSUREVISIBLE SCI_START + 232
-#define SCI_SETFOLDFLAGS SCI_START + 233
-
-// Key messages
-#define SCI_LINEDOWN SCI_START + 300
-#define SCI_LINEDOWNEXTEND SCI_START + 301
-#define SCI_LINEUP SCI_START + 302
-#define SCI_LINEUPEXTEND SCI_START + 303
-#define SCI_CHARLEFT SCI_START + 304
-#define SCI_CHARLEFTEXTEND SCI_START + 305
-#define SCI_CHARRIGHT SCI_START + 306
-#define SCI_CHARRIGHTEXTEND SCI_START + 307
-#define SCI_WORDLEFT SCI_START + 308
-#define SCI_WORDLEFTEXTEND SCI_START + 309
-#define SCI_WORDRIGHT SCI_START + 310
-#define SCI_WORDRIGHTEXTEND SCI_START + 311
-#define SCI_HOME SCI_START + 312
-#define SCI_HOMEEXTEND SCI_START + 313
-#define SCI_LINEEND SCI_START + 314
-#define SCI_LINEENDEXTEND SCI_START + 315
-#define SCI_DOCUMENTSTART SCI_START + 316
-#define SCI_DOCUMENTSTARTEXTEND SCI_START + 317
-#define SCI_DOCUMENTEND SCI_START + 318
-#define SCI_DOCUMENTENDEXTEND SCI_START + 319
-#define SCI_PAGEUP SCI_START + 320
-#define SCI_PAGEUPEXTEND SCI_START + 321
-#define SCI_PAGEDOWN SCI_START + 322
-#define SCI_PAGEDOWNEXTEND SCI_START + 323
-#define SCI_EDITTOGGLEOVERTYPE SCI_START + 324
-#define SCI_CANCEL SCI_START + 325
-#define SCI_DELETEBACK SCI_START + 326
-#define SCI_TAB SCI_START + 327
-#define SCI_BACKTAB SCI_START + 328
-#define SCI_NEWLINE SCI_START + 329
-#define SCI_FORMFEED SCI_START + 330
-#define SCI_VCHOME SCI_START + 331
-#define SCI_VCHOMEEXTEND SCI_START + 332
-#define SCI_ZOOMIN SCI_START + 333
-#define SCI_ZOOMOUT SCI_START + 334
-#define SCI_DELWORDLEFT SCI_START + 335
-#define SCI_DELWORDRIGHT SCI_START + 336
-#define SCI_LINECUT SCI_START + 337
-#define SCI_LINEDELETE SCI_START + 338
-#define SCI_LINETRANSPOSE SCI_START + 339
-#define SCI_LOWERCASE SCI_START + 340
-#define SCI_UPPERCASE SCI_START + 341
-
-#define SCI_LINELENGTH SCI_START + 350
-#define SCI_BRACEHIGHLIGHT SCI_START + 351
-#define SCI_BRACEBADLIGHT SCI_START + 352
-#define SCI_BRACEMATCH SCI_START + 353
-#define SCI_GETVIEWEOL SCI_START + 355
-#define SCI_SETVIEWEOL SCI_START + 356
-#define SCI_GETDOCPOINTER SCI_START + 357
-#define SCI_SETDOCPOINTER SCI_START + 358
-#define SCI_SETMODEVENTMASK SCI_START + 359
-
-#define EDGE_NONE 0
-#define EDGE_LINE 1
-#define EDGE_BACKGROUND 2
-
-#define SCI_GETEDGECOLUMN SCI_START + 360
-#define SCI_SETEDGECOLUMN SCI_START + 361
-#define SCI_GETEDGEMODE SCI_START + 362
-#define SCI_SETEDGEMODE SCI_START + 363
-#define SCI_GETEDGECOLOUR SCI_START + 364
-#define SCI_SETEDGECOLOUR SCI_START + 365
-
-#define SCI_SEARCHANCHOR SCI_START + 366
-#define SCI_SEARCHNEXT SCI_START + 367
-#define SCI_SEARCHPREV SCI_START + 368
-
-#define CARET_SLOP 0x01    // Show caret within N lines of edge when it's scrolled to view
-#define CARET_CENTER 0x02  // Center caret on screen when it's scrolled to view
-#define CARET_STRICT 0x04  // OR this with CARET_CENTER to reposition even when visible, or
-                           // OR this with CARET_SLOP to reposition whenever outside slop border
-
-#define SCI_SETCARETPOLICY SCI_START + 369
-#define SCI_LINESONSCREEN SCI_START + 370
-#define SCI_USEPOPUP SCI_START + 371
-
-// GTK+ Specific
-#define SCI_GRABFOCUS SCI_START + 400
-
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-typedef void (tMacroRecorder)(UINT iMessage, WPARAM wParam, LPARAM lParam, 
-                              void *userData);
-#define SCI_STARTRECORD SCI_OPTIONAL_START + 1
-#define SCI_STOPRECORD SCI_OPTIONAL_START + 2
-#endif
-
-#define SCI_SETLEXER SCI_LEXER_START + 1
-#define SCI_GETLEXER SCI_LEXER_START + 2
-#define SCI_COLOURISE SCI_LEXER_START + 3
-#define SCI_SETPROPERTY SCI_LEXER_START + 4
-#define SCI_SETKEYWORDS SCI_LEXER_START + 5
-
-// 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_*.
-#define SC_MOD_INSERTTEXT 0x1
-#define SC_MOD_DELETETEXT 0x2
-#define SC_MOD_CHANGESTYLE 0x4
-#define SC_MOD_CHANGEFOLD 0x8
-#define SC_PERFORMED_USER 0x10
-#define SC_PERFORMED_UNDO 0x20
-#define SC_PERFORMED_REDO 0x40
-#define SC_LASTSTEPINUNDOREDO 0x100
-#define SC_MOD_CHANGEMARKER 0x200
-
-#define SC_MODEVENTMASKALL 0x377
-
-struct SCNotification {
-	NMHDR nmhdr;
-	int position;			// SCN_STYLENEEDED, SCN_MODIFIED
-	int ch;					// SCN_CHARADDED, SCN_KEY
-	int modifiers;			// SCN_KEY
-  	int modificationType;	// SCN_MODIFIED
- 	const char *text;		// SCN_MODIFIED
- 	int length;				// SCN_MODIFIED
- 	int linesAdded;	// SCN_MODIFIED
-#ifdef MACRO_SUPPORT
-	int message;	// SCN_MACRORECORD
-	int wParam;	// SCN_MACRORECORD
-	int lParam;	// SCN_MACRORECORD
-#endif
-	int line;			// SCN_MODIFIED
-	int foldLevelNow;	// SCN_MODIFIED
-	int foldLevelPrev;	// SCN_MODIFIED
-	int margin;	// SCN_MARGINCLICK
-};
-
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-// GTK+ Specific to work around focus and accelerator problems:
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-// The old name for SCN_UPDATEUI:
-#define SCN_CHECKBRACE 2007
-#define SCN_MODIFIED 2008
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-#define SCN_MACRORECORD 2009
-#endif
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-
-#ifdef STATIC_BUILD
-void Scintilla_RegisterClasses(HINSTANCE hInstance);
-#endif
-
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-
-// Default style settings. These are deprecated and will be removed in a future version.
-#define SCI_SETFORE SCI_START + 60
-#define SCI_SETBACK SCI_START + 61
-#define SCI_SETBOLD SCI_START + 62
-#define SCI_SETITALIC SCI_START + 63
-#define SCI_SETSIZE SCI_START + 64
-#define SCI_SETFONT SCI_START + 65
-
-#define SCI_APPENDUNDOSTARTACTION SCI_START + 74
-
-#define SC_UNDOCOLLECT_MANUALSTART 2
-
-// Deprecated in release 1.22
-#define SCI_SETMARGINWIDTH SCI_START + 34
-#define SCI_SETLINENUMBERWIDTH SCI_START + 38
-
-#endif
-
-#endif

contrib/src/stc/scintilla/include/WinDefs.h

@@ -1,218 +0,0 @@
-// Scintilla source code edit control
-// WinDefs.h - the subset of definitions from Windows needed by Scintilla for GTK+
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef WINDEFS_H
-#define WINDEFS_H
-
-#define WORD short
-#define WPARAM unsigned long
-#define LPARAM long
-#define LRESULT long
-#define DWORD long
-
-#define UINT unsigned int
-#define LPSTR char *
-#define LONG long
-
-/* RTF control */
-#define EM_CANPASTE	(1074)
-#define EM_CANUNDO	(198)
-#define EM_CHARFROMPOS	(215)
-#define EM_DISPLAYBAND	(1075)
-#define EM_EMPTYUNDOBUFFER	(205)
-#define EM_EXGETSEL	(1076)
-#define EM_EXLIMITTEXT	(1077)
-#define EM_EXLINEFROMCHAR	(1078)
-#define EM_EXSETSEL	(1079)
-#define EM_FINDTEXT	(1080)
-#define EM_FINDTEXTEX	(1103)
-#define EM_FINDWORDBREAK	(1100)
-#define EM_FMTLINES	(200)
-#define EM_FORMATRANGE	(1081)
-#define EM_GETCHARFORMAT	(1082)
-#define EM_GETEVENTMASK	(1083)
-#define EM_GETFIRSTVISIBLELINE	(206)
-#define EM_GETHANDLE	(189)
-#define EM_GETLIMITTEXT	(213)
-#define EM_GETLINE	(196)
-#define EM_GETLINECOUNT	(186)
-#define EM_GETMARGINS	(212)
-#define EM_GETMODIFY	(184)
-#define EM_GETIMECOLOR	(1129)
-#define EM_GETIMEOPTIONS	(1131)
-#define EM_GETOPTIONS	(1102)
-#define EM_GETOLEINTERFACE	(1084)
-#define EM_GETPARAFORMAT	(1085)
-#define EM_GETPASSWORDCHAR	(210)
-#define EM_GETPUNCTUATION	(1125)
-#define EM_GETRECT	(178)
-#define EM_GETSEL	(176)
-#define EM_GETSELTEXT	(1086)
-#define EM_GETTEXTRANGE	(1099)
-#define EM_GETTHUMB	(190)
-#define EM_GETWORDBREAKPROC	(209)
-#define EM_GETWORDBREAKPROCEX	(1104)
-#define EM_GETWORDWRAPMODE	(1127)
-#define EM_HIDESELECTION	(1087)
-#define EM_LIMITTEXT	(197)
-#define EM_LINEFROMCHAR	(201)
-#define EM_LINEINDEX	(187)
-#define EM_LINELENGTH	(193)
-#define EM_LINESCROLL	(182)
-#define EM_PASTESPECIAL	(1088)
-#define EM_POSFROMCHAR	(214)
-#define EM_REPLACESEL	(194)
-#define EM_REQUESTRESIZE	(1089)
-#define EM_SCROLL	(181)
-#define EM_SCROLLCARET	(183)
-#define EM_SELECTIONTYPE	(1090)
-#define EM_SETBKGNDCOLOR	(1091)
-#define EM_SETCHARFORMAT	(1092)
-#define EM_SETEVENTMASK	(1093)
-#define EM_SETHANDLE	(188)
-#define EM_SETIMECOLOR	(1128)
-#define EM_SETIMEOPTIONS	(1130)
-#define EM_SETLIMITTEXT	(197)
-#define EM_SETMARGINS	(211)
-#define EM_SETMODIFY	(185)
-#define EM_SETOLECALLBACK	(1094)
-#define EM_SETOPTIONS	(1101)
-#define EM_SETPARAFORMAT	(1095)
-#define EM_SETPASSWORDCHAR	(204)
-#define EM_SETPUNCTUATION	(1124)
-#define EM_SETREADONLY	(207)
-#define EM_SETRECT	(179)
-#define EM_SETRECTNP	(180)
-#define EM_SETSEL	(177)
-#define EM_SETTABSTOPS	(203)
-#define EM_SETTARGETDEVICE	(1096)
-#define EM_SETWORDBREAKPROC	(208)
-#define EM_SETWORDBREAKPROCEX	(1105)
-#define EM_SETWORDWRAPMODE	(1126)
-#define EM_STREAMIN	(1097)
-#define EM_STREAMOUT	(1098)
-#define EM_UNDO	(199)
-
-#define WM_NULL		(0)
-#define WM_CLEAR	(771)
-#define WM_COMMAND	(273)
-#define WM_COPY	(769)
-#define WM_CUT	(768)
-#define WM_GETTEXT	(13)
-#define WM_GETTEXTLENGTH	(14)
-#define WM_NOTIFY	(78)
-#define WM_PASTE	(770)
-#define WM_SETTEXT	(12)
-#define WM_UNDO	(772)
-
-#define EN_CHANGE	(768)
-#define EN_KILLFOCUS (512)
-#define EN_SETFOCUS (256)
-
-#define EC_LEFTMARGIN 1
-#define EC_RIGHTMARGIN 2
-#define EC_USEFONTINFO 0xffff
-
-#if PLAT_GTK
-#define VK_DOWN GDK_Down
-#define VK_UP GDK_Up
-#define VK_LEFT GDK_Left
-#define VK_RIGHT GDK_Right
-#define VK_HOME GDK_Home
-#define VK_END GDK_End
-#define VK_PRIOR GDK_Page_Up
-#define VK_NEXT GDK_Page_Down
-#define VK_DELETE GDK_Delete
-#define VK_INSERT GDK_Insert
-#define VK_ESCAPE GDK_Escape
-#define VK_BACK GDK_BackSpace
-#define VK_TAB GDK_Tab
-#define VK_RETURN GDK_Return
-#define VK_ADD GDK_KP_Add
-#define VK_SUBTRACT GDK_KP_Subtract
-#endif
-
-#if PLAT_WX
-#define VK_DOWN         WXK_DOWN
-#define VK_UP           WXK_UP
-#define VK_LEFT         WXK_LEFT
-#define VK_RIGHT        WXK_RIGHT
-#define VK_HOME         WXK_HOME
-#define VK_END          WXK_END
-#define VK_PRIOR        WXK_PRIOR
-#define VK_NEXT         WXK_NEXT
-#define VK_DELETE       WXK_DELETE
-#define VK_INSERT       WXK_INSERT
-#define VK_ESCAPE       WXK_ESCAPE
-#define VK_BACK         WXK_BACK
-#define VK_TAB          WXK_TAB
-#define VK_RETURN       WXK_RETURN
-#define VK_ADD          WXK_ADD
-#define VK_SUBTRACT     WXK_SUBTRACT
-
-// Are these needed any more
-#define LPSTR char *
-#define LONG long
-#define LPDWORD (long *)
-#endif
-
-/* SELCHANGE structure */
-#define SEL_EMPTY	(0)
-#define SEL_TEXT	(1)
-#define SEL_OBJECT	(2)
-#define SEL_MULTICHAR	(4)
-#define SEL_MULTIOBJECT	(8)
-
-/* FINDREPLACE structure */
-#define FR_MATCHCASE	(0x4)
-#define FR_WHOLEWORD	(0x2)
-#define FR_DOWN		(0x1)
-
-#define SHIFT_PRESSED 1
-#define LEFT_CTRL_PRESSED 2
-#define LEFT_ALT_PRESSED 4
-
-struct RECT {
-	LONG left;
-	LONG top;
-	LONG right;
-	LONG bottom;
-};
-
-struct CHARRANGE {
-	LONG cpMin;
-	LONG cpMax;
-};
-
-struct TEXTRANGE {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-};
-
-struct FINDTEXTEX {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-	CHARRANGE chrgText;
-};
-
-struct NMHDR {
-	WindowID hwndFrom;
-	UINT idFrom;
-	UINT code;
-};
-
-struct FORMATRANGE {
-	SurfaceID hdc;
-	SurfaceID hdcTarget;
-	RECT rc;
-	RECT rcPage;
-	CHARRANGE chrg;
-};
-
-#define MAKELONG(a, b) ((a) | ((b) << 16))
-#define LOWORD(x) (x & 0xffff)
-#define HIWORD(x) (x >> 16)
-
-#endif

contrib/src/stc/scintilla/src/Accessor.cxx

@@ -1,166 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.cxx - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <ctype.h> 
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "Scintilla.h"
-
-bool Accessor::InternalIsLeadByte(char ch) {
-#if PLAT_GTK
-	// TODO: support DBCS under GTK+
-	return false;
-#elif PLAT_WIN 
-	return IsDBCSLeadByteEx(codePage, ch);
-#elif PLAT_WX 
-	return false;
-#endif 
-}
-
-void Accessor::Fill(int position) {
-	if (lenDoc == -1)
-		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
-	startPos = position - slopSize;
-	if (startPos + bufferSize > lenDoc)
-		startPos = lenDoc - bufferSize;
-	if (startPos < 0)
-		startPos = 0;
-	endPos = startPos + bufferSize;
-	if (endPos > lenDoc)
-		endPos = lenDoc;
-
-	TEXTRANGE tr = {{startPos, endPos}, buf};
-	Platform::SendScintilla(id, EM_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&tr));
-}
-
-char Accessor::StyleAt(int position) {
-	return static_cast<char>(Platform::SendScintilla(
-		id, SCI_GETSTYLEAT, position, 0));
-}
-
-int Accessor::GetLine(int position) {
-	return Platform::SendScintilla(id, EM_LINEFROMCHAR, position, 0);
-}
-
-int Accessor::LineStart(int line) {
-	return Platform::SendScintilla(id, EM_LINEINDEX, line, 0);
-}
-
-int Accessor::LevelAt(int line) {
-	return Platform::SendScintilla(id, SCI_GETFOLDLEVEL, line, 0);
-}
-
-int Accessor::Length() { 
-	if (lenDoc == -1) 
-		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
-	return lenDoc; 
-}
-
-int Accessor::GetLineState(int line) {
-	return Platform::SendScintilla(id, SCI_GETLINESTATE, line);
-}
-
-int Accessor::SetLineState(int line, int state) {
-	return Platform::SendScintilla(id, SCI_SETLINESTATE, line, state);
-}
-
-void StylingContext::StartAt(unsigned int start, char chMask) {
-	Platform::SendScintilla(id, SCI_STARTSTYLING, start, chMask);
-}
-
-void StylingContext::StartSegment(unsigned int pos) {
-	startSeg = pos;
-}
-
-void StylingContext::ColourTo(unsigned int pos, int chAttr) {
-	// Only perform styling if non empty range
-	if (pos != startSeg - 1) {
-		if (pos < startSeg) {
-			Platform::DebugPrintf("Bad colour positions %d - %d\n", startSeg, pos);
-		}
-
-		if (validLen + (pos - startSeg + 1) >= bufferSize)
-			Flush();
-		if (validLen + (pos - startSeg + 1) >= bufferSize) {
-			// Too big for buffer so send directly
-			Platform::SendScintilla(id, SCI_SETSTYLING, pos - startSeg + 1, chAttr);
-		} else {
-			if (chAttr != chWhile)
-				chFlags = 0;
-			chAttr |= chFlags;
-			for (unsigned int i = startSeg; i <= pos; i++) {
-				styleBuf[validLen++] = chAttr;
-			}
-		}
-	}
-	startSeg = pos+1;
-}
-
-int StylingContext::GetLine(int position) {
-	return Platform::SendScintilla(id, EM_LINEFROMCHAR, position, 0);
-}
-
-void StylingContext::SetLevel(int line, int level) {
-	Platform::SendScintilla(id, SCI_SETFOLDLEVEL, line, level);
-}
-
-void StylingContext::Flush() {
-	if (validLen > 0) {
-		Platform::SendScintilla(id, SCI_SETSTYLINGEX, validLen, 
-			reinterpret_cast<LPARAM>(styleBuf));
-		validLen = 0;
-	}
-}
-
-int StylingContext::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
-	int end = Length();
-	int spaceFlags = 0;
-	
-	// Determines the indentation level of the current line and also checks for consistent 
-	// indentation compared to the previous line.
-	// Indentation is judged consistent when the indentation whitespace of each line lines 
-	// the same or the indentation of one line is a prefix of the other.
-	
-	int pos = LineStart(line);
-	char ch = (*this)[pos];
-	int indent = 0;
-	bool inPrevPrefix = line > 0;
-	int posPrev = inPrevPrefix ? LineStart(line-1) : 0;
-	while ((ch == ' ' || ch == '\t') && (pos < end)) {
-		if (inPrevPrefix) {
-			char chPrev = (*this)[posPrev++];
-			if (chPrev == ' ' || chPrev == '\t') {
-				if (chPrev != ch)
-					spaceFlags |= wsInconsistent;
-			} else {
-				inPrevPrefix = false;
-			}
-		}
-		if (ch == ' ') {
-			spaceFlags |= wsSpace;
-			indent++;
-		} else {	// Tab
-			spaceFlags |= wsTab;
-			if (spaceFlags & wsSpace)
-				spaceFlags |= wsSpaceTab;
-			indent = (indent / 8 + 1) * 8;
-		}
-		ch = (*this)[++pos];
-	}
-	
-	*flags = spaceFlags;
-	indent += SC_FOLDLEVELBASE;
-	// if completely empty line or the start of a comment...
-	if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )
-		return indent | SC_FOLDLEVELWHITEFLAG;
-	else
-		return indent;
-}
-

contrib/src/stc/scintilla/src/AutoComplete.cxx

@@ -1,104 +0,0 @@
-// Scintilla source code edit control
-// AutoComplete.cxx - defines the auto completion list box
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "Platform.h"
-
-#include "AutoComplete.h"
-
-AutoComplete::AutoComplete() {
-	lb = 0;
-	active = false;
-	posStart = 0;
-	strcpy(stopChars, "");
-}
-
-AutoComplete::~AutoComplete() {
-	lb.Destroy();
-}
-
-bool AutoComplete::Active() {
-	return active;
-}
-
-void AutoComplete::Start(Window &parent, int ctrlID, int position, int startLen_) {
-	if (!lb.Created()) {
-		lb.Create(parent, ctrlID);
-	}
-	lb.Clear();
-	active = true;
-	startLen = startLen_;
-	posStart = position;
-}
-
-void AutoComplete::SetStopChars(const char *stopChars_) {
-	strncpy(stopChars, stopChars_, sizeof(stopChars));
-	stopChars[sizeof(stopChars) - 1] = '\0';
-}
-
-bool AutoComplete::IsStopChar(char ch) {
-	return ch && strchr(stopChars, ch);
-}
-
-int AutoComplete::SetList(const char *list) {
-	int maxStrLen = 12;
-	lb.Clear();
-	char *words = new char[strlen(list) + 1];
-	if (words) {
-		strcpy(words, list);
-		char *startword = words;
-		int i = 0;
-		for (; words && words[i]; i++) {
-			if (words[i] == ' ') {
-				words[i] = '\0';
-				lb.Append(startword);
-				maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
-				startword = words + i + 1;
-			}
-		}
-		if (startword) {
-			lb.Append(startword);
-			maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
-		}
-		delete []words;
-	}
-	lb.Sort();
-	return maxStrLen;
-}
-
-void AutoComplete::Show() {
-	lb.Show();
-	lb.Select(0);
-}
-
-void AutoComplete::Cancel() {
-	if (lb.Created()) {
-		lb.Destroy();
-		lb = 0;
-		active = false;
-	}
-}
-
-
-void AutoComplete::Move(int delta) {
-	int count = lb.Length();
-	int current = lb.GetSelection();
-	current += delta;
-	if (current >= count)
-		current = count - 1;
-	if (current < 0)
-		current = 0;
-	lb.Select(current);
-}
-
-void AutoComplete::Select(const char *word) {
-	int pos = lb.Find(word);
-	//Platform::DebugPrintf("Autocompleting at <%s> %d\n", wordCurrent, pos);
-	if (pos != -1)
-		lb.Select(pos);
-}
-

contrib/src/stc/scintilla/src/AutoComplete.h

@@ -1,43 +0,0 @@
-// Scintilla source code edit control
-// AutoComplete.h - defines the auto completion list box
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef AUTOCOMPLETE_H
-#define AUTOCOMPLETE_H
-
-class AutoComplete {
-	bool active;
-	char stopChars[256];
-public:
-	ListBox lb;
-	int posStart;
-	int startLen;
-	
-	AutoComplete();
-	~AutoComplete();
-
-	// Is the auto completion list displayed?	
-	bool Active();
-	
-	// Display the auto completion list positioned to be near a character position
-	void Start(Window &parent, int ctrlID, int position, int startLen_);
-	
-	// The stop chars are characters which, when typed, cause the auto completion list to disappear
-	void SetStopChars(const char *stopChars_);
-	bool IsStopChar(char ch);
-	
-	// The list string contains a sequence of words separated by spaces
-	int SetList(const char *list);
-	
-	void Show();
-	void Cancel();
-	
-	// Move the current list element by delta, scrolling appropriately
-	void Move(int delta);
-	
-	// Select a list element that starts with word as the current element
-	void Select(const char *word);
-};
-
-#endif

contrib/src/stc/scintilla/src/CallTip.cxx

@@ -1,168 +0,0 @@
-// Scintilla source code edit control
-// CallTip.cxx - code for displaying call tips
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-
-#include "Platform.h"
-
-#include "CallTip.h"
-
-CallTip::CallTip() {
-	wCallTip = 0;
-	inCallTipMode = false;
-	posStartCallTip = 0;
-	val = 0;
-	startHighlight = 0;
-	endHighlight = 0;
-
-	colourBG.desired = Colour(0xff, 0xff, 0xff);
-	colourUnSel.desired = Colour(0x80, 0x80, 0x80);
-	colourSel.desired = Colour(0, 0, 0x80);
-	colourShade.desired = Colour(0, 0, 0);
-	colourLight.desired = Colour(0xc0, 0xc0, 0xc0);
-}
-
-CallTip::~CallTip() {
-	wCallTip.Destroy();
-	delete []val;
-	val = 0;
-}
-
-void CallTip::RefreshColourPalette(Palette &pal, bool want) {
-	pal.WantFind(colourBG, want);
-	pal.WantFind(colourUnSel, want);
-	pal.WantFind(colourSel, want);
-	pal.WantFind(colourShade, want);
-	pal.WantFind(colourLight, want);
-}
-
-void CallTip::PaintCT(Surface *surfaceWindow) {
-	if (!val)
-		return;
-	PRectangle rcClientPos = wCallTip.GetClientPosition();
-	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
-	                        rcClientPos.bottom - rcClientPos.top);
-	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
-
-	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
-	// To make a nice small call tip window, it is only sized to fit most normal characters without accents
-	int lineHeight = surfaceWindow->Height(font);
-	int ascent = surfaceWindow->Ascent(font) - surfaceWindow->InternalLeading(font);
-
-	// For each line...
-	// Draw the definition in three parts: before highlight, highlighted, after highlight
-	int ytext = rcClient.top + ascent + 1;
-	char *chunkVal = val;
-	bool moreChunks = true;
-	while (moreChunks) {
-		char *chunkEnd = strchr(chunkVal, '\n');
-		if (chunkEnd == NULL) {
-			chunkEnd = chunkVal + strlen(chunkVal);
-			moreChunks = false;
-		}
-		int chunkOffset = chunkVal - val;
-		int chunkLength = chunkEnd - chunkVal;
-		int chunkEndOffset = chunkOffset + chunkLength;
-		int thisStartHighlight = Platform::Maximum(startHighlight, chunkOffset);
-		thisStartHighlight = Platform::Minimum(thisStartHighlight, chunkEndOffset);
-		thisStartHighlight -= chunkOffset;
-		int thisEndHighlight = Platform::Maximum(endHighlight, chunkOffset);
-		thisEndHighlight = Platform::Minimum(thisEndHighlight, chunkEndOffset);
-		thisEndHighlight -= chunkOffset;
-		int x = 5;
-		int xEnd = x + surfaceWindow->WidthText(font, chunkVal, thisStartHighlight);
-		rcClient.left = x;
-		rcClient.top = ytext - ascent - 1;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal, thisStartHighlight,
-		                        colourUnSel.allocated, colourBG.allocated);
-		x = xEnd;
-
-		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisStartHighlight,
-		                                    thisEndHighlight - thisStartHighlight);
-		rcClient.top = ytext;
-		rcClient.left = x;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal + thisStartHighlight, thisEndHighlight - thisStartHighlight,
-		                        colourSel.allocated, colourBG.allocated);
-		x = xEnd;
-
-		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisEndHighlight,
-		                                    chunkLength - thisEndHighlight);
-		rcClient.left = x;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal + thisEndHighlight, chunkLength - thisEndHighlight,
-		                        colourUnSel.allocated, colourBG.allocated);
-		chunkVal = chunkEnd + 1;
-		ytext += lineHeight;
-	}
-	// Draw a raised border around the edges of the window
-	surfaceWindow->MoveTo(0, rcClientSize.bottom - 1);
-	surfaceWindow->PenColour(colourShade.allocated);
-	surfaceWindow->LineTo(rcClientSize.right - 1, rcClientSize.bottom - 1);
-	surfaceWindow->LineTo(rcClientSize.right - 1, 0);
-	surfaceWindow->PenColour(colourLight.allocated);
-	surfaceWindow->LineTo(0, 0);
-	surfaceWindow->LineTo(0, rcClientSize.bottom - 1);
-}
-
-PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
-                                 const char *faceName, int size) {
-	Surface surfaceMeasure;
-	surfaceMeasure.Init();
-	int deviceHeight = (size * surfaceMeasure.LogPixelsY()) / 72;
-	font.Create(faceName, deviceHeight);
-	if (val)
-		delete []val;
-	val = new char[strlen(defn) + 1];
-	if (!val)
-		return PRectangle();
-	strcpy(val, defn);
-	startHighlight = 0;
-	endHighlight = 0;
-	inCallTipMode = true;
-	posStartCallTip = pos;
-	// Look for multiple lines in the text
-	// Only support \n here - simply means container must avoid \r!
-	int width = 0;
-	int numLines = 1;
-	const char *newline;
-	const char *look = val;
-	while ((newline = strchr(look, '\n')) != NULL) {
-		int thisWidth = surfaceMeasure.WidthText(font, look, newline - look);
-		width = Platform::Maximum(width, thisWidth);
-		look = newline + 1;
-		numLines++;
-	}
-	int lastWidth = surfaceMeasure.WidthText(font, look, strlen(look));
-	width = Platform::Maximum(width, lastWidth) + 10;
-	int lineHeight = surfaceMeasure.Height(font);
-	// Extra line for border and an empty line at top and bottom
-	int height = lineHeight * numLines - surfaceMeasure.InternalLeading(font) + 2 + 2;
-	return PRectangle(pt.x -5, pt.y + lineHeight + 1, pt.x + width - 5, pt.y + lineHeight + 1 + height);
-}
-
-
-void CallTip::CallTipCancel() {
-	inCallTipMode = false;
-	if (wCallTip.Created()) {
-		wCallTip.Destroy();
-	}
-}
-
-void CallTip::SetHighlight(int start, int end) {
-	// Avoid flashing by checking something has really changed
-	if ((start != startHighlight) || (end != endHighlight)) {
-		startHighlight = start;
-		endHighlight = end;
-		if (wCallTip.Created()) {
-			wCallTip.InvalidateAll();
-		}
-	}
-}

contrib/src/stc/scintilla/src/CallTip.h

@@ -1,46 +0,0 @@
-// Scintilla source code edit control
-// CallTip.h - interface to the call tip control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CALLTIP_H
-#define CALLTIP_H
-
-const char callClassName[] = "CallTip";
-
-class CallTip {
-	int startHighlight;
-	int endHighlight;
-	char *val;
-	Font font;
-public:
-	Window wCallTip;
-	Window wDraw;
-	bool inCallTipMode;
-	int posStartCallTip;
-	ColourPair colourBG;
-	ColourPair colourUnSel;
-	ColourPair colourSel;
-	ColourPair colourShade;
-	ColourPair colourLight;
-	
-	CallTip();
-	~CallTip();
-	
-	// Claim or accept palette entries for the colours required to paint a calltip
-	void RefreshColourPalette(Palette &pal, bool want);
-	
-	void PaintCT(Surface *surfaceWindow);
-	
-	// Setup the calltip and return a rectangle of the area required
-	PRectangle CallTipStart(int pos, Point pt, const char *defn, 
-		const char *faceName, int size);
-		
-	void CallTipCancel();
-	
-	// Set a range of characters to be displayed in a highlight style.
-	// Commonly used to highlight the current parameter.
-	void SetHighlight(int start, int end);
-};
-
-#endif

contrib/src/stc/scintilla/src/CellBuffer.h

@@ -1,224 +0,0 @@
-// Scintilla source code edit control
-// CellBuffer.h - manages the text of the document
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CELLBUFFER_H
-#define CELLBUFFER_H
-
-// This holds the marker identifier and the marker type to display.
-// MarkerHandleNumbers are members of lists.
-struct MarkerHandleNumber {
-	int handle;
-	int number;
-	MarkerHandleNumber *next;
-};
-
-// A marker handle set contains any number of MarkerHandleNumbers
-class MarkerHandleSet {
-	MarkerHandleNumber *root;
-public:
-	MarkerHandleSet();
-	~MarkerHandleSet();
-	int Length();
-	int NumberFromHandle(int handle);
-	int MarkValue();	// Bit set of marker numbers
-	bool Contains(int handle);
-	bool InsertHandle(int handle, int markerNum);
-	void RemoveHandle(int handle);
-	void RemoveNumber(int markerNum);
-	void CombineWith(MarkerHandleSet *other);
-};
-
-// Each line stores the starting position of the first character of the line in the cell buffer
-// and potentially a marker handle set. Often a line will not have any attached markers.
-struct LineData {
-	int startPosition;
-	MarkerHandleSet *handleSet;
-	LineData() : startPosition(0), handleSet(0) {
-	}
-};
-
-// The line vector contains information about each of the lines in a cell buffer.
-class LineVector {
-public:
-	enum { growSize = 4000 };
-	int lines;
-	LineData *linesData;
-	int size;
-	int *levels;
-	int sizeLevels;
-	
-	// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big.
-	int handleCurrent;
-	
-	LineVector();
-	~LineVector();
-	void Init();
-
-	void Expand(int sizeNew);
-	void ExpandLevels(int sizeNew=-1);
-	void InsertValue(int pos, int value);
-	void SetValue(int pos, int value);
-	void Remove(int pos);
-	int LineFromPosition(int pos);
-	
-	int AddMark(int line, int marker);
-	void MergeMarkers(int pos);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	int LineFromHandle(int markerHandle);
-};
-
-// Actions are used to store all the information required to perform one undo/redo step.
-enum actionType { insertAction, removeAction, startAction };
-
-class Action {
-public:
-	actionType at;
-	int position;
-	char *data;
-	int lenData;
-
-	Action();
-	~Action();
-	void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0);
-	void Destroy();
-	void Grab(Action *source);
-};
-
-enum undoCollectionType { undoCollectNone, undoCollectAutoStart, undoCollectManualStart };
-
-class UndoHistory {
-	Action *actions;
-	int lenActions;
-	int maxAction;
-	int currentAction;
-	int undoSequenceDepth;
-	int savePoint;
-
-	void EnsureUndoRoom();
-	
-public:
-	UndoHistory();
-	~UndoHistory();
-	
-	void AppendAction(actionType at, int position, char *data, int length);
-
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DropUndoSequence();
-	void DeleteUndoHistory();
-	
-	// The save point is a marker in the undo stack where the container has stated that 
-	// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint() const;
-
-	// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is 
-	// called that many times. Similarly for redo.
-	bool CanUndo() const;
-	int StartUndo();
-	const Action &UndoStep();
-	bool CanRedo() const;
-	int StartRedo();
-	const Action &RedoStep();
-};
-
-// Holder for an expandable array of characters that supports undo and line markers
-// Based on article "Data Structures in a Bit-Mapped Text Editor"
-// by Wilfred J. Hansen, Byte January 1987, page 183
-class CellBuffer {
-private:
-	char *body;
-	int size;
-	int length;
-	int part1len;
-	int gaplen;
-	char *part2body;
-	bool readOnly;
-
-	undoCollectionType collectingUndo;
-	UndoHistory uh;
-
-	LineVector lv;
-
-	SVector<int, 4000> lineStates;
-
-	void GapTo(int position);
-	void RoomFor(int insertionLength);
-
-	inline char ByteAt(int position);
-	void SetByteAt(int position, char ch);
-
-public:
-
-	CellBuffer(int initialLength = 4000);
-	~CellBuffer();
-	
-	// Retrieving positions outside the range of the buffer works and returns 0
-	char CharAt(int position);
-	void GetCharRange(char *buffer, int position, int lengthRetrieve);
-	char StyleAt(int position);
-	
-	int ByteLength();
-	int Length();
-	int Lines();
-	int LineStart(int line);
-	int LineFromPosition(int pos) { return lv.LineFromPosition(pos); }
-	const char *InsertString(int position, char *s, int insertLength);
-	void InsertCharStyle(int position, char ch, char style);
-	
-	// Setting styles for positions outside the range of the buffer is safe and has no effect.
-	// True is returned if the style of a character changed.
-	bool SetStyleAt(int position, char style, char mask=(char)0xff);
-	bool SetStyleFor(int position, int length, char style, char mask);
-	
-	const char *DeleteChars(int position, int deleteLength);
-
-	bool IsReadOnly();
-	void SetReadOnly(bool set);
-
-	// The save point is a marker in the undo stack where the container has stated that 
-	// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint();
-
-	// Line marker functions
-	int AddMark(int line, int markerNum);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	int GetMark(int line);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle);
- 
-	// Without undo
-	void BasicInsertString(int position, char *s, int insertLength);
-	void BasicDeleteChars(int position, int deleteLength);
-
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo);
-	bool IsCollectingUndo();
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DeleteUndoHistory();
-	
-	// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is 
-	// called that many times. Similarly for redo.
-	bool CanUndo();
-	int StartUndo();
-	const Action &UndoStep();
-	bool CanRedo();
-	int StartRedo();
-	const Action &RedoStep();
-	
-	int SetLineState(int line, int state);
-	int GetLineState(int line);
-	int GetMaxLineState();
-		
-	int SetLevel(int line, int level);
-	int GetLevel(int line);
-};
-
-#define CELL_SIZE	2
-
-#endif

contrib/src/stc/scintilla/src/ContractionState.cxx

@@ -1,203 +0,0 @@
-// Scintilla source code edit control
-// ContractionState.cxx - manages visibility of lines for folding
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "ContractionState.h"
-
-OneLine::OneLine() {
-	displayLine = 0;
-	docLine = 0;
-	visible = true;
-	expanded = true;
-}
-
-ContractionState::ContractionState() {
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-	valid = false;
-}
-
-ContractionState::~ContractionState() {
-	Clear();
-}
-
-void ContractionState::MakeValid() const {
-	if (!valid) {
-		// Could be cleverer by keeping the index of the last still valid entry 
-		// rather than invalidating all.
-		int linePrev = -1;
-		int lineDisplay = 0;
-		for (int line=0; line<linesInDoc; line++) {
-			lines[line].displayLine = lineDisplay;
-			if (lines[line].visible) {
-				lines[lineDisplay].docLine = line;
-				lineDisplay++;
-			}
-		}
-		valid = true;
-	}
-}
-
-void ContractionState::Clear() {
-	delete []lines;
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-}
-
-int ContractionState::LinesInDoc() const {
-	return linesInDoc;
-}
-
-int ContractionState::LinesDisplayed() const {
-	return linesInDisplay;
-}
-
-int ContractionState::DisplayFromDoc(int lineDoc) const {
-	if (size == 0) {
-		return lineDoc;
-	}
-	MakeValid();
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].displayLine;
-	}
-	return -1;
-}
-
-int ContractionState::DocFromDisplay(int lineDisplay) const {
-	if (lineDisplay <= 0)
-		return 0;
-	if (lineDisplay >= linesInDisplay)
-		return linesInDoc-1;
-	if (size == 0)
-		return lineDisplay;
-	MakeValid();
-	return lines[lineDisplay].docLine;
-}
-
-void ContractionState::Grow(int sizeNew) {
-	OneLine *linesNew = new OneLine[sizeNew];
-	if (linesNew) {
-		int i = 0;
-		for (; i < size; i++) {
-			linesNew[i] = lines[i];
-		}
-		for (; i < sizeNew; i++) {
-			linesNew[i].displayLine = i;
-		}
-		delete []lines;
-		lines = linesNew;
-		size = sizeNew;
-		valid = false;
-	} else {
-		Platform::DebugPrintf("No memory available\n");
-		// TODO: Blow up
-	}
-}
-
-void ContractionState::InsertLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc += lineCount;
-		linesInDisplay += lineCount;
-		return;
-	}
-	//Platform::DebugPrintf("InsertLine[%d] = %d\n", lineDoc);
-	if ((linesInDoc + lineCount + 2) >= size) {
-		Grow(linesInDoc + lineCount + growSize);
-	}
-	linesInDoc += lineCount;
-	linesInDisplay += lineCount;
-	for (int i = linesInDoc + 1; i >= lineDoc + lineCount; i--) {
-		lines[i].visible = lines[i - lineCount].visible;
-		lines[i].expanded = lines[i - lineCount].expanded;
-	}
-	for (int d=0;d<lineCount;d++) {
-		lines[lineDoc+d].visible = true;	// Should inherit visibility from context ?
-		lines[lineDoc+d].expanded = true;
-	}
-	valid = false;
-}
-
-void ContractionState::DeleteLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc -= lineCount;
-		linesInDisplay -= lineCount;
-		return;
-	}
-	int delta = 0;
-	for (int d=0;d<lineCount;d++)
-		if (lines[lineDoc+d].visible)
-			delta--;
-	for (int i = lineDoc; i < linesInDoc-lineCount; i++) {
-		lines[i].visible = lines[i + lineCount].visible;
-		lines[i].expanded = lines[i + lineCount].expanded;
-	}
-	linesInDoc -= lineCount;
-	linesInDisplay += delta;
-	valid = false;
-}
-
-bool ContractionState::GetVisible(int lineDoc) const {
-	if (size == 0)
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].visible;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible) {
-	if (size == 0) {
-		Grow(linesInDoc + growSize);
-	}
-	// TODO: modify docLine members to mirror displayLine
-	int delta = 0;
-	// Change lineDocs
-	if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < linesInDoc)) {
-		for (int line=lineDocStart; line <= lineDocEnd; line++) {
-			if (lines[line].visible != visible) {
-				delta += visible ? 1 : -1;		
-				lines[line].visible = visible;
-			}
-			lines[line].displayLine += delta;
-		}
-		if (delta != 0) {
-			for (int line=lineDocEnd+1; line <= linesInDoc; line++) {
-				lines[line].displayLine += delta;
-			}
-		}
-	}
-	linesInDisplay += delta;
-	valid = false;
-	return delta != 0;
-}
-
-bool ContractionState::GetExpanded(int lineDoc) const {
-	if (size == 0) 
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].expanded;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetExpanded(int lineDoc, bool expanded) {
-	if (size == 0) {
-		Grow(linesInDoc + growSize);
-	}
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		if (lines[lineDoc].expanded != expanded) {
-			lines[lineDoc].expanded = expanded;
-			return true;
-		}
-	}
-	return false;
-}

contrib/src/stc/scintilla/src/ContractionState.h

@@ -1,50 +0,0 @@
-// Scintilla source code edit control
-// ContractionState.h - manages visibility of lines for folding
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CONTRACTIONSTATE_H
-#define CONTRACTIONSTATE_H
-
-class OneLine {
-public:
-	int displayLine;	// position within set of visible lines
-	int docLine;		// inverse of displayLine
-	bool visible;
-	bool expanded;
-	
-	OneLine();
-	virtual ~OneLine() {}
-};
-
-class ContractionState {
-	void Grow(int sizeNew);
-	enum { growSize = 4000 };
-	int linesInDoc;
-	int linesInDisplay;
-	mutable OneLine *lines;
-	int size;
-	mutable bool valid;
-	void MakeValid() const;
-public:
-	ContractionState();
-	virtual ~ContractionState();
-	
-	void Clear();
-	
-	int LinesInDoc() const;	
-	int LinesDisplayed() const;	
-	int DisplayFromDoc(int lineDoc) const;
-	int DocFromDisplay(int lineDisplay) const;
-	
-	void InsertLines(int lineDoc, int lineCount);
-	void DeleteLines(int lineDoc, int lineCount);
-	
-	bool GetVisible(int lineDoc) const;
-	bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
-	
-	bool GetExpanded(int lineDoc) const;
-	bool SetExpanded(int lineDoc, bool expanded);
-};
-
-#endif

contrib/src/stc/scintilla/src/Document.cxx

@@ -1,797 +0,0 @@
-// Scintilla source code edit control
-// Document.cxx - text document that handles notifications, DBCS, styling, words and end of line
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "Document.h"
-
-Document::Document() {
-	refCount = 0;
-#ifdef unix
-	eolMode = SC_EOL_LF;
-#else
-	eolMode = SC_EOL_CRLF;
-#endif
-	dbcsCodePage = 0;
-	stylingBits = 5;
-	stylingBitsMask = 0x1F;
-	stylingPos = 0;
-	stylingMask = 0;
-	for (int ch = 0; ch < 256; ch++) {
-		wordchars[ch] = isalnum(ch) || ch == '_';
-	}
-	endStyled = 0;
-	enteredCount = 0;
-	tabInChars = 8;
-	watchers = 0;
-	lenWatchers = 0;
-}
-
-Document::~Document() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyDeleted(this, watchers[i].userData);
-	}
-	delete []watchers;
-	watchers = 0;
-	lenWatchers = 0;
-}
-
-// Increase reference count and return its previous value.
-int Document::AddRef() {
-	return refCount++;
-}
-
-// Decrease reference count and return its provius value.
-// Delete the document if reference count reaches zero.
-int Document::Release() {
-	int curRefCount = --refCount;
-	if (curRefCount == 0)
-		delete this;
-	return curRefCount;
-}
-
-void Document::SetSavePoint() {
-	cb.SetSavePoint();
-	NotifySavePoint(true);
-}
-
-int Document::AddMark(int line, int markerNum) { 
-	int prev = cb.AddMark(line, markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0);
-	NotifyModified(mh);
-	return prev;
-}
-
-void Document::DeleteMark(int line, int markerNum) { 
-	cb.DeleteMark(line, markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0);
-	NotifyModified(mh);
-}
-
-void Document::DeleteMarkFromHandle(int markerHandle) { 
-	cb.DeleteMarkFromHandle(markerHandle); 
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	NotifyModified(mh);
-}
-
-void Document::DeleteAllMarks(int markerNum) { 
-	cb.DeleteAllMarks(markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	NotifyModified(mh);
-}
-
-int Document::LineStart(int line) {
-	return cb.LineStart(line);
-}
-
-int Document::LineEnd(int line) {
-	if (line == LinesTotal() - 1) {
-		return LineStart(line + 1);
-	} else {
-		int position = LineStart(line + 1) - 1;
-		// When line terminator is CR+LF, may need to go back one more
-		if ((position > LineStart(line)) && (cb.CharAt(position - 1) == '\r')) {
-			position--;
-		}
-		return position;
-	}
-}
-
-int Document::LineFromPosition(int pos) {
-	return cb.LineFromPosition(pos);
-}
-
-int Document::LineEndPosition(int position) {
-	return LineEnd(LineFromPosition(position));
-}
-
-int Document::VCHomePosition(int position) {
-	int line = LineFromPosition(position);
-	int startPosition = LineStart(line);
-	int endLine = LineStart(line + 1) - 1;
-	int startText = startPosition;
-	while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t' ) )
-		startText++;
-	if (position == startText)
-		return startPosition;
-	else
-		return startText;
-}
-
-int Document::SetLevel(int line, int level) { 
-	int prev = cb.SetLevel(line, level); 
-	if (prev != level) {
-		DocModification mh(SC_MOD_CHANGEFOLD, LineStart(line), 0, 0, 0);
-		mh.line = line;
-		mh.foldLevelNow = level;
-		mh.foldLevelPrev = prev;
-		NotifyModified(mh);
-	}
-	return prev;
-}
-
-static bool IsSubordinate(int levelStart, int levelTry) {
-	if (levelTry & SC_FOLDLEVELWHITEFLAG)
-		return true;
-	else 
-		return (levelStart & SC_FOLDLEVELNUMBERMASK) < (levelTry & SC_FOLDLEVELNUMBERMASK);
-}
-
-int Document::GetLastChild(int lineParent, int level) {
-	if (level == -1)
-		level = GetLevel(lineParent) & SC_FOLDLEVELNUMBERMASK;
-	int maxLine = LinesTotal();
-	int lineMaxSubord = lineParent;
-	while (lineMaxSubord < maxLine-1) {
-		EnsureStyledTo(LineStart(lineMaxSubord+2));
-		if (!IsSubordinate(level, GetLevel(lineMaxSubord+1)))
-			break;
-		lineMaxSubord++;
-	}
-	if (lineMaxSubord > lineParent) {
-		if (level > (GetLevel(lineMaxSubord+1) & SC_FOLDLEVELNUMBERMASK)) {
-			// Have chewed up some whitespace that belongs to a parent so seek back 
-			if ((lineMaxSubord > lineParent) && (GetLevel(lineMaxSubord) & SC_FOLDLEVELWHITEFLAG)) {
-				lineMaxSubord--;
-			}
-		}
-	}
-	return lineMaxSubord;
-}
-
-int Document::GetFoldParent(int line) {
-	int level = GetLevel(line);
-	int lineLook = line-1;
-	while ((lineLook > 0) && (
-		(!(GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG)) || 
-		((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) >= level))
-	) {
-		lineLook--;
-	}
-	if ((GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG) &&
-		((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) < level)) {
-		return lineLook;
-	} else {
-		return -1;
-	}
-}
-
-int Document::ClampPositionIntoDocument(int pos) {
-	return Platform::Clamp(pos, 0, Length());
-}
-
-bool Document::IsCrLf(int pos) {
-	if (pos < 0)
-		return false;
-	if (pos >= (Length() - 1))
-		return false;
-	return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n');
-}
-
-bool Document::IsDBCS(int pos) {
-#if PLAT_WIN
-	if (dbcsCodePage) {
-		// Anchor DBCS calculations at start of line because start of line can
-		// not be a DBCS trail byte.
-		int startLine = pos;
-		while (startLine > 0 && cb.CharAt(startLine) != '\r' && cb.CharAt(startLine) != '\n')
-			startLine--;
-		while (startLine <= pos) {
-			if (IsDBCSLeadByteEx(dbcsCodePage, cb.CharAt(startLine))) {
-				startLine++;
-				if (startLine >= pos)
-					return true;
-			}
-			startLine++;
-		}
-	}
-	return false;
-#else
-	return false;
-#endif
-}
-
-// Normalise a position so that it is not halfway through a two byte character.
-// This can occur in two situations -
-// When lines are terminated with \r\n pairs which should be treated as one character.
-// When displaying DBCS text such as Japanese.
-// If moving, move the position in the indicated direction.
-int Document::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) {
-	//Platform::DebugPrintf("NoCRLF %d %d\n", pos, moveDir);
-	// If out of range, just return value - should be fixed up after
-	if (pos < 0)
-		return pos;
-	if (pos > Length())
-		return pos;
-
-	// Position 0 and Length() can not be between any two characters
-	if (pos == 0)
-		return pos;
-	if (pos == Length())
-		return pos;
-
-	// assert pos > 0 && pos < Length()
-	if (checkLineEnd && IsCrLf(pos - 1)) {
-		if (moveDir > 0)
-			return pos + 1;
-		else
-			return pos - 1;
-	}
-
-	// Not between CR and LF
-
-#if PLAT_WIN
-	if (dbcsCodePage) {
-		// Anchor DBCS calculations at start of line because start of line can
-		// not be a DBCS trail byte.
-		int startLine = pos;
-		while (startLine > 0 && cb.CharAt(startLine) != '\r' && cb.CharAt(startLine) != '\n')
-			startLine--;
-		bool atLeadByte = false;
-		while (startLine < pos) {
-			if (atLeadByte)
-				atLeadByte = false;
-			else if (IsDBCSLeadByteEx(dbcsCodePage, cb.CharAt(startLine)))
-				atLeadByte = true;
-			else
-				atLeadByte = false;
-			startLine++;
-			//Platform::DebugPrintf("DBCS %s\n", atlead ? "D" : "-");
-		}
-
-		if (atLeadByte) {
-			// Position is between a lead byte and a trail byte
-			if (moveDir > 0)
-				return pos + 1;
-			else
-				return pos - 1;
-		}
-	}
-#endif
-
-	return pos;
-}
-
-void Document::ModifiedAt(int pos) {
-	if (endStyled > pos)
-		endStyled = pos;
-}
-
-// Document only modified by gateways DeleteChars, InsertStyledString, Undo, Redo, and SetStyleAt.
-// SetStyleAt does not change the persistent state of a document
-
-// Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number
-void Document::DeleteChars(int pos, int len) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
-		if (!cb.IsReadOnly()) {
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.DeleteChars(pos*2, len * 2);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			ModifiedAt(pos);
-			int modFlags = SC_MOD_DELETETEXT | SC_PERFORMED_USER;
-			DocModification mh(modFlags, pos, len, LinesTotal() - prevLinesTotal, text);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-void Document::InsertStyledString(int position, char *s, int insertLength) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
-		if (!cb.IsReadOnly()) {
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.InsertString(position, s, insertLength);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			ModifiedAt(position / 2);
-	
-			int modFlags = SC_MOD_INSERTTEXT | SC_PERFORMED_USER;
-			DocModification mh(modFlags, position / 2, insertLength / 2, LinesTotal() - prevLinesTotal, text);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-int Document::Undo() {
-	int newPos = 0;
-	if (enteredCount == 0) {
-		enteredCount++;
-		bool startSavePoint = cb.IsSavePoint();
-		int steps = cb.StartUndo();
-		//Platform::DebugPrintf("Steps=%d\n", steps);
-		for (int step=0; step<steps; step++) {
-			int prevLinesTotal = LinesTotal();
-			const Action &action = cb.UndoStep();
-			int cellPosition = action.position / 2;
-			ModifiedAt(cellPosition);
-			newPos = cellPosition;
-			
-			int modFlags = SC_PERFORMED_UNDO;
-			// With undo, an insertion action becomes a deletion notification
-			if (action.at == removeAction) {
-				newPos += action.lenData;
-				modFlags |= SC_MOD_INSERTTEXT;
-			} else {
-				modFlags |= SC_MOD_DELETETEXT;
-			}
-			if (step == steps-1)
-				modFlags |= SC_LASTSTEPINUNDOREDO;
-			NotifyModified(DocModification(modFlags, cellPosition, action.lenData, 
-				LinesTotal() - prevLinesTotal, action.data));
-		}
-	
-		bool endSavePoint = cb.IsSavePoint();
-		if (startSavePoint != endSavePoint)
-			NotifySavePoint(endSavePoint);
-		enteredCount--;
-	}
-	return newPos;
-}
-
-int Document::Redo() {
-	int newPos = 0;
-	if (enteredCount == 0) {
-		enteredCount++;
-		bool startSavePoint = cb.IsSavePoint();
-		int steps = cb.StartRedo();
-		for (int step=0; step<steps; step++) {
-			int prevLinesTotal = LinesTotal();
-			const Action &action = cb.RedoStep();
-			int cellPosition = action.position / 2;
-			ModifiedAt(cellPosition);
-			newPos = cellPosition;
-			
-			int modFlags = SC_PERFORMED_REDO;
-			if (action.at == insertAction) {
-				newPos += action.lenData;
-				modFlags |= SC_MOD_INSERTTEXT;
-			} else {
-				modFlags |= SC_MOD_DELETETEXT;
-			}
-			if (step == steps-1)
-				modFlags |= SC_LASTSTEPINUNDOREDO;
-			NotifyModified(DocModification(modFlags, cellPosition, action.lenData, 
-				LinesTotal() - prevLinesTotal, action.data));
-		}
-	
-		bool endSavePoint = cb.IsSavePoint();
-		if (startSavePoint != endSavePoint)
-			NotifySavePoint(endSavePoint);
-		enteredCount--;
-	}
-	return newPos;
-}
-
-void Document::InsertChar(int pos, char ch) {
-	char chs[2];
-	chs[0] = ch;
-	chs[1] = 0;
-	InsertStyledString(pos*2, chs, 2);
-}
-
-// Insert a null terminated string
-void Document::InsertString(int position, const char *s) {
-	InsertString(position, s, strlen(s));
-}
-
-// Insert a string with a length
-void Document::InsertString(int position, const char *s, int insertLength) {
-	char *sWithStyle = new char[insertLength * 2];
-	if (sWithStyle) {
-		for (int i = 0; i < insertLength; i++) {
-			sWithStyle[i*2] = s[i];
-			sWithStyle[i*2 + 1] = 0;
-		}
-		InsertStyledString(position*2, sWithStyle, insertLength*2);
-		delete []sWithStyle;
-	}
-}
-
-void Document::ChangeChar(int pos, char ch) {
-	DeleteChars(pos, 1);
-	InsertChar(pos, ch);
-}
-
-void Document::DelChar(int pos) {
-	if (IsCrLf(pos)) {
-		DeleteChars(pos, 2);
-	} else if (IsDBCS(pos)) {
-		DeleteChars(pos, 2);
-	} else if (pos < Length()) {
-		DeleteChars(pos, 1);
-	}
-}
-
-int Document::DelCharBack(int pos) {
-	if (pos <= 0) {
-		return pos;
-	} else if (IsCrLf(pos - 2)) {
-		DeleteChars(pos - 2, 2);
-		return pos - 2;
-	} else if (IsDBCS(pos - 1)) {
-		DeleteChars(pos - 2, 2);
-		return pos - 2;
-	} else {
-		DeleteChars(pos - 1, 1);
-		return pos - 1;
-	}
-}
-
-void Document::Indent(bool forwards, int lineBottom, int lineTop) {
-	if (forwards) {
-		// Indent by a tab
-		for (int line = lineBottom; line >= lineTop; line--) {
-			InsertChar(LineStart(line), '\t');
-		}
-	} else {
-		// Dedent - suck white space off the front of the line to dedent by equivalent of a tab
-		for (int line = lineBottom; line >= lineTop; line--) {
-			int ispc = 0;
-			while (ispc < tabInChars && cb.CharAt(LineStart(line) + ispc) == ' ')
-				ispc++;
-			int posStartLine = LineStart(line);
-			if (ispc == tabInChars) {
-				DeleteChars(posStartLine, ispc);
-			} else if (cb.CharAt(posStartLine + ispc) == '\t') {
-				DeleteChars(posStartLine, ispc + 1);
-			} else {	// Hit a non-white
-				DeleteChars(posStartLine, ispc);
-			}
-		}
-	}
-}
-
-void Document::ConvertLineEnds(int eolModeSet) {
-	BeginUndoAction();
-	for (int pos = 0; pos < Length(); pos++) {
-		if (cb.CharAt(pos) == '\r') {
-			if (cb.CharAt(pos+1) == '\n') {
-				if (eolModeSet != SC_EOL_CRLF) {
-					DeleteChars(pos, 2);
-					if (eolModeSet == SC_EOL_CR)
-						InsertString(pos, "\r", 1);
-					else
-						InsertString(pos, "\n", 1);
-				} else {
-					pos++;
-				}
-			} else {
-				if (eolModeSet != SC_EOL_CR) {
-					DeleteChars(pos, 1);
-					if (eolModeSet == SC_EOL_CRLF) {
-						InsertString(pos, "\r\n", 2);
-						pos++;
-					} else {
-						InsertString(pos, "\n", 1);
-					}
-				}
-			}
-		} else if (cb.CharAt(pos) == '\n') {
-			if (eolModeSet != SC_EOL_LF) {
-				DeleteChars(pos, 1);
-				if (eolModeSet == SC_EOL_CRLF) {
-					InsertString(pos, "\r\n", 2);
-					pos++;
-				} else {
-					InsertString(pos, "\r", 1);
-				}
-			}
-		}
-	}
-	EndUndoAction();
-}
-
-bool Document::IsWordChar(unsigned char ch) {
-	return wordchars[ch];
-}
-
-int Document::ExtendWordSelect(int pos, int delta) {
-	if (delta < 0) {
-		while (pos > 0 && IsWordChar(cb.CharAt(pos - 1)))
-			pos--;
-	} else {
-		while (pos < (Length()) && IsWordChar(cb.CharAt(pos)))
-			pos++;
-	}
-	return pos;
-}
-
-int Document::NextWordStart(int pos, int delta) {
-	if (delta < 0) {
-		while (pos > 0 && (cb.CharAt(pos - 1) == ' ' || cb.CharAt(pos - 1) == '\t'))
-			pos--;
-		if (isspace(cb.CharAt(pos - 1))) {	// Back up to previous line
-			while (pos > 0 && isspace(cb.CharAt(pos - 1)))
-				pos--;
-		} else {
-			bool startAtWordChar = IsWordChar(cb.CharAt(pos - 1));
-			while (pos > 0 && !isspace(cb.CharAt(pos - 1)) && (startAtWordChar == IsWordChar(cb.CharAt(pos - 1))))
-				pos--;
-		}
-	} else {
-		bool startAtWordChar = IsWordChar(cb.CharAt(pos));
-		while (pos < (Length()) && isspace(cb.CharAt(pos)))
-			pos++;
-		while (pos < (Length()) && !isspace(cb.CharAt(pos)) && (startAtWordChar == IsWordChar(cb.CharAt(pos))))
-			pos++;
-		while (pos < (Length()) && (cb.CharAt(pos) == ' ' || cb.CharAt(pos) == '\t'))
-			pos++;
-	}
-	return pos;
-}
-
-bool Document::IsWordAt(int start, int end) {
-	int lengthDoc = Length();
-	if (start > 0) {
-		char ch = CharAt(start - 1);
-		if (IsWordChar(ch))
-			return false;
-	}
-	if (end < lengthDoc - 1) {
-		char ch = CharAt(end);
-		if (IsWordChar(ch))
-			return false;
-	}
-	return true;
-}
-
-// Find text in document, supporting both forward and backward
-// searches (just pass minPos > maxPos to do a backward search)
-// Has not been tested with backwards DBCS searches yet.
-long Document::FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word) {
- 	bool forward = minPos <= maxPos;
-	int increment = forward ? 1 : -1;
-
-	// Range endpoints should not be inside DBCS characters, but just in case, move them.
-	int startPos = MovePositionOutsideChar(minPos, increment, false);
-	int endPos = MovePositionOutsideChar(maxPos, increment, false);
- 	
-	// Compute actual search ranges needed
-	int lengthFind = strlen(s);
- 	int endSearch = 0;
- 	if (startPos <= endPos) {
- 		endSearch = endPos - lengthFind + 1;
- 	} else {
- 		endSearch = endPos;
- 	}
-	//Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind);
-	char firstChar = s[0];
-	if (!caseSensitive)
-		firstChar = toupper(firstChar);
-	int pos = startPos;
-	while (forward ? (pos < endSearch) : (pos >= endSearch)) {
-		char ch = CharAt(pos);
-		if (caseSensitive) {
-			if (ch == firstChar) {
-				bool found = true;
-				for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-					ch = CharAt(pos + posMatch);
-					if (ch != s[posMatch])
-						found = false;
-				}
-				if (found) {
-					if ((!word) || IsWordAt(pos, pos + lengthFind))
-						return pos;
-				}
-			}
-		} else {
-			if (toupper(ch) == firstChar) {
-				bool found = true;
-				for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-					ch = CharAt(pos + posMatch);
-					if (toupper(ch) != toupper(s[posMatch]))
-						found = false;
-				}
-				if (found) {
-					if ((!word) || IsWordAt(pos, pos + lengthFind))
-						return pos;
-				}
-			}
-		}
-		pos += increment;
-		if (dbcsCodePage) {
-			// Ensure trying to match from start of character
-			pos = MovePositionOutsideChar(pos, increment, false);
-		}
-	}
-	//Platform::DebugPrintf("Not found\n");
-	return - 1;
-}
-
-int Document::LinesTotal() {
-	return cb.Lines();
-}
-
-void Document::ChangeCase(Range r, bool makeUpperCase) {
-	for (int pos=r.start; pos<r.end; pos++) {
-		char ch = CharAt(pos);
-		if (dbcsCodePage && IsDBCS(pos)) {
-			pos++;
-		} else {
-			if (makeUpperCase) {
-				if (islower(ch)) {
-					ChangeChar(pos, toupper(ch));
-				}
-			} else {
-				if (isupper(ch)) {
-					ChangeChar(pos, tolower(ch));
-				}
-			}
-		}
-	}
-}
-
-void Document::SetWordChars(unsigned char *chars) {
-	int ch;
-	for (ch = 0; ch < 256; ch++) {
-		wordchars[ch] = false;
-	}
-	if (chars) {
-		while (*chars) {
-			wordchars[*chars] = true;
-			chars++;
-		}
-	} else {
-		for (ch = 0; ch < 256; ch++) {
-			wordchars[ch] = isalnum(ch) || ch == '_';
-		}
-	}
-}
-
-void Document::SetStylingBits(int bits) {
-	stylingBits = bits;
-	stylingBitsMask = 0;
-	for (int bit=0; bit<stylingBits; bit++) {
-		stylingBitsMask <<= 1;
-		stylingBitsMask |= 1;
-	}
-}
-
-void Document::StartStyling(int position, char mask) {
-	stylingPos = position;
-	stylingMask = mask;
-}
-
-void Document::SetStyleFor(int length, char style) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		int prevEndStyled = endStyled;
-		if (cb.SetStyleFor(stylingPos, length, style, stylingMask)) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER, 
-				prevEndStyled, length);
-			NotifyModified(mh);
-		}
-		stylingPos += length;
-		endStyled = stylingPos;
-		enteredCount--;
-	}
-}
-
-void Document::SetStyles(int length, char *styles) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		int prevEndStyled = endStyled;
-		bool didChange = false;
-		for (int iPos = 0; iPos < length; iPos++, stylingPos++) {
-			if (cb.SetStyleAt(stylingPos, styles[iPos], stylingMask)) {
-				didChange = true;
-			}
-		}
-		endStyled = stylingPos;
-		if (didChange) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER, 
-				prevEndStyled, endStyled - prevEndStyled);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-bool Document::EnsureStyledTo(int pos) {
-	// Ask the watchers to style, and stop as soon as one responds.
-	for (int i = 0; pos > GetEndStyled() && i < lenWatchers; i++)
-		watchers[i].watcher->NotifyStyleNeeded(this, watchers[i].userData, pos);
-	return pos <= GetEndStyled();
-}
-
-bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData))
-			return false;
-	}
-	WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers + 1];
-	if (!pwNew)
-		return false;
-	for (int j = 0; j < lenWatchers; j++)
-		pwNew[j] = watchers[j];
-	pwNew[lenWatchers].watcher = watcher;
-	pwNew[lenWatchers].userData = userData;
-	delete []watchers;
-	watchers = pwNew;
-	lenWatchers++;
-	return true;
-}
-
-bool Document::RemoveWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData)) {
-			if (lenWatchers == 1) {
-				delete []watchers;
-				watchers = 0;
-				lenWatchers = 0;
-			} else {
-				WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers];
-				if (!pwNew)
-					return false;
-				for (int j = 0; j < lenWatchers - 1; j++) {
-					pwNew[j] = (j < i) ? watchers[j] : watchers[j + 1];
-				}
-				delete []watchers;
-				watchers = pwNew;
-				lenWatchers--;
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-void Document::NotifyModifyAttempt() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModifyAttempt(this, watchers[i].userData);
-	}
-}
-
-void Document::NotifySavePoint(bool atSavePoint) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifySavePoint(this, watchers[i].userData, atSavePoint);
-	}
-}
-
-void Document::NotifyModified(DocModification mh) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModified(this, mh, watchers[i].userData);
-	}
-}

contrib/src/stc/scintilla/src/Document.h

@@ -1,227 +0,0 @@
-// Scintilla source code edit control
-// Document.h - text document that handles notifications, DBCS, styling, words and end of line
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef DOCUMENT_H
-#define DOCUMENT_H
-
-// A Position is a position within a document between two characters or at the beginning or end.
-// Sometimes used as a character index where it identifies the character after the position.
-typedef int Position;
-const Position invalidPosition = -1;
-
-// The range class represents a range of text in a document.
-// The two values are not sorted as one end may be more significant than the other
-// as is the case for the selection where the end position is the position of the caret.
-// If either position is invalidPosition then the range is invalid and most operations will fail.
-class Range {
-public:
-	Position start;
-	Position end;
-	
-	Range(Position pos=0) : 
-		start(pos), end(pos) {
-	};
-	Range(Position start_, Position end_) : 
-		start(start_), end(end_) {
-	};
-	
-	bool Valid() const {
-		return (start != invalidPosition) && (end != invalidPosition);
-	}
-	
-	bool Contains(Position pos) const {
-		if (start < end) {
-			return (pos >= start && pos <= end);
-		} else {
-			return (pos <= start && pos >= end);
-		}
-	}
-	
-	bool Contains(Range other) const {
-		return Contains(other.start) && Contains(other.end);
-	}
-	
-	bool Overlaps(Range other) const {
-		return 
-		Contains(other.start) ||
-		Contains(other.end) ||
-		other.Contains(start) ||
-		other.Contains(end);
-	}
-};
-
-class DocWatcher;
-class DocModification;
-
-class Document {
-
-public:
-	// Used to pair watcher pointer with user data
-	class WatcherWithUserData {
-	public:
-		DocWatcher *watcher;
-		void *userData;
-		WatcherWithUserData() {
-			watcher = 0;
-			userData = 0;
-		}
-	};
-	
-private:	
-	int refCount;
-	CellBuffer cb;
-	bool wordchars[256];
-	int stylingPos;
-	int stylingMask;
-	int endStyled;
-	int enteredCount;
-	
-	WatcherWithUserData *watchers;
-	int lenWatchers;
-	
-public:
-	int stylingBits;
-	int stylingBitsMask;
-	
-	int eolMode;
-	int dbcsCodePage;
-	int tabInChars;
-	
-	Document();
-	virtual ~Document();
-	
-	int AddRef();
-	int Release();
- 	
-	int LineFromPosition(int pos);
-	int ClampPositionIntoDocument(int pos);
-	bool IsCrLf(int pos);
-	int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
-
-	// Gateways to modifying document
-	void DeleteChars(int pos, int len);
-	void InsertStyledString(int position, char *s, int insertLength);
-	int Undo();
-	int Redo();
-	bool CanUndo() { return cb.CanUndo(); }
-	bool CanRedo() { return cb.CanRedo(); }
-	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo) {
-		return cb.SetUndoCollection(collectUndo);
-	}
-	void BeginUndoAction() { cb.BeginUndoAction(); }
-	void EndUndoAction() { cb.EndUndoAction(); }
-	void SetSavePoint();
-	bool IsSavePoint() { return cb.IsSavePoint(); }
-	void Indent(bool forwards, int lineBottom, int lineTop);
-	void ConvertLineEnds(int eolModeSet);
-	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
-
-	void InsertChar(int pos, char ch);
-	void InsertString(int position, const char *s);
-	void InsertString(int position, const char *s, int insertLength);
-	void ChangeChar(int pos, char ch);
-	void DelChar(int pos);
-	int DelCharBack(int pos);
-
-	char CharAt(int position) { return cb.CharAt(position); }
-	void GetCharRange(char *buffer, int position, int lengthRetrieve) {
-		cb.GetCharRange(buffer, position, lengthRetrieve);
-	}
-	char StyleAt(int position) { return cb.StyleAt(position); }
-	int GetMark(int line) { return cb.GetMark(line); }
-	int AddMark(int line, int markerNum);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle) { return cb.LineFromHandle(markerHandle); }
-	int LineStart(int line);
-	int LineEnd(int line);
-	int LineEndPosition(int position);
-	int VCHomePosition(int position);
-
-	int SetLevel(int line, int level);
-	int GetLevel(int line) { return cb.GetLevel(line); }
-	int GetLastChild(int lineParent, int level=-1);
-	int GetFoldParent(int line);
-
-	void Indent(bool forwards);
-	int ExtendWordSelect(int pos, int delta);
-	int NextWordStart(int pos, int delta);
-	int Length() { return cb.Length(); }
-	long FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word);
-	long FindText(WORD iMessage,WPARAM wParam,LPARAM lParam);
-	int LinesTotal();
-	
-	void ChangeCase(Range r, bool makeUpperCase);
-	
-	void SetWordChars(unsigned char *chars);
-	void SetStylingBits(int bits);
-	void StartStyling(int position, char mask);
-	void SetStyleFor(int length, char style);
-	void SetStyles(int length, char *styles);
-	int GetEndStyled() { return endStyled; }
-	bool EnsureStyledTo(int pos);
-
-	int SetLineState(int line, int state) { return cb.SetLineState(line, state); }
-	int GetLineState(int line) { return cb.GetLineState(line); }
-	int GetMaxLineState() { return cb.GetMaxLineState(); }
-		
-	bool AddWatcher(DocWatcher *watcher, void *userData);
-	bool RemoveWatcher(DocWatcher *watcher, void *userData);
-	const WatcherWithUserData *GetWatchers() const { return watchers; }
-	int GetLenWatchers() const { return lenWatchers; }
-	
-private:
-	bool IsDBCS(int pos);
-	bool IsWordChar(unsigned char ch);
-	bool IsWordAt(int start, int end);
-	void ModifiedAt(int pos);
-		
-	void NotifyModifyAttempt();
-	void NotifySavePoint(bool atSavePoint);
-	void NotifyModified(DocModification mh);
-};
-
-// To optimise processing of document modifications by DocWatchers, a hint is passed indicating the 
-// scope of the change.
-// If the DocWatcher is a document view then this can be used to optimise screen updating.
-class DocModification {
-public:
-  	int modificationType;
-	int position;
- 	int length;
- 	int linesAdded;	// Negative if lines deleted
- 	const char *text;	// Only valid for changes to text, not for changes to style
- 	int line;
-	int foldLevelNow;
-	int foldLevelPrev;
-
-	DocModification(int modificationType_, int position_=0, int length_=0, 
-		int linesAdded_=0, const char *text_=0) :
-		modificationType(modificationType_),
-		position(position_),
-		length(length_),
-		linesAdded(linesAdded_),
-		text(text_),
-		line(0),
-		foldLevelNow(0),
-		foldLevelPrev(0) {}
-};
-
-// A class that wants to receive notifications from a Document must be derived from DocWatcher 
-// and implement the notification methods. It can then be added to the watcher list with AddWatcher.
-class DocWatcher {
-public:
-	virtual ~DocWatcher() {}
-	
-	virtual void NotifyModifyAttempt(Document *doc, void *userData) = 0;
-	virtual void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) = 0;
-	virtual void NotifyModified(Document *doc, DocModification mh, void *userData) = 0;
-	virtual void NotifyDeleted(Document *doc, void *userData) = 0;
-	virtual void NotifyStyleNeeded(Document *doc, void *userData, int endPos) = 0;
-};
-
-#endif

contrib/src/stc/scintilla/src/Editor.h

@@ -1,287 +0,0 @@
-// Scintilla source code edit control
-// Editor.h - defines the main editor class
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef EDITOR_H
-#define EDITOR_H
-
-class Caret {
-public:
-	bool active;
-	bool on;
-	int period;
-		
-	Caret();
-};
-
-class Timer {
-
-public:
-	bool ticking;
-	int ticksToWait;
-	enum {tickSize = 100};
-	int tickerID;
-		
-	Timer();
-};
-
-class LineLayout {
-public:
-	// Drawing is only performed for maxLineLength characters on each line.
-	enum {maxLineLength = 4000};
-	int numCharsInLine;
-	char chars[maxLineLength];
-	char styles[maxLineLength];
-	char indicators[maxLineLength];
-	int positions[maxLineLength];
-};
-
-class Editor : public DocWatcher {
-protected:	// ScintillaBase subclass needs access to much of Editor
-
-	// On GTK+, Scintilla is a container widget holding two scroll bars and a drawing area
-	// whereas on Windows there is just one window with both scroll bars turned on.
-	// Therefore, on GTK+ the following are separate windows but only one window on Windows.
-	Window wMain;	// The Scintilla parent window
-	Window wDraw;	// The text drawing area
-
-	// Style resources may be expensive to allocate so are cached between uses.
-	// When a style attribute is changed, this cache is flushed.
-	bool stylesValid;	
-	ViewStyle vs;
-	Palette palette;
-	
-	bool hideSelection;
-	bool inOverstrike;
-
-	// In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to 
-	// the screen. This avoids flashing but is about 30% slower.
-	bool bufferedDraw;
-
-	int xOffset;				// Horizontal scrolled amount in pixels
-	int xCaretMargin;	// Ensure this many pixels visible on both sides of caret
-	
-	Surface pixmapLine;
-	Surface pixmapSelMargin;
-	Surface pixmapSelPattern;
-	// Intellimouse support - currently only implemented for Windows
-	unsigned int ucWheelScrollLines;
-	short cWheelDelta; //wheel delta from roll
-
-	KeyMap kmap;
-
-	Caret caret;
-	Timer timer;
-
-	Point lastClick;
-	unsigned int lastClickTime;
-	enum { selChar, selWord, selLine } selectionType;
-	Point ptMouseLast;
-	bool firstExpose;
-	bool inDragDrop;
-	bool dropWentOutside;
-	int posDrag;
-	int posDrop;
-	int lastXChosen;
-	int lineAnchor;
-	int originalAnchorPos;
-	int currentPos;
-	int anchor;
-	int topLine;
-	int posTopLine;
-	
-	bool needUpdateUI;
-	Position braces[2];
-	int bracesMatchStyle;
-	
-	int edgeState;
-	int theEdge;
-
-	enum { notPainting, painting, paintAbandoned } paintState;
-	PRectangle rcPaint;
-	bool paintingAllText;
-	
-	int modEventMask;
-	
-	char *dragChars;
-	int lenDrag;
-	bool dragIsRectangle;
-	enum { selStream, selRectangle, selRectangleFixed } selType;
-	int xStartSelect;
-	int xEndSelect;
-	
-	int caretPolicy;
-	int caretSlop;
-
-	int searchAnchor;
-
-	int displayPopupMenu;
-
-#ifdef MACRO_SUPPORT
-	int recordingMacro;
-#endif
-
-	int foldFlags;
-	ContractionState cs;
-
-	Document *pdoc;
-
-	Editor();
-	virtual ~Editor();
-	virtual void Initialise() = 0;
-	virtual void Finalise();
-
-	void InvalidateStyleData();
-	void InvalidateStyleRedraw();
-	virtual void RefreshColourPalette(Palette &pal, bool want);
-	void RefreshStyleData();
-	void DropGraphics();
-
-	PRectangle GetClientRectangle();
-	PRectangle GetTextRectangle();
-	
-	int LinesOnScreen();
-	int LinesToScroll();
-	int MaxScrollPos();
-	Point LocationFromPosition(unsigned int pos);
-	int XFromPosition(unsigned int pos);
-	int PositionFromLocation(Point pt);
-	int PositionFromLineX(int line, int x);
-	int LineFromLocation(Point pt);
-	void SetTopLine(int topLineNew);
-	
-	void RedrawRect(PRectangle rc);
-	void Redraw();
-	void RedrawSelMargin();
-	PRectangle RectangleFromRange(int start, int end);
-	void InvalidateRange(int start, int end);
-	
-	int CurrentPosition();
-	bool SelectionEmpty();
-	int SelectionStart(int line=-1);
-	int SelectionEnd(int line=-1);
-	void SetSelection(int currentPos_, int anchor_);
-	void SetSelection(int currentPos_);
-	void SetEmptySelection(int currentPos_);
-	int MovePositionTo(int newPos, bool extend = false);
-	int MovePositionSoVisible(int pos, int moveDir);
-	void SetLastXChosen();
-
-	void ScrollTo(int line);
-	virtual void ScrollText(int linesToMove);
-	void HorizontalScrollTo(int xPos);
-	void EnsureCaretVisible(bool useMargin=true);
-	void ShowCaretAtCurrentPosition();
-	void DropCaret();
-	void InvalidateCaret();
-
-	void PaintSelMargin(Surface *surface, PRectangle &rc);
-        void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout &ll);
-	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int xStart, 
-		PRectangle rcLine, LineLayout &ll);
-	void Paint(Surface *surfaceWindow, PRectangle rcArea);
-	long FormatRange(bool draw, FORMATRANGE *pfr);
-
-	virtual void SetVerticalScrollPos() = 0;
-	virtual void SetHorizontalScrollPos() = 0;
-	virtual bool ModifyScrollBars(int nMax, int nPage) = 0;
-	void SetScrollBarsTo(PRectangle rsClient);
-	void SetScrollBars();
-
-	virtual void AddChar(char ch);
-	void ClearSelection();
-	void ClearAll();
-	void Cut();
-	void PasteRectangular(int pos, const char *ptr, int len);
-	virtual void Copy() = 0;
-	virtual void Paste() = 0;
-	void Clear();
-	void SelectAll();
-	void Undo();
-	void Redo();
-	void DelChar();
-	void DelCharBack();
-	virtual void ClaimSelection() = 0;
-
-	virtual void NotifyChange() = 0;
-	virtual void NotifyFocus(bool focus);
-	virtual void NotifyParent(SCNotification scn) = 0;
-	virtual void NotifyStyleNeeded(int endStyleNeeded);
-	void NotifyChar(char ch);
-	void NotifySavePoint(bool isSavePoint);
-	void NotifyModifyAttempt();
-	virtual void NotifyDoubleClick(Point pt, bool shift);
-	void NotifyUpdateUI();
-	bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt);
-	void NotifyNeedShown(int pos, int len);
-	
-	void NotifyModifyAttempt(Document *document, void *userData);
-	void NotifySavePoint(Document *document, void *userData, bool atSavePoint);
-	void NotifyModified(Document *document, DocModification mh, void *userData);
-	void NotifyDeleted(Document *document, void *userData);
-	void NotifyStyleNeeded(Document *doc, void *userData, int endPos);
-
-	
-#ifdef MACRO_SUPPORT
-	void NotifyMacroRecord(UINT iMessage, WPARAM wParam, LPARAM lParam);
-#endif
-
-	void PageMove(int direction, bool extend=false);
-	void ChangeCaseOfSelection(bool makeUpperCase);
-	void LineTranspose();
-	virtual int KeyCommand(UINT iMessage);
-	virtual int KeyDefault(int /* key */, int /*modifiers*/);
-	int KeyDown(int key, bool shift, bool ctrl, bool alt);
-
-	bool GetWhitespaceVisible();
-	void SetWhitespaceVisible(bool view);
-
-	void Indent(bool forwards);
-
-	long FindText(UINT iMessage,WPARAM wParam,LPARAM lParam);
-	void SearchAnchor();
-	long SearchText(UINT iMessage,WPARAM wParam,LPARAM lParam);
-	void GoToLine(int lineNo);
-
-	char *CopyRange(int start, int end);
-	int SelectionRangeLength();
-	char *CopySelectionRange();
-	void CopySelectionIntoDrag();
-	void SetDragPosition(int newPos);
-	virtual void StartDrag();
-	void DropAt(int position, const char *value, bool moving, bool rectangular);
-	// PositionInSelection returns 0 if position in selection, -1 if position before selection, and 1 if after.
-	// Before means either before any line of selection or before selection on its line, with a similar meaning to after
-	int PositionInSelection(int pos);
-	bool PointInSelection(Point pt);
-	bool PointInSelMargin(Point pt);
-	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-	void ButtonMove(Point pt);
-	void ButtonUp(Point pt, unsigned int curTime, bool ctrl);
-
-	void Tick();
-	virtual void SetTicking(bool on) = 0;
-	virtual void SetMouseCapture(bool on) = 0;
-	virtual bool HaveMouseCapture() = 0;
-
-	void CheckForChangeOutsidePaint(Range r);
-	int BraceMatch(int position, int maxReStyle);
-	void SetBraceHighlight(Position pos0, Position pos1, int matchStyle);
-	
-	void SetDocPointer(Document *document);
-	
-	void Expand(int &line, bool doExpand);
-	void ToggleContraction(int line);
-	void EnsureLineVisible(int line);
-
-	virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) = 0;
-	
-public:
-	// Public so scintilla_send_message can use it
-	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-	// Public so scintilla_set_id can use it
-	int ctrlID;	
-};
-
-#endif

contrib/src/stc/scintilla/src/Indicator.cxx

@@ -1,45 +0,0 @@
-// Scintilla source code edit control
-// Indicator.cxx - defines the style of indicators which are text decorations such as underlining
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-
-void Indicator::Draw(Surface *surface, PRectangle &rc) {
-	surface->PenColour(fore.allocated);
-	int ymid = (rc.bottom + rc.top) / 2;
-	if (style == INDIC_SQUIGGLE) {
-		surface->MoveTo(rc.left, rc.top);
-		int x = rc.left + 2;
-		int y = 2;
-		while (x < rc.right) {
-			surface->LineTo(x, rc.top + y);
-			x += 2;
-			y = 2 - y;
-		}
-		surface->LineTo(rc.right, rc.top + y);	// Finish the line
-	} else if (style == INDIC_TT) {
-		surface->MoveTo(rc.left, ymid);
-		int x = rc.left + 5;
-		while (x < rc.right) {
-			surface->LineTo(x, ymid);
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-			x++;
-			surface->MoveTo(x, ymid);
-			x += 5;
-		}
-		surface->LineTo(rc.right, ymid);	// Finish the line
-		if (x - 3 <= rc.right) {
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-		}
-	} else {	// Either INDIC_PLAIN or unknown
-		surface->MoveTo(rc.left, ymid);
-		surface->LineTo(rc.right, ymid);
-	}
-}
-

contrib/src/stc/scintilla/src/Indicator.h

@@ -1,18 +0,0 @@
-// Scintilla source code edit control
-// Indicator.h - defines the style of indicators which are text decorations such as underlining
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef INDICATOR_H
-#define INDICATOR_H
-
-class Indicator {
-public:
-	int style;
-	ColourPair fore;
-	Indicator() : style(INDIC_PLAIN), fore(Colour(0,0,0)) {
-	}
-	void Draw(Surface *surface, PRectangle &rc);
-};
-
-#endif

contrib/src/stc/scintilla/src/KeyMap.cxx

@@ -1,116 +0,0 @@
-// Scintilla source code edit control
-// KeyMap.cxx  - defines a mapping between keystrokes and commands
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-
-#include "KeyMap.h"
-
-KeyMap::KeyMap() : kmap(0), len(0), alloc(0) {
-	for (int i = 0; MapDefault[i].key; i++) {
-		AssignCmdKey(MapDefault[i].key, 
-			MapDefault[i].modifiers,
-             		MapDefault[i].msg);
-	}
-}
-
-KeyMap::~KeyMap() {
-	Clear();
-}
-
-void KeyMap::Clear() {
-	delete []kmap;
-	kmap = 0;
-	len = 0;
-	alloc = 0;
-}
-
-void KeyMap::AssignCmdKey(int key, int modifiers, UINT msg) {
-	if ((len+1) >= alloc) {
-		KeyToCommand *ktcNew = new KeyToCommand[alloc + 5];
-		if (!ktcNew)
-			return;
-		for (int k=0;k<len;k++)
-			ktcNew[k] = kmap[k];
-		alloc += 5;
-		delete []kmap;
-		kmap = ktcNew;
-	}
-	for (int keyIndex = 0; keyIndex < len; keyIndex++) {
-		if ((key == kmap[keyIndex].key) && (modifiers == kmap[keyIndex].modifiers)) {
-			kmap[keyIndex].msg = msg;
-			return;
-		}
-	}
-	kmap[len].key = key;
-	kmap[len].modifiers = modifiers;
-	kmap[len].msg = msg;
-	len++;
-}
-
-UINT KeyMap::Find(int key, int modifiers) {
-	for (int i=0; i < len; i++) {
-		if ((key == kmap[i].key) && (modifiers == kmap[i].modifiers)) {
-			return kmap[i].msg;
-		}
-	}
-	return 0;
-}
-
-KeyToCommand KeyMap::MapDefault[] = {
-    VK_DOWN,		SCI_NORM,	SCI_LINEDOWN,
-    VK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND,
-    VK_UP,			SCI_NORM,	SCI_LINEUP,
-    VK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND,
-    VK_LEFT,		SCI_NORM,	SCI_CHARLEFT,
-    VK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND,
-    VK_LEFT,		SCI_CTRL,	SCI_WORDLEFT,
-    VK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND,
-    VK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT,
-    VK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND,
-    VK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT,
-    VK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND,
-    VK_HOME, 		SCI_NORM, 	SCI_VCHOME,
-    VK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND,
-    VK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART,
-    VK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND,
-    VK_END,	 	SCI_NORM, 	SCI_LINEEND,
-    VK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND,
-    VK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND,
-    VK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND,
-    VK_PRIOR,		SCI_NORM, 	SCI_PAGEUP,
-    VK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND,
-    VK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN,
-    VK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND,
-    VK_DELETE, 	SCI_NORM,	WM_CLEAR,
-    VK_DELETE, 	SCI_SHIFT,	WM_CUT,
-    VK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT,
-    VK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE,
-    VK_INSERT, 		SCI_SHIFT,	WM_PASTE,
-    VK_INSERT, 		SCI_CTRL,	WM_COPY,
-    VK_ESCAPE,  	SCI_NORM,	SCI_CANCEL,
-    VK_BACK,		SCI_NORM, 	SCI_DELETEBACK,
-    VK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT,
-    'Z', 			SCI_CTRL,	WM_UNDO,
-    'Y', 			SCI_CTRL,	SCI_REDO,
-    'X', 			SCI_CTRL,	WM_CUT,
-    'C', 			SCI_CTRL,	WM_COPY,
-    'V', 			SCI_CTRL,	WM_PASTE,
-    'A', 			SCI_CTRL,	SCI_SELECTALL,
-    VK_TAB,		SCI_NORM,	SCI_TAB,
-    VK_TAB,		SCI_SHIFT,	SCI_BACKTAB,
-    VK_RETURN, 	SCI_NORM,	SCI_NEWLINE,
-    VK_ADD, 		SCI_CTRL,	SCI_ZOOMIN,
-    VK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT,
-    //'L', 			SCI_CTRL,		SCI_FORMFEED,
-    'L', 			SCI_CTRL,	SCI_LINECUT,
-    'L', 			SCI_CSHIFT,	SCI_LINEDELETE,
-    'T', 			SCI_CTRL,	SCI_LINETRANSPOSE,
-    'U', 			SCI_CTRL,	SCI_LOWERCASE,
-    'U', 			SCI_CSHIFT,	SCI_UPPERCASE,
-    0,0,0,
-};
-

contrib/src/stc/scintilla/src/KeyMap.h

@@ -1,36 +0,0 @@
-// Scintilla source code edit control
-// KeyMap.h - defines a mapping between keystrokes and commands
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef KEYTOCOMMAND_H
-#define KEYTOCOMMAND_H
-
-#define SCI_NORM 0
-#define SCI_SHIFT SHIFT_PRESSED
-#define SCI_CTRL LEFT_CTRL_PRESSED
-#define SCI_ALT LEFT_ALT_PRESSED
-#define SCI_CSHIFT (SCI_CTRL | SCI_SHIFT)
-#define SCI_ASHIFT (SCI_ALT | SCI_SHIFT)
-
-class KeyToCommand {
-public:
-	int key;
-	int modifiers;
-	UINT msg;
-};
-
-class KeyMap {
-	KeyToCommand *kmap;
-	int len;
-	int alloc;
-	static KeyToCommand MapDefault[];
-public:
-	KeyMap();
-	~KeyMap();
-	void Clear();
-	void AssignCmdKey(int key, int modifiers, UINT msg);
-	UINT Find(int key, int modifiers);	// 0 returned on failure
-};
-
-#endif

contrib/src/stc/scintilla/src/KeyWords.cxx

@@ -1,45 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// KeyWords.cxx - colourise for particular languages
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-LexerModule *LexerModule::base = 0;
-
-LexerModule::LexerModule(int language_, LexerFunction fn_) :
-	language(language_), fn(fn_) {
-	next = base;
-	base = this;
-}
-
-void LexerModule::Colourise(unsigned int startPos, int lengthDoc, int initStyle,
-		int language, WordList *keywordlists[], StylingContext &styler) {
-	LexerModule *lm = base;
-	while (lm) {
-		if (lm->language == language) {
-			lm->fn(startPos, lengthDoc, initStyle, keywordlists, styler);
-			return;
-		}
-		lm = lm->next;
-	}
-	// Unknown language
-	// Null language means all style bytes are 0 so just mark the end - no need to fill in.
-	if (lengthDoc > 0) {
-		styler.StartAt(startPos + lengthDoc - 1);
-		styler.StartSegment(startPos + lengthDoc - 1);
-		styler.ColourTo(startPos + lengthDoc - 1, 0);
-	}
-}

contrib/src/stc/scintilla/src/LexCPP.cxx

@@ -1,255 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexCPP.cxx - lexer for C++, C, Java, and Javascript
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static bool classifyWordCpp(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	bool wordIsUUID = false;
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_C_WORD;
-			wordIsUUID = strcmp(s, "uuid") == 0; 
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	return wordIsUUID;
-}
-
-static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], 
-	StylingContext &styler) {
-	
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-	
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-
-	int state = initStyle;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	unsigned int lengthDoc = startPos + length;
-	int visChars = 0;
-	styler.StartSegment(startPos);
-	bool lastWordWasUUID = false;
-	for (unsigned int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((fold) && ((ch == '\r' && chNext != '\n') || (ch == '\n'))) {
-			int lev = levelPrev;
-			if (visChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-			visChars = 0;
-			levelPrev = levelCurrent;
-		}
-		if (!isspace(ch))
-			visChars++;
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_STRINGEOL) {
-			if (ch != '\r' && ch != '\n') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_DEFAULT;
-			}
-		}
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i-1, state);
-				if (lastWordWasUUID) {
-					state = SCE_C_UUID;
-					lastWordWasUUID = false;
-				} else {
-					state = SCE_C_WORD;
-				}
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i-1, state);
-				if (styler.SafeGetCharAt(i + 2) == '*')
-					state = SCE_C_COMMENTDOC;
-				else
-					state = SCE_C_COMMENT;
-			} else if (ch == '/' && chNext == '/') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_STRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_CHARACTER;
-			} else if (ch == '#') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_PREPROCESSOR;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i-1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
-				if ((ch == '{') || (ch == '}')) {
-					levelCurrent += (ch == '{') ? 1 : -1;
-				}
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				lastWordWasUUID = classifyWordCpp(styler.GetStartSegment(), i - 1, keywords, styler);
-				state = SCE_C_DEFAULT;
-				if (ch == '/' && chNext == '*') {
-					if (styler.SafeGetCharAt(i + 2) == '*')
-						state = SCE_C_COMMENTDOC;
-					else
-						state = SCE_C_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (ch == '#') {
-					state = SCE_C_PREPROCESSOR;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-					if ((ch == '{') || (ch == '}')) {
-						levelCurrent += (ch == '{') ? 1 : -1;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_C_PREPROCESSOR) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_COMMENT) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > styler.GetStartSegment() + 2) || (
-						(initStyle == SCE_C_COMMENT) && 
-						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTDOC) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > styler.GetStartSegment() + 3) || (
-						(initStyle == SCE_C_COMMENTDOC) && 
-						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_C_CHARACTER) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_C_UUID) {
-				if (ch == '\r' || ch == '\n' || ch == ')') {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '/' && chNext == '*') {
-					if (styler.SafeGetCharAt(i + 2) == '*')
-						state = SCE_C_COMMENTDOC;
-					else
-						state = SCE_C_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (ch == '#') {
-					state = SCE_C_PREPROCESSOR;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-					if ((ch == '{') || (ch == '}')) {
-						levelCurrent += (ch == '{') ? 1 : -1;
-					}
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	if (fold) {
-		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-		//styler.SetLevel(lineCurrent, levelCurrent | flagsNext);
-		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-		
-	}
-}
-
-LexerModule lmCPP(SCLEX_CPP, ColouriseCppDoc);

contrib/src/stc/scintilla/src/LexOthers.cxx

@@ -1,200 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexOthers.cxx - lexers for properties files, batch files, make files and error lists
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseBatchLine(char *lineBuffer, int endLine, StylingContext &styler) {
-	if (0 == strncmp(lineBuffer, "REM", 3)) {
-		styler.ColourTo(endLine, 1);
-	} else if (0 == strncmp(lineBuffer, "rem", 3)) {
-		styler.ColourTo(endLine, 1);
-	} else if (0 == strncmp(lineBuffer, "SET", 3)) {
-		styler.ColourTo(endLine, 2);
-	} else if (0 == strncmp(lineBuffer, "set", 3)) {
-		styler.ColourTo(endLine, 2);
-	} else if (lineBuffer[0] == ':') {
-		styler.ColourTo(endLine, 3);
-	} else {
-		styler.ColourTo(endLine, 0);
-	}
-}
-
-static void ColouriseBatchDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseBatchLine(lineBuffer, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseBatchLine(lineBuffer, startPos + length, styler);
-}
-
-static void ColourisePropsLine(char *lineBuffer, int lengthLine, int startLine, int endPos, StylingContext &styler) {
-	int i = 0;
-	while (isspace(lineBuffer[i]) && (i < lengthLine))	// Skip initial spaces
-		i++;
-	if (lineBuffer[i] == '#' || lineBuffer[i] == '!' || lineBuffer[i] == ';') {
-		styler.ColourTo(endPos, 1);
-	} else if (lineBuffer[i] == '[') {
-		styler.ColourTo(endPos, 2);
-	} else if (lineBuffer[i] == '@') {
-		styler.ColourTo(startLine+i, 4);
-		if (lineBuffer[++i] == '=')
-			styler.ColourTo(startLine+i, 3);
-		styler.ColourTo(endPos, 0);
-	} else {
-		while (lineBuffer[i] != '=' && (i < lengthLine))	// Search the '=' character
-			i++;
-		if (lineBuffer[i] == '=') {
-			styler.ColourTo(startLine+i-1, 0);
-			styler.ColourTo(startLine+i, 3);
-			styler.ColourTo(endPos, 0);
-		} else {
-			styler.ColourTo(endPos, 0);
-		}
-	}
-}
-
-static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	int startLine = startPos;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if ((styler[i] == '\r' && styler.SafeGetCharAt(i+1) != '\n') || 
-			styler[i] == '\n' || 
-			(linePos >= sizeof(lineBuffer) - 1)) {
-			lineBuffer[linePos] = '\0';
-			ColourisePropsLine(lineBuffer, linePos, startLine, i, styler);
-			linePos = 0;
-			startLine = i+1;
-		}
-	}
-	if (linePos > 0)
-		ColourisePropsLine(lineBuffer, linePos, startLine, startPos + length, styler);
-}
-
-static void ColouriseMakeLine(char *lineBuffer, int lengthLine, int endPos, StylingContext &styler) {
-	int i = 0;
-	while (isspace(lineBuffer[i]) && (i < lengthLine))
-		i++;
-	if (lineBuffer[i] == '#' || lineBuffer[i] == '!') {
-		styler.ColourTo(endPos, 1);
-	} else {
-		styler.ColourTo(endPos, 0);
-	}
-}
-
-static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseMakeLine(lineBuffer, linePos, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseMakeLine(lineBuffer, linePos, startPos + length, styler);
-}
-
-static void ColouriseErrorListLine(char *lineBuffer, int lengthLine, int endPos, StylingContext &styler) {
-	if (lineBuffer[0] == '>') {
-		// Command or return status
-		styler.ColourTo(endPos, 4);
-	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
-		styler.ColourTo(endPos, 1);
-	} else if (0 == strncmp(lineBuffer, "Error ", strlen("Error "))) {
-		// Borland error message
-		styler.ColourTo(endPos, 5);
-	} else if (0 == strncmp(lineBuffer, "Warning ", strlen("Warning "))) {
-		// Borland warning message
-		styler.ColourTo(endPos, 5);
-	} else {
-		// Look for <filename>:<line>:message
-		// Look for <filename>(line)message
-		// Look for <filename>(line,pos)message
-		int state = 0;
-		for (int i = 0; i < lengthLine; i++) {
-			if (state == 0 && lineBuffer[i] == ':' && isdigit(lineBuffer[i + 1])) {
-				state = 1;
-			} else if (state == 0 && lineBuffer[i] == '(') {
-				state = 10;
-			} else if (state == 1 && isdigit(lineBuffer[i])) {
-				state = 2;
-			} else if (state == 2 && lineBuffer[i] == ':') {
-				state = 3;
-				break;
-			} else if (state == 2 && !isdigit(lineBuffer[i])) {
-				state = 99;
-			} else if (state == 10 && isdigit(lineBuffer[i])) {
-				state = 11;
-			} else if (state == 11 && lineBuffer[i] == ',') {
-				state = 14;
-			} else if (state == 11 && lineBuffer[i] == ')') {
-				state = 12;
-				break;
-			} else if (state == 12 && lineBuffer[i] == ':') {
-				state = 13;
-			} else if (state == 14 && lineBuffer[i] == ')') {
-				state = 15;
-				break;
-			} else if (((state == 11) || (state == 14)) && !((lineBuffer[i] == ' ') || isdigit(lineBuffer[i]))) {
-				state = 99;
-			}
-		}
-		if (state == 3) {
-			styler.ColourTo(endPos, 2);
-		} else if ((state == 14) || (state == 15)) {
-			styler.ColourTo(endPos, 3);
-		} else {
-			styler.ColourTo(endPos, 0);
-		}
-	}
-}
-
-static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseErrorListLine(lineBuffer, linePos, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseErrorListLine(lineBuffer, linePos, startPos + length, styler);
-}
-
-LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc);
-LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc);
-LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc);
-LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc);

contrib/src/stc/scintilla/src/LexPerl.cxx

@@ -1,488 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexPerl.cxx - lexer for subset of Perl
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-inline bool isPerlOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' || ch == '\\' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	return false;
-}
-
-static int classifyWordPerl(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_PL_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_PL_NUMBER;
-	else {
-		if (keywords.InList(s))
-			chAttr = SCE_PL_WORD;
-	}
-	styler.ColourTo(end, chAttr);
-	return chAttr;
-}
-
-static bool isEndVar(char ch) {
-	return !isalnum(ch) && ch != '#' && ch != '$' &&
-	       ch != '_' && ch != '\'';
-}
-
-static bool isMatch(StylingContext &styler, int lengthDoc, int pos, const char *val) {
-	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
-		return false;
-	}
-	while (*val) {
-		if (*val != styler[pos++]) {
-			return false;
-		}
-		val++;
-	}
-	return true;
-}
-
-static bool isOKQuote(char ch) {
-	if (isalnum(ch))
-		return false;
-	if (isspace(ch))
-		return false;
-	if (iscntrl(ch))
-		return false;
-	return true;
-}
-
-static char opposite(char ch) {
-	if (ch == '(')
-		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
-	if (ch == '<')
-		return '>';
-	return ch;
-}
-
-static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
-                             WordList *keywordlists[], StylingContext &styler) {
-
-	// Lexer for perl often has to backtrack to start of current style to determine
-	// which characters are being used as quotes, how deeply nested is the
-	// start position and what the termination string is for here documents
-	
-	WordList &keywords = *keywordlists[0];
-	
-	char sooked[100];
-	int quotes = 0;
-	char quoteDown = 'd';
-	char quoteUp = 'd';
-	int quoteRep = 1;
-	int sookedpos = 0;
-	bool preferRE = true;
-	sooked[sookedpos] = '\0';
-	int state = initStyle;
-	int lengthDoc = startPos + length;
-	// If in a long distance lexical state, seek to the beginning  to find quote characters
-	if (state == SCE_PL_HERE || state == SCE_PL_REGEX || 
-		state == SCE_PL_REGSUBST || state == SCE_PL_LONGQUOTE) {
-		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == state)) {
-			startPos--;
-		}
-		state = SCE_PL_DEFAULT;
-	}
-	styler.StartAt(startPos);
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	for (int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		char chNext2 = styler.SafeGetCharAt(i + 2);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_PL_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				if (ch == 's' && !isalnum(chNext)) {
-					state = SCE_PL_REGSUBST;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 2;
-				} else if (ch == 'm' && !isalnum(chNext)) {
-					state = SCE_PL_REGEX;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 1;
-				} else if (ch == 't' && chNext == 'r' && !isalnum(chNext2)) {
-					state = SCE_PL_REGSUBST;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 2;
-					i++;
-					chNext = chNext2;
-				} else if (ch == 'q' && (chNext == 'q' || chNext == 'r' || chNext == 'w' || chNext == 'x') && !isalnum(chNext2)) {
-					state = SCE_PL_LONGQUOTE;
-					i++;
-					chNext = chNext2;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 1;
-				} else {
-					state = SCE_PL_WORD;
-					preferRE = false;
-				}
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_STRING;
-			} else if (ch == '\'') {
-				if (chPrev == '&') {
-					// Archaic call
-					styler.ColourTo(i, state);
-				} else {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_CHARACTER;
-				}
-			} else if (ch == '`') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_BACKTICKS;
-			} else if (ch == '$') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalnum(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_SCALAR;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_SCALAR);
-					i++;
-					ch = ' ';
-					chNext = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_SCALAR);
-				}
-			} else if (ch == '@') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_ARRAY;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-					i++;
-					ch = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-				}
-			} else if (ch == '%') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_HASH;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_HASH);
-					i++;
-					ch = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_HASH);
-				}
-			} else if (ch == '*') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_SYMBOLTABLE;
-			} else if (ch == '/' && preferRE) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_REGEX;
-				quoteUp = '/';
-				quoteDown = '/';
-				quotes = 1;
-				quoteRep = 1;
-			} else if (ch == '<' && chNext == '<') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_HERE;
-				i++;
-				ch = chNext;
-				chNext = chNext2;
-				quotes = 0;
-				sookedpos = 0;
-				sooked[sookedpos] = '\0';
-			} else if (ch == '=' && isalpha(chNext)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_POD;
-				quotes = 0;
-				sookedpos = 0;
-				sooked[sookedpos] = '\0';
-			} else if (isPerlOperator(ch)) {
-				if (ch == ')' || ch == ']')
-					preferRE = false;
-				else
-					preferRE = true;
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_PL_OPERATOR);
-			}
-		} else if (state == SCE_PL_WORD) {
-			if (!iswordchar(ch) && ch != '\'') {	// Archaic Perl has quotes inside names
-				if (isMatch(styler, lengthDoc, styler.GetStartSegment(), "__DATA__")) {
-					styler.ColourTo(i, SCE_PL_DATASECTION);
-					state = SCE_PL_DATASECTION;
-				} else if (isMatch(styler, lengthDoc, styler.GetStartSegment(), "__END__")) {
-					styler.ColourTo(i, SCE_PL_DATASECTION);
-					state = SCE_PL_DATASECTION;
-				} else {
-					if (classifyWordPerl(styler.GetStartSegment(), i - 1, keywords, styler) == SCE_PL_WORD)
-						preferRE = true;
-					state = SCE_PL_DEFAULT;
-					if (ch == '#') {
-						state = SCE_PL_COMMENTLINE;
-					} else if (ch == '\"') {
-						state = SCE_PL_STRING;
-					} else if (ch == '\'') {
-						state = SCE_PL_CHARACTER;
-					} else if (ch == '<' && chNext == '<') {
-						state = SCE_PL_HERE;
-						quotes = 0;
-						sookedpos = 0;
-						sooked[sookedpos] = '\0';
-					} else if (isPerlOperator(ch)) {
-						if (ch == ')' || ch == ']')
-							preferRE = false;
-						else
-							preferRE = true;
-						styler.ColourTo(i, SCE_PL_OPERATOR);
-						state = SCE_PL_DEFAULT;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_PL_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_HERE) {
-				if (isalnum(ch) && quotes < 2) {
-					sooked[sookedpos++] = ch;
-					sooked[sookedpos] = '\0';
-					if (quotes == 0)
-						quotes = 1;
-				} else {
-					quotes++;
-				}
-
-				if (quotes > 1 && isMatch(styler, lengthDoc, i, sooked)) {
-					styler.ColourTo(i + sookedpos - 1, SCE_PL_HERE);
-					state = SCE_PL_DEFAULT;
-					i += sookedpos;
-					chNext = ' ';
-				}
-			} else if (state == SCE_PL_STRING) {
-				if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_CHARACTER) {
-				if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_BACKTICKS) {
-				if (ch == '`') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_POD) {
-				if (ch == '=') {
-					if (isMatch(styler, lengthDoc, i, "=cut")) {
-						styler.ColourTo(i - 1 + 4, state);
-						i += 4;
-						state = SCE_PL_DEFAULT;
-						chNext = ' ';
-						ch = ' ';
-					}
-				}
-			} else if (state == SCE_PL_SCALAR) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_ARRAY) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_HASH) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_SYMBOLTABLE) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_REF) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_REGEX) {
-				if (!quoteUp && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(ch);
-					quotes++;
-				} else {
-					if (ch == quoteDown && chPrev != '\\') {
-						quotes--;
-						if (quotes == 0) {
-							quoteRep--;
-							if (quoteUp == quoteDown) {
-								quotes++;
-							}
-						}
-						if (!isalpha(chNext)) {
-							if (quoteRep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-					} else if (ch == quoteUp && chPrev != '\\') {
-						quotes++;
-					} else if (!isalpha(chNext)) {
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_REGSUBST) {
-				if (!quoteUp && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(ch);
-					quotes++;
-				} else {
-					if (ch == quoteDown && chPrev != '\\') {
-						quotes--;
-						if (quotes == 0) {
-							quoteRep--;
-						}
-						if (!isalpha(chNext)) {
-							if (quoteRep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-						if (quoteUp == quoteDown) {
-							quotes++;
-						}
-					} else if (ch == quoteUp && chPrev != '\\') {
-						quotes++;
-					} else if (!isalpha(chNext)) {
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_LONGQUOTE) {
-				if (!quoteDown && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(quoteUp);
-					quotes++;
-				} else if (ch == quoteDown) {
-					quotes--;
-					if (quotes == 0) {
-						quoteRep--;
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-						if (quoteUp == quoteDown) {
-							quotes++;
-						}
-					}
-				} else if (ch == quoteUp) {
-					quotes++;
-				}
-			}
-
-			if (state == SCE_PL_DEFAULT) {    // One of the above succeeded
-				if (ch == '#') {
-					state = SCE_PL_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_PL_STRING;
-				} else if (ch == '\'') {
-					state = SCE_PL_CHARACTER;
-				} else if (iswordstart(ch)) {
-					state = SCE_PL_WORD;
-					preferRE = false;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_PL_OPERATOR);
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc, state);
-}
-
-LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc);

contrib/src/stc/scintilla/src/LexPython.cxx

@@ -1,254 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexPython.cxx - lexer for Python
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void classifyWordPy(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler, char *prevWord) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]);
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_P_IDENTIFIER;
-	if (0 == strcmp(prevWord, "class"))
-		chAttr = SCE_P_CLASSNAME;
-	else if (0 == strcmp(prevWord, "def"))
-		chAttr = SCE_P_DEFNAME;
-	else if (wordIsNumber)
-		chAttr = SCE_P_NUMBER;
-	else if (keywords.InList(s))
-		chAttr = SCE_P_WORD;
-	styler.ColourTo(end, chAttr);
-	strcpy(prevWord, s);
-}
-
-static bool IsPyComment(StylingContext &styler, int pos, int len) {
-	return len>0 && styler[pos]=='#';
-}
-
-static void ColourisePyDoc(unsigned int startPos, int length, int initStyle, 
-						   WordList *keywordlists[], StylingContext &styler) {
-
-	// Python uses a different mask because bad indentation is marked by oring with 32
-	styler.StartAt(startPos, 127);
-	
-	WordList &keywords = *keywordlists[0];
-	
-	//Platform::DebugPrintf("Python coloured\n");
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int whingeLevel = styler.GetPropSet().GetInt("tab.timmy.whinge.level");
-	char prevWord[200];
-	prevWord[0] = '\0';
-	if (length == 0)
-		return ;
-	int lineCurrent = styler.GetLine(startPos);
-	int spaceFlags = 0;
-	// TODO: Need to check previous line for indentation for both folding and bad indentation
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
-
-	int state = initStyle & 31;
-	char chPrev = ' ';
-	char chPrev2 = ' ';
-	char chNext = styler[startPos];
-	char chNext2 = styler[startPos];
-	styler.StartSegment(startPos);
-	int lengthDoc = startPos + length;
-	bool atStartLine = true;
-	for (int i = startPos; i <= lengthDoc; i++) {
-	
-		if (atStartLine) {
-			if (whingeLevel == 1) {
-				styler.SetFlags((spaceFlags & wsInconsistent) ? 64 : 0, state);
-			} else if (whingeLevel == 2) {
-				styler.SetFlags((spaceFlags & wsSpaceTab) ? 64 : 0, state);
-			} else if (whingeLevel == 3) {
-				styler.SetFlags((spaceFlags & wsSpace) ? 64 : 0, state);
-			} else if (whingeLevel == 4) {
-				styler.SetFlags((spaceFlags & wsTab) ? 64 : 0, state);
-			}
-			atStartLine = false;
-		}
-		
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		chNext2 = styler.SafeGetCharAt(i + 2);
-		
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) {
-			if ((state == SCE_P_DEFAULT) || (state == SCE_P_TRIPLE) || (state == SCE_P_TRIPLEDOUBLE)) {
-				// Perform colourisation of white space and triple quoted strings at end of each line to allow
-				// tab marking to work inside white space and triple quoted strings
-				styler.ColourTo(i, state);
-			}
-
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsPyComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsPyComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			if (fold) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			atStartLine = true;
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			chPrev2 = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_P_STRINGEOL) {
-			if (ch != '\r' && ch != '\n') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_P_DEFAULT;
-			}
-		}
-		if (state == SCE_P_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_P_WORD;
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				state = chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				if (chNext == '\"' && chNext2 == '\"') {
-					i += 2;
-					state = SCE_P_TRIPLEDOUBLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					state = SCE_P_STRING;
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				if (chNext == '\'' && chNext2 == '\'') {
-					i += 2;
-					state = SCE_P_TRIPLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					state = SCE_P_CHARACTER;
-				}
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_P_OPERATOR);
-			}
-		} else if (state == SCE_P_WORD) {
-			if (!iswordchar(ch)) {
-				classifyWordPy(styler.GetStartSegment(), i - 1, keywords, styler, prevWord);
-				state = SCE_P_DEFAULT;
-				if (ch == '#') {
-					state = chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE;
-				} else if (ch == '\"') {
-					if (chNext == '\"' && chNext2 == '\"') {
-						i += 2;
-						state = SCE_P_TRIPLEDOUBLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_P_STRING;
-					}
-				} else if (ch == '\'') {
-					if (chNext == '\'' && chNext2 == '\'') {
-						i += 2;
-						state = SCE_P_TRIPLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_P_CHARACTER;
-					}
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_P_OPERATOR);
-				}
-			}
-		} else {
-			if (state == SCE_P_COMMENTLINE || state == SCE_P_COMMENTBLOCK) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_STRING) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_CHARACTER) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_TRIPLE) {
-				if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_TRIPLEDOUBLE) {
-				if (ch == '\"' && chPrev == '\"' && chPrev2 == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			}
-		}
-		chPrev2 = chPrev;
-		chPrev = ch;
-	}
-	if (state == SCE_P_WORD) {
-		classifyWordPy(styler.GetStartSegment(), lengthDoc, keywords, styler, prevWord);
-	} else {
-		styler.ColourTo(lengthDoc, state);
-	}
-}
-
-LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc);

contrib/src/stc/scintilla/src/LexSQL.cxx

@@ -1,158 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexSQL.cxx - lexer for SQL
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void classifyWordSQL(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = toupper(styler[start + i]);
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s))
-			chAttr = SCE_C_WORD;
-	}
-	styler.ColourTo(end, chAttr);
-}
-
-static void ColouriseSQLDoc(unsigned int startPos, int length,
-                            int initStyle, WordList *keywordlists[], StylingContext &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int lineCurrent = styler.GetLine(startPos);
-	int spaceFlags = 0;
-	int indentCurrent = 0;
-
-	int state = initStyle;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	unsigned int lengthDoc = startPos + length;
-	bool prevCr = false;
-	for (unsigned int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
-			indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
-			int lev = indentCurrent;
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
-				if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				}
-			}
-			if (fold) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_WORD;
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENT;
-			} else if (ch == '-' && chNext == '-') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_STRING;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				classifyWordSQL(styler.GetStartSegment(), i - 1, keywords, styler);
-				state = SCE_C_DEFAULT;
-				if (ch == '/' && chNext == '*') {
-					state = SCE_C_COMMENT;
-				} else if (ch == '-' && chNext == '-') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\'') {
-					state = SCE_C_STRING;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-				}
-			}
-		} else {
-			if (state == SCE_C_COMMENT) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > (styler.GetStartSegment() + 2)) || ((initStyle == SCE_C_COMMENT) &&
-					    (styler.GetStartSegment() == startPos)))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				if (ch == '\'') {
-					if ( chNext == '\'' ) {
-						i++;
-					} else {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-						i++;
-					}
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '/' && chNext == '*') {
-					state = SCE_C_COMMENT;
-				} else if (ch == '-' && chNext == '-') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\'') {
-					state = SCE_C_STRING;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc);

contrib/src/stc/scintilla/src/LexVB.cxx

@@ -1,118 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexVB.cxx - lexer for Visual Basic and VBScript
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static int classifyWordVB(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = tolower(styler[start + i]);
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_DEFAULT;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_C_WORD;
-			if (strcmp(s, "rem") == 0)
-				chAttr = SCE_C_COMMENTLINE;
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	if (chAttr == SCE_C_COMMENTLINE)
-		return SCE_C_COMMENTLINE;
-	else
-		return SCE_C_DEFAULT;
-}
-
-static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], StylingContext &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-
-	int state = initStyle;
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	int lengthDoc = startPos + length;
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_WORD;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_STRING;
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				state = classifyWordVB(styler.GetStartSegment(), i - 1, keywords, styler);
-				if (state == SCE_C_DEFAULT) {
-					if (ch == '\'') {
-						state = SCE_C_COMMENTLINE;
-					} else if (ch == '\"') {
-						state = SCE_C_STRING;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				// VB doubles quotes to preserve them
-				if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '\'') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				}
-			}
-		}
-	}
-	styler.ColourTo(lengthDoc, state);
-}
-
-LexerModule lmVB(SCLEX_VB, ColouriseVBDoc);

contrib/src/stc/scintilla/src/LineMarker.cxx

@@ -1,125 +0,0 @@
-// Scintilla source code edit control
-// LineMarker.cxx - defines the look of a line marker in the margin 
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "LineMarker.h"
-
-void LineMarker::Draw(Surface *surface, PRectangle &rc) {
-	int minDim = Platform::Minimum(rc.Width(), rc.Height());
-	minDim--;	// Ensure does not go beyond edge
-	int centreX = (rc.right + rc.left) / 2;
-	int centreY = (rc.bottom + rc.top) / 2;
-	int dimOn2 = minDim / 2;
-	int dimOn4 = minDim / 4;
-	if (rc.Width() > (rc.Height() * 2)) {
-		// Wide column is line number so move to left to try to avoid overlapping number
-		centreX = rc.left + dimOn2 + 1;
-	}
-	if (markType == SC_MARK_ROUNDRECT) {
-		PRectangle rcRounded = rc;
-		rcRounded.left = rc.left + 1;
-		rcRounded.right = rc.right - 1;
-		surface->RoundedRectangle(rcRounded, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_CIRCLE) {
-		PRectangle rcCircle;
-		rcCircle.left = centreX - dimOn2;
-		rcCircle.top = centreY - dimOn2;
-		rcCircle.right = centreX + dimOn2;
-		rcCircle.bottom = centreY + dimOn2;
-		surface->Ellipse(rcCircle, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_ARROW) {
-		Point pts[] = {
-    		Point(centreX - dimOn4, centreY - dimOn2),
-    		Point(centreX - dimOn4, centreY + dimOn2),
-    		Point(centreX + dimOn2 - dimOn4, centreY),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_ARROWDOWN) {
-		Point pts[] = {
-    		Point(centreX - dimOn2, centreY - dimOn4),
-    		Point(centreX + dimOn2, centreY - dimOn4),
-    		Point(centreX, centreY + dimOn2 - dimOn4),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_PLUS) {
-		int armSize = dimOn2-2;
-		Point xpts[] = {
-    		Point(centreX - armSize, centreY),
-    		Point(centreX, centreY),
-    		Point(centreX, centreY - armSize),
-    		Point(centreX, centreY - armSize),
-    		Point(centreX, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX, centreY),
-    		Point(centreX, centreY + armSize),
-    		Point(centreX, centreY + armSize),
-    		Point(centreX, centreY),
-    		Point(centreX - armSize, centreY),
-		};
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX - 1, centreY - 1),
-    		Point(centreX - 1, centreY - armSize),
-    		Point(centreX + 1, centreY - armSize),
-    		Point(centreX + 1, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX + 1, centreY + 1),
-    		Point(centreX + 1, centreY + armSize),
-    		Point(centreX - 1, centreY + armSize),
-    		Point(centreX - 1, centreY + 1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_MINUS) {
-		int armSize = dimOn2-2;
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		Point xpts[] = {
-    		Point(centreX - armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX - armSize, centreY),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_SMALLRECT) {
-		PRectangle rcSmall;
-		rcSmall.left = rc.left + 1;
-		rcSmall.top = rc.top + 2;
-		rcSmall.right = rc.right - 1;
-		rcSmall.bottom = rc.bottom - 2;
-		surface->RectangleDraw(rcSmall, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_EMPTY) {
-		// An invisible marker so don't draw anything
-	} else { // SC_MARK_SHORTARROW
-		Point pts[] = {
-			Point(centreX, centreY + dimOn2),
-			Point(centreX + dimOn2, centreY),
-			Point(centreX, centreY - dimOn2),
-			Point(centreX, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY + dimOn4),
-			Point(centreX, centreY + dimOn4),
-			Point(centreX, centreY + dimOn2),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-				fore.allocated, back.allocated);
-	}
-}

contrib/src/stc/scintilla/src/LineMarker.h

@@ -1,22 +0,0 @@
-// Scintilla source code edit control
-// LineMarker.h - defines the look of a line marker in the margin 
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef LINEMARKER_H
-#define LINEMARKER_H
-
-class LineMarker {
-public:
-	int markType;
-	ColourPair fore;
-	ColourPair back;
-	LineMarker() {
-		markType = SC_MARK_CIRCLE;
-		fore = Colour(0,0,0);
-		back = Colour(0xff,0xff,0xff);
-	}
-	void Draw(Surface *surface, PRectangle &rc);
-};
-
-#endif

contrib/src/stc/scintilla/src/PropSet.cxx

@@ -1,404 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// PropSet.cxx - a java style properties file module
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// Maintain a dictionary of properties
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-
-bool EqualCaseInsensitive(const char *a, const char *b) {
-#if PLAT_GTK
-	return 0 == strcasecmp(a, b);
-#elif PLAT_WIN
-	return 0 == stricmp(a, b);
-#elif PLAT_WX
-	return 0 == wxStricmp(a, b);
-#endif
-}
-
-// Get a line of input. If end of line escaped with '\\' then continue reading.
-static bool GetFullLine(const char *&fpc, int &lenData, char *s, int len) {
-	bool continuation = true;
-	s[0] = '\0';
-	while ((len > 1) && lenData > 0) {
-		char ch = *fpc;
-		fpc++;
-		lenData--;
-		if ((ch == '\r') || (ch == '\n')) {
-			if (!continuation) {
-				if ((lenData > 0) && (ch == '\r') && ((*fpc) == '\n')) {
-					// munch the second half of a crlf
-					fpc++;
-					lenData--;
-				}
-				*s++ = '\0';
-				return true;
-			}
-		} else if ((ch == '\\') && (lenData > 0) && ((*fpc == '\r') || (*fpc == '\n'))) {
-			continuation = true;
-		} else {
-			continuation = false;
-			*s++ = ch;
-			*s = '\0';
-			len--;
-		}
-	}
-	return false;
-}
-
-PropSet::PropSet() {
-	superPS = 0;
-	size = 10;
-	used = 0;
-	vals = new char * [size];
-}
-
-PropSet::~PropSet() {
-	superPS = 0;
-	Clear();
-	delete []vals;
-}
-
-void PropSet::EnsureCanAddEntry() {
-	if (used >= size - 2) {
-		int newsize = size + 10;
-		char **newvals = new char * [newsize];
-
-		for (int i = 0; i < used; i++) {
-			newvals[i] = vals[i];
-		}
-		delete []vals;
-		vals = newvals;
-		size = newsize;
-	}
-}
-
-void PropSet::Set(const char *key, const char *val) {
-	EnsureCanAddEntry();
-	for (int i = 0; i < used; i += 2) {
-		if (EqualCaseInsensitive(vals[i], key)) {
-			// Replace current value
-			delete [](vals[i + 1]);
-			vals[i + 1] = StringDup(val);
-			return;
-		}
-	}
-	// Not found
-	vals[used++] = StringDup(key);
-	vals[used++] = StringDup(val);
-}
-
-void PropSet::Set(char *keyval) {
-	char *eqat = strchr(keyval, '=');
-	if (eqat) {
-		*eqat = '\0';
-		Set(keyval, eqat + 1);
-		*eqat = '=';
-	}
-}
-
-SString PropSet::Get(const char *key) {
-	for (int i = 0; i < used; i += 2) {
-		if (EqualCaseInsensitive(vals[i], key)) {
-			return vals[i + 1];
-		}
-	}
-	if (superPS) {
-		// Failed here, so try in base property set
-		return superPS->Get(key);
-	} else {
-		return "";
-	}
-}
-
-int PropSet::GetInt(const char *key, int defaultValue) {
-	SString val = Get(key);
-	if (val.length())
-		return Get(key).value();
-	else
-		return defaultValue;
-}
-
-bool isprefix(const char *target, const char *prefix) {
-	while (*target && *prefix) {
-		if (toupper(*target) != toupper(*prefix))
-			return false;
-		target++;
-		prefix++;
-	}
-	if (*prefix)
-		return false;
-	else
-		return true;
-}
-
-bool issuffix(const char *target, const char *suffix) {
-	int lentarget = strlen(target);
-	int lensuffix = strlen(suffix);
-	if (lensuffix > lentarget)
-		return false;
-	for (int i = lensuffix - 1; i >= 0; i--) {
-		if (toupper(target[i + lentarget - lensuffix]) != toupper(suffix[i]))
-			return false;
-	}
-	return true;
-}
-
-SString PropSet::GetWild(const char *keybase, const char *filename) {
-	for (int i = 0; i < used; i += 2) {
-		if (isprefix(vals[i], keybase)) {
-			char *orgkeyfile = vals[i] + strlen(keybase);
-			char *keyfile = NULL;
-
-			if (strstr(orgkeyfile, "$(") == orgkeyfile) {
-				char *cpendvar = strchr(orgkeyfile, ')');
-				if (cpendvar) {
-					int lenvar = cpendvar - orgkeyfile - 2; 	// Subtract the $()
-					char *var = static_cast<char *>(malloc(lenvar + 1));
-					strncpy(var, orgkeyfile + 2, lenvar);
-					var[lenvar] = '\0';
-					SString s = Get(var);
-					free(var);
-					keyfile = strdup(s.c_str());
-				}
-			}
-			char *keyptr = keyfile;
-
-			if (keyfile == NULL)
-				keyfile = orgkeyfile;
-
-			for (; ; ) {
-				char *del = strchr(keyfile, ';');
-				if (del == NULL)
-					del = keyfile + strlen(keyfile);
-				char delchr = *del;
-				*del = '\0';
-				if (*keyfile == '*') {
-					if (issuffix(filename, keyfile + 1)) {
-						*del = delchr;
-						free(keyptr);
-						return vals[i + 1];
-					}
-				} else if (EqualCaseInsensitive(keyfile, filename)) {
-					*del = delchr;
-					free(keyptr);
-					return vals[i + 1];
-				}
-				if (delchr == '\0')
-					break;
-				*del = delchr;
-				keyfile = del + 1;
-			}
-			free(keyptr);
-
-			if (EqualCaseInsensitive(vals[i], keybase)) {
-				return vals[i + 1];
-			}
-		}
-	}
-	if (superPS) {
-		// Failed here, so try in base property set
-		return superPS->GetWild(keybase, filename);
-	} else {
-		return "";
-	}
-}
-
-SString PropSet::GetNewExpand(const char *keybase, const char *filename) {
-	char *base = StringDup(GetWild(keybase, filename).c_str());
-	char *cpvar = strstr(base, "$(");
-	while (cpvar) {
-		char *cpendvar = strchr(cpvar, ')');
-		if (cpendvar) {
-			int lenvar = cpendvar - cpvar - 2;  	// Subtract the $()
-			char *var = new char[lenvar + 1];
-			strncpy(var, cpvar + 2, lenvar);
-			var[lenvar] = '\0';
-			SString val = GetWild(var, filename);
-			int newlenbase = strlen(base) + val.length() - lenvar;
-			char *newbase = new char[newlenbase];
-			strncpy(newbase, base, cpvar - base);
-			strcpy(newbase + (cpvar - base), val.c_str());
-			strcpy(newbase + (cpvar - base) + val.length(), cpendvar + 1);
-			delete []var;
-			delete []base;
-			base = newbase;
-		}
-		cpvar = strstr(base, "$(");
-	}
-	SString sret = base;
-	delete []base;
-	return sret;
-}
-
-void PropSet::Clear() {
-	for (int i = 0; i < used; i++) {
-		delete [](vals[i]);
-		vals[i] = 0;
-	}
-	used = 0;
-}
-
-void PropSet::ReadFromMemory(const char *data, int len) {
-	if (len > 0) {
-		const char *pd = data;
-		char linebuf[60000];
-		while (GetFullLine(pd, len, linebuf, sizeof(linebuf))) {
-			if (isalpha(linebuf[0]))
-				Set(linebuf);
-		}
-		// If there is a final line:
-		if (isalpha(linebuf[0]))
-			Set(linebuf);
-	}
-}
-
-void PropSet::Read(const char *filename) {
-	//printf("Opening properties <%s>\n", filename);
-	Clear();
-	char propsData[60000];
-	FILE *rcfile = fopen(filename, "rb");
-	if (rcfile) {
-		int lenFile = fread(propsData, 1, sizeof(propsData), rcfile);
-		fclose(rcfile);
-		ReadFromMemory(propsData, lenFile);
-	} else {
-		//printf("Could not open <%s>\n", filename);
-	}
-}
-
-static bool iswordsep(char ch, bool onlyLineEnds) {
-	if (!isspace(ch))
-		return false;
-	if (!onlyLineEnds)
-		return true;
-	return ch == '\r' || ch == '\n';
-}
-
-// Creates an array that points into each word in the string and puts \0 terminators
-// after each word.
-static char **ArrayFromWordList(char *wordlist, bool onlyLineEnds = false) {
-	char prev = '\n';
-	int words = 0;
-	for (int j = 0; wordlist[j]; j++) {
-		if (!iswordsep(wordlist[j], onlyLineEnds) && iswordsep(prev, onlyLineEnds))
-			words++;
-		prev = wordlist[j];
-	}
-	char **keywords = new char * [words + 1];
-	if (keywords) {
-		words = 0;
-		prev = '\0';
-		int len = strlen(wordlist);
-		for (int k = 0; k < len; k++) {
-			if (!iswordsep(wordlist[k], onlyLineEnds)) {
-				if (!prev) {
-					keywords[words] = &wordlist[k];
-					words++;
-				}
-			} else {
-				wordlist[k] = '\0';
-			}
-			prev = wordlist[k];
-		}
-		keywords[words] = &wordlist[len];
-	}
-	return keywords;
-}
-
-void WordList::Clear() {
-	if (words) {
-		delete []words;
-		delete []list;
-	}
-	words = 0;
-	list = 0;
-	len = 0;
-}
-
-void WordList::Set(const char *s) {
-	len = 0;
-	list = StringDup(s);
-	words = ArrayFromWordList(list, onlyLineEnds);
-}
-
-char *WordList::Allocate(int size) {
-	list = new char[size + 1];
-	list[size] = '\0';
-	return list;
-}
-
-void WordList::SetFromAllocated() {
-	len = 0;
-	words = ArrayFromWordList(list, onlyLineEnds);
-}
-
-// Shell sort based upon public domain C implementation by Raymond Gardner 1991
-// Used here because of problems with mingw qsort.
-static void SortWordList(char **words, unsigned int len) {
-	unsigned int gap = len / 2;
-
-	while (gap > 0) {
-		unsigned int i = gap;
-		while (i < len) {
-			unsigned int j = i;
-			char **a = words + j;
-			do {
-				j -= gap;
-				char **b = a;
-				a -= gap;
-				if (strcmp(*a, *b) > 0) {
-					char *tmp = *a;
-					*a = *b;
-					*b = tmp;
-				} else {
-					break;
-				}
-			} while (j >= gap);
-			i++;
-		}
-		gap = gap / 2;
-	}
-}
-
-bool WordList::InList(const char *s) {
-	if (0 == words)
-		return false;
-	if (len == 0) {
-		for (int i = 0; words[i][0]; i++)
-			len++;
-		SortWordList(words, len);
-		for (int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++)
-			starts[k] = -1;
-		for (int l = len - 1; l >= 0; l--) {
-			unsigned char indexChar = words[l][0];
-			starts[indexChar] = l;
-		}
-	}
-	unsigned char firstChar = s[0];
-	int j = starts[firstChar];
-	if (j >= 0) {
-		while (words[j][0] == firstChar) {
-			if (s[1] == words[j][1]) {
-				const char *a = words[j] + 1;
-				const char *b = s + 1;
-				while (*a && *a == *b) {
-					a++;
-					b++;
-				}
-				if (!*a && !*b)
-					return true;
-			}
-			j++;
-		}
-	}
-	return false;
-}

contrib/src/stc/scintilla/src/SVector.h

@@ -1,110 +0,0 @@
-// Scintilla source code edit control
-// SVector.h - a simple expandable vector
-// Copyright 1998-1999 by Neil Hodgson <neilh@hare.net.au>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SVECTOR_H
-#define SVECTOR_H
-
-// A simple expandable vector. 
-// T must support assignment.
-// Storage not allocated for elements until an element is used. 
-// This makes it very lightweight unless used so is a good match for optional features.
-template<class T, int sizeIncrement>
-class SVector {
-	T *v;
-	unsigned int size;	// Number of elements allocated
-	unsigned int len;	// Number of elements in vector
-	bool allocFailure;	// A memory allocation call has failed
-	
-	// Internally allocate more elements than the user wants to avoid 
-	// thrashng the memory allocator
-	void SizeTo(int newSize) {
-		if (newSize < sizeIncrement)
-			newSize += sizeIncrement;
-		else 
-			newSize = (newSize * 3) / 2;
-		T* newv = new T[newSize];
-		if (!newv) {
-			allocFailure = true;
-			return;
-		}
-		size = newSize;
-		for (unsigned int i=0; i<len; i++) {
-			newv[i] = v[i];
-		}
-		delete []v;
-		v = newv;
-	}
-	
-public:
-	SVector() {
-		allocFailure = false;
-		v = 0;
-		len = 0;
-		size = 0;
-	}
-	~SVector() {
-		Free();
-	}
-	SVector(const SVector &other) {
-		allocFailure = false;
-		v = 0;
-		len = 0;
-		size = 0;
-		if (other.Length() > 0) {
-			SizeTo(other.Length());
-			if (!allocFailure) {
-				for (int i=0;i<other.Length();i++)
-					v[i] = other.v[i];
-				len = other.Length();
-			}
-		}
-	}
-	SVector &operator=(const SVector &other) {
-		if (this != &other) {
-			delete []v;
-			allocFailure = false;
-			v = 0;
-			len = 0;
-			size = 0;
-			if (other.Length() > 0) {
-				SizeTo(other.Length());
-				if (!allocFailure) {
-					for (int i=0;i<other.Length();i++)
-						v[i] = other.v[i];
-				}
-				len = other.Length();
-			}
-		}
-		return *this;
-	}
-	T &operator[](unsigned int i) {
-		if (i >= len) {
-			if (i >= size) {
-				SizeTo(i);
-			}
-			len = i+1;
-		}
-		return v[i];
-	}
-	void Free() {
-		delete []v;
-		v = 0;
-		size = 0;
-		len = 0;
-	}
-	void SetLength(unsigned int newLength) {
-		if (newLength > len) {
-			if (newLength >= size) {
-				SizeTo(newLength);
-			}
-		}
-		len = newLength;
-	}
-	int Length() const {
-		return len;
-	}
-};
-
-#endif

contrib/src/stc/scintilla/src/ScintillaBase.cxx

@@ -1,398 +0,0 @@
-// Scintilla source code edit control
-// ScintillaBase.cxx - an enhanced subclass of Editor with calltips, autocomplete and context menu
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#endif
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CallTip.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "AutoComplete.h"
-#include "Document.h"
-#include "Editor.h"
-#include "ScintillaBase.h"
-
-ScintillaBase::ScintillaBase() {
-#ifdef SCI_LEXER	
-	lexLanguage = SCLEX_CONTAINER;
-	for (int wl=0;wl<numWordLists;wl++)
-		keyWordLists[wl] = new WordList;
-#endif
-}
-
-ScintillaBase::~ScintillaBase() {}
-
-void ScintillaBase::Finalise() {
-	popup.Destroy();
-}
-
-void ScintillaBase::RefreshColourPalette(Palette &pal, bool want) {
-	Editor::RefreshColourPalette(pal, want);
-	ct.RefreshColourPalette(pal, want);
-}
-
-void ScintillaBase::AddChar(char ch) {
-	bool acActiveBeforeCharAdded = ac.Active();
-	Editor::AddChar(ch);
-	if (acActiveBeforeCharAdded)
-		AutoCompleteChanged(ch);
-}
-
-void ScintillaBase::Command(int cmdId) {
-
-	switch (cmdId) {
-
-	case idAutoComplete: 	// Nothing to do
-		break;
-
-	case idCallTip: 	// Nothing to do
-		break;
-
-	case idcmdUndo:
-		WndProc(WM_UNDO, 0, 0);
-		break;
-
-	case idcmdRedo:
-		WndProc(SCI_REDO, 0, 0);
-		break;
-
-	case idcmdCut:
-		WndProc(WM_CUT, 0, 0);
-		break;
-
-	case idcmdCopy:
-		WndProc(WM_COPY, 0, 0);
-		break;
-
-	case idcmdPaste:
-		WndProc(WM_PASTE, 0, 0);
-		break;
-
-	case idcmdDelete:
-		WndProc(WM_CLEAR, 0, 0);
-		break;
-
-	case idcmdSelectAll:
-		WndProc(SCI_SELECTALL, 0, 0);
-		break;
-	}
-}
-
-int ScintillaBase::KeyCommand(UINT iMessage) {
-	// Most key commands cancel autocompletion mode
-	if (ac.Active()) {
-		switch (iMessage) {
-			// Except for these
-		case SCI_LINEDOWN:
-			AutoCompleteMove(1);
-			return 0;
-		case SCI_LINEUP:
-			AutoCompleteMove( -1);
-			return 0;
-		case SCI_PAGEDOWN:
-			AutoCompleteMove(5);
-			return 0;
-		case SCI_PAGEUP:
-			AutoCompleteMove( -5);
-			return 0;
-		case SCI_VCHOME:
-			AutoCompleteMove( -5000);
-			return 0;
-		case SCI_LINEEND:
-			AutoCompleteMove(5000);
-			return 0;
-		case SCI_DELETEBACK:
-			DelCharBack();
-			AutoCompleteChanged();
-			EnsureCaretVisible();
-			return 0;
-		case SCI_TAB:
-			AutoCompleteCompleted();
-			return 0;
-
-		default:
-			ac.Cancel();
-		}
-	}
-
-	if (ct.inCallTipMode) {
-		if (
-		    (iMessage != SCI_CHARLEFT) &&
-		    (iMessage != SCI_CHARLEFTEXTEND) &&
-		    (iMessage != SCI_CHARRIGHT) &&
-		    (iMessage != SCI_CHARLEFTEXTEND) &&
-		    (iMessage != SCI_EDITTOGGLEOVERTYPE) &&
-		    (iMessage != SCI_DELETEBACK)
-		) {
-			ct.CallTipCancel();
-		}
-		if (iMessage == SCI_DELETEBACK) {
-			if (currentPos <= ct.posStartCallTip) {
-				ct.CallTipCancel();
-			}
-		}
-	}
-	return Editor::KeyCommand(iMessage);
-}
-
-void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
-	//Platform::DebugPrintf("AutoCOmplete %s\n", list);
-	ct.CallTipCancel();
-
-	ac.Start(wDraw, idAutoComplete, currentPos, lenEntered);
-
-	PRectangle rcClient = GetClientRectangle();
-	Point pt = LocationFromPosition(currentPos-lenEntered);
-
-	//Platform::DebugPrintf("Auto complete %x\n", lbAutoComplete);
-	int heightLB = 100;
-	int widthLB = 100;
-	if (pt.x >= rcClient.right - widthLB) {
-		HorizontalScrollTo(xOffset + pt.x - rcClient.right + widthLB);
-		Redraw();
-		pt = LocationFromPosition(currentPos);
-	}
-	PRectangle rcac;
-	rcac.left = pt.x - 5;
-	if (pt.y >= rcClient.bottom - heightLB && // Wont fit below.
-	    pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
-		rcac.top = pt.y - heightLB;
-		if (rcac.top < 0) {
-			heightLB += rcac.top;
-			rcac.top = 0;
-		}
-	} else {
-		rcac.top = pt.y + vs.lineHeight;
-	}
-	rcac.right = rcac.left + widthLB;
-	rcac.bottom = Platform::Minimum(rcac.top + heightLB, rcClient.bottom);
-	ac.lb.SetPositionRelative(rcac, wMain);
-	ac.lb.SetFont(vs.styles[0].font);
-
-	int maxStrLen = ac.SetList(list);
-
-	// Fiddle the position of the list so it is right next to the target and wide enough for all its strings
-	PRectangle rcList = ac.lb.GetPosition();
-	int heightAlloced = rcList.bottom - rcList.top;
-	// Make an allowance for large strings in list
-	rcList.left = pt.x - 5;
-	rcList.right = rcList.left + Platform::Maximum(widthLB, maxStrLen * 8 + 16);
-	if (pt.y >= rcClient.bottom - heightLB && // Wont fit below.
-	    pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
-		rcList.top = pt.y - heightAlloced;
-	} else {
-		rcList.top = pt.y + vs.lineHeight;
-	}
-	rcList.bottom = rcList.top + heightAlloced;
-	ac.lb.SetPositionRelative(rcList, wMain);
-	//lbAutoComplete.SetPosition(rcList);
-	ac.Show();
-}
-
-void ScintillaBase::AutoCompleteCancel() {
-	ac.Cancel();
-}
-
-void ScintillaBase::AutoCompleteMove(int delta) {
-	ac.Move(delta);
-}
-
-void ScintillaBase::AutoCompleteChanged(char ch) {
-	if (currentPos <= ac.posStart) {
-		ac.Cancel();
-	} else if (ac.IsStopChar(ch)) {
-		ac.Cancel();
-	} else {
-		char wordCurrent[1000];
-		int i;
-		int startWord = ac.posStart - ac.startLen;
-		for (i = startWord; i < currentPos; i++)
-			wordCurrent[i - startWord] = pdoc->CharAt(i);
-		wordCurrent[i - startWord] = '\0';
-		ac.Select(wordCurrent);
-	}
-}
-
-void ScintillaBase::AutoCompleteCompleted() {
-	int item = ac.lb.GetSelection();
-	char selected[200];
-	if (item != -1) {
-		ac.lb.GetValue(item, selected, sizeof(selected));
-	}
-	ac.Cancel();
-	if (currentPos != ac.posStart) {
-		pdoc->DeleteChars(ac.posStart, currentPos - ac.posStart);
-	}
-	SetEmptySelection(ac.posStart);
-	if (item != -1) {
-		pdoc->InsertString(currentPos, selected + ac.startLen);
-		SetEmptySelection(currentPos + strlen(selected + ac.startLen));
-	}
-}
-
-void ScintillaBase::ContextMenu(Point pt) {
-	popup.CreatePopUp();
-	AddToPopUp("Undo", idcmdUndo, pdoc->CanUndo());
-	AddToPopUp("Redo", idcmdRedo, pdoc->CanRedo());
-	AddToPopUp("");
-	AddToPopUp("Cut", idcmdCut, currentPos != anchor);
-	AddToPopUp("Copy", idcmdCopy, currentPos != anchor);
-	AddToPopUp("Paste", idcmdPaste, WndProc(EM_CANPASTE, 0, 0));
-	AddToPopUp("Delete", idcmdDelete, currentPos != anchor);
-	AddToPopUp("");
-	AddToPopUp("Select All", idcmdSelectAll);
-	popup.Show(pt, wMain);
-}
-
-void ScintillaBase::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-	AutoCompleteCancel();
-	ct.CallTipCancel();
-	Editor::ButtonDown(pt, curTime, shift, ctrl, alt);
-}
-
-#ifdef SCI_LEXER
-void ScintillaBase::Colourise(int start, int end) {
-	int lengthDoc = Platform::SendScintilla(wMain.GetID(), SCI_GETLENGTH, 0, 0);
-	if (end == -1)
-		end = lengthDoc;
-	int len = end - start;
-
-	StylingContext styler(wMain.GetID(), props);
-
-	int styleStart = 0;
-	if (start > 0)
-		styleStart = styler.StyleAt(start - 1);
-	styler.SetCodePage(pdoc->dbcsCodePage);
-	
-	LexerModule::Colourise(start, len, styleStart, lexLanguage, keyWordLists, styler);
-	styler.Flush();
-}
-#endif
-
-void ScintillaBase::NotifyStyleNeeded(int endStyleNeeded) {
-#ifdef SCI_LEXER
-	if (lexLanguage != SCLEX_CONTAINER) {
-		int endStyled = Platform::SendScintilla(wMain.GetID(), SCI_GETENDSTYLED, 0, 0);
-		int lineEndStyled = Platform::SendScintilla(wMain.GetID(), EM_LINEFROMCHAR, endStyled, 0);
-		endStyled = Platform::SendScintilla(wMain.GetID(), EM_LINEINDEX, lineEndStyled, 0);
-		Colourise(endStyled, endStyleNeeded);
-		return;
-	}
-#endif
-	Editor::NotifyStyleNeeded(endStyleNeeded);
-}
-
-LRESULT ScintillaBase::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
-	switch (iMessage) {
-	case SCI_AUTOCSHOW:
-		AutoCompleteStart(wParam, reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_AUTOCCANCEL:
-		AutoCompleteCancel();
-		break;
-
-	case SCI_AUTOCACTIVE:
-		return ac.Active();
-
-	case SCI_AUTOCPOSSTART:
-		return ac.posStart;
-
-	case SCI_AUTOCCOMPLETE:
-		AutoCompleteCompleted();
-		break;
-
-	case SCI_AUTOCSTOPS:
-		ac.SetStopChars(reinterpret_cast<char *>(lParam));
-		break;
-
-	case SCI_CALLTIPSHOW: {
-			AutoCompleteCancel();
-			if (!ct.wCallTip.Created()) {
-				PRectangle rc = ct.CallTipStart(currentPos, LocationFromPosition(wParam),
-				                                reinterpret_cast<char *>(lParam),
-				                                vs.styles[0].fontName, vs.styles[0].size);
-				// If the call-tip window would be out of the client
-				// space, adjust so it displays above the text.
-				PRectangle rcClient = GetClientRectangle();
-				if (rc.bottom > rcClient.bottom) {
-					int offset = vs.lineHeight + rc.Height();
-					rc.top -= offset;
-					rc.bottom -= offset;
-				}
-				// Now display the window.
-				CreateCallTipWindow(rc);
-				ct.wCallTip.SetPositionRelative(rc, wDraw);
-				ct.wCallTip.Show();
-			}
-		}
-		break;
-
-	case SCI_CALLTIPCANCEL:
-		ct.CallTipCancel();
-		break;
-
-	case SCI_CALLTIPACTIVE:
-		return ct.inCallTipMode;
-
-	case SCI_CALLTIPPOSSTART:
-		return ct.posStartCallTip;
-
-	case SCI_CALLTIPSETHLT:
-		ct.SetHighlight(wParam, lParam);
-		break;
-
-	case SCI_CALLTIPSETBACK:
-		ct.colourBG = Colour(wParam);
-		InvalidateStyleRedraw();
-		break;
-		
-#ifdef SCI_LEXER
-	case SCI_SETLEXER:
-		lexLanguage = wParam;
-		break;
-		
-	case SCI_GETLEXER:
-		return lexLanguage;
-		
-	case SCI_COLOURISE:
-		Colourise(wParam, lParam);
-		break;
-		
-	case SCI_SETPROPERTY:
-		props.Set(reinterpret_cast<const char *>(wParam), 
-			reinterpret_cast<const char *>(lParam));
-		break;
-		
-	case SCI_SETKEYWORDS:
-		if ((wParam >= 0) && (wParam < numWordLists)) {
-			keyWordLists[wParam]->Clear();
-			keyWordLists[wParam]->Set(reinterpret_cast<const char *>(lParam));
-		}
-		break;
-#endif
-
-	default:
-		return Editor::WndProc(iMessage, wParam, lParam);
-	}
-	return 0l;
-}

contrib/src/stc/scintilla/src/ScintillaBase.h

@@ -1,68 +0,0 @@
-// Scintilla source code edit control
-// ScintillaBase.h - defines an enhanced subclass of Editor with calltips, autocomplete and context menu
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCINTILLABASE_H
-#define SCINTILLABASE_H
-
-class ScintillaBase : public Editor {
-protected:
-	// Enumeration of commands and child windows
-	enum {
-		idCallTip=1,
-		idAutoComplete=2,
-		
-		idcmdUndo=10,
-		idcmdRedo=11,
-		idcmdCut=12,
-		idcmdCopy=13,
-		idcmdPaste=14,
-		idcmdDelete=15,
-		idcmdSelectAll=16
-	};
-
-	Menu popup;
-	AutoComplete ac;
-
-	CallTip ct;
-
-#ifdef SCI_LEXER
-	int lexLanguage;
-	PropSet props;
-	enum {numWordLists=5};
-	WordList *keyWordLists[numWordLists];
-	void Colourise(int start, int end);
-#endif
-
-	ScintillaBase();
-	virtual ~ScintillaBase();
-	virtual void Initialise() = 0;
-	virtual void Finalise() = 0;
-
-	virtual void RefreshColourPalette(Palette &pal, bool want);
-	
-	virtual void AddChar(char ch);
-	void Command(int cmdId);
-	virtual int KeyCommand(UINT iMessage);
-	
-	void AutoCompleteStart(int lenEntered, const char *list);
-	void AutoCompleteCancel();
-	void AutoCompleteMove(int delta);
-	void AutoCompleteChanged(char ch=0);
-	void AutoCompleteCompleted();
-
-	virtual void CreateCallTipWindow(PRectangle rc) = 0;
-		
-	virtual void AddToPopUp(const char *label, int cmd=0, bool enabled=true) = 0;
-	void ContextMenu(Point pt);
-	
-	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-
-	virtual void NotifyStyleNeeded(int endStyleNeeded);
-public:
-	// Public so scintilla_send_message can use it
-	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-};
-
-#endif

contrib/src/stc/scintilla/src/Style.cxx

@@ -1,101 +0,0 @@
-// Scintilla source code edit control
-// Style.cxx - defines the font and colour style for a class of text
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Style.h"
-
-Style::Style() {
-	aliasOfDefaultFont = true;
-	Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
-	        Platform::DefaultFontSize(), 0,
-		false, false, false);
-}
-	
-Style::~Style() {
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	aliasOfDefaultFont = false;
-}
-
-Style &Style::operator=(const Style &source) {
-	if (this == &source)
-		return *this;
-	Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
-	        0, 0,
-		false, false, false);
-	fore.desired = source.fore.desired;
-	back.desired = source.back.desired;
-	bold = source.bold;
-	italic = source.italic;
-	size = source.size;
-	eolFilled = source.eolFilled;
-	return *this;
-}
-
-void Style::Clear(Colour fore_, Colour back_, int size_, const char *fontName_, 
-	bool bold_, bool italic_, bool eolFilled_) {
-	fore.desired = fore_;
-	back.desired = back_;
-	bold = bold_;
-	italic = italic_;
-	size = size_;
-	fontName = fontName_;
-	eolFilled = eolFilled_;
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else 
-		font.Release();
-	aliasOfDefaultFont = false;
-}
-
-bool Style::EquivalentFontTo(const Style *other) const {
-	if (bold != other->bold ||
-		italic != other->italic ||
-		size != other->size)
-		return false;
-	if (fontName == other->fontName)
-		return true;
-	if (!fontName)
-		return false;
-	if (!other->fontName)
-		return false;
-	return strcmp(fontName, other->fontName) == 0;
-}
-
-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle) {
-	int sizeZoomed = size + zoomLevel;
-	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1
-		sizeZoomed = 2;
-
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else 
-		font.Release();		
-	int deviceHeight = (sizeZoomed * surface.LogPixelsY()) / 72;
-	aliasOfDefaultFont = defaultStyle && 
-		(EquivalentFontTo(defaultStyle) || !fontName);
-	if (aliasOfDefaultFont) {
-		font.SetID(defaultStyle->font.GetID());
-	} else if (fontName) {
-		font.Create(fontName, deviceHeight, bold, italic);
-	} else {
-		font.SetID(0);
-	}
-
-	ascent = surface.Ascent(font);
-	descent = surface.Descent(font);
-	// Probably more typographically correct to include leading
-	// but that means more complex drawing as leading must be erased
-	//lineHeight = surface.ExternalLeading() + surface.Height();
-	externalLeading = surface.ExternalLeading(font);
-	lineHeight = surface.Height(font);
-	aveCharWidth = surface.AverageCharWidth(font);
-	spaceWidth = surface.WidthChar(font, ' ');
-}

contrib/src/stc/scintilla/src/Style.h

@@ -1,39 +0,0 @@
-// Scintilla source code edit control
-// Style.h - defines the font and colour style for a class of text
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef STYLE_H
-#define STYLE_H
-
-class Style {
-public:
-	ColourPair fore;
-	ColourPair back;
-	bool aliasOfDefaultFont;
-	bool bold;
-	bool italic;
-	int size;
-	const char *fontName;
-	bool eolFilled;
-
-	Font font;
-	unsigned int lineHeight;
-	unsigned int ascent;
-	unsigned int descent;
-	unsigned int externalLeading;
-	unsigned int aveCharWidth;
-	unsigned int spaceWidth;
-
-	Style();
-	~Style();
-	Style &operator=(const Style &source);
-	void Clear(Colour fore_, Colour back_,
-           	int size_, 
-		const char *fontName_, 
-		bool bold_, bool italic_, bool eolFilled_);
-	bool EquivalentFontTo(const Style *other) const;
-	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle=0);
-};
-
-#endif

contrib/src/stc/scintilla/src/ViewStyle.cxx

@@ -1,227 +0,0 @@
-// Scintilla source code edit control
-// ViewStyle.cxx - store information on how the document is to be viewed
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-
-MarginStyle::MarginStyle() : 
-	symbol(false), width(16), mask(0xffffffff), sensitive(false) {
-}
-
-// A list of the fontnames - avoids wasting space in each style
-FontNames::FontNames() {
-	max = 0;
-}
-
-FontNames::~FontNames() {
-	Clear();
-}
-
-void FontNames::Clear() {
-	for (int i=0;i<max;i++) {
-		delete []names[i];
-	}
-	max = 0;
-}
-
-const char *FontNames::Save(const char *name) {
-	if (!name)
-		return 0;
-	for (int i=0;i<max;i++) {
-		if (strcmp(names[i], name) == 0) {
-			return names[i];
-		}
-	}
-	names[max] = new char[strlen(name) + 1];
-	strcpy(names[max], name);
-	max++;
-	return names[max-1];
-}
-
-ViewStyle::ViewStyle() {
-	Init();
-}
-
-ViewStyle::ViewStyle(const ViewStyle &source) {
-	Init();
-	for (unsigned int sty=0;sty<(sizeof(styles)/sizeof(styles[0]));sty++) {
-		styles[sty] = source.styles[sty];
-		// Can't just copy fontname as its lifetime is relative to its owning ViewStyle
-		styles[sty].fontName = fontNames.Save(source.styles[sty].fontName);
-	}
-	for (int mrk=0;mrk<=MARKER_MAX;mrk++) {
-		markers[mrk] = source.markers[mrk];
-	}
-	for (int ind=0;ind<=INDIC_MAX;ind++) {
-		indicators[ind] = source.indicators[ind];
-	}
-	
-	selforeset = source.selforeset;
-	selforeground.desired = source.selforeground.desired;
-	selbackset = source.selbackset;
-	selbackground.desired = source.selbackground.desired;
-	selbar.desired = source.selbar.desired;
-	selbarlight.desired = source.selbarlight.desired;
-	caretcolour.desired = source.caretcolour.desired;
-	edgecolour.desired = source.edgecolour.desired;
-	leftMarginWidth = source.leftMarginWidth;
-	rightMarginWidth = source.rightMarginWidth;
-	for (int i=0;i < margins; i++) {
-		ms[i] = source.ms[i];
-	}
-	symbolMargin = source.symbolMargin;
-	maskInLine = source.maskInLine;
-	fixedColumnWidth = source.fixedColumnWidth;
-	zoomLevel = source.zoomLevel;
-	viewWhitespace = source.viewWhitespace;
-	viewEOL = source.viewEOL;
-	showMarkedLines = source.showMarkedLines;		
-}
-
-ViewStyle::~ViewStyle() {
-}
-
-void ViewStyle::Init() {
-	fontNames.Clear();
-	ResetDefaultStyle();
-	
-	indicators[0].style = INDIC_SQUIGGLE;
-	indicators[0].fore = Colour(0, 0x7f, 0);
-	indicators[1].style = INDIC_TT;
-	indicators[1].fore = Colour(0, 0, 0xff);
-	indicators[2].style = INDIC_PLAIN;
-	indicators[2].fore = Colour(0xff, 0, 0);
-
-	lineHeight = 1;
-	maxAscent = 1;
-	maxDescent = 1;
-	aveCharWidth = 8;
-	spaceWidth = 8;
-
-	selforeset = false;
-	selforeground.desired = Colour(0xff, 0, 0);
-	selbackset = true;
-	selbackground.desired = Colour(0xc0, 0xc0, 0xc0);
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_LINENUMBER].fore.desired = Colour(0, 0, 0);
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-	//caretcolour.desired = Colour(0xff, 0, 0);
-	caretcolour.desired = Colour(0, 0, 0);
-	edgecolour.desired = Colour(0xc0, 0xc0, 0xc0);
-	
-	leftMarginWidth = 1;
-	rightMarginWidth = 1;
-	ms[0].symbol = false;
-	ms[0].width = 0;
-	ms[0].mask = 0;
-	ms[1].symbol = true;
-	ms[1].width = 16;
-	ms[1].mask = ~SC_MASK_FOLDERS;
-	ms[2].symbol = true;
-	ms[2].width = 14;	// Nice width for arrows
-	ms[2].mask = SC_MASK_FOLDERS;
-	ms[2].width = 0;	// Nice width for arrows
-	ms[2].mask = 0;
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || ms[margin].symbol;
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-	zoomLevel = 0;
-	viewWhitespace = false;
-	viewEOL = false;
-	showMarkedLines = true;
-}
-
-void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
-	unsigned int i;
-	for (i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		pal.WantFind(styles[i].fore, want);
-		pal.WantFind(styles[i].back, want);
-	}
-	for (i=0;i<(sizeof(indicators)/sizeof(indicators[0]));i++) {
-		pal.WantFind(indicators[i].fore, want);
-	}
-	for (i=0;i<(sizeof(markers)/sizeof(markers[0]));i++) {
-		pal.WantFind(markers[i].fore, want);
-		pal.WantFind(markers[i].back, want);
-	}
-	pal.WantFind(selforeground, want);
-	pal.WantFind(selbackground, want);
-	pal.WantFind(selbar, want);
-	pal.WantFind(selbarlight, want);
-	pal.WantFind(caretcolour, want);
-	pal.WantFind(edgecolour, want);
-}
-
-void ViewStyle::Refresh(Surface &surface) {
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_DEFAULT].Realise(surface, zoomLevel);
-	maxAscent = styles[STYLE_DEFAULT].ascent;
-	maxDescent = styles[STYLE_DEFAULT].descent;
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT]);
-			if (maxAscent < styles[i].ascent)
-				maxAscent = styles[i].ascent;
-			if (maxDescent < styles[i].descent)
-				maxDescent = styles[i].descent;
-		}
-	}
-	
-	lineHeight = maxAscent + maxDescent;
-	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;
-	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;
-
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || ms[margin].symbol;
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-}
-
-void ViewStyle::ResetDefaultStyle() {
-	styles[STYLE_DEFAULT].Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
-	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),
-		false, false, false);
-}
-
-void ViewStyle::ClearStyles() {
-	// Reset all styles to be like the default style
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Clear(
-				styles[STYLE_DEFAULT].fore.desired, 
-				styles[STYLE_DEFAULT].back.desired, 
-				styles[STYLE_DEFAULT].size, 
-				styles[STYLE_DEFAULT].fontName, 
-				styles[STYLE_DEFAULT].bold, 
-				styles[STYLE_DEFAULT].italic,
-				styles[STYLE_DEFAULT].eolFilled);
-		}
-	}
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-}
-
-void ViewStyle::SetStyleFontName(int styleIndex, const char *name) {
-	styles[styleIndex].fontName = fontNames.Save(name);
-}

contrib/src/stc/scintilla/src/ViewStyle.h

@@ -1,72 +0,0 @@
-// Scintilla source code edit control
-// ViewStyle.h - store information on how the document is to be viewed
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef VIEWSTYLE_H
-#define VIEWSTYLE_H
-
-class MarginStyle {
-public:
-	bool symbol;
-	int width;
-	int mask;
-	bool sensitive;
-	MarginStyle();
-};
-
-class FontNames {
-private:
-	char *names[STYLE_MAX + 1];
-	int max;
-public:
-	FontNames();
-	~FontNames();
-	void Clear();
-	const char *Save(const char *name);
-};
-
-class ViewStyle {
-public:
-	FontNames fontNames;
-	Style styles[STYLE_MAX + 1];
-	LineMarker markers[MARKER_MAX + 1];
-	Indicator indicators[INDIC_MAX + 1];
-	int lineHeight;
-	unsigned int maxAscent;
-	unsigned int maxDescent;
-	unsigned int aveCharWidth;
-	unsigned int spaceWidth;
-	bool selforeset;
-	ColourPair selforeground;
-	bool selbackset;
-	ColourPair selbackground;
-	ColourPair selbar;
-	ColourPair selbarlight;
-	// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin
-	int leftMarginWidth;		// Spacing margin on left of text
-	int rightMarginWidth;	// Spacing margin on left of text
-	enum { margins=3 };
-	bool symbolMargin;
-	int maskInLine;	// Mask for markers to be put into text because there is nowhere for them to go in margin
-	MarginStyle ms[margins];
-	int fixedColumnWidth;
-	int zoomLevel;
-	bool viewWhitespace;
-	bool viewEOL;
-	bool showMarkedLines;
-	ColourPair caretcolour;
-	ColourPair edgecolour;
-	
-	ViewStyle();
-	ViewStyle(const ViewStyle &source);
-	~ViewStyle();
-	void Init();
-	void RefreshColourPalette(Palette &pal, bool want);
-	void Refresh(Surface &surface);
-	void ResetDefaultStyle();
-	void ClearStyles();
-	void SetStyleFontName(int styleIndex, const char *name);
-};
-
-#endif

include/wx/univ/textctrl.h

@@ -0,0 +1,427 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/univ/textctrl.h
+// Purpose:     wxTextCtrl class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     15.09.00
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIV_TEXTCTRL_H_
+#define _WX_UNIV_TEXTCTRL_H_
+
+#ifdef __GNUG__
+    #pragma interface "univtextctrl.h"
+#endif
+
+class WXDLLEXPORT wxCaret;
+class WXDLLEXPORT wxTextCtrlCommandProcessor;
+
+#include "wx/scrolwin.h"    // for wxScrollHelper
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl actions
+// ----------------------------------------------------------------------------
+
+// cursor movement and also selection and delete operations
+#define wxACTION_TEXT_GOTO          _T("goto")  // to pos in numArg
+#define wxACTION_TEXT_FIRST         _T("first") // go to pos 0
+#define wxACTION_TEXT_LAST          _T("last")  // go to last pos
+#define wxACTION_TEXT_HOME          _T("home")
+#define wxACTION_TEXT_END           _T("end")
+#define wxACTION_TEXT_LEFT          _T("left")
+#define wxACTION_TEXT_RIGHT         _T("right")
+#define wxACTION_TEXT_UP            _T("up")
+#define wxACTION_TEXT_DOWN          _T("down")
+#define wxACTION_TEXT_WORD_LEFT     _T("wordleft")
+#define wxACTION_TEXT_WORD_RIGHT    _T("wordright")
+#define wxACTION_TEXT_PAGE_UP       _T("pageup")
+#define wxACTION_TEXT_PAGE_DOWN     _T("pagedown")
+
+// clipboard operations
+#define wxACTION_TEXT_COPY          _T("copy")
+#define wxACTION_TEXT_CUT           _T("cut")
+#define wxACTION_TEXT_PASTE         _T("paste")
+
+// insert text at the cursor position: the text is in strArg of PerformAction
+#define wxACTION_TEXT_INSERT        _T("insert")
+
+// if the action starts with either of these prefixes and the rest of the
+// string is one of the movement commands, it means to select/delete text from
+// the current cursor position to the new one
+#define wxACTION_TEXT_PREFIX_SEL    _T("sel")
+#define wxACTION_TEXT_PREFIX_DEL    _T("del")
+
+// mouse selection
+#define wxACTION_TEXT_ANCHOR_SEL    _T("anchorsel")
+#define wxACTION_TEXT_EXTEND_SEL    _T("extendsel")
+#define wxACTION_TEXT_SEL_WORD      _T("wordsel")
+#define wxACTION_TEXT_SEL_LINE      _T("linesel")
+
+// undo or redo
+#define wxACTION_TEXT_UNDO          _T("undo")
+#define wxACTION_TEXT_REDO          _T("redo")
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl::HitTest return values
+// ----------------------------------------------------------------------------
+
+enum wxTextCtrlHitTestResult
+{
+    wxTE_HT_BEFORE = -1,
+    wxTE_HT_ON_TEXT,
+    wxTE_HT_AFTER
+};
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, public wxScrollHelper
+{
+public:
+    // creation
+    // --------
+
+    wxTextCtrl() { Init(); }
+
+    wxTextCtrl(wxWindow *parent,
+               wxWindowID id,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxTextCtrlNameStr)
+    {
+        Init();
+
+        Create(parent, id, value, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxTextCtrlNameStr);
+
+    virtual ~wxTextCtrl();
+
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
+    // wxUniv-specific methods
+    // -----------------------
+
+    // caret stuff
+    virtual void ShowCaret(bool show = TRUE);
+    void HideCaret() { ShowCaret(FALSE); }
+    void CreateCaret(); // for the current font size
+    wxCoord GetCaretPosition(long pos = -1) const; // in pixels, def => current
+
+    // helpers for cursor movement
+    long GetWordStart() const;
+    long GetWordEnd() const;
+
+    // selection helpers
+    bool HasSelection() const
+        { return m_selStart != -1 && m_selEnd > m_selStart; }
+    void ClearSelection();
+    void RemoveSelection();
+    wxString GetSelectionText() const;
+
+    // find the character at this position, return 0 if the character is
+    // really there, -1 if the point is before the beginning of the text/line
+    // and the returned character is the first one to follow it or +1 if it the
+    // position is beyond the end of line/text and the returned character is
+    // the last one
+    //
+    // NB: pt is in device coords (not adjusted for the client area origin nor
+    //     for the scrolling)
+    wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
+                                    long *col, long *row) const;
+
+    // find the character at this position in the given line, return value as
+    // for HitTest()
+    //
+    // NB: x is the logical coord (client and unscrolled)
+    wxTextCtrlHitTestResult HitTestLine(const wxString& line,
+                                        wxCoord x,
+                                        long *colOut) const;
+
+    // bring the given position into view
+    void ShowHorzPosition(wxCoord pos);
+
+    // scroll the window horizontally so that the first character shown is in
+    // position pos
+    void ScrollText(long col);
+
+    // adjust the DC for horz text control scrolling too
+    virtual void DoPrepareDC(wxDC& dc);
+
+    // implementation only from now on
+    // -------------------------------
+
+    // override this to take into account our scrollbar-less scrolling
+    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+
+    // set the right colours
+    virtual bool IsContainerWindow() const { return TRUE; }
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
+
+    // perform an action
+    virtual bool PerformAction(const wxControlAction& action,
+                               long numArg = -1,
+                               const wxString& strArg = wxEmptyString);
+
+    // override these methods to handle the caret
+    virtual bool SetFont(const wxFont &font);
+    virtual bool Enable(bool enable = TRUE);
+
+protected:
+    // draw the text
+    void DrawTextLine(wxDC& dc, const wxRect& rect,
+                      const wxString& text,
+                      long selStart, long selEnd);
+
+    void DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate);
+
+    virtual void DoDraw(wxControlRenderer *renderer);
+
+    // calc the size from the text extent
+    virtual wxSize DoGetBestClientSize() const;
+
+    // input support
+    virtual wxString GetInputHandlerType() const;
+
+    // common part of all ctors
+    void Init();
+
+    // more readable flag testing methods
+    bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
+    bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
+    bool WrapLines() const { return !(GetWindowStyle() & wxHSCROLL); }
+
+    // get the extent (width) of the text
+    wxCoord GetTextWidth(const wxString& text) const;
+
+    // get the logical text width (accounting for scrolling)
+    wxCoord GetTotalWidth() const;
+
+    // the text area is the part of the window in which the text can be
+    // displayed, i.e. part of it inside the margins and the real text area is
+    // the area in which the text *is* currently displayed: for example, in the
+    // multiline control case the text area can have extra space at the bottom
+    // which is not tall enough for another line and which is then not included
+    // into the real text area
+    wxRect GetRealTextArea() const;
+
+    // refresh the text in the given (in logical coords) rect
+    void RefreshTextRect(wxRect& rect);
+
+    // refresh the text in the given range (in logical coords) of this line, if
+    // width is 0, refresh to the end of line
+    void RefreshPixelRange(long line, wxCoord start, wxCoord width);
+
+    // refresh the text in the given range (in text coords) in this line
+    void RefreshColRange(long line, long start, long count);
+
+    // refresh the text from in the given line range (inclusive)
+    void RefreshLineRange(long lineFirst, long lineLast);
+
+    // refresh the text in the given range which can span multiple lines
+    // (this method accepts arguments in any order)
+    void RefreshTextRange(long start, long end);
+
+    // get the text to show: either the text itself or the text replaced with
+    // starts for wxTE_PASSWORD control
+    wxString GetTextToShow(const wxString& text) const;
+
+    // get the start and end of the selection for this line: if the line is
+    // outside the selection, both will be -1 and FALSE will be returned
+    bool GetSelectedPartOfLine(long line, int *start, int *end) const;
+
+    // update the text rect: the zone inside our client rect (its coords are
+    // client coords) which contains the text
+    void UpdateTextRect();
+
+    // calculate the last visible position
+    void UpdateLastVisible();
+
+    // move caret to the given position unconditionally
+    // (SetInsertionPoint() does nothing if the position didn't change)
+    void DoSetInsertionPoint(long pos);
+
+    // set the caret to its initial (default) position
+    void InitInsertionPoint();
+
+    // get the width of the longest line in pixels
+    wxCoord GetMaxWidth() const;
+
+    // force recalculation of the max line width
+    void RecalcMaxWidth()
+    {
+        m_widthMax = -1;
+        (void)GetMaxWidth();
+    }
+
+    // update the max width after the given line was modified
+    void UpdateMaxWidth(long line);
+
+    // event handlers
+    void OnIdle(wxIdleEvent& event);
+    void OnChar(wxKeyEvent& event);
+    void OnSize(wxSizeEvent& event);
+
+    // accessors for derived classes (SL stands for single line)
+    const wxString& GetSLValue() const
+    {
+        wxASSERT_MSG( IsSingleLine(), _T("only for single line controls") );
+
+        return m_value;
+    }
+
+    void SetSLValue(const wxString& value)
+    {
+        wxASSERT_MSG( IsSingleLine(), _T("only for single line controls") );
+        m_value = value;
+    }
+
+    // clipboard operations (unlike the versions without Do prefix, they have a
+    // return code)
+    bool DoCut();
+    bool DoPaste();
+
+private:
+    // update the scrollbars (only called from OnIdle)
+    void UpdateScrollbars();
+
+    // the initially specified control size
+    wxSize m_sizeInitial;
+
+    // the control text (only used for single line controls)
+    wxString m_value;
+
+    // the lines of text (only used for multiline controls)
+    wxArrayString m_lines;
+
+    // current position
+    long m_curPos,
+         m_curCol,
+         m_curRow;
+
+    // last position (only used by GetLastPosition())
+    long m_posLast;
+
+    // selection
+    long m_selAnchor,
+         m_selStart,
+         m_selEnd;
+
+    // flags
+    bool m_isModified:1,
+         m_isEditable:1,
+         m_hasCaret:1;
+
+    // the rectangle (in client coordinates) to draw text inside
+    wxRect m_rectText;
+
+    // this section is for the controls without horz scrollbar only
+
+    // the position of the first visible pixel and the first visible column
+    wxCoord m_ofsHorz;
+    long m_colStart;
+
+    // and the last ones (m_posLastVisible is the width but m_colLastVisible
+    // is an absolute value)
+    wxCoord m_posLastVisible;
+    long m_colLastVisible;
+
+    // this section is for the controls with scrollbar(s)
+
+    // the current ranges of the scrollbars
+    int m_scrollRangeX,
+        m_scrollRangeY;
+
+    // should we adjust the horz/vert scrollbar?
+    bool m_updateScrollbarX,
+         m_updateScrollbarY;
+
+    // the max line length in pixels
+    wxCoord m_widthMax;
+
+    // the index of the line which has the length of m_widthMax
+    long m_lineLongest;
+
+    // the object to which we delegate our undo/redo implementation
+    wxTextCtrlCommandProcessor *m_cmdProcessor;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+};
+
+#endif // _WX_UNIV_TEXTCTRL_H_
+

src/stc/Makefile.in

@@ -1,47 +0,0 @@
-###############################################################################
-# Purpose: Makefile.in for STC contrib for Unix with autoconf
-# Created: 14.03.00
-# Author:  VZ
-# Version: $Id$
-###############################################################################
-
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-
-this_dir = $(top_srcdir)/src/stc
-scintilla_dir=$(this_dir)/scintilla
-VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
-
-TARGET_LIBNAME=libstc
-
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
-
-OBJECTS=PlatWX.o ScintillaWX.o stc.o \
-        Accessor.o	        \
-        AutoComplete.o	    \
-        CallTip.o	        \
-        CellBuffer.o	    \
-        ContractionState.o  \
-        Document.o	        \
-        Editor.o		    \
-        Indicator.o	        \
-        KeyMap.o		    \
-        KeyWords.o	        \
-	LexCPP.o		\
-	LexHTML.o		\
-	LexOthers.o		\
-	LexPerl.o		\
-	LexPython.o		\
-	LexSQL.o		\
-	LexVB.o			\
-        LineMarker.o	    \
-        PropSet.o	        \
-        ScintillaBase.o	    \
-        Style.o		        \
-        ViewStyle.o
-        
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/include
-
-include $(top_builddir)/src/makelib.env

src/stc/PlatWX.cpp

@@ -1,597 +0,0 @@
-// Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
-// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
-//                        Robin Dunn <robin@aldunn.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <ctype.h>
-
-#include "Platform.h"
-#include "wx/stc/stc.h"
-
-Point Point::FromLong(long lpoint) {
-    return Point(lpoint & 0xFFFF, lpoint >> 32);
-}
-
-wxRect wxRectFromPRectangle(PRectangle prc) {
-    wxRect rc(prc.left, prc.top,
-              prc.right-prc.left+1, prc.bottom-prc.top+1);
-    return rc;
-}
-
-PRectangle PRectangleFromwxRect(wxRect rc) {
-    return PRectangle(rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom());
-}
-
-Colour::Colour(long lcol) {
-    co.Set(lcol & 0xff, (lcol >> 8) & 0xff, (lcol >> 16) & 0xff);
-}
-
-Colour::Colour(unsigned int red, unsigned int green, unsigned int blue) {
-    co.Set(red, green, blue);
-}
-
-bool Colour::operator==(const Colour &other) const {
-    return co == other.co;
-}
-
-long Colour::AsLong() const {
-    return (((long)co.Blue()  << 16) |
-            ((long)co.Green() <<  8) |
-            ((long)co.Red()));
-}
-
-unsigned int Colour::GetRed() {
-    return co.Red();
-}
-
-unsigned int Colour::GetGreen() {
-    return co.Green();
-}
-
-unsigned int Colour::GetBlue() {
-    return co.Blue();
-}
-
-Palette::Palette() {
-    used = 0;
-    allowRealization = false;
-}
-
-Palette::~Palette() {
-    Release();
-}
-
-void Palette::Release() {
-    used = 0;
-}
-
-// This method either adds a colour to the list of wanted colours (want==true)
-// or retrieves the allocated colour back to the ColourPair.
-// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-void Palette::WantFind(ColourPair &cp, bool want) {
-    if (want) {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired)
-                return;
-        }
-
-        if (used < numEntries) {
-            entries[used].desired = cp.desired;
-            entries[used].allocated = cp.desired;
-            used++;
-        }
-    } else {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired) {
-                cp.allocated = entries[i].allocated;
-                return;
-            }
-        }
-        cp.allocated = cp.desired;
-    }
-}
-
-void Palette::Allocate(Window &) {
-    if (allowRealization) {
-    }
-}
-
-
-Font::Font() {
-    id = 0;
-    ascent = 0;
-}
-
-Font::~Font() {
-}
-
-void Font::Create(const char *faceName, int size, bool bold, bool italic) {
-    Release();
-    id = new wxFont(size,
-                    wxDEFAULT,
-                    italic ? wxITALIC :  wxNORMAL,
-                    bold ? wxBOLD : wxNORMAL,
-                    false,
-                    faceName);
-}
-
-
-void Font::Release() {
-    if (id)
-        delete id;
-    id = 0;
-}
-
-
-Surface::Surface() :
-    hdc(0), hdcOwned(0), bitmap(0),
-    x(0), y(0) {
-}
-
-Surface::~Surface() {
-    Release();
-}
-
-void Surface::Release() {
-    if (bitmap) {
-        ((wxMemoryDC*)hdc)->SelectObject(wxNullBitmap);
-        delete bitmap;
-        bitmap = 0;
-    }
-    if (hdcOwned) {
-        delete hdc;
-        hdc = 0;
-        hdcOwned = false;
-    }
-}
-
-
-bool Surface::Initialised() {
-    return hdc != 0;
-}
-
-void Surface::Init() {
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::Init(SurfaceID hdc_) {
-    Release();
-    hdc = hdc_;
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::InitPixMap(int width, int height, Surface *surface_) {
-    Release();
-    hdc = new wxMemoryDC(surface_->hdc);
-    hdcOwned = true;
-    bitmap = new wxBitmap(width, height);
-    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
-    // **** ::SetTextAlign(hdc, TA_BASELINE);
-}
-
-void Surface::PenColour(Colour fore) {
-    hdc->SetPen(wxPen(fore.co, 1, wxSOLID));
-}
-
-void Surface::BrushColor(Colour back) {
-    hdc->SetBrush(wxBrush(back.co, wxSOLID));
-}
-
-void Surface::SetFont(Font &font_) {
-
-  // I think the following check is valid.  
-  // It eliminates a crash for me.  -- eric@sourcegear.com
-
-  if (font_.GetID())
-    {
-      hdc->SetFont(*font_.GetID());
-    }
-}
-
-int Surface::LogPixelsY() {
-    return hdc->GetPPI().y;
-}
-
-void Surface::MoveTo(int x_, int y_) {
-    x = x_;
-    y = y_;
-}
-
-void Surface::LineTo(int x_, int y_) {
-    hdc->DrawLine(x,y, x_,y_);
-    x = x_;
-    y = y_;
-}
-
-void Surface::Polygon(Point *pts, int npts, Colour fore,
-                      Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawPolygon(npts, (wxPoint*)pts);
-}
-
-void Surface::RectangleDraw(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::FillRectangle(PRectangle rc, Colour back) {
-    BrushColor(back);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::FillRectangle(PRectangle rc, Surface &surfacePattern) {
-    wxBrush br;
-    if (surfacePattern.bitmap)
-        br = wxBrush(*surfacePattern.bitmap);
-    else    // Something is wrong so display in red
-        br = wxBrush(*wxRED, wxSOLID);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->SetBrush(br);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void Surface::RoundedRectangle(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 8);
-}
-
-void Surface::Ellipse(PRectangle rc, Colour fore, Colour back) {
-    PenColour(fore);
-    BrushColor(back);
-    hdc->DrawEllipse(wxRectFromPRectangle(rc));
-}
-
-void Surface::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
-    hdc->Blit(rc.left, rc.top, rc.Width(), rc.Height(),
-              surfaceSource.hdc, from.x, from.y, wxCOPY);
-}
-
-void Surface::DrawText(PRectangle rc, Font &font, int ybase,
-                       const char *s, int len, Colour fore, Colour back) {
-    SetFont(font);
-    hdc->SetTextForeground(fore.co);
-    hdc->SetTextBackground(back.co);
-    FillRectangle(rc, back);
-
-    // ybase is where the baseline should be, but wxWin uses the upper left
-    // corner, so I need to calculate the real position for the text...
-    hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent);
-}
-
-void Surface::DrawTextClipped(PRectangle rc, Font &font, int ybase, const char *s, int len, Colour fore, Colour back) {
-    SetFont(font);
-    hdc->SetTextForeground(fore.co);
-    hdc->SetTextBackground(back.co);
-    FillRectangle(rc, back);
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-
-    // see comments above
-    hdc->DrawText(wxString(s, len), rc.left, ybase - font.ascent);
-    hdc->DestroyClippingRegion();
-}
-
-int Surface::WidthText(Font &font, const char *s, int len) {
-    SetFont(font);
-    int w;
-    int h;
-    hdc->GetTextExtent(wxString(s, len), &w, &h);
-    return w;
-}
-
-void Surface::MeasureWidths(Font &font, const char *s, int len, int *positions) {
-    SetFont(font);
-    int totalWidth = 0;
-    for (int i=0; i<len; i++) {
-        int w;
-        int h;
-        hdc->GetTextExtent(s[i], &w, &h);
-        totalWidth += w;
-        positions[i] = totalWidth;
-    }
-}
-
-int Surface::WidthChar(Font &font, char ch) {
-    SetFont(font);
-    int w;
-    int h;
-    hdc->GetTextExtent(ch, &w, &h);
-    return w;
-}
-
-#define EXTENT_TEST " `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-int Surface::Ascent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    font.ascent = h - d;
-    return font.ascent;
-}
-
-int Surface::Descent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return d;
-}
-
-int Surface::InternalLeading(Font &font) {
-    return 0;
-}
-
-int Surface::ExternalLeading(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return e;
-}
-
-int Surface::Height(Font &font) {
-    SetFont(font);
-    return hdc->GetCharHeight();
-}
-
-int Surface::AverageCharWidth(Font &font) {
-    SetFont(font);
-    return hdc->GetCharWidth();
-}
-
-int Surface::SetPalette(Palette *pal, bool inBackGround) {
-    return 0;  // **** figure out what to do with palettes...
-}
-
-void Surface::SetClip(PRectangle rc) {
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-}
-
-void Surface::FlushCachedState() {
-  // TODO Is there anything we need to do here? eric@sourcegear.com
-  // TODO I had to add this method when I merged new Scintilla code
-  // TODO from Neil.
-}
-
-Window::~Window() {
-}
-
-void Window::Destroy() {
-    if (id)
-        id->Destroy();
-    id = 0;
-}
-
-bool Window::HasFocus() {
-    return wxWindow::FindFocus() == id;
-}
-
-PRectangle Window::GetPosition() {
-    wxRect rc(id->GetPosition(), id->GetSize());
-    return PRectangleFromwxRect(rc);
-}
-
-void Window::SetPosition(PRectangle rc) {
-    id->SetSize(rc.left, rc.top, rc.Width(), rc.Height());
-}
-
-void Window::SetPositionRelative(PRectangle rc, Window) {
-    SetPosition(rc);  // ????
-}
-
-PRectangle Window::GetClientPosition() {
-    wxSize sz = id->GetClientSize();
-    return  PRectangle(0, 0, sz.x - 1, sz.y - 1);
-}
-
-void Window::Show(bool show) {
-    id->Show(show);
-}
-
-void Window::InvalidateAll() {
-    id->Refresh(false);
-}
-
-void Window::InvalidateRectangle(PRectangle rc) {
-    id->Refresh(false, &wxRectFromPRectangle(rc));
-}
-
-void Window::SetFont(Font &font) {
-    id->SetFont(*font.GetID());
-}
-
-void Window::SetCursor(Cursor curs) {
-    int cursorId;
-
-    switch (curs) {
-    case cursorText:
-        cursorId = wxCURSOR_IBEAM;
-        break;
-    case cursorArrow:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    case cursorUp:
-        cursorId = wxCURSOR_ARROW; // ** no up arrow...  wxCURSOR_UPARROW;
-        break;
-    case cursorWait:
-        cursorId = wxCURSOR_WAIT;
-        break;
-    case cursorHoriz:
-        cursorId = wxCURSOR_SIZEWE;
-        break;
-    case cursorVert:
-        cursorId = wxCURSOR_SIZENS;
-        break;
-    case cursorReverseArrow:
-        cursorId = wxCURSOR_POINT_RIGHT;
-        break;
-    default:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    }
-
-    id->SetCursor(wxCursor(cursorId));
-}
-
-
-void Window::SetTitle(const char *s) {
-    id->SetTitle(s);
-}
-
-
-
-ListBox::ListBox() {
-}
-
-ListBox::~ListBox() {
-}
-
-void ListBox::Create(Window &parent, int ctrlID) {
-    id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
-                       0, NULL, wxLB_SINGLE | wxLB_SORT);
-}
-
-void ListBox::Clear() {
-    ((wxListBox*)id)->Clear();
-}
-
-void ListBox::Append(char *s) {
-    ((wxListBox*)id)->Append(s);
-}
-
-int ListBox::Length() {
-    return ((wxListBox*)id)->Number();
-}
-
-void ListBox::Select(int n) {
-    ((wxListBox*)id)->SetSelection(n);
-}
-
-int ListBox::GetSelection() {
-    return ((wxListBox*)id)->GetSelection();
-}
-
-int ListBox::Find(const char *prefix) {
-    return ((wxListBox*)id)->FindString(prefix);
-}
-
-void ListBox::GetValue(int n, char *value, int len) {
-    wxString text = ((wxListBox*)id)->GetString(n);
-    strncpy(value, text.c_str(), len);
-    value[len-1] = '\0';
-}
-
-void ListBox::Sort() {
-    // wxWindows keeps sorted so no need to sort
-}
-
-
-Menu::Menu() : id(0) {
-}
-
-void Menu::CreatePopUp() {
-    Destroy();
-    id = new wxMenu();
-}
-
-void Menu::Destroy() {
-    if (id)
-        delete id;
-    id = 0;
-}
-
-void Menu::Show(Point pt, Window &w) {
-    w.GetID()->PopupMenu(id, pt.x - 4, pt.y);
-    Destroy();
-}
-
-
-Colour Platform::Chrome() {
-    wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    return Colour(c.Red(), c.Green(), c.Blue());
-}
-
-Colour Platform::ChromeHighlight() {
-    wxColour c;
-    c = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHIGHLIGHT);
-    return Colour(c.Red(), c.Green(), c.Blue());
-}
-
-const char *Platform::DefaultFont() {
-    return wxNORMAL_FONT->GetFaceName();
-}
-
-int Platform::DefaultFontSize() {
-    return 8;
-}
-
-unsigned int Platform::DoubleClickTime() {
-    return 500;   // **** ::GetDoubleClickTime();
-}
-
-void Platform::DebugDisplay(const char *s) {
-    wxLogDebug(s);
-}
-
-bool Platform::IsKeyDown(int key) {
-    return false;  // I don't think we'll need this.
-}
-
-long Platform::SendScintilla(WindowID w,
-                             unsigned int msg,
-                             unsigned long wParam,
-                             long lParam) {
-
-    wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
-    return stc->SendMsg(msg, wParam, lParam);
-}
-
-
-// These are utility functions not really tied to a platform
-
-int Platform::Minimum(int a, int b) {
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-int Platform::Maximum(int a, int b) {
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-#define TRACE
-
-void Platform::DebugPrintf(const char *format, ...) {
-#ifdef TRACE
-    char buffer[2000];
-    va_list pArguments;
-    va_start(pArguments, format);
-    vsprintf(buffer,format,pArguments);
-    va_end(pArguments);
-    Platform::DebugDisplay(buffer);
-#endif
-}
-
-int Platform::Clamp(int val, int minVal, int maxVal) {
-    if (val > maxVal)
-        val = maxVal;
-    if (val < minVal)
-        val = minVal;
-    return val;
-}
-
-
-
-
-
-

src/stc/README.txt

@@ -1,47 +0,0 @@
-This contrib is the wxStyledTextCtrl, which is a wrapper around the
-Scintilla edit control.  (See www.scintilla.org)
-
-There is still VERY MUCH to be done, most notable of which is a more
-advanced sample that exercises more of the code.  (I havn't tested
-AutoComplete or CallTips, or most of the event types at all yet.)  And
-also documentation, adding wrappers for some new scintilla
-functionality, building and testing on wxGTK, etc.  Be patient, it all
-will get there soon.
-
-
-
-Let me describe a bit about the architecture I am implementing...
-Obviously there is the Platform layer which implements the varioius
-platform classes by using wxWindows classes and filling in where
-needed.  Then there is a ScintillaWX class that is derived from
-ScintillaBase and implements the necessary virtual methods that
-Scintilla needs to fully funciton.  This class however is not meant to
-ever be used directly by wx programmers.  I call it one end of the
-bridge between the wx and Scintilla worlds.  The other end of the
-bridge is a class called wxStyledTextCtrl that looks, feels and acts
-like other classes in wxWindows.  Here is a diagram:
-
-
- +------------------+          +-------------------+
- | wxStyledTextCtrl |--bridge--|    ScintillaWX    |
- +------------------+          +-------------------+
-                               |   ScintillaBase   |
-                               +-------------------+
-                               |       Editor      |
-                               +-------------------+
-                               |     PlatWX        |
-                               +-------------------+
-
-
-wxStyledTextCtrl derives from wxControl so it has a window that can be
-drawn upon.  When a wxStyledTextCtrl is constructed it constructs a
-ScintillaWX for itself and passes itself to the scintilla object to be
-set as the wMain and wDraw attributes.  All method calls on the STC
-are sent over the bridge in the form of calls to ScintiallWX::WndProc.
-All notifications are sent back over the bridge and turned into
-wxEvents.
-
-
-Robin
-
-

src/stc/ScintillaWX.cpp

@@ -1,460 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.cxx
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatformWX.cxx  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include <ctype.h>
-
-#include "ScintillaWX.h"
-#include "wx/stc/stc.h"
-
-
-//----------------------------------------------------------------------
-
-const int H_SCROLL_MAX  = 2000;
-const int H_SCROLL_STEP = 20;
-const int H_SCROLL_PAGE = 200;
-
-//----------------------------------------------------------------------
-// Helper classes
-
-class wxSTCTimer : public wxTimer {
-public:
-    wxSTCTimer(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    void Notify() {
-        swx->DoTick();
-    }
-
-private:
-    ScintillaWX* swx;
-};
-
-
-
-bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
-    return swx->DoDropText(x, y, data);
-}
-
-wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragEnter(x, y, def);
-}
-
-wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragOver(x, y, def);
-}
-
-void  wxSTCDropTarget::OnLeave() {
-    swx->DoDragLeave();
-}
-
-
-
-//----------------------------------------------------------------------
-// Constructor/Destructor
-
-
-ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
-    capturedMouse = false;
-    wMain = win;
-    wDraw = win;
-    stc   = win;
-    Initialise();
-}
-
-
-ScintillaWX::~ScintillaWX() {
-    SetTicking(false);
-}
-
-//----------------------------------------------------------------------
-// base class virtuals
-
-
-void ScintillaWX::Initialise() {
-    //ScintillaBase::Initialise();
-    dropTarget = new wxSTCDropTarget;
-    dropTarget->SetScintilla(this);
-    stc->SetDropTarget(dropTarget);
-}
-
-
-void ScintillaWX::Finalise() {
-    ScintillaBase::Finalise();
-}
-
-
-void ScintillaWX::StartDrag() {
-    wxDropSource        source(wMain.GetID());
-    wxTextDataObject    data(dragChars);
-    wxDragResult        result;
-
-    source.SetData(data);
-    result = source.DoDragDrop(TRUE);
-    if (result == wxDragMove && dropWentOutside)
-        ClearSelection();
-    inDragDrop = FALSE;
-    SetDragPosition(invalidPosition);
-}
-
-
-void ScintillaWX::SetTicking(bool on) {
-    wxSTCTimer* steTimer;
-    if (timer.ticking != on) {
-        timer.ticking = on;
-        if (timer.ticking) {
-            steTimer = new wxSTCTimer(this);
-            steTimer->Start(timer.tickSize);
-            timer.tickerID = (int)steTimer;
-        } else {
-            steTimer = (wxSTCTimer*)timer.tickerID;
-            steTimer->Stop();
-            delete steTimer;
-            timer.tickerID = 0;
-        }
-    }
-    timer.ticksToWait = caret.period;
-}
-
-
-void ScintillaWX::SetMouseCapture(bool on) {
-    if (on && !capturedMouse)
-        wMain.GetID()->CaptureMouse();
-    else if (!on && capturedMouse)
-        wMain.GetID()->ReleaseMouse();
-    capturedMouse = on;
-}
-
-
-bool ScintillaWX::HaveMouseCapture() {
-    return capturedMouse;
-}
-
-
-void ScintillaWX::ScrollText(int linesToMove) {
-    int dy = vs.lineHeight * (linesToMove);
-    // TODO: calculate the rectangle to refreshed...
-    wMain.GetID()->ScrollWindow(0, dy);
-}
-
-void ScintillaWX::SetVerticalScrollPos() {
-    wMain.GetID()->SetScrollPos(wxVERTICAL, topLine);
-}
-
-void ScintillaWX::SetHorizontalScrollPos() {
-    wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset);
-}
-
-
-bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
-    bool modified = false;
-    int  sbMax    = wMain.GetID()->GetScrollRange(wxVERTICAL);
-    int  sbThumb  = wMain.GetID()->GetScrollThumb(wxVERTICAL);
-    int  sbPos    = wMain.GetID()->GetScrollPos(wxVERTICAL);
-
-
-    if (sbMax != nMax || sbThumb != nPage) {
-        wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
-        modified = true;
-    }
-
-    sbMax    = wMain.GetID()->GetScrollRange(wxHORIZONTAL);
-    sbThumb  = wMain.GetID()->GetScrollThumb(wxHORIZONTAL);
-    if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-        wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
-        modified = true;
-    }
-    return modified;
-}
-
-
-void ScintillaWX::NotifyChange() {
-    stc->NotifyChange();
-}
-
-
-void ScintillaWX::NotifyParent(SCNotification scn) {
-    stc->NotifyParent(&scn);
-}
-
-
-
-void ScintillaWX::Copy() {
-    if (currentPos != anchor) {
-        char* text = CopySelectionRange();
-        textDO.SetText(text);
-        wxTheClipboard->Open();
-        wxTheClipboard->SetData(&textDO);
-        wxTheClipboard->Close();
-    }
-}
-
-
-void ScintillaWX::Paste() {
-    pdoc->BeginUndoAction();
-    ClearSelection();
-
-    wxTextDataObject data;
-    bool canPaste;
-
-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
-    if (canPaste) {
-        wxString str = data.GetText();
-        int      len = str.Length();
-        pdoc->InsertString(currentPos, str.c_str(), len);
-        SetEmptySelection(currentPos + len);
-    }
-
-    pdoc->EndUndoAction();
-    NotifyChange();
-    Redraw();
-}
-
-
-bool ScintillaWX::CanPaste() {
-    wxTextDataObject data;
-    bool canPaste;
-
-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
-
-    return canPaste;
-}
-
-void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    ct.wCallTip = new wxWindow(wDraw.GetID(), -1);
-    ct.wDraw = ct.wCallTip;
-}
-
-
-void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
-    if (!label[0])
-        popup.GetID()->AppendSeparator();
-    else
-        popup.GetID()->Append(cmd, label);
-
-    if (!enabled)
-        popup.GetID()->Enable(cmd, enabled);
-
-    // TODO:  need to create event handler mappings for the cmd ID
-}
-
-
-void ScintillaWX::ClaimSelection() {
-
-}
-
-
-LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) {
-    return 0;
-}
-
-LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
-    switch (iMessage) {
-    case EM_CANPASTE:
-        return CanPaste();
-    default:
-        return ScintillaBase::WndProc(iMessage, wParam, lParam);
-    }
-    return 0;
-}
-
-
-
-//----------------------------------------------------------------------
-// Event delegates
-
-void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
-
-    paintState = painting;
-    Surface surfaceWindow;
-    surfaceWindow.Init(dc);
-    PRectangle rcPaint = PRectangleFromwxRect(rect);
-    dc->BeginDrawing();
-    Paint(&surfaceWindow, rcPaint);
-    dc->EndDrawing();
-    surfaceWindow.Release();
-    if (paintState == paintAbandoned) {
-        // Painting area was insufficient to cover new styling or brace highlight positions
-        FullPaint();
-    }
-    paintState = notPainting;
-}
-
-
-void ScintillaWX::DoHScroll(int type, int pos) {
-    int xPos = xOffset;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
-        xPos -= H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
-        xPos += H_SCROLL_STEP;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
-        xPos -= H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
-        xPos += H_SCROLL_PAGE;
-        break;
-    case wxEVT_SCROLLWIN_TOP:
-        xPos = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
-        xPos = H_SCROLL_MAX;
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
-        xPos = pos;
-        break;
-    }
-    HorizontalScrollTo(xPos);
-}
-
-void ScintillaWX::DoVScroll(int type, int pos) {
-    int topLineNew = topLine;
-    switch (type) {
-    case wxEVT_SCROLLWIN_LINEUP:
-        topLineNew -= 1;
-        break;
-    case wxEVT_SCROLLWIN_LINEDOWN:
-        topLineNew += 1;
-        break;
-    case wxEVT_SCROLLWIN_PAGEUP:
-        topLineNew -= LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_PAGEDOWN:
-        topLineNew += LinesToScroll();
-        break;
-    case wxEVT_SCROLLWIN_TOP:
-        topLineNew = 0;
-        break;
-    case wxEVT_SCROLLWIN_BOTTOM:
-        topLineNew = MaxScrollPos();
-        break;
-    case wxEVT_SCROLLWIN_THUMBTRACK:
-        topLineNew = pos;
-        break;
-    }
-    ScrollTo(topLineNew);
-}
-
-void ScintillaWX::DoSize(int width, int height) {
-    PRectangle rcClient(0,0,width,height);
-    SetScrollBarsTo(rcClient);
-    DropGraphics();
-}
-
-void ScintillaWX::DoLoseFocus(){
-    DropCaret();
-}
-
-void ScintillaWX::DoGainFocus(){
-    ShowCaretAtCurrentPosition();
-}
-
-void ScintillaWX::DoSysColourChange() {
-    InvalidateStyleData();
-}
-
-void ScintillaWX::DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-    ButtonDown(pt, curTime, shift, ctrl, alt);
-}
-
-void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-    ButtonUp(pt, curTime, ctrl);
-}
-
-void ScintillaWX::DoButtonMove(Point pt) {
-    ButtonMove(pt);
-}
-
-
-void ScintillaWX::DoAddChar(char ch) {
-    AddChar(ch);
-}
-
-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
-    return KeyDown(key, shift, ctrl, alt);
-}
-
-
-void ScintillaWX::DoCommand(int ID) {
-    Command(ID);
-}
-
-
-void ScintillaWX::DoContextMenu(Point pt) {
-    ContextMenu(pt);
-}
-
-
-//----------------------------------------------------------------------
-
-bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
-    SetDragPosition(invalidPosition);
-    int movePos = PositionFromLocation(Point(x,y));
-    DropAt(movePos, data, dragResult == wxDragMove, FALSE); // TODO: rectangular?
-    return TRUE;
-}
-
-
-wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {
-    return def;
-}
-
-
-wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    SetDragPosition(PositionFromLocation(Point(x, y)));
-    dragResult = def;
-    return def;
-}
-
-
-void ScintillaWX::DoDragLeave() {
-    SetDragPosition(invalidPosition);
-}
-
-//----------------------------------------------------------------------
-
-// Redraw all of text area. This paint will not be abandoned.
-void ScintillaWX::FullPaint() {
-    paintState = painting;
-    rcPaint = GetTextRectangle();
-    wxClientDC dc(wMain.GetID());
-    Surface surfaceWindow;
-    surfaceWindow.Init(&dc);
-    Paint(&surfaceWindow, rcPaint);
-    surfaceWindow.Release();
-    paintState = notPainting;
-}
-
-
-void ScintillaWX::DoScrollToLine(int line) {
-    ScrollTo(line);
-}
-
-
-void ScintillaWX::DoScrollToColumn(int column) {
-    HorizontalScrollTo(column * vs.spaceWidth);
-}
-
-
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------

src/stc/ScintillaWX.h

@@ -1,148 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatWX.cpp.  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ScintillaWX_h__
-#define __ScintillaWX_h__
-
-//----------------------------------------------------------------------
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#endif
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CallTip.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "AutoComplete.h"
-#include "Document.h"
-#include "Editor.h"
-#include "ScintillaBase.h"
-
-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
-
-//----------------------------------------------------------------------
-
-class wxStyledTextCtrl;           // forward
-class ScintillaWX;
-
-
-//----------------------------------------------------------------------
-// Helper classes
-
-class wxSTCDropTarget : public wxTextDropTarget {
-public:
-    void SetScintilla(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
-    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void OnLeave();
-
-private:
-    ScintillaWX* swx;
-};
-
-
-//----------------------------------------------------------------------
-
-class ScintillaWX : public ScintillaBase {
-public:
-
-    ScintillaWX(wxStyledTextCtrl* win);
-    ~ScintillaWX();
-
-    // base class virtuals
-    virtual void Initialise();
-    virtual void Finalise();
-    virtual void StartDrag();
-    virtual void SetTicking(bool on);
-    virtual void SetMouseCapture(bool on);
-    virtual bool HaveMouseCapture();
-    virtual void ScrollText(int linesToMove);
-    virtual void SetVerticalScrollPos();
-    virtual void SetHorizontalScrollPos();
-    virtual bool ModifyScrollBars(int nMax, int nPage);
-    virtual void Copy();
-    virtual void Paste();
-    virtual void CreateCallTipWindow(PRectangle rc);
-    virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
-    virtual void ClaimSelection();
-
-    virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-    virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-
-    virtual void NotifyChange();
-    virtual void NotifyParent(SCNotification scn);
-
-
-    // Event delegates
-    void DoPaint(wxDC* dc, wxRect rect);
-    void DoHScroll(int type, int pos);
-    void DoVScroll(int type, int pos);
-    void DoSize(int width, int height);
-    void DoLoseFocus();
-    void DoGainFocus();
-    void DoSysColourChange();
-    void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-    void DoButtonUp(Point pt, unsigned int curTime, bool ctrl);
-    void DoButtonMove(Point pt);
-    void DoAddChar(char ch);
-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
-    void DoTick() { Tick(); }
-
-    bool DoDropText(long x, long y, const wxString& data);
-    wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void DoDragLeave();
-
-    void DoCommand(int ID);
-    void DoContextMenu(Point pt);
-
-
-    // helpers
-    void FullPaint();
-    bool CanPaste();
-    bool GetHideSelection() { return hideSelection; }
-    void DoScrollToLine(int line);
-    void DoScrollToColumn(int column);
-
-private:
-    bool                capturedMouse;
-    wxStyledTextCtrl*   stc;
-
-    wxTextDataObject    textDO;
-    wxSTCDropTarget*    dropTarget;
-    wxDragResult        dragResult;
-};
-
-//----------------------------------------------------------------------
-#endif

src/stc/StcVC.dsp

@@ -1,250 +0,0 @@
-# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=StcVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "StcVC.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-
-!IF  "$(CFG)" == "StcVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c
-# SUBTRACT CPP /YX
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\stc.lib"
-
-!ELSEIF  "$(CFG)" == "StcVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c
-# SUBTRACT CPP /YX
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\stcd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "StcVC - Win32 Release"
-# Name "StcVC - Win32 Debug"
-# Begin Group "Stc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScintillaWX.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stc.cpp
-# End Source File
-# End Group
-# Begin Group "Scintilla"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\scintilla\src\Accessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\AutoComplete.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CallTip.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\CellBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ContractionState.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Document.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Editor.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Indicator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\LineMarker.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ScintillaBase.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\Style.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\SVector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=.\scintilla\src\ViewStyle.h
-# End Source File
-# End Group
-# End Target
-# End Project

src/stc/StcVC.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "StcVC"=.\StcVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

src/stc/makefile.b32

@@ -1,79 +0,0 @@
-#
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:
-#
-# Makefile : Builds wxMMedia library for 32-bit BC++
-
-# N.B. use:
-# make -f makefile.b32 stc.cfg
-# make -f makefile.b32
-
-WXDIR = $(WXWIN)
-
-SCINTILLA=.\scintilla
-S=$(SCINTILLA)\src
-
-STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
-
-LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
-
-OBJECTS = \
-	Accessor.obj	\
-	AutoComplete.obj	\
-	CallTip.obj	\
-	CellBuffer.obj	\
-	ContractionState.obj\
-	Document.obj	\
-	Editor.obj		\
-	Indicator.obj	\
-	KeyMap.obj		\
-	KeyWords.obj	\
-	LineMarker.obj	\
-	PropSet.obj	\
-	ScintillaBase.obj	\
-	Style.obj		\
-	ViewStyle.obj	\
-				\
-	PlatWX.obj		\
-	ScintillaWX.obj	\
-	stc.obj		\
-
-!include $(WXDIR)\src\makelib.b32
-
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
-
-{$(S)}.cxx.obj:
-	bcc32 $(CPPFLAGS) -P -c {$< }
-
-$(CFG): makefile.b32
-	copy &&!
--H=$(WXDIR)\src\msw\wx32.csm
--3
--d
--a1 # byte alignment
--R-
--X
--w-par
--w-aus
--w-hid # virtual function A hides virtual function B
--WE
--tWM
-
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
--I$(WXDIR)\include\wx\msw\gnuwin32
-
--L$(BCCDIR)\lib
--D__WXWIN__
--D__WXMSW__
--D__WINDOWS__
--DWIN32
-$(OPT)
-$(DEBUG_FLAGS)
-$(WIN95FLAG)
-$(STCEXTRACPPFLAGS)
-! $(CFG)
-

src/stc/makefile.g95

@@ -1,34 +0,0 @@
-# File:		makefile.g95  For stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-WXDIR = ../../..
-
-SCINTILLA=$(WXDIR)/contrib/src/stc/scintilla
-S=$(SCINTILLA)/src
-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
-
-OBJECTS = \
-	$(S)/Accessor.$(OBJSUFF) \
-	$(S)/AutoComplete.$(OBJSUFF) \
-	$(S)/CallTip.$(OBJSUFF) \
-	$(S)/CellBuffer.$(OBJSUFF) \
-	$(S)/ContractionState.$(OBJSUFF)\
-	$(S)/Document.$(OBJSUFF) \
-	$(S)/Editor.$(OBJSUFF) \
-	$(S)/Indicator.$(OBJSUFF) \
-	$(S)/KeyMap.$(OBJSUFF) \
-	$(S)/KeyWords.$(OBJSUFF) \
-	$(S)/LineMarker.$(OBJSUFF) \
-	$(S)/PropSet.$(OBJSUFF) \
-	$(S)/ScintillaBase.$(OBJSUFF) \
-	$(S)/Style.$(OBJSUFF) \
-	$(S)/ViewStyle.$(OBJSUFF) \
-	PlatWX.$(OBJSUFF) \
-	ScintillaWX.$(OBJSUFF) \
-	stc.$(OBJSUFF)
-
-LIBTARGET = $(WXDIR)/contrib/lib/libstc.a
-
-include $(WXDIR)/src/makelib.g95

src/stc/makefile.vc

@@ -1,94 +0,0 @@
-# File:		makefile.vc  For stectrl
-# Author:	Robin Dunn
-# Created:	1-Feb-2000
-# Updated:
-
-
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-SCINTILLA=.\scintilla
-S=$(SCINTILLA)\src
-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)\contrib\include
-NOPCH=1
-
-!include $(WXDIR)\src\makevc.env
-
-OBJECTS = \
-	$(D)\Accessor.obj	\
-	$(D)\AutoComplete.obj	\
-	$(D)\CallTip.obj	\
-	$(D)\CellBuffer.obj	\
-	$(D)\ContractionState.obj\
-	$(D)\Document.obj	\
-	$(D)\Editor.obj		\
-	$(D)\Indicator.obj	\
-	$(D)\KeyMap.obj		\
-	$(D)\KeyWords.obj	\
-	$(D)\LineMarker.obj	\
-	$(D)\PropSet.obj	\
-	$(D)\ScintillaBase.obj	\
-	$(D)\Style.obj		\
-	$(D)\ViewStyle.obj	\
-				\
-	$(D)\PlatWX.obj		\
-	$(D)\ScintillaWX.obj	\
-	$(D)\stc.obj		\
-
-
-
-
-LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib
-
-all:    $(D) $(LIBTARGET)
-
-$(D) :
-	mkdir $(D)
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.vc clean
-        cd $(THISDIR)
-
-
-
-
-$(LIBTARGET): $(OBJECTS)
-	-erase $(LIBTARGET)
-	$(implib) @<<
--out:$(LIBTARGET)
--machine:$(CPU)
-$(OBJECTS)
-<<
-
-
-
-{$(S)}.cxx{$(D)}.obj:
-	$(cc) @<<
-$(CPPFLAGS) /c /Fo$@ /Tp $<
-<<
-
-{}.cpp{$(D)}.obj:
-	$(cc) @<<
-$(CPPFLAGS) /c /Fo$@ /Tp $<
-<<
-
-
-show:
-	@echo $(CPPFLAGS)
-
-
-clean:
-        -erase $(D)\*.obj
-        -erase *.sbr
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.pdb
-        -erase $(LIBTARGET)
-

src/stc/scintilla/README.txt

@@ -1,7 +0,0 @@
-This directory contains copies of the scintilla/src and
-scintilla/include directories from the Scintilla/SCiTE source
-distribution.  All other code needed to implement Scintilla on top of
-wxWindows is located in the directory above this one.
-
-The current version of the Scintilla code is somewhere between 1.22
-and 1.23, (from their CVS.)

src/stc/scintilla/include/Accessor.h

@@ -1,88 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.h - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8};
-
-class Accessor {
-protected:
-	// bufferSize is a trade off between time taken to copy the characters and SendMessage overhead
-	// slopSize positions the buffer before the desired position in case there is some backtracking
-	enum {bufferSize=4000, slopSize=bufferSize/8};
-	char buf[bufferSize+1];
-	WindowID id;
-	PropSet &props;
-	int startPos;
-	int endPos;
-	int lenDoc;
-	int offset;	// Optional but including an offset makes GCC generate better code 
-	int codePage;	
-	bool InternalIsLeadByte(char ch);
-	void Fill(int position);
-public:
-	Accessor(WindowID id_, PropSet &props_, int offset_=0) : 
-			id(id_), props(props_), startPos(0x7FFFFFFF), endPos(0), 
-			lenDoc(-1), offset(offset_), codePage(0) {
-	}
-	void SetCodePage(int codePage_) { codePage = codePage_; }
-	char operator[](int position) {
-		position += offset;
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-		}
-		return buf[position - startPos];
-	}
-	char SafeGetCharAt(int position, char chDefault=' ') {
-		// Safe version of operator[], returning a defined value for invalid position 
-		position += offset;
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-			if (position < startPos || position >= endPos) {
-				// Position is outside range of document 
-				return chDefault;
-			}
-		}
-		return buf[position - startPos];
-	}
-	bool IsLeadByte(char ch) {
-		return codePage && InternalIsLeadByte(ch);
-	}
-	char StyleAt(int position);
-	int GetLine(int position);
-	int LineStart(int line);
-	int LevelAt(int line);
-	int Length();
-	void Flush() {
-		startPos = 0x7FFFFFFF;
-		lenDoc = -1;
-	}
-	int GetLineState(int line);
-	int SetLineState(int line, int state);
-	PropSet &GetPropSet() { return props; }
-};
-
-class StylingContext;
-
-typedef bool (*PFNIsCommentLeader)(StylingContext &styler, int pos, int len);
-
-class StylingContext : public Accessor {
-	char styleBuf[bufferSize];
-	int validLen;
-	char chFlags;
-	char chWhile;
-	unsigned int startSeg;
-public:
-	StylingContext(WindowID id_, PropSet &props_, int offset_=0) : 
-		Accessor(id_,props_,offset_), validLen(0), chFlags(0) {}
-	void StartAt(unsigned int start, char chMask=31);
-	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
-	unsigned int GetStartSegment() { return startSeg; }
-	void StartSegment(unsigned int pos);
-	void ColourTo(unsigned int pos, int chAttr);
-	int GetLine(int position);
-	void SetLevel(int line, int level);
-	void Flush();
-	int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
-};
-

src/stc/scintilla/include/KeyWords.h

@@ -1,41 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// KeyWords.h - colourise for particular languages
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
-                  WordList *keywordlists[], StylingContext &styler);
-                  
-class LexerModule {
-	static LexerModule *base;
-	LexerModule *next;
-	int language;
-	LexerFunction fn;
-public:
-	LexerModule(int language_, LexerFunction fn_);
-	static void Colourise(unsigned int startPos, int lengthDoc, int initStyle,
-                  int language, WordList *keywordlists[], StylingContext &styler);
-};
-
-inline bool iswordchar(char ch) {
-	return isalnum(ch) || ch == '.' || ch == '_';
-}
-
-inline bool iswordstart(char ch) {
-	return isalnum(ch) || ch == '_';
-}
-
-inline bool isoperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	return false;
-}
-

src/stc/scintilla/include/Platform.h

@@ -1,395 +0,0 @@
-// Scintilla source code edit control
-// Platform.h - interface to platform facilities
-// Also includes some basic utilities
-// Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-// PLAT_GTK = GTK+ on Linux, PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWindows on any supported platform
-// Could also have PLAT_GTKWIN = GTK+ on Win32 OS in future
-
-#define PLAT_GTK 0
-#define PLAT_WIN 0
-#define PLAT_WX  0
-
-#if defined(__WX__)
-#undef PLAT_WX
-#define PLAT_WX  1
-
-#elif defined(GTK)
-#undef PLAT_GTK
-#define PLAT_GTK 1
-
-#else
-#undef PLAT_WIN
-#define PLAT_WIN 1
-
-#endif
-
-
-// Include the main header for each platform
-
-#if PLAT_GTK
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#endif
-
-#if PLAT_WIN
-#define _WIN32_WINNT  0x0400 // Otherwise some required stuff gets ifdef'd out
-// Vassili Bourdo: shut up annoying Visual C++ warnings:
-#ifdef _MSC_VER
-#pragma warning(disable: 4800 4244 4309)
-#endif
-#include <windows.h>
-#include <richedit.h>
-#endif
-
-#if PLAT_WX
-#include <wx/wx.h>
-#endif
-
-// Underlying the implementation of the platform classes are platform specific types.
-// Sometimes these need to be passed around by client code so they are defined here
-
-#if PLAT_GTK
-typedef GdkColor ColourID;
-typedef GdkFont* FontID;
-typedef GdkDrawable* SurfaceID;
-typedef GtkWidget* WindowID;
-typedef GtkItemFactory* MenuID;
-#endif
-
-#if PLAT_WIN
-typedef COLORREF ColourID;
-typedef HFONT FontID;
-typedef HDC SurfaceID;
-typedef HWND WindowID;
-typedef HMENU MenuID;
-#endif
-
-#if PLAT_WX
-typedef wxColour ColourID;
-typedef wxFont* FontID;
-typedef wxDC* SurfaceID;
-typedef wxWindow* WindowID;
-typedef wxMenu* MenuID;
-#endif
-
-#if PLAT_GTK || PLAT_WX
-#define SHIFT_PRESSED 1
-#define LEFT_CTRL_PRESSED 2
-#define LEFT_ALT_PRESSED 4
-#endif
-
-// Point is exactly the same as the Win32 POINT and GTK+ GdkPoint so can be used interchangeably
-
-class Point {
-public:
-	int x;
-	int y;
-	
-	Point(int x_=0, int y_=0) : x(x_), y(y_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-	
-	static Point FromLong(long lpoint);
-};
-
-// PRectangle is exactly the same as the Win32 RECT so can be used interchangeably
-// PRectangles contain their top and left sides, but not their right and bottom sides
-class PRectangle {
-public:
-	int left;
-	int top;
-	int right;
-	int bottom;
-
-	PRectangle(int left_=0, int top_=0, int right_=0, int bottom_ = 0) :
-		left(left_), top(top_), right(right_), bottom(bottom_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-
-	bool Contains(Point pt) {
-		return (pt.x >= left) && (pt.x <= right) &&
-			(pt.y >= top) && (pt.y <= bottom);
-	}
-	bool Contains(PRectangle rc) {
-		return (rc.left >= left) && (rc.right <= right) &&
-			(rc.top >= top) && (rc.bottom <= bottom);
-	}
-	bool Intersects(PRectangle other) {
-		return (right >= other.left) && (left <= other.right) &&
-			(bottom >= other.top) && (top <= other.bottom);
-	}
-	int Width() { return right - left; }
-	int Height() { return bottom - top; }
-};
-
-#if PLAT_WX
-wxRect wxRectFromPRectangle(PRectangle prc);
-PRectangle PRectangleFromwxRect(wxRect rc);
-#endif
-
-class Colour {
-	ColourID co;
-public:
-	Colour(long lcol=0);
-	Colour(unsigned int red, unsigned int green, unsigned int blue);
-	bool operator==(const Colour &other) const;
-	long AsLong() const;
-	unsigned int GetRed();
-	unsigned int GetGreen();
-	unsigned int GetBlue();
-	
-	friend class Surface;
-	friend class Palette;
-};
-
-// Colour pairs hold a desired colour and the colour that the graphics engine
-// allocates to approximate the desired colour.
-// To make palette management more automatic, ColourPairs could register at 
-// construction time with a palette management object.
-struct ColourPair {
-	Colour desired;
-	Colour allocated;
-
-	ColourPair(Colour desired_=Colour(0,0,0)) {
-		desired = desired_;
-		allocated = desired;
-	}
-};
-
-class Window;	// Forward declaration for Palette
-
-class Palette {
-	int used;
-	enum {numEntries = 100};
-	ColourPair entries[numEntries];
-#if PLAT_GTK
-	GdkColor *allocatedPalette;
-	int allocatedLen;
-#elif PLAT_WIN
-	HPALETTE hpal;
-#elif PLAT_WX
-	// wxPalette* pal;  // **** Is this needed?
-#endif
-public:
-	bool allowRealization;
-	
-	Palette();
-	~Palette();
-
-	void Release();
-	
-	// This method either adds a colour to the list of wanted colours (want==true)
-	// or retrieves the allocated colour back to the ColourPair.
-	// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-	void WantFind(ColourPair &cp, bool want);
-
-	void Allocate(Window &w);
-	
-	friend class Surface;
-};
-
-class Font {
-	FontID id;
-#if PLAT_WX
-	int ascent;
-#endif
-	// Private so Font objects can not be copied
-	Font(const Font &) {}
-	Font &operator=(const Font &) { id=0; return *this; }
-public:
-	Font();
-	~Font();
-
-	void Create(const char *faceName, int size, bool bold=false, bool italic=false);
-	void Release();
-
-	FontID GetID() { return id; }
-	// Alias another font - caller guarantees not to Release
-	void SetID(FontID id_) { id = id_; }
-	friend class Surface;
-};
-
-// A surface abstracts a place to draw
-class Surface {
-private:
-#if PLAT_GTK
-	GdkDrawable *drawable;
-	GdkGC *gc;
-	GdkPixmap *ppixmap;
-	int x;
-	int y;
-	bool inited;
-	bool createdGC;
-#elif PLAT_WIN
-	HDC hdc;
-	bool hdcOwned;
-	HPEN pen;
-	HPEN penOld;
-	HBRUSH brush;
-	HBRUSH brushOld;
-	HFONT font;
-	HFONT fontOld;
-	HBITMAP bitmap;
-	HBITMAP bitmapOld;
-	HPALETTE paletteOld;
-#elif PLAT_WX
-	wxDC* hdc;
-	bool hdcOwned;
-	wxBitmap* bitmap;
-	int x;
-	int y;
-#endif
-
-	// Private so Surface objects can not be copied
-	Surface(const Surface &) {}
-	Surface &operator=(const Surface &) { return *this; }
-#if PLAT_WIN || PLAT_WX
-	void BrushColor(Colour back);
-	void SetFont(Font &font_);
-#endif
-public:
-	Surface();
-	~Surface();
-	
-	void Init();
-	void Init(SurfaceID hdc_);
-	void InitPixMap(int width, int height, Surface *surface_);
-
-	void Release();
-	bool Initialised();
-	void PenColour(Colour fore);
-	int LogPixelsY();
-	void MoveTo(int x_, int y_);
-	void LineTo(int x_, int y_);
-	void Polygon(Point *pts, int npts, Colour fore, Colour back);
-	void RectangleDraw(PRectangle rc, Colour fore, Colour back);
-	void FillRectangle(PRectangle rc, Colour back);
-	void FillRectangle(PRectangle rc, Surface &surfacePattern);
-	void RoundedRectangle(PRectangle rc, Colour fore, Colour back);
-	void Ellipse(PRectangle rc, Colour fore, Colour back);
-	void Copy(PRectangle rc, Point from, Surface &surfaceSource);
-
-	void DrawText(PRectangle rc, Font &font_, int ybase, const char *s, int len, Colour fore, Colour back);
-	void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, Colour fore, Colour back);
-	void MeasureWidths(Font &font_, const char *s, int len, int *positions);
-	int WidthText(Font &font_, const char *s, int len);
-	int WidthChar(Font &font_, char ch);
-	int Ascent(Font &font_);
-	int Descent(Font &font_);
-	int InternalLeading(Font &font_);
-	int ExternalLeading(Font &font_);
-	int Height(Font &font_);
-	int AverageCharWidth(Font &font_);
-	
-	int SetPalette(Palette *pal, bool inBackGround);
-	void SetClip(PRectangle rc);
-	void FlushCachedState();
-};
-
-// Class to hide the details of window manipulation
-// Does not own the window which will normally have a longer life than this object
-class Window {
-	friend class ListBox;
-protected:
-	WindowID id;
-public:
-	Window() : id(0) {}
-	virtual ~Window();
-	Window &operator=(WindowID id_) {
-		id = id_;
-		return *this;
-	}
-	WindowID GetID() { return id; }
-	bool Created() { return id != 0; }
-	void Destroy();
-	bool HasFocus();
-	PRectangle GetPosition();
-	void SetPosition(PRectangle rc);
-	void SetPositionRelative(PRectangle rc, Window relativeTo);
-	PRectangle GetClientPosition();
-	void Show(bool show=true);
-	void InvalidateAll();
-	void InvalidateRectangle(PRectangle rc);
-	void SetFont(Font &font);
-	enum Cursor { cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow };
-	void SetCursor(Cursor curs);
-	void SetTitle(const char *s);
-#if PLAT_WIN
-	LRESULT SendMessage(UINT msg, WPARAM wParam=0, LPARAM lParam=0);
-	int GetDlgCtrlID();
-	HINSTANCE GetInstance();
-#endif
-};
-
-class ListBox : public Window {
-#if PLAT_GTK
-	WindowID list;
-	WindowID scroller;
-	int current;
-#endif
-public:
-	ListBox();
-	virtual ~ListBox();
-	ListBox &operator=(WindowID id_) {
-		id = id_;
-		return *this;
-	}
-	void Create(Window &parent, int ctrlID);
-	void Clear();
-	void Append(char *s);
-	int Length();
-	void Select(int n);
-	int GetSelection();
-	int Find(const char *prefix);
-	void GetValue(int n, char *value, int len);
-	void Sort();
-};
-
-class Menu {
-	MenuID id;
-public:
-	Menu();
-	MenuID GetID() { return id; }
-	void CreatePopUp();
-	void Destroy();
-	void Show(Point pt, Window &w);
-};
-
-// Platform class used to retrieve system wide parameters such as double click speed
-// and chrome colour. Not a creatable object, more of a module with several functions.
-class Platform {
-	// Private so Platform objects can not be copied
-	Platform(const Platform &) {}
-	Platform &operator=(const Platform &) { return *this; }
-public:
-	// Should be private because no new Platforms are ever created
-	// but gcc warns about this
-	Platform() {}
-	~Platform() {}
-	static Colour Chrome();
-	static Colour ChromeHighlight();
-	static const char *DefaultFont();
-	static int DefaultFontSize();
-	static unsigned int DoubleClickTime();
-	static void DebugDisplay(const char *s);
-	static bool IsKeyDown(int key);
-	static long SendScintilla(
-		WindowID w, unsigned int msg, unsigned long wParam=0, long lParam=0);
-	
-	// These are utility functions not really tied to a platform
-	static int Minimum(int a, int b);
-	static int Maximum(int a, int b);
-	static void DebugPrintf(const char *format, ...);
-	static int Clamp(int val, int minVal, int maxVal);
-};
-
-#endif

src/stc/scintilla/include/PropSet.h

@@ -1,180 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// PropSet.h - a java style properties file module
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PROPSET_H
-#define PROPSET_H
-
-bool EqualCaseInsensitive(const char *a, const char *b);
-
-// Define another string class.
-// While it would be 'better' to use std::string, that doubles the executable size.
-
-inline char *StringDup(const char *s) {
-	if (!s)
-		return 0;
-	char *sNew = new char[strlen(s) + 1];
-	if (sNew)
-		strcpy(sNew, s);
-	return sNew;
-}
-
-class SString {
-	char *s;
-public:
-	SString() {
-		s = 0;
-	}
-	SString(const SString &source) {
-		s = StringDup(source.s);
-	}
-	SString(const char *s_) {
-		s = StringDup(s_);
-	}
-	SString(int i) {
-		char number[100];
-		sprintf(number, "%0d", i);
-		//itoa(i, number, 10);
-		s = StringDup(number);
-	}
-	~SString() {
-		delete []s;
-		s = 0;
-	}
-	SString &operator=(const SString &source) {
-		if (this != &source) {
-			delete []s;
-			s = StringDup(source.s);
-		}
-		return *this;
-	}
-	bool operator==(const SString &other) const {
-		if ((s == 0) && (other.s == 0))
-			return true;
-		if ((s == 0) || (other.s == 0))
-			return false;
-		return strcmp(s, other.s) == 0;
-	}
-	bool operator==(const char *sother) const {
-		if ((s == 0) && (sother == 0))
-			return true;
-		if ((s == 0) || (sother == 0))
-			return false;
-		return strcmp(s, sother) == 0;
-	}
-	const char *c_str() const {
-		if (s)
-			return s;
-		else
-			return "";
-	}
-	int length() const {
-		if (s)
-			return strlen(s);
-		else
-			return 0;
-	}
-	char operator[](int i) {
-		if (s)
-			return s[i];
-		else
-			return '\0';
-	}
-	SString &operator +=(const char *sother) {
-		int len = length();
-		int lenOther = strlen(sother);
-		char *sNew = new char[len + lenOther + 1];
-		if (sNew) {
-			if (s)
-				memcpy(sNew, s, len);
-			memcpy(sNew + len, sother, lenOther);
-			sNew[len + lenOther] = '\0';
-			delete []s;
-			s = sNew;
-		}
-		return *this;
-	}
-	int value() {
-		if (s)
-			return atoi(s);
-		else 
-			return 0;
-	}
-};
-
-class PropSet {
-private:
-	char **vals;
-	int size;
-	int used;
-public:
-	PropSet *superPS;
-	PropSet();
-	~PropSet();
-	void EnsureCanAddEntry();
-	void Set(const char *key, const char *val);
-	void Set(char *keyval);
-	SString Get(const char *key);
-	int GetInt(const char *key, int defaultValue=0);
-	SString GetWild(const char *keybase, const char *filename);
-	SString GetNewExpand(const char *keybase, const char *filename);
-	void Clear();
-	void ReadFromMemory(const char *data, int len);
-	void Read(const char *filename);
-};
-
-// This is a fixed length list of strings suitable for display  in combo boxes
-// as a memory of user entries
-template<int sz>
-class EntryMemory {
-	SString entries[sz];
-public:
-	void Insert(SString s) {
-		for (int i=0;i<sz;i++) {
-			if (entries[i] == s) {
-				for (int j=i;j>0;j--) {
-					entries[j] = entries[j-1];
-				}
-				entries[0] = s;
-				return;
-			}
-		}
-		for (int k=sz-1;k>0;k--) {
-			entries[k] = entries[k-1];
-		}
-		entries[0] = s;
-	}
-	int Length() const {
-		int len = 0;
-		for (int i=0;i<sz;i++)
-			if (entries[i].length())
-				len++;
-		return len;
-	}
-	SString At(int n) const {
-		return entries[n];
-	}
-};
-
-class WordList {
-public:
-	// Each word contains at least one character - a empty word acts as sentinal at the end.
-	char **words;
-	char *list;
-	int len;
-	bool onlyLineEnds;	// Delimited by any white space or only line ends
-	int starts[256];
-	WordList(bool onlyLineEnds_ = false) : 
-		words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {}
-	~WordList() { Clear(); }
-	operator bool() { return list; }
-	const char *operator[](int ind) { return words[ind]; }
-	void Clear();
-	void Set(const char *s);
-	char *Allocate(int size);
-	void SetFromAllocated();
-	bool InList(const char *s);
-};
-
-#endif

src/stc/scintilla/include/SciLexer.h

@@ -1,172 +0,0 @@
-// Scintilla source code edit control
-// SciLexer - interface to the added lexer functions in the SciLexer version of the edit control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCILEXER_H
-#define SCILEXER_H
-
-// SciLexer features - not in standard Scintilla
-
-#define SCLEX_CONTAINER 0
-#define SCLEX_NULL 1
-#define SCLEX_PYTHON 2
-#define SCLEX_CPP 3
-#define SCLEX_HTML 4
-#define SCLEX_XML 5
-#define SCLEX_PERL 6
-#define SCLEX_SQL 7
-#define SCLEX_VB 8
-#define SCLEX_PROPERTIES 9
-#define SCLEX_ERRORLIST 10
-#define SCLEX_MAKEFILE 11
-#define SCLEX_BATCH 12
-
-// Lexical states for SCLEX_PYTHON
-#define SCE_P_DEFAULT 0
-#define SCE_P_COMMENTLINE 1
-#define SCE_P_NUMBER 2
-#define SCE_P_STRING 3
-#define SCE_P_CHARACTER 4
-#define SCE_P_WORD 5
-#define SCE_P_TRIPLE 6
-#define SCE_P_TRIPLEDOUBLE 7
-#define SCE_P_CLASSNAME 8
-#define SCE_P_DEFNAME 9
-#define SCE_P_OPERATOR 10
-#define SCE_P_IDENTIFIER 11
-#define SCE_P_COMMENTBLOCK 12
-#define SCE_P_STRINGEOL 13
-
-// Lexical states for SCLEX_CPP, SCLEX_VB
-#define SCE_C_DEFAULT 0
-#define SCE_C_COMMENT 1
-#define SCE_C_COMMENTLINE 2
-#define SCE_C_COMMENTDOC 3
-#define SCE_C_NUMBER 4
-#define SCE_C_WORD 5
-#define SCE_C_STRING 6
-#define SCE_C_CHARACTER 7
-#define SCE_C_UUID 8
-#define SCE_C_PREPROCESSOR 9
-#define SCE_C_OPERATOR 10
-#define SCE_C_IDENTIFIER 11
-#define SCE_C_STRINGEOL 12
-
-// Lexical states for SCLEX_HTML, SCLEX_xML
-#define SCE_H_DEFAULT 0
-#define SCE_H_TAG 1
-#define SCE_H_TAGUNKNOWN 2
-#define SCE_H_ATTRIBUTE 3
-#define SCE_H_ATTRIBUTEUNKNOWN 4
-#define SCE_H_NUMBER 5
-#define SCE_H_DOUBLESTRING 6
-#define SCE_H_SINGLESTRING 7
-#define SCE_H_OTHER 8
-#define SCE_H_COMMENT 9
-#define SCE_H_ENTITY 10
-// XML and ASP
-#define SCE_H_TAGEND 11
-#define SCE_H_XMLSTART 12
-#define SCE_H_XMLEND 13
-#define SCE_H_SCRIPT 14
-#define SCE_H_ASP 15
-#define SCE_H_ASPAT 16
-// Embedded Javascript
-#define SCE_HJ_START 40
-#define SCE_HJ_DEFAULT 41
-#define SCE_HJ_COMMENT 42
-#define SCE_HJ_COMMENTLINE 43
-#define SCE_HJ_COMMENTDOC 44
-#define SCE_HJ_NUMBER 45
-#define SCE_HJ_WORD 46
-#define SCE_HJ_KEYWORD 47
-#define SCE_HJ_DOUBLESTRING 48
-#define SCE_HJ_SINGLESTRING 49
-#define SCE_HJ_SYMBOLS 50
-#define SCE_HJ_STRINGEOL 51
-// ASP Javascript
-#define SCE_HJA_START 55
-#define SCE_HJA_DEFAULT 56
-#define SCE_HJA_COMMENT 57
-#define SCE_HJA_COMMENTLINE 58
-#define SCE_HJA_COMMENTDOC 59
-#define SCE_HJA_NUMBER 60
-#define SCE_HJA_WORD 61
-#define SCE_HJA_KEYWORD 62
-#define SCE_HJA_DOUBLESTRING 63
-#define SCE_HJA_SINGLESTRING 64
-#define SCE_HJA_SYMBOLS 65
-#define SCE_HJA_STRINGEOL 66
-// Embedded VBScript
-#define SCE_HB_START 70
-#define SCE_HB_DEFAULT 71
-#define SCE_HB_COMMENTLINE 72
-#define SCE_HB_NUMBER 73
-#define SCE_HB_WORD 74
-#define SCE_HB_STRING 75
-#define SCE_HB_IDENTIFIER 76
-#define SCE_HB_STRINGEOL 77
-// ASP VBScript
-#define SCE_HBA_START 80
-#define SCE_HBA_DEFAULT 81
-#define SCE_HBA_COMMENTLINE 82
-#define SCE_HBA_NUMBER 83
-#define SCE_HBA_WORD 84
-#define SCE_HBA_STRING 85
-#define SCE_HBA_IDENTIFIER 86
-#define SCE_HBA_STRINGEOL 87
-// Embedded Python
-#define SCE_HP_START 90
-#define SCE_HP_DEFAULT 91
-#define SCE_HP_COMMENTLINE 92
-#define SCE_HP_NUMBER 93
-#define SCE_HP_STRING 94
-#define SCE_HP_CHARACTER 95
-#define SCE_HP_WORD 96
-#define SCE_HP_TRIPLE 97
-#define SCE_HP_TRIPLEDOUBLE 98
-#define SCE_HP_CLASSNAME 99
-#define SCE_HP_DEFNAME 100
-#define SCE_HP_OPERATOR 101
-#define SCE_HP_IDENTIFIER 102
-// ASP Python
-#define SCE_HPA_START 105
-#define SCE_HPA_DEFAULT 106
-#define SCE_HPA_COMMENTLINE 107
-#define SCE_HPA_NUMBER 108
-#define SCE_HPA_STRING 109
-#define SCE_HPA_CHARACTER 110
-#define SCE_HPA_WORD 111
-#define SCE_HPA_TRIPLE 112
-#define SCE_HPA_TRIPLEDOUBLE 113
-#define SCE_HPA_CLASSNAME 114
-#define SCE_HPA_DEFNAME 115
-#define SCE_HPA_OPERATOR 116
-#define SCE_HPA_IDENTIFIER 117
-
-// Lexical states for SCLEX_PERL
-#define SCE_PL_DEFAULT 0
-#define SCE_PL_HERE 1
-#define SCE_PL_COMMENTLINE 2
-#define SCE_PL_POD 3
-#define SCE_PL_NUMBER 4
-#define SCE_PL_WORD 5
-#define SCE_PL_STRING 6
-#define SCE_PL_CHARACTER 7
-#define SCE_PL_PUNCTUATION 8
-#define SCE_PL_PREPROCESSOR 9
-#define SCE_PL_OPERATOR 10
-#define SCE_PL_IDENTIFIER 11
-#define SCE_PL_SCALAR 12
-#define SCE_PL_ARRAY 13
-#define SCE_PL_HASH 14
-#define SCE_PL_SYMBOLTABLE 15
-#define SCE_PL_REF 16
-#define SCE_PL_REGEX 17
-#define SCE_PL_REGSUBST 18
-#define SCE_PL_LONGQUOTE 19
-#define SCE_PL_BACKTICKS 20
-#define SCE_PL_DATASECTION 21
-    
-#endif

src/stc/scintilla/include/Scintilla.h

@@ -1,423 +0,0 @@
-// Scintilla source code edit control
-// Scintilla.h - interface to the edit control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCINTILLA_H
-#define SCINTILLA_H
-
-// Compile-time configuration options
-#define MACRO_SUPPORT 1  // Comment out to remove macro hooks
-
-#if PLAT_GTK
-#include <gdk/gdk.h>
-#include <gtk/gtkvbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAS	T (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
-
-	typedef struct _ScintillaObject ScintillaObject;
-	typedef struct _ScintillaClass  ScintillaClass;
-
-	struct _ScintillaObject
-	{
-		GtkFixed vbox;
-		void *pscin;
-	};
-
-	struct _ScintillaClass
-	{
-		GtkFixedClass parent_class;
-
-		void (* command) (ScintillaObject *ttt);
-		void (* notify) (ScintillaObject *ttt);
-	};
-
-	guint		scintilla_get_type	(void);
-	GtkWidget*	scintilla_new		(void);
-	void		scintilla_set_id	(ScintillaObject *sci,int id);
-	long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
-
-#include "WinDefs.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#if PLAT_WX
-#include "WinDefs.h"
-#endif
-
-// Both GTK and Windows
-
-#define INVALID_POSITION -1 
-
-// Define start of Scintilla messages to be greater than all edit (EM_*) messages
-// as many EM_ messages can be used.
-#define SCI_START 2000
-#define SCI_OPTIONAL_START 3000
-#define SCI_LEXER_START 4000
-
-#define SCI_ADDTEXT SCI_START + 1
-#define SCI_ADDSTYLEDTEXT SCI_START + 2
-#define SCI_INSERTTEXT SCI_START + 3
-#define SCI_CLEARALL SCI_START + 4
-#define SCI_GETLENGTH SCI_START + 6
-#define SCI_GETCHARAT SCI_START + 7
-#define SCI_GETCURRENTPOS SCI_START + 8
-#define SCI_GETANCHOR SCI_START + 9
-#define SCI_GETSTYLEAT SCI_START + 10
-
-#define SCI_REDO SCI_START + 11
-#define SCI_SETUNDOCOLLECTION SCI_START + 12
-#define SCI_SELECTALL SCI_START + 13
-#define SCI_SETSAVEPOINT SCI_START + 14
-#define SCI_GETSTYLEDTEXT SCI_START + 15
-#define SCI_CANREDO SCI_START + 16
-#define SCI_MARKERLINEFROMHANDLE SCI_START + 17
-#define SCI_MARKERDELETEHANDLE SCI_START + 18
-
-#define SC_UNDOCOLLECT_NONE 0
-#define SC_UNDOCOLLECT_AUTOSTART 1
-
-#define SCI_GETVIEWWS SCI_START + 20
-#define SCI_SETVIEWWS SCI_START + 21
-#define SCI_CHANGEPOSITION SCI_START + 22
-#define SCI_GOTOLINE SCI_START + 24
-#define SCI_GOTOPOS SCI_START + 25
-#define SCI_SETANCHOR SCI_START + 26
-#define SCI_GETCURLINE SCI_START + 27
-#define SCI_GETENDSTYLED SCI_START + 28
-#define SCI_CONVERTEOLS SCI_START + 29
-
-#define SCI_GETEOLMODE SCI_START + 30
-#define SCI_SETEOLMODE SCI_START + 31
-
-#define SC_EOL_CRLF 0
-#define SC_EOL_CR 1
-#define SC_EOL_LF 2
-
-#define SCI_STARTSTYLING SCI_START + 32
-#define SCI_SETSTYLING SCI_START + 33
-
-#define SCI_SETBUFFEREDDRAW SCI_START + 35
-#define SCI_SETTABWIDTH SCI_START + 36
-#define SCI_SETCODEPAGE SCI_START + 37
-#define SCI_SETUSEPALETTE SCI_START + 39
-
-#define MARKER_MAX 31
-
-#define SC_MARK_CIRCLE 0
-#define SC_MARK_ROUNDRECT 1
-#define SC_MARK_ARROW 2
-#define SC_MARK_SMALLRECT 3
-#define SC_MARK_SHORTARROW 4
-#define SC_MARK_EMPTY 5
-#define SC_MARK_ARROWDOWN 6
-#define SC_MARK_MINUS 7
-#define SC_MARK_PLUS 8
-
-#define SCI_MARKERDEFINE SCI_START + 40
-#define SCI_MARKERSETFORE SCI_START + 41
-#define SCI_MARKERSETBACK SCI_START + 42
-#define SCI_MARKERADD SCI_START + 43
-#define SCI_MARKERDELETE SCI_START + 44
-#define SCI_MARKERDELETEALL SCI_START + 45
-#define SCI_MARKERGET SCI_START + 46
-#define SCI_MARKERNEXT SCI_START + 47
-#define SCI_MARKERPREVIOUS SCI_START + 48
-
-#define SC_MARKNUM_FOLDER 30
-#define SC_MARKNUM_FOLDEROPEN 31
-
-#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
-
-#define SC_MARGIN_SYMBOL 0
-#define SC_MARGIN_NUMBER 1
-
-#define SCI_SETMARGINTYPEN SCI_START + 240
-#define SCI_GETMARGINTYPEN SCI_START + 241
-#define SCI_SETMARGINWIDTHN SCI_START + 242
-#define SCI_GETMARGINWIDTHN SCI_START + 243
-#define SCI_SETMARGINMASKN SCI_START + 244
-#define SCI_GETMARGINMASKN SCI_START + 245
-#define SCI_SETMARGINSENSITIVEN SCI_START + 246
-#define SCI_GETMARGINSENSITIVEN SCI_START + 247
-
-#define STYLE_DEFAULT 32
-#define STYLE_LINENUMBER 33
-#define STYLE_BRACELIGHT 34
-#define STYLE_BRACEBAD 35
-#define STYLE_CONTROLCHAR 36
-#define STYLE_MAX 127
-
-#define SCI_STYLECLEARALL SCI_START + 50
-#define SCI_STYLESETFORE SCI_START + 51
-#define SCI_STYLESETBACK SCI_START + 52
-#define SCI_STYLESETBOLD SCI_START + 53
-#define SCI_STYLESETITALIC SCI_START + 54
-#define SCI_STYLESETSIZE SCI_START + 55
-#define SCI_STYLESETFONT SCI_START + 56
-#define SCI_STYLESETEOLFILLED SCI_START + 57
-#define SCI_STYLERESETDEFAULT SCI_START + 58
-
-#define SCI_SETSELFORE SCI_START + 67
-#define SCI_SETSELBACK SCI_START + 68
-#define SCI_SETCARETFORE SCI_START + 69
-
-#define SCI_ASSIGNCMDKEY SCI_START + 70
-#define SCI_CLEARCMDKEY SCI_START + 71
-#define SCI_CLEARALLCMDKEYS SCI_START + 72
-
-#define SCI_SETSTYLINGEX SCI_START + 73
-
-#define SCI_GETCARETPERIOD SCI_START + 75
-#define SCI_SETCARETPERIOD SCI_START + 76
-#define SCI_SETWORDCHARS SCI_START + 77
-
-#define SCI_BEGINUNDOACTION SCI_START + 78
-#define SCI_ENDUNDOACTION SCI_START + 79
-
-#define INDIC_MAX 7
-
-#define INDIC_PLAIN 0
-#define INDIC_SQUIGGLE 1
-#define INDIC_TT 2
-
-#define INDIC0_MASK 32
-#define INDIC1_MASK 64
-#define INDIC2_MASK 128
-#define INDICS_MASK (INDIC0_MASK | INDIC1_MASK | INDIC2_MASK)
-
-#define SCI_INDICSETSTYLE SCI_START + 80
-#define SCI_INDICGETSTYLE SCI_START + 81
-#define SCI_INDICSETFORE SCI_START + 82
-#define SCI_INDICGETFORE SCI_START + 83
-
-#define SCI_SETSTYLEBITS SCI_START + 90
-#define SCI_GETSTYLEBITS SCI_START + 91
-#define SCI_SETLINESTATE SCI_START + 92
-#define SCI_GETLINESTATE SCI_START + 93
-#define SCI_GETMAXLINESTATE SCI_START + 94
-
-#define SCI_AUTOCSHOW SCI_START + 100
-#define SCI_AUTOCCANCEL SCI_START + 101
-#define SCI_AUTOCACTIVE SCI_START + 102
-#define SCI_AUTOCPOSSTART SCI_START + 103
-#define SCI_AUTOCCOMPLETE SCI_START + 104
-#define SCI_AUTOCSTOPS SCI_START + 105
-
-#define SCI_CALLTIPSHOW SCI_START + 200
-#define SCI_CALLTIPCANCEL SCI_START + 201
-#define SCI_CALLTIPACTIVE SCI_START + 202
-#define SCI_CALLTIPPOSSTART SCI_START + 203
-#define SCI_CALLTIPSETHLT SCI_START + 204
-#define SCI_CALLTIPSETBACK SCI_START + 205
-
-#define SC_FOLDLEVELBASE 0x400
-#define SC_FOLDLEVELWHITEFLAG 0x1000
-#define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELNUMBERMASK 0x0FFF
-
-#define SCI_VISIBLEFROMDOCLINE SCI_START + 220
-#define SCI_DOCLINEFROMVISIBLE SCI_START + 221
-#define SCI_SETFOLDLEVEL SCI_START + 222
-#define SCI_GETFOLDLEVEL SCI_START + 223
-#define SCI_GETLASTCHILD SCI_START + 224
-#define SCI_GETFOLDPARENT SCI_START + 225
-#define SCI_SHOWLINES SCI_START + 226
-#define SCI_HIDELINES SCI_START + 227
-#define SCI_GETLINEVISIBLE SCI_START + 228
-#define SCI_SETFOLDEXPANDED SCI_START + 229
-#define SCI_GETFOLDEXPANDED SCI_START + 230
-#define SCI_TOGGLEFOLD SCI_START + 231
-#define SCI_ENSUREVISIBLE SCI_START + 232
-#define SCI_SETFOLDFLAGS SCI_START + 233
-
-// Key messages
-#define SCI_LINEDOWN SCI_START + 300
-#define SCI_LINEDOWNEXTEND SCI_START + 301
-#define SCI_LINEUP SCI_START + 302
-#define SCI_LINEUPEXTEND SCI_START + 303
-#define SCI_CHARLEFT SCI_START + 304
-#define SCI_CHARLEFTEXTEND SCI_START + 305
-#define SCI_CHARRIGHT SCI_START + 306
-#define SCI_CHARRIGHTEXTEND SCI_START + 307
-#define SCI_WORDLEFT SCI_START + 308
-#define SCI_WORDLEFTEXTEND SCI_START + 309
-#define SCI_WORDRIGHT SCI_START + 310
-#define SCI_WORDRIGHTEXTEND SCI_START + 311
-#define SCI_HOME SCI_START + 312
-#define SCI_HOMEEXTEND SCI_START + 313
-#define SCI_LINEEND SCI_START + 314
-#define SCI_LINEENDEXTEND SCI_START + 315
-#define SCI_DOCUMENTSTART SCI_START + 316
-#define SCI_DOCUMENTSTARTEXTEND SCI_START + 317
-#define SCI_DOCUMENTEND SCI_START + 318
-#define SCI_DOCUMENTENDEXTEND SCI_START + 319
-#define SCI_PAGEUP SCI_START + 320
-#define SCI_PAGEUPEXTEND SCI_START + 321
-#define SCI_PAGEDOWN SCI_START + 322
-#define SCI_PAGEDOWNEXTEND SCI_START + 323
-#define SCI_EDITTOGGLEOVERTYPE SCI_START + 324
-#define SCI_CANCEL SCI_START + 325
-#define SCI_DELETEBACK SCI_START + 326
-#define SCI_TAB SCI_START + 327
-#define SCI_BACKTAB SCI_START + 328
-#define SCI_NEWLINE SCI_START + 329
-#define SCI_FORMFEED SCI_START + 330
-#define SCI_VCHOME SCI_START + 331
-#define SCI_VCHOMEEXTEND SCI_START + 332
-#define SCI_ZOOMIN SCI_START + 333
-#define SCI_ZOOMOUT SCI_START + 334
-#define SCI_DELWORDLEFT SCI_START + 335
-#define SCI_DELWORDRIGHT SCI_START + 336
-#define SCI_LINECUT SCI_START + 337
-#define SCI_LINEDELETE SCI_START + 338
-#define SCI_LINETRANSPOSE SCI_START + 339
-#define SCI_LOWERCASE SCI_START + 340
-#define SCI_UPPERCASE SCI_START + 341
-
-#define SCI_LINELENGTH SCI_START + 350
-#define SCI_BRACEHIGHLIGHT SCI_START + 351
-#define SCI_BRACEBADLIGHT SCI_START + 352
-#define SCI_BRACEMATCH SCI_START + 353
-#define SCI_GETVIEWEOL SCI_START + 355
-#define SCI_SETVIEWEOL SCI_START + 356
-#define SCI_GETDOCPOINTER SCI_START + 357
-#define SCI_SETDOCPOINTER SCI_START + 358
-#define SCI_SETMODEVENTMASK SCI_START + 359
-
-#define EDGE_NONE 0
-#define EDGE_LINE 1
-#define EDGE_BACKGROUND 2
-
-#define SCI_GETEDGECOLUMN SCI_START + 360
-#define SCI_SETEDGECOLUMN SCI_START + 361
-#define SCI_GETEDGEMODE SCI_START + 362
-#define SCI_SETEDGEMODE SCI_START + 363
-#define SCI_GETEDGECOLOUR SCI_START + 364
-#define SCI_SETEDGECOLOUR SCI_START + 365
-
-#define SCI_SEARCHANCHOR SCI_START + 366
-#define SCI_SEARCHNEXT SCI_START + 367
-#define SCI_SEARCHPREV SCI_START + 368
-
-#define CARET_SLOP 0x01    // Show caret within N lines of edge when it's scrolled to view
-#define CARET_CENTER 0x02  // Center caret on screen when it's scrolled to view
-#define CARET_STRICT 0x04  // OR this with CARET_CENTER to reposition even when visible, or
-                           // OR this with CARET_SLOP to reposition whenever outside slop border
-
-#define SCI_SETCARETPOLICY SCI_START + 369
-#define SCI_LINESONSCREEN SCI_START + 370
-#define SCI_USEPOPUP SCI_START + 371
-
-// GTK+ Specific
-#define SCI_GRABFOCUS SCI_START + 400
-
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-typedef void (tMacroRecorder)(UINT iMessage, WPARAM wParam, LPARAM lParam, 
-                              void *userData);
-#define SCI_STARTRECORD SCI_OPTIONAL_START + 1
-#define SCI_STOPRECORD SCI_OPTIONAL_START + 2
-#endif
-
-#define SCI_SETLEXER SCI_LEXER_START + 1
-#define SCI_GETLEXER SCI_LEXER_START + 2
-#define SCI_COLOURISE SCI_LEXER_START + 3
-#define SCI_SETPROPERTY SCI_LEXER_START + 4
-#define SCI_SETKEYWORDS SCI_LEXER_START + 5
-
-// 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_*.
-#define SC_MOD_INSERTTEXT 0x1
-#define SC_MOD_DELETETEXT 0x2
-#define SC_MOD_CHANGESTYLE 0x4
-#define SC_MOD_CHANGEFOLD 0x8
-#define SC_PERFORMED_USER 0x10
-#define SC_PERFORMED_UNDO 0x20
-#define SC_PERFORMED_REDO 0x40
-#define SC_LASTSTEPINUNDOREDO 0x100
-#define SC_MOD_CHANGEMARKER 0x200
-
-#define SC_MODEVENTMASKALL 0x377
-
-struct SCNotification {
-	NMHDR nmhdr;
-	int position;			// SCN_STYLENEEDED, SCN_MODIFIED
-	int ch;					// SCN_CHARADDED, SCN_KEY
-	int modifiers;			// SCN_KEY
-  	int modificationType;	// SCN_MODIFIED
- 	const char *text;		// SCN_MODIFIED
- 	int length;				// SCN_MODIFIED
- 	int linesAdded;	// SCN_MODIFIED
-#ifdef MACRO_SUPPORT
-	int message;	// SCN_MACRORECORD
-	int wParam;	// SCN_MACRORECORD
-	int lParam;	// SCN_MACRORECORD
-#endif
-	int line;			// SCN_MODIFIED
-	int foldLevelNow;	// SCN_MODIFIED
-	int foldLevelPrev;	// SCN_MODIFIED
-	int margin;	// SCN_MARGINCLICK
-};
-
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-// GTK+ Specific to work around focus and accelerator problems:
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-// The old name for SCN_UPDATEUI:
-#define SCN_CHECKBRACE 2007
-#define SCN_MODIFIED 2008
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-#define SCN_MACRORECORD 2009
-#endif
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-
-#ifdef STATIC_BUILD
-void Scintilla_RegisterClasses(HINSTANCE hInstance);
-#endif
-
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-
-// Default style settings. These are deprecated and will be removed in a future version.
-#define SCI_SETFORE SCI_START + 60
-#define SCI_SETBACK SCI_START + 61
-#define SCI_SETBOLD SCI_START + 62
-#define SCI_SETITALIC SCI_START + 63
-#define SCI_SETSIZE SCI_START + 64
-#define SCI_SETFONT SCI_START + 65
-
-#define SCI_APPENDUNDOSTARTACTION SCI_START + 74
-
-#define SC_UNDOCOLLECT_MANUALSTART 2
-
-// Deprecated in release 1.22
-#define SCI_SETMARGINWIDTH SCI_START + 34
-#define SCI_SETLINENUMBERWIDTH SCI_START + 38
-
-#endif
-
-#endif

src/stc/scintilla/include/WinDefs.h

@@ -1,218 +0,0 @@
-// Scintilla source code edit control
-// WinDefs.h - the subset of definitions from Windows needed by Scintilla for GTK+
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef WINDEFS_H
-#define WINDEFS_H
-
-#define WORD short
-#define WPARAM unsigned long
-#define LPARAM long
-#define LRESULT long
-#define DWORD long
-
-#define UINT unsigned int
-#define LPSTR char *
-#define LONG long
-
-/* RTF control */
-#define EM_CANPASTE	(1074)
-#define EM_CANUNDO	(198)
-#define EM_CHARFROMPOS	(215)
-#define EM_DISPLAYBAND	(1075)
-#define EM_EMPTYUNDOBUFFER	(205)
-#define EM_EXGETSEL	(1076)
-#define EM_EXLIMITTEXT	(1077)
-#define EM_EXLINEFROMCHAR	(1078)
-#define EM_EXSETSEL	(1079)
-#define EM_FINDTEXT	(1080)
-#define EM_FINDTEXTEX	(1103)
-#define EM_FINDWORDBREAK	(1100)
-#define EM_FMTLINES	(200)
-#define EM_FORMATRANGE	(1081)
-#define EM_GETCHARFORMAT	(1082)
-#define EM_GETEVENTMASK	(1083)
-#define EM_GETFIRSTVISIBLELINE	(206)
-#define EM_GETHANDLE	(189)
-#define EM_GETLIMITTEXT	(213)
-#define EM_GETLINE	(196)
-#define EM_GETLINECOUNT	(186)
-#define EM_GETMARGINS	(212)
-#define EM_GETMODIFY	(184)
-#define EM_GETIMECOLOR	(1129)
-#define EM_GETIMEOPTIONS	(1131)
-#define EM_GETOPTIONS	(1102)
-#define EM_GETOLEINTERFACE	(1084)
-#define EM_GETPARAFORMAT	(1085)
-#define EM_GETPASSWORDCHAR	(210)
-#define EM_GETPUNCTUATION	(1125)
-#define EM_GETRECT	(178)
-#define EM_GETSEL	(176)
-#define EM_GETSELTEXT	(1086)
-#define EM_GETTEXTRANGE	(1099)
-#define EM_GETTHUMB	(190)
-#define EM_GETWORDBREAKPROC	(209)
-#define EM_GETWORDBREAKPROCEX	(1104)
-#define EM_GETWORDWRAPMODE	(1127)
-#define EM_HIDESELECTION	(1087)
-#define EM_LIMITTEXT	(197)
-#define EM_LINEFROMCHAR	(201)
-#define EM_LINEINDEX	(187)
-#define EM_LINELENGTH	(193)
-#define EM_LINESCROLL	(182)
-#define EM_PASTESPECIAL	(1088)
-#define EM_POSFROMCHAR	(214)
-#define EM_REPLACESEL	(194)
-#define EM_REQUESTRESIZE	(1089)
-#define EM_SCROLL	(181)
-#define EM_SCROLLCARET	(183)
-#define EM_SELECTIONTYPE	(1090)
-#define EM_SETBKGNDCOLOR	(1091)
-#define EM_SETCHARFORMAT	(1092)
-#define EM_SETEVENTMASK	(1093)
-#define EM_SETHANDLE	(188)
-#define EM_SETIMECOLOR	(1128)
-#define EM_SETIMEOPTIONS	(1130)
-#define EM_SETLIMITTEXT	(197)
-#define EM_SETMARGINS	(211)
-#define EM_SETMODIFY	(185)
-#define EM_SETOLECALLBACK	(1094)
-#define EM_SETOPTIONS	(1101)
-#define EM_SETPARAFORMAT	(1095)
-#define EM_SETPASSWORDCHAR	(204)
-#define EM_SETPUNCTUATION	(1124)
-#define EM_SETREADONLY	(207)
-#define EM_SETRECT	(179)
-#define EM_SETRECTNP	(180)
-#define EM_SETSEL	(177)
-#define EM_SETTABSTOPS	(203)
-#define EM_SETTARGETDEVICE	(1096)
-#define EM_SETWORDBREAKPROC	(208)
-#define EM_SETWORDBREAKPROCEX	(1105)
-#define EM_SETWORDWRAPMODE	(1126)
-#define EM_STREAMIN	(1097)
-#define EM_STREAMOUT	(1098)
-#define EM_UNDO	(199)
-
-#define WM_NULL		(0)
-#define WM_CLEAR	(771)
-#define WM_COMMAND	(273)
-#define WM_COPY	(769)
-#define WM_CUT	(768)
-#define WM_GETTEXT	(13)
-#define WM_GETTEXTLENGTH	(14)
-#define WM_NOTIFY	(78)
-#define WM_PASTE	(770)
-#define WM_SETTEXT	(12)
-#define WM_UNDO	(772)
-
-#define EN_CHANGE	(768)
-#define EN_KILLFOCUS (512)
-#define EN_SETFOCUS (256)
-
-#define EC_LEFTMARGIN 1
-#define EC_RIGHTMARGIN 2
-#define EC_USEFONTINFO 0xffff
-
-#if PLAT_GTK
-#define VK_DOWN GDK_Down
-#define VK_UP GDK_Up
-#define VK_LEFT GDK_Left
-#define VK_RIGHT GDK_Right
-#define VK_HOME GDK_Home
-#define VK_END GDK_End
-#define VK_PRIOR GDK_Page_Up
-#define VK_NEXT GDK_Page_Down
-#define VK_DELETE GDK_Delete
-#define VK_INSERT GDK_Insert
-#define VK_ESCAPE GDK_Escape
-#define VK_BACK GDK_BackSpace
-#define VK_TAB GDK_Tab
-#define VK_RETURN GDK_Return
-#define VK_ADD GDK_KP_Add
-#define VK_SUBTRACT GDK_KP_Subtract
-#endif
-
-#if PLAT_WX
-#define VK_DOWN         WXK_DOWN
-#define VK_UP           WXK_UP
-#define VK_LEFT         WXK_LEFT
-#define VK_RIGHT        WXK_RIGHT
-#define VK_HOME         WXK_HOME
-#define VK_END          WXK_END
-#define VK_PRIOR        WXK_PRIOR
-#define VK_NEXT         WXK_NEXT
-#define VK_DELETE       WXK_DELETE
-#define VK_INSERT       WXK_INSERT
-#define VK_ESCAPE       WXK_ESCAPE
-#define VK_BACK         WXK_BACK
-#define VK_TAB          WXK_TAB
-#define VK_RETURN       WXK_RETURN
-#define VK_ADD          WXK_ADD
-#define VK_SUBTRACT     WXK_SUBTRACT
-
-// Are these needed any more
-#define LPSTR char *
-#define LONG long
-#define LPDWORD (long *)
-#endif
-
-/* SELCHANGE structure */
-#define SEL_EMPTY	(0)
-#define SEL_TEXT	(1)
-#define SEL_OBJECT	(2)
-#define SEL_MULTICHAR	(4)
-#define SEL_MULTIOBJECT	(8)
-
-/* FINDREPLACE structure */
-#define FR_MATCHCASE	(0x4)
-#define FR_WHOLEWORD	(0x2)
-#define FR_DOWN		(0x1)
-
-#define SHIFT_PRESSED 1
-#define LEFT_CTRL_PRESSED 2
-#define LEFT_ALT_PRESSED 4
-
-struct RECT {
-	LONG left;
-	LONG top;
-	LONG right;
-	LONG bottom;
-};
-
-struct CHARRANGE {
-	LONG cpMin;
-	LONG cpMax;
-};
-
-struct TEXTRANGE {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-};
-
-struct FINDTEXTEX {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-	CHARRANGE chrgText;
-};
-
-struct NMHDR {
-	WindowID hwndFrom;
-	UINT idFrom;
-	UINT code;
-};
-
-struct FORMATRANGE {
-	SurfaceID hdc;
-	SurfaceID hdcTarget;
-	RECT rc;
-	RECT rcPage;
-	CHARRANGE chrg;
-};
-
-#define MAKELONG(a, b) ((a) | ((b) << 16))
-#define LOWORD(x) (x & 0xffff)
-#define HIWORD(x) (x >> 16)
-
-#endif

src/stc/scintilla/src/Accessor.cxx

@@ -1,166 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.cxx - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <ctype.h> 
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "Scintilla.h"
-
-bool Accessor::InternalIsLeadByte(char ch) {
-#if PLAT_GTK
-	// TODO: support DBCS under GTK+
-	return false;
-#elif PLAT_WIN 
-	return IsDBCSLeadByteEx(codePage, ch);
-#elif PLAT_WX 
-	return false;
-#endif 
-}
-
-void Accessor::Fill(int position) {
-	if (lenDoc == -1)
-		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
-	startPos = position - slopSize;
-	if (startPos + bufferSize > lenDoc)
-		startPos = lenDoc - bufferSize;
-	if (startPos < 0)
-		startPos = 0;
-	endPos = startPos + bufferSize;
-	if (endPos > lenDoc)
-		endPos = lenDoc;
-
-	TEXTRANGE tr = {{startPos, endPos}, buf};
-	Platform::SendScintilla(id, EM_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&tr));
-}
-
-char Accessor::StyleAt(int position) {
-	return static_cast<char>(Platform::SendScintilla(
-		id, SCI_GETSTYLEAT, position, 0));
-}
-
-int Accessor::GetLine(int position) {
-	return Platform::SendScintilla(id, EM_LINEFROMCHAR, position, 0);
-}
-
-int Accessor::LineStart(int line) {
-	return Platform::SendScintilla(id, EM_LINEINDEX, line, 0);
-}
-
-int Accessor::LevelAt(int line) {
-	return Platform::SendScintilla(id, SCI_GETFOLDLEVEL, line, 0);
-}
-
-int Accessor::Length() { 
-	if (lenDoc == -1) 
-		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
-	return lenDoc; 
-}
-
-int Accessor::GetLineState(int line) {
-	return Platform::SendScintilla(id, SCI_GETLINESTATE, line);
-}
-
-int Accessor::SetLineState(int line, int state) {
-	return Platform::SendScintilla(id, SCI_SETLINESTATE, line, state);
-}
-
-void StylingContext::StartAt(unsigned int start, char chMask) {
-	Platform::SendScintilla(id, SCI_STARTSTYLING, start, chMask);
-}
-
-void StylingContext::StartSegment(unsigned int pos) {
-	startSeg = pos;
-}
-
-void StylingContext::ColourTo(unsigned int pos, int chAttr) {
-	// Only perform styling if non empty range
-	if (pos != startSeg - 1) {
-		if (pos < startSeg) {
-			Platform::DebugPrintf("Bad colour positions %d - %d\n", startSeg, pos);
-		}
-
-		if (validLen + (pos - startSeg + 1) >= bufferSize)
-			Flush();
-		if (validLen + (pos - startSeg + 1) >= bufferSize) {
-			// Too big for buffer so send directly
-			Platform::SendScintilla(id, SCI_SETSTYLING, pos - startSeg + 1, chAttr);
-		} else {
-			if (chAttr != chWhile)
-				chFlags = 0;
-			chAttr |= chFlags;
-			for (unsigned int i = startSeg; i <= pos; i++) {
-				styleBuf[validLen++] = chAttr;
-			}
-		}
-	}
-	startSeg = pos+1;
-}
-
-int StylingContext::GetLine(int position) {
-	return Platform::SendScintilla(id, EM_LINEFROMCHAR, position, 0);
-}
-
-void StylingContext::SetLevel(int line, int level) {
-	Platform::SendScintilla(id, SCI_SETFOLDLEVEL, line, level);
-}
-
-void StylingContext::Flush() {
-	if (validLen > 0) {
-		Platform::SendScintilla(id, SCI_SETSTYLINGEX, validLen, 
-			reinterpret_cast<LPARAM>(styleBuf));
-		validLen = 0;
-	}
-}
-
-int StylingContext::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
-	int end = Length();
-	int spaceFlags = 0;
-	
-	// Determines the indentation level of the current line and also checks for consistent 
-	// indentation compared to the previous line.
-	// Indentation is judged consistent when the indentation whitespace of each line lines 
-	// the same or the indentation of one line is a prefix of the other.
-	
-	int pos = LineStart(line);
-	char ch = (*this)[pos];
-	int indent = 0;
-	bool inPrevPrefix = line > 0;
-	int posPrev = inPrevPrefix ? LineStart(line-1) : 0;
-	while ((ch == ' ' || ch == '\t') && (pos < end)) {
-		if (inPrevPrefix) {
-			char chPrev = (*this)[posPrev++];
-			if (chPrev == ' ' || chPrev == '\t') {
-				if (chPrev != ch)
-					spaceFlags |= wsInconsistent;
-			} else {
-				inPrevPrefix = false;
-			}
-		}
-		if (ch == ' ') {
-			spaceFlags |= wsSpace;
-			indent++;
-		} else {	// Tab
-			spaceFlags |= wsTab;
-			if (spaceFlags & wsSpace)
-				spaceFlags |= wsSpaceTab;
-			indent = (indent / 8 + 1) * 8;
-		}
-		ch = (*this)[++pos];
-	}
-	
-	*flags = spaceFlags;
-	indent += SC_FOLDLEVELBASE;
-	// if completely empty line or the start of a comment...
-	if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )
-		return indent | SC_FOLDLEVELWHITEFLAG;
-	else
-		return indent;
-}
-

src/stc/scintilla/src/AutoComplete.cxx

@@ -1,104 +0,0 @@
-// Scintilla source code edit control
-// AutoComplete.cxx - defines the auto completion list box
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "Platform.h"
-
-#include "AutoComplete.h"
-
-AutoComplete::AutoComplete() {
-	lb = 0;
-	active = false;
-	posStart = 0;
-	strcpy(stopChars, "");
-}
-
-AutoComplete::~AutoComplete() {
-	lb.Destroy();
-}
-
-bool AutoComplete::Active() {
-	return active;
-}
-
-void AutoComplete::Start(Window &parent, int ctrlID, int position, int startLen_) {
-	if (!lb.Created()) {
-		lb.Create(parent, ctrlID);
-	}
-	lb.Clear();
-	active = true;
-	startLen = startLen_;
-	posStart = position;
-}
-
-void AutoComplete::SetStopChars(const char *stopChars_) {
-	strncpy(stopChars, stopChars_, sizeof(stopChars));
-	stopChars[sizeof(stopChars) - 1] = '\0';
-}
-
-bool AutoComplete::IsStopChar(char ch) {
-	return ch && strchr(stopChars, ch);
-}
-
-int AutoComplete::SetList(const char *list) {
-	int maxStrLen = 12;
-	lb.Clear();
-	char *words = new char[strlen(list) + 1];
-	if (words) {
-		strcpy(words, list);
-		char *startword = words;
-		int i = 0;
-		for (; words && words[i]; i++) {
-			if (words[i] == ' ') {
-				words[i] = '\0';
-				lb.Append(startword);
-				maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
-				startword = words + i + 1;
-			}
-		}
-		if (startword) {
-			lb.Append(startword);
-			maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
-		}
-		delete []words;
-	}
-	lb.Sort();
-	return maxStrLen;
-}
-
-void AutoComplete::Show() {
-	lb.Show();
-	lb.Select(0);
-}
-
-void AutoComplete::Cancel() {
-	if (lb.Created()) {
-		lb.Destroy();
-		lb = 0;
-		active = false;
-	}
-}
-
-
-void AutoComplete::Move(int delta) {
-	int count = lb.Length();
-	int current = lb.GetSelection();
-	current += delta;
-	if (current >= count)
-		current = count - 1;
-	if (current < 0)
-		current = 0;
-	lb.Select(current);
-}
-
-void AutoComplete::Select(const char *word) {
-	int pos = lb.Find(word);
-	//Platform::DebugPrintf("Autocompleting at <%s> %d\n", wordCurrent, pos);
-	if (pos != -1)
-		lb.Select(pos);
-}
-

src/stc/scintilla/src/AutoComplete.h

@@ -1,43 +0,0 @@
-// Scintilla source code edit control
-// AutoComplete.h - defines the auto completion list box
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef AUTOCOMPLETE_H
-#define AUTOCOMPLETE_H
-
-class AutoComplete {
-	bool active;
-	char stopChars[256];
-public:
-	ListBox lb;
-	int posStart;
-	int startLen;
-	
-	AutoComplete();
-	~AutoComplete();
-
-	// Is the auto completion list displayed?	
-	bool Active();
-	
-	// Display the auto completion list positioned to be near a character position
-	void Start(Window &parent, int ctrlID, int position, int startLen_);
-	
-	// The stop chars are characters which, when typed, cause the auto completion list to disappear
-	void SetStopChars(const char *stopChars_);
-	bool IsStopChar(char ch);
-	
-	// The list string contains a sequence of words separated by spaces
-	int SetList(const char *list);
-	
-	void Show();
-	void Cancel();
-	
-	// Move the current list element by delta, scrolling appropriately
-	void Move(int delta);
-	
-	// Select a list element that starts with word as the current element
-	void Select(const char *word);
-};
-
-#endif

src/stc/scintilla/src/CallTip.cxx

@@ -1,168 +0,0 @@
-// Scintilla source code edit control
-// CallTip.cxx - code for displaying call tips
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-
-#include "Platform.h"
-
-#include "CallTip.h"
-
-CallTip::CallTip() {
-	wCallTip = 0;
-	inCallTipMode = false;
-	posStartCallTip = 0;
-	val = 0;
-	startHighlight = 0;
-	endHighlight = 0;
-
-	colourBG.desired = Colour(0xff, 0xff, 0xff);
-	colourUnSel.desired = Colour(0x80, 0x80, 0x80);
-	colourSel.desired = Colour(0, 0, 0x80);
-	colourShade.desired = Colour(0, 0, 0);
-	colourLight.desired = Colour(0xc0, 0xc0, 0xc0);
-}
-
-CallTip::~CallTip() {
-	wCallTip.Destroy();
-	delete []val;
-	val = 0;
-}
-
-void CallTip::RefreshColourPalette(Palette &pal, bool want) {
-	pal.WantFind(colourBG, want);
-	pal.WantFind(colourUnSel, want);
-	pal.WantFind(colourSel, want);
-	pal.WantFind(colourShade, want);
-	pal.WantFind(colourLight, want);
-}
-
-void CallTip::PaintCT(Surface *surfaceWindow) {
-	if (!val)
-		return;
-	PRectangle rcClientPos = wCallTip.GetClientPosition();
-	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
-	                        rcClientPos.bottom - rcClientPos.top);
-	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
-
-	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
-	// To make a nice small call tip window, it is only sized to fit most normal characters without accents
-	int lineHeight = surfaceWindow->Height(font);
-	int ascent = surfaceWindow->Ascent(font) - surfaceWindow->InternalLeading(font);
-
-	// For each line...
-	// Draw the definition in three parts: before highlight, highlighted, after highlight
-	int ytext = rcClient.top + ascent + 1;
-	char *chunkVal = val;
-	bool moreChunks = true;
-	while (moreChunks) {
-		char *chunkEnd = strchr(chunkVal, '\n');
-		if (chunkEnd == NULL) {
-			chunkEnd = chunkVal + strlen(chunkVal);
-			moreChunks = false;
-		}
-		int chunkOffset = chunkVal - val;
-		int chunkLength = chunkEnd - chunkVal;
-		int chunkEndOffset = chunkOffset + chunkLength;
-		int thisStartHighlight = Platform::Maximum(startHighlight, chunkOffset);
-		thisStartHighlight = Platform::Minimum(thisStartHighlight, chunkEndOffset);
-		thisStartHighlight -= chunkOffset;
-		int thisEndHighlight = Platform::Maximum(endHighlight, chunkOffset);
-		thisEndHighlight = Platform::Minimum(thisEndHighlight, chunkEndOffset);
-		thisEndHighlight -= chunkOffset;
-		int x = 5;
-		int xEnd = x + surfaceWindow->WidthText(font, chunkVal, thisStartHighlight);
-		rcClient.left = x;
-		rcClient.top = ytext - ascent - 1;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal, thisStartHighlight,
-		                        colourUnSel.allocated, colourBG.allocated);
-		x = xEnd;
-
-		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisStartHighlight,
-		                                    thisEndHighlight - thisStartHighlight);
-		rcClient.top = ytext;
-		rcClient.left = x;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal + thisStartHighlight, thisEndHighlight - thisStartHighlight,
-		                        colourSel.allocated, colourBG.allocated);
-		x = xEnd;
-
-		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisEndHighlight,
-		                                    chunkLength - thisEndHighlight);
-		rcClient.left = x;
-		rcClient.right = xEnd;
-		surfaceWindow->DrawText(rcClient, font, ytext,
-		                        chunkVal + thisEndHighlight, chunkLength - thisEndHighlight,
-		                        colourUnSel.allocated, colourBG.allocated);
-		chunkVal = chunkEnd + 1;
-		ytext += lineHeight;
-	}
-	// Draw a raised border around the edges of the window
-	surfaceWindow->MoveTo(0, rcClientSize.bottom - 1);
-	surfaceWindow->PenColour(colourShade.allocated);
-	surfaceWindow->LineTo(rcClientSize.right - 1, rcClientSize.bottom - 1);
-	surfaceWindow->LineTo(rcClientSize.right - 1, 0);
-	surfaceWindow->PenColour(colourLight.allocated);
-	surfaceWindow->LineTo(0, 0);
-	surfaceWindow->LineTo(0, rcClientSize.bottom - 1);
-}
-
-PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
-                                 const char *faceName, int size) {
-	Surface surfaceMeasure;
-	surfaceMeasure.Init();
-	int deviceHeight = (size * surfaceMeasure.LogPixelsY()) / 72;
-	font.Create(faceName, deviceHeight);
-	if (val)
-		delete []val;
-	val = new char[strlen(defn) + 1];
-	if (!val)
-		return PRectangle();
-	strcpy(val, defn);
-	startHighlight = 0;
-	endHighlight = 0;
-	inCallTipMode = true;
-	posStartCallTip = pos;
-	// Look for multiple lines in the text
-	// Only support \n here - simply means container must avoid \r!
-	int width = 0;
-	int numLines = 1;
-	const char *newline;
-	const char *look = val;
-	while ((newline = strchr(look, '\n')) != NULL) {
-		int thisWidth = surfaceMeasure.WidthText(font, look, newline - look);
-		width = Platform::Maximum(width, thisWidth);
-		look = newline + 1;
-		numLines++;
-	}
-	int lastWidth = surfaceMeasure.WidthText(font, look, strlen(look));
-	width = Platform::Maximum(width, lastWidth) + 10;
-	int lineHeight = surfaceMeasure.Height(font);
-	// Extra line for border and an empty line at top and bottom
-	int height = lineHeight * numLines - surfaceMeasure.InternalLeading(font) + 2 + 2;
-	return PRectangle(pt.x -5, pt.y + lineHeight + 1, pt.x + width - 5, pt.y + lineHeight + 1 + height);
-}
-
-
-void CallTip::CallTipCancel() {
-	inCallTipMode = false;
-	if (wCallTip.Created()) {
-		wCallTip.Destroy();
-	}
-}
-
-void CallTip::SetHighlight(int start, int end) {
-	// Avoid flashing by checking something has really changed
-	if ((start != startHighlight) || (end != endHighlight)) {
-		startHighlight = start;
-		endHighlight = end;
-		if (wCallTip.Created()) {
-			wCallTip.InvalidateAll();
-		}
-	}
-}

src/stc/scintilla/src/CallTip.h

@@ -1,46 +0,0 @@
-// Scintilla source code edit control
-// CallTip.h - interface to the call tip control
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CALLTIP_H
-#define CALLTIP_H
-
-const char callClassName[] = "CallTip";
-
-class CallTip {
-	int startHighlight;
-	int endHighlight;
-	char *val;
-	Font font;
-public:
-	Window wCallTip;
-	Window wDraw;
-	bool inCallTipMode;
-	int posStartCallTip;
-	ColourPair colourBG;
-	ColourPair colourUnSel;
-	ColourPair colourSel;
-	ColourPair colourShade;
-	ColourPair colourLight;
-	
-	CallTip();
-	~CallTip();
-	
-	// Claim or accept palette entries for the colours required to paint a calltip
-	void RefreshColourPalette(Palette &pal, bool want);
-	
-	void PaintCT(Surface *surfaceWindow);
-	
-	// Setup the calltip and return a rectangle of the area required
-	PRectangle CallTipStart(int pos, Point pt, const char *defn, 
-		const char *faceName, int size);
-		
-	void CallTipCancel();
-	
-	// Set a range of characters to be displayed in a highlight style.
-	// Commonly used to highlight the current parameter.
-	void SetHighlight(int start, int end);
-};
-
-#endif

src/stc/scintilla/src/CellBuffer.h

@@ -1,224 +0,0 @@
-// Scintilla source code edit control
-// CellBuffer.h - manages the text of the document
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CELLBUFFER_H
-#define CELLBUFFER_H
-
-// This holds the marker identifier and the marker type to display.
-// MarkerHandleNumbers are members of lists.
-struct MarkerHandleNumber {
-	int handle;
-	int number;
-	MarkerHandleNumber *next;
-};
-
-// A marker handle set contains any number of MarkerHandleNumbers
-class MarkerHandleSet {
-	MarkerHandleNumber *root;
-public:
-	MarkerHandleSet();
-	~MarkerHandleSet();
-	int Length();
-	int NumberFromHandle(int handle);
-	int MarkValue();	// Bit set of marker numbers
-	bool Contains(int handle);
-	bool InsertHandle(int handle, int markerNum);
-	void RemoveHandle(int handle);
-	void RemoveNumber(int markerNum);
-	void CombineWith(MarkerHandleSet *other);
-};
-
-// Each line stores the starting position of the first character of the line in the cell buffer
-// and potentially a marker handle set. Often a line will not have any attached markers.
-struct LineData {
-	int startPosition;
-	MarkerHandleSet *handleSet;
-	LineData() : startPosition(0), handleSet(0) {
-	}
-};
-
-// The line vector contains information about each of the lines in a cell buffer.
-class LineVector {
-public:
-	enum { growSize = 4000 };
-	int lines;
-	LineData *linesData;
-	int size;
-	int *levels;
-	int sizeLevels;
-	
-	// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big.
-	int handleCurrent;
-	
-	LineVector();
-	~LineVector();
-	void Init();
-
-	void Expand(int sizeNew);
-	void ExpandLevels(int sizeNew=-1);
-	void InsertValue(int pos, int value);
-	void SetValue(int pos, int value);
-	void Remove(int pos);
-	int LineFromPosition(int pos);
-	
-	int AddMark(int line, int marker);
-	void MergeMarkers(int pos);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	int LineFromHandle(int markerHandle);
-};
-
-// Actions are used to store all the information required to perform one undo/redo step.
-enum actionType { insertAction, removeAction, startAction };
-
-class Action {
-public:
-	actionType at;
-	int position;
-	char *data;
-	int lenData;
-
-	Action();
-	~Action();
-	void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0);
-	void Destroy();
-	void Grab(Action *source);
-};
-
-enum undoCollectionType { undoCollectNone, undoCollectAutoStart, undoCollectManualStart };
-
-class UndoHistory {
-	Action *actions;
-	int lenActions;
-	int maxAction;
-	int currentAction;
-	int undoSequenceDepth;
-	int savePoint;
-
-	void EnsureUndoRoom();
-	
-public:
-	UndoHistory();
-	~UndoHistory();
-	
-	void AppendAction(actionType at, int position, char *data, int length);
-
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DropUndoSequence();
-	void DeleteUndoHistory();
-	
-	// The save point is a marker in the undo stack where the container has stated that 
-	// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint() const;
-
-	// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is 
-	// called that many times. Similarly for redo.
-	bool CanUndo() const;
-	int StartUndo();
-	const Action &UndoStep();
-	bool CanRedo() const;
-	int StartRedo();
-	const Action &RedoStep();
-};
-
-// Holder for an expandable array of characters that supports undo and line markers
-// Based on article "Data Structures in a Bit-Mapped Text Editor"
-// by Wilfred J. Hansen, Byte January 1987, page 183
-class CellBuffer {
-private:
-	char *body;
-	int size;
-	int length;
-	int part1len;
-	int gaplen;
-	char *part2body;
-	bool readOnly;
-
-	undoCollectionType collectingUndo;
-	UndoHistory uh;
-
-	LineVector lv;
-
-	SVector<int, 4000> lineStates;
-
-	void GapTo(int position);
-	void RoomFor(int insertionLength);
-
-	inline char ByteAt(int position);
-	void SetByteAt(int position, char ch);
-
-public:
-
-	CellBuffer(int initialLength = 4000);
-	~CellBuffer();
-	
-	// Retrieving positions outside the range of the buffer works and returns 0
-	char CharAt(int position);
-	void GetCharRange(char *buffer, int position, int lengthRetrieve);
-	char StyleAt(int position);
-	
-	int ByteLength();
-	int Length();
-	int Lines();
-	int LineStart(int line);
-	int LineFromPosition(int pos) { return lv.LineFromPosition(pos); }
-	const char *InsertString(int position, char *s, int insertLength);
-	void InsertCharStyle(int position, char ch, char style);
-	
-	// Setting styles for positions outside the range of the buffer is safe and has no effect.
-	// True is returned if the style of a character changed.
-	bool SetStyleAt(int position, char style, char mask=(char)0xff);
-	bool SetStyleFor(int position, int length, char style, char mask);
-	
-	const char *DeleteChars(int position, int deleteLength);
-
-	bool IsReadOnly();
-	void SetReadOnly(bool set);
-
-	// The save point is a marker in the undo stack where the container has stated that 
-	// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint();
-
-	// Line marker functions
-	int AddMark(int line, int markerNum);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	int GetMark(int line);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle);
- 
-	// Without undo
-	void BasicInsertString(int position, char *s, int insertLength);
-	void BasicDeleteChars(int position, int deleteLength);
-
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo);
-	bool IsCollectingUndo();
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DeleteUndoHistory();
-	
-	// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is 
-	// called that many times. Similarly for redo.
-	bool CanUndo();
-	int StartUndo();
-	const Action &UndoStep();
-	bool CanRedo();
-	int StartRedo();
-	const Action &RedoStep();
-	
-	int SetLineState(int line, int state);
-	int GetLineState(int line);
-	int GetMaxLineState();
-		
-	int SetLevel(int line, int level);
-	int GetLevel(int line);
-};
-
-#define CELL_SIZE	2
-
-#endif

src/stc/scintilla/src/ContractionState.cxx

@@ -1,203 +0,0 @@
-// Scintilla source code edit control
-// ContractionState.cxx - manages visibility of lines for folding
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "ContractionState.h"
-
-OneLine::OneLine() {
-	displayLine = 0;
-	docLine = 0;
-	visible = true;
-	expanded = true;
-}
-
-ContractionState::ContractionState() {
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-	valid = false;
-}
-
-ContractionState::~ContractionState() {
-	Clear();
-}
-
-void ContractionState::MakeValid() const {
-	if (!valid) {
-		// Could be cleverer by keeping the index of the last still valid entry 
-		// rather than invalidating all.
-		int linePrev = -1;
-		int lineDisplay = 0;
-		for (int line=0; line<linesInDoc; line++) {
-			lines[line].displayLine = lineDisplay;
-			if (lines[line].visible) {
-				lines[lineDisplay].docLine = line;
-				lineDisplay++;
-			}
-		}
-		valid = true;
-	}
-}
-
-void ContractionState::Clear() {
-	delete []lines;
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-}
-
-int ContractionState::LinesInDoc() const {
-	return linesInDoc;
-}
-
-int ContractionState::LinesDisplayed() const {
-	return linesInDisplay;
-}
-
-int ContractionState::DisplayFromDoc(int lineDoc) const {
-	if (size == 0) {
-		return lineDoc;
-	}
-	MakeValid();
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].displayLine;
-	}
-	return -1;
-}
-
-int ContractionState::DocFromDisplay(int lineDisplay) const {
-	if (lineDisplay <= 0)
-		return 0;
-	if (lineDisplay >= linesInDisplay)
-		return linesInDoc-1;
-	if (size == 0)
-		return lineDisplay;
-	MakeValid();
-	return lines[lineDisplay].docLine;
-}
-
-void ContractionState::Grow(int sizeNew) {
-	OneLine *linesNew = new OneLine[sizeNew];
-	if (linesNew) {
-		int i = 0;
-		for (; i < size; i++) {
-			linesNew[i] = lines[i];
-		}
-		for (; i < sizeNew; i++) {
-			linesNew[i].displayLine = i;
-		}
-		delete []lines;
-		lines = linesNew;
-		size = sizeNew;
-		valid = false;
-	} else {
-		Platform::DebugPrintf("No memory available\n");
-		// TODO: Blow up
-	}
-}
-
-void ContractionState::InsertLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc += lineCount;
-		linesInDisplay += lineCount;
-		return;
-	}
-	//Platform::DebugPrintf("InsertLine[%d] = %d\n", lineDoc);
-	if ((linesInDoc + lineCount + 2) >= size) {
-		Grow(linesInDoc + lineCount + growSize);
-	}
-	linesInDoc += lineCount;
-	linesInDisplay += lineCount;
-	for (int i = linesInDoc + 1; i >= lineDoc + lineCount; i--) {
-		lines[i].visible = lines[i - lineCount].visible;
-		lines[i].expanded = lines[i - lineCount].expanded;
-	}
-	for (int d=0;d<lineCount;d++) {
-		lines[lineDoc+d].visible = true;	// Should inherit visibility from context ?
-		lines[lineDoc+d].expanded = true;
-	}
-	valid = false;
-}
-
-void ContractionState::DeleteLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc -= lineCount;
-		linesInDisplay -= lineCount;
-		return;
-	}
-	int delta = 0;
-	for (int d=0;d<lineCount;d++)
-		if (lines[lineDoc+d].visible)
-			delta--;
-	for (int i = lineDoc; i < linesInDoc-lineCount; i++) {
-		lines[i].visible = lines[i + lineCount].visible;
-		lines[i].expanded = lines[i + lineCount].expanded;
-	}
-	linesInDoc -= lineCount;
-	linesInDisplay += delta;
-	valid = false;
-}
-
-bool ContractionState::GetVisible(int lineDoc) const {
-	if (size == 0)
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].visible;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible) {
-	if (size == 0) {
-		Grow(linesInDoc + growSize);
-	}
-	// TODO: modify docLine members to mirror displayLine
-	int delta = 0;
-	// Change lineDocs
-	if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < linesInDoc)) {
-		for (int line=lineDocStart; line <= lineDocEnd; line++) {
-			if (lines[line].visible != visible) {
-				delta += visible ? 1 : -1;		
-				lines[line].visible = visible;
-			}
-			lines[line].displayLine += delta;
-		}
-		if (delta != 0) {
-			for (int line=lineDocEnd+1; line <= linesInDoc; line++) {
-				lines[line].displayLine += delta;
-			}
-		}
-	}
-	linesInDisplay += delta;
-	valid = false;
-	return delta != 0;
-}
-
-bool ContractionState::GetExpanded(int lineDoc) const {
-	if (size == 0) 
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].expanded;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetExpanded(int lineDoc, bool expanded) {
-	if (size == 0) {
-		Grow(linesInDoc + growSize);
-	}
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		if (lines[lineDoc].expanded != expanded) {
-			lines[lineDoc].expanded = expanded;
-			return true;
-		}
-	}
-	return false;
-}

src/stc/scintilla/src/ContractionState.h

@@ -1,50 +0,0 @@
-// Scintilla source code edit control
-// ContractionState.h - manages visibility of lines for folding
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CONTRACTIONSTATE_H
-#define CONTRACTIONSTATE_H
-
-class OneLine {
-public:
-	int displayLine;	// position within set of visible lines
-	int docLine;		// inverse of displayLine
-	bool visible;
-	bool expanded;
-	
-	OneLine();
-	virtual ~OneLine() {}
-};
-
-class ContractionState {
-	void Grow(int sizeNew);
-	enum { growSize = 4000 };
-	int linesInDoc;
-	int linesInDisplay;
-	mutable OneLine *lines;
-	int size;
-	mutable bool valid;
-	void MakeValid() const;
-public:
-	ContractionState();
-	virtual ~ContractionState();
-	
-	void Clear();
-	
-	int LinesInDoc() const;	
-	int LinesDisplayed() const;	
-	int DisplayFromDoc(int lineDoc) const;
-	int DocFromDisplay(int lineDisplay) const;
-	
-	void InsertLines(int lineDoc, int lineCount);
-	void DeleteLines(int lineDoc, int lineCount);
-	
-	bool GetVisible(int lineDoc) const;
-	bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
-	
-	bool GetExpanded(int lineDoc) const;
-	bool SetExpanded(int lineDoc, bool expanded);
-};
-
-#endif

src/stc/scintilla/src/Document.cxx

@@ -1,797 +0,0 @@
-// Scintilla source code edit control
-// Document.cxx - text document that handles notifications, DBCS, styling, words and end of line
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "Document.h"
-
-Document::Document() {
-	refCount = 0;
-#ifdef unix
-	eolMode = SC_EOL_LF;
-#else
-	eolMode = SC_EOL_CRLF;
-#endif
-	dbcsCodePage = 0;
-	stylingBits = 5;
-	stylingBitsMask = 0x1F;
-	stylingPos = 0;
-	stylingMask = 0;
-	for (int ch = 0; ch < 256; ch++) {
-		wordchars[ch] = isalnum(ch) || ch == '_';
-	}
-	endStyled = 0;
-	enteredCount = 0;
-	tabInChars = 8;
-	watchers = 0;
-	lenWatchers = 0;
-}
-
-Document::~Document() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyDeleted(this, watchers[i].userData);
-	}
-	delete []watchers;
-	watchers = 0;
-	lenWatchers = 0;
-}
-
-// Increase reference count and return its previous value.
-int Document::AddRef() {
-	return refCount++;
-}
-
-// Decrease reference count and return its provius value.
-// Delete the document if reference count reaches zero.
-int Document::Release() {
-	int curRefCount = --refCount;
-	if (curRefCount == 0)
-		delete this;
-	return curRefCount;
-}
-
-void Document::SetSavePoint() {
-	cb.SetSavePoint();
-	NotifySavePoint(true);
-}
-
-int Document::AddMark(int line, int markerNum) { 
-	int prev = cb.AddMark(line, markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0);
-	NotifyModified(mh);
-	return prev;
-}
-
-void Document::DeleteMark(int line, int markerNum) { 
-	cb.DeleteMark(line, markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0);
-	NotifyModified(mh);
-}
-
-void Document::DeleteMarkFromHandle(int markerHandle) { 
-	cb.DeleteMarkFromHandle(markerHandle); 
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	NotifyModified(mh);
-}
-
-void Document::DeleteAllMarks(int markerNum) { 
-	cb.DeleteAllMarks(markerNum); 
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	NotifyModified(mh);
-}
-
-int Document::LineStart(int line) {
-	return cb.LineStart(line);
-}
-
-int Document::LineEnd(int line) {
-	if (line == LinesTotal() - 1) {
-		return LineStart(line + 1);
-	} else {
-		int position = LineStart(line + 1) - 1;
-		// When line terminator is CR+LF, may need to go back one more
-		if ((position > LineStart(line)) && (cb.CharAt(position - 1) == '\r')) {
-			position--;
-		}
-		return position;
-	}
-}
-
-int Document::LineFromPosition(int pos) {
-	return cb.LineFromPosition(pos);
-}
-
-int Document::LineEndPosition(int position) {
-	return LineEnd(LineFromPosition(position));
-}
-
-int Document::VCHomePosition(int position) {
-	int line = LineFromPosition(position);
-	int startPosition = LineStart(line);
-	int endLine = LineStart(line + 1) - 1;
-	int startText = startPosition;
-	while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t' ) )
-		startText++;
-	if (position == startText)
-		return startPosition;
-	else
-		return startText;
-}
-
-int Document::SetLevel(int line, int level) { 
-	int prev = cb.SetLevel(line, level); 
-	if (prev != level) {
-		DocModification mh(SC_MOD_CHANGEFOLD, LineStart(line), 0, 0, 0);
-		mh.line = line;
-		mh.foldLevelNow = level;
-		mh.foldLevelPrev = prev;
-		NotifyModified(mh);
-	}
-	return prev;
-}
-
-static bool IsSubordinate(int levelStart, int levelTry) {
-	if (levelTry & SC_FOLDLEVELWHITEFLAG)
-		return true;
-	else 
-		return (levelStart & SC_FOLDLEVELNUMBERMASK) < (levelTry & SC_FOLDLEVELNUMBERMASK);
-}
-
-int Document::GetLastChild(int lineParent, int level) {
-	if (level == -1)
-		level = GetLevel(lineParent) & SC_FOLDLEVELNUMBERMASK;
-	int maxLine = LinesTotal();
-	int lineMaxSubord = lineParent;
-	while (lineMaxSubord < maxLine-1) {
-		EnsureStyledTo(LineStart(lineMaxSubord+2));
-		if (!IsSubordinate(level, GetLevel(lineMaxSubord+1)))
-			break;
-		lineMaxSubord++;
-	}
-	if (lineMaxSubord > lineParent) {
-		if (level > (GetLevel(lineMaxSubord+1) & SC_FOLDLEVELNUMBERMASK)) {
-			// Have chewed up some whitespace that belongs to a parent so seek back 
-			if ((lineMaxSubord > lineParent) && (GetLevel(lineMaxSubord) & SC_FOLDLEVELWHITEFLAG)) {
-				lineMaxSubord--;
-			}
-		}
-	}
-	return lineMaxSubord;
-}
-
-int Document::GetFoldParent(int line) {
-	int level = GetLevel(line);
-	int lineLook = line-1;
-	while ((lineLook > 0) && (
-		(!(GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG)) || 
-		((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) >= level))
-	) {
-		lineLook--;
-	}
-	if ((GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG) &&
-		((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) < level)) {
-		return lineLook;
-	} else {
-		return -1;
-	}
-}
-
-int Document::ClampPositionIntoDocument(int pos) {
-	return Platform::Clamp(pos, 0, Length());
-}
-
-bool Document::IsCrLf(int pos) {
-	if (pos < 0)
-		return false;
-	if (pos >= (Length() - 1))
-		return false;
-	return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n');
-}
-
-bool Document::IsDBCS(int pos) {
-#if PLAT_WIN
-	if (dbcsCodePage) {
-		// Anchor DBCS calculations at start of line because start of line can
-		// not be a DBCS trail byte.
-		int startLine = pos;
-		while (startLine > 0 && cb.CharAt(startLine) != '\r' && cb.CharAt(startLine) != '\n')
-			startLine--;
-		while (startLine <= pos) {
-			if (IsDBCSLeadByteEx(dbcsCodePage, cb.CharAt(startLine))) {
-				startLine++;
-				if (startLine >= pos)
-					return true;
-			}
-			startLine++;
-		}
-	}
-	return false;
-#else
-	return false;
-#endif
-}
-
-// Normalise a position so that it is not halfway through a two byte character.
-// This can occur in two situations -
-// When lines are terminated with \r\n pairs which should be treated as one character.
-// When displaying DBCS text such as Japanese.
-// If moving, move the position in the indicated direction.
-int Document::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) {
-	//Platform::DebugPrintf("NoCRLF %d %d\n", pos, moveDir);
-	// If out of range, just return value - should be fixed up after
-	if (pos < 0)
-		return pos;
-	if (pos > Length())
-		return pos;
-
-	// Position 0 and Length() can not be between any two characters
-	if (pos == 0)
-		return pos;
-	if (pos == Length())
-		return pos;
-
-	// assert pos > 0 && pos < Length()
-	if (checkLineEnd && IsCrLf(pos - 1)) {
-		if (moveDir > 0)
-			return pos + 1;
-		else
-			return pos - 1;
-	}
-
-	// Not between CR and LF
-
-#if PLAT_WIN
-	if (dbcsCodePage) {
-		// Anchor DBCS calculations at start of line because start of line can
-		// not be a DBCS trail byte.
-		int startLine = pos;
-		while (startLine > 0 && cb.CharAt(startLine) != '\r' && cb.CharAt(startLine) != '\n')
-			startLine--;
-		bool atLeadByte = false;
-		while (startLine < pos) {
-			if (atLeadByte)
-				atLeadByte = false;
-			else if (IsDBCSLeadByteEx(dbcsCodePage, cb.CharAt(startLine)))
-				atLeadByte = true;
-			else
-				atLeadByte = false;
-			startLine++;
-			//Platform::DebugPrintf("DBCS %s\n", atlead ? "D" : "-");
-		}
-
-		if (atLeadByte) {
-			// Position is between a lead byte and a trail byte
-			if (moveDir > 0)
-				return pos + 1;
-			else
-				return pos - 1;
-		}
-	}
-#endif
-
-	return pos;
-}
-
-void Document::ModifiedAt(int pos) {
-	if (endStyled > pos)
-		endStyled = pos;
-}
-
-// Document only modified by gateways DeleteChars, InsertStyledString, Undo, Redo, and SetStyleAt.
-// SetStyleAt does not change the persistent state of a document
-
-// Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number
-void Document::DeleteChars(int pos, int len) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
-		if (!cb.IsReadOnly()) {
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.DeleteChars(pos*2, len * 2);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			ModifiedAt(pos);
-			int modFlags = SC_MOD_DELETETEXT | SC_PERFORMED_USER;
-			DocModification mh(modFlags, pos, len, LinesTotal() - prevLinesTotal, text);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-void Document::InsertStyledString(int position, char *s, int insertLength) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (cb.IsReadOnly())
-			NotifyModifyAttempt();
-		if (!cb.IsReadOnly()) {
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.InsertString(position, s, insertLength);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			ModifiedAt(position / 2);
-	
-			int modFlags = SC_MOD_INSERTTEXT | SC_PERFORMED_USER;
-			DocModification mh(modFlags, position / 2, insertLength / 2, LinesTotal() - prevLinesTotal, text);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-int Document::Undo() {
-	int newPos = 0;
-	if (enteredCount == 0) {
-		enteredCount++;
-		bool startSavePoint = cb.IsSavePoint();
-		int steps = cb.StartUndo();
-		//Platform::DebugPrintf("Steps=%d\n", steps);
-		for (int step=0; step<steps; step++) {
-			int prevLinesTotal = LinesTotal();
-			const Action &action = cb.UndoStep();
-			int cellPosition = action.position / 2;
-			ModifiedAt(cellPosition);
-			newPos = cellPosition;
-			
-			int modFlags = SC_PERFORMED_UNDO;
-			// With undo, an insertion action becomes a deletion notification
-			if (action.at == removeAction) {
-				newPos += action.lenData;
-				modFlags |= SC_MOD_INSERTTEXT;
-			} else {
-				modFlags |= SC_MOD_DELETETEXT;
-			}
-			if (step == steps-1)
-				modFlags |= SC_LASTSTEPINUNDOREDO;
-			NotifyModified(DocModification(modFlags, cellPosition, action.lenData, 
-				LinesTotal() - prevLinesTotal, action.data));
-		}
-	
-		bool endSavePoint = cb.IsSavePoint();
-		if (startSavePoint != endSavePoint)
-			NotifySavePoint(endSavePoint);
-		enteredCount--;
-	}
-	return newPos;
-}
-
-int Document::Redo() {
-	int newPos = 0;
-	if (enteredCount == 0) {
-		enteredCount++;
-		bool startSavePoint = cb.IsSavePoint();
-		int steps = cb.StartRedo();
-		for (int step=0; step<steps; step++) {
-			int prevLinesTotal = LinesTotal();
-			const Action &action = cb.RedoStep();
-			int cellPosition = action.position / 2;
-			ModifiedAt(cellPosition);
-			newPos = cellPosition;
-			
-			int modFlags = SC_PERFORMED_REDO;
-			if (action.at == insertAction) {
-				newPos += action.lenData;
-				modFlags |= SC_MOD_INSERTTEXT;
-			} else {
-				modFlags |= SC_MOD_DELETETEXT;
-			}
-			if (step == steps-1)
-				modFlags |= SC_LASTSTEPINUNDOREDO;
-			NotifyModified(DocModification(modFlags, cellPosition, action.lenData, 
-				LinesTotal() - prevLinesTotal, action.data));
-		}
-	
-		bool endSavePoint = cb.IsSavePoint();
-		if (startSavePoint != endSavePoint)
-			NotifySavePoint(endSavePoint);
-		enteredCount--;
-	}
-	return newPos;
-}
-
-void Document::InsertChar(int pos, char ch) {
-	char chs[2];
-	chs[0] = ch;
-	chs[1] = 0;
-	InsertStyledString(pos*2, chs, 2);
-}
-
-// Insert a null terminated string
-void Document::InsertString(int position, const char *s) {
-	InsertString(position, s, strlen(s));
-}
-
-// Insert a string with a length
-void Document::InsertString(int position, const char *s, int insertLength) {
-	char *sWithStyle = new char[insertLength * 2];
-	if (sWithStyle) {
-		for (int i = 0; i < insertLength; i++) {
-			sWithStyle[i*2] = s[i];
-			sWithStyle[i*2 + 1] = 0;
-		}
-		InsertStyledString(position*2, sWithStyle, insertLength*2);
-		delete []sWithStyle;
-	}
-}
-
-void Document::ChangeChar(int pos, char ch) {
-	DeleteChars(pos, 1);
-	InsertChar(pos, ch);
-}
-
-void Document::DelChar(int pos) {
-	if (IsCrLf(pos)) {
-		DeleteChars(pos, 2);
-	} else if (IsDBCS(pos)) {
-		DeleteChars(pos, 2);
-	} else if (pos < Length()) {
-		DeleteChars(pos, 1);
-	}
-}
-
-int Document::DelCharBack(int pos) {
-	if (pos <= 0) {
-		return pos;
-	} else if (IsCrLf(pos - 2)) {
-		DeleteChars(pos - 2, 2);
-		return pos - 2;
-	} else if (IsDBCS(pos - 1)) {
-		DeleteChars(pos - 2, 2);
-		return pos - 2;
-	} else {
-		DeleteChars(pos - 1, 1);
-		return pos - 1;
-	}
-}
-
-void Document::Indent(bool forwards, int lineBottom, int lineTop) {
-	if (forwards) {
-		// Indent by a tab
-		for (int line = lineBottom; line >= lineTop; line--) {
-			InsertChar(LineStart(line), '\t');
-		}
-	} else {
-		// Dedent - suck white space off the front of the line to dedent by equivalent of a tab
-		for (int line = lineBottom; line >= lineTop; line--) {
-			int ispc = 0;
-			while (ispc < tabInChars && cb.CharAt(LineStart(line) + ispc) == ' ')
-				ispc++;
-			int posStartLine = LineStart(line);
-			if (ispc == tabInChars) {
-				DeleteChars(posStartLine, ispc);
-			} else if (cb.CharAt(posStartLine + ispc) == '\t') {
-				DeleteChars(posStartLine, ispc + 1);
-			} else {	// Hit a non-white
-				DeleteChars(posStartLine, ispc);
-			}
-		}
-	}
-}
-
-void Document::ConvertLineEnds(int eolModeSet) {
-	BeginUndoAction();
-	for (int pos = 0; pos < Length(); pos++) {
-		if (cb.CharAt(pos) == '\r') {
-			if (cb.CharAt(pos+1) == '\n') {
-				if (eolModeSet != SC_EOL_CRLF) {
-					DeleteChars(pos, 2);
-					if (eolModeSet == SC_EOL_CR)
-						InsertString(pos, "\r", 1);
-					else
-						InsertString(pos, "\n", 1);
-				} else {
-					pos++;
-				}
-			} else {
-				if (eolModeSet != SC_EOL_CR) {
-					DeleteChars(pos, 1);
-					if (eolModeSet == SC_EOL_CRLF) {
-						InsertString(pos, "\r\n", 2);
-						pos++;
-					} else {
-						InsertString(pos, "\n", 1);
-					}
-				}
-			}
-		} else if (cb.CharAt(pos) == '\n') {
-			if (eolModeSet != SC_EOL_LF) {
-				DeleteChars(pos, 1);
-				if (eolModeSet == SC_EOL_CRLF) {
-					InsertString(pos, "\r\n", 2);
-					pos++;
-				} else {
-					InsertString(pos, "\r", 1);
-				}
-			}
-		}
-	}
-	EndUndoAction();
-}
-
-bool Document::IsWordChar(unsigned char ch) {
-	return wordchars[ch];
-}
-
-int Document::ExtendWordSelect(int pos, int delta) {
-	if (delta < 0) {
-		while (pos > 0 && IsWordChar(cb.CharAt(pos - 1)))
-			pos--;
-	} else {
-		while (pos < (Length()) && IsWordChar(cb.CharAt(pos)))
-			pos++;
-	}
-	return pos;
-}
-
-int Document::NextWordStart(int pos, int delta) {
-	if (delta < 0) {
-		while (pos > 0 && (cb.CharAt(pos - 1) == ' ' || cb.CharAt(pos - 1) == '\t'))
-			pos--;
-		if (isspace(cb.CharAt(pos - 1))) {	// Back up to previous line
-			while (pos > 0 && isspace(cb.CharAt(pos - 1)))
-				pos--;
-		} else {
-			bool startAtWordChar = IsWordChar(cb.CharAt(pos - 1));
-			while (pos > 0 && !isspace(cb.CharAt(pos - 1)) && (startAtWordChar == IsWordChar(cb.CharAt(pos - 1))))
-				pos--;
-		}
-	} else {
-		bool startAtWordChar = IsWordChar(cb.CharAt(pos));
-		while (pos < (Length()) && isspace(cb.CharAt(pos)))
-			pos++;
-		while (pos < (Length()) && !isspace(cb.CharAt(pos)) && (startAtWordChar == IsWordChar(cb.CharAt(pos))))
-			pos++;
-		while (pos < (Length()) && (cb.CharAt(pos) == ' ' || cb.CharAt(pos) == '\t'))
-			pos++;
-	}
-	return pos;
-}
-
-bool Document::IsWordAt(int start, int end) {
-	int lengthDoc = Length();
-	if (start > 0) {
-		char ch = CharAt(start - 1);
-		if (IsWordChar(ch))
-			return false;
-	}
-	if (end < lengthDoc - 1) {
-		char ch = CharAt(end);
-		if (IsWordChar(ch))
-			return false;
-	}
-	return true;
-}
-
-// Find text in document, supporting both forward and backward
-// searches (just pass minPos > maxPos to do a backward search)
-// Has not been tested with backwards DBCS searches yet.
-long Document::FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word) {
- 	bool forward = minPos <= maxPos;
-	int increment = forward ? 1 : -1;
-
-	// Range endpoints should not be inside DBCS characters, but just in case, move them.
-	int startPos = MovePositionOutsideChar(minPos, increment, false);
-	int endPos = MovePositionOutsideChar(maxPos, increment, false);
- 	
-	// Compute actual search ranges needed
-	int lengthFind = strlen(s);
- 	int endSearch = 0;
- 	if (startPos <= endPos) {
- 		endSearch = endPos - lengthFind + 1;
- 	} else {
- 		endSearch = endPos;
- 	}
-	//Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind);
-	char firstChar = s[0];
-	if (!caseSensitive)
-		firstChar = toupper(firstChar);
-	int pos = startPos;
-	while (forward ? (pos < endSearch) : (pos >= endSearch)) {
-		char ch = CharAt(pos);
-		if (caseSensitive) {
-			if (ch == firstChar) {
-				bool found = true;
-				for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-					ch = CharAt(pos + posMatch);
-					if (ch != s[posMatch])
-						found = false;
-				}
-				if (found) {
-					if ((!word) || IsWordAt(pos, pos + lengthFind))
-						return pos;
-				}
-			}
-		} else {
-			if (toupper(ch) == firstChar) {
-				bool found = true;
-				for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-					ch = CharAt(pos + posMatch);
-					if (toupper(ch) != toupper(s[posMatch]))
-						found = false;
-				}
-				if (found) {
-					if ((!word) || IsWordAt(pos, pos + lengthFind))
-						return pos;
-				}
-			}
-		}
-		pos += increment;
-		if (dbcsCodePage) {
-			// Ensure trying to match from start of character
-			pos = MovePositionOutsideChar(pos, increment, false);
-		}
-	}
-	//Platform::DebugPrintf("Not found\n");
-	return - 1;
-}
-
-int Document::LinesTotal() {
-	return cb.Lines();
-}
-
-void Document::ChangeCase(Range r, bool makeUpperCase) {
-	for (int pos=r.start; pos<r.end; pos++) {
-		char ch = CharAt(pos);
-		if (dbcsCodePage && IsDBCS(pos)) {
-			pos++;
-		} else {
-			if (makeUpperCase) {
-				if (islower(ch)) {
-					ChangeChar(pos, toupper(ch));
-				}
-			} else {
-				if (isupper(ch)) {
-					ChangeChar(pos, tolower(ch));
-				}
-			}
-		}
-	}
-}
-
-void Document::SetWordChars(unsigned char *chars) {
-	int ch;
-	for (ch = 0; ch < 256; ch++) {
-		wordchars[ch] = false;
-	}
-	if (chars) {
-		while (*chars) {
-			wordchars[*chars] = true;
-			chars++;
-		}
-	} else {
-		for (ch = 0; ch < 256; ch++) {
-			wordchars[ch] = isalnum(ch) || ch == '_';
-		}
-	}
-}
-
-void Document::SetStylingBits(int bits) {
-	stylingBits = bits;
-	stylingBitsMask = 0;
-	for (int bit=0; bit<stylingBits; bit++) {
-		stylingBitsMask <<= 1;
-		stylingBitsMask |= 1;
-	}
-}
-
-void Document::StartStyling(int position, char mask) {
-	stylingPos = position;
-	stylingMask = mask;
-}
-
-void Document::SetStyleFor(int length, char style) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		int prevEndStyled = endStyled;
-		if (cb.SetStyleFor(stylingPos, length, style, stylingMask)) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER, 
-				prevEndStyled, length);
-			NotifyModified(mh);
-		}
-		stylingPos += length;
-		endStyled = stylingPos;
-		enteredCount--;
-	}
-}
-
-void Document::SetStyles(int length, char *styles) {
-	if (enteredCount == 0) {
-		enteredCount++;
-		int prevEndStyled = endStyled;
-		bool didChange = false;
-		for (int iPos = 0; iPos < length; iPos++, stylingPos++) {
-			if (cb.SetStyleAt(stylingPos, styles[iPos], stylingMask)) {
-				didChange = true;
-			}
-		}
-		endStyled = stylingPos;
-		if (didChange) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER, 
-				prevEndStyled, endStyled - prevEndStyled);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-	}
-}
-
-bool Document::EnsureStyledTo(int pos) {
-	// Ask the watchers to style, and stop as soon as one responds.
-	for (int i = 0; pos > GetEndStyled() && i < lenWatchers; i++)
-		watchers[i].watcher->NotifyStyleNeeded(this, watchers[i].userData, pos);
-	return pos <= GetEndStyled();
-}
-
-bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData))
-			return false;
-	}
-	WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers + 1];
-	if (!pwNew)
-		return false;
-	for (int j = 0; j < lenWatchers; j++)
-		pwNew[j] = watchers[j];
-	pwNew[lenWatchers].watcher = watcher;
-	pwNew[lenWatchers].userData = userData;
-	delete []watchers;
-	watchers = pwNew;
-	lenWatchers++;
-	return true;
-}
-
-bool Document::RemoveWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData)) {
-			if (lenWatchers == 1) {
-				delete []watchers;
-				watchers = 0;
-				lenWatchers = 0;
-			} else {
-				WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers];
-				if (!pwNew)
-					return false;
-				for (int j = 0; j < lenWatchers - 1; j++) {
-					pwNew[j] = (j < i) ? watchers[j] : watchers[j + 1];
-				}
-				delete []watchers;
-				watchers = pwNew;
-				lenWatchers--;
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-void Document::NotifyModifyAttempt() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModifyAttempt(this, watchers[i].userData);
-	}
-}
-
-void Document::NotifySavePoint(bool atSavePoint) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifySavePoint(this, watchers[i].userData, atSavePoint);
-	}
-}
-
-void Document::NotifyModified(DocModification mh) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModified(this, mh, watchers[i].userData);
-	}
-}

src/stc/scintilla/src/Document.h

@@ -1,227 +0,0 @@
-// Scintilla source code edit control
-// Document.h - text document that handles notifications, DBCS, styling, words and end of line
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef DOCUMENT_H
-#define DOCUMENT_H
-
-// A Position is a position within a document between two characters or at the beginning or end.
-// Sometimes used as a character index where it identifies the character after the position.
-typedef int Position;
-const Position invalidPosition = -1;
-
-// The range class represents a range of text in a document.
-// The two values are not sorted as one end may be more significant than the other
-// as is the case for the selection where the end position is the position of the caret.
-// If either position is invalidPosition then the range is invalid and most operations will fail.
-class Range {
-public:
-	Position start;
-	Position end;
-	
-	Range(Position pos=0) : 
-		start(pos), end(pos) {
-	};
-	Range(Position start_, Position end_) : 
-		start(start_), end(end_) {
-	};
-	
-	bool Valid() const {
-		return (start != invalidPosition) && (end != invalidPosition);
-	}
-	
-	bool Contains(Position pos) const {
-		if (start < end) {
-			return (pos >= start && pos <= end);
-		} else {
-			return (pos <= start && pos >= end);
-		}
-	}
-	
-	bool Contains(Range other) const {
-		return Contains(other.start) && Contains(other.end);
-	}
-	
-	bool Overlaps(Range other) const {
-		return 
-		Contains(other.start) ||
-		Contains(other.end) ||
-		other.Contains(start) ||
-		other.Contains(end);
-	}
-};
-
-class DocWatcher;
-class DocModification;
-
-class Document {
-
-public:
-	// Used to pair watcher pointer with user data
-	class WatcherWithUserData {
-	public:
-		DocWatcher *watcher;
-		void *userData;
-		WatcherWithUserData() {
-			watcher = 0;
-			userData = 0;
-		}
-	};
-	
-private:	
-	int refCount;
-	CellBuffer cb;
-	bool wordchars[256];
-	int stylingPos;
-	int stylingMask;
-	int endStyled;
-	int enteredCount;
-	
-	WatcherWithUserData *watchers;
-	int lenWatchers;
-	
-public:
-	int stylingBits;
-	int stylingBitsMask;
-	
-	int eolMode;
-	int dbcsCodePage;
-	int tabInChars;
-	
-	Document();
-	virtual ~Document();
-	
-	int AddRef();
-	int Release();
- 	
-	int LineFromPosition(int pos);
-	int ClampPositionIntoDocument(int pos);
-	bool IsCrLf(int pos);
-	int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
-
-	// Gateways to modifying document
-	void DeleteChars(int pos, int len);
-	void InsertStyledString(int position, char *s, int insertLength);
-	int Undo();
-	int Redo();
-	bool CanUndo() { return cb.CanUndo(); }
-	bool CanRedo() { return cb.CanRedo(); }
-	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo) {
-		return cb.SetUndoCollection(collectUndo);
-	}
-	void BeginUndoAction() { cb.BeginUndoAction(); }
-	void EndUndoAction() { cb.EndUndoAction(); }
-	void SetSavePoint();
-	bool IsSavePoint() { return cb.IsSavePoint(); }
-	void Indent(bool forwards, int lineBottom, int lineTop);
-	void ConvertLineEnds(int eolModeSet);
-	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
-
-	void InsertChar(int pos, char ch);
-	void InsertString(int position, const char *s);
-	void InsertString(int position, const char *s, int insertLength);
-	void ChangeChar(int pos, char ch);
-	void DelChar(int pos);
-	int DelCharBack(int pos);
-
-	char CharAt(int position) { return cb.CharAt(position); }
-	void GetCharRange(char *buffer, int position, int lengthRetrieve) {
-		cb.GetCharRange(buffer, position, lengthRetrieve);
-	}
-	char StyleAt(int position) { return cb.StyleAt(position); }
-	int GetMark(int line) { return cb.GetMark(line); }
-	int AddMark(int line, int markerNum);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle) { return cb.LineFromHandle(markerHandle); }
-	int LineStart(int line);
-	int LineEnd(int line);
-	int LineEndPosition(int position);
-	int VCHomePosition(int position);
-
-	int SetLevel(int line, int level);
-	int GetLevel(int line) { return cb.GetLevel(line); }
-	int GetLastChild(int lineParent, int level=-1);
-	int GetFoldParent(int line);
-
-	void Indent(bool forwards);
-	int ExtendWordSelect(int pos, int delta);
-	int NextWordStart(int pos, int delta);
-	int Length() { return cb.Length(); }
-	long FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word);
-	long FindText(WORD iMessage,WPARAM wParam,LPARAM lParam);
-	int LinesTotal();
-	
-	void ChangeCase(Range r, bool makeUpperCase);
-	
-	void SetWordChars(unsigned char *chars);
-	void SetStylingBits(int bits);
-	void StartStyling(int position, char mask);
-	void SetStyleFor(int length, char style);
-	void SetStyles(int length, char *styles);
-	int GetEndStyled() { return endStyled; }
-	bool EnsureStyledTo(int pos);
-
-	int SetLineState(int line, int state) { return cb.SetLineState(line, state); }
-	int GetLineState(int line) { return cb.GetLineState(line); }
-	int GetMaxLineState() { return cb.GetMaxLineState(); }
-		
-	bool AddWatcher(DocWatcher *watcher, void *userData);
-	bool RemoveWatcher(DocWatcher *watcher, void *userData);
-	const WatcherWithUserData *GetWatchers() const { return watchers; }
-	int GetLenWatchers() const { return lenWatchers; }
-	
-private:
-	bool IsDBCS(int pos);
-	bool IsWordChar(unsigned char ch);
-	bool IsWordAt(int start, int end);
-	void ModifiedAt(int pos);
-		
-	void NotifyModifyAttempt();
-	void NotifySavePoint(bool atSavePoint);
-	void NotifyModified(DocModification mh);
-};
-
-// To optimise processing of document modifications by DocWatchers, a hint is passed indicating the 
-// scope of the change.
-// If the DocWatcher is a document view then this can be used to optimise screen updating.
-class DocModification {
-public:
-  	int modificationType;
-	int position;
- 	int length;
- 	int linesAdded;	// Negative if lines deleted
- 	const char *text;	// Only valid for changes to text, not for changes to style
- 	int line;
-	int foldLevelNow;
-	int foldLevelPrev;
-
-	DocModification(int modificationType_, int position_=0, int length_=0, 
-		int linesAdded_=0, const char *text_=0) :
-		modificationType(modificationType_),
-		position(position_),
-		length(length_),
-		linesAdded(linesAdded_),
-		text(text_),
-		line(0),
-		foldLevelNow(0),
-		foldLevelPrev(0) {}
-};
-
-// A class that wants to receive notifications from a Document must be derived from DocWatcher 
-// and implement the notification methods. It can then be added to the watcher list with AddWatcher.
-class DocWatcher {
-public:
-	virtual ~DocWatcher() {}
-	
-	virtual void NotifyModifyAttempt(Document *doc, void *userData) = 0;
-	virtual void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) = 0;
-	virtual void NotifyModified(Document *doc, DocModification mh, void *userData) = 0;
-	virtual void NotifyDeleted(Document *doc, void *userData) = 0;
-	virtual void NotifyStyleNeeded(Document *doc, void *userData, int endPos) = 0;
-};
-
-#endif

src/stc/scintilla/src/Editor.h

@@ -1,287 +0,0 @@
-// Scintilla source code edit control
-// Editor.h - defines the main editor class
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef EDITOR_H
-#define EDITOR_H
-
-class Caret {
-public:
-	bool active;
-	bool on;
-	int period;
-		
-	Caret();
-};
-
-class Timer {
-
-public:
-	bool ticking;
-	int ticksToWait;
-	enum {tickSize = 100};
-	int tickerID;
-		
-	Timer();
-};
-
-class LineLayout {
-public:
-	// Drawing is only performed for maxLineLength characters on each line.
-	enum {maxLineLength = 4000};
-	int numCharsInLine;
-	char chars[maxLineLength];
-	char styles[maxLineLength];
-	char indicators[maxLineLength];
-	int positions[maxLineLength];
-};
-
-class Editor : public DocWatcher {
-protected:	// ScintillaBase subclass needs access to much of Editor
-
-	// On GTK+, Scintilla is a container widget holding two scroll bars and a drawing area
-	// whereas on Windows there is just one window with both scroll bars turned on.
-	// Therefore, on GTK+ the following are separate windows but only one window on Windows.
-	Window wMain;	// The Scintilla parent window
-	Window wDraw;	// The text drawing area
-
-	// Style resources may be expensive to allocate so are cached between uses.
-	// When a style attribute is changed, this cache is flushed.
-	bool stylesValid;	
-	ViewStyle vs;
-	Palette palette;
-	
-	bool hideSelection;
-	bool inOverstrike;
-
-	// In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to 
-	// the screen. This avoids flashing but is about 30% slower.
-	bool bufferedDraw;
-
-	int xOffset;				// Horizontal scrolled amount in pixels
-	int xCaretMargin;	// Ensure this many pixels visible on both sides of caret
-	
-	Surface pixmapLine;
-	Surface pixmapSelMargin;
-	Surface pixmapSelPattern;
-	// Intellimouse support - currently only implemented for Windows
-	unsigned int ucWheelScrollLines;
-	short cWheelDelta; //wheel delta from roll
-
-	KeyMap kmap;
-
-	Caret caret;
-	Timer timer;
-
-	Point lastClick;
-	unsigned int lastClickTime;
-	enum { selChar, selWord, selLine } selectionType;
-	Point ptMouseLast;
-	bool firstExpose;
-	bool inDragDrop;
-	bool dropWentOutside;
-	int posDrag;
-	int posDrop;
-	int lastXChosen;
-	int lineAnchor;
-	int originalAnchorPos;
-	int currentPos;
-	int anchor;
-	int topLine;
-	int posTopLine;
-	
-	bool needUpdateUI;
-	Position braces[2];
-	int bracesMatchStyle;
-	
-	int edgeState;
-	int theEdge;
-
-	enum { notPainting, painting, paintAbandoned } paintState;
-	PRectangle rcPaint;
-	bool paintingAllText;
-	
-	int modEventMask;
-	
-	char *dragChars;
-	int lenDrag;
-	bool dragIsRectangle;
-	enum { selStream, selRectangle, selRectangleFixed } selType;
-	int xStartSelect;
-	int xEndSelect;
-	
-	int caretPolicy;
-	int caretSlop;
-
-	int searchAnchor;
-
-	int displayPopupMenu;
-
-#ifdef MACRO_SUPPORT
-	int recordingMacro;
-#endif
-
-	int foldFlags;
-	ContractionState cs;
-
-	Document *pdoc;
-
-	Editor();
-	virtual ~Editor();
-	virtual void Initialise() = 0;
-	virtual void Finalise();
-
-	void InvalidateStyleData();
-	void InvalidateStyleRedraw();
-	virtual void RefreshColourPalette(Palette &pal, bool want);
-	void RefreshStyleData();
-	void DropGraphics();
-
-	PRectangle GetClientRectangle();
-	PRectangle GetTextRectangle();
-	
-	int LinesOnScreen();
-	int LinesToScroll();
-	int MaxScrollPos();
-	Point LocationFromPosition(unsigned int pos);
-	int XFromPosition(unsigned int pos);
-	int PositionFromLocation(Point pt);
-	int PositionFromLineX(int line, int x);
-	int LineFromLocation(Point pt);
-	void SetTopLine(int topLineNew);
-	
-	void RedrawRect(PRectangle rc);
-	void Redraw();
-	void RedrawSelMargin();
-	PRectangle RectangleFromRange(int start, int end);
-	void InvalidateRange(int start, int end);
-	
-	int CurrentPosition();
-	bool SelectionEmpty();
-	int SelectionStart(int line=-1);
-	int SelectionEnd(int line=-1);
-	void SetSelection(int currentPos_, int anchor_);
-	void SetSelection(int currentPos_);
-	void SetEmptySelection(int currentPos_);
-	int MovePositionTo(int newPos, bool extend = false);
-	int MovePositionSoVisible(int pos, int moveDir);
-	void SetLastXChosen();
-
-	void ScrollTo(int line);
-	virtual void ScrollText(int linesToMove);
-	void HorizontalScrollTo(int xPos);
-	void EnsureCaretVisible(bool useMargin=true);
-	void ShowCaretAtCurrentPosition();
-	void DropCaret();
-	void InvalidateCaret();
-
-	void PaintSelMargin(Surface *surface, PRectangle &rc);
-        void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout &ll);
-	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int xStart, 
-		PRectangle rcLine, LineLayout &ll);
-	void Paint(Surface *surfaceWindow, PRectangle rcArea);
-	long FormatRange(bool draw, FORMATRANGE *pfr);
-
-	virtual void SetVerticalScrollPos() = 0;
-	virtual void SetHorizontalScrollPos() = 0;
-	virtual bool ModifyScrollBars(int nMax, int nPage) = 0;
-	void SetScrollBarsTo(PRectangle rsClient);
-	void SetScrollBars();
-
-	virtual void AddChar(char ch);
-	void ClearSelection();
-	void ClearAll();
-	void Cut();
-	void PasteRectangular(int pos, const char *ptr, int len);
-	virtual void Copy() = 0;
-	virtual void Paste() = 0;
-	void Clear();
-	void SelectAll();
-	void Undo();
-	void Redo();
-	void DelChar();
-	void DelCharBack();
-	virtual void ClaimSelection() = 0;
-
-	virtual void NotifyChange() = 0;
-	virtual void NotifyFocus(bool focus);
-	virtual void NotifyParent(SCNotification scn) = 0;
-	virtual void NotifyStyleNeeded(int endStyleNeeded);
-	void NotifyChar(char ch);
-	void NotifySavePoint(bool isSavePoint);
-	void NotifyModifyAttempt();
-	virtual void NotifyDoubleClick(Point pt, bool shift);
-	void NotifyUpdateUI();
-	bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt);
-	void NotifyNeedShown(int pos, int len);
-	
-	void NotifyModifyAttempt(Document *document, void *userData);
-	void NotifySavePoint(Document *document, void *userData, bool atSavePoint);
-	void NotifyModified(Document *document, DocModification mh, void *userData);
-	void NotifyDeleted(Document *document, void *userData);
-	void NotifyStyleNeeded(Document *doc, void *userData, int endPos);
-
-	
-#ifdef MACRO_SUPPORT
-	void NotifyMacroRecord(UINT iMessage, WPARAM wParam, LPARAM lParam);
-#endif
-
-	void PageMove(int direction, bool extend=false);
-	void ChangeCaseOfSelection(bool makeUpperCase);
-	void LineTranspose();
-	virtual int KeyCommand(UINT iMessage);
-	virtual int KeyDefault(int /* key */, int /*modifiers*/);
-	int KeyDown(int key, bool shift, bool ctrl, bool alt);
-
-	bool GetWhitespaceVisible();
-	void SetWhitespaceVisible(bool view);
-
-	void Indent(bool forwards);
-
-	long FindText(UINT iMessage,WPARAM wParam,LPARAM lParam);
-	void SearchAnchor();
-	long SearchText(UINT iMessage,WPARAM wParam,LPARAM lParam);
-	void GoToLine(int lineNo);
-
-	char *CopyRange(int start, int end);
-	int SelectionRangeLength();
-	char *CopySelectionRange();
-	void CopySelectionIntoDrag();
-	void SetDragPosition(int newPos);
-	virtual void StartDrag();
-	void DropAt(int position, const char *value, bool moving, bool rectangular);
-	// PositionInSelection returns 0 if position in selection, -1 if position before selection, and 1 if after.
-	// Before means either before any line of selection or before selection on its line, with a similar meaning to after
-	int PositionInSelection(int pos);
-	bool PointInSelection(Point pt);
-	bool PointInSelMargin(Point pt);
-	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-	void ButtonMove(Point pt);
-	void ButtonUp(Point pt, unsigned int curTime, bool ctrl);
-
-	void Tick();
-	virtual void SetTicking(bool on) = 0;
-	virtual void SetMouseCapture(bool on) = 0;
-	virtual bool HaveMouseCapture() = 0;
-
-	void CheckForChangeOutsidePaint(Range r);
-	int BraceMatch(int position, int maxReStyle);
-	void SetBraceHighlight(Position pos0, Position pos1, int matchStyle);
-	
-	void SetDocPointer(Document *document);
-	
-	void Expand(int &line, bool doExpand);
-	void ToggleContraction(int line);
-	void EnsureLineVisible(int line);
-
-	virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) = 0;
-	
-public:
-	// Public so scintilla_send_message can use it
-	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-	// Public so scintilla_set_id can use it
-	int ctrlID;	
-};
-
-#endif

src/stc/scintilla/src/Indicator.cxx

@@ -1,45 +0,0 @@
-// Scintilla source code edit control
-// Indicator.cxx - defines the style of indicators which are text decorations such as underlining
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-
-void Indicator::Draw(Surface *surface, PRectangle &rc) {
-	surface->PenColour(fore.allocated);
-	int ymid = (rc.bottom + rc.top) / 2;
-	if (style == INDIC_SQUIGGLE) {
-		surface->MoveTo(rc.left, rc.top);
-		int x = rc.left + 2;
-		int y = 2;
-		while (x < rc.right) {
-			surface->LineTo(x, rc.top + y);
-			x += 2;
-			y = 2 - y;
-		}
-		surface->LineTo(rc.right, rc.top + y);	// Finish the line
-	} else if (style == INDIC_TT) {
-		surface->MoveTo(rc.left, ymid);
-		int x = rc.left + 5;
-		while (x < rc.right) {
-			surface->LineTo(x, ymid);
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-			x++;
-			surface->MoveTo(x, ymid);
-			x += 5;
-		}
-		surface->LineTo(rc.right, ymid);	// Finish the line
-		if (x - 3 <= rc.right) {
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-		}
-	} else {	// Either INDIC_PLAIN or unknown
-		surface->MoveTo(rc.left, ymid);
-		surface->LineTo(rc.right, ymid);
-	}
-}
-

src/stc/scintilla/src/Indicator.h

@@ -1,18 +0,0 @@
-// Scintilla source code edit control
-// Indicator.h - defines the style of indicators which are text decorations such as underlining
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef INDICATOR_H
-#define INDICATOR_H
-
-class Indicator {
-public:
-	int style;
-	ColourPair fore;
-	Indicator() : style(INDIC_PLAIN), fore(Colour(0,0,0)) {
-	}
-	void Draw(Surface *surface, PRectangle &rc);
-};
-
-#endif

src/stc/scintilla/src/KeyMap.cxx

@@ -1,116 +0,0 @@
-// Scintilla source code edit control
-// KeyMap.cxx  - defines a mapping between keystrokes and commands
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-
-#include "KeyMap.h"
-
-KeyMap::KeyMap() : kmap(0), len(0), alloc(0) {
-	for (int i = 0; MapDefault[i].key; i++) {
-		AssignCmdKey(MapDefault[i].key, 
-			MapDefault[i].modifiers,
-             		MapDefault[i].msg);
-	}
-}
-
-KeyMap::~KeyMap() {
-	Clear();
-}
-
-void KeyMap::Clear() {
-	delete []kmap;
-	kmap = 0;
-	len = 0;
-	alloc = 0;
-}
-
-void KeyMap::AssignCmdKey(int key, int modifiers, UINT msg) {
-	if ((len+1) >= alloc) {
-		KeyToCommand *ktcNew = new KeyToCommand[alloc + 5];
-		if (!ktcNew)
-			return;
-		for (int k=0;k<len;k++)
-			ktcNew[k] = kmap[k];
-		alloc += 5;
-		delete []kmap;
-		kmap = ktcNew;
-	}
-	for (int keyIndex = 0; keyIndex < len; keyIndex++) {
-		if ((key == kmap[keyIndex].key) && (modifiers == kmap[keyIndex].modifiers)) {
-			kmap[keyIndex].msg = msg;
-			return;
-		}
-	}
-	kmap[len].key = key;
-	kmap[len].modifiers = modifiers;
-	kmap[len].msg = msg;
-	len++;
-}
-
-UINT KeyMap::Find(int key, int modifiers) {
-	for (int i=0; i < len; i++) {
-		if ((key == kmap[i].key) && (modifiers == kmap[i].modifiers)) {
-			return kmap[i].msg;
-		}
-	}
-	return 0;
-}
-
-KeyToCommand KeyMap::MapDefault[] = {
-    VK_DOWN,		SCI_NORM,	SCI_LINEDOWN,
-    VK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND,
-    VK_UP,			SCI_NORM,	SCI_LINEUP,
-    VK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND,
-    VK_LEFT,		SCI_NORM,	SCI_CHARLEFT,
-    VK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND,
-    VK_LEFT,		SCI_CTRL,	SCI_WORDLEFT,
-    VK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND,
-    VK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT,
-    VK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND,
-    VK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT,
-    VK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND,
-    VK_HOME, 		SCI_NORM, 	SCI_VCHOME,
-    VK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND,
-    VK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART,
-    VK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND,
-    VK_END,	 	SCI_NORM, 	SCI_LINEEND,
-    VK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND,
-    VK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND,
-    VK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND,
-    VK_PRIOR,		SCI_NORM, 	SCI_PAGEUP,
-    VK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND,
-    VK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN,
-    VK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND,
-    VK_DELETE, 	SCI_NORM,	WM_CLEAR,
-    VK_DELETE, 	SCI_SHIFT,	WM_CUT,
-    VK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT,
-    VK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE,
-    VK_INSERT, 		SCI_SHIFT,	WM_PASTE,
-    VK_INSERT, 		SCI_CTRL,	WM_COPY,
-    VK_ESCAPE,  	SCI_NORM,	SCI_CANCEL,
-    VK_BACK,		SCI_NORM, 	SCI_DELETEBACK,
-    VK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT,
-    'Z', 			SCI_CTRL,	WM_UNDO,
-    'Y', 			SCI_CTRL,	SCI_REDO,
-    'X', 			SCI_CTRL,	WM_CUT,
-    'C', 			SCI_CTRL,	WM_COPY,
-    'V', 			SCI_CTRL,	WM_PASTE,
-    'A', 			SCI_CTRL,	SCI_SELECTALL,
-    VK_TAB,		SCI_NORM,	SCI_TAB,
-    VK_TAB,		SCI_SHIFT,	SCI_BACKTAB,
-    VK_RETURN, 	SCI_NORM,	SCI_NEWLINE,
-    VK_ADD, 		SCI_CTRL,	SCI_ZOOMIN,
-    VK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT,
-    //'L', 			SCI_CTRL,		SCI_FORMFEED,
-    'L', 			SCI_CTRL,	SCI_LINECUT,
-    'L', 			SCI_CSHIFT,	SCI_LINEDELETE,
-    'T', 			SCI_CTRL,	SCI_LINETRANSPOSE,
-    'U', 			SCI_CTRL,	SCI_LOWERCASE,
-    'U', 			SCI_CSHIFT,	SCI_UPPERCASE,
-    0,0,0,
-};
-

src/stc/scintilla/src/KeyMap.h

@@ -1,36 +0,0 @@
-// Scintilla source code edit control
-// KeyMap.h - defines a mapping between keystrokes and commands
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef KEYTOCOMMAND_H
-#define KEYTOCOMMAND_H
-
-#define SCI_NORM 0
-#define SCI_SHIFT SHIFT_PRESSED
-#define SCI_CTRL LEFT_CTRL_PRESSED
-#define SCI_ALT LEFT_ALT_PRESSED
-#define SCI_CSHIFT (SCI_CTRL | SCI_SHIFT)
-#define SCI_ASHIFT (SCI_ALT | SCI_SHIFT)
-
-class KeyToCommand {
-public:
-	int key;
-	int modifiers;
-	UINT msg;
-};
-
-class KeyMap {
-	KeyToCommand *kmap;
-	int len;
-	int alloc;
-	static KeyToCommand MapDefault[];
-public:
-	KeyMap();
-	~KeyMap();
-	void Clear();
-	void AssignCmdKey(int key, int modifiers, UINT msg);
-	UINT Find(int key, int modifiers);	// 0 returned on failure
-};
-
-#endif

src/stc/scintilla/src/KeyWords.cxx

@@ -1,45 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// KeyWords.cxx - colourise for particular languages
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-LexerModule *LexerModule::base = 0;
-
-LexerModule::LexerModule(int language_, LexerFunction fn_) :
-	language(language_), fn(fn_) {
-	next = base;
-	base = this;
-}
-
-void LexerModule::Colourise(unsigned int startPos, int lengthDoc, int initStyle,
-		int language, WordList *keywordlists[], StylingContext &styler) {
-	LexerModule *lm = base;
-	while (lm) {
-		if (lm->language == language) {
-			lm->fn(startPos, lengthDoc, initStyle, keywordlists, styler);
-			return;
-		}
-		lm = lm->next;
-	}
-	// Unknown language
-	// Null language means all style bytes are 0 so just mark the end - no need to fill in.
-	if (lengthDoc > 0) {
-		styler.StartAt(startPos + lengthDoc - 1);
-		styler.StartSegment(startPos + lengthDoc - 1);
-		styler.ColourTo(startPos + lengthDoc - 1, 0);
-	}
-}

src/stc/scintilla/src/LexCPP.cxx

@@ -1,255 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexCPP.cxx - lexer for C++, C, Java, and Javascript
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static bool classifyWordCpp(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	bool wordIsUUID = false;
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_C_WORD;
-			wordIsUUID = strcmp(s, "uuid") == 0; 
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	return wordIsUUID;
-}
-
-static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], 
-	StylingContext &styler) {
-	
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-	
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-
-	int state = initStyle;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	unsigned int lengthDoc = startPos + length;
-	int visChars = 0;
-	styler.StartSegment(startPos);
-	bool lastWordWasUUID = false;
-	for (unsigned int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((fold) && ((ch == '\r' && chNext != '\n') || (ch == '\n'))) {
-			int lev = levelPrev;
-			if (visChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-			visChars = 0;
-			levelPrev = levelCurrent;
-		}
-		if (!isspace(ch))
-			visChars++;
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_STRINGEOL) {
-			if (ch != '\r' && ch != '\n') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_DEFAULT;
-			}
-		}
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i-1, state);
-				if (lastWordWasUUID) {
-					state = SCE_C_UUID;
-					lastWordWasUUID = false;
-				} else {
-					state = SCE_C_WORD;
-				}
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i-1, state);
-				if (styler.SafeGetCharAt(i + 2) == '*')
-					state = SCE_C_COMMENTDOC;
-				else
-					state = SCE_C_COMMENT;
-			} else if (ch == '/' && chNext == '/') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_STRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_CHARACTER;
-			} else if (ch == '#') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_PREPROCESSOR;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i-1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
-				if ((ch == '{') || (ch == '}')) {
-					levelCurrent += (ch == '{') ? 1 : -1;
-				}
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				lastWordWasUUID = classifyWordCpp(styler.GetStartSegment(), i - 1, keywords, styler);
-				state = SCE_C_DEFAULT;
-				if (ch == '/' && chNext == '*') {
-					if (styler.SafeGetCharAt(i + 2) == '*')
-						state = SCE_C_COMMENTDOC;
-					else
-						state = SCE_C_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (ch == '#') {
-					state = SCE_C_PREPROCESSOR;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-					if ((ch == '{') || (ch == '}')) {
-						levelCurrent += (ch == '{') ? 1 : -1;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_C_PREPROCESSOR) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_COMMENT) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > styler.GetStartSegment() + 2) || (
-						(initStyle == SCE_C_COMMENT) && 
-						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTDOC) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > styler.GetStartSegment() + 3) || (
-						(initStyle == SCE_C_COMMENTDOC) && 
-						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_C_CHARACTER) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_C_UUID) {
-				if (ch == '\r' || ch == '\n' || ch == ')') {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_DEFAULT;
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '/' && chNext == '*') {
-					if (styler.SafeGetCharAt(i + 2) == '*')
-						state = SCE_C_COMMENTDOC;
-					else
-						state = SCE_C_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (ch == '#') {
-					state = SCE_C_PREPROCESSOR;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-					if ((ch == '{') || (ch == '}')) {
-						levelCurrent += (ch == '{') ? 1 : -1;
-					}
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	if (fold) {
-		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-		//styler.SetLevel(lineCurrent, levelCurrent | flagsNext);
-		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-		
-	}
-}
-
-LexerModule lmCPP(SCLEX_CPP, ColouriseCppDoc);

src/stc/scintilla/src/LexOthers.cxx

@@ -1,200 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexOthers.cxx - lexers for properties files, batch files, make files and error lists
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseBatchLine(char *lineBuffer, int endLine, StylingContext &styler) {
-	if (0 == strncmp(lineBuffer, "REM", 3)) {
-		styler.ColourTo(endLine, 1);
-	} else if (0 == strncmp(lineBuffer, "rem", 3)) {
-		styler.ColourTo(endLine, 1);
-	} else if (0 == strncmp(lineBuffer, "SET", 3)) {
-		styler.ColourTo(endLine, 2);
-	} else if (0 == strncmp(lineBuffer, "set", 3)) {
-		styler.ColourTo(endLine, 2);
-	} else if (lineBuffer[0] == ':') {
-		styler.ColourTo(endLine, 3);
-	} else {
-		styler.ColourTo(endLine, 0);
-	}
-}
-
-static void ColouriseBatchDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseBatchLine(lineBuffer, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseBatchLine(lineBuffer, startPos + length, styler);
-}
-
-static void ColourisePropsLine(char *lineBuffer, int lengthLine, int startLine, int endPos, StylingContext &styler) {
-	int i = 0;
-	while (isspace(lineBuffer[i]) && (i < lengthLine))	// Skip initial spaces
-		i++;
-	if (lineBuffer[i] == '#' || lineBuffer[i] == '!' || lineBuffer[i] == ';') {
-		styler.ColourTo(endPos, 1);
-	} else if (lineBuffer[i] == '[') {
-		styler.ColourTo(endPos, 2);
-	} else if (lineBuffer[i] == '@') {
-		styler.ColourTo(startLine+i, 4);
-		if (lineBuffer[++i] == '=')
-			styler.ColourTo(startLine+i, 3);
-		styler.ColourTo(endPos, 0);
-	} else {
-		while (lineBuffer[i] != '=' && (i < lengthLine))	// Search the '=' character
-			i++;
-		if (lineBuffer[i] == '=') {
-			styler.ColourTo(startLine+i-1, 0);
-			styler.ColourTo(startLine+i, 3);
-			styler.ColourTo(endPos, 0);
-		} else {
-			styler.ColourTo(endPos, 0);
-		}
-	}
-}
-
-static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	int startLine = startPos;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if ((styler[i] == '\r' && styler.SafeGetCharAt(i+1) != '\n') || 
-			styler[i] == '\n' || 
-			(linePos >= sizeof(lineBuffer) - 1)) {
-			lineBuffer[linePos] = '\0';
-			ColourisePropsLine(lineBuffer, linePos, startLine, i, styler);
-			linePos = 0;
-			startLine = i+1;
-		}
-	}
-	if (linePos > 0)
-		ColourisePropsLine(lineBuffer, linePos, startLine, startPos + length, styler);
-}
-
-static void ColouriseMakeLine(char *lineBuffer, int lengthLine, int endPos, StylingContext &styler) {
-	int i = 0;
-	while (isspace(lineBuffer[i]) && (i < lengthLine))
-		i++;
-	if (lineBuffer[i] == '#' || lineBuffer[i] == '!') {
-		styler.ColourTo(endPos, 1);
-	} else {
-		styler.ColourTo(endPos, 0);
-	}
-}
-
-static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseMakeLine(lineBuffer, linePos, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseMakeLine(lineBuffer, linePos, startPos + length, styler);
-}
-
-static void ColouriseErrorListLine(char *lineBuffer, int lengthLine, int endPos, StylingContext &styler) {
-	if (lineBuffer[0] == '>') {
-		// Command or return status
-		styler.ColourTo(endPos, 4);
-	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
-		styler.ColourTo(endPos, 1);
-	} else if (0 == strncmp(lineBuffer, "Error ", strlen("Error "))) {
-		// Borland error message
-		styler.ColourTo(endPos, 5);
-	} else if (0 == strncmp(lineBuffer, "Warning ", strlen("Warning "))) {
-		// Borland warning message
-		styler.ColourTo(endPos, 5);
-	} else {
-		// Look for <filename>:<line>:message
-		// Look for <filename>(line)message
-		// Look for <filename>(line,pos)message
-		int state = 0;
-		for (int i = 0; i < lengthLine; i++) {
-			if (state == 0 && lineBuffer[i] == ':' && isdigit(lineBuffer[i + 1])) {
-				state = 1;
-			} else if (state == 0 && lineBuffer[i] == '(') {
-				state = 10;
-			} else if (state == 1 && isdigit(lineBuffer[i])) {
-				state = 2;
-			} else if (state == 2 && lineBuffer[i] == ':') {
-				state = 3;
-				break;
-			} else if (state == 2 && !isdigit(lineBuffer[i])) {
-				state = 99;
-			} else if (state == 10 && isdigit(lineBuffer[i])) {
-				state = 11;
-			} else if (state == 11 && lineBuffer[i] == ',') {
-				state = 14;
-			} else if (state == 11 && lineBuffer[i] == ')') {
-				state = 12;
-				break;
-			} else if (state == 12 && lineBuffer[i] == ':') {
-				state = 13;
-			} else if (state == 14 && lineBuffer[i] == ')') {
-				state = 15;
-				break;
-			} else if (((state == 11) || (state == 14)) && !((lineBuffer[i] == ' ') || isdigit(lineBuffer[i]))) {
-				state = 99;
-			}
-		}
-		if (state == 3) {
-			styler.ColourTo(endPos, 2);
-		} else if ((state == 14) || (state == 15)) {
-			styler.ColourTo(endPos, 3);
-		} else {
-			styler.ColourTo(endPos, 0);
-		}
-	}
-}
-
-static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], StylingContext &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i <= startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseErrorListLine(lineBuffer, linePos, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseErrorListLine(lineBuffer, linePos, startPos + length, styler);
-}
-
-LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc);
-LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc);
-LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc);
-LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc);

src/stc/scintilla/src/LexPerl.cxx

@@ -1,488 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexPerl.cxx - lexer for subset of Perl
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-inline bool isPerlOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' || ch == '\\' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	return false;
-}
-
-static int classifyWordPerl(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_PL_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_PL_NUMBER;
-	else {
-		if (keywords.InList(s))
-			chAttr = SCE_PL_WORD;
-	}
-	styler.ColourTo(end, chAttr);
-	return chAttr;
-}
-
-static bool isEndVar(char ch) {
-	return !isalnum(ch) && ch != '#' && ch != '$' &&
-	       ch != '_' && ch != '\'';
-}
-
-static bool isMatch(StylingContext &styler, int lengthDoc, int pos, const char *val) {
-	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
-		return false;
-	}
-	while (*val) {
-		if (*val != styler[pos++]) {
-			return false;
-		}
-		val++;
-	}
-	return true;
-}
-
-static bool isOKQuote(char ch) {
-	if (isalnum(ch))
-		return false;
-	if (isspace(ch))
-		return false;
-	if (iscntrl(ch))
-		return false;
-	return true;
-}
-
-static char opposite(char ch) {
-	if (ch == '(')
-		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
-	if (ch == '<')
-		return '>';
-	return ch;
-}
-
-static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
-                             WordList *keywordlists[], StylingContext &styler) {
-
-	// Lexer for perl often has to backtrack to start of current style to determine
-	// which characters are being used as quotes, how deeply nested is the
-	// start position and what the termination string is for here documents
-	
-	WordList &keywords = *keywordlists[0];
-	
-	char sooked[100];
-	int quotes = 0;
-	char quoteDown = 'd';
-	char quoteUp = 'd';
-	int quoteRep = 1;
-	int sookedpos = 0;
-	bool preferRE = true;
-	sooked[sookedpos] = '\0';
-	int state = initStyle;
-	int lengthDoc = startPos + length;
-	// If in a long distance lexical state, seek to the beginning  to find quote characters
-	if (state == SCE_PL_HERE || state == SCE_PL_REGEX || 
-		state == SCE_PL_REGSUBST || state == SCE_PL_LONGQUOTE) {
-		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == state)) {
-			startPos--;
-		}
-		state = SCE_PL_DEFAULT;
-	}
-	styler.StartAt(startPos);
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	for (int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		char chNext2 = styler.SafeGetCharAt(i + 2);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_PL_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				if (ch == 's' && !isalnum(chNext)) {
-					state = SCE_PL_REGSUBST;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 2;
-				} else if (ch == 'm' && !isalnum(chNext)) {
-					state = SCE_PL_REGEX;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 1;
-				} else if (ch == 't' && chNext == 'r' && !isalnum(chNext2)) {
-					state = SCE_PL_REGSUBST;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 2;
-					i++;
-					chNext = chNext2;
-				} else if (ch == 'q' && (chNext == 'q' || chNext == 'r' || chNext == 'w' || chNext == 'x') && !isalnum(chNext2)) {
-					state = SCE_PL_LONGQUOTE;
-					i++;
-					chNext = chNext2;
-					quotes = 0;
-					quoteUp = '\0';
-					quoteDown = '\0';
-					quoteRep = 1;
-				} else {
-					state = SCE_PL_WORD;
-					preferRE = false;
-				}
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_STRING;
-			} else if (ch == '\'') {
-				if (chPrev == '&') {
-					// Archaic call
-					styler.ColourTo(i, state);
-				} else {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_CHARACTER;
-				}
-			} else if (ch == '`') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_BACKTICKS;
-			} else if (ch == '$') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalnum(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_SCALAR;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_SCALAR);
-					i++;
-					ch = ' ';
-					chNext = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_SCALAR);
-				}
-			} else if (ch == '@') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_ARRAY;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-					i++;
-					ch = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-				}
-			} else if (ch == '%') {
-				preferRE = false;
-				styler.ColourTo(i - 1, state);
-				if (isalpha(chNext) || chNext == '#' || chNext == '$' || chNext == '_') {
-					state = SCE_PL_HASH;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_HASH);
-					i++;
-					ch = ' ';
-				} else {
-					styler.ColourTo(i, SCE_PL_HASH);
-				}
-			} else if (ch == '*') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_SYMBOLTABLE;
-			} else if (ch == '/' && preferRE) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_REGEX;
-				quoteUp = '/';
-				quoteDown = '/';
-				quotes = 1;
-				quoteRep = 1;
-			} else if (ch == '<' && chNext == '<') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_HERE;
-				i++;
-				ch = chNext;
-				chNext = chNext2;
-				quotes = 0;
-				sookedpos = 0;
-				sooked[sookedpos] = '\0';
-			} else if (ch == '=' && isalpha(chNext)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_PL_POD;
-				quotes = 0;
-				sookedpos = 0;
-				sooked[sookedpos] = '\0';
-			} else if (isPerlOperator(ch)) {
-				if (ch == ')' || ch == ']')
-					preferRE = false;
-				else
-					preferRE = true;
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_PL_OPERATOR);
-			}
-		} else if (state == SCE_PL_WORD) {
-			if (!iswordchar(ch) && ch != '\'') {	// Archaic Perl has quotes inside names
-				if (isMatch(styler, lengthDoc, styler.GetStartSegment(), "__DATA__")) {
-					styler.ColourTo(i, SCE_PL_DATASECTION);
-					state = SCE_PL_DATASECTION;
-				} else if (isMatch(styler, lengthDoc, styler.GetStartSegment(), "__END__")) {
-					styler.ColourTo(i, SCE_PL_DATASECTION);
-					state = SCE_PL_DATASECTION;
-				} else {
-					if (classifyWordPerl(styler.GetStartSegment(), i - 1, keywords, styler) == SCE_PL_WORD)
-						preferRE = true;
-					state = SCE_PL_DEFAULT;
-					if (ch == '#') {
-						state = SCE_PL_COMMENTLINE;
-					} else if (ch == '\"') {
-						state = SCE_PL_STRING;
-					} else if (ch == '\'') {
-						state = SCE_PL_CHARACTER;
-					} else if (ch == '<' && chNext == '<') {
-						state = SCE_PL_HERE;
-						quotes = 0;
-						sookedpos = 0;
-						sooked[sookedpos] = '\0';
-					} else if (isPerlOperator(ch)) {
-						if (ch == ')' || ch == ']')
-							preferRE = false;
-						else
-							preferRE = true;
-						styler.ColourTo(i, SCE_PL_OPERATOR);
-						state = SCE_PL_DEFAULT;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_PL_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_HERE) {
-				if (isalnum(ch) && quotes < 2) {
-					sooked[sookedpos++] = ch;
-					sooked[sookedpos] = '\0';
-					if (quotes == 0)
-						quotes = 1;
-				} else {
-					quotes++;
-				}
-
-				if (quotes > 1 && isMatch(styler, lengthDoc, i, sooked)) {
-					styler.ColourTo(i + sookedpos - 1, SCE_PL_HERE);
-					state = SCE_PL_DEFAULT;
-					i += sookedpos;
-					chNext = ' ';
-				}
-			} else if (state == SCE_PL_STRING) {
-				if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_CHARACTER) {
-				if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_BACKTICKS) {
-				if (ch == '`') {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_POD) {
-				if (ch == '=') {
-					if (isMatch(styler, lengthDoc, i, "=cut")) {
-						styler.ColourTo(i - 1 + 4, state);
-						i += 4;
-						state = SCE_PL_DEFAULT;
-						chNext = ' ';
-						ch = ' ';
-					}
-				}
-			} else if (state == SCE_PL_SCALAR) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_ARRAY) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_HASH) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_SYMBOLTABLE) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_REF) {
-				if (isEndVar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_REGEX) {
-				if (!quoteUp && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(ch);
-					quotes++;
-				} else {
-					if (ch == quoteDown && chPrev != '\\') {
-						quotes--;
-						if (quotes == 0) {
-							quoteRep--;
-							if (quoteUp == quoteDown) {
-								quotes++;
-							}
-						}
-						if (!isalpha(chNext)) {
-							if (quoteRep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-					} else if (ch == quoteUp && chPrev != '\\') {
-						quotes++;
-					} else if (!isalpha(chNext)) {
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_REGSUBST) {
-				if (!quoteUp && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(ch);
-					quotes++;
-				} else {
-					if (ch == quoteDown && chPrev != '\\') {
-						quotes--;
-						if (quotes == 0) {
-							quoteRep--;
-						}
-						if (!isalpha(chNext)) {
-							if (quoteRep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-						if (quoteUp == quoteDown) {
-							quotes++;
-						}
-					} else if (ch == quoteUp && chPrev != '\\') {
-						quotes++;
-					} else if (!isalpha(chNext)) {
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_LONGQUOTE) {
-				if (!quoteDown && !isspace(ch)) {
-					quoteUp = ch;
-					quoteDown = opposite(quoteUp);
-					quotes++;
-				} else if (ch == quoteDown) {
-					quotes--;
-					if (quotes == 0) {
-						quoteRep--;
-						if (quoteRep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-						if (quoteUp == quoteDown) {
-							quotes++;
-						}
-					}
-				} else if (ch == quoteUp) {
-					quotes++;
-				}
-			}
-
-			if (state == SCE_PL_DEFAULT) {    // One of the above succeeded
-				if (ch == '#') {
-					state = SCE_PL_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_PL_STRING;
-				} else if (ch == '\'') {
-					state = SCE_PL_CHARACTER;
-				} else if (iswordstart(ch)) {
-					state = SCE_PL_WORD;
-					preferRE = false;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_PL_OPERATOR);
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc, state);
-}
-
-LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc);

src/stc/scintilla/src/LexPython.cxx

@@ -1,254 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexPython.cxx - lexer for Python
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void classifyWordPy(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler, char *prevWord) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]);
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_P_IDENTIFIER;
-	if (0 == strcmp(prevWord, "class"))
-		chAttr = SCE_P_CLASSNAME;
-	else if (0 == strcmp(prevWord, "def"))
-		chAttr = SCE_P_DEFNAME;
-	else if (wordIsNumber)
-		chAttr = SCE_P_NUMBER;
-	else if (keywords.InList(s))
-		chAttr = SCE_P_WORD;
-	styler.ColourTo(end, chAttr);
-	strcpy(prevWord, s);
-}
-
-static bool IsPyComment(StylingContext &styler, int pos, int len) {
-	return len>0 && styler[pos]=='#';
-}
-
-static void ColourisePyDoc(unsigned int startPos, int length, int initStyle, 
-						   WordList *keywordlists[], StylingContext &styler) {
-
-	// Python uses a different mask because bad indentation is marked by oring with 32
-	styler.StartAt(startPos, 127);
-	
-	WordList &keywords = *keywordlists[0];
-	
-	//Platform::DebugPrintf("Python coloured\n");
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int whingeLevel = styler.GetPropSet().GetInt("tab.timmy.whinge.level");
-	char prevWord[200];
-	prevWord[0] = '\0';
-	if (length == 0)
-		return ;
-	int lineCurrent = styler.GetLine(startPos);
-	int spaceFlags = 0;
-	// TODO: Need to check previous line for indentation for both folding and bad indentation
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
-
-	int state = initStyle & 31;
-	char chPrev = ' ';
-	char chPrev2 = ' ';
-	char chNext = styler[startPos];
-	char chNext2 = styler[startPos];
-	styler.StartSegment(startPos);
-	int lengthDoc = startPos + length;
-	bool atStartLine = true;
-	for (int i = startPos; i <= lengthDoc; i++) {
-	
-		if (atStartLine) {
-			if (whingeLevel == 1) {
-				styler.SetFlags((spaceFlags & wsInconsistent) ? 64 : 0, state);
-			} else if (whingeLevel == 2) {
-				styler.SetFlags((spaceFlags & wsSpaceTab) ? 64 : 0, state);
-			} else if (whingeLevel == 3) {
-				styler.SetFlags((spaceFlags & wsSpace) ? 64 : 0, state);
-			} else if (whingeLevel == 4) {
-				styler.SetFlags((spaceFlags & wsTab) ? 64 : 0, state);
-			}
-			atStartLine = false;
-		}
-		
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		chNext2 = styler.SafeGetCharAt(i + 2);
-		
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) {
-			if ((state == SCE_P_DEFAULT) || (state == SCE_P_TRIPLE) || (state == SCE_P_TRIPLEDOUBLE)) {
-				// Perform colourisation of white space and triple quoted strings at end of each line to allow
-				// tab marking to work inside white space and triple quoted strings
-				styler.ColourTo(i, state);
-			}
-
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsPyComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsPyComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			if (fold) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			atStartLine = true;
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			chPrev2 = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_P_STRINGEOL) {
-			if (ch != '\r' && ch != '\n') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_P_DEFAULT;
-			}
-		}
-		if (state == SCE_P_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_P_WORD;
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				state = chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				if (chNext == '\"' && chNext2 == '\"') {
-					i += 2;
-					state = SCE_P_TRIPLEDOUBLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					state = SCE_P_STRING;
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				if (chNext == '\'' && chNext2 == '\'') {
-					i += 2;
-					state = SCE_P_TRIPLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					state = SCE_P_CHARACTER;
-				}
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_P_OPERATOR);
-			}
-		} else if (state == SCE_P_WORD) {
-			if (!iswordchar(ch)) {
-				classifyWordPy(styler.GetStartSegment(), i - 1, keywords, styler, prevWord);
-				state = SCE_P_DEFAULT;
-				if (ch == '#') {
-					state = chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE;
-				} else if (ch == '\"') {
-					if (chNext == '\"' && chNext2 == '\"') {
-						i += 2;
-						state = SCE_P_TRIPLEDOUBLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_P_STRING;
-					}
-				} else if (ch == '\'') {
-					if (chNext == '\'' && chNext2 == '\'') {
-						i += 2;
-						state = SCE_P_TRIPLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_P_CHARACTER;
-					}
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_P_OPERATOR);
-				}
-			}
-		} else {
-			if (state == SCE_P_COMMENTLINE || state == SCE_P_COMMENTBLOCK) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_STRING) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_CHARACTER) {
-				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_P_STRINGEOL;
-				} else if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_TRIPLE) {
-				if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			} else if (state == SCE_P_TRIPLEDOUBLE) {
-				if (ch == '\"' && chPrev == '\"' && chPrev2 == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_P_DEFAULT;
-				}
-			}
-		}
-		chPrev2 = chPrev;
-		chPrev = ch;
-	}
-	if (state == SCE_P_WORD) {
-		classifyWordPy(styler.GetStartSegment(), lengthDoc, keywords, styler, prevWord);
-	} else {
-		styler.ColourTo(lengthDoc, state);
-	}
-}
-
-LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc);

src/stc/scintilla/src/LexSQL.cxx

@@ -1,158 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexSQL.cxx - lexer for SQL
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void classifyWordSQL(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = toupper(styler[start + i]);
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_IDENTIFIER;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s))
-			chAttr = SCE_C_WORD;
-	}
-	styler.ColourTo(end, chAttr);
-}
-
-static void ColouriseSQLDoc(unsigned int startPos, int length,
-                            int initStyle, WordList *keywordlists[], StylingContext &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-
-	bool fold = styler.GetPropSet().GetInt("fold");
-	int lineCurrent = styler.GetLine(startPos);
-	int spaceFlags = 0;
-	int indentCurrent = 0;
-
-	int state = initStyle;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	unsigned int lengthDoc = startPos + length;
-	bool prevCr = false;
-	for (unsigned int i = startPos; i <= lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
-			indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
-			int lev = indentCurrent;
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
-				if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				}
-			}
-			if (fold) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_WORD;
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENT;
-			} else if (ch == '-' && chNext == '-') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_STRING;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				classifyWordSQL(styler.GetStartSegment(), i - 1, keywords, styler);
-				state = SCE_C_DEFAULT;
-				if (ch == '/' && chNext == '*') {
-					state = SCE_C_COMMENT;
-				} else if (ch == '-' && chNext == '-') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\'') {
-					state = SCE_C_STRING;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-				}
-			}
-		} else {
-			if (state == SCE_C_COMMENT) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > (styler.GetStartSegment() + 2)) || ((initStyle == SCE_C_COMMENT) &&
-					    (styler.GetStartSegment() == startPos)))) {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				if (ch == '\'') {
-					if ( chNext == '\'' ) {
-						i++;
-					} else {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-						i++;
-					}
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '/' && chNext == '*') {
-					state = SCE_C_COMMENT;
-				} else if (ch == '-' && chNext == '-') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\'') {
-					state = SCE_C_STRING;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc);

src/stc/scintilla/src/LexVB.cxx

@@ -1,118 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexVB.cxx - lexer for Visual Basic and VBScript
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h> 
-#include <string.h> 
-#include <ctype.h> 
-#include <stdio.h> 
-#include <stdarg.h> 
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static int classifyWordVB(unsigned int start, unsigned int end, WordList &keywords, StylingContext &styler) {
-
-	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = tolower(styler[start + i]);
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_C_DEFAULT;
-	if (wordIsNumber)
-		chAttr = SCE_C_NUMBER;
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_C_WORD;
-			if (strcmp(s, "rem") == 0)
-				chAttr = SCE_C_COMMENTLINE;
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	if (chAttr == SCE_C_COMMENTLINE)
-		return SCE_C_COMMENTLINE;
-	else
-		return SCE_C_DEFAULT;
-}
-
-static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], StylingContext &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	
-	styler.StartAt(startPos);
-
-	int state = initStyle;
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	int lengthDoc = startPos + length;
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_WORD;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_STRING;
-			}
-		} else if (state == SCE_C_WORD) {
-			if (!iswordchar(ch)) {
-				state = classifyWordVB(styler.GetStartSegment(), i - 1, keywords, styler);
-				if (state == SCE_C_DEFAULT) {
-					if (ch == '\'') {
-						state = SCE_C_COMMENTLINE;
-					} else if (ch == '\"') {
-						state = SCE_C_STRING;
-					}
-				}
-			}
-		} else {
-			if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					styler.ColourTo(i - 1, state);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_STRING) {
-				// VB doubles quotes to preserve them
-				if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_C_DEFAULT;
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			}
-			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
-				if (ch == '\'') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (iswordstart(ch)) {
-					state = SCE_C_WORD;
-				}
-			}
-		}
-	}
-	styler.ColourTo(lengthDoc, state);
-}
-
-LexerModule lmVB(SCLEX_VB, ColouriseVBDoc);

src/stc/scintilla/src/LineMarker.cxx

@@ -1,125 +0,0 @@
-// Scintilla source code edit control
-// LineMarker.cxx - defines the look of a line marker in the margin 
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "LineMarker.h"
-
-void LineMarker::Draw(Surface *surface, PRectangle &rc) {
-	int minDim = Platform::Minimum(rc.Width(), rc.Height());
-	minDim--;	// Ensure does not go beyond edge
-	int centreX = (rc.right + rc.left) / 2;
-	int centreY = (rc.bottom + rc.top) / 2;
-	int dimOn2 = minDim / 2;
-	int dimOn4 = minDim / 4;
-	if (rc.Width() > (rc.Height() * 2)) {
-		// Wide column is line number so move to left to try to avoid overlapping number
-		centreX = rc.left + dimOn2 + 1;
-	}
-	if (markType == SC_MARK_ROUNDRECT) {
-		PRectangle rcRounded = rc;
-		rcRounded.left = rc.left + 1;
-		rcRounded.right = rc.right - 1;
-		surface->RoundedRectangle(rcRounded, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_CIRCLE) {
-		PRectangle rcCircle;
-		rcCircle.left = centreX - dimOn2;
-		rcCircle.top = centreY - dimOn2;
-		rcCircle.right = centreX + dimOn2;
-		rcCircle.bottom = centreY + dimOn2;
-		surface->Ellipse(rcCircle, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_ARROW) {
-		Point pts[] = {
-    		Point(centreX - dimOn4, centreY - dimOn2),
-    		Point(centreX - dimOn4, centreY + dimOn2),
-    		Point(centreX + dimOn2 - dimOn4, centreY),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_ARROWDOWN) {
-		Point pts[] = {
-    		Point(centreX - dimOn2, centreY - dimOn4),
-    		Point(centreX + dimOn2, centreY - dimOn4),
-    		Point(centreX, centreY + dimOn2 - dimOn4),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_PLUS) {
-		int armSize = dimOn2-2;
-		Point xpts[] = {
-    		Point(centreX - armSize, centreY),
-    		Point(centreX, centreY),
-    		Point(centreX, centreY - armSize),
-    		Point(centreX, centreY - armSize),
-    		Point(centreX, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX, centreY),
-    		Point(centreX, centreY + armSize),
-    		Point(centreX, centreY + armSize),
-    		Point(centreX, centreY),
-    		Point(centreX - armSize, centreY),
-		};
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX - 1, centreY - 1),
-    		Point(centreX - 1, centreY - armSize),
-    		Point(centreX + 1, centreY - armSize),
-    		Point(centreX + 1, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX + 1, centreY + 1),
-    		Point(centreX + 1, centreY + armSize),
-    		Point(centreX - 1, centreY + armSize),
-    		Point(centreX - 1, centreY + 1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_MINUS) {
-		int armSize = dimOn2-2;
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		Point xpts[] = {
-    		Point(centreX - armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX + armSize, centreY),
-    		Point(centreX - armSize, centreY),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_SMALLRECT) {
-		PRectangle rcSmall;
-		rcSmall.left = rc.left + 1;
-		rcSmall.top = rc.top + 2;
-		rcSmall.right = rc.right - 1;
-		rcSmall.bottom = rc.bottom - 2;
-		surface->RectangleDraw(rcSmall, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_EMPTY) {
-		// An invisible marker so don't draw anything
-	} else { // SC_MARK_SHORTARROW
-		Point pts[] = {
-			Point(centreX, centreY + dimOn2),
-			Point(centreX + dimOn2, centreY),
-			Point(centreX, centreY - dimOn2),
-			Point(centreX, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY + dimOn4),
-			Point(centreX, centreY + dimOn4),
-			Point(centreX, centreY + dimOn2),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-				fore.allocated, back.allocated);
-	}
-}

src/stc/scintilla/src/LineMarker.h

@@ -1,22 +0,0 @@
-// Scintilla source code edit control
-// LineMarker.h - defines the look of a line marker in the margin 
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef LINEMARKER_H
-#define LINEMARKER_H
-
-class LineMarker {
-public:
-	int markType;
-	ColourPair fore;
-	ColourPair back;
-	LineMarker() {
-		markType = SC_MARK_CIRCLE;
-		fore = Colour(0,0,0);
-		back = Colour(0xff,0xff,0xff);
-	}
-	void Draw(Surface *surface, PRectangle &rc);
-};
-
-#endif