|
From: <mha...@us...> - 2003-11-25 11:01:29
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include
In directory sc8-pr-cvs1:/tmp/cvs-serv12826/include
Modified Files:
Platform.h PropSet.h SString.h SciLexer.h Scintilla.h
Log Message:
New scintilla version.
Index: Platform.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/Platform.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Platform.h 2 Aug 2002 12:53:10 -0000 1.10
--- Platform.h 25 Nov 2003 10:45:20 -0000 1.11
***************
*** 4,8 ****
** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
**/
! // Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
--- 4,8 ----
** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
**/
! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
***************
*** 53,56 ****
--- 53,58 ----
typedef void *MenuID;
typedef void *TickerID;
+ typedef void *Function;
+ typedef void *IdlerID;
/**
***************
*** 105,108 ****
--- 107,116 ----
(bottom > other.top) && (top < other.bottom);
}
+ void Move(int xDelta, int yDelta) {
+ left += xDelta;
+ top += yDelta;
+ right += xDelta;
+ bottom += yDelta;
+ }
int Width() { return right - left; }
int Height() { return bottom - top; }
***************
*** 111,121 ****
/**
* In some circumstances, including Win32 in paletted mode and GTK+, each colour
! * must be allocated before use. The desired colours are held in the ColourDesired class,
* and after allocation the allocation entry is stored in the ColourAllocated class. In other
! * circumstances, such as Win32 in true colour mode, the allocation process just copies
* the RGB values from the desired to the allocated class.
* As each desired colour requires allocation before it can be used, the ColourPair class
* holds both a ColourDesired and a ColourAllocated
! * The Palette class is responsible for managing the palette of colours which contains a
* list of ColourPair objects and performs the allocation.
*/
--- 119,129 ----
/**
* In some circumstances, including Win32 in paletted mode and GTK+, each colour
! * must be allocated before use. The desired colours are held in the ColourDesired class,
* and after allocation the allocation entry is stored in the ColourAllocated class. In other
! * circumstances, such as Win32 in true colour mode, the allocation process just copies
* the RGB values from the desired to the allocated class.
* As each desired colour requires allocation before it can be used, the ColourPair class
* holds both a ColourDesired and a ColourAllocated
! * The Palette class is responsible for managing the palette of colours which contains a
* list of ColourPair objects and performs the allocation.
*/
***************
*** 130,158 ****
co = lcol;
}
!
ColourDesired(unsigned int red, unsigned int green, unsigned int blue) {
! co = red | (green << 8) | (blue << 16);
}
!
bool operator==(const ColourDesired &other) const {
return co == other.co;
}
!
void Set(long lcol) {
co = lcol;
}
!
long AsLong() const {
return co;
}
!
unsigned int GetRed() {
return co & 0xff;
}
!
unsigned int GetGreen() {
return (co >> 8) & 0xff;
}
!
unsigned int GetBlue() {
return (co >> 16) & 0xff;
--- 138,191 ----
co = lcol;
}
!
ColourDesired(unsigned int red, unsigned int green, unsigned int blue) {
! Set(red, green, blue);
}
!
bool operator==(const ColourDesired &other) const {
return co == other.co;
}
!
void Set(long lcol) {
co = lcol;
}
!
! void Set(unsigned int red, unsigned int green, unsigned int blue) {
! co = red | (green << 8) | (blue << 16);
! }
!
! static inline unsigned int ValueOfHex(const char ch) {
! if (ch >= '0' && ch <= '9')
! return ch - '0';
! else if (ch >= 'A' && ch <= 'F')
! return ch - 'A' + 10;
! else if (ch >= 'a' && ch <= 'f')
! return ch - 'a' + 10;
! else
! return 0;
! }
!
! void Set(const char *val) {
! if (*val == '#') {
! val++;
! }
! unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
! unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
! unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
! Set(r, g, b);
! }
!
long AsLong() const {
return co;
}
!
unsigned int GetRed() {
return co & 0xff;
}
!
unsigned int GetGreen() {
return (co >> 8) & 0xff;
}
!
unsigned int GetBlue() {
return (co >> 16) & 0xff;
***************
*** 165,169 ****
class ColourAllocated {
long coAllocated;
!
public:
--- 198,202 ----
class ColourAllocated {
long coAllocated;
!
public:
***************
*** 171,179 ****
coAllocated = lcol;
}
!
void Set(long lcol) {
coAllocated = lcol;
}
!
long AsLong() const {
return coAllocated;
--- 204,212 ----
coAllocated = lcol;
}
!
void Set(long lcol) {
coAllocated = lcol;
}
!
long AsLong() const {
return coAllocated;
***************
*** 192,195 ****
--- 225,231 ----
allocated.Set(desired.AsLong());
}
+ void Copy() {
+ allocated.Set(desired.AsLong());
+ }
};
***************
*** 266,272 ****
static Surface *Allocate();
! virtual void Init()=0;
! virtual void Init(SurfaceID sid)=0;
! virtual void InitPixMap(int width, int height, Surface *surface_)=0;
virtual void Release()=0;
--- 302,308 ----
static Surface *Allocate();
! virtual void Init(WindowID wid)=0;
! virtual void Init(SurfaceID sid, WindowID wid)=0;
! virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid)=0;
virtual void Release()=0;
***************
*** 287,290 ****
--- 323,327 ----
virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
+ virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore)=0;
virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions)=0;
virtual int WidthText(Font &font_, const char *s, int len)=0;
***************
*** 302,305 ****
--- 339,343 ----
virtual void SetUnicodeMode(bool unicodeMode_)=0;
+ virtual void SetDBCSMode(int codePage)=0;
};
***************
*** 324,329 ****
return *this;
}
! WindowID GetID() { return id; }
! bool Created() { return id != 0; }
void Destroy();
bool HasFocus();
--- 362,367 ----
return *this;
}
! WindowID GetID() const { return id; }
! bool Created() const { return id != 0; }
void Destroy();
bool HasFocus();
***************
*** 336,340 ****
void InvalidateRectangle(PRectangle rc);
virtual void SetFont(Font &font);
! enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow };
void SetCursor(Cursor curs);
void SetTitle(const char *s);
--- 374,378 ----
void InvalidateRectangle(PRectangle rc);
virtual void SetFont(Font &font);
! enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
void SetCursor(Cursor curs);
void SetTitle(const char *s);
***************
*** 348,383 ****
class ListBox : public Window {
- private:
- #if PLAT_GTK
- WindowID list;
- WindowID scroller;
- int current;
- #endif
- int desiredVisibleRows;
- unsigned int maxItemCharacters;
- unsigned int aveCharWidth;
- public:
- CallBackAction doubleClickAction;
- void *doubleClickActionData;
public:
ListBox();
virtual ~ListBox();
! void Create(Window &parent, int ctrlID);
! virtual void SetFont(Font &font);
! void SetAverageCharWidth(int width);
! void SetVisibleRows(int rows);
! PRectangle GetDesiredRect();
! 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();
! void SetDoubleClickAction(CallBackAction action, void *data) {
! doubleClickAction = action;
! doubleClickActionData = data;
! }
};
--- 386,410 ----
class ListBox : public Window {
public:
ListBox();
virtual ~ListBox();
! static ListBox *Allocate();
!
! virtual void SetFont(Font &font)=0;
! virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0;
! virtual void SetAverageCharWidth(int width)=0;
! virtual void SetVisibleRows(int rows)=0;
! virtual PRectangle GetDesiredRect()=0;
! virtual int CaretFromEdge()=0;
! virtual void Clear()=0;
! virtual void Append(char *s, int type = -1)=0;
! virtual int Length()=0;
! virtual void Select(int n)=0;
! virtual int GetSelection()=0;
! virtual int Find(const char *prefix)=0;
! virtual void GetValue(int n, char *value, int len)=0;
! virtual void RegisterImage(int type, const char *xpm_data)=0;
! virtual void ClearRegisteredImages()=0;
! virtual void SetDoubleClickAction(CallBackAction, void *)=0;
};
***************
*** 404,407 ****
--- 431,451 ----
/**
+ * Dynamic Library (DLL/SO/...) loading
+ */
+ class DynamicLibrary {
+ public:
+ virtual ~DynamicLibrary() {};
+
+ /// @return Pointer to function "name", or NULL on failure.
+ virtual Function FindFunction(const char *name) = 0;
+
+ /// @return true if the library was loaded successfully.
+ virtual bool IsValid() = 0;
+
+ /// @return An instance of a DynamicLibrary subclass with "modulePath" loaded.
+ static DynamicLibrary *Load(const char *modulePath);
+ };
+
+ /**
* 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.
***************
*** 421,424 ****
--- 465,469 ----
static int DefaultFontSize();
static unsigned int DoubleClickTime();
+ static bool MouseButtonBounce();
static void DebugDisplay(const char *s);
static bool IsKeyDown(int key);
***************
*** 428,431 ****
--- 473,478 ----
WindowID w, unsigned int msg, unsigned long wParam=0, void *lParam=0);
static bool IsDBCSLeadByte(int codePage, char ch);
+ static int DBCSCharLength(int codePage, const char *s);
+ static int DBCSCharMaxLength();
// These are utility functions not really tied to a platform
Index: PropSet.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/PropSet.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PropSet.h 2 Aug 2002 12:53:10 -0000 1.9
--- PropSet.h 25 Nov 2003 10:45:20 -0000 1.10
***************
*** 25,33 ****
*/
class PropSet {
! private:
enum { hashRoots=31 };
Property *props[hashRoots];
Property *enumnext;
int enumhash;
public:
PropSet *superPS;
--- 25,43 ----
*/
class PropSet {
! protected:
enum { hashRoots=31 };
Property *props[hashRoots];
Property *enumnext;
int enumhash;
+ static unsigned int HashString(const char *s, size_t len) {
+ unsigned int ret = 0;
+ while (len--) {
+ ret <<= 4;
+ ret ^= *s;
+ s++;
+ }
+ return ret;
+ }
+ static bool IncludesVar(const char *value, const char *key);
public:
PropSet *superPS;
***************
*** 39,43 ****
SString Get(const char *key);
SString GetExpanded(const char *key);
! SString Expand(const char *withVars);
int GetInt(const char *key, int defaultValue=0);
SString GetWild(const char *keybase, const char *filename);
--- 49,53 ----
SString Get(const char *key);
SString GetExpanded(const char *key);
! SString Expand(const char *withVars, int maxExpands=100);
int GetInt(const char *key, int defaultValue=0);
SString GetWild(const char *keybase, const char *filename);
***************
*** 61,65 ****
bool sorted;
int starts[256];
! WordList(bool onlyLineEnds_ = false) :
words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {}
~WordList() { Clear(); }
--- 71,75 ----
bool sorted;
int starts[256];
! WordList(bool onlyLineEnds_ = false) :
words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {}
~WordList() { Clear(); }
***************
*** 71,77 ****
void SetFromAllocated();
bool InList(const char *s);
! const char *GetNearestWord(const char *wordStart, int searchLen = -1,
! bool ignoreCase = false, SString wordCharacters="");
! char *GetNearestWords(const char *wordStart, int searchLen=-1,
bool ignoreCase=false, char otherSeparator='\0');
};
--- 81,87 ----
void SetFromAllocated();
bool InList(const char *s);
! const char *GetNearestWord(const char *wordStart, int searchLen = -1,
! bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
! char *GetNearestWords(const char *wordStart, int searchLen=-1,
bool ignoreCase=false, char otherSeparator='\0');
};
Index: SString.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/SString.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SString.h 2 Aug 2002 12:53:10 -0000 1.3
--- SString.h 25 Nov 2003 10:45:20 -0000 1.4
***************
*** 239,243 ****
}
SString &operator+=(const SString &sOther) {
! return append(sOther.s, sOther.sSize);
}
SString &operator+=(char ch) {
--- 239,243 ----
}
SString &operator+=(const SString &sOther) {
! return append(sOther.s, sOther.sLen);
}
SString &operator+=(char ch) {
Index: SciLexer.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/SciLexer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SciLexer.h 2 Aug 2002 12:53:10 -0000 1.10
--- SciLexer.h 25 Nov 2003 10:45:20 -0000 1.11
***************
*** 49,52 ****
--- 49,72 ----
#define SCLEX_MATLAB 32
#define SCLEX_SCRIPTOL 33
+ #define SCLEX_ASM 34
+ #define SCLEX_CPPNOCASE 35
+ #define SCLEX_FORTRAN 36
+ #define SCLEX_F77 37
+ #define SCLEX_CSS 38
+ #define SCLEX_POV 39
+ #define SCLEX_LOUT 40
+ #define SCLEX_ESCRIPT 41
+ #define SCLEX_PS 42
+ #define SCLEX_NSIS 43
+ #define SCLEX_MMIXAL 44
+ #define SCLEX_CLW 45
+ #define SCLEX_CLWNOCASE 46
+ #define SCLEX_LOT 47
+ #define SCLEX_YAML 48
+ #define SCLEX_TEX 49
+ #define SCLEX_METAPOST 50
+ #define SCLEX_POWERBASIC 51
+ #define SCLEX_FORTH 52
+ #define SCLEX_ERLANG 53
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
***************
*** 83,86 ****
--- 103,107 ----
#define SCE_C_COMMENTDOCKEYWORD 17
#define SCE_C_COMMENTDOCKEYWORDERROR 18
+ #define SCE_C_GLOBALCLASS 19
#define SCE_H_DEFAULT 0
#define SCE_H_TAG 1
***************
*** 260,263 ****
--- 281,286 ----
#define SCE_LUA_WORD5 16
#define SCE_LUA_WORD6 17
+ #define SCE_LUA_WORD7 18
+ #define SCE_LUA_WORD8 19
#define SCE_ERR_DEFAULT 0
#define SCE_ERR_PYTHON 1
***************
*** 274,277 ****
--- 297,303 ----
#define SCE_ERR_DIFF_DELETION 12
#define SCE_ERR_DIFF_MESSAGE 13
+ #define SCE_ERR_PHP 14
+ #define SCE_ERR_ELF 15
+ #define SCE_ERR_IFC 16
#define SCE_BAT_DEFAULT 0
#define SCE_BAT_COMMENT 1
***************
*** 310,315 ****
#define SCE_AVE_NUMBER 2
#define SCE_AVE_WORD 3
- #define SCE_AVE_KEYWORD 4
- #define SCE_AVE_STATEMENT 5
#define SCE_AVE_STRING 6
#define SCE_AVE_ENUM 7
--- 336,339 ----
***************
*** 317,329 ****
#define SCE_AVE_IDENTIFIER 9
#define SCE_AVE_OPERATOR 10
#define SCE_ADA_DEFAULT 0
! #define SCE_ADA_COMMENT 1
! #define SCE_ADA_NUMBER 2
! #define SCE_ADA_WORD 3
! #define SCE_ADA_STRING 4
#define SCE_ADA_CHARACTER 5
! #define SCE_ADA_OPERATOR 6
! #define SCE_ADA_IDENTIFIER 7
#define SCE_ADA_STRINGEOL 8
#define SCE_BAAN_DEFAULT 0
#define SCE_BAAN_COMMENT 1
--- 341,362 ----
#define SCE_AVE_IDENTIFIER 9
#define SCE_AVE_OPERATOR 10
+ #define SCE_AVE_WORD1 11
+ #define SCE_AVE_WORD2 12
+ #define SCE_AVE_WORD3 13
+ #define SCE_AVE_WORD4 14
+ #define SCE_AVE_WORD5 15
+ #define SCE_AVE_WORD6 16
#define SCE_ADA_DEFAULT 0
! #define SCE_ADA_WORD 1
! #define SCE_ADA_IDENTIFIER 2
! #define SCE_ADA_NUMBER 3
! #define SCE_ADA_DELIMITER 4
#define SCE_ADA_CHARACTER 5
! #define SCE_ADA_CHARACTEREOL 6
! #define SCE_ADA_STRING 7
#define SCE_ADA_STRINGEOL 8
+ #define SCE_ADA_LABEL 9
+ #define SCE_ADA_COMMENTLINE 10
+ #define SCE_ADA_ILLEGAL 11
#define SCE_BAAN_DEFAULT 0
#define SCE_BAAN_COMMENT 1
***************
*** 365,368 ****
--- 398,413 ----
#define SCE_NNCRONTAB_ENVIRONMENT 9
#define SCE_NNCRONTAB_IDENTIFIER 10
+ #define SCE_FORTH_DEFAULT 0
+ #define SCE_FORTH_COMMENT 1
+ #define SCE_FORTH_COMMENT_ML 2
+ #define SCE_FORTH_IDENTIFIER 3
+ #define SCE_FORTH_CONTROL 4
+ #define SCE_FORTH_KEYWORD 5
+ #define SCE_FORTH_DEFWORD 6
+ #define SCE_FORTH_PREWORD1 7
+ #define SCE_FORTH_PREWORD2 8
+ #define SCE_FORTH_NUMBER 9
+ #define SCE_FORTH_STRING 10
+ #define SCE_FORTH_LOCALE 11
#define SCE_MATLAB_DEFAULT 0
#define SCE_MATLAB_COMMENT 1
***************
*** 374,396 ****
#define SCE_MATLAB_IDENTIFIER 7
#define SCE_SCRIPTOL_DEFAULT 0
! #define SCE_SCRIPTOL_COMMENT 1
#define SCE_SCRIPTOL_COMMENTLINE 2
! #define SCE_SCRIPTOL_COMMENTDOC 3
! #define SCE_SCRIPTOL_NUMBER 4
! #define SCE_SCRIPTOL_WORD 5
! #define SCE_SCRIPTOL_STRING 6
! #define SCE_SCRIPTOL_CHARACTER 7
! #define SCE_SCRIPTOL_UUID 8
! #define SCE_SCRIPTOL_PREPROCESSOR 9
! #define SCE_SCRIPTOL_OPERATOR 10
! #define SCE_SCRIPTOL_IDENTIFIER 11
! #define SCE_SCRIPTOL_STRINGEOL 12
! #define SCE_SCRIPTOL_VERBATIM 13
! #define SCE_SCRIPTOL_REGEX 14
! #define SCE_SCRIPTOL_COMMENTLINEDOC 15
! #define SCE_SCRIPTOL_WORD2 16
! #define SCE_SCRIPTOL_COMMENTDOCKEYWORD 17
! #define SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
! #define SCE_SCRIPTOL_COMMENTBASIC 19
//--Autogenerated -- end of section automatically generated from Scintilla.iface
--- 419,629 ----
#define SCE_MATLAB_IDENTIFIER 7
#define SCE_SCRIPTOL_DEFAULT 0
! #define SCE_SCRIPTOL_WHITE 1
#define SCE_SCRIPTOL_COMMENTLINE 2
! #define SCE_SCRIPTOL_PERSISTENT 3
! #define SCE_SCRIPTOL_CSTYLE 4
! #define SCE_SCRIPTOL_COMMENTBLOCK 5
! #define SCE_SCRIPTOL_NUMBER 6
! #define SCE_SCRIPTOL_STRING 7
! #define SCE_SCRIPTOL_CHARACTER 8
! #define SCE_SCRIPTOL_STRINGEOL 9
! #define SCE_SCRIPTOL_KEYWORD 10
! #define SCE_SCRIPTOL_OPERATOR 11
! #define SCE_SCRIPTOL_IDENTIFIER 12
! #define SCE_SCRIPTOL_TRIPLE 13
! #define SCE_SCRIPTOL_CLASSNAME 14
! #define SCE_SCRIPTOL_PREPROCESSOR 15
! #define SCE_ASM_DEFAULT 0
! #define SCE_ASM_COMMENT 1
! #define SCE_ASM_NUMBER 2
! #define SCE_ASM_STRING 3
! #define SCE_ASM_OPERATOR 4
! #define SCE_ASM_IDENTIFIER 5
! #define SCE_ASM_CPUINSTRUCTION 6
! #define SCE_ASM_MATHINSTRUCTION 7
! #define SCE_ASM_REGISTER 8
! #define SCE_ASM_DIRECTIVE 9
! #define SCE_ASM_DIRECTIVEOPERAND 10
! #define SCE_ASM_COMMENTBLOCK 11
! #define SCE_ASM_CHARACTER 12
! #define SCE_ASM_STRINGEOL 13
! #define SCE_ASM_EXTINSTRUCTION 14
! #define SCE_F_DEFAULT 0
! #define SCE_F_COMMENT 1
! #define SCE_F_NUMBER 2
! #define SCE_F_STRING1 3
! #define SCE_F_STRING2 4
! #define SCE_F_STRINGEOL 5
! #define SCE_F_OPERATOR 6
! #define SCE_F_IDENTIFIER 7
! #define SCE_F_WORD 8
! #define SCE_F_WORD2 9
! #define SCE_F_WORD3 10
! #define SCE_F_PREPROCESSOR 11
! #define SCE_F_OPERATOR2 12
! #define SCE_F_LABEL 13
! #define SCE_F_CONTINUATION 14
! #define SCE_CSS_DEFAULT 0
! #define SCE_CSS_TAG 1
! #define SCE_CSS_CLASS 2
! #define SCE_CSS_PSEUDOCLASS 3
! #define SCE_CSS_UNKNOWN_PSEUDOCLASS 4
! #define SCE_CSS_OPERATOR 5
! #define SCE_CSS_IDENTIFIER 6
! #define SCE_CSS_UNKNOWN_IDENTIFIER 7
! #define SCE_CSS_VALUE 8
! #define SCE_CSS_COMMENT 9
! #define SCE_CSS_ID 10
! #define SCE_CSS_IMPORTANT 11
! #define SCE_CSS_DIRECTIVE 12
! #define SCE_CSS_DOUBLESTRING 13
! #define SCE_CSS_SINGLESTRING 14
! #define SCE_POV_DEFAULT 0
! #define SCE_POV_COMMENT 1
! #define SCE_POV_COMMENTLINE 2
! #define SCE_POV_NUMBER 3
! #define SCE_POV_OPERATOR 4
! #define SCE_POV_IDENTIFIER 5
! #define SCE_POV_STRING 6
! #define SCE_POV_STRINGEOL 7
! #define SCE_POV_DIRECTIVE 8
! #define SCE_POV_BADDIRECTIVE 9
! #define SCE_POV_WORD2 10
! #define SCE_POV_WORD3 11
! #define SCE_POV_WORD4 12
! #define SCE_POV_WORD5 13
! #define SCE_POV_WORD6 14
! #define SCE_POV_WORD7 15
! #define SCE_POV_WORD8 16
! #define SCE_LOUT_DEFAULT 0
! #define SCE_LOUT_COMMENT 1
! #define SCE_LOUT_NUMBER 2
! #define SCE_LOUT_WORD 3
! #define SCE_LOUT_WORD2 4
! #define SCE_LOUT_WORD3 5
! #define SCE_LOUT_WORD4 6
! #define SCE_LOUT_STRING 7
! #define SCE_LOUT_OPERATOR 8
! #define SCE_LOUT_IDENTIFIER 9
! #define SCE_LOUT_STRINGEOL 10
! #define SCE_ESCRIPT_DEFAULT 0
! #define SCE_ESCRIPT_COMMENT 1
! #define SCE_ESCRIPT_COMMENTLINE 2
! #define SCE_ESCRIPT_COMMENTDOC 3
! #define SCE_ESCRIPT_NUMBER 4
! #define SCE_ESCRIPT_WORD 5
! #define SCE_ESCRIPT_STRING 6
! #define SCE_ESCRIPT_OPERATOR 7
! #define SCE_ESCRIPT_IDENTIFIER 8
! #define SCE_ESCRIPT_BRACE 9
! #define SCE_ESCRIPT_WORD2 10
! #define SCE_ESCRIPT_WORD3 11
! #define SCE_PS_DEFAULT 0
! #define SCE_PS_COMMENT 1
! #define SCE_PS_DSC_COMMENT 2
! #define SCE_PS_DSC_VALUE 3
! #define SCE_PS_NUMBER 4
! #define SCE_PS_NAME 5
! #define SCE_PS_KEYWORD 6
! #define SCE_PS_LITERAL 7
! #define SCE_PS_IMMEVAL 8
! #define SCE_PS_PAREN_ARRAY 9
! #define SCE_PS_PAREN_DICT 10
! #define SCE_PS_PAREN_PROC 11
! #define SCE_PS_TEXT 12
! #define SCE_PS_HEXSTRING 13
! #define SCE_PS_BASE85STRING 14
! #define SCE_PS_BADSTRINGCHAR 15
! #define SCE_NSIS_DEFAULT 0
! #define SCE_NSIS_COMMENT 1
! #define SCE_NSIS_STRINGDQ 2
! #define SCE_NSIS_STRINGLQ 3
! #define SCE_NSIS_STRINGRQ 4
! #define SCE_NSIS_FUNCTION 5
! #define SCE_NSIS_VARIABLE 6
! #define SCE_NSIS_LABEL 7
! #define SCE_NSIS_USERDEFINED 8
! #define SCE_NSIS_SECTIONDEF 9
! #define SCE_NSIS_SUBSECTIONDEF 10
! #define SCE_NSIS_IFDEFINEDEF 11
! #define SCE_NSIS_MACRODEF 12
! #define SCE_NSIS_STRINGVAR 13
! #define SCE_MMIXAL_LEADWS 0
! #define SCE_MMIXAL_COMMENT 1
! #define SCE_MMIXAL_LABEL 2
! #define SCE_MMIXAL_OPCODE 3
! #define SCE_MMIXAL_OPCODE_PRE 4
! #define SCE_MMIXAL_OPCODE_VALID 5
! #define SCE_MMIXAL_OPCODE_UNKNOWN 6
! #define SCE_MMIXAL_OPCODE_POST 7
! #define SCE_MMIXAL_OPERANDS 8
! #define SCE_MMIXAL_NUMBER 9
! #define SCE_MMIXAL_REF 10
! #define SCE_MMIXAL_CHAR 11
! #define SCE_MMIXAL_STRING 12
! #define SCE_MMIXAL_REGISTER 13
! #define SCE_MMIXAL_HEX 14
! #define SCE_MMIXAL_OPERATOR 15
! #define SCE_MMIXAL_SYMBOL 16
! #define SCE_MMIXAL_INCLUDE 17
! #define SCE_CLW_DEFAULT 0
! #define SCE_CLW_LABEL 1
! #define SCE_CLW_COMMENT 2
! #define SCE_CLW_STRING 3
! #define SCE_CLW_USER_IDENTIFIER 4
! #define SCE_CLW_INTEGER_CONSTANT 5
! #define SCE_CLW_REAL_CONSTANT 6
! #define SCE_CLW_PICTURE_STRING 7
! #define SCE_CLW_KEYWORD 8
! #define SCE_CLW_COMPILER_DIRECTIVE 9
! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 10
! #define SCE_CLW_STRUCTURE_DATA_TYPE 11
! #define SCE_CLW_ATTRIBUTE 12
! #define SCE_CLW_STANDARD_EQUATE 13
! #define SCE_CLW_ERROR 14
! #define SCE_LOT_DEFAULT 0
! #define SCE_LOT_HEADER 1
! #define SCE_LOT_BREAK 2
! #define SCE_LOT_SET 3
! #define SCE_LOT_PASS 4
! #define SCE_LOT_FAIL 5
! #define SCE_LOT_ABORT 6
! #define SCE_YAML_DEFAULT 0
! #define SCE_YAML_COMMENT 1
! #define SCE_YAML_IDENTIFIER 2
! #define SCE_YAML_KEYWORD 3
! #define SCE_YAML_NUMBER 4
! #define SCE_YAML_REFERENCE 5
! #define SCE_YAML_DOCUMENT 6
! #define SCE_YAML_TEXT 7
! #define SCE_YAML_ERROR 8
! #define SCE_TEX_DEFAULT 0
! #define SCE_TEX_SPECIAL 1
! #define SCE_TEX_GROUP 2
! #define SCE_TEX_SYMBOL 3
! #define SCE_TEX_COMMAND 4
! #define SCE_TEX_TEXT 5
! #define SCE_METAPOST_DEFAULT 0
! #define SCE_METAPOST_SPECIAL 1
! #define SCE_METAPOST_GROUP 2
! #define SCE_METAPOST_SYMBOL 3
! #define SCE_METAPOST_COMMAND 4
! #define SCE_METAPOST_TEXT 5
! #define SCE_METAPOST_EXTRA 6
! #define SCE_ERLANG_DEFAULT 0
! #define SCE_ERLANG_COMMENT 1
! #define SCE_ERLANG_VARIABLE 2
! #define SCE_ERLANG_NUMBER 3
! #define SCE_ERLANG_KEYWORD 4
! #define SCE_ERLANG_STRING 5
! #define SCE_ERLANG_OPERATOR 6
! #define SCE_ERLANG_ATOM 7
! #define SCE_ERLANG_FUNCTION_NAME 8
! #define SCE_ERLANG_CHARACTER 9
! #define SCE_ERLANG_MACRO 10
! #define SCE_ERLANG_RECORD 11
! #define SCE_ERLANG_SEPARATOR 12
! #define SCE_ERLANG_NODE_NAME 13
! #define SCE_ERLANG_UNKNOWN 31
//--Autogenerated -- end of section automatically generated from Scintilla.iface
Index: Scintilla.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/Scintilla.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Scintilla.h 4 Oct 2002 12:50:02 -0000 1.13
--- Scintilla.h 25 Nov 2003 10:45:20 -0000 1.14
***************
*** 3,7 ****
** Interface to the edit control.
**/
! // Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
--- 3,7 ----
** Interface to the edit control.
**/
! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
***************
*** 84,87 ****
--- 84,88 ----
#define SCI_GETTABWIDTH 2121
#define SC_CP_UTF8 65001
+ #define SC_CP_DBCS 1
#define SCI_SETCODEPAGE 2037
#define SCI_SETUSEPALETTE 2039
***************
*** 112,115 ****
--- 113,117 ----
#define SC_MARK_DOTDOTDOT 23
#define SC_MARK_ARROWS 24
+ #define SC_MARK_PIXMAP 25
#define SC_MARK_CHARACTER 10000
#define SC_MARKNUM_FOLDEREND 25
***************
*** 130,133 ****
--- 132,136 ----
#define SCI_MARKERNEXT 2047
#define SCI_MARKERPREVIOUS 2048
+ #define SCI_MARKERDEFINEPIXMAP 2049
#define SC_MARGIN_SYMBOL 0
#define SC_MARGIN_NUMBER 1
***************
*** 182,185 ****
--- 185,189 ----
#define SCI_STYLESETCASE 2060
#define SCI_STYLESETCHARACTERSET 2066
+ #define SCI_STYLESETHOTSPOT 2409
#define SCI_SETSELFORE 2067
#define SCI_SETSELBACK 2068
***************
*** 201,204 ****
--- 205,210 ----
#define INDIC_DIAGONAL 3
#define INDIC_STRIKE 4
+ #define INDIC_HIDDEN 5
+ #define INDIC_BOX 6
#define INDIC0_MASK 0x20
#define INDIC1_MASK 0x40
***************
*** 242,245 ****
--- 248,255 ----
#define SCI_AUTOCSETDROPRESTOFWORD 2270
#define SCI_AUTOCGETDROPRESTOFWORD 2271
+ #define SCI_REGISTERIMAGE 2405
+ #define SCI_CLEARREGISTEREDIMAGES 2408
+ #define SCI_AUTOCGETTYPESEPARATOR 2285
+ #define SCI_AUTOCSETTYPESEPARATOR 2286
#define SCI_SETINDENT 2122
#define SCI_GETINDENT 2123
***************
*** 279,282 ****
--- 289,293 ----
#define SCFIND_WORDSTART 0x00100000
#define SCFIND_REGEXP 0x00200000
+ #define SCFIND_POSIX 0x00400000
#define SCI_FINDTEXT 2150
#define SCI_FORMATRANGE 2151
***************
*** 334,337 ****
--- 345,350 ----
#define SCI_CALLTIPSETHLT 2204
#define SCI_CALLTIPSETBACK 2205
+ #define SCI_CALLTIPSETFORE 2206
+ #define SCI_CALLTIPSETFOREHLT 2207
#define SCI_VISIBLEFROMDOCLINE 2220
#define SCI_DOCLINEFROMVISIBLE 2221
***************
*** 339,342 ****
--- 352,359 ----
#define SC_FOLDLEVELWHITEFLAG 0x1000
#define SC_FOLDLEVELHEADERFLAG 0x2000
+ #define SC_FOLDLEVELBOXHEADERFLAG 0x4000
+ #define SC_FOLDLEVELBOXFOOTERFLAG 0x8000
+ #define SC_FOLDLEVELCONTRACTED 0x10000
+ #define SC_FOLDLEVELUNINDENT 0x20000
#define SC_FOLDLEVELNUMBERMASK 0x0FFF
#define SCI_SETFOLDLEVEL 2222
***************
*** 351,354 ****
--- 368,377 ----
#define SCI_TOGGLEFOLD 2231
#define SCI_ENSUREVISIBLE 2232
+ #define SC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
+ #define SC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
+ #define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
+ #define SC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
+ #define SC_FOLDFLAG_LEVELNUMBERS 0x0040
+ #define SC_FOLDFLAG_BOX 0x0001
#define SCI_SETFOLDFLAGS 2233
#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
***************
*** 378,381 ****
--- 401,414 ----
#define SCI_GETENDATLASTLINE 2278
#define SCI_TEXTHEIGHT 2279
+ #define SCI_SETVSCROLLBAR 2280
+ #define SCI_GETVSCROLLBAR 2281
+ #define SCI_APPENDTEXT 2282
+ #define SCI_GETTWOPHASEDRAW 2283
+ #define SCI_SETTWOPHASEDRAW 2284
+ #define SCI_TARGETFROMSELECTION 2287
+ #define SCI_LINESJOIN 2288
+ #define SCI_LINESSPLIT 2289
+ #define SCI_SETFOLDMARGINCOLOUR 2290
+ #define SCI_SETFOLDMARGINHICOLOUR 2291
#define SCI_LINEDOWN 2300
#define SCI_LINEDOWNEXTEND 2301
***************
*** 418,421 ****
--- 451,455 ----
#define SCI_LINEDELETE 2338
#define SCI_LINETRANSPOSE 2339
+ #define SCI_LINEDUPLICATE 2404
#define SCI_LOWERCASE 2340
#define SCI_UPPERCASE 2341
***************
*** 427,430 ****
--- 461,471 ----
#define SCI_LINEENDDISPLAY 2347
#define SCI_LINEENDDISPLAYEXTEND 2348
+ #define SCI_HOMEWRAP 2349
+ #define SCI_HOMEWRAPEXTEND 2450
+ #define SCI_LINEENDWRAP 2451
+ #define SCI_LINEENDWRAPEXTEND 2452
+ #define SCI_VCHOMEWRAP 2453
+ #define SCI_VCHOMEWRAPEXTEND 2454
+ #define SCI_LINECOPY 2455
#define SCI_MOVECARETINSIDEVIEW 2401
#define SCI_LINELENGTH 2350
***************
*** 465,469 ****
#define SCI_GETMOUSEDOWNCAPTURES 2385
#define SC_CURSORNORMAL -1
! #define SC_CURSORWAIT 3
#define SCI_SETCURSOR 2386
#define SCI_GETCURSOR 2387
--- 506,510 ----
#define SCI_GETMOUSEDOWNCAPTURES 2385
#define SC_CURSORNORMAL -1
! #define SC_CURSORWAIT 4
#define SCI_SETCURSOR 2386
#define SCI_GETCURSOR 2387
***************
*** 481,484 ****
--- 522,526 ----
#define SCI_SETXOFFSET 2397
#define SCI_GETXOFFSET 2398
+ #define SCI_CHOOSECARETX 2399
#define SCI_GRABFOCUS 2400
#define CARET_SLOP 0x01
***************
*** 488,491 ****
--- 530,573 ----
#define SCI_SETXCARETPOLICY 2402
#define SCI_SETYCARETPOLICY 2403
+ #define SCI_SETPRINTWRAPMODE 2406
+ #define SCI_GETPRINTWRAPMODE 2407
+ #define SCI_SETHOTSPOTACTIVEFORE 2410
+ #define SCI_SETHOTSPOTACTIVEBACK 2411
+ #define SCI_SETHOTSPOTACTIVEUNDERLINE 2412
+ #define SCI_SETHOTSPOTSINGLELINE 2421
+ #define SCI_PARADOWN 2413
+ #define SCI_PARADOWNEXTEND 2414
+ #define SCI_PARAUP 2415
+ #define SCI_PARAUPEXTEND 2416
+ #define SCI_POSITIONBEFORE 2417
+ #define SCI_POSITIONAFTER 2418
+ #define SCI_COPYRANGE 2419
+ #define SCI_COPYTEXT 2420
+ #define SC_SEL_STREAM 0
+ #define SC_SEL_RECTANGLE 1
+ #define SC_SEL_LINES 2
+ #define SCI_SETSELECTIONMODE 2422
+ #define SCI_GETSELECTIONMODE 2423
+ #define SCI_GETLINESELSTARTPOSITION 2424
+ #define SCI_GETLINESELENDPOSITION 2425
+ #define SCI_LINEDOWNRECTEXTEND 2426
+ #define SCI_LINEUPRECTEXTEND 2427
+ #define SCI_CHARLEFTRECTEXTEND 2428
+ #define SCI_CHARRIGHTRECTEXTEND 2429
+ #define SCI_HOMERECTEXTEND 2430
+ #define SCI_VCHOMERECTEXTEND 2431
+ #define SCI_LINEENDRECTEXTEND 2432
+ #define SCI_PAGEUPRECTEXTEND 2433
+ #define SCI_PAGEDOWNRECTEXTEND 2434
+ #define SCI_STUTTEREDPAGEUP 2435
+ #define SCI_STUTTEREDPAGEUPEXTEND 2436
+ #define SCI_STUTTEREDPAGEDOWN 2437
+ #define SCI_STUTTEREDPAGEDOWNEXTEND 2438
+ #define SCI_WORDLEFTEND 2439
+ #define SCI_WORDLEFTENDEXTEND 2440
+ #define SCI_WORDRIGHTEND 2441
+ #define SCI_WORDRIGHTENDEXTEND 2442
+ #define SCI_SETWHITESPACECHARS 2443
+ #define SCI_SETCHARSDEFAULT 2444
#define SCI_STARTRECORD 3001
#define SCI_STOPRECORD 3002
***************
*** 494,499 ****
--- 576,583 ----
#define SCI_COLOURISE 4003
#define SCI_SETPROPERTY 4004
+ #define KEYWORDSET_MAX 8
#define SCI_SETKEYWORDS 4005
#define SCI_SETLEXERLANGUAGE 4006
+ #define SCI_LOADLEXERLIBRARY 4007
#define SC_MOD_INSERTTEXT 0x1
#define SC_MOD_DELETETEXT 0x2
***************
*** 549,552 ****
--- 633,639 ----
#define SCN_DWELLEND 2017
#define SCN_ZOOM 2018
+ #define SCN_HOTSPOTCLICK 2019
+ #define SCN_HOTSPOTDOUBLECLICK 2020
+ #define SCN_CALLTIPCLICK 2021
//--Autogenerated -- end of section automatically generated from Scintilla.iface
|
