Commits June 2007

commits@lists.geany.org

4 participants
67 discussions

SF.net SVN: geany: [1635] trunk
by eht16＠users.sourceforge.net 22 Jun '07

22 Jun '07

Revision: 1635 http://svn.sourceforge.net/geany/?rev=1635&view=rev Author: eht16 Date: 2007-06-22 10:34:31 -0700 (Fri, 22 Jun 2007) Log Message: ----------- Add new filetypes CSharp and FreeBasic. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/msgwindow.c trunk/src/templates.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h Added Paths: ----------- trunk/data/filetypes.cs trunk/data/filetypes.freebasic trunk/scintilla/LexBasic.cxx trunk/tagmanager/basic.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/ChangeLog 2007-06-22 17:34:31 UTC (rev 1635) @@ -1,3 +1,18 @@ +2007-06-22 Enrico Tröger <enrico.troeger(a)uvena.de> + + * tagmanager/c.c, tagmanager/get.c, tagmanager/get.h: + Use get.c and get.h from CTags SVN. + Merged CSharp parser support into from CTags SVN. + * data/filetype_extensions.conf, data/filetypes.cs, + data/filetypes.freebasic, scintilla/KeyWords.cxx, + scintilla/LexBasic.cxx, scintilla/Makefile.am, src/editor.c, + scintilla/makefile.win32, src/filetypes.c, src/filetypes.h, + src/highlighting.c, src/highlighting.h, src/msgwindow.c, + src/templates.c, tagmanager/basic.c, tagmanager/Makefile.am, + tagmanager/makefile.win32, tagmanager/parsers.h: + Add new filetypes CSharp and FreeBasic. + + 2007-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/callbacks.c: Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/data/filetype_extensions.conf 2007-06-22 17:34:31 UTC (rev 1635) @@ -4,9 +4,11 @@ [Extensions] C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; +C#=*.cs;*.lala; D=*.d;*.di; Java=*.java;*.jsp; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; +FreeBasic=*.bas;*.bi; ASM=*.asm; Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95; CAML=*.ml;*.mli; Added: trunk/data/filetypes.cs =================================================================== --- trunk/data/filetypes.cs (rev 0) +++ trunk/data/filetypes.cs 2007-06-22 17:34:31 UTC (rev 1635) @@ -0,0 +1,63 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0x3f5fbf;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +verbatim=0x101030;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0x3f5fbf;0xffffff;true;false +commentdockeyword=0x3f5fbf;0xffffff;true;true +commentdockeyworderror=0x3f5fbf;0xffffff;false;false +globalclass=0x0000d0;0xffffff;true;false +# whether arguments of preprocessor commands should be styled (only first argument is used) +# 1 to enable, 0 to disable +styling_within_preprocessor=1;0;false;false + +[keywords] +# all items must be in one line +primary=abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual void volatile while +secondary= +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=// +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/* +#comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +# be careful following settings are untested +compiler=mcs /t:winexe "%f" /r:System,System.Drawing +run_cmd=mono "%e.exe" Added: trunk/data/filetypes.freebasic =================================================================== --- trunk/data/filetypes.freebasic (rev 0) +++ trunk/data/filetypes.freebasic 2007-06-22 17:34:31 UTC (rev 1635) @@ -0,0 +1,61 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false; +comment=0x808080;0xffffff;false;false; +number=0x007f00;0xffffff;false;false; +word=0x00007f;0xffffff;true;false; +string=0xff901e;0xffffff;false;false; +preprocessor=0x007f7f;0xffffff;false;false; +operator=0x301010;0xffffff;false;false; +identifier=0x000000;0xffffff;false;false; +date=0x1a6500;0xffffff;false;false; +stringeol=0x000000;0xe0c0e0;false;false; +word2=0x007f7f;0xffffff;true;false; +word3=0x991111;0xffffff;false;false; +word4=0x0000d0;0xffffff;false;false; +constant=0x007f7f;0xffffff;false;false; +# asm is still unused +asm=0x105090;0xffffff;false;false; +label=0x007f7f;0xffffff;false;false; +error=0xd00000;0xffffff;false;false; +hexnumber=0x007f00;0xffffff;false;false; +binnumber=0x007f00;0xffffff;false;false; + +[keywords] +# all items must be in one line +keywords=append as asc asin asm atan2 atn beep bin binary bit bitreset bitset bload bsave byref byte byval call callocate case cbyte cdbl cdecl chain chdir chr cint circle clear clng clngint close cls color command common cons const continue cos cshort csign csng csrlin cubyte cuint culngint cunsg curdir cushort custom cvd cvi cvl cvlongint cvs cvshort data date deallocate declare defbyte defdbl defined defint deflng deflngint defshort defsng defstr defubyte defuint defulngint defushort dim dir do double draw dylibload dylibsymbol else elseif end enum environ environ$ eof eqv erase err error exec exepath exit exp export extern field fix flip for fre freefile function get getjoystick getkey getmouse gosub goto hex hibyte hiword if iif imagecreate imagedestroy imp inkey inp input instr int integer is kill lbound lcase left len let lib line lobyte loc local locate lock lof log long longint loop loword lset ltrim mid mkd mkdir mki mkl mklongint mks mkshort mod multikey mutexcreate mutexdestroy mutexlock mutexunlock name next not oct on once open option or out output overload paint palette pascal pcopy peek peeki peeks pipe pmap point pointer poke pokei pokes pos preserve preset print private procptr pset ptr public put random randomize read reallocate redim rem reset restore resume return rgb rgba right rmdir rnd rset rtrim run sadd screen screencopy screeninfo screenlock screenptr screenres screenset screensync screenunlock seek selectcase setdate setenviron setmouse settime sgn shared shell shl short shr sin single sizeof sleep space spc sqr statement static stdcall step stop str string strptr sub swap system tab tan then threadcreate threadwait time timer to trans trim type ubound ubyte ucase uinteger ulongint union unlock unsigned until ushort using va_arg va_first val val64 valint va_next varptr view viewprint wait wend while width window windowtitle with write xor zstring +preprocessor=#define defined #dynamic #else #endif #endmacro #error #if #ifdef #ifndef #inclib #include #libpath #line #macro #print #undef +# user definable keywords +user1= +user2= + +[settings] +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=' +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/' +#comment_close='/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=fbc -w all "%f" +run_cmd="./%e" + Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/scintilla/KeyWords.cxx 2007-06-22 17:34:31 UTC (rev 1635) @@ -144,6 +144,7 @@ LINK_LEXER(lmAsm); LINK_LEXER(lmASP); LINK_LEXER(lmBash); + LINK_LEXER(lmFreeBasic); LINK_LEXER(lmBatch); LINK_LEXER(lmCaml); LINK_LEXER(lmConf); Added: trunk/scintilla/LexBasic.cxx =================================================================== --- trunk/scintilla/LexBasic.cxx (rev 0) +++ trunk/scintilla/LexBasic.cxx 2007-06-22 17:34:31 UTC (rev 1635) @@ -0,0 +1,373 @@ +// Scintilla source code edit control +/** @file LexBasic.cxx + ** Lexer for BlitzBasic and PureBasic. + **/ +// Copyright 1998-2003 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +// This tries to be a unified Lexer/Folder for all the BlitzBasic/BlitzMax/PurBasic basics +// and derivatives. Once they diverge enough, might want to split it into multiple +// lexers for more code clearity. +// +// Mail me (elias <at> users <dot> sf <dot> net) for any bugs. + +// Folding only works for simple things like functions or types. + +// You may want to have a look at my ctags lexer as well, if you additionally to coloring +// and folding need to extract things like label tags in your editor. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <ctype.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +/* Bits: + * 1 - whitespace + * 2 - operator + * 4 - identifier + * 8 - decimal digit + * 16 - hex digit + * 32 - bin digit + */ +static int character_classification[128] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 10, 2, + 60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2, 2, 2, 2, 2, 2, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 4, + 2, 20, 20, 20, 20, 20, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 0 +}; + +static bool IsSpace(int c) { + return c < 128 && (character_classification[c] & 1); +} + +static bool IsOperator(int c) { + return c < 128 && (character_classification[c] & 2); +} + +static bool IsIdentifier(int c) { + return c < 128 && (character_classification[c] & 4); +} + +static bool IsDigit(int c) { + return c < 128 && (character_classification[c] & 8); +} + +static bool IsHexDigit(int c) { + return c < 128 && (character_classification[c] & 16); +} + +static bool IsBinDigit(int c) { + return c < 128 && (character_classification[c] & 32); +} + +static int LowerCase(int c) +{ + if (c >= 'A' && c <= 'Z') + return 'a' + c - 'A'; + return c; +} + +static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler, char comment_char) { + bool wasfirst = true, isfirst = true; // true if first token in a line + styler.StartAt(startPos); + + StyleContext sc(startPos, length, initStyle, styler); + + // Can't use sc.More() here else we miss the last character + for (; ; sc.Forward()) { + if (sc.state == SCE_B_IDENTIFIER) { + if (!IsIdentifier(sc.ch)) { + // Labels + if (wasfirst && sc.Match(':')) { + sc.ChangeState(SCE_B_LABEL); + sc.ForwardSetState(SCE_B_DEFAULT); + } else { + char s[100]; + int kstates[4] = { + SCE_B_KEYWORD, + SCE_B_KEYWORD2, + SCE_B_KEYWORD3, + SCE_B_KEYWORD4, + }; + sc.GetCurrentLowered(s, sizeof(s)); + for (int i = 0; i < 4; i++) { + if (keywordlists[i]->InList(s)) { + sc.ChangeState(kstates[i]); + } + } + // Types, must set them as operator else they will be + // matched as number/constant + if (sc.Match('.') || sc.Match('$') || sc.Match('%') || + sc.Match('#')) { + sc.SetState(SCE_B_OPERATOR); + } else { + sc.SetState(SCE_B_DEFAULT); + } + } + } + } else if (sc.state == SCE_B_OPERATOR) { + if (!IsOperator(sc.ch) || sc.Match('#')) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_LABEL) { + if (!IsIdentifier(sc.ch)) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_CONSTANT) { + if (!IsIdentifier(sc.ch)) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_NUMBER) { + if (!IsDigit(sc.ch)) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_HEXNUMBER) { + if (!IsHexDigit(sc.ch)) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_BINNUMBER) { + if (!IsBinDigit(sc.ch)) + sc.SetState(SCE_B_DEFAULT); + } else if (sc.state == SCE_B_STRING) { + if (sc.ch == '"') { + sc.ForwardSetState(SCE_B_DEFAULT); + } + if (sc.atLineEnd) { + sc.ChangeState(SCE_B_ERROR); + sc.SetState(SCE_B_DEFAULT); + } + } else if (sc.state == SCE_B_COMMENT || sc.state == SCE_B_PREPROCESSOR) { + if (sc.atLineEnd) { + sc.SetState(SCE_B_DEFAULT); + } + } + + if (sc.atLineStart) + isfirst = true; + + if (sc.state == SCE_B_DEFAULT || sc.state == SCE_B_ERROR) { + if (isfirst && sc.Match('.')) { + sc.SetState(SCE_B_LABEL); + } else if (isfirst && sc.Match('#')) { + wasfirst = isfirst; + sc.SetState(SCE_B_IDENTIFIER); + } else if (sc.Match(comment_char)) { + // Hack to make deprecated QBASIC '$Include show + // up in freebasic with SCE_B_PREPROCESSOR. + if (comment_char == '\'' && sc.Match(comment_char, '$')) + sc.SetState(SCE_B_PREPROCESSOR); + else + sc.SetState(SCE_B_COMMENT); + } else if (sc.Match('"')) { + sc.SetState(SCE_B_STRING); + } else if (IsDigit(sc.ch)) { + sc.SetState(SCE_B_NUMBER); + } else if (sc.Match('$')) { + sc.SetState(SCE_B_HEXNUMBER); + } else if (sc.Match('%')) { + sc.SetState(SCE_B_BINNUMBER); + } else if (sc.Match('#')) { + sc.SetState(SCE_B_CONSTANT); + } else if (IsOperator(sc.ch)) { + sc.SetState(SCE_B_OPERATOR); + } else if (IsIdentifier(sc.ch)) { + wasfirst = isfirst; + sc.SetState(SCE_B_IDENTIFIER); + } else if (!IsSpace(sc.ch)) { + sc.SetState(SCE_B_ERROR); + } + } + + if (!IsSpace(sc.ch)) + isfirst = false; + + if (!sc.More()) + break; + } + sc.Complete(); +} + +static int CheckBlitzFoldPoint(char const *token, int &level) { + if (!strcmp(token, "function") || + !strcmp(token, "type")) { + level |= SC_FOLDLEVELHEADERFLAG; + return 1; + } + if (!strcmp(token, "end function") || + !strcmp(token, "end type")) { + return -1; + } + return 0; +} + +static int CheckPureFoldPoint(char const *token, int &level) { + if (!strcmp(token, "procedure") || + !strcmp(token, "enumeration") || + !strcmp(token, "interface") || + !strcmp(token, "structure")) { + level |= SC_FOLDLEVELHEADERFLAG; + return 1; + } + if (!strcmp(token, "endprocedure") || + !strcmp(token, "endenumeration") || + !strcmp(token, "endinterface") || + !strcmp(token, "endstructure")) { + return -1; + } + return 0; +} + +static int CheckFreeFoldPoint(char const *token, int &level) { + if (!strcmp(token, "function") || + !strcmp(token, "sub") || + !strcmp(token, "type")) { + level |= SC_FOLDLEVELHEADERFLAG; + return 1; + } + if (!strcmp(token, "end function") || + !strcmp(token, "end sub") || + !strcmp(token, "end type")) { + return -1; + } + return 0; +} + +static void FoldBasicDoc(unsigned int startPos, int length, + Accessor &styler, int (*CheckFoldPoint)(char const *, int &)) { + int line = styler.GetLine(startPos); + int level = styler.LevelAt(line); + int go = 0, done = 0; + int endPos = startPos + length; + char word[256]; + int wordlen = 0; + int i; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + // Scan for tokens at the start of the line (they may include + // whitespace, for tokens like "End Function" + for (i = startPos; i < endPos; i++) { + int c = styler.SafeGetCharAt(i); + if (!done && !go) { + if (wordlen) { // are we scanning a token already? + word[wordlen] = static_cast<char>(LowerCase(c)); + if (!IsIdentifier(c)) { // done with token + word[wordlen] = '\0'; + go = CheckFoldPoint(word, level); + if (!go) { + // Treat any whitespace as single blank, for + // things like "End Function". + if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) { + word[wordlen] = ' '; + if (wordlen < 255) + wordlen++; + } + else // done with this line + done = 1; + } + } else if (wordlen < 255) { + wordlen++; + } + } else { // start scanning at first non-whitespace character + if (!IsSpace(c)) { + if (IsIdentifier(c)) { + word[0] = static_cast<char>(LowerCase(c)); + wordlen = 1; + } else // done with this line + done = 1; + } + } + } + if (c == '\n') { // line end + if (!done && wordlen == 0 && foldCompact) // line was only space + level |= SC_FOLDLEVELWHITEFLAG; + if (level != styler.LevelAt(line)) + styler.SetLevel(line, level); + level += go; + line++; + // reset state + wordlen = 0; + level &= ~SC_FOLDLEVELHEADERFLAG; + level &= ~SC_FOLDLEVELWHITEFLAG; + go = 0; + done = 0; + } + } +} + +static void ColouriseBlitzBasicDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';'); +} + +static void ColourisePureBasicDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';'); +} + +static void ColouriseFreeBasicDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, '\''); +} + +static void FoldBlitzBasicDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler) { + FoldBasicDoc(startPos, length, styler, CheckBlitzFoldPoint); +} + +static void FoldPureBasicDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler) { + FoldBasicDoc(startPos, length, styler, CheckPureFoldPoint); +} + +static void FoldFreeBasicDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler) { + FoldBasicDoc(startPos, length, styler, CheckFreeFoldPoint); +} + +static const char * const blitzbasicWordListDesc[] = { + "BlitzBasic Keywords", + "user1", + "user2", + "user3", + 0 +}; + +static const char * const purebasicWordListDesc[] = { + "PureBasic Keywords", + "PureBasic PreProcessor Keywords", + "user defined 1", + "user defined 2", + 0 +}; + +static const char * const freebasicWordListDesc[] = { + "FreeBasic Keywords", + "FreeBasic PreProcessor Keywords", + "user defined 1", + "user defined 2", + 0 +}; + +LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, ColouriseBlitzBasicDoc, "blitzbasic", + FoldBlitzBasicDoc, blitzbasicWordListDesc); + +LexerModule lmPureBasic(SCLEX_PUREBASIC, ColourisePureBasicDoc, "purebasic", + FoldPureBasicDoc, purebasicWordListDesc); + +LexerModule lmFreeBasic(SCLEX_FREEBASIC, ColouriseFreeBasicDoc, "freebasic", + FoldFreeBasicDoc, freebasicWordListDesc); + Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/scintilla/Makefile.am 2007-06-22 17:34:31 UTC (rev 1635) @@ -9,6 +9,7 @@ LEXER_SRCS= \ LexAsm.cxx \ +LexBasic.cxx \ LexBash.cxx \ LexOMS.cxx \ LexCPP.cxx \ Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/scintilla/makefile.win32 2007-06-22 17:34:31 UTC (rev 1635) @@ -62,7 +62,7 @@ LEXOBJS=\ LexBash.o LexAsm.o LexCSS.o LexConf.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ -LexD.o LexLua.o LexHaskell.o +LexD.o LexLua.o LexHaskell.o LexBasic.o #--Autogenerated -- end of automatically generated section all: $(COMPLIB) Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/editor.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -2130,6 +2130,13 @@ result = TRUE; break; } + case SCLEX_FREEBASIC: + { + if (style == SCE_B_COMMENT || + style == SCE_B_STRING) + result = TRUE; + break; + } case SCLEX_HTML: { if (style == SCE_HPHP_SIMPLESTRING || Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/filetypes.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -71,7 +71,9 @@ FILETYPE_UID_VHDL, // 26 FILETYPE_UID_JS, // 27 FILETYPE_UID_LUA, // 28 - FILETYPE_UID_HASKELL // 29 + FILETYPE_UID_HASKELL, // 29 + FILETYPE_UID_CS, // 30 + FILETYPE_UID_BASIC // 31 }; @@ -115,6 +117,8 @@ case FILETYPE_UID_JS: return filetypes[GEANY_FILETYPES_JS]; case FILETYPE_UID_LUA: return filetypes[GEANY_FILETYPES_LUA]; case FILETYPE_UID_HASKELL: return filetypes[GEANY_FILETYPES_HASKELL]; + case FILETYPE_UID_CS: return filetypes[GEANY_FILETYPES_CS]; + case FILETYPE_UID_BASIC: return filetypes[GEANY_FILETYPES_BASIC]; default: return NULL; } } @@ -157,6 +161,18 @@ filetypes[GEANY_FILETYPES_CPP]->comment_open = g_strdup("//"); filetypes[GEANY_FILETYPES_CPP]->comment_close = NULL; +#define CS + filetypes[GEANY_FILETYPES_CS]->id = GEANY_FILETYPES_CS; + filetypes[GEANY_FILETYPES_CS]->uid = FILETYPE_UID_CS; + filetypes[GEANY_FILETYPES_CS]->lang = 25; + filetypes[GEANY_FILETYPES_CS]->name = g_strdup("C#"); + filetypes[GEANY_FILETYPES_CS]->title = g_strdup(_("C# source file")); + filetypes[GEANY_FILETYPES_CS]->extension = g_strdup("cs"); + filetypes[GEANY_FILETYPES_CS]->pattern = utils_strv_new("*.cs", NULL); + filetypes[GEANY_FILETYPES_CS]->style_func_ptr = styleset_cs; + filetypes[GEANY_FILETYPES_CS]->comment_open = g_strdup("//"); + filetypes[GEANY_FILETYPES_CS]->comment_close = NULL; + #define D filetypes[GEANY_FILETYPES_D]->id = GEANY_FILETYPES_D; filetypes[GEANY_FILETYPES_D]->uid = FILETYPE_UID_D; @@ -206,6 +222,18 @@ filetypes[GEANY_FILETYPES_ASM]->comment_open = g_strdup(";"); filetypes[GEANY_FILETYPES_ASM]->comment_close = NULL; +#define BASIC + filetypes[GEANY_FILETYPES_BASIC]->id = GEANY_FILETYPES_BASIC; + filetypes[GEANY_FILETYPES_BASIC]->uid = FILETYPE_UID_BASIC; + filetypes[GEANY_FILETYPES_BASIC]->lang = 26; + filetypes[GEANY_FILETYPES_BASIC]->name = g_strdup("FreeBasic"); + filetypes[GEANY_FILETYPES_BASIC]->title = g_strdup(_("FreeBasic source file")); + filetypes[GEANY_FILETYPES_BASIC]->extension = g_strdup("bas"); + filetypes[GEANY_FILETYPES_BASIC]->pattern = utils_strv_new("*.bas", "*.bi", NULL); + filetypes[GEANY_FILETYPES_BASIC]->style_func_ptr = styleset_basic; + filetypes[GEANY_FILETYPES_BASIC]->comment_open = g_strdup("'"); + filetypes[GEANY_FILETYPES_BASIC]->comment_close = NULL; + #define FORTRAN filetypes[GEANY_FILETYPES_FORTRAN]->id = GEANY_FILETYPES_FORTRAN; filetypes[GEANY_FILETYPES_FORTRAN]->uid = FILETYPE_UID_FORTRAN; @@ -800,17 +828,17 @@ gchar *filetypes_get_conf_extension(gint filetype_idx) { - gchar *result, *tmp = g_strdup(filetypes[filetype_idx]->name); + gchar *result; // Handle any special extensions different from lowercase filetype->name switch (filetype_idx) { case GEANY_FILETYPES_CPP: result = g_strdup("cpp"); break; + case GEANY_FILETYPES_CS: result = g_strdup("cs"); break; case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break; case GEANY_FILETYPES_OMS: result = g_strdup("oms"); break; - default: result = g_ascii_strdown(tmp, -1); break; + default: result = g_ascii_strdown(filetypes[filetype_idx]->name, -1); break; } - g_free(tmp); return result; } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/filetypes.h 2007-06-22 17:34:31 UTC (rev 1635) @@ -38,9 +38,11 @@ // normally compiled languages GEANY_FILETYPES_C = 0, GEANY_FILETYPES_CPP, + GEANY_FILETYPES_CS, GEANY_FILETYPES_D, GEANY_FILETYPES_JAVA, GEANY_FILETYPES_PASCAL, + GEANY_FILETYPES_BASIC, GEANY_FILETYPES_ASM, GEANY_FILETYPES_FORTRAN, GEANY_FILETYPES_CAML, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/highlighting.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -781,6 +781,68 @@ } +static void styleset_cs_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + + load_keyfiles(config, config_home, GEANY_FILETYPES_CS); + + new_style_array(GEANY_FILETYPES_CS, 21); + styleset_c_like_init(config, config_home, GEANY_FILETYPES_CS); + get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", + 1, 0, &style_sets[GEANY_FILETYPES_CS].styling[20]); + + style_sets[GEANY_FILETYPES_CS].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CS, 0, "\ + abstract as base bool break byte case catch char checked class \ + const continue decimal default delegate do double else enum \ + event explicit extern false finally fixed float for foreach goto if \ + implicit in int interface internal is lock long namespace new null \ + object operator out override params private protected public \ + readonly ref return sbyte sealed short sizeof stackalloc static \ + string struct switch this throw true try typeof uint ulong \ + unchecked unsafe ushort using virtual void volatile while"); + get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CS, 1, ""); + get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_CS, 2, ""); + style_sets[GEANY_FILETYPES_CS].keywords[3] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_CS].wordchars); + filetypes_get_config(config, config_home, GEANY_FILETYPES_CS); + + g_key_file_free(config); + g_key_file_free(config_home); +} + + +void styleset_cs(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_CS; + + styleset_common(sci, 5, ft_id); + if (style_sets[ft_id].styling == NULL) styleset_cs_init(); + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[ft_id].wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); + + //SSM(sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[ft_id].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[ft_id].keywords[2]); + + // assign global types, merge them with user defined keywords and set them + assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1]); + + styleset_c_like(sci, ft_id); + + if (style_sets[ft_id].styling[20].foreground == 1) + SSM(sci, ft_id, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); +} + + static void styleset_pascal_init(void) { GKeyFile *config = g_key_file_new(); @@ -3103,3 +3165,100 @@ set_sci_style(sci, SCE_LUA_WORD7, GEANY_FILETYPES_LUA, 18); set_sci_style(sci, SCE_LUA_WORD8, GEANY_FILETYPES_LUA, 19); } + + +static void styleset_basic_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + + load_keyfiles(config, config_home, GEANY_FILETYPES_BASIC); + + new_style_array(GEANY_FILETYPES_BASIC, 19); + + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[0]); + get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[1]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[2]); + get_keyfile_hex(config, config_home, "styling", "word", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_BASIC].styling[3]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[4]); + get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[5]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[6]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[7]); + get_keyfile_hex(config, config_home, "styling", "date", "0x1a6500", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[8]); + get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[9]); + get_keyfile_hex(config, config_home, "styling", "word2", "0x007f7f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_BASIC].styling[10]); + get_keyfile_hex(config, config_home, "styling", "word3", "0x991111", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[11]); + get_keyfile_hex(config, config_home, "styling", "word4", "0x0000d0", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[12]); + get_keyfile_hex(config, config_home, "styling", "constant", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[13]); + get_keyfile_hex(config, config_home, "styling", "asm", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[14]); + get_keyfile_hex(config, config_home, "styling", "label", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[15]); + get_keyfile_hex(config, config_home, "styling", "error", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[16]); + get_keyfile_hex(config, config_home, "styling", "hexnumber", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[17]); + get_keyfile_hex(config, config_home, "styling", "binnumber", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_BASIC].styling[18]); + + style_sets[GEANY_FILETYPES_BASIC].keywords = g_new(gchar*, 5); + get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_BASIC, 0, + "as asm bit bitreset bitset byte case cint close cls color const \ + continue cshort csign csng cubyte cuint culngint custom data \ + dim do double else elseif end enum environ eof err error exec exit exp \ + export extern field fix for function get gosub goto hex hibyte hiword if iif imp \ + input instr int integer is kill left len let lobyte loc local locate lof log long \ + longint loop loword lset mklongint mks mkshort mod next not on once open or out \ + pointer pos preserve preset private public put read redim rem reset restore return \ + sizeof sleep space static step stop str string sub then time timer to type ubound \ + ubyte ucase uinteger ulongint union unsigned until ushort using val val64 valint \ + wait while with xor"); + get_keyfile_keywords(config, config_home, "keywords", "preprocessor", GEANY_FILETYPES_BASIC, 1, + "#define defined #dynamic #else #endif #endmacro #error #if #ifdef #ifndef #inclib #include \ + #libpath #line #macro #print #undef"); + get_keyfile_keywords(config, config_home, "keywords", "user1", GEANY_FILETYPES_BASIC, 2, ""); + get_keyfile_keywords(config, config_home, "keywords", "user2", GEANY_FILETYPES_BASIC, 3, ""); + style_sets[GEANY_FILETYPES_BASIC].keywords[4] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_BASIC].wordchars); + filetypes_get_config(config, config_home, GEANY_FILETYPES_BASIC); + + g_key_file_free(config); + g_key_file_free(config_home); +} + + +void styleset_basic(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_BASIC; + + styleset_common(sci, 5, ft_id); + if (style_sets[GEANY_FILETYPES_BASIC].styling == NULL) styleset_basic_init(); + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_FREEBASIC, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[1]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[2]); + SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_BASIC].keywords[3]); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_BASIC, 0); + set_sci_style(sci, SCE_B_DEFAULT, GEANY_FILETYPES_BASIC, 0); + set_sci_style(sci, SCE_B_COMMENT, GEANY_FILETYPES_BASIC, 1); + set_sci_style(sci, SCE_B_NUMBER, GEANY_FILETYPES_BASIC, 2); + set_sci_style(sci, SCE_B_KEYWORD, GEANY_FILETYPES_BASIC, 3); + set_sci_style(sci, SCE_B_STRING, GEANY_FILETYPES_BASIC, 4); + set_sci_style(sci, SCE_B_PREPROCESSOR, GEANY_FILETYPES_BASIC, 5); + set_sci_style(sci, SCE_B_OPERATOR, GEANY_FILETYPES_BASIC, 6); + set_sci_style(sci, SCE_B_IDENTIFIER, GEANY_FILETYPES_BASIC, 7); + set_sci_style(sci, SCE_B_DATE, GEANY_FILETYPES_BASIC, 8); + set_sci_style(sci, SCE_B_STRINGEOL, GEANY_FILETYPES_BASIC, 9); + set_sci_style(sci, SCE_B_KEYWORD2, GEANY_FILETYPES_BASIC, 10); + set_sci_style(sci, SCE_B_KEYWORD3, GEANY_FILETYPES_BASIC, 11); + set_sci_style(sci, SCE_B_KEYWORD4, GEANY_FILETYPES_BASIC, 12); + set_sci_style(sci, SCE_B_CONSTANT, GEANY_FILETYPES_BASIC, 13); + set_sci_style(sci, SCE_B_ASM, GEANY_FILETYPES_BASIC, 14); // (still?) unused by the lexer + set_sci_style(sci, SCE_B_LABEL, GEANY_FILETYPES_BASIC, 15); + set_sci_style(sci, SCE_B_ERROR, GEANY_FILETYPES_BASIC, 16); + set_sci_style(sci, SCE_B_HEXNUMBER, GEANY_FILETYPES_BASIC, 17); + set_sci_style(sci, SCE_B_BINNUMBER, GEANY_FILETYPES_BASIC, 18); +} Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/highlighting.h 2007-06-22 17:34:31 UTC (rev 1635) @@ -95,4 +95,8 @@ void styleset_lua(ScintillaObject *sci); +void styleset_cs(ScintillaObject *sci); + +void styleset_basic(ScintillaObject *sci); + #endif Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/msgwindow.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -651,8 +651,10 @@ data.file_idx = 2; break; } + case GEANY_FILETYPES_BASIC: case GEANY_FILETYPES_PASCAL: { + // getdrive.bas(52) error 18: Syntax error in '? GetAllDrives' // bandit.pas(149,3) Fatal: Syntax error, ";" expected but "ELSE" found data.pattern = "("; data.min_fields = 2; Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/src/templates.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -553,6 +553,12 @@ break; } + case GEANY_FILETYPES_BASIC: + { + line_prefix = "'"; + break; + } + case GEANY_FILETYPES_PASCAL: { frame_start = "{\n"; Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/tagmanager/Makefile.am 2007-06-22 17:34:31 UTC (rev 1635) @@ -26,6 +26,7 @@ strlist.h\ args.c\ args.h\ + basic.c\ c.c\ conf.c\ css.c\ Added: trunk/tagmanager/basic.c =================================================================== --- trunk/tagmanager/basic.c (rev 0) +++ trunk/tagmanager/basic.c 2007-06-22 17:34:31 UTC (rev 1635) @@ -0,0 +1,225 @@ +/* + * $Id:$ + * + * Copyright (c) 2000-2006, Darren Hiebert, Elias Pschernig + * + * This source code is released for free distribution under the terms of the + * GNU General Public License. + * + * This module contains functions for generating tags for BlitzBasic + * (BlitzMax), PureBasic and FreeBasic language files. For now, this is kept + * quite simple - but feel free to ask for more things added any time - + * patches are of course most welcome. + */ + +/* + * INCLUDE FILES + */ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* + * DATA DEFINITIONS + */ +typedef enum { + K_CONST, + K_FUNCTION, + K_LABEL, + K_TYPE, + K_VARIABLE, + K_ENUM +} BasicKind; + +typedef struct { + char const *token; + BasicKind kind; +} KeyWord; + +static kindOption BasicKinds[] = { + {TRUE, 'c', "constant", "constants"}, + {TRUE, 'f', "function", "functions"}, + {TRUE, 'l', "label", "labels"}, + {TRUE, 't', "type", "types"}, + {TRUE, 'v', "variable", "variables"}, + {TRUE, 'g', "enum", "enumerations"} +}; + +static KeyWord blitzbasic_keywords[] = { + {"const", K_CONST}, + {"global", K_VARIABLE}, + {"dim", K_VARIABLE}, + {"function", K_FUNCTION}, + {"type", K_TYPE}, + {NULL, 0} +}; + +static KeyWord purebasic_keywords[] = { + {"newlist", K_VARIABLE}, + {"global", K_VARIABLE}, + {"dim", K_VARIABLE}, + {"procedure", K_FUNCTION}, + {"interface", K_TYPE}, + {"structure", K_TYPE}, + {NULL, 0} +}; + +static KeyWord freebasic_keywords[] = { + {"const", K_CONST}, + {"dim", K_VARIABLE}, + {"common", K_VARIABLE}, + {"function", K_FUNCTION}, + {"sub", K_FUNCTION}, + {"private sub", K_FUNCTION}, + {"public sub", K_FUNCTION}, + {"private function", K_FUNCTION}, + {"public function", K_FUNCTION}, + {"type", K_TYPE}, + {"enum", K_ENUM}, + {NULL, 0} +}; + +/* + * FUNCTION DEFINITIONS + */ + +/* Match the name of a tag (function, variable, type, ...) starting at pos. */ +static void extract_name (char const *pos, vString * name) +{ + while (isspace (*pos)) + pos++; + vStringClear (name); + for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ','; pos++) + vStringPut (name, *pos); + vStringTerminate (name); +} + +/* Match a keyword starting at p (case insensitive). */ +static void match_keyword (const char *p, const char *keyword, BasicKind kind) +{ + vString *name; + size_t i; + for (i = 0; i < strlen (keyword); i++) + { + if (tolower (p[i]) != keyword[i]) + return; + } + name = vStringNew (); + extract_name (p + i, name); + // if we have "DIM AS STRING str" we should skip "AS STRING" - eht16 + if (strcmp(keyword, "dim") == 0 && strncasecmp (name->buffer, "as", 2) == 0) + { + char *new_start = strchr (p + i + 4, ' '); // + 4 skips " AS " + if (new_start != NULL) + extract_name (new_start + 1, name); + } + makeSimpleTag (name, BasicKinds, kind); + vStringDelete (name); +} + +/* Match a "label:" style label. */ +static void match_colon_label (char const *p) +{ + char const *end = p + strlen (p) - 1; + while (isspace (*end)) + end--; + if (*end == ':') + { + vString *name = vStringNew (); + vStringNCatS (name, p, end - p); + makeSimpleTag (name, BasicKinds, K_LABEL); + vStringDelete (name); + } +} + +/* Match a ".label" style label. */ +static void match_dot_label (char const *p) +{ + if (*p == '.') + { + vString *name = vStringNew (); + extract_name (p + 1, name); + makeSimpleTag (name, BasicKinds, K_LABEL); + vStringDelete (name); + } +} + +static void findBasicTags (KeyWord const keywords[], + void (*label) (const char *)) +{ + const char *line; + + while ((line = (const char *) fileReadLine ()) != NULL) + { + const char *p = line; + KeyWord const *kw; + + while (isspace (*p)) + p++; + + /* Empty line? */ + if (!*p) + continue; + + /* In Basic, keywords always are at the start of the line. */ + for (kw = keywords; kw->token; kw++) + match_keyword (p, kw->token, kw->kind); + + /* Is it a label? */ + label (p); + } +} + +static void findBlitzBasicTags (void) +{ + findBasicTags (blitzbasic_keywords, match_dot_label); +} + +static void findPureBasicTags (void) +{ + findBasicTags (purebasic_keywords, match_colon_label); +} + +static void findFreeBasicTags (void) +{ + findBasicTags (freebasic_keywords, match_colon_label); +} + +parserDefinition *BlitzBasicParser (void) +{ + static char const *extensions[] = { "bb", NULL }; + parserDefinition *def = parserNew ("BlitzBasic"); + def->kinds = BasicKinds; + def->kindCount = KIND_COUNT (BasicKinds); + def->extensions = extensions; + def->parser = findBlitzBasicTags; + return def; +} + +parserDefinition *PureBasicParser (void) +{ + static char const *extensions[] = { "pb", NULL }; + parserDefinition *def = parserNew ("PureBasic"); + def->kinds = BasicKinds; + def->kindCount = KIND_COUNT (BasicKinds); + def->extensions = extensions; + def->parser = findPureBasicTags; + return def; +} + +parserDefinition *FreeBasicParser (void) +{ + static char const *extensions[] = { "bas", "bi", NULL }; + parserDefinition *def = parserNew ("FreeBasic"); + def->kinds = BasicKinds; + def->kindCount = KIND_COUNT (BasicKinds); + def->extensions = extensions; + def->parser = findFreeBasicTags; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/tagmanager/makefile.win32 2007-06-22 17:34:31 UTC (rev 1635) @@ -33,7 +33,7 @@ -$(RM) deps.mak *.o $(COMPLIB) $(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ -haskell.o python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \ +haskell.o python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o basic.c \ read.o sort.o strlist.o latex.o docbook.o tcl.o ruby.o asm.o sql.o css.o vstring.o tm_workspace.o tm_work_object.o \ tm_source_file.o tm_project.o tm_tag.o tm_symbol.o tm_file_entry.o \ tm_tagmanager.o Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2007-06-22 17:22:07 UTC (rev 1634) +++ trunk/tagmanager/parsers.h 2007-06-22 17:34:31 UTC (rev 1635) @@ -39,7 +39,9 @@ VhdlParser, \ LuaParser, \ JavaScriptParser, \ - HaskellParser + HaskellParser, \ + CsharpParser, \ + FreeBasicParser /* langType of each parser @@ -68,6 +70,8 @@ 22 LuaParser 23 JavaScriptParser 24 HaskellParser +25 CsharpParser +26 FreeBasicParser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1634] trunk/tagmanager
by eht16＠users.sourceforge.net 22 Jun '07

22 Jun '07

Revision: 1634 http://svn.sourceforge.net/geany/?rev=1634&view=rev Author: eht16 Date: 2007-06-22 10:22:07 -0700 (Fri, 22 Jun 2007) Log Message: ----------- Use get.c and get.h from CTags SVN. Merged CSharp parser support into from CTags SVN. Modified Paths: -------------- trunk/tagmanager/c.c trunk/tagmanager/get.c trunk/tagmanager/get.h Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2007-06-20 12:42:06 UTC (rev 1633) +++ trunk/tagmanager/c.c 2007-06-22 17:22:07 UTC (rev 1634) @@ -57,39 +57,48 @@ /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE, - KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, - KEYWORD_BOOLEAN, KEYWORD_BYTE, - KEYWORD_CATCH, KEYWORD_CHAR, KEYWORD_CLASS, KEYWORD_CONST, - KEYWORD_DOUBLE, - KEYWORD_ENUM, KEYWORD_EXPLICIT, KEYWORD_EXTERN, KEYWORD_EXTENDS, - KEYWORD_FINAL, KEYWORD_FLOAT, KEYWORD_FRIEND, - KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_INLINE, KEYWORD_INT, - KEYWORD_INTERFACE, - KEYWORD_LONG, - KEYWORD_MODULE, - KEYWORD_MUTABLE, - KEYWORD_NAMESPACE, KEYWORD_NEW, KEYWORD_NATIVE, - KEYWORD_OPERATOR, KEYWORD_OVERLOAD, - KEYWORD_PACKAGE, KEYWORD_PRIVATE, KEYWORD_PROTECTED, KEYWORD_PUBLIC, - KEYWORD_REGISTER, - KEYWORD_SHORT, KEYWORD_SIGNED, KEYWORD_STATIC, KEYWORD_STRUCT, - KEYWORD_SYNCHRONIZED, - KEYWORD_TEMPLATE, KEYWORD_THROW, KEYWORD_THROWS, KEYWORD_TRANSIENT, - KEYWORD_TRY, KEYWORD_TYPEDEF, KEYWORD_TYPENAME, - KEYWORD_UNION, KEYWORD_UNSIGNED, KEYWORD_USES, KEYWORD_USING, - KEYWORD_VIRTUAL, KEYWORD_VOID, KEYWORD_VOLATILE, - KEYWORD_WCHAR_T, KEYWORD_AUTO, KEYWORD_RESTRICT, KEYWORD_SIZE_T, - KEYWORD_BOOL + KEYWORD_NONE, + KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, + KEYWORD_BOOLEAN, KEYWORD_BYTE, KEYWORD_BAD_STATE, KEYWORD_BAD_TRANS, + KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT, + KEYWORD_CASE, KEYWORD_CATCH, KEYWORD_CHAR, KEYWORD_CLASS, KEYWORD_CONST, + KEYWORD_CONSTRAINT, KEYWORD_COVERAGE_BLOCK, KEYWORD_COVERAGE_DEF, + KEYWORD_DEFAULT, KEYWORD_DELEGATE, KEYWORD_DELETE, KEYWORD_DO, + KEYWORD_DOUBLE, + KEYWORD_ELSE, KEYWORD_ENUM, KEYWORD_EXPLICIT, KEYWORD_EXTERN, + KEYWORD_EXTENDS, KEYWORD_EVENT, + KEYWORD_FINAL, KEYWORD_FLOAT, KEYWORD_FOR, KEYWORD_FRIEND, KEYWORD_FUNCTION, + KEYWORD_GOTO, + KEYWORD_IF, KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_INLINE, KEYWORD_INT, + KEYWORD_INOUT, KEYWORD_INPUT, KEYWORD_INTEGER, KEYWORD_INTERFACE, + KEYWORD_INTERNAL, + KEYWORD_LOCAL, KEYWORD_LONG, + KEYWORD_M_BAD_STATE, KEYWORD_M_BAD_TRANS, KEYWORD_M_STATE, KEYWORD_M_TRANS, + KEYWORD_MODULE, KEYWORD_MUTABLE, + KEYWORD_NAMESPACE, KEYWORD_NEW, KEYWORD_NEWCOV, KEYWORD_NATIVE, + KEYWORD_OPERATOR, KEYWORD_OUTPUT, KEYWORD_OVERLOAD, KEYWORD_OVERRIDE, + KEYWORD_PACKED, KEYWORD_PORT, KEYWORD_PACKAGE, KEYWORD_PRIVATE, + KEYWORD_PROGRAM, KEYWORD_PROTECTED, KEYWORD_PUBLIC, + KEYWORD_REGISTER, KEYWORD_RETURN, + KEYWORD_SHADOW, KEYWORD_STATE, + KEYWORD_SHORT, KEYWORD_SIGNED, KEYWORD_SIZE_T, KEYWORD_STATIC, KEYWORD_STRING, + KEYWORD_STRUCT, KEYWORD_SWITCH, KEYWORD_SYNCHRONIZED, + KEYWORD_TASK, KEYWORD_TEMPLATE, KEYWORD_THIS, KEYWORD_THROW, + KEYWORD_THROWS, KEYWORD_TRANSIENT, KEYWORD_TRANS, KEYWORD_TRANSITION, + KEYWORD_TRY, KEYWORD_TYPEDEF, KEYWORD_TYPENAME, + KEYWORD_UINT, KEYWORD_ULONG, KEYWORD_UNION, KEYWORD_UNSIGNED, KEYWORD_USHORT, + KEYWORD_USING, + KEYWORD_VIRTUAL, KEYWORD_VOID, KEYWORD_VOLATILE, + KEYWORD_WCHAR_T, KEYWORD_WHILE } keywordId; /* Used to determine whether keyword is valid for the current language and * what its ID is. */ typedef struct sKeywordDesc { - const char *name; - keywordId id; - short isValid [3]; /* indicates languages for which kw is valid */ + const char *name; + keywordId id; + short isValid [5]; /* indicates languages for which kw is valid */ } keywordDesc; /* Used for reporting the type of object parsed by nextToken (). @@ -127,6 +136,7 @@ DECL_BASE, /* base type (default) */ DECL_CLASS, DECL_ENUM, + DECL_EVENT, DECL_FUNCTION, DECL_IGNORE, /* non-taggable "declaration" */ DECL_INTERFACE, @@ -218,6 +228,9 @@ TAG_VARIABLE, /* variable definition */ TAG_EXTERN_VAR, /* external variable declaration */ TAG_MACRO, /* #define s */ + TAG_EVENT, /* event */ + TAG_LOCAL, /* local variable definition */ + TAG_PROPERTY, /* property name */ TAG_COUNT /* must be last */ } tagType; @@ -239,6 +252,7 @@ static langType Lang_c; static langType Lang_cpp; +static langType Lang_csharp; static langType Lang_java; static langType Lang_d; static langType Lang_ferite; @@ -283,70 +297,138 @@ { TRUE, 'p', "package", "packages"}, }; +typedef enum { + CSK_UNDEFINED = -1, + CSK_CLASS, CSK_DEFINE, CSK_ENUMERATOR, CSK_EVENT, CSK_FIELD, + CSK_ENUMERATION, CSK_INTERFACE, CSK_LOCAL, CSK_METHOD, + CSK_NAMESPACE, CSK_PROPERTY, CSK_STRUCT, CSK_TYPEDEF +} csharpKind; + +static kindOption CsharpKinds [] = { + { TRUE, 'c', "class", "classes"}, + { TRUE, 'd', "macro", "macro definitions"}, + { TRUE, 'e', "enumerator", "enumerators (values inside an enumeration)"}, + { TRUE, 'E', "event", "events"}, + { TRUE, 'f', "field", "fields"}, + { TRUE, 'g', "enum", "enumeration names"}, + { TRUE, 'i', "interface", "interfaces"}, + { FALSE, 'l', "local", "local variables"}, + { TRUE, 'm', "method", "methods"}, + { TRUE, 'n', "namespace", "namespaces"}, + { TRUE, 'p', "property", "properties"}, + { TRUE, 's', "struct", "structure names"}, + { TRUE, 't', "typedef", "typedefs"}, +}; + static const keywordDesc KeywordTable [] = { - /* C++ */ - /* ANSI C | Java */ - /* keyword keyword ID \ | / */ - { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 0 } }, - { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1 } }, - { "boolean", KEYWORD_BOOLEAN, { 0, 0, 1 } }, - { "byte", KEYWORD_BYTE, { 0, 0, 1 } }, - { "catch", KEYWORD_CATCH, { 0, 1, 0 } }, - { "char", KEYWORD_CHAR, { 1, 1, 1 } }, - { "class", KEYWORD_CLASS, { 0, 1, 1 } }, - { "const", KEYWORD_CONST, { 1, 1, 1 } }, - { "double", KEYWORD_DOUBLE, { 1, 1, 1 } }, - { "enum", KEYWORD_ENUM, { 1, 1, 0 } }, - { "explicit", KEYWORD_EXPLICIT, { 0, 1, 0 } }, - { "extends", KEYWORD_EXTENDS, { 0, 0, 1 } }, - { "extern", KEYWORD_EXTERN, { 1, 1, 0 } }, - { "final", KEYWORD_FINAL, { 0, 0, 1 } }, - { "float", KEYWORD_FLOAT, { 1, 1, 1 } }, - { "friend", KEYWORD_FRIEND, { 0, 1, 0 } }, - { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 1 } }, - { "import", KEYWORD_IMPORT, { 0, 0, 1 } }, - { "inline", KEYWORD_INLINE, { 0, 1, 0 } }, - { "int", KEYWORD_INT, { 1, 1, 1 } }, - { "interface", KEYWORD_INTERFACE, { 0, 0, 1 } }, - { "long", KEYWORD_LONG, { 1, 1, 1 } }, - { "module", KEYWORD_MODULE, { 0, 1, 0 } }, - { "mutable", KEYWORD_MUTABLE, { 0, 1, 0 } }, - { "namespace", KEYWORD_NAMESPACE, { 0, 1, 0 } }, - { "native", KEYWORD_NATIVE, { 0, 0, 1 } }, - { "new", KEYWORD_NEW, { 0, 1, 1 } }, - { "operator", KEYWORD_OPERATOR, { 0, 1, 0 } }, - { "overload", KEYWORD_OVERLOAD, { 0, 1, 0 } }, - { "package", KEYWORD_PACKAGE, { 0, 0, 1 } }, - { "private", KEYWORD_PRIVATE, { 0, 1, 1 } }, - { "protected", KEYWORD_PROTECTED, { 0, 1, 1 } }, - { "public", KEYWORD_PUBLIC, { 0, 1, 1 } }, - { "register", KEYWORD_REGISTER, { 1, 1, 0 } }, - { "short", KEYWORD_SHORT, { 1, 1, 1 } }, - { "signed", KEYWORD_SIGNED, { 1, 1, 0 } }, - { "static", KEYWORD_STATIC, { 1, 1, 1 } }, - { "struct", KEYWORD_STRUCT, { 1, 1, 0 } }, - { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 1 } }, - { "template", KEYWORD_TEMPLATE, { 0, 1, 0 } }, - { "throw", KEYWORD_THROW, { 0, 1, 1 } }, - { "throws", KEYWORD_THROWS, { 0, 0, 1 } }, - { "transient", KEYWORD_TRANSIENT, { 0, 0, 1 } }, - { "try", KEYWORD_TRY, { 0, 1, 0 } }, - { "typedef", KEYWORD_TYPEDEF, { 1, 1, 0 } }, - { "typename", KEYWORD_TYPENAME, { 0, 1, 0 } }, - { "union", KEYWORD_UNION, { 1, 1, 0 } }, - { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 0 } }, - { "uses", KEYWORD_USES, { 0, 1, 0 } }, - { "using", KEYWORD_USING, { 0, 1, 0 } }, - { "virtual", KEYWORD_VIRTUAL, { 0, 1, 0 } }, - { "void", KEYWORD_VOID, { 1, 1, 1 } }, - { "volatile", KEYWORD_VOLATILE, { 1, 1, 1 } }, - { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 0 } }, - { "auto", KEYWORD_AUTO, { 1, 1, 0 } }, - { "restrict", KEYWORD_RESTRICT, { 1, 0, 0 } }, - { "size_t", KEYWORD_SIZE_T, { 1, 1, 0 } }, - { "bool", KEYWORD_BOOL, { 0, 1, 0 } } + /* C++ */ + /* ANSI C | C# Java */ + /* | | | | Vera */ + /* keyword keyword ID | | | | | */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0 } }, + { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1 } }, + { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1 } }, + { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1 } }, + { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1 } }, + { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1 } }, + { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0 } }, + { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0 } }, + { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0 } }, + { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0 } }, + { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0 } }, + { "class", KEYWORD_CLASS, { 0, 1, 1, 1, 1 } }, + { "const", KEYWORD_CONST, { 1, 1, 1, 1, 0 } }, + { "constraint", KEYWORD_CONSTRAINT, { 0, 0, 0, 0, 1 } }, + { "coverage_block", KEYWORD_COVERAGE_BLOCK, { 0, 0, 0, 0, 1 } }, + { "coverage_def", KEYWORD_COVERAGE_DEF, { 0, 0, 0, 0, 1 } }, + { "do", KEYWORD_DO, { 1, 1, 1, 1, 0 } }, + { "default", KEYWORD_DEFAULT, { 1, 1, 1, 1, 0 } }, + { "delegate", KEYWORD_DELEGATE, { 0, 0, 1, 0, 0 } }, + { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0 } }, + { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0 } }, + { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0 } }, + { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1 } }, + { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1 } }, + { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0 } }, + { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1 } }, + { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0 } }, + { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0 } }, + { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0 } }, + { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0 } }, + { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1 } }, + { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0 } }, + { "if", KEYWORD_IF, { 1, 1, 1, 1, 0 } }, + { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0 } }, + { "import", KEYWORD_IMPORT, { 0, 0, 0, 1, 0 } }, + { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0 } }, + { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1 } }, + { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1 } }, + { "int", KEYWORD_INT, { 1, 1, 1, 1, 0 } }, + { "integer", KEYWORD_INTEGER, { 0, 0, 0, 0, 1 } }, + { "interface", KEYWORD_INTERFACE, { 0, 0, 1, 1, 1 } }, + { "internal", KEYWORD_INTERNAL, { 0, 0, 1, 0, 0 } }, + { "local", KEYWORD_LOCAL, { 0, 0, 0, 0, 1 } }, + { "long", KEYWORD_LONG, { 1, 1, 1, 1, 0 } }, + { "m_bad_state", KEYWORD_M_BAD_STATE, { 0, 0, 0, 0, 1 } }, + { "m_bad_trans", KEYWORD_M_BAD_TRANS, { 0, 0, 0, 0, 1 } }, + { "m_state", KEYWORD_M_STATE, { 0, 0, 0, 0, 1 } }, + { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1 } }, + { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0 } }, + { "module", KEYWORD_MODULE, { 0, 1, 0, 0, 0 } }, + { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0 } }, + { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0 } }, + { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0 } }, + { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1 } }, + { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0 } }, + { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1 } }, + { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0 } }, + { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0 } }, + { "package", KEYWORD_PACKAGE, { 0, 0, 0, 1, 0 } }, + { "packed", KEYWORD_PACKED, { 0, 0, 0, 0, 1 } }, + { "port", KEYWORD_PORT, { 0, 0, 0, 0, 1 } }, + { "private", KEYWORD_PRIVATE, { 0, 1, 1, 1, 0 } }, + { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1 } }, + { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1 } }, + { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1 } }, + { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0 } }, + { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0 } }, + { "shadow", KEYWORD_SHADOW, { 0, 0, 0, 0, 1 } }, + { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0 } }, + { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0 } }, + { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0 } }, + { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1 } }, + { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1 } }, + { "string", KEYWORD_STRING, { 0, 0, 1, 0, 1 } }, + { "struct", KEYWORD_STRUCT, { 1, 1, 1, 0, 0 } }, + { "switch", KEYWORD_SWITCH, { 1, 1, 1, 1, 0 } }, + { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 0, 1, 0 } }, + { "task", KEYWORD_TASK, { 0, 0, 0, 0, 1 } }, + { "template", KEYWORD_TEMPLATE, { 0, 1, 0, 0, 0 } }, + { "this", KEYWORD_THIS, { 0, 1, 1, 1, 0 } }, + { "throw", KEYWORD_THROW, { 0, 1, 1, 1, 0 } }, + { "throws", KEYWORD_THROWS, { 0, 0, 0, 1, 0 } }, + { "trans", KEYWORD_TRANS, { 0, 0, 0, 0, 1 } }, + { "transition", KEYWORD_TRANSITION, { 0, 0, 0, 0, 1 } }, + { "transient", KEYWORD_TRANSIENT, { 0, 0, 0, 1, 0 } }, + { "try", KEYWORD_TRY, { 0, 1, 1, 0, 0 } }, + { "typedef", KEYWORD_TYPEDEF, { 1, 1, 1, 0, 1 } }, + { "typename", KEYWORD_TYPENAME, { 0, 1, 0, 0, 0 } }, + { "uint", KEYWORD_UINT, { 0, 0, 1, 0, 0 } }, + { "ulong", KEYWORD_ULONG, { 0, 0, 1, 0, 0 } }, + { "union", KEYWORD_UNION, { 1, 1, 0, 0, 0 } }, + { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0 } }, + { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0 } }, + { "using", KEYWORD_USING, { 0, 1, 1, 0, 0 } }, + { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1 } }, + { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1 } }, + { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0 } }, + { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0 } }, + { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0 } } }; + /* * FUNCTION PROTOTYPES */ @@ -630,7 +712,6 @@ case KEYWORD_VOID: case KEYWORD_WCHAR_T: case KEYWORD_SIZE_T: - case KEYWORD_BOOL: return TRUE; default: return FALSE; } @@ -645,8 +726,6 @@ case KEYWORD_EXTERN: case KEYWORD_REGISTER: case KEYWORD_STATIC: - case KEYWORD_AUTO: - case KEYWORD_RESTRICT: case KEYWORD_VIRTUAL: case KEYWORD_SIGNED: case KEYWORD_UNSIGNED: @@ -826,6 +905,29 @@ return result; } +static csharpKind csharpTagKind (const tagType type) +{ + csharpKind result = CSK_UNDEFINED; + switch (type) + { + case TAG_CLASS: result = CSK_CLASS; break; + case TAG_ENUM: result = CSK_ENUMERATION; break; + case TAG_ENUMERATOR: result = CSK_ENUMERATOR; break; + case TAG_EVENT: result = CSK_EVENT; break; + case TAG_FIELD: result = CSK_FIELD ; break; + case TAG_INTERFACE: result = CSK_INTERFACE; break; + case TAG_LOCAL: result = CSK_LOCAL; break; + case TAG_METHOD: result = CSK_METHOD; break; + case TAG_NAMESPACE: result = CSK_NAMESPACE; break; + case TAG_PROPERTY: result = CSK_PROPERTY; break; + case TAG_STRUCT: result = CSK_STRUCT; break; + case TAG_TYPEDEF: result = CSK_TYPEDEF; break; + + default: Assert ("Bad C# tag type" == NULL); break; + } + return result; +} + static javaKind javaTagKind (const tagType type) { javaKind result = JK_UNDEFINED; @@ -846,9 +948,11 @@ { const char* result; if (isLanguage (Lang_java)) - result = JavaKinds [javaTagKind (type)].name; + result = JavaKinds [javaTagKind (type)].name; + else if (isLanguage (Lang_csharp)) + result = CsharpKinds [csharpTagKind (type)].name; else - result = CKinds [cTagKind (type)].name; + result = CKinds [cTagKind (type)].name; return result; } @@ -856,9 +960,11 @@ { int result; if (isLanguage (Lang_java)) - result = JavaKinds [javaTagKind (type)].letter; + result = JavaKinds [javaTagKind (type)].letter; + if (isLanguage (Lang_csharp)) + result = CsharpKinds [csharpTagKind (type)].letter; else - result = CKinds [cTagKind (type)].letter; + result = CKinds [cTagKind (type)].letter; return result; } @@ -929,42 +1035,34 @@ case TAG_STRUCT: case TAG_TYPEDEF: case TAG_UNION: - if (isMember (st) && - ! (type == TAG_ENUMERATOR && vStringLength (scope) == 0)) - { - if (isType (st->context, TOKEN_NAME)) - tag->extensionFields.scope [0] = tagName (TAG_CLASS); - else - tag->extensionFields.scope [0] = - tagName (declToTagType (parentDecl (st))); - tag->extensionFields.scope [1] = vStringValue (scope); - } - if ((type == TAG_CLASS || type == TAG_INTERFACE || - type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) - { + if (vStringLength (scope) > 0 && + (isMember (st) || st->parent->declaration == DECL_NAMESPACE)) + { + if (isType (st->context, TOKEN_NAME)) + tag->extensionFields.scope [0] = tagName (TAG_CLASS); + else + tag->extensionFields.scope [0] = + tagName (declToTagType (parentDecl (st))); + tag->extensionFields.scope [1] = vStringValue (scope); + } + if ((type == TAG_CLASS || type == TAG_INTERFACE || + type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) + { - tag->extensionFields.inheritance = - vStringValue (st->parentClasses); - } - if (st->implementation != IMP_DEFAULT && - (isLanguage (Lang_cpp) || isLanguage (Lang_java) || - isLanguage (Lang_d) || isLanguage (Lang_ferite))) - { - tag->extensionFields.implementation = - implementationString (st->implementation); - } - if (isMember (st)) - { - tag->extensionFields.access = accessField (st); - } - if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && - ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - - if (1) { - tag->extensionFields.arglist = getArglistFromPos( - tag->filePosition, tag->name); + tag->extensionFields.inheritance = + vStringValue (st->parentClasses); } - } + if (st->implementation != IMP_DEFAULT && + (isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || + isLanguage (Lang_java))) + { + tag->extensionFields.implementation = + implementationString (st->implementation); + } + if (isMember (st)) + { + tag->extensionFields.access = accessField (st); + } break; } @@ -984,7 +1082,7 @@ if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) vStringCatS (scope, "::"); else if (isLanguage (Lang_java) || - isLanguage (Lang_d) || isLanguage (Lang_ferite)) + isLanguage (Lang_d) || isLanguage (Lang_ferite) || isLanguage (Lang_csharp)) vStringCatS (scope, "."); } @@ -1152,7 +1250,8 @@ { if (isType (nameToken, TOKEN_NAME)) { - const tagType type = isLanguage (Lang_java) ? TAG_METHOD : TAG_FUNCTION; + const tagType type = (isLanguage (Lang_java) || isLanguage (Lang_csharp)) + ? TAG_METHOD : TAG_FUNCTION; const boolean isFileScope = (boolean) (st->member.access == ACCESS_PRIVATE || (!isMember (st) && st->scope == SCOPE_STATIC)); @@ -1166,12 +1265,12 @@ { if (! isType (nameToken, TOKEN_NAME)) ; - else if (isLanguage (Lang_java)) - qualifyFunctionTag (st, nameToken); + else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) + qualifyFunctionTag (st, nameToken); else if (st->scope == SCOPE_TYPEDEF) - makeTag (nameToken, st, TRUE, TAG_TYPEDEF); - else if (isValidTypeSpecifier (st->declaration)) - makeTag (nameToken, st, TRUE, TAG_PROTOTYPE); + makeTag (nameToken, st, TRUE, TAG_TYPEDEF); + else if (isValidTypeSpecifier (st->declaration) && ! isLanguage (Lang_csharp)) + makeTag (nameToken, st, TRUE, TAG_PROTOTYPE); } static void qualifyCompoundTag (const statementInfo *const st, @@ -1182,7 +1281,7 @@ const tagType type = declToTagType (st->declaration); if (type != TAG_UNDEFINED) - makeTag (nameToken, st, (boolean) (! isLanguage (Lang_java)), type); + makeTag (nameToken, st, (boolean) (! isLanguage (Lang_java) && ! isLanguage (Lang_csharp)), type); } } @@ -1224,7 +1323,7 @@ { if (isMember (st)) { - if (isLanguage (Lang_java)) + if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) makeTag (nameToken, st, (boolean) (st->member.access == ACCESS_PRIVATE), TAG_FIELD); @@ -1246,6 +1345,15 @@ * Parsing functions */ +static int skipToOneOf (const char *const chars) +{ + int c; + do + c = cppGetc (); + while (c != EOF && c != '\0' && strchr (chars, c) == NULL); + return c; +} + /* Skip to the next non-white character. */ static int skipToNonWhite (void) @@ -1417,6 +1525,27 @@ cppUngetc (c); /* unget non-package character */ } +static void readPackageOrNamespace (statementInfo *const st, const declType declaration) +{ + st->declaration = declaration; + + if (declaration == DECL_NAMESPACE && !isLanguage (Lang_csharp)) + { + /* In C++ a namespace is specified one level at a time. */ + return; + } + else + { + /* In C#, a namespace can also be specified like a Java package name. */ + tokenInfo *const token = activeToken (st); + Assert (isType (token, TOKEN_KEYWORD)); + readPackageName (token, skipToNonWhite ()); + token->type = TOKEN_NAME; + st->gotName = TRUE; + st->haveQualifyingName = TRUE; + } +} + static void readPackage (statementInfo *const st) { tokenInfo *const token = activeToken (st); @@ -1611,8 +1740,6 @@ case KEYWORD_CHAR: st->declaration = DECL_BASE; break; case KEYWORD_CLASS: st->declaration = DECL_CLASS; break; case KEYWORD_CONST: st->declaration = DECL_BASE; break; - case KEYWORD_AUTO: st->declaration = DECL_BASE; break; - case KEYWORD_RESTRICT: st->declaration = DECL_BASE; break; case KEYWORD_DOUBLE: st->declaration = DECL_BASE; break; case KEYWORD_ENUM: st->declaration = DECL_ENUM; break; case KEYWORD_EXTENDS: readParents (st, '.'); @@ -1623,15 +1750,13 @@ setToken (st, TOKEN_NONE); break; case KEYWORD_IMPORT: st->declaration = DECL_IGNORE; break; case KEYWORD_INT: st->declaration = DECL_BASE; break; - case KEYWORD_BOOL: st->declaration = DECL_BASE; break; + case KEYWORD_BOOLEAN: st->declaration = DECL_BASE; break; case KEYWORD_WCHAR_T: st->declaration = DECL_BASE; break; case KEYWORD_SIZE_T: st->declaration = DECL_BASE; break; case KEYWORD_INTERFACE: st->declaration = DECL_INTERFACE; break; case KEYWORD_LONG: st->declaration = DECL_BASE; break; - case KEYWORD_NAMESPACE: st->declaration = DECL_NAMESPACE; break; case KEYWORD_OPERATOR: readOperator (st); break; case KEYWORD_MODULE: readPackage (st); break; - case KEYWORD_PACKAGE: readPackage (st); break; case KEYWORD_PRIVATE: setAccess (st, ACCESS_PRIVATE); break; case KEYWORD_PROTECTED: setAccess (st, ACCESS_PROTECTED); break; case KEYWORD_PUBLIC: setAccess (st, ACCESS_PUBLIC); break; @@ -1647,16 +1772,30 @@ case KEYWORD_VOLATILE: st->declaration = DECL_BASE; break; case KEYWORD_VIRTUAL: st->implementation = IMP_VIRTUAL; break; + case KEYWORD_NAMESPACE: readPackageOrNamespace (st, DECL_NAMESPACE); break; + case KEYWORD_PACKAGE: readPackageOrNamespace (st, DECL_PACKAGE); break; + case KEYWORD_EVENT: + if (isLanguage (Lang_csharp)) + st->declaration = DECL_EVENT; + break; + case KEYWORD_EXTERN: - st->scope = SCOPE_EXTERN; - st->declaration = DECL_BASE; - break; + if (! isLanguage (Lang_csharp) || !st->gotName) + { + //reinitStatement (st, FALSE); + st->scope = SCOPE_EXTERN; + st->declaration = DECL_BASE; + } + break; case KEYWORD_STATIC: - if (! isLanguage (Lang_java)) - st->scope = SCOPE_STATIC; - st->declaration = DECL_BASE; - break; + if (! isLanguage (Lang_java) && ! isLanguage (Lang_csharp)) + { + //reinitStatement (st, FALSE); + st->scope = SCOPE_STATIC; + st->declaration = DECL_BASE; + } + break; } } @@ -2097,7 +2236,7 @@ if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) vStringCatS (st->context->name, "::"); else if (isLanguage (Lang_java) || - isLanguage (Lang_d) || isLanguage (Lang_ferite)) + isLanguage (Lang_d) || isLanguage (Lang_ferite) || isLanguage (Lang_csharp)) vStringCatS (st->context->name, "."); } vStringCat (st->context->name, token->name); @@ -2105,25 +2244,52 @@ } } +static boolean inheritingDeclaration (declType decl) +{ + return (boolean) ( + decl == DECL_CLASS || + decl == DECL_STRUCT || + decl == DECL_INTERFACE); +} + static void processColon (statementInfo *const st) { - const int c = skipToNonWhite (); - const boolean doubleColon = (boolean) (c == ':'); + int c = skipToNonWhite (); + const boolean doubleColon = (boolean) (c == ':'); - if (doubleColon) - { - setToken (st, TOKEN_DOUBLE_COLON); - st->haveQualifyingName = FALSE; - } - else - { - cppUngetc (c); - if ((isLanguage (Lang_cpp) || isLanguage (Lang_d) || isLanguage (Lang_ferite)) && ( - st->declaration == DECL_CLASS || st->declaration == DECL_STRUCT)) + if (doubleColon) { - readParents (st, ':'); + setToken (st, TOKEN_DOUBLE_COLON); + st->haveQualifyingName = FALSE; } - } + else + { + cppUngetc (c); + if ((isLanguage (Lang_cpp) || isLanguage (Lang_csharp)) && + inheritingDeclaration (st->declaration)) + { + readParents (st, ':'); + } + else if (parentDecl (st) == DECL_STRUCT) + { + c = skipToOneOf (",;"); + if (c == ',') + setToken (st, TOKEN_COMMA); + else if (c == ';') + setToken (st, TOKEN_SEMICOLON); + } + else + { + const tokenInfo *const prev = prevToken (st, 1); + const tokenInfo *const prev2 = prevToken (st, 2); + if (prev->keyword == KEYWORD_DEFAULT || + prev2->keyword == KEYWORD_CASE || + st->parent != NULL) + { + reinitStatement (st, FALSE); + } + } + } } /* Skips over any initializing value which may follow an '=' character in a @@ -2314,7 +2480,7 @@ /* Java, D, C# do not require semicolons to end a block. Neither do C++ * namespaces. All other blocks require a semicolon to terminate them. */ - isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) || + isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) || isLanguage (Lang_csharp) || ! isContextualStatement (st)); else isEnd = FALSE; @@ -2426,6 +2592,8 @@ { copyToken (st->blockName, name_token); } + else if (isLanguage (Lang_csharp)) + makeTag (prev, st, FALSE, TAG_PROPERTY); else { tokenInfo *contextual_token = (tokenInfo *)prev; @@ -2538,7 +2706,7 @@ boolean retry; Assert (passCount < 3); - cppInit ((boolean) (passCount > 1)); + cppInit ((boolean) (passCount > 1), isLanguage (Lang_csharp)); exception = (exception_t) setjmp (Exception); retry = FALSE; @@ -2591,7 +2759,7 @@ { contextual_fake_count = 0; Lang_java = language; - buildKeywordHash (language, 2); + buildKeywordHash (language, 3); } static void initializeDParser (const langType language) @@ -2608,6 +2776,13 @@ buildKeywordHash (language, 1); } +static void initializeCsharpParser (const langType language) +{ + contextual_fake_count = 0; + Lang_csharp = language; + buildKeywordHash (language, 2); +} + extern parserDefinition* CParser (void) { static const char *const extensions [] = { "c", "pc", "sc", NULL }; @@ -2675,4 +2850,15 @@ return def; } +extern parserDefinition* CsharpParser (void) +{ + static const char *const extensions [] = { "cs", NULL }; + parserDefinition* def = parserNew ("C#"); + def->kinds = CsharpKinds; + def->kindCount = KIND_COUNT (CsharpKinds); + def->extensions = extensions; + def->parser2 = findCTags; + def->initialize = initializeCsharpParser; + return def; +} /* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2007-06-20 12:42:06 UTC (rev 1633) +++ trunk/tagmanager/get.c 2007-06-22 17:22:07 UTC (rev 1634) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -12,14 +13,12 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ -#include <glib.h> +#include "general.h" /* must always come first */ #include <string.h> #include "entry.h" #include "get.h" -#include "main.h" #include "options.h" #include "read.h" #include "vstring.h" @@ -27,8 +26,8 @@ /* * MACROS */ -#define stringMatch(s1,s2) (strcmp (s1,s2) == 0) -#define isspacetab(c) ((c) == ' ' || (c) == '\t') +#define stringMatch(s1,s2) (strcmp (s1,s2) == 0) +#define isspacetab(c) ((c) == SPACE || (c) == TAB) /* * DATA DECLARATIONS @@ -36,37 +35,41 @@ typedef enum { COMMENT_NONE, COMMENT_C, COMMENT_CPLUS } Comment; enum eCppLimits { - MaxCppNestingLevel = 20, - MaxDirectiveName = 10 + MaxCppNestingLevel = 20, + MaxDirectiveName = 10 }; /* Defines the one nesting level of a preprocessor conditional. */ typedef struct sConditionalInfo { - boolean ignoreAllBranches; /* ignoring parent conditional branch */ - boolean singleBranch; /* choose only one branch */ - boolean branchChosen; /* branch already selected */ - boolean ignoring; /* current ignore state */ + boolean ignoreAllBranches; /* ignoring parent conditional branch */ + boolean singleBranch; /* choose only one branch */ + boolean branchChosen; /* branch already selected */ + boolean ignoring; /* current ignore state */ } conditionalInfo; +enum eState { + DRCTV_NONE, /* no known directive - ignore to end of line */ + DRCTV_DEFINE, /* "#define" encountered */ + DRCTV_HASH, /* initial '#' read; determine directive */ + DRCTV_IF, /* "#if" or "#ifdef" encountered */ + DRCTV_PRAGMA, /* #pragma encountered */ + DRCTV_UNDEF /* "#undef" encountered */ +}; + /* Defines the current state of the pre-processor. */ typedef struct sCppState { - int ungetch, ungetch2; /* ungotten characters, if any */ - boolean resolveRequired; /* must resolve if/else/elif/endif branch */ - struct sDirective { - enum eState { - DRCTV_NONE, /* no known directive - ignore to end of line */ - DRCTV_DEFINE, /* "#define" encountered */ - DRCTV_HASH, /* initial '#' read; determine directive */ - DRCTV_IF, /* "#if" or "#ifdef" encountered */ - DRCTV_UNDEF /* "#undef" encountered */ - } state; - boolean accept; /* is a directive syntatically permitted? */ - vString * name; /* macro name */ - unsigned int nestLevel; /* level 0 is not used */ - conditionalInfo ifdef [MaxCppNestingLevel]; - } directive; + int ungetch, ungetch2; /* ungotten characters, if any */ + boolean resolveRequired; /* must resolve if/else/elif/endif branch */ + boolean hasAtLiteralStrings; /* supports @"c:\" strings */ + struct sDirective { + enum eState state; /* current directive being processed */ + boolean accept; /* is a directive syntactically permitted? */ + vString * name; /* macro name */ + unsigned int nestLevel; /* level 0 is not used */ + conditionalInfo ifdef [MaxCppNestingLevel]; + } directive; } cppState; /* @@ -78,15 +81,16 @@ static boolean BraceFormat = FALSE; static cppState Cpp = { - '\0', '\0', /* ungetch characters */ - FALSE, /* resolveRequired */ - { - DRCTV_NONE, /* state */ - FALSE, /* accept */ - NULL, /* tag name */ - 0, /* nestLevel */ - { {FALSE,FALSE,FALSE,FALSE} } /* ifdef array */ - } /* directive */ + '\0', '\0', /* ungetch characters */ + FALSE, /* resolveRequired */ + FALSE, /* hasAtLiteralStrings */ + { + DRCTV_NONE, /* state */ + FALSE, /* accept */ + NULL, /* tag name */ + 0, /* nestLevel */ + { {FALSE,FALSE,FALSE,FALSE} } /* ifdef array */ + } /* directive */ }; /* @@ -95,49 +99,55 @@ extern boolean isBraceFormat (void) { - return BraceFormat; + return BraceFormat; } extern unsigned int getDirectiveNestLevel (void) { - return Cpp.directive.nestLevel; + return Cpp.directive.nestLevel; } -extern void cppInit (const boolean state) +extern void cppInit (const boolean state, const boolean hasAtLiteralStrings) { - BraceFormat = state; + BraceFormat = state; - Cpp.ungetch = '\0'; - Cpp.ungetch2 = '\0'; - Cpp.resolveRequired = FALSE; + Cpp.ungetch = '\0'; + Cpp.ungetch2 = '\0'; + Cpp.resolveRequired = FALSE; + Cpp.hasAtLiteralStrings = hasAtLiteralStrings; - Cpp.directive.state = DRCTV_NONE; - Cpp.directive.accept = TRUE; - Cpp.directive.nestLevel = 0; + Cpp.directive.state = DRCTV_NONE; + Cpp.directive.accept = TRUE; + Cpp.directive.nestLevel = 0; - if (Cpp.directive.name == NULL) - Cpp.directive.name = vStringNew (); - else - vStringClear (Cpp.directive.name); + Cpp.directive.ifdef [0].ignoreAllBranches = FALSE; + Cpp.directive.ifdef [0].singleBranch = FALSE; + Cpp.directive.ifdef [0].branchChosen = FALSE; + Cpp.directive.ifdef [0].ignoring = FALSE; + + if (Cpp.directive.name == NULL) + Cpp.directive.name = vStringNew (); + else + vStringClear (Cpp.directive.name); } extern void cppTerminate (void) { - if (Cpp.directive.name != NULL) - { - vStringDelete (Cpp.directive.name); - Cpp.directive.name = NULL; - } + if (Cpp.directive.name != NULL) + { + vStringDelete (Cpp.directive.name); + Cpp.directive.name = NULL; + } } extern void cppBeginStatement (void) { - Cpp.resolveRequired = TRUE; + Cpp.resolveRequired = TRUE; } extern void cppEndStatement (void) { - Cpp.resolveRequired = FALSE; + Cpp.resolveRequired = FALSE; } /* @@ -152,100 +162,96 @@ */ extern void cppUngetc (const int c) { - Assert (Cpp.ungetch2 == '\0'); - Cpp.ungetch2 = Cpp.ungetch; - Cpp.ungetch = c; + Assert (Cpp.ungetch2 == '\0'); + Cpp.ungetch2 = Cpp.ungetch; + Cpp.ungetch = c; } /* Reads a directive, whose first character is given by "c", into "name". */ static boolean readDirective (int c, char *const name, unsigned int maxLength) { - unsigned int i; + unsigned int i; - for (i = 0 ; i < maxLength - 1 ; ++i) - { - if (i > 0) + for (i = 0 ; i < maxLength - 1 ; ++i) { - c = fileGetc (); - if (c == EOF || ! isalpha (c)) - { - fileUngetc (c); - break; - } + if (i > 0) + { + c = fileGetc (); + if (c == EOF || ! isalpha (c)) + { + fileUngetc (c); + break; + } + } + name [i] = c; } - name [i] = c; - } - name [i] = '\0'; /* null terminate */ + name [i] = '\0'; /* null terminate */ - return (boolean) isspacetab (c); + return (boolean) isspacetab (c); } /* Reads an identifier, whose first character is given by "c", into "tag", * together with the file location and corresponding line number. */ -static boolean readDefineTag (int c, vString *const name, - boolean *const parameterized) +static void readIdentifier (int c, vString *const name) { - vStringClear (name); - do - { - vStringPut (name, c); - } while (c = fileGetc (), (c != EOF && isident (c))); - fileUngetc (c); - vStringPut (name, '\0'); - - *parameterized = (boolean) (c == '('); - return (boolean) (isspace (c) || c == '('); + vStringClear (name); + do + { + vStringPut (name, c); + } while (c = fileGetc (), (c != EOF && isident (c))); + fileUngetc (c); + vStringTerminate (name); } static conditionalInfo *currentConditional (void) { - return &Cpp.directive.ifdef [Cpp.directive.nestLevel]; + return &Cpp.directive.ifdef [Cpp.directive.nestLevel]; } static boolean isIgnore (void) { - return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring; + return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring; } static boolean setIgnore (const boolean ignore) { - return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring = ignore; + return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring = ignore; } static boolean isIgnoreBranch (void) { - conditionalInfo *const ifdef = currentConditional (); + conditionalInfo *const ifdef = currentConditional (); - /* Force a single branch if an incomplete statement is discovered - * en route. This may have allowed earlier branches containing complete - * statements to be followed, but we must follow no further branches. - */ - if (Cpp.resolveRequired && ! BraceFormat) - ifdef->singleBranch = TRUE; + /* Force a single branch if an incomplete statement is discovered + * en route. This may have allowed earlier branches containing complete + * statements to be followed, but we must follow no further branches. + */ + if (Cpp.resolveRequired && ! BraceFormat) + ifdef->singleBranch = TRUE; - /* We will ignore this branch in the following cases: - * - * 1. We are ignoring all branches (conditional was within an ignored - * branch of the parent conditional) - * 2. A branch has already been chosen and either of: - * a. A statement was incomplete upon entering the conditional - * b. A statement is incomplete upon encountering a branch - */ - return (boolean) (ifdef->ignoreAllBranches || - (ifdef->branchChosen && ifdef->singleBranch)); + /* We will ignore this branch in the following cases: + * + * 1. We are ignoring all branches (conditional was within an ignored + * branch of the parent conditional) + * 2. A branch has already been chosen and either of: + * a. A statement was incomplete upon entering the conditional + * b. A statement is incomplete upon encountering a branch + */ + return (boolean) (ifdef->ignoreAllBranches || + (ifdef->branchChosen && ifdef->singleBranch)); } static void chooseBranch (void) { - if (! BraceFormat) - { - conditionalInfo *const ifdef = currentConditional (); + if (! BraceFormat) + { + conditionalInfo *const ifdef = currentConditional (); - ifdef->branchChosen = (boolean) (ifdef->singleBranch || - Cpp.resolveRequired); - } + ifdef->branchChosen = (boolean) (ifdef->singleBranch || + Cpp.resolveRequired); + } } /* Pushes one nesting level for an #if directive, indicating whether or not @@ -253,141 +259,155 @@ */ static boolean pushConditional (const boolean firstBranchChosen) { - const boolean ignoreAllBranches = isIgnore (); /* current ignore */ - boolean ignoreBranch = FALSE; + const boolean ignoreAllBranches = isIgnore (); /* current ignore */ + boolean ignoreBranch = FALSE; - if (Cpp.directive.nestLevel < (unsigned int) MaxCppNestingLevel - 1) - { - conditionalInfo *ifdef; + if (Cpp.directive.nestLevel < (unsigned int) MaxCppNestingLevel - 1) + { + conditionalInfo *ifdef; - ++Cpp.directive.nestLevel; - ifdef = currentConditional (); + ++Cpp.directive.nestLevel; + ifdef = currentConditional (); - /* We take a snapshot of whether there is an incomplete statement in - * progress upon encountering the preprocessor conditional. If so, - * then we will flag that only a single branch of the conditional - * should be followed. - */ - ifdef->ignoreAllBranches= ignoreAllBranches; - ifdef->singleBranch = Cpp.resolveRequired; - ifdef->branchChosen = firstBranchChosen; - ifdef->ignoring = (boolean) (ignoreAllBranches || ( - ! firstBranchChosen && ! BraceFormat && - (ifdef->singleBranch || !Option.if0))); - ignoreBranch = ifdef->ignoring; - } - return ignoreBranch; + /* We take a snapshot of whether there is an incomplete statement in + * progress upon encountering the preprocessor conditional. If so, + * then we will flag that only a single branch of the conditional + * should be followed. + */ + ifdef->ignoreAllBranches = ignoreAllBranches; + ifdef->singleBranch = Cpp.resolveRequired; + ifdef->branchChosen = firstBranchChosen; + ifdef->ignoring = (boolean) (ignoreAllBranches || ( + ! firstBranchChosen && ! BraceFormat && + (ifdef->singleBranch || !Option.if0))); + ignoreBranch = ifdef->ignoring; + } + return ignoreBranch; } /* Pops one nesting level for an #endif directive. */ static boolean popConditional (void) { - if (Cpp.directive.nestLevel > 0) - --Cpp.directive.nestLevel; + if (Cpp.directive.nestLevel > 0) + --Cpp.directive.nestLevel; - return isIgnore (); + return isIgnore (); } -static void makeDefineTag (const char *const name, boolean parameterized) +static void makeDefineTag (const char *const name) { - const boolean isFileScope = (boolean) (! isHeaderFile ()); + const boolean isFileScope = (boolean) (! isHeaderFile ()); - if (includingDefineTags () && - (! isFileScope || Option.include.fileScope)) - { - tagEntryInfo e; - - initTagEntry (&e, name); - - e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); - e.isFileScope = isFileScope; - e.truncateLine = TRUE; - e.kindName = "macro"; - e.kind = 'd'; - if (parameterized) - e.extensionFields.arglist = getArglistFromPos(getInputFilePosition() - , e.name); - makeTagEntry (&e); - if (parameterized) - free((char *) e.extensionFields.arglist); - } + if (includingDefineTags () && + (! isFileScope || Option.include.fileScope)) + { + tagEntryInfo e; + initTagEntry (&e, name); + e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); + e.isFileScope = isFileScope; + e.truncateLine = TRUE; + e.kindName = "macro"; + e.kind = 'd'; + makeTagEntry (&e); + } } static void directiveDefine (const int c) { - boolean parameterized; + if (isident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + if (! isIgnore ()) + makeDefineTag (vStringValue (Cpp.directive.name)); + } + Cpp.directive.state = DRCTV_NONE; +} - if (isident1 (c)) - { - readDefineTag (c, Cpp.directive.name, &parameterized); - if (! isIgnore ()) - /// TODO - // the second argument need to be tested, not sure if TRUE is correct - makeDefineTag (vStringValue (Cpp.directive.name), TRUE); - } - Cpp.directive.state = DRCTV_NONE; +static void directivePragma (int c) +{ + if (isident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + if (stringMatch (vStringValue (Cpp.directive.name), "weak")) + { + /* generate macro tag for weak name */ + do + { + c = fileGetc (); + } while (c == SPACE); + if (isident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + makeDefineTag (vStringValue (Cpp.directive.name)); + } + } + } + Cpp.directive.state = DRCTV_NONE; } static boolean directiveIf (const int c) { - const boolean ignore = pushConditional ((boolean) (c != '0')); + const boolean ignore = pushConditional ((boolean) (c != '0')); - Cpp.directive.state = DRCTV_NONE; + Cpp.directive.state = DRCTV_NONE; - return ignore; + return ignore; } static boolean directiveHash (const int c) { - boolean ignore = FALSE; - char directive [MaxDirectiveName]; - DebugStatement ( const boolean ignore0 = isIgnore (); ) + boolean ignore = FALSE; + char directive [MaxDirectiveName]; + DebugStatement ( const boolean ignore0 = isIgnore (); ) - readDirective (c, directive, MaxDirectiveName); - if (stringMatch (directive, "define")) - Cpp.directive.state = DRCTV_DEFINE; - else if (stringMatch (directive, "undef")) - Cpp.directive.state = DRCTV_UNDEF; - else if (strncmp (directive, "if", (size_t) 2) == 0) - Cpp.directive.state = DRCTV_IF; - else if (stringMatch (directive, "elif") || - stringMatch (directive, "else")) - { - ignore = setIgnore (isIgnoreBranch ()); - if (! ignore && stringMatch (directive, "else")) - chooseBranch (); - Cpp.directive.state = DRCTV_NONE; - DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) - } - else if (stringMatch (directive, "endif")) - { - DebugStatement ( debugCppNest (FALSE, Cpp.directive.nestLevel); ) - ignore = popConditional (); - Cpp.directive.state = DRCTV_NONE; - DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) - } - else /* "pragma", etc. */ - Cpp.directive.state = DRCTV_NONE; + readDirective (c, directive, MaxDirectiveName); + if (stringMatch (directive, "define")) + Cpp.directive.state = DRCTV_DEFINE; + else if (stringMatch (directive, "undef")) + Cpp.directive.state = DRCTV_UNDEF; + else if (strncmp (directive, "if", (size_t) 2) == 0) + Cpp.directive.state = DRCTV_IF; + else if (stringMatch (directive, "elif") || + stringMatch (directive, "else")) + { + ignore = setIgnore (isIgnoreBranch ()); + if (! ignore && stringMatch (directive, "else")) + chooseBranch (); + Cpp.directive.state = DRCTV_NONE; + DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) + } + else if (stringMatch (directive, "endif")) + { + DebugStatement ( debugCppNest (FALSE, Cpp.directive.nestLevel); ) + ignore = popConditional (); + Cpp.directive.state = DRCTV_NONE; + DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) + } + else if (stringMatch (directive, "pragma")) + Cpp.directive.state = DRCTV_PRAGMA; + else + Cpp.directive.state = DRCTV_NONE; - return ignore; + return ignore; } /* Handles a pre-processor directive whose first character is given by "c". */ static boolean handleDirective (const int c) { - boolean ignore = isIgnore (); + boolean ignore = isIgnore (); - switch (Cpp.directive.state) - { - case DRCTV_NONE: ignore = isIgnore (); break; - case DRCTV_DEFINE: directiveDefine (c); break; - case DRCTV_HASH: ignore = directiveHash (c); break; - case DRCTV_IF: ignore = directiveIf (c); break; - case DRCTV_UNDEF: directiveDefine (c); break; - } - return ignore; + switch (Cpp.directive.state) + { + case DRCTV_NONE: ignore = isIgnore (); break; + case DRCTV_DEFINE: directiveDefine (c); break; + case DRCTV_HASH: ignore = directiveHash (c); break; + case DRCTV_IF: ignore = directiveIf (c); break; + case DRCTV_PRAGMA: directivePragma (c); break; + case DRCTV_UNDEF: directiveDefine (c); break; + } + return ignore; } /* Called upon reading of a slash ('/') characters, determines whether a @@ -395,101 +415,111 @@ */ static Comment isComment (void) { - Comment comment; - const int next = fileGetc (); + Comment comment; + const int next = fileGetc (); - if (next == '*') - comment = COMMENT_C; - else if (next == '/') - comment = COMMENT_CPLUS; - else - { - fileUngetc (next); - comment = COMMENT_NONE; - } - return comment; + if (next == '*') + comment = COMMENT_C; + else if (next == '/') + comment = COMMENT_CPLUS; + else + { + fileUngetc (next); + comment = COMMENT_NONE; + } + return comment; } /* Skips over a C style comment. According to ANSI specification a comment - * is treated as white space, so we perform this subsitution. + * is treated as white space, so we perform this substitution. */ -static int skipOverCComment (void) +int skipOverCComment (void) { - int c = fileGetc (); + int c = fileGetc (); - while (c != EOF) - { - if (c != '*') - c = fileGetc (); - else + while (c != EOF) { - const int next = fileGetc (); + if (c != '*') + c = fileGetc (); + else + { + const int next = fileGetc (); - if (next != '/') - c = next; - else - { - c = ' '; /* replace comment with space */ - break; - } + if (next != '/') + c = next; + else + { + c = SPACE; /* replace comment with space */ + break; + } + } } - } - return c; + return c; } /* Skips over a C++ style comment. */ static int skipOverCplusComment (void) { - int c; + int c; - while ((c = fileGetc ()) != EOF) - { - if (c == BACKSLASH) - fileGetc (); /* throw away next character, too */ - else if (c == NEWLINE) - break; - } - return c; + while ((c = fileGetc ()) != EOF) + { + if (c == BACKSLASH) + fileGetc (); /* throw away next character, too */ + else if (c == NEWLINE) + break; + } + return c; } /* Skips to the end of a string, returning a special character to * symbolically represent a generic string. */ -static int skipToEndOfString (void) +static int skipToEndOfString (boolean ignoreBackslash) { - int c; + int c; - while ((c = fileGetc ()) != EOF) - { - if (c == BACKSLASH) - fileGetc (); /* throw away next character, too */ - else if (c == DOUBLE_QUOTE) - break; - } - return STRING_SYMBOL; /* symbolic representation of string */ + while ((c = fileGetc ()) != EOF) + { + if (c == BACKSLASH && ! ignoreBackslash) + fileGetc (); /* throw away next character, too */ + else if (c == DOUBLE_QUOTE) + break; + } + return STRING_SYMBOL; /* symbolic representation of string */ } /* Skips to the end of the three (possibly four) 'c' sequence, returning a * special character to symbolically represent a generic character. + * Also detects Vera numbers that include a base specifier (ie. 'b1010). */ static int skipToEndOfChar (void) { - int c; + int c; + int count = 0, veraBase = '\0'; - while ((c = fileGetc ()) != EOF) - { - if (c == BACKSLASH) - fileGetc (); /* throw away next character, too */ - else if (c == SINGLE_QUOTE) - break; - else if (c == NEWLINE) + while ((c = fileGetc ()) != EOF) { - fileUngetc (c); - break; + ++count; + if (c == BACKSLASH) + fileGetc (); /* throw away next character, too */ + else if (c == SINGLE_QUOTE) + break; + else if (c == NEWLINE) + { + fileUngetc (c); + break; + } + else if (count == 1 && strchr ("DHOB", toupper (c)) != NULL) + veraBase = c; + else if (veraBase != '\0' && ! isalnum (c)) + { + fileUngetc (c); + break; + } } - } - return CHAR_SYMBOL; /* symbolic representation of character */ + return CHAR_SYMBOL; /* symbolic representation of character */ } /* This function returns the next character, stripping out comments, @@ -499,265 +529,137 @@ */ extern int cppGetc (void) { - boolean directive = FALSE; - boolean ignore = FALSE; - int c; + boolean directive = FALSE; + boolean ignore = FALSE; + int c; - if (Cpp.ungetch != '\0') - { - c = Cpp.ungetch; - Cpp.ungetch = Cpp.ungetch2; - Cpp.ungetch2 = '\0'; - return c; /* return here to avoid re-calling debugPutc () */ - } - else do - { - c = fileGetc (); -process: - switch (c) + if (Cpp.ungetch != '\0') { - case EOF: - ignore = FALSE; - directive = FALSE; - break; - - case TAB: - case SPACE: - break; /* ignore most white space */ - - case NEWLINE: - if (directive && ! ignore) - directive = FALSE; - Cpp.directive.accept = TRUE; - break; - - case DOUBLE_QUOTE: - Cpp.directive.accept = FALSE; - c = skipToEndOfString (); - break; - - case '#': - if (Cpp.directive.accept) + c = Cpp.ungetch; + Cpp.ungetch = Cpp.ungetch2; + Cpp.ungetch2 = '\0'; + return c; /* return here to avoid re-calling debugPutc () */ + } + else do + { + c = fileGetc (); +process: + switch (c) { - directive = TRUE; - Cpp.directive.state = DRCTV_HASH; - Cpp.directive.accept = FALSE; - } - break; + case EOF: + ignore = FALSE; + directive = FALSE; + break; - case SINGLE_QUOTE: - Cpp.directive.accept = FALSE; - c = skipToEndOfChar (); - break; + case TAB: + case SPACE: + break; /* ignore most white space */ - case '/': - { - const Comment comment = isComment (); + case NEWLINE: + if (directive && ! ignore) + directive = FALSE; + Cpp.directive.accept = TRUE; + break; - if (comment == COMMENT_C) - c = skipOverCComment (); - else if (comment == COMMENT_CPLUS) - { - c = skipOverCplusComment (); - if (c == NEWLINE) - fileUngetc (c); - } - else - Cpp.directive.accept = FALSE; - break; - } + case DOUBLE_QUOTE: + Cpp.directive.accept = FALSE; + c = skipToEndOfString (FALSE); + break; - case BACKSLASH: - { - int next = fileGetc (); + case '#': + if (Cpp.directive.accept) + { + directive = TRUE; + Cpp.directive.state = DRCTV_HASH; + Cpp.directive.accept = FALSE; + } + break; - if (next == NEWLINE) - continue; - else if (next == '?') - cppUngetc (next); - else - fileUngetc (next); - break; - } + case SINGLE_QUOTE: + Cpp.directive.accept = FALSE; + c = skipToEndOfChar (); + break; - case '?': - { - int next = fileGetc (); - if (next != '?') - fileUngetc (next); - else - { - next = fileGetc (); - switch (next) - { - case '(': c = '['; break; - case ')': c = ']'; break; - case '<': c = '{'; break; - case '>': c = '}'; break; - case '/': c = BACKSLASH; goto process; - case '!': c = '|'; break; - case SINGLE_QUOTE: c = '^'; break; - case '-': c = '~'; break; - case '=': c = '#'; goto process; - default: - fileUngetc (next); - cppUngetc ('?'); - break; - } - } - } break; + case '/': + { + const Comment comment = isComment (); - default: - Cpp.directive.accept = FALSE; - if (directive) - ignore = handleDirective (c); - break; - } - } while (directive || ignore); + if (comment == COMMENT_C) + c = skipOverCComment (); + else if (comment == COMMENT_CPLUS) + { + c = skipOverCplusComment (); + if (c == NEWLINE) + fileUngetc (c); + } + else + Cpp.directive.accept = FALSE; + break; + } - DebugStatement ( debugPutc (DEBUG_CPP, c); ) - DebugStatement ( if (c == NEWLINE) - debugPrintf (DEBUG_CPP, "%6ld: ", getInputLineNumber () + 1); ) + case BACKSLASH: + { + int next = fileGetc (); - return c; -} + if (next == NEWLINE) + continue; + else if (next == '?') + cppUngetc (next); + else + fileUngetc (next); + break; + } - -extern char *getArglistFromPos(fpos_t startPosition, const char *tokenName) -{ - fpos_t originalPosition; - char *result = NULL; - char *arglist = NULL; - long pos1, pos2 = ftell(File.fp); - - fgetpos(File.fp, &originalPosition); - fsetpos(File.fp, &startPosition); - pos1 = ftell(File.fp); - if (pos2 > pos1) - { - result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL) - { - fread(result, sizeof(char), pos2 - pos1 + 1, File.fp); - result[pos2-pos1+1] = '\0'; - arglist = getArglistFromStr(result, tokenName); - free(result); - } - } - fsetpos(File.fp, &originalPosition); - return arglist; -} - -typedef enum -{ - st_none_t, - st_escape_t, - st_c_comment_t, - st_cpp_comment_t, - st_double_quote_t, - st_single_quote_t -} ParseState; - -static void stripCodeBuffer(char *buf) -{ - int i = 0, pos = 0; - ParseState state = st_none_t, prev_state = st_none_t; - - while (buf[i] != '\0') - { - switch(buf[i]) - { - case '/': - if (st_none_t == state) + case '?': + { + int next = fileGetc (); + if (next != '?') + fileUngetc (next); + else { - /* Check if this is the start of a comment */ - if (buf[i+1] == '*') /* C comment */ - state = st_c_comment_t; - else if (buf[i+1] == '/') /* C++ comment */ - state = st_cpp_comment_t; - else /* Normal character */ - buf[pos++] = '/'; - } - else if (st_c_comment_t == state) - { - /* Check if this is the end of a C comment */ - if (buf[i-1] == '*') + next = fileGetc (); + switch (next) { - if ((pos > 0) && (buf[pos-1] != ' ')) - buf[pos++] = ' '; - state = st_none_t; + case '(': c = '['; break; + case ')': c = ']'; break; + case '<': c = '{'; break; + case '>': c = '}'; break; + case '/': c = BACKSLASH; goto process; + case '!': c = '|'; break; + case SINGLE_QUOTE: c = '^'; break; + case '-': c = '~'; break; + case '=': c = '#'; goto process; + default: + fileUngetc (next); + cppUngetc ('?'); + break; } } - break; - case '"': - if (st_none_t == state) - state = st_double_quote_t; - else if (st_double_quote_t == state) - state = st_none_t; - break; - case '\'': - if (st_none_t == state) - state = st_single_quote_t; - else if (st_single_quote_t == state) - state = st_none_t; - break; + } break; + default: - if ((buf[i] == '\\') && (st_escape_t != state)) + if (c == '@' && Cpp.hasAtLiteralStrings) { - prev_state = state; - state = st_escape_t; - } - else if (st_escape_t == state) - { - state = prev_state; - prev_state = st_none_t; - } - else if ((buf[i] == '\n') && (st_cpp_comment_t == state)) - { - if ((pos > 0) && (buf[pos-1] != ' ')) - buf[pos++] = ' '; - state = st_none_t; - } - else if (st_none_t == state) - { - if (isspace(buf[i])) + int next = fileGetc (); + if (next == DOUBLE_QUOTE) { - if ((pos > 0) && (buf[pos-1] != ' ')) - buf[pos++] = ' '; + Cpp.directive.accept = FALSE; + c = skipToEndOfString (TRUE); + break; } - else - buf[pos++] = buf[i]; } + Cpp.directive.accept = FALSE; + if (directive) + ignore = handleDirective (c); break; } - ++i; - } - buf[pos] = '\0'; - return; -} + } while (directive || ignore); -extern char *getArglistFromStr(char *buf, const char *name) -{ - char *start, *end; - int level; - if ((NULL == buf) || (NULL == name) || ('\0' == name[0])) - return NULL; - stripCodeBuffer(buf); - if (NULL == (start = strstr(buf, name))) - return NULL; - if (NULL == (start = strchr(start, '('))) - return NULL; - for (level = 1, end = start + 1; level > 0; ++end) - { - if ('\0' == *end) - break; - else if ('(' == *end) - ++ level; - else if (')' == *end) - -- level; - } - *end = '\0'; - return strdup(start); + DebugStatement ( debugPutc (DEBUG_CPP, c); ) + DebugStatement ( if (c == NEWLINE) + debugPrintf (DEBUG_CPP, "%6ld: ", getInputLineNumber () + 1); ) + + return c; } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ Modified: trunk/tagmanager/get.h =================================================================== --- trunk/tagmanager/get.h 2007-06-20 12:42:06 UTC (rev 1633) +++ trunk/tagmanager/get.h 2007-06-22 17:22:07 UTC (rev 1634) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -13,7 +14,7 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include "ctags.h" /* to define langType */ @@ -36,14 +37,14 @@ */ extern boolean isBraceFormat (void); extern unsigned int getDirectiveNestLevel (void); -extern void cppInit (const boolean state); +extern void cppInit (const boolean state, const boolean hasAtLiteralStrings); extern void cppTerminate (void); extern void cppBeginStatement (void); extern void cppEndStatement (void); extern void cppUngetc (const int c); extern int cppGetc (void); -extern char *getArglistFromPos(fpos_t startPosition, const char *tokenName); -extern char *getArglistFromStr(char *buf, const char *name); -#endif /* _GET_H */ +extern int skipOverCComment (void); -/* vi:set tabstop=8 shiftwidth=4: */ +#endif /* _GET_H */ + +/* vi:set tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1633] trunk
by ntrel＠users.sourceforge.net 20 Jun '07

20 Jun '07

Revision: 1633 http://svn.sourceforge.net/geany/?rev=1633&view=rev Author: ntrel Date: 2007-06-20 05:42:06 -0700 (Wed, 20 Jun 2007) Log Message: ----------- Prevent segfault when using Goto Tag from an untitled file. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-19 17:11:46 UTC (rev 1632) +++ trunk/ChangeLog 2007-06-20 12:42:06 UTC (rev 1633) @@ -1,3 +1,9 @@ +2007-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/callbacks.c: + Prevent segfault when using goto tag from an untitled file. + + 2007-06-19 Nick Treleaven <nick.treleaven(a)btinternet.com> * HACKING: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-06-19 17:11:46 UTC (rev 1632) +++ trunk/src/callbacks.c 2007-06-20 12:42:06 UTC (rev 1633) @@ -1255,8 +1255,9 @@ TRUE, tmtag->atts.entry.line)) { // first add old file as old position - navqueue_new_position(doc_list[old_idx].tm_file->file_name, - sci_get_line_from_position(doc_list[old_idx].sci, editor_info.click_pos) + 1); + if (doc_list[old_idx].tm_file) + navqueue_new_position(doc_list[old_idx].tm_file->file_name, + sci_get_line_from_position(doc_list[old_idx].sci, editor_info.click_pos) + 1); navqueue_new_position(tmtag->atts.entry.file->work_object.file_name, tmtag->atts.entry.line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1632] trunk
by ntrel＠users.sourceforge.net 19 Jun '07

19 Jun '07

Revision: 1632 http://svn.sourceforge.net/geany/?rev=1632&view=rev Author: ntrel Date: 2007-06-19 10:11:46 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Hopefully fix gtk_widget_set_sensitive assertion failed warning on Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-19 16:50:33 UTC (rev 1631) +++ trunk/ChangeLog 2007-06-19 17:11:46 UTC (rev 1632) @@ -4,6 +4,9 @@ Added 'About this file' and links for some Windows developer tools. Added notes on adding a source file to src/ and brief notes on adding a filetype. + * src/build.c: + Hopefully fix gtk_widget_set_sensitive assertion failed warning on + Windows. 2007-06-18 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-06-19 16:50:33 UTC (rev 1631) +++ trunk/src/build.c 2007-06-19 17:11:46 UTC (rev 1632) @@ -1676,7 +1676,8 @@ // simply enable next error command if the compiler window has any items have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), NULL) > 0; - gtk_widget_set_sensitive(menu_items->item_next_error, have_errors); + if (menu_items->item_next_error) + gtk_widget_set_sensitive(menu_items->item_next_error, have_errors); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1631] trunk
by ntrel＠users.sourceforge.net 19 Jun '07

19 Jun '07

Revision: 1631 http://svn.sourceforge.net/geany/?rev=1631&view=rev Author: ntrel Date: 2007-06-19 09:50:33 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Added 'About this file' and links for some Windows developer tools. Added notes on adding a source file to src/ and brief notes on adding a filetype. Modified Paths: -------------- trunk/ChangeLog trunk/HACKING Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-18 13:22:15 UTC (rev 1630) +++ trunk/ChangeLog 2007-06-19 16:50:33 UTC (rev 1631) @@ -1,3 +1,11 @@ +2007-06-19 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * HACKING: + Added 'About this file' and links for some Windows developer tools. + Added notes on adding a source file to src/ and brief notes on adding + a filetype. + + 2007-06-18 Enrico Tröger <enrico.troeger(a)uvena.de> * scintilla/*, scintilla/include/*: Updated Scintilla to version 1.74. Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2007-06-18 13:22:15 UTC (rev 1630) +++ trunk/HACKING 2007-06-19 16:50:33 UTC (rev 1631) @@ -1,3 +1,8 @@ +About this file +--------------- +This file contains information for anyone wanting to work on the Geany codebase. +You should be aware of the licenses used - see the README file or the documentation. + Patches ------- We are happy to receive patches, but it's best to check with us by email or mailing list whether a @@ -9,6 +14,11 @@ If you're not using SVN, you can use the diff command: $ diff -u originalpath modifiedpath > new-feature.patch +For Windows: +Subversion (SVN): http://subversion.tigris.org/ +diff, grep, etc: http://mingw.org/ or http://unxutils.sourceforge.net/. +See also the 'Building on Windows' document on the website. + File organization ----------------- We aim to use callbacks.c only for Glade callbacks. @@ -54,24 +64,40 @@ NOTES ===== +Some of these notes below are brief (or maybe incomplete) - please contact +the mailing list for more information. +Adding a file foo.[hc] in src/ +------------------------------ +Add foo.c, foo.h to SRCS in src/Makefile.am. +Add foo.o to OBJS in src/makefile.win32. +Add src/foo.c to po/POTFILES.in (for string translation). + +Adding a filetype +----------------- +For syntax highlighting, you will need to find (or write) a Scintilla lexer, LexFoo.cxx. +For tag parsing (e.g. for the symbol list), see 'Adding a TagManager parser' below. +Add GEANY_FILETYPES_FOO and initialize it in filetypes.[hc]. + Adding a TagManager parser -------------------------- This assumes the Geany filetype already exists. First write or find a CTags compatible parser, foo.c. Note that there are -some unapplied language patches for CTags at: +some language patches for CTags at: http://sf.net/projects/ctags - see the tracker. -Add foo.c to Makefile.am. -Add foo.o to makefile.win32. +(You can also try the Anjuta project's tagmanager codebase.) + +Add foo.c to SRCS in Makefile.am. +Add foo.o to OBJS in makefile.win32. Add Foo to parsers.h & fill in comment with parser number for foo. In foo.c: Edit FooKinds 3rd column to match a s_tag_type_names string in tm_tag.c. In filetypes.c, filetypes_init_types(): -set filetypes[GEANY_FILETYPES_FOO].lang = foo's parser number. +Set filetypes[GEANY_FILETYPES_FOO].lang = foo's parser number. In symbols.c: Update init_tag_list() for foo, listing the tm_tag_* types corresponding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1630] trunk
by eht16＠users.sourceforge.net 18 Jun '07

18 Jun '07

Revision: 1630 http://svn.sourceforge.net/geany/?rev=1630&view=rev Author: eht16 Date: 2007-06-18 06:22:15 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Fix mem leak in auto completion and prevent completion of words with trailing spaces. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-18 13:02:34 UTC (rev 1629) +++ trunk/ChangeLog 2007-06-18 13:22:15 UTC (rev 1630) @@ -1,6 +1,8 @@ 2007-06-18 Enrico Tröger <enrico.troeger(a)uvena.de> * scintilla/*, scintilla/include/*: Updated Scintilla to version 1.74. + * src/editor.c: Fix mem leak in auto completion and prevent completion + of words with trailing spaces. 2007-06-17 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-06-18 13:02:34 UTC (rev 1629) +++ trunk/src/editor.c 2007-06-18 13:22:15 UTC (rev 1630) @@ -1207,7 +1207,7 @@ gboolean editor_auto_forif(gint idx, gint pos) { - gboolean result; + gboolean result = FALSE; gchar *word; gint lexer, style; gint i; @@ -1241,18 +1241,21 @@ while (i >= 0 && word[i] != '\n' && word[i] != '\r') // we want to stay in this line('\n' check) { if (! isspace(word[i])) + { + g_free(word); return FALSE; + } i--; } - // get the indentation - if (doc_list[idx].auto_indent) - get_indent(sci, pos, TRUE); + // prevent completion of "for " + if (! isspace(sci_get_char_at(sci, pos - 1))) // pos points to the line end char so use pos -1 + { + sci_start_undo_action(sci); // needed because we insert a space separately from construct + result = ac_complete_constructs(idx, pos, word); + sci_end_undo_action(sci); + } - sci_start_undo_action(sci); // needed because we insert a space separately from construct - result = ac_complete_constructs(idx, pos, word); - sci_end_undo_action(sci); - utils_free_pointers(word, NULL); return result; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1629] trunk
by eht16＠users.sourceforge.net 18 Jun '07

18 Jun '07

Revision: 1629 http://svn.sourceforge.net/geany/?rev=1629&view=rev Author: eht16 Date: 2007-06-18 06:02:34 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Updated Scintilla to version 1.74. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/AutoComplete.cxx trunk/scintilla/AutoComplete.h trunk/scintilla/CallTip.cxx trunk/scintilla/CallTip.h trunk/scintilla/CellBuffer.cxx trunk/scintilla/CellBuffer.h trunk/scintilla/ContractionState.cxx trunk/scintilla/ContractionState.h trunk/scintilla/Document.cxx trunk/scintilla/Document.h trunk/scintilla/DocumentAccessor.cxx trunk/scintilla/DocumentAccessor.h trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/ExternalLexer.cxx trunk/scintilla/ExternalLexer.h trunk/scintilla/Indicator.cxx trunk/scintilla/Indicator.h trunk/scintilla/KeyMap.cxx trunk/scintilla/KeyMap.h trunk/scintilla/KeyWords.cxx trunk/scintilla/LexAsm.cxx trunk/scintilla/LexBash.cxx trunk/scintilla/LexCPP.cxx trunk/scintilla/LexCSS.cxx trunk/scintilla/LexCaml.cxx trunk/scintilla/LexConf.cxx trunk/scintilla/LexCrontab.cxx trunk/scintilla/LexD.cxx trunk/scintilla/LexFortran.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexHaskell.cxx trunk/scintilla/LexLua.cxx trunk/scintilla/LexOthers.cxx trunk/scintilla/LexPascal.cxx trunk/scintilla/LexPerl.cxx trunk/scintilla/LexPython.cxx trunk/scintilla/LexRuby.cxx trunk/scintilla/LexSQL.cxx trunk/scintilla/LexTCL.cxx trunk/scintilla/LexVHDL.cxx trunk/scintilla/LineMarker.cxx trunk/scintilla/LineMarker.h trunk/scintilla/Makefile.am trunk/scintilla/Partitioning.h trunk/scintilla/PlatGTK.cxx trunk/scintilla/PropSet.cxx trunk/scintilla/RESearch.cxx trunk/scintilla/RESearch.h trunk/scintilla/SVector.h trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaBase.h trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/SplitVector.h trunk/scintilla/Style.cxx trunk/scintilla/Style.h trunk/scintilla/StyleContext.cxx trunk/scintilla/StyleContext.h trunk/scintilla/UniConversion.cxx trunk/scintilla/UniConversion.h trunk/scintilla/ViewStyle.cxx trunk/scintilla/ViewStyle.h trunk/scintilla/WindowAccessor.cxx trunk/scintilla/XPM.cxx trunk/scintilla/XPM.h trunk/scintilla/include/Accessor.h trunk/scintilla/include/KeyWords.h trunk/scintilla/include/Makefile.am trunk/scintilla/include/Platform.h trunk/scintilla/include/PropSet.h trunk/scintilla/include/SString.h trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/WindowAccessor.h trunk/scintilla/makefile.win32 Added Paths: ----------- trunk/scintilla/CharacterSet.h trunk/scintilla/Decoration.cxx trunk/scintilla/Decoration.h trunk/scintilla/PositionCache.cxx trunk/scintilla/PositionCache.h trunk/scintilla/RunStyles.cxx trunk/scintilla/RunStyles.h Removed Paths: ------------- trunk/scintilla/include/Face.py trunk/scintilla/include/HFacer.py trunk/scintilla/include/Scintilla.iface Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/ChangeLog 2007-06-18 13:02:34 UTC (rev 1629) @@ -1,3 +1,8 @@ +2007-06-18 Enrico Tröger <enrico.troeger(a)uvena.de> + + * scintilla/*, scintilla/include/*: Updated Scintilla to version 1.74. + + 2007-06-17 Enrico Tröger <enrico.troeger(a)uvena.de> * src/templates.c, src/tools.c: Apply patch from Alexander Rodin to Modified: trunk/scintilla/AutoComplete.cxx =================================================================== --- trunk/scintilla/AutoComplete.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/AutoComplete.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -14,6 +14,10 @@ #include "PropSet.h" #include "AutoComplete.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + AutoComplete::AutoComplete() : active(false), separator(' '), Modified: trunk/scintilla/AutoComplete.h =================================================================== --- trunk/scintilla/AutoComplete.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/AutoComplete.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef AUTOCOMPLETE_H #define AUTOCOMPLETE_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** */ class AutoComplete { @@ -67,4 +71,8 @@ void Select(const char *word); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/CallTip.cxx =================================================================== --- trunk/scintilla/CallTip.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/CallTip.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -12,7 +12,12 @@ #include "Scintilla.h" #include "CallTip.h" +#include <stdio.h> +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + static const int insetX = 5; // text inset in x from calltip border static const int widthArrow = 14; @@ -29,8 +34,14 @@ tabSize = 0; useStyleCallTip = false; // for backwards compatibility +#ifdef __APPLE__ + // proper apple colours for the default + colourBG.desired = ColourDesired(0xff, 0xff, 0xc6); + colourUnSel.desired = ColourDesired(0, 0, 0); +#else colourBG.desired = ColourDesired(0xff, 0xff, 0xff); colourUnSel.desired = ColourDesired(0x80, 0x80, 0x80); +#endif colourSel.desired = ColourDesired(0, 0, 0x80); colourShade.desired = ColourDesired(0, 0, 0); colourLight.desired = ColourDesired(0xc0, 0xc0, 0xc0); @@ -170,6 +181,7 @@ char *chunkVal = val; bool moreChunks = true; int maxWidth = 0; + while (moreChunks) { char *chunkEnd = strchr(chunkVal, '\n'); if (chunkEnd == NULL) { @@ -217,6 +229,8 @@ offsetMain = insetX; // initial alignment assuming no arrows PaintContents(surfaceWindow, true); +#ifndef __APPLE__ + // OSX doesn't put borders on "help tags" // Draw a raised border around the edges of the window surfaceWindow->MoveTo(0, rcClientSize.bottom - 1); surfaceWindow->PenColour(colourShade.allocated); @@ -225,6 +239,7 @@ surfaceWindow->PenColour(colourLight.allocated); surfaceWindow->LineTo(0, 0); surfaceWindow->LineTo(0, rcClientSize.bottom - 1); +#endif } void CallTip::MouseClick(Point pt) { Modified: trunk/scintilla/CallTip.h =================================================================== --- trunk/scintilla/CallTip.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/CallTip.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef CALLTIP_H #define CALLTIP_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** */ class CallTip { @@ -76,4 +80,8 @@ void SetForeBack(const ColourPair &fore, const ColourPair &back); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/CellBuffer.cxx =================================================================== --- trunk/scintilla/CellBuffer.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/CellBuffer.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -18,6 +18,10 @@ #include "Partitioning.h" #include "CellBuffer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + MarkerHandleSet::MarkerHandleSet() { root = 0; } Modified: trunk/scintilla/CellBuffer.h =================================================================== --- trunk/scintilla/CellBuffer.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/CellBuffer.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef CELLBUFFER_H #define CELLBUFFER_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** * This holds the marker identifier and the marker type to display. * MarkerHandleNumbers are members of lists. @@ -228,4 +232,8 @@ void ClearLevels(); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Added: trunk/scintilla/CharacterSet.h =================================================================== --- trunk/scintilla/CharacterSet.h (rev 0) +++ trunk/scintilla/CharacterSet.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -0,0 +1,58 @@ +// Scintilla source code edit control +/** @file CharacterSet.h + ** Encapsulates a set of characters. Used to test if a character is within a set. + **/ +// Copyright 2007 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +class CharacterSet { + int size; + bool valueAfter; + bool *bset; +public: + enum setBase { + setNone=0, + setLower=1, + setUpper=2, + setDigits=4, + setAlpha=setLower|setUpper, + setAlphaNum=setAlpha|setDigits + }; + CharacterSet(setBase base=setNone, const char *initialSet="", int size_=0x80, bool valueAfter_=false) { + size = size_; + valueAfter = valueAfter_; + bset = new bool[size]; + for (int i=0; i < size; i++) { + bset[i] = false; + } + AddString(initialSet); + if (base & setLower) + AddString("abcdefghijklmnopqrstuvwxyz"); + if (base & setUpper) + AddString("ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + if (base & setDigits) + AddString("0123456789"); + } + ~CharacterSet() { + delete []bset; + bset = 0; + size = 0; + } + void Add(int val) { + PLATFORM_ASSERT(val >= 0); + PLATFORM_ASSERT(val < size); + bset[val] = true; + } + void AddString(const char *CharacterSet) { + for (const char *cp=CharacterSet; *cp; cp++) { + int val = static_cast<unsigned char>(*cp); + PLATFORM_ASSERT(val >= 0); + PLATFORM_ASSERT(val < size); + bset[val] = true; + } + } + bool Contains(int val) const { + PLATFORM_ASSERT(val >= 0); + return (val < size) ? bset[val] : valueAfter; + } +}; Modified: trunk/scintilla/ContractionState.cxx =================================================================== --- trunk/scintilla/ContractionState.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/ContractionState.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -9,6 +9,10 @@ #include "ContractionState.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + OneLine::OneLine() { displayLine = 0; //docLine = 0; Modified: trunk/scintilla/ContractionState.h =================================================================== --- trunk/scintilla/ContractionState.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/ContractionState.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef CONTRACTIONSTATE_H #define CONTRACTIONSTATE_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** */ class OneLine { @@ -62,4 +66,8 @@ void ShowAll(); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Added: trunk/scintilla/Decoration.cxx =================================================================== --- trunk/scintilla/Decoration.cxx (rev 0) +++ trunk/scintilla/Decoration.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -0,0 +1,188 @@ +/** @file Decoration.cxx + ** Visual elements added over text. + **/ +// Copyright 1998-2007 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "Scintilla.h" +#include "SplitVector.h" +#include "Partitioning.h" +#include "RunStyles.h" +#include "Decoration.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +Decoration::Decoration(int indicator_) : next(0), indicator(indicator_) { +} + +Decoration::~Decoration() { +} + +bool Decoration::Empty() { + return rs.starts->Partitions() == 1; +} + +DecorationList::DecorationList() : currentIndicator(0), currentValue(1), current(0), + lengthDocument(0), root(0), clickNotified(false) { +} + +DecorationList::~DecorationList() { + Decoration *deco = root; + while (deco) { + Decoration *decoNext = deco->next; + delete deco; + deco = decoNext; + } + root = 0; + current = 0; +} + +Decoration *DecorationList::DecorationFromIndicator(int indicator) { + for (Decoration *deco=root; deco; deco = deco->next) { + if (deco->indicator == indicator) { + return deco; + } + } + return 0; +} + +Decoration *DecorationList::Create(int indicator, int length) { + currentIndicator = indicator; + Decoration *decoNew = new Decoration(indicator); + decoNew->rs.InsertSpace(0, length); + + Decoration *decoPrev = 0; + Decoration *deco = root; + + while (deco && (deco->indicator < indicator)) { + decoPrev = deco; + deco = deco->next; + } + if (decoPrev == 0) { + decoNew->next = root; + root = decoNew; + } else { + decoNew->next = deco; + decoPrev->next = decoNew; + } + return decoNew; +} + +void DecorationList::Delete(int indicator) { + Decoration *decoToDelete = 0; + if (root) { + if (root->indicator == indicator) { + decoToDelete = root; + root = root->next; + } else { + Decoration *deco=root; + while (deco->next && !decoToDelete) { + if (deco->next && deco->next->indicator == indicator) { + decoToDelete = deco->next; + deco->next = decoToDelete->next; + } else { + deco = deco->next; + } + } + } + } + if (decoToDelete) { + delete decoToDelete; + current = 0; + } +} + +void DecorationList::SetCurrentIndicator(int indicator) { + currentIndicator = indicator; + current = DecorationFromIndicator(indicator); + currentValue = 1; +} + +void DecorationList::SetCurrentValue(int value) { + currentValue = value ? value : 1; +} + +bool DecorationList::FillRange(int &position, int value, int &fillLength) { + if (!current) { + current = DecorationFromIndicator(currentIndicator); + if (!current) { + current = Create(currentIndicator, lengthDocument); + } + } + bool changed = current->rs.FillRange(position, value, fillLength); + if (current->Empty()) { + Delete(currentIndicator); + } + return changed; +} + +void DecorationList::InsertSpace(int position, int insertLength) { + lengthDocument += insertLength; + for (Decoration *deco=root; deco; deco = deco->next) { + deco->rs.InsertSpace(position, insertLength); + } +} + +void DecorationList::DeleteRange(int position, int deleteLength) { + lengthDocument -= deleteLength; + Decoration *deco; + for (deco=root; deco; deco = deco->next) { + deco->rs.DeleteRange(position, deleteLength); + } + DeleteAnyEmpty(); +} + +void DecorationList::DeleteAnyEmpty() { + Decoration *deco = root; + while (deco) { + if (deco->Empty()) { + Delete(deco->indicator); + deco = root; + } else { + deco = deco->next; + } + } +} + +int DecorationList::AllOnFor(int position) { + int mask = 0; + for (Decoration *deco=root; deco; deco = deco->next) { + if (deco->rs.ValueAt(position)) { + mask |= 1 << deco->indicator; + } + } + return mask; +} + +int DecorationList::ValueAt(int indicator, int position) { + Decoration *deco = DecorationFromIndicator(indicator); + if (deco) { + return deco->rs.ValueAt(position); + } + return 0; +} + +int DecorationList::Start(int indicator, int position) { + Decoration *deco = DecorationFromIndicator(indicator); + if (deco) { + return deco->rs.StartRun(position); + } + return 0; +} + +int DecorationList::End(int indicator, int position) { + Decoration *deco = DecorationFromIndicator(indicator); + if (deco) { + return deco->rs.EndRun(position); + } + return 0; +} Added: trunk/scintilla/Decoration.h =================================================================== --- trunk/scintilla/Decoration.h (rev 0) +++ trunk/scintilla/Decoration.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -0,0 +1,64 @@ +/** @file Decoration.h + ** Visual elements added over text. + **/ +// Copyright 1998-2007 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef DECORATION_H +#define DECORATION_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +class Decoration { +public: + Decoration *next; + RunStyles rs; + int indicator; + + Decoration(int indicator_); + ~Decoration(); + + bool Empty(); +}; + +class DecorationList { + int currentIndicator; + int currentValue; + Decoration *current; + int lengthDocument; + Decoration *DecorationFromIndicator(int indicator); + Decoration *Create(int indicator, int length); + void Delete(int indicator); + void DeleteAnyEmpty(); +public: + Decoration *root; + bool clickNotified; + + DecorationList(); + ~DecorationList(); + + void SetCurrentIndicator(int indicator); + int GetCurrentIndicator() { return currentIndicator; } + + void SetCurrentValue(int value); + int GetCurrentValue() { return currentValue; } + + // Returns true if some values may have changed + bool FillRange(int &position, int value, int &fillLength); + + void InsertSpace(int position, int insertLength); + void DeleteRange(int position, int deleteLength); + + int AllOnFor(int position); + int ValueAt(int indicator, int position); + int Start(int indicator, int position); + int End(int indicator, int position); +}; + +#ifdef SCI_NAMESPACE +} +#endif + +#endif Modified: trunk/scintilla/Document.cxx =================================================================== --- trunk/scintilla/Document.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Document.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -16,11 +16,17 @@ #include "SVector.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" #include "RESearch.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + // This is ASCII specific but is safe with chars >= 0x80 static inline bool isspacechar(unsigned char ch) { return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d)); @@ -55,7 +61,8 @@ stylingMask = 0; endStyled = 0; styleClock = 0; - enteredCount = 0; + enteredModification = 0; + enteredStyling = 0; enteredReadOnlyCount = 0; tabInChars = 8; indentInChars = 0; @@ -263,7 +270,9 @@ if (ch < 0x80) return 1; int len = 2; - if (ch >= (0x80 + 0x40 + 0x20)) + if (ch >= (0x80 + 0x40 + 0x20 + 0x10)) + len = 4; + else if (ch >= (0x80 + 0x40 + 0x20)) len = 3; int lengthDoc = Length(); if ((pos + len) > lengthDoc) @@ -369,10 +378,10 @@ if ((pos + len) > Length()) return false; CheckReadOnly(); - if (enteredCount != 0) { + if (enteredModification != 0) { return false; } else { - enteredCount++; + enteredModification++; if (!cb.IsReadOnly()) { NotifyModified( DocModification( @@ -395,7 +404,7 @@ pos, len, LinesTotal() - prevLinesTotal, text)); } - enteredCount--; + enteredModification--; } return !cb.IsReadOnly(); } @@ -408,10 +417,10 @@ return false; } CheckReadOnly(); - if (enteredCount != 0) { + if (enteredModification != 0) { return false; } else { - enteredCount++; + enteredModification++; if (!cb.IsReadOnly()) { NotifyModified( DocModification( @@ -431,7 +440,7 @@ position, insertLength, LinesTotal() - prevLinesTotal, text)); } - enteredCount--; + enteredModification--; } return !cb.IsReadOnly(); } @@ -439,8 +448,8 @@ int Document::Undo() { int newPos = -1; CheckReadOnly(); - if (enteredCount == 0) { - enteredCount++; + if (enteredModification == 0) { + enteredModification++; if (!cb.IsReadOnly()) { bool startSavePoint = cb.IsSavePoint(); bool multiLine = false; @@ -487,7 +496,7 @@ if (startSavePoint != endSavePoint) NotifySavePoint(endSavePoint); } - enteredCount--; + enteredModification--; } return newPos; } @@ -495,8 +504,8 @@ int Document::Redo() { int newPos = -1; CheckReadOnly(); - if (enteredCount == 0) { - enteredCount++; + if (enteredModification == 0) { + enteredModification++; if (!cb.IsReadOnly()) { bool startSavePoint = cb.IsSavePoint(); bool multiLine = false; @@ -541,7 +550,7 @@ if (startSavePoint != endSavePoint) NotifySavePoint(endSavePoint); } - enteredCount--; + enteredModification--; } return newPos; } @@ -671,7 +680,7 @@ return column; } else { column++; - i = MovePositionOutsideChar(i + 1, 1); + i = MovePositionOutsideChar(i + 1, 1, false); } } } @@ -693,7 +702,7 @@ return position; } else { columnCurrent++; - position = MovePositionOutsideChar(position + 1, 1); + position = MovePositionOutsideChar(position + 1, 1, false); } } } @@ -1275,10 +1284,10 @@ } bool Document::SetStyleFor(int length, char style) { - if (enteredCount != 0) { + if (enteredStyling != 0) { return false; } else { - enteredCount++; + enteredStyling++; style &= stylingMask; int prevEndStyled = endStyled; if (cb.SetStyleFor(endStyled, length, style, stylingMask)) { @@ -1287,16 +1296,16 @@ NotifyModified(mh); } endStyled += length; - enteredCount--; + enteredStyling--; return true; } } bool Document::SetStyles(int length, char *styles) { - if (enteredCount != 0) { + if (enteredStyling != 0) { return false; } else { - enteredCount++; + enteredStyling++; bool didChange = false; int startMod = 0; int endMod = 0; @@ -1315,20 +1324,19 @@ startMod, endMod - startMod + 1); NotifyModified(mh); } - enteredCount--; + enteredStyling--; return true; } } -bool Document::EnsureStyledTo(int pos) { - if (pos > GetEndStyled()) { +void Document::EnsureStyledTo(int pos) { + if ((enteredStyling == 0) && (pos > GetEndStyled())) { IncrementStyleClock(); // 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(); } void Document::IncrementStyleClock() { @@ -1338,6 +1346,14 @@ } } +void Document::DecorationFillRange(int position, int value, int fillLength) { + if (decorations.FillRange(position, value, fillLength)) { + DocModification mh(SC_MOD_CHANGEINDICATOR | SC_PERFORMED_USER, + position, fillLength); + NotifyModified(mh); + } +} + bool Document::AddWatcher(DocWatcher *watcher, void *userData) { for (int i = 0; i < lenWatchers; i++) { if ((watchers[i].watcher == watcher) && Modified: trunk/scintilla/Document.h =================================================================== --- trunk/scintilla/Document.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Document.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef DOCUMENT_H #define DOCUMENT_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** * 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. @@ -97,7 +101,8 @@ char stylingMask; int endStyled; int styleClock; - int enteredCount; + int enteredModification; + int enteredStyling; int enteredReadOnlyCount; WatcherWithUserData *watchers; @@ -121,6 +126,8 @@ bool tabIndents; bool backspaceUnindents; + DecorationList decorations; + Document(); virtual ~Document(); @@ -212,9 +219,10 @@ bool SetStyleFor(int length, char style); bool SetStyles(int length, char *styles); int GetEndStyled() { return endStyled; } - bool EnsureStyledTo(int pos); + void EnsureStyledTo(int pos); int GetStyleClock() { return styleClock; } void IncrementStyleClock(); + void DecorationFillRange(int position, int value, int fillLength); int SetLineState(int line, int state) { return cb.SetLineState(line, state); } int GetLineState(int line) { return cb.GetLineState(line); } @@ -301,4 +309,8 @@ virtual void NotifyStyleNeeded(Document *doc, void *userData, int endPos) = 0; }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/DocumentAccessor.cxx =================================================================== --- trunk/scintilla/DocumentAccessor.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/DocumentAccessor.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -18,11 +18,17 @@ #include "DocumentAccessor.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "Scintilla.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + DocumentAccessor::~DocumentAccessor() { } @@ -105,8 +111,9 @@ void DocumentAccessor::ColourTo(unsigned int pos, int chAttr) { // Only perform styling if non empty range if (pos != startSeg - 1) { + PLATFORM_ASSERT(pos >= startSeg); if (pos < startSeg) { - Platform::DebugPrintf("Bad colour positions %d - %d\n", startSeg, pos); + return; } if (validLen + (pos - startSeg + 1) >= bufferSize) @@ -187,3 +194,7 @@ return indent; } +void DocumentAccessor::IndicatorFill(int start, int end, int indicator, int value) { + pdoc->decorations.SetCurrentIndicator(indicator); + pdoc->DecorationFillRange(start, value, end - start); +} Modified: trunk/scintilla/DocumentAccessor.h =================================================================== --- trunk/scintilla/DocumentAccessor.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/DocumentAccessor.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -6,6 +6,10 @@ // Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + class Document; /** @@ -64,4 +68,9 @@ void ColourTo(unsigned int pos, int chAttr); void SetLevel(int line, int level); int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0); + void IndicatorFill(int start, int end, int indicator, int value); }; + +#ifdef SCI_NAMESPACE +} +#endif Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Editor.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -23,15 +23,22 @@ #include "Partitioning.h" #include "CellBuffer.h" #include "KeyMap.h" +#include "RunStyles.h" #include "Indicator.h" #include "XPM.h" #include "LineMarker.h" #include "Style.h" #include "ViewStyle.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" +#include "PositionCache.h" #include "Editor.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + /* return whether this modification represents an operation that may reasonably be deferred (not done now OR [possibly] at all) @@ -72,268 +79,11 @@ Idler::Idler() : state(false), idlerID(0) {} -LineLayout::LineLayout(int maxLineLength_) : - lineStarts(0), - lenLineStarts(0), - lineNumber(-1), - inCache(false), - maxLineLength(-1), - numCharsInLine(0), - validity(llInvalid), - xHighlightGuide(0), - highlightColumn(0), - selStart(0), - selEnd(0), - containsCaret(false), - edgeColumn(0), - chars(0), - styles(0), - styleBitsSet(0), - indicators(0), - positions(0), - hsStart(0), - hsEnd(0), - widthLine(wrapWidthInfinite), - lines(1) { - Resize(maxLineLength_); +static inline bool IsControlCharacter(int ch) { + // iscntrl returns true for lots of chars > 127 which are displayable + return ch >= 0 && ch < ' '; } -LineLayout::~LineLayout() { - Free(); -} - -void LineLayout::Resize(int maxLineLength_) { - if (maxLineLength_ > maxLineLength) { - Free(); - chars = new char[maxLineLength_ + 1]; - styles = new unsigned char[maxLineLength_ + 1]; - indicators = new char[maxLineLength_ + 1]; - // Extra position allocated as sometimes the Windows - // GetTextExtentExPoint API writes an extra element. - positions = new int[maxLineLength_ + 1 + 1]; - maxLineLength = maxLineLength_; - } -} - -void LineLayout::Free() { - delete []chars; - chars = 0; - delete []styles; - styles = 0; - delete []indicators; - indicators = 0; - delete []positions; - positions = 0; - delete []lineStarts; - lineStarts = 0; -} - -void LineLayout::Invalidate(validLevel validity_) { - if (validity > validity_) - validity = validity_; -} - -void LineLayout::SetLineStart(int line, int start) { - if ((line >= lenLineStarts) && (line != 0)) { - int newMaxLines = line + 20; - int *newLineStarts = new int[newMaxLines]; - if (!newLineStarts) - return; - for (int i = 0; i < newMaxLines; i++) { - if (i < lenLineStarts) - newLineStarts[i] = lineStarts[i]; - else - newLineStarts[i] = 0; - } - delete []lineStarts; - lineStarts = newLineStarts; - lenLineStarts = newMaxLines; - } - lineStarts[line] = start; -} - -void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[], - char bracesMatchStyle, int xHighlight) { - if (rangeLine.ContainsCharacter(braces[0])) { - int braceOffset = braces[0] - rangeLine.start; - if (braceOffset < numCharsInLine) { - bracePreviousStyles[0] = styles[braceOffset]; - styles[braceOffset] = bracesMatchStyle; - } - } - if (rangeLine.ContainsCharacter(braces[1])) { - int braceOffset = braces[1] - rangeLine.start; - if (braceOffset < numCharsInLine) { - bracePreviousStyles[1] = styles[braceOffset]; - styles[braceOffset] = bracesMatchStyle; - } - } - if ((braces[0] >= rangeLine.start && braces[1] <= rangeLine.end) || - (braces[1] >= rangeLine.start && braces[0] <= rangeLine.end)) { - xHighlightGuide = xHighlight; - } -} - -void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[]) { - if (rangeLine.ContainsCharacter(braces[0])) { - int braceOffset = braces[0] - rangeLine.start; - if (braceOffset < numCharsInLine) { - styles[braceOffset] = bracePreviousStyles[0]; - } - } - if (rangeLine.ContainsCharacter(braces[1])) { - int braceOffset = braces[1] - rangeLine.start; - if (braceOffset < numCharsInLine) { - styles[braceOffset] = bracePreviousStyles[1]; - } - } - xHighlightGuide = 0; -} - -LineLayoutCache::LineLayoutCache() : - level(0), length(0), size(0), cache(0), - allInvalidated(false), styleClock(-1), useCount(0) { - Allocate(0); -} - -LineLayoutCache::~LineLayoutCache() { - Deallocate(); -} - -void LineLayoutCache::Allocate(int length_) { - PLATFORM_ASSERT(cache == NULL); - allInvalidated = false; - length = length_; - size = length; - if (size > 1) { - size = (size / 16 + 1) * 16; - } - if (size > 0) { - cache = new LineLayout * [size]; - } - for (int i = 0; i < size; i++) - cache[i] = 0; -} - -void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) { - PLATFORM_ASSERT(useCount == 0); - int lengthForLevel = 0; - if (level == llcCaret) { - lengthForLevel = 1; - } else if (level == llcPage) { - lengthForLevel = linesOnScreen + 1; - } else if (level == llcDocument) { - lengthForLevel = linesInDoc; - } - if (lengthForLevel > size) { - Deallocate(); - Allocate(lengthForLevel); - } else { - if (lengthForLevel < length) { - for (int i = lengthForLevel; i < length; i++) { - delete cache[i]; - cache[i] = 0; - } - } - length = lengthForLevel; - } - PLATFORM_ASSERT(length == lengthForLevel); - PLATFORM_ASSERT(cache != NULL || length == 0); -} - -void LineLayoutCache::Deallocate() { - PLATFORM_ASSERT(useCount == 0); - for (int i = 0; i < length; i++) - delete cache[i]; - delete []cache; - cache = 0; - length = 0; - size = 0; -} - -void LineLayoutCache::Invalidate(LineLayout::validLevel validity_) { - if (cache && !allInvalidated) { - for (int i = 0; i < length; i++) { - if (cache[i]) { - cache[i]->Invalidate(validity_); - } - } - if (validity_ == LineLayout::llInvalid) { - allInvalidated = true; - } - } -} - -void LineLayoutCache::SetLevel(int level_) { - allInvalidated = false; - if ((level_ != -1) && (level != level_)) { - level = level_; - Deallocate(); - } -} - -LineLayout *LineLayoutCache::Retrieve(int lineNumber, int lineCaret, int maxChars, int styleClock_, - int linesOnScreen, int linesInDoc) { - AllocateForLevel(linesOnScreen, linesInDoc); - if (styleClock != styleClock_) { - Invalidate(LineLayout::llCheckTextAndStyle); - styleClock = styleClock_; - } - allInvalidated = false; - int pos = -1; - LineLayout *ret = 0; - if (level == llcCaret) { - pos = 0; - } else if (level == llcPage) { - if (lineNumber == lineCaret) { - pos = 0; - } else if (length > 1) { - pos = 1 + (lineNumber % (length - 1)); - } - } else if (level == llcDocument) { - pos = lineNumber; - } - if (pos >= 0) { - PLATFORM_ASSERT(useCount == 0); - if (cache && (pos < length)) { - if (cache[pos]) { - if ((cache[pos]->lineNumber != lineNumber) || - (cache[pos]->maxLineLength < maxChars)) { - delete cache[pos]; - cache[pos] = 0; - } - } - if (!cache[pos]) { - cache[pos] = new LineLayout(maxChars); - } - if (cache[pos]) { - cache[pos]->lineNumber = lineNumber; - cache[pos]->inCache = true; - ret = cache[pos]; - useCount++; - } - } - } - - if (!ret) { - ret = new LineLayout(maxChars); - ret->lineNumber = lineNumber; - } - - return ret; -} - -void LineLayoutCache::Dispose(LineLayout *ll) { - allInvalidated = false; - if (ll) { - if (!ll->inCache) { - delete ll; - } else { - useCount--; - } - } -} - Editor::Editor() { ctrlID = 0; @@ -360,7 +110,7 @@ dwelling = false; ptMouseLast.x = 0; ptMouseLast.y = 0; - inDragDrop = false; + inDragDrop = ddNone; dropWentOutside = false; posDrag = invalidPosition; posDrop = invalidPosition; @@ -444,6 +194,7 @@ hsEnd = -1; llc.SetLevel(LineLayoutCache::llcCaret); + posCache.SetSize(0x400); } Editor::~Editor() { @@ -476,6 +227,7 @@ palette.Release(); DropGraphics(); llc.Invalidate(LineLayout::llInvalid); + posCache.Clear(); if (selType == selRectangle) { xStartSelect = XFromPosition(anchor); xEndSelect = XFromPosition(currentPos); @@ -548,11 +300,6 @@ } } -static inline bool IsControlCharacter(int ch) { - // iscntrl returns true for lots of chars > 127 which are displayable - return ch >= 0 && ch < ' '; -} - const char *ControlCharacterString(unsigned char ch) { const char *reps[] = { "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL", @@ -592,6 +339,10 @@ } }; +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** * Allows to iterate through the lines of a selection. * Althought it can be called for a stream selection, in most cases @@ -670,6 +421,10 @@ } }; +#ifdef SCI_NAMESPACE +} +#endif + Point Editor::LocationFromPosition(int pos) { Point pt; RefreshStyleData(); @@ -724,10 +479,6 @@ posTopLine = pdoc->LineStart(cs.DocFromDisplay(topLine)); } -static inline bool IsEOLChar(char ch) { - return (ch == '\r') || (ch == '\n'); -} - int Editor::PositionFromLocation(Point pt) { RefreshStyleData(); pt.x = pt.x - vs.fixedColumnWidth + xOffset; @@ -750,18 +501,19 @@ int subLine = visibleLine - lineStartSet; if (subLine < ll->lines) { int lineStart = ll->LineStart(subLine); - int lineEnd = ll->LineStart(subLine + 1); + int lineEnd = ll->LineLastVisible(subLine); int subLineStart = ll->positions[lineStart]; if (actualWrapVisualStartIndent != 0) { if (lineStart != 0) // Wrapped pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth; } - for (int i = lineStart; i < lineEnd; i++) { - if (pt.x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) || - IsEOLChar(ll->chars[i])) { + int i = ll->FindBefore(pt.x + subLineStart, lineStart, lineEnd); + while (i < lineEnd) { + if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { return pdoc->MovePositionOutsideChar(i + posLineStart, 1); } + i++; } return lineEnd + posLineStart; } @@ -799,18 +551,19 @@ int subLine = visibleLine - lineStartSet; if (subLine < ll->lines) { int lineStart = ll->LineStart(subLine); - int lineEnd = ll->LineStart(subLine + 1); + int lineEnd = ll->LineLastVisible(subLine); int subLineStart = ll->positions[lineStart]; if (actualWrapVisualStartIndent != 0) { if (lineStart != 0) // Wrapped pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth; } - for (int i = lineStart; i < lineEnd; i++) { - if (pt.x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) || - IsEOLChar(ll->chars[i])) { + int i = ll->FindBefore(pt.x + subLineStart, lineStart, lineEnd); + while (i < lineEnd) { + if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { return pdoc->MovePositionOutsideChar(i + posLineStart, 1); } + i++; } if (pt.x < (ll->positions[lineEnd] - subLineStart)) { return pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1); @@ -839,19 +592,20 @@ retVal = ll->numCharsInLine + posLineStart; int subLine = 0; int lineStart = ll->LineStart(subLine); - int lineEnd = ll->LineStart(subLine + 1); + int lineEnd = ll->LineLastVisible(subLine); int subLineStart = ll->positions[lineStart]; if (actualWrapVisualStartIndent != 0) { if (lineStart != 0) // Wrapped x -= actualWrapVisualStartIndent * vs.aveCharWidth; } - for (int i = lineStart; i < lineEnd; i++) { - if (x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) || - IsEOLChar(ll->chars[i])) { + int i = ll->FindBefore(x + subLineStart, lineStart, lineEnd); + while (i < lineEnd) { + if ((x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { retVal = pdoc->MovePositionOutsideChar(i + posLineStart, 1); break; } + i++; } } return retVal; @@ -1125,7 +879,7 @@ ShowCaretAtCurrentPosition(); // Perform redraw rather than scroll if many lines would be redrawn anyway. #ifndef UNDER_CE - if (abs(linesToMove) <= 10) { + if ((abs(linesToMove) <= 10) && (paintState == notPainting)) { ScrollText(linesToMove); } else { Redraw(); @@ -1439,6 +1193,10 @@ xOffsetNew = pt.x + xOffset - rcClient.left; } else if (pt.x + xOffset >= rcClient.right + xOffsetNew) { xOffsetNew = pt.x + xOffset - rcClient.right + 1; + if (vs.caretStyle == CARETSTYLE_BLOCK) { + // Ensure we can see a good portion of the block caret + xOffsetNew += vs.aveCharWidth; + } } if (xOffsetNew < 0) { xOffsetNew = 0; @@ -1627,6 +1385,7 @@ if (prevNonWS) { // Ensure at least one space separating previous lines pdoc->InsertChar(pos, ' '); + targetEnd++; } } else { prevNonWS = pdoc->CharAt(pos) != ' '; @@ -1910,10 +1669,6 @@ surface->LineTo(xhead, ymid + ydiff); } -static bool IsSpaceOrTab(char ch) { - return ch == ' ' || ch == '\t'; -} - LineLayout *Editor::RetrieveLineLayout(int lineNumber) { int posLineStart = pdoc->LineStart(lineNumber); int posLineEnd = pdoc->LineStart(lineNumber + 1); @@ -1932,6 +1687,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll, int width) { if (!ll) return; + PLATFORM_ASSERT(line < pdoc->LinesTotal()); PLATFORM_ASSERT(ll->chars != NULL); int posLineStart = pdoc->LineStart(line); @@ -2067,7 +1823,7 @@ ll->positions[charInLine + 1] = vstyle.styles[ll->styles[charInLine]].spaceWidth; } else { lastSegItalics = vstyle.styles[ll->styles[charInLine]].italic; - surface->MeasureWidths(vstyle.styles[ll->styles[charInLine]].font, ll->chars + startseg, + posCache.MeasureWidths(surface, vstyle, ll->styles[charInLine], ll->chars + startseg, lenSeg, ll->positions + startseg + 1); } } @@ -2107,8 +1863,6 @@ } ll->lines = 0; // Calculate line start positions based upon width. - // For now this is simplistic - wraps on byte rather than character and - // in the middle of words. Should search for spaces or style changes. int lastGoodBreak = 0; int lastLineStart = 0; int startOffset = 0; @@ -2173,7 +1927,7 @@ return vsDraw.edgecolour.allocated; if (inHotspot && vsDraw.hotspotBackgroundSet) return vsDraw.hotspotBackground.allocated; - if (overrideBackground) + if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD)) return background; } return vsDraw.styles[styleMain].back.allocated; @@ -2307,6 +2061,73 @@ } } +void Editor::DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under) { + // Draw decorators + const int posLineStart = pdoc->LineStart(line); + const int lineStart = ll->LineStart(subLine); + const int subLineStart = ll->positions[lineStart]; + const int posLineEnd = posLineStart + lineEnd; + + if (!under) { + // Draw indicators + // foreach indicator... + for (int indicnum = 0, mask = 1 << pdoc->stylingBits; mask < 0x100; indicnum++) { + if (!(mask & ll->styleBitsSet)) { + mask <<= 1; + continue; + } + int startPos = -1; + // foreach style pos in line... + for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) { + // look for starts... + if (startPos < 0) { + // NOT in indicator run, looking for START + if (indicPos < lineEnd && (ll->indicators[indicPos] & mask)) + startPos = indicPos; + } + // ... or ends + if (startPos >= 0) { + // IN indicator run, looking for END + if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) { + // AT end of indicator run, DRAW it! + PRectangle rcIndic( + ll->positions[startPos] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent, + ll->positions[indicPos] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent + 3); + vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine); + // RESET control var + startPos = -1; + } + } + } + mask <<= 1; + } + } + + for (Decoration *deco=pdoc->decorations.root; deco; deco = deco->next) { + if (under == vsDraw.indicators[deco->indicator].under) { + int startPos = posLineStart + subLineStart; + if (!deco->rs.ValueAt(startPos)) { + startPos = deco->rs.EndRun(startPos); + } + while ((startPos < posLineEnd) && (deco->rs.ValueAt(startPos))) { + int endPos = deco->rs.EndRun(startPos); + if (endPos > posLineEnd) + endPos = posLineEnd; + PRectangle rcIndic( + ll->positions[startPos - posLineStart] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent, + ll->positions[endPos - posLineStart] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent + 3); + vsDraw.indicators[deco->indicator].Draw(surface, rcIndic, rcLine); + startPos = deco->rs.EndRun(endPos); + } + } + } +} + void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine) { @@ -2373,6 +2194,10 @@ lineEnd = ll->LineStart(subLine + 1); } + ColourAllocated wrapColour = vsDraw.styles[STYLE_DEFAULT].fore.allocated; + if (vsDraw.whitespaceForegroundSet) + wrapColour = vsDraw.whitespaceForeground.allocated; + bool drawWrapMarkEnd = false; if (wrapVisualFlags & SC_WRAPVISUALFLAG_END) { @@ -2396,7 +2221,8 @@ rcPlace.right = rcPlace.left + actualWrapVisualStartIndent * vsDraw.aveCharWidth; // default bgnd here.. - surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated); + surface->FillRectangle(rcSegment, overrideBackground ? background : + vsDraw.styles[STYLE_DEFAULT].back.allocated); // main line style would be below but this would be inconsistent with end markers // also would possibly not be the style at wrap point @@ -2410,273 +2236,253 @@ else rcPlace.right = rcPlace.left + vsDraw.aveCharWidth; - DrawWrapMarker(surface, rcPlace, false, vsDraw.whitespaceForeground.allocated); + DrawWrapMarker(surface, rcPlace, false, wrapColour); } xStart += actualWrapVisualStartIndent * vsDraw.aveCharWidth; } } - int i; + // Does not take margin into account but not significant + int xStartVisible = subLineStart - xStart; + BreakFinder bfBack(ll, lineStart, lineEnd, posLineStart, xStartVisible); + int next = bfBack.First(); + // Background drawing loop - for (i = lineStart; twoPhaseDraw && (i < lineEnd); i++) { + while (twoPhaseDraw && (next < lineEnd)) { + startseg = next; + next = bfBack.Next(); + int i = next - 1; int iDoc = i + posLineStart; - // If there is the end of a style run for any reason - if ((ll->styles[i] != ll->styles[i + 1]) || - i == (lineEnd - 1) || - IsControlCharacter(ll->chars[i]) || IsControlCharacter(ll->chars[i + 1]) || - ((ll->selStart != ll->selEnd) && ((iDoc + 1 == ll->selStart) || (iDoc + 1 == ll->selEnd))) || - (i == (ll->edgeColumn - 1))) { - rcSegment.left = ll->positions[startseg] + xStart - subLineStart; - rcSegment.right = ll->positions[i + 1] + xStart - subLineStart; - // Only try to draw if really visible - enhances performance by not calling environment to - // draw strings that are completely past the right side of the window. - if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) { - int styleMain = ll->styles[i]; - bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); - bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); - ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); - if (ll->chars[i] == '\t') { - // Tab display - if (drawWhitespaceBackground && - (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) - textBack = vsDraw.whitespaceBackground.allocated; - surface->FillRectangle(rcSegment, textBack); - } else if (IsControlCharacter(ll->chars[i])) { - // Control character display - inIndentation = false; - surface->FillRectangle(rcSegment, textBack); - } else { - // Normal text display - surface->FillRectangle(rcSegment, textBack); - if (vsDraw.viewWhitespace != wsInvisible || - (inIndentation && vsDraw.viewIndentationGuides)) { - for (int cpos = 0; cpos <= i - startseg; cpos++) { - if (ll->chars[cpos + startseg] == ' ') { - if (drawWhitespaceBackground && - (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) { - PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top, - ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom); - surface->FillRectangle(rcSpace, vsDraw.whitespaceBackground.allocated); - } - } else { - inIndentation = false; + + rcSegment.left = ll->positions[startseg] + xStart - subLineStart; + rcSegment.right = ll->positions[i + 1] + xStart - subLineStart; + // Only try to draw if really visible - enhances performance by not calling environment to + // draw strings that are completely past the right side of the window. + if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) { + // Clip to line rectangle, since may have a huge position which will not work with some platforms + rcSegment.left = Platform::Maximum(rcSegment.left, rcLine.left); + rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); + + int styleMain = ll->styles[i]; + bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); + bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); + ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); + if (ll->chars[i] == '\t') { + // Tab display + if (drawWhitespaceBackground && + (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) + textBack = vsDraw.whitespaceBackground.allocated; + surface->FillRectangle(rcSegment, textBack); + } else if (IsControlCharacter(ll->chars[i])) { + // Control character display + inIndentation = false; + surface->FillRectangle(rcSegment, textBack); + } else { + // Normal text display + surface->FillRectangle(rcSegment, textBack); + if (vsDraw.viewWhitespace != wsInvisible || + (inIndentation && vsDraw.viewIndentationGuides)) { + for (int cpos = 0; cpos <= i - startseg; cpos++) { + if (ll->chars[cpos + startseg] == ' ') { + if (drawWhitespaceBackground && + (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) { + PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top, + ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom); + surface->FillRectangle(rcSpace, vsDraw.whitespaceBackground.allocated); } + } else { + inIndentation = false; } } } - } else if (rcSegment.left > rcLine.right) { - break; } - startseg = i + 1; + } else if (rcSegment.left > rcLine.right) { + break; } } if (twoPhaseDraw) { DrawEOL(surface, vsDraw, rcLine, ll, line, lineEnd, xStart, subLine, subLineStart, overrideBackground, background, - drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated); + drawWrapMarkEnd, wrapColour); } + DrawIndicators(surface, vsDraw, line, xStart, rcLine, ll, subLine, lineEnd, true); + + if (vsDraw.edgeState == EDGE_LINE) { + int edgeX = theEdge * vsDraw.spaceWidth; + rcSegment.left = edgeX + xStart; + rcSegment.right = rcSegment.left + 1; + surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated); + } + inIndentation = subLine == 0; // Do not handle indentation except on first subline. - startseg = ll->LineStart(subLine); // Foreground drawing loop - for (i = lineStart; i < lineEnd; i++) { + BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, xStartVisible); + next = bfFore.First(); + while (next < lineEnd) { + + startseg = next; + next = bfFore.Next(); + int i = next - 1; + int iDoc = i + posLineStart; - // If there is the end of a style run for any reason - if ((ll->styles[i] != ll->styles[i + 1]) || - i == (lineEnd - 1) || - IsControlCharacter(ll->chars[i]) || IsControlCharacter(ll->chars[i + 1]) || - ((ll->selStart != ll->selEnd) && ((iDoc + 1 == ll->selStart) || (iDoc + 1 == ll->selEnd))) || - (i == (ll->edgeColumn - 1))) { - rcSegment.left = ll->positions[startseg] + xStart - subLineStart; - rcSegment.right = ll->positions[i + 1] + xStart - subLineStart; - // Only try to draw if really visible - enhances performance by not calling environment to - // draw strings that are completely past the right side of the window. - if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) { - int styleMain = ll->styles[i]; - ColourAllocated textFore = vsDraw.styles[styleMain].fore.allocated; - Font &textFont = vsDraw.styles[styleMain].font; - //hotspot foreground - if (ll->hsStart != -1 && iDoc >= ll->hsStart && iDoc < hsEnd) { - if (vsDraw.hotspotForegroundSet) - textFore = vsDraw.hotspotForeground.allocated; + + rcSegment.left = ll->positions[startseg] + xStart - subLineStart; + rcSegment.right = ll->positions[i + 1] + xStart - subLineStart; + // Only try to draw if really visible - enhances performance by not calling environment to + // draw strings that are completely past the right side of the window. + if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) { + int styleMain = ll->styles[i]; + ColourAllocated textFore = vsDraw.styles[styleMain].fore.allocated; + Font &textFont = vsDraw.styles[styleMain].font; + //hotspot foreground + if (ll->hsStart != -1 && iDoc >= ll->hsStart && iDoc < hsEnd) { + if (vsDraw.hotspotForegroundSet) + textFore = vsDraw.hotspotForeground.allocated; + } + bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); + if (inSelection && (vsDraw.selforeset)) { + textFore = vsDraw.selforeground.allocated; + } + bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); + ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); + if (ll->chars[i] == '\t') { + // Tab display + if (!twoPhaseDraw) { + if (drawWhitespaceBackground && + (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) + textBack = vsDraw.whitespaceBackground.allocated; + surface->FillRectangle(rcSegment, textBack); } - bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd); - if (inSelection && (vsDraw.selforeset)) { - textFore = vsDraw.selforeground.allocated; + if ((vsDraw.viewWhitespace != wsInvisible) || ((inIndentation && vsDraw.viewIndentationGuides))) { + if (vsDraw.whitespaceForegroundSet) + textFore = vsDraw.whitespaceForeground.allocated; + surface->PenColour(textFore); } - bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd); - ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll); - if (ll->chars[i] == '\t') { - // Tab display - if (!twoPhaseDraw) { - if (drawWhitespaceBackground && - (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) - textBack = vsDraw.whitespaceBackground.allocated; - surface->FillRectangle(rcSegment, textBack); - } - if ((vsDraw.viewWhitespace != wsInvisible) || ((inIndentation && vsDraw.viewIndentationGuides))) { - if (vsDraw.whitespaceForegroundSet) - textFore = vsDraw.whitespaceForeground.allocated; - surface->PenColour(textFore); - } - if (inIndentation && vsDraw.viewIndentationGuides) { - for (int xIG = ll->positions[i] / indentWidth * indentWidth; xIG < ll->positions[i + 1]; xIG += indentWidth) { - if (xIG >= ll->positions[i] && xIG > 0) { - DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIG + xStart, rcSegment, - (ll->xHighlightGuide == xIG)); - } + if (inIndentation && vsDraw.viewIndentationGuides) { + for (int xIG = ll->positions[i] / indentWidth * indentWidth; xIG < ll->positions[i + 1]; xIG += indentWidth) { + if (xIG >= ll->positions[i] && xIG > 0) { + DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIG + xStart, rcSegment, + (ll->xHighlightGuide == xIG)); } } - if (vsDraw.viewWhitespace != wsInvisible) { - if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) { - PRectangle rcTab(rcSegment.left + 1, rcSegment.top + 4, - rcSegment.right - 1, rcSegment.bottom - vsDraw.maxDescent); - DrawTabArrow(surface, rcTab, rcSegment.top + vsDraw.lineHeight / 2); - } + } + if (vsDraw.viewWhitespace != wsInvisible) { + if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) { + PRectangle rcTab(rcSegment.left + 1, rcSegment.top + 4, + rcSegment.right - 1, rcSegment.bottom - vsDraw.maxDescent); + DrawTabArrow(surface, rcTab, rcSegment.top + vsDraw.lineHeight / 2); } - } else if (IsControlCharacter(ll->chars[i])) { - // Control character display - inIndentation = false; - if (controlCharSymbol < 32) { - // Draw the character - const char *ctrlChar = ControlCharacterString(ll->chars[i]); - if (!twoPhaseDraw) { - surface->FillRectangle(rcSegment, textBack); - } - int normalCharHeight = surface->Ascent(ctrlCharsFont) - - surface->InternalLeading(ctrlCharsFont); - PRectangle rcCChar = rcSegment; - rcCChar.left = rcCChar.left + 1; - rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight; - rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1; - PRectangle rcCentral = rcCChar; - rcCentral.top++; - rcCentral.bottom--; - surface->FillRectangle(rcCentral, textFore); - PRectangle rcChar = rcCChar; - rcChar.left++; - rcChar.right--; - surface->DrawTextClipped(rcChar, ctrlCharsFont, - rcSegment.top + vsDraw.maxAscent, ctrlChar, istrlen(ctrlChar), - textBack, textFore); - } else { - char cc[2] = { static_cast<char>(controlCharSymbol), '\0' }; - surface->DrawTextNoClip(rcSegment, ctrlCharsFont, - rcSegment.top + vsDraw.maxAscent, - cc, 1, textBack, textFore); + } + } else if (IsControlCharacter(ll->chars[i])) { + // Control character display + inIndentation = false; + if (controlCharSymbol < 32) { + // Draw the character + const char *ctrlChar = ControlCharacterString(ll->chars[i]); + if (!twoPhaseDraw) { + surface->FillRectangle(rcSegment, textBack); } + int normalCharHeight = surface->Ascent(ctrlCharsFont) - + surface->InternalLeading(ctrlCharsFont); + PRectangle rcCChar = rcSegment; + rcCChar.left = rcCChar.left + 1; + rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight; + rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1; + PRectangle rcCentral = rcCChar; + rcCentral.top++; + rcCentral.bottom--; + surface->FillRectangle(rcCentral, textFore); + PRectangle rcChar = rcCChar; + rcChar.left++; + rcChar.right--; + surface->DrawTextClipped(rcChar, ctrlCharsFont, + rcSegment.top + vsDraw.maxAscent, ctrlChar, istrlen(ctrlChar), + textBack, textFore); } else { - // Normal text display - if (vsDraw.styles[styleMain].visible) { - if (twoPhaseDraw) { - surface->DrawTextTransparent(rcSegment, textFont, - rcSegment.top + vsDraw.maxAscent, ll->chars + startseg, - i - startseg + 1, textFore); - } else { - surface->DrawTextNoClip(rcSegment, textFont, - rcSegment.top + vsDraw.maxAscent, ll->chars + startseg, - i - startseg + 1, textFore, textBack); - } + char cc[2] = { static_cast<char>(controlCharSymbol), '\0' }; + surface->DrawTextNoClip(rcSegment, ctrlCharsFont, + rcSegment.top + vsDraw.maxAscent, + cc, 1, textBack, textFore); + } + } else { + // Normal text display + if (vsDraw.styles[styleMain].visible) { + if (twoPhaseDraw) { + surface->DrawTextTransparent(rcSegment, textFont, + rcSegment.top + vsDraw.maxAscent, ll->chars + startseg, + i - startseg + 1, textFore); + } else { + surface->DrawTextNoClip(rcSegment, textFont, + rcSegment.top + vsDraw.maxAscent, ll->chars + startseg, + i - startseg + 1, textFore, textBack); } - if (vsDraw.viewWhitespace != wsInvisible || - (inIndentation && vsDraw.viewIndentationGuides)) { - for (int cpos = 0; cpos <= i - startseg; cpos++) { - if (ll->chars[cpos + startseg] == ' ') { - if (vsDraw.viewWhitespace != wsInvisible) { - if (vsDraw.whitespaceForegroundSet) - textFore = vsDraw.whitespaceForeground.allocated; - if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) { - int xmid = (ll->positions[cpos + startseg] + ll->positions[cpos + startseg + 1]) / 2; - if (!twoPhaseDraw && drawWhitespaceBackground && - (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) { - textBack = vsDraw.whitespaceBackground.allocated; - PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top, ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom); - surface->FillRectangle(rcSpace, textBack); - } - PRectangle rcDot(xmid + xStart - subLineStart, rcSegment.top + vsDraw.lineHeight / 2, 0, 0); - rcDot.right = rcDot.left + 1; - rcDot.bottom = rcDot.top + 1; - surface->FillRectangle(rcDot, textFore); + } + if (vsDraw.viewWhitespace != wsInvisible || + (inIndentation && vsDraw.viewIndentationGuides)) { + for (int cpos = 0; cpos <= i - startseg; cpos++) { + if (ll->chars[cpos + startseg] == ' ') { + if (vsDraw.viewWhitespace != wsInvisible) { + if (vsDraw.whitespaceForegroundSet) + textFore = vsDraw.whitespaceForeground.allocated; + if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) { + int xmid = (ll->positions[cpos + startseg] + ll->positions[cpos + startseg + 1]) / 2; + if (!twoPhaseDraw && drawWhitespaceBackground && + (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) { + textBack = vsDraw.whitespaceBackground.allocated; + PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top, ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom); + surface->FillRectangle(rcSpace, textBack); } + PRectangle rcDot(xmid + xStart - subLineStart, rcSegment.top + vsDraw.lineHeight / 2, 0, 0); + rcDot.right = rcDot.left + 1; + rcDot.bottom = rcDot.top + 1; + surface->FillRectangle(rcDot, textFore); } - if (inIndentation && vsDraw.viewIndentationGuides) { - int startSpace = ll->positions[cpos + startseg]; - if (startSpace > 0 && (startSpace % indentWidth == 0)) { - DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, startSpace + xStart, rcSegment, - (ll->xHighlightGuide == ll->positions[cpos + startseg])); - } + } + if (inIndentation && vsDraw.viewIndentationGuides) { + int startSpace = ll->positions[cpos + startseg]; + if (startSpace > 0 && (startSpace % indentWidth == 0)) { + DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, startSpace + xStart, rcSegment, + (ll->xHighlightGuide == ll->positions[cpos + startseg])); } - } else { - inIndentation = false; } + } else { + inIndentation = false; } } } - if (ll->hsStart != -1 && vsDraw.hotspotUnderline && iDoc >= ll->hsStart && iDoc < ll->hsEnd ) { - PRectangle rcUL = rcSegment; - rcUL.top = rcUL.top + vsDraw.maxAscent + 1; - rcUL.bottom = rcUL.top + 1; - if (vsDraw.hotspotForegroundSet) - surface->FillRectangle(rcUL, vsDraw.hotspotForeground.allocated); - else - surface->FillRectangle(rcUL, textFore); - } else if (vsDraw.styles[styleMain].underline) { - PRectangle rcUL = rcSegment; - rcUL.top = rcUL.top + vsDraw.maxAscent + 1; - rcUL.bottom = rcUL.top + 1; + } + if (ll->hsStart != -1 && vsDraw.hotspotUnderline && iDoc >= ll->hsStart && iDoc < ll->hsEnd ) { + PRectangle rcUL = rcSegment; + rcUL.top = rcUL.top + vsDraw.maxAscent + 1; + rcUL.bottom = rcUL.top + 1; + if (vsDraw.hotspotForegroundSet) + surface->FillRectangle(rcUL, vsDraw.hotspotForeground.allocated); + else surface->FillRectangle(rcUL, textFore); - } - } else if (rcSegment.left > rcLine.right) { - break; + } else if (vsDraw.styles[styleMain].underline) { + PRectangle rcUL = rcSegment; + rcUL.top = rcUL.top + vsDraw.maxAscent + 1; + rcUL.bottom = rcUL.top + 1; + surface->FillRectangle(rcUL, textFore); } - startseg = i + 1; + } else if (rcSegment.left > rcLine.right) { + break; } } - // Draw indicators - // foreach indicator... - for (int indicnum = 0, mask = 1 << pdoc->stylingBits; mask < 0x100; indicnum++) { - if (!(mask & ll->styleBitsSet)) { - mask <<= 1; - continue; - } - int startPos = -1; - // foreach style pos in line... - for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) { - // look for starts... - if (startPos < 0) { - // NOT in indicator run, looking for START - if (indicPos < lineEnd && (ll->indicators[indicPos] & mask)) - startPos = indicPos; - } - // ... or ends - if (startPos >= 0) { - // IN indicator run, looking for END - if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) { - // AT end of indicator run, DRAW it! - PRectangle rcIndic( - ll->positions[startPos] + xStart - subLineStart, - rcLine.top + vsDraw.maxAscent, - ll->positions[indicPos] + xStart - subLineStart, - rcLine.top + vsDraw.maxAscent + 3); - vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine); - // RESET control var - startPos = -1; - } - } - } - mask <<= 1; - } + DrawIndicators(surface, vsDraw, line, xStart, rcLine, ll, subLine, lineEnd, false); + // End of the drawing of the current line if (!twoPhaseDraw) { DrawEOL(surface, vsDraw, rcLine, ll, line, lineEnd, xStart, subLine, subLineStart, overrideBackground, background, - drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated); + drawWrapMarkEnd, wrapColour); } if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) && (ll->selStart >= 0) && (ll->selEnd >= 0)) { int startPosSel = (ll->selStart < posLineStart) ? posLineStart : ll->selStart; @@ -2684,17 +2490,12 @@ if (startPosSel < endPosSel) { rcSegment.left = xStart + ll->positions[startPosSel - posLineStart] - subLineStart; rcSegment.right = xStart + ll->positions[endPosSel - posLineStart] - subLineStart; + rcSegment.left = Platform::Maximum(rcSegment.left, rcLine.left); + rcSegment.right = Platform::Minimum(rcSegment.right, rcLine.right); SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); } } - if (vsDraw.edgeState == EDGE_LINE) { - int edgeX = theEdge * vsDraw.spaceWidth; - rcSegment.left = edgeX + xStart; - rcSegment.right = rcSegment.left + 1; - surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated); - } - // Draw any translucent whole line states rcSegment.left = xStart; rcSegment.right = rcLine.right - 1; @@ -2721,6 +2522,61 @@ } } +void Editor::DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, int xStart, int offset, int posCaret, PRectangle rcCaret) { + + int lineStart = ll->LineStart(subLine); + int posBefore = posCaret; + int posAfter = MovePositionOutsideChar(posCaret+1, 1); + int numCharsToDraw = posAfter - posCaret; + + // Work out where the starting and ending offsets are. We need to + // see if the previous character shares horizontal space, such as a + // glyph / combining character. If so we'll need to draw that too. + int offsetFirstChar = offset; + int offsetLastChar = offset + (posAfter - posCaret); + while ((offsetLastChar - numCharsToDraw) >= lineStart) { + if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - numCharsToDraw]) > 0) { + // The char does not share horizontal space + break; + } + // Char shares horizontal space, update the numChars to draw + // Update posBefore to point to the prev char + posBefore = MovePositionOutsideChar(posBefore-1, -1); + numCharsToDraw = posAfter - posBefore; + offsetFirstChar = offset - (posCaret - posBefore); + } + + // See if the next character shares horizontal space, if so we'll + // need to draw that too. + numCharsToDraw = offsetLastChar - offsetFirstChar; + while ((offsetLastChar < ll->LineStart(subLine + 1)) && (offsetLastChar <= ll->numCharsInLine)) { + // Update posAfter to point to the 2nd next char, this is where + // the next character ends, and 2nd next begins. We'll need + // to compare these two + posBefore = posAfter; + posAfter = MovePositionOutsideChar(posAfter+1, 1); + offsetLastChar = offset + (posAfter - posCaret); + if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - (posAfter - posBefore)]) > 0) { + // The char does not share horizontal space + break; + } + // Char shares horizontal space, update the numChars to draw + numCharsToDraw = offsetLastChar - offsetFirstChar; + } + + // We now know what to draw, update the caret drawing rectangle + rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[ll->LineStart(subLine)] + xStart; + rcCaret.right = ll->positions[offsetFirstChar+numCharsToDraw] - ll->positions[ll->LineStart(subLine)] + xStart; + + // This character is where the caret block is, we override the colours + // (inversed) for drawing the caret here. + int styleMain = ll->styles[offsetFirstChar]; + surface->DrawTextClipped(rcCaret, vsDraw.styles[styleMain].font, + rcCaret.top + vsDraw.maxAscent, ll->chars + offsetFirstChar, + numCharsToDraw, vsDraw.styles[styleMain].back.allocated, + vsDraw.caretcolour.allocated); +} + void Editor::RefreshPixMaps(Surface *surfaceWindow) { if (!pixmapSelPattern->Initialised()) { const int patternSize = 8; @@ -3022,35 +2878,57 @@ if (lineStart != 0) // Wrapped xposCaret += actualWrapVisualStartIndent * vs.aveCharWidth; } - int widthOverstrikeCaret; - if (posCaret == pdoc->Length()) { // At end of document - widthOverstrikeCaret = vs.aveCharWidth; - } else if ((posCaret - rangeLine.start) >= ll->numCharsInLine) { // At end of line - widthOverstrikeCaret = vs.aveCharWidth; - } else { - widthOverstrikeCaret = ll->positions[offset + 1] - ll->positions[offset]; - } - if (widthOverstrikeCaret < 3) // Make sure its visible - widthOverstrikeCaret = 3; - if (((caret.active && caret.on) || (posDrag >= 0)) && xposCaret >= 0) { + if ((xposCaret >= 0) && (vs.caretWidth > 0) && (vs.caretStyle != CARETSTYLE_INVISIBLE) && + ((posDrag >= 0) || (caret.active && caret.on))) { + bool caretAtEOF = false; + bool caretAtEOL = false; + bool drawBlockCaret = false; + int widthOverstrikeCaret; + int caretWidthOffset = 0; PRectangle rcCaret = rcLine; - int caretWidthOffset = 0; - if ((offset > 0) && (vs.caretWidth > 1)) + + if (posCaret == pdoc->Length()) { // At end of document + caretAtEOF = true; + widthOverstrikeCaret = vs.aveCharWidth; + } else if ((posCaret - rangeLine.start) >= ll->numCharsInLine) { // At end of line + caretAtEOL = true; + widthOverstrikeCaret = vs.aveCharWidth; + } else { + widthOverstrikeCaret = ll->positions[offset + 1] - ll->positions[offset]; + } + if (widthOverstrikeCaret < 3) // Make sure its visible + widthOverstrikeCaret = 3; + + if (offset > 0) caretWidthOffset = 1; // Move back so overlaps both character cells. if (posDrag >= 0) { + /* Dragging text, use a line caret */ rcCaret.left = xposCaret - caretWidthOffset; rcCaret.right = rcCaret.left + vs.caretWidth; - } else { - if (inOverstrike) { - rcCaret.top = rcCaret.bottom - 2; - rcCaret.left = xposCaret + 1; - rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1; + } else if (inOverstrike) { + /* Overstrike (insert mode), use a modified bar caret */ + rcCaret.top = rcCaret.bottom - 2; + rcCaret.left = xposCaret + 1; + rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1; + } else if (vs.caretStyle == CARETSTYLE_BLOCK) { + /* Block caret */ + rcCaret.left = xposCaret; + if (!caretAtEOL && !caretAtEOF && (ll->chars[offset] != '\t') && !(IsControlCharacter(ll->chars[offset]))) { + drawBlockCaret = true; + rcCaret.right = xposCaret + widthOverstrikeCaret; } else { - rcCaret.left = xposCaret - caretWidthOffset; - rcCaret.right = rcCaret.left + vs.caretWidth; + rcCaret.right = xposCaret + vs.aveCharWidth; } + } else { + /* Line caret */ + rcCaret.left = xposCaret - caretWidthOffset; + rcCaret.right = rcCaret.left + vs.caretWidth; } - surface->FillRectangle(rcCaret, vs.caretcolour.allocated); + if (drawBlockCaret) { + DrawBlockCaret(surface, vs, ll, subLine, xStart, offset, posCaret, rcCaret); + } else { + surface->FillRectangle(rcCaret, vs.caretcolour.allocated); + } } } } @@ -3129,6 +3007,9 @@ return 0; } + // Can't use measurements cached for screen + posCache.Clear(); + ViewStyle vsPrint(vs); // Modify the view style for printing as do not normally want any of the transient features to be printed @@ -3173,16 +3054,17 @@ vsPrint.styles[STYLE_LINENUMBER].back.desired = ColourDesired(0xff, 0xff, 0xff); vsPrint.Refresh(*surfaceMeasure); - // Ensure colours are set up - vsPrint.RefreshColourPalette(palette, true); - vsPrint.RefreshColourPalette(palette, false); // Determining width must hapen after fonts have been realised in Refresh int lineNumberWidth = 0; if (lineNumberIndex >= 0) { lineNumberWidth = surfaceMeasure->WidthText(vsPrint.styles[STYLE_LINENUMBER].font, "99999" lineNumberPrintSpace, 5 + istrlen(lineNumberPrintSpace)); vsPrint.ms[lineNumberIndex].width = lineNumberWidth; + vsPrint.Refresh(*surfaceMeasure); // Recalculate fixedColumnWidth } + // Ensure colours are set up + vsPrint.RefreshColourPalette(palette, true); + vsPrint.RefreshColourPalette(palette, false); int linePrintStart = pdoc->LineFromPosition(pfr->chrg.cpMin); int linePrintLast = linePrintStart + (pfr->rc.bottom - pfr->rc.top) / vsPrint.lineHeight - 1; @@ -3201,14 +3083,14 @@ // Ensure we are styled to where we are formatting. pdoc->EnsureStyledTo(endPosPrint); - int xStart = vsPrint.fixedColumnWidth + pfr->rc.left + lineNumberWidth; + int xStart = vsPrint.fixedColumnWidth + pfr->rc.left; int ypos = pfr->rc.top; int lineDoc = linePrintStart; int nPrintPos = pfr->chrg.cpMin; int visibleLine = 0; - int widthPrint = pfr->rc.Width() - lineNumberWidth; + int widthPrint = pfr->rc.Width() - vsPrint.fixedColumnWidth; if (printWrapState == eWrapNone) widthPrint = LineLayout::wrapWidthInfinite; @@ -3230,7 +3112,7 @@ ll.containsCaret = false; PRectangle rcLine; - rcLine.left = pfr->rc.left + lineNumberWidth; + rcLine.left = pfr->rc.left; rcLine.top = ypos; rcLine.right = pfr->rc.right - 1; rcLine.bottom = ypos + vsPrint.lineHeight; @@ -3259,7 +3141,7 @@ PRectangle rcNumber = rcLine; rcNumber.right = rcNumber.left + lineNumberWidth; // Right justify - rcNumber.left -= surfaceMeasure->WidthText( + rcNumber.left = rcNumber.right - surfaceMeasure->WidthText( vsPrint.styles[STYLE_LINENUMBER].font, number, istrlen(number)); surface->FlushCachedState(); surface->DrawTextNoClip(rcNumber, vsPrint.styles[STYLE_LINENUMBER].font, @@ -3292,6 +3174,9 @@ ++lineDoc; } + // Clear cache so measurements are not used for screen + posCache.Clear(); + return nPrintPos; } @@ -3631,11 +3516,13 @@ NotifyParent(scn); } -void Editor::NotifyDoubleClick(Point pt, bool) { +void Editor::NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt) { SCNotification scn = {0}; scn.nmhdr.code = SCN_DOUBLECLICK; scn.line = LineFromLocation(pt); scn.position = PositionFromLocationClose(pt); + scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | + (alt ? SCI_ALT : 0); NotifyParent(scn); } @@ -3669,6 +3556,18 @@ NotifyParent(scn); } +void Editor::NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt) { + int mask = pdoc->decorations.AllOnFor(position); + if ((click && mask) || pdoc->decorations.clickNotified) { + SCNotification scn = {0}; + pdoc->decorations.clickNotified = click; + scn.nmhdr.code = click ? SCN_INDICATORCLICK : SCN_INDICATORRELEASE; + scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | (alt ? SCI_ALT : 0); + scn.position = position; + NotifyParent(scn); + } +} + bool Editor::NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt) { int marginClicked = -1; int x = 0; @@ -3771,8 +3670,10 @@ if (paintState == painting) { CheckForChangeOutsidePaint(Range(mh.position, mh.position + mh.length)); } - if (mh.modificationType & SC_MOD_CHANGESTYLE) { - pdoc->IncrementStyleClock(); + if (mh.modificationType & (SC_MOD_CHANGESTYLE|SC_MOD_CHANGEINDICATOR)) { + if (mh.modificationType & SC_MOD_CHANGESTYLE) { + pdoc->IncrementStyleClock(); + } if (paintState == notPainting) { if (mh.position < pdoc->LineStart(topLine)) { // Styling performed before this view @@ -3781,7 +3682,9 @@ InvalidateRange(mh.position, mh.position + mh.length); } } - llc.Invalidate(LineLayout::llCheckTextAndStyle); + if (mh.modificationType & SC_MOD_CHANGESTYLE) { + llc.Invalidate(LineLayout::llCheckTextAndStyle); + } } else { // Move selection and brace highlights if (mh.modificationType & SC_MOD_INSERTTEXT) { @@ -3789,11 +3692,13 @@ anchor = MovePositionForInsertion(anchor, mh.position, mh.length); braces[0] = MovePositionForInsertion(braces[0], mh.position, mh.length); braces[1] = MovePositionForInsertion(braces[1], mh.position, mh.length); + pdoc->decorations.InsertSpace(mh.position, mh.length); } else if (mh.modificationType & SC_MOD_DELETETEXT) { currentPos = MovePositionForDeletion(currentPos, mh.position, mh.length); anchor = MovePositionForDeletion(anchor, mh.position, mh.length); braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length); braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length); + pdoc->decorations.DeleteRange(mh.position, mh.length); } if (cs.LinesDisplayed() < cs.LinesInDoc()) { // Some lines are hidden so may need shown. @@ -3863,7 +3768,7 @@ // If client wants to see this modification if (mh.modificationType & modEventMask) { - if ((mh.modificationType & SC_MOD_CHANGESTYLE) == 0) { + if ((mh.modificationType & (SC_MOD_CHANGESTYLE|SC_MOD_CHANGEINDICATOR)) == 0) { // Real modification made to text of document. NotifyChange(); // Send EN_CHANGE } @@ -4019,7 +3924,10 @@ // I consider only the caretYSlop, and ignore the caretYPolicy-- is that a problem? int currentLine = pdoc->LineFromPosition(currentPos); int topStutterLine = topLine + caretYSlop; - int bottomStutterLine = topLine + LinesToScroll() - caretYSlop; + int bottomStutterLine = + pdoc->LineFromPosition(PositionFromLocation( + Point(lastXChosen, direction * vs.lineHeight * LinesToScroll()))) + - caretYSlop - 1; if (stuttered && (direction < 0 && currentLine > topStutterLine)) { topLineNew = topLine; @@ -4072,32 +3980,23 @@ void Editor::LineTranspose() { int line = pdoc->LineFromPosition(currentPos); if (line > 0) { + pdoc->BeginUndoAction(); int startPrev = pdoc->LineStart(line - 1); int endPrev = pdoc->LineEnd(line - 1); int start = pdoc->LineStart(line); int end = pdoc->LineEnd(line); - int startNext = pdoc->LineStart(line + 1); - if (end < pdoc->Length()) { - end = startNext; - char *thisLine = CopyRange(start, end); - pdoc->DeleteChars(start, end - start); - if (pdoc->InsertString(startPrev, thisLine, end - start)) { - MovePositionTo(startPrev + end - start); - } - delete []thisLine; - } else { - // Last line so line has no line end - char *thisLine = CopyRange(start, end); - char *prevEnd = CopyRange(endPrev, start); - pdoc->DeleteChars(endPrev, end - endPrev); - pdoc->InsertString(startPrev, thisLine, end - start); - if (pdoc->InsertString(startPrev + end - start, prevEnd, start - endPrev)) { - MovePositionTo(startPrev + end - endPrev); - } - delete []thisLine; - delete []prevEnd; - } - + char *line1 = CopyRange(startPrev, endPrev); + int len1 = endPrev - startPrev; + char *line2 = CopyRange(start, end); + int len2 = end - start; + pdoc->DeleteChars(start, len2); + pdoc->DeleteChars(startPrev, len1); + pdoc->InsertString(startPrev, line2, len2); + pdoc->InsertString(start - len1 + len2, line1, len1); + MovePositionTo(start - len1 + len2); + delete []line1; + delete []line2; + pdoc->EndUndoAction(); } } @@ -4940,6 +4839,13 @@ wMain.SetCursor(static_cast<Window::Cursor>(cursorMode)); } +bool Editor::DragThreshold(Point ptStart, Point ptNow) { + int xMove = ptStart.x - ptNow.x; + int yMove = ptStart.y - ptNow.y; + int distanceSquared = xMove * xMove + yMove * yMove; + return distanceSquared > 16; +} + void Editor::StartDrag() { // Always handled by subclasses //SetMouseCapture(true); @@ -4947,8 +4853,8 @@ } void Editor::DropAt(int position, const char *value, bool moving, bool rectangular) { - //Platform::DebugPrintf("DropAt %d\n", inDragDrop); - if (inDragDrop) + //Platform::DebugPrintf("DropAt %d %d\n", inDragDrop, position); + if (inDragDrop == ddDragging) dropWentOutside = false; int positionWasInSelection = PositionInSelection(position); @@ -4956,7 +4862,7 @@ bool positionOnEdgeOfSelection = (position == SelectionStart()) || (position == SelectionEnd()); - if ((!inDragDrop) || !(0 == positionWasInSelection) || + if ((inDragDrop != ddDragging) || !(0 == positionWasInSelection) || (positionOnEdgeOfSelection && !moving)) { int selStart = SelectionStart(); @@ -4965,7 +4871,7 @@ pdoc->BeginUndoAction(); int positionAfterDeletion = position; - if (inDragDrop && moving) { + if ((inDragDrop == ddDragging) && moving) { // Remove dragged out text if (rectangular || selType == selLines) { SelectionLineIterator lineIterator(this); @@ -4999,7 +4905,7 @@ } pdoc->EndUndoAction(); } - } else if (inDragDrop) { + } else if (inDragDrop == ddDragging) { SetEmptySelection(position); } } @@ -5101,17 +5007,19 @@ } void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) { - //Platform::DebugPrintf("Scintilla:ButtonDown %d %d = %d alt=%d\n", curTime, lastClickTime, curTime - lastClickTime, alt); + //Platform::DebugPrintf("ButtonDown %d %d = %d alt=%d %d\n", curTime, lastClickTime, curTime - lastClickTime, alt, inDragDrop); ptMouseLast = pt; int newPos = PositionFromLocation(pt); newPos = MovePositionOutsideChar(newPos, currentPos - newPos); - inDragDrop = false; + inDragDrop = ddNone; moveExtendsSelection = false; bool processed = NotifyMarginClick(pt, shift, ctrl, alt); if (processed) return; + NotifyIndicatorClick(true, newPos, shift, ctrl, alt); + bool inSelMargin = PointInSelMargin(pt); if (shift & !inSelMargin) { SetSelection(newPos); @@ -5151,7 +5059,7 @@ } //Platform::DebugPrintf("Double click: %d - %d\n", anchor, currentPos); if (doubleClick) { - NotifyDoubleClick(pt, shift); + NotifyDoubleClick(pt, shift, ctrl, alt); if (PositionIsHotspot(newPos)) NotifyHotSpotDoubleClicked(newPos, shift, ctrl, alt); } @@ -5188,16 +5096,22 @@ NotifyHotSpotClicked(newPos, shift, ctrl, alt); } if (!shift) { - inDragDrop = PointInSelection(pt) && !SelectionEmpty(); + if (PointInSelection(pt) && !SelectionEmpty()) + inDragDrop = ddInitial; + else + inDragDrop = ddNone; } - if (inDragDrop) { - SetMouseCapture(false); - SetDragPosition(newPos); - CopySelectionRange(&drag); - StartDrag(); - } else { +#ifdef __APPLE__ + // we need to additionaly check if the mouse moved before we + // decide that we can in fact start a drag session. Currently + // only OSX will return anything but true. + if (inDragDrop == ddInitial && !Platform::WaitMouseMoved(pt)) { + inDragDrop = ddNone; + } +#endif + SetMouseCapture(true); + if (inDragDrop != ddInitial) { SetDragPosition(invalidPosition); - SetMouseCapture(true); if (!shift) { SetEmptySelection(newPos); } @@ -5266,6 +5180,20 @@ if ((ptMouseLast.x != pt.x) || (ptMouseLast.y != pt.y)) { DwellEnd(true); } + + int movePos = PositionFromLocation(pt); + movePos = MovePositionOutsideChar(movePos, currentPos - movePos); + + if (inDragDrop == ddInitial) { + if (DragThreshold(ptMouseLast, pt)) { + SetMouseCapture(false); + SetDragPosition(movePos); + CopySelectionRange(&drag); + StartDrag(); + } + return; + } + ptMouseLast = pt; //Platform::DebugPrintf("Move %d %d\n", pt.x, pt.y); if (HaveMouseCapture()) { @@ -5277,8 +5205,6 @@ autoScrollTimer.ticksToWait = autoScrollDelay; // Adjust selection - int movePos = PositionFromLocation(pt); - movePos = MovePositionOutsideChar(movePos, currentPos - movePos); if (posDrag >= 0) { SetDragPosition(movePos); } else { @@ -5354,7 +5280,13 @@ } void Editor::ButtonUp(Point pt, unsigned int curTime, bool ctrl) { - //Platform::DebugPrintf("ButtonUp %d\n", HaveMouseCapture()); + //Platform::DebugPrintf("ButtonUp %d %d\n", HaveMouseCapture(), inDragDrop); + int newPos = PositionFromLocation(pt); + newPos = MovePositionOutsideChar(newPos, currentPos - newPos); + if (inDragDrop == ddInitial) { + inDragDrop = ddNone; + SetEmptySelection(newPos); + } if (HaveMouseCapture()) { if (PointInSelMargin(pt)) { DisplayCursor(Window::cursorReverseArrow); @@ -5366,7 +5298,8 @@ SetMouseCapture(false); int newPos = PositionFromLocation(pt); newPos = MovePositionOutsideChar(newPos, currentPos - newPos); - if (inDragDrop) { + NotifyIndicatorClick(false, newPos, false, false, false); + if (inDragDrop == ddDragging) { int selStart = SelectionStart(); int selEnd = SelectionEnd(); if (selStart < selEnd) { @@ -5405,7 +5338,7 @@ if (selType == selStream) { SetLastXChosen(); } - inDragDrop = false; + inDragDrop = ddNone; EnsureCaretVisible(false); } } @@ -6445,6 +6378,13 @@ case SCI_GETLAYOUTCACHE: return llc.GetLevel(); + case SCI_SETPOSITIONCACHE: + posCache.SetSize(wParam); + break; + + case SCI_GETPOSITIONCACHE: + return posCache.GetSize(); + case SCI_SETSCROLLWIDTH: PLATFORM_ASSERT(wParam > 0); if ((wParam > 0) && (wParam != static_cast<unsigned int >(scrollWidth))) { @@ -6773,7 +6713,73 @@ InvalidateStyleRedraw(); } break; + case SCI_STYLEGETFORE: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].fore.desired.AsLong(); + else + return 0; + case SCI_STYLEGETBACK: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].back.desired.AsLong(); + else + return 0; + case SCI_STYLEGETBOLD: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].bold ? 1 : 0; + else + return 0; + case SCI_STYLEGETITALIC: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].italic ? 1 : 0; + else + return 0; + case SCI_STYLEGETEOLFILLED: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].eolFilled ? 1 : 0; + else + return 0; + case SCI_STYLEGETSIZE: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].size; + else + return 0; + case SCI_STYLEGETFONT: + if (lParam == 0) + return strlen(vs.styles[wParam].fontName); + if (wParam <= STYLE_MAX) + strcpy(CharPtrFromSPtr(lParam), vs.styles[wParam].fontName); + break; + case SCI_STYLEGETUNDERLINE: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].underline ? 1 : 0; + else + return 0; + case SCI_STYLEGETCASE: + if (wParam <= STYLE_MAX) + return static_cast<int>(vs.styles[wParam].caseForce); + else + return 0; + case SCI_STYLEGETCHARACTERSET: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].characterSet; + else + return 0; + case SCI_STYLEGETVISIBLE: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].visible ? 1 : 0; + else + return 0; + case SCI_STYLEGETCHANGEABLE: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].changeable ? 1 : 0; + else + return 0; + case SCI_STYLEGETHOTSPOT: + if (wParam <= STYLE_MAX) + return vs.styles[wParam].hotspot ? 1 : 0; + else + return 0; case SCI_STYLERESETDEFAULT: vs.ResetDefaultStyle(); InvalidateStyleRedraw(); @@ -6962,6 +6968,18 @@ case SCI_GETCARETFORE: return vs.caretcolour.desired.AsLong(); + case SCI_SETCARETSTYLE: + if (wParam >= CARETSTYLE_INVISIBLE && wParam <= CARETSTYLE_BLOCK) + vs.caretStyle = wParam; + else + /* Default to the line caret */ + vs.caretStyle = CARETSTYLE_LINE; + InvalidateStyleRedraw(); + break; + + case SCI_GETCARETSTYLE: + return vs.caretStyle; + case SCI_SETCARETWIDTH: if (wParam <= 0) vs.caretWidth = 0; @@ -7009,6 +7027,47 @@ case SCI_INDICGETFORE: return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fore.desired.AsLong() : 0; + case SCI_INDICSETUNDER: + if (wParam <= INDIC_MAX) { + vs.indicators[wParam].under = lParam != 0; + InvalidateStyleRedraw(); + } + break; + + case SCI_INDICGETUNDER: + return (wParam <= INDIC_MAX) ? vs.indicators[wParam].under : 0; + + case SCI_SETINDICATORCURRENT: + pdoc->decorations.SetCurrentIndicator(wParam); + break; + case SCI_GETINDICATORCURRENT: + return pdoc->decorations.GetCurrentIndicator(); + case SCI_SETINDICATORVALUE: + pdoc->decorations.SetCurrentValue(wParam); + break; + case SCI_GETINDICATORVALUE: + return pdoc->decorations.GetCurrentValue(); + + case SCI_INDICATORFILLRANGE: + pdoc->DecorationFillRange(wParam, pdoc->decorations.GetCurrentValue(), lParam); + break; + + case SCI_INDICATORCLEARRANGE: + pdoc->DecorationFillRange(wParam, 0, lParam); + break; + + case SCI_INDICATORALLONFOR: + return pdoc->decorations.AllOnFor(wParam); + + case SCI_INDICATORVALUEAT: + return pdoc->decorations.ValueAt(wParam, lParam); + + case SCI_INDICATORSTART: + return pdoc->decorations.Start(wParam, lParam); + + case SCI_INDICATOREND: + return pdoc->decorations.End(wParam, lParam); + case SCI_LINEDOWN: case SCI_LINEDOWNEXTEND: case SCI_PARADOWN: @@ -7310,22 +7369,34 @@ InvalidateStyleRedraw(); break; + case SCI_GETHOTSPOTACTIVEFORE: + return vs.hotspotForeground.desired.AsLong(); + case SCI_SETHOTSPOTACTIVEBACK: vs.hotspotBackgroundSet = wParam != 0; vs.hotspotBackground.desired = ColourDesired(lParam); InvalidateStyleRedraw(); break; + case SCI_GETHOTSPOTACTIVEBACK: + return vs.hotspotBackground.desired.AsLong(); + case SCI_SETHOTSPOTACTIVEUNDERLINE: vs.hotspotUnderline = wParam != 0; InvalidateStyleRedraw(); break; + case SCI_GETHOTSPOTACTIVEUNDERLINE: + return vs.hotspotUnderline ? 1 : 0; + case SCI_SETHOTSPOTSINGLELINE: vs.hotspotSingleLine = wParam != 0; InvalidateStyleRedraw(); break; + case SCI_GETHOTSPOTSINGLELINE: + return vs.hotspotSingleLine ? 1 : 0; + case SCI_SETPASTECONVERTENDINGS: convertPastes = wParam != 0; break; Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Editor.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef EDITOR_H #define EDITOR_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** */ class Caret { @@ -42,92 +46,6 @@ }; /** - */ -class LineLayout { -private: - friend class LineLayoutCache; - int *lineStarts; - int lenLineStarts; - /// Drawing is only performed for @a maxLineLength characters on each line. - int lineNumber; - bool inCache; -public: - enum { wrapWidthInfinite = 0x7ffffff }; - int maxLineLength; - int numCharsInLine; - enum validLevel { llInvalid, llCheckTextAndStyle, llPositions, llLines } validity; - int xHighlightGuide; - bool highlightColumn; - int selStart; - int selEnd; - bool containsCaret; - int edgeColumn; - char *chars; - unsigned char *styles; - int styleBitsSet; - char *indicators; - int *positions; - char bracePreviousStyles[2]; - - // Hotspot support - int hsStart; - int hsEnd; - - // Wrapped line support - int widthLine; - int lines; - - LineLayout(int maxLineLength_); - virtual ~LineLayout(); - void Resize(int maxLineLength_); - void Free(); - void Invalidate(validLevel validity_); - int LineStart(int line) { - if (line <= 0) { - return 0; - } else if ((line >= lines) || !lineStarts) { - return numCharsInLine; - } else { - return lineStarts[line]; - } - } - void SetLineStart(int line, int start); - void SetBracesHighlight(Range rangeLine, Position braces[], - char bracesMatchStyle, int xHighlight); - void RestoreBracesHighlight(Range rangeLine, Position braces[]); -}; - -/** - */ -class LineLayoutCache { - int level; - int length; - int size; - LineLayout **cache; - bool allInvalidated; - int styleClock; - int useCount; - void Allocate(int length_); - void AllocateForLevel(int linesOnScreen, int linesInDoc); -public: - LineLayoutCache(); - virtual ~LineLayoutCache(); - void Deallocate(); - enum { - llcNone=SC_CACHE_NONE, - llcCaret=SC_CACHE_CARET, - llcPage=SC_CACHE_PAGE, - llcDocument=SC_CACHE_DOCUMENT - }; - void Invalidate(LineLayout::validLevel validity_); - void SetLevel(int level_); - int GetLevel() { return level; } - LineLayout *Retrieve(int lineNumber, int lineCaret, int maxChars, int styleClock_, - int linesOnScreen, int linesInDoc); - void Dispose(LineLayout *ll); -}; - -/** * Hold a piece of text selected for copying or dragging. * The text is expected to hold a terminating '\0' and this is counted in len. */ @@ -229,6 +147,7 @@ Surface *pixmapIndentGuideHighlight; LineLayoutCache llc; + PositionCache posCache; KeyMap kmap; @@ -246,7 +165,7 @@ bool dwelling; enum { selChar, selWord, selLine } selectionType; Point ptMouseLast; - bool inDragDrop; + enum { ddNone, ddInitial, ddDragging } inDragDrop; bool dropWentOutside; int posDrag; int posDrop; @@ -395,8 +314,11 @@ int line, int lineEnd, int xStart, int subLine, int subLineStart, bool overrideBackground, ColourAllocated background, bool drawWrapMark, ColourAllocated wrapColour); + void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under); void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine=0); + void DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine, int xStart, int offset, int posCaret, PRectangle rcCaret); void RefreshPixMaps(Surface *surfaceWindow); void Paint(Surface *surfaceWindow, PRectangle rcArea); long FormatRange(bool draw, RangeToFormat *pfr); @@ -413,7 +335,7 @@ virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false); void ClearSelection(); void ClearAll(); - void ClearDocumentStyle(); + void ClearDocumentStyle(); void Cut(); void PasteRectangular(int pos, const char *ptr, int len); virtual void Copy() = 0; @@ -436,11 +358,12 @@ void NotifyMove(int position); void NotifySavePoint(bool isSavePoint); void NotifyModifyAttempt(); - virtual void NotifyDoubleClick(Point pt, bool shift); + virtual void NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt); void NotifyHotSpotClicked(int position, bool shift, bool ctrl, bool alt); void NotifyHotSpotDoubleClicked(int position, bool shift, bool ctrl, bool alt); void NotifyUpdateUI(); void NotifyPainted(); + void NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt); bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt); void NotifyNeedShown(int pos, int len); void NotifyDwelling(Point pt, bool state); @@ -486,6 +409,7 @@ void CopyText(int length, const char *text); void SetDragPosition(int newPos); virtual void DisplayCursor(Window::Cursor c); + virtual bool DragThreshold(Point ptStart, Point ptNow); 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. @@ -580,4 +504,8 @@ } }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/ExternalLexer.cxx =================================================================== --- trunk/scintilla/ExternalLexer.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/ExternalLexer.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -21,6 +21,10 @@ #include "KeyWords.h" #include "ExternalLexer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + LexerManager *LexerManager::theInstance = NULL; //------------------------------------------ Modified: trunk/scintilla/ExternalLexer.h =================================================================== --- trunk/scintilla/ExternalLexer.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/ExternalLexer.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -10,10 +10,14 @@ #if PLAT_WIN #define EXT_LEXER_DECL __stdcall -#elif PLAT_GTK -#define EXT_LEXER_DECL +#else +#define EXT_LEXER_DECL #endif +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + // External Lexer function definitions... typedef void (EXT_LEXER_DECL *ExtLexerFunction)(unsigned int lexer, unsigned int startPos, int length, int initStyle, char *words[], WindowID window, char *props); @@ -92,4 +96,8 @@ ~LMMinder(); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/Indicator.cxx =================================================================== --- trunk/scintilla/Indicator.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Indicator.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -10,6 +10,10 @@ #include "Scintilla.h" #include "Indicator.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine) { surface->PenColour(fore.allocated); int ymid = (rc.bottom + rc.top) / 2; Modified: trunk/scintilla/Indicator.h =================================================================== --- trunk/scintilla/Indicator.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/Indicator.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,15 +8,24 @@ #ifndef INDICATOR_H #define INDICATOR_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + /** */ class Indicator { public: int style; + bool under; ColourPair fore; - Indicator() : style(INDIC_PLAIN), fore(ColourDesired(0,0,0)) { + Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)) { } void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine); }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/KeyMap.cxx =================================================================== --- trunk/scintilla/KeyMap.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/KeyMap.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -11,6 +11,10 @@ #include "KeyMap.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + KeyMap::KeyMap() : kmap(0), len(0), alloc(0) { for (int i = 0; MapDefault[i].key; i++) { AssignCmdKey(MapDefault[i].key, Modified: trunk/scintilla/KeyMap.h =================================================================== --- trunk/scintilla/KeyMap.h 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/KeyMap.h 2007-06-18 13:02:34 UTC (rev 1629) @@ -8,6 +8,10 @@ #ifndef KEYTOCOMMAND_H #define KEYTOCOMMAND_H +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + #define SCI_NORM 0 #define SCI_SHIFT SCMOD_SHIFT #define SCI_CTRL SCMOD_CTRL @@ -40,4 +44,8 @@ unsigned int Find(int key, int modifiers); // 0 returned on failure }; +#ifdef SCI_NAMESPACE +} #endif + +#endif Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/KeyWords.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -19,6 +19,10 @@ #include "Scintilla.h" #include "SciLexer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + const LexerModule *LexerModule::base = 0; int LexerModule::nextLanguage = SCLEX_AUTOMATIC+1; @@ -138,37 +142,37 @@ //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ LINK_LEXER(lmAsm); + LINK_LEXER(lmASP); LINK_LEXER(lmBash); - LINK_LEXER(lmOMS); + LINK_LEXER(lmBatch); LINK_LEXER(lmCaml); - LINK_LEXER(lmFortran); - LINK_LEXER(lmPython); - LINK_LEXER(lmBatch); + LINK_LEXER(lmConf); + LINK_LEXER(lmCPP); + LINK_LEXER(lmCPPNoCase); + LINK_LEXER(lmCss); + LINK_LEXER(lmD); LINK_LEXER(lmDiff); - LINK_LEXER(lmProps); - LINK_LEXER(lmMake); LINK_LEXER(lmErrorList); + LINK_LEXER(lmFortran); + LINK_LEXER(lmHaskell); + LINK_LEXER(lmHTML); LINK_LEXER(lmLatex); + LINK_LEXER(lmLua); + LINK_LEXER(lmMake); + LINK_LEXER(lmNncrontab); LINK_LEXER(lmNull); + LINK_LEXER(lmOMS); LINK_LEXER(lmPascal); - LINK_LEXER(lmConf); - LINK_LEXER(lmNncrontab); - LINK_LEXER(lmHTML); - LINK_LEXER(lmXML); - LINK_LEXER(lmASP); + LINK_LEXER(lmPerl); LINK_LEXER(lmPHP); LINK_LEXER(lmPHPSCRIPT); - LINK_LEXER(lmCss); - LINK_LEXER(lmCPP); - LINK_LEXER(lmCPPNoCase); - LINK_LEXER(lmPerl); + LINK_LEXER(lmProps); + LINK_LEXER(lmPython); LINK_LEXER(lmRuby); LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); LINK_LEXER(lmVHDL); - LINK_LEXER(lmD); - LINK_LEXER(lmLua); - LINK_LEXER(lmHaskell); + LINK_LEXER(lmXML); //--Autogenerated -- end of automatically generated section Modified: trunk/scintilla/LexAsm.cxx =================================================================== --- trunk/scintilla/LexAsm.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexAsm.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -23,6 +23,9 @@ #include "Scintilla.h" #include "SciLexer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || @@ -30,9 +33,8 @@ } static inline bool IsAWordStart(const int ch) { - //ch == '$' || return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' || - ch == '%' || ch == '$' || ch == '?'); + ch == '%' || ch == '@' || ch == '$' || ch == '?'); } static inline bool IsAsmOperator(char ch) { @@ -99,7 +101,6 @@ char s[100]; sc.GetCurrentLowered(s, sizeof(s)); - //printf("-%s--", s); if (cpuInstruction.InList(s)) { sc.ChangeState(SCE_ASM_CPUINSTRUCTION); } else if (mathInstruction.InList(s)) { Modified: trunk/scintilla/LexBash.cxx =================================================================== --- trunk/scintilla/LexBash.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexBash.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -28,6 +28,10 @@ #define HERE_DELIM_MAX 256 +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + static inline int translateBashDigit(char ch) { if (ch >= '0' && ch <= '9') { return ch - '0'; Modified: trunk/scintilla/LexCPP.cxx =================================================================== --- trunk/scintilla/LexCPP.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexCPP.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -19,46 +19,12 @@ #include "KeyWords.h" #include "Scintilla.h" #include "SciLexer.h" +#include "CharacterSet.h" -#define SET_LOWER "abcdefghijklmnopqrstuvwxyz" -#define SET_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define SET_DIGITS "0123456789" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif -class SetOfCharacters { - int size; - bool valueAfter; - bool *bset; -public: - SetOfCharacters(const char *setOfCharacters, int size_=0x80, bool valueAfter_=false) { - size = size_; - valueAfter = valueAfter_; - bset = new bool[size]; - for (int i=0; i < size; i++) { - bset[i] = false; - } - for (const char *cp=setOfCharacters; *cp; cp++) { - int val = static_cast<unsigned char>(*cp); - PLATFORM_ASSERT(val >= 0); - PLATFORM_ASSERT(val < size); - bset[val] = true; - } - } - ~SetOfCharacters() { - delete []bset; - bset = 0; - size = 0; - } - void Add(int val) { - PLATFORM_ASSERT(val >= 0); - PLATFORM_ASSERT(val < size); - bset[val] = true; - } - bool Contains(int val) { - PLATFORM_ASSERT(val >= 0); - return (val < size) ? bset[val] : valueAfter; - } -}; - static bool IsSpaceEquiv(int state) { return (state <= SCE_C_COMMENTDOC) || // including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE @@ -76,12 +42,12 @@ bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; - SetOfCharacters setOKBeforeRE("(=,"); + CharacterSet setOKBeforeRE(CharacterSet::setNone, "(=,"); - SetOfCharacters setDoxygen("$@\\&<>#{}[]" SET_LOWER); + CharacterSet setDoxygen(CharacterSet::setLower, "$@\\&<>#{}[]"); - SetOfCharacters setWordStart("_" SET_LOWER SET_UPPER, 0x80, true); - SetOfCharacters setWord("._" SET_LOWER SET_UPPER SET_DIGITS, 0x80, true); + CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); + CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { setWordStart.Add('$'); setWord.Add('$'); Modified: trunk/scintilla/LexCSS.cxx =================================================================== --- trunk/scintilla/LexCSS.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexCSS.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -22,7 +22,11 @@ #include "Scintilla.h" #include "SciLexer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + static inline bool IsAWordChar(const unsigned int ch) { return (isalnum(ch) || ch == '-' || ch == '_' || ch >= 161); // _ is not in fact correct CSS word-character } Modified: trunk/scintilla/LexCaml.cxx =================================================================== --- trunk/scintilla/LexCaml.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexCaml.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -42,6 +42,10 @@ 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,16 /* M - X */ }; +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + #ifdef BUILD_AS_EXTERNAL_LEXER /* (actually seems to work!) Modified: trunk/scintilla/LexConf.cxx =================================================================== --- trunk/scintilla/LexConf.cxx 2007-06-17 17:56:48 UTC (rev 1628) +++ trunk/scintilla/LexConf.cxx 2007-06-18 13:02:34 UTC (rev 1629) @@ -23,6 +23,10 @@ #include "Scintilla.h" #include "SciLexer.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1628] trunk
by eht16＠users.sourceforge.net 17 Jun '07

17 Jun '07

Revision: 1628 http://svn.sourceforge.net/geany/?rev=1628&view=rev Author: eht16 Date: 2007-06-17 10:56:48 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Add new command line option --ft-names to get a list of supported filetype names. Complete rewrite of auto completion to make it user-definable and much more flexible. Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/TODO trunk/doc/geany.1.in trunk/doc/geany.docbook trunk/src/editor.c trunk/src/editor.h trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/main.c Added Paths: ----------- trunk/data/autocomplete.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/ChangeLog 2007-06-17 17:56:48 UTC (rev 1628) @@ -2,6 +2,13 @@ * src/templates.c, src/tools.c: Apply patch from Alexander Rodin to improve the class builder code(thanks). + * Makefile.am, TODO, data/autocomplete.conf, doc/geany.1.in, + doc/geany.docbook, src/editor.c, src/editor.h, src/keyfile.c, + src/keyfile.h, src/main.c: + Add new command line option --ft-names to get a list of supported + filetype names. + Complete rewrite of auto completion to make it user-definable and + much more flexible. 2007-06-15 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/Makefile.am 2007-06-17 17:56:48 UTC (rev 1628) @@ -17,7 +17,8 @@ data/pascal.tags \ data/html_entities.tags \ $(srcdir)/data/filetypes.* \ - data/filetype_extensions.conf + data/filetype_extensions.conf \ + data/autocomplete.conf EXTRA_DIST = \ autogen.sh \ Modified: trunk/TODO =================================================================== --- trunk/TODO 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/TODO 2007-06-17 17:56:48 UTC (rev 1628) @@ -11,7 +11,6 @@ return type with const, [] for D, etc.) o documentation: list and explain filetype modes o documentation: preferences - o user-definable construct completion o line breaking mode to limit words on a line for e.g. XML content. o common default highlighting for all programming languages o fix parsing command line args after given filenames Added: trunk/data/autocomplete.conf =================================================================== --- trunk/data/autocomplete.conf (rev 0) +++ trunk/data/autocomplete.conf 2007-06-17 17:56:48 UTC (rev 1628) @@ -0,0 +1,45 @@ +# Geany's auto completion configuration file +# use \n or %newline% for a new line (it will be replaced by the used EOL char(s) - LF, CR/LF, CR) +# use \t ot %ws% for an indentation step, if using only spaces for indentation only spaces will be used +# use \s to force whitespace at beginning or end of a value ('key= value' won't work, use 'key=\svalue') +# use %cursor% to define where the cursor should be placed after completion +# use %key% for all keys defined in the [Special] section +# you can define a section for each supported filetype to overwrite default settings, the section +# name must match exactly the internal filetype name, run 'geany --ft-names' for a full list + +# filetype names: +# C, C++, D, Java, Pascal, ASM, Fortran, CAML, Haskell, VHDL, Perl, PHP, Javascript, Python, Ruby, +# Tcl, Lua, Ferite, Sh, Make, O-Matrix, XML, Docbook, HTML, CSS, SQL, LaTeX, Diff, Conf, None + +# Default is used for all filetypes and keys can be overwritten by [filetype] sections +[Default] +if=if (%cursor%)%brace_open%\n%brace_close% +else=else%brace_open%\n%brace_close% +for=for (i = 0; i < %cursor%; i++)%brace_open%\n%brace_close% +while=while (%cursor%)%brace_open%\n%brace_close% +do=do%brace_open%%cursor%\n%brace_close%while () +switch=switch (%cursor%)%brace_open%case : break;\n%ws%default: \n%brace_close% +try=try%block_cursor%catch ()%block% + +# special keys to be used in other completions, cannot be used "standalone" +# can be used by %key%, e.g. %brace_open% +# nesting of special keys is not supported (e.g. brace_open=\n{\n%brace_close% won't work) +[Special] +brace_open=\n{\n\t +brace_close=}\n +block=\n{\n\t\n}\n +block_cursor=\n{\n\t%cursor%\n}\n + +[C++] +for=for (int i = 0; i < %cursor%; i++)%brace_open%\n%brace_close% + +[Java] +for=for (int i = 0; i < %cursor%; i++)%brace_open%\n%brace_close% + +[PHP] +for=for ($i = 0; $i < %cursor%; $i++)%brace_open%\n%brace_close% + +[Ferite] +iferr=iferr%block_cursor%fix%block% +monitor=monitor%block_cursor%handle%block% + Modified: trunk/doc/geany.1.in =================================================================== --- trunk/doc/geany.1.in 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/doc/geany.1.in 2007-06-17 17:56:48 UTC (rev 1628) @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "May 21, 2007" "@PACKAGE@ @VERSION@" "" +.TH "GEANY" "1" "June 17, 2007" "@PACKAGE@ @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" @@ -20,6 +20,8 @@ ~/.geany/ and there resides geany.conf and some template files. .IP "\fB-d\fP \fB\-\-debug\fP " 10 Run Geany in debug mode, which means being verbose and printing lots of information. +.IP "\fB\fP \fB\-\-ft\-names\fP " 10 +Print a list of Geany's internal filetype names (useful for the auto completion list). .IP "\fB-i\fP \fB\-\-new-instance\fP " 10 Don't open files in a running instance, force opening a new instance. Only available if Geany was compiled with support for Sockets. Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/doc/geany.docbook 2007-06-17 17:56:48 UTC (rev 1628) @@ -229,6 +229,13 @@ </entry> </row> <row> + <entry></entry> + <entry>--ft-names</entry> + <entry>Print a list of <application>Geany</application>'s internal + filetype names (useful for the auto completion list). + </entry> + </row> + <row> <entry>-i</entry> <entry>--new-instance</entry> <entry>Do not open files in a running instance, force opening a @@ -583,26 +590,6 @@ </variablelist> </para> </section> - <section id="editing_cc"> - <title>Construct completion</title> - <para> - Built-in construct completion is available for C-like languages. By default the - <keycap>Tab</keycap> key is used straight after typing the construct keyword. - </para> - <para> - Example: <literal>for</literal><TAB> - </para> - <para> - typed into a C file expands to: - </para> - <para> - <literallayout><literal>for (i = 0; i < ; i++) - { - - } - </literal></literallayout> - </para> - </section> <section id="editing_bookmarks"> <title>Bookmarks</title> <para> @@ -675,6 +662,108 @@ and it will open the address: http://www.php.net/echo. </para> </section> + <section id="editing_cc"> + <title>User-definable auto completion</title> + <para> + Geany can complete pre-defined constructs and often used strings automatically. + To know what to complete or replace Geany reads a configuration file called + <filename>autocomplete.conf</filename> at startup. + </para> + <para> + The system-wide configuration file can be found in + <filename>$prefix/share/geany</filename>, where $prefix is the path where + <application>Geany</application> is installed (commonly + <filename>/usr/local</filename>). It is not recommended to edit the system-wide + file, because it will be overridden when <application>Geany</application> is + updated. + </para> + <para> + To change the settings, copy the file from + <filename>$prefix/share/geany</filename> in your configuration directory + (usually <filename>~/.geany/</filename>). + </para> + <para> + For example: + <screen><prompt>%</prompt> <userinput><command>cp /usr/local/share/geany/autocomplete.conf /home/username/.geany/</command></userinput></screen> + Then you can edit the file and the changes are also available after an update of + <application>Geany</application> because the file resides in your configuration + directory. Alternatively, you can create a file + <filename>~/.geany/autocomplete.conf</filename> and add only these settings + you want to change. All missing settings will be read from the global auto + completion file in <filename>$prefix/share/geany</filename>. + </para> + <para> + The file autocomplete.conf may contain several sections for each filetype. It + also contains two additional sections "Default" and "Special". + Default contains all completions which are available for every filetype. You + may define another section for a certain filetype(e.g. C++) containing the same + completions. Then when using such a completion in a C++ file the completion + defined in the C++ section will be used. In any other file the completion + defined in the Default section will be used unless a section for the current + filetype exists and the used completion is defined in this section. + The section "Special" contains special completions which can only be used in + other completions. So you can define often used parts of completions and just + use the special completion as a placeholder (see the autocomplete.conf for + details). + </para> + <para> + To define completions you can use several special characters which will be + replaced when using the completion: + <table frame="all" id="completion_wildcards"> + <title>Wildcards for auto completion</title> + <tgroup cols="2"> + <?dbhtml cellpadding="4" ?> + <?dbhtml cellspacing="0" ?> + <colspec colnum="1" colname="col1"/> + <colspec colnum="2" colname="col2"/> + <tbody> + <row> + <entry>\n or %newline%</entry> + <entry>Insert a new line (it will be replaced by the used + EOL char(s) - LF, CR/LF, CR).</entry> + </row> + <row> + <entry>\t ot %ws%</entry> + <entry>Insert an indentation step, if using only spaces for + indentation only spaces will be used.</entry> + </row> + <row> + <entry>\s</entry> + <entry>\s to force whitespace at beginning or end of a value + ('key= value' won't work, use 'key=\svalue')</entry> + </row> + <row> + <entry>%cursor%</entry> + <entry>Place the cursor at this position after completion has + been done.</entry> + </row> + <row> + <entry>%...%</entry> + <entry>... means the name of a key in the "Special" section. + If you have defined a key "brace_open" in the "Special" + section you can use %brace_open" in any other completion. + </entry> + </row> + </tbody> + </tgroup> + </table> + </para> + <para> + Defined completions must not contain spaces otherwise they won't work + correctly. But beside that you can define almost everything string as a + completion and use it later in Geany. It is not limited to existing contructs + of certain programming languages(like if, for, switch). Define whatever you + need. + </para> + <para> + Maybe you need to often type your name, so define a completion like this: + <literallayout><literal>[Default] + myname=Enrico Tröger</literal></literallayout> + Everytime you write <literal>myname</literal><TAB> in Geany, it will + replace "myname" by "Enrico Tröger". The key to start auto completion can + be changed in the preferences dialog, by default it is TAB. + </para> + </section> </section> <section id="search"> <title>Search, replace and go to</title> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/src/editor.c 2007-06-17 17:56:48 UTC (rev 1628) @@ -1081,137 +1081,119 @@ } -/* This should use a string with the current word instead of buf, but we will replace this - * code with user-defined construct completion. */ -static gboolean complete_constructs(gint idx, gint pos, const gchar *buf, const gchar *space, - const gchar *eol) +static gchar *ac_find_completion_by_name(const gchar *type, const gchar *name) { - gboolean result; - gchar *construct = NULL; - gint space_len = strlen(space); - ScintillaObject *sci = doc_list[idx].sci; + gchar *result = NULL; + GHashTable *tmp; - // "pattern", buf + x, y -> x + y = 15, because buf is (pos - 15)...(pos) = 15 - if (! strncmp("if", buf + 13, 2)) - { - if (! isspace(*(buf + 12))) - return FALSE; + g_return_val_if_fail(type != NULL && name != NULL, NULL); - construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); - - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 1, TRUE); - } - else if (! strncmp("else", buf + 11, 4)) + tmp = g_hash_table_lookup(editor_prefs.auto_completions, type); + if (tmp != NULL) { - if (! isspace(*(buf + 10))) - return FALSE; - - construct = g_strdup_printf("%s{%s%s%s}%s", eol, eol, space, eol, eol); - - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + result = g_hash_table_lookup(tmp, name); } - else if (! strncmp("for", buf + 12, 3)) + // whether nothing is set for the current filetype(tmp is NULL) or + // the particular completion for this filetype is not set (result is NULL) + if (tmp == NULL || result == NULL) { - gchar *var; - gint contruct_len; - - if (! isspace(*(buf + 11))) - return FALSE; - - if (doc_list[idx].file_type->id == GEANY_FILETYPES_PHP) + tmp = g_hash_table_lookup(editor_prefs.auto_completions, "Default"); + if (tmp != NULL) { - var = g_strdup("$i"); - contruct_len = 14; + result = g_hash_table_lookup(tmp, name); } - else - { - var = g_strdup("i"); - contruct_len = 12; - } - construct = g_strdup_printf("(%s%s = 0; %s < ; %s++)%s{%s%s%s}%s", - (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? "int " : "", - var, var, var, eol, eol, space, eol, eol); - - // add 4 characters because of "int " in C++ mode - contruct_len += (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? 4 : 0; - - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + contruct_len, TRUE); - g_free(var); } - else if (! strncmp("while", buf + 10, 5)) - { - if (! isspace(*(buf + 9))) - return FALSE; + // if result is still NULL here, no completion could be found - construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); + // result is owned by the hash table and will be freed when the table will destroyed + return g_strdup(result); +} - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 1, TRUE); - } - else if (! strncmp("do", buf + 13, 2)) - { - if (! isspace(*(buf + 12))) - return FALSE; - construct = g_strdup_printf("%s{%s%s%s}%swhile ();%s", eol, eol, space, eol, eol, eol); +/* This is very ugly but passing the pattern to ac_replace_specials() doesn't work because it is + * modified when replacing a completion but the foreach function still passes the old pointer + * to ac_replace_specials, so we use a global pointer outside of ac_replace_specials and + * ac_complete_constructs. Any hints to improve this are welcome. */ +static gchar *global_pattern = NULL; - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); - } - else if (! strncmp("try", buf + 12, 3)) - { - if (! isspace(*(buf + 11))) - return FALSE; +void ac_replace_specials(gpointer key, gpointer value, gpointer user_data) +{ + gchar *needle; - construct = g_strdup_printf("%s{%s%s%s}%scatch ()%s{%s%s%s}%s", - eol, eol, space, eol, eol, eol, eol, space, eol, eol); + if (key == NULL || value == NULL) + return; - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); - } - else if (! strncmp("switch", buf + 9, 6)) - { - if (! isspace(*(buf + 8))) - return FALSE; + needle = g_strconcat("%", (gchar*) key, "%", NULL); - construct = g_strdup_printf("()%s{%s%scase : break;%s%sdefault: %s}%s", - eol, eol, space, eol, space, eol, eol); + global_pattern = utils_str_replace(global_pattern, needle, (gchar*) value); + g_free(needle); +} - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 1, TRUE); - } - else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("iferr", buf + 10, 5)) - { - if (! isspace(*(buf + 9))) - return FALSE; - construct = g_strdup_printf("%s{%s%s%s}%sfix%s{%s%s%s}%s", - eol, eol, space, eol, eol, eol, eol, space, eol, eol); +static gboolean ac_complete_constructs(gint idx, gint pos, const gchar *word) +{ + gchar *str; + gchar *pattern; + gchar *lindent; + gchar *whitespace; + gint step, str_len; + GHashTable *specials; + ScintillaObject *sci = doc_list[idx].sci; - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); - } - else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("monitor", buf + 8, 7)) + str = g_strdup(word); + g_strstrip(str); + + pattern = ac_find_completion_by_name(doc_list[idx].file_type->name, str); + if (pattern == NULL || pattern[0] == '\0') { - if (! isspace(*(buf + 7))) - return FALSE; + utils_free_pointers(str, pattern, NULL); // free pattern in case it is "" + return FALSE; + } - construct = g_strdup_printf("%s{%s%s%s}%shandle%s{%s%s%s}%s", - eol, eol, space, eol, eol, eol, eol, space, eol, eol); + get_indent(sci, pos, TRUE); + lindent = g_strconcat(utils_get_eol_char(idx), indent, NULL); + whitespace = get_whitespace(editor_prefs.tab_width, FALSE); - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); - } - result = (construct != NULL); - if (result) + // remove the typed word, it will be added again by the used auto completion + // (not really necessary but this makes the auto completion more flexible, + // e.g. with a completion like hi=hello, so typing "hi<TAB>" will result in "hello") + str_len = strlen(str); + sci_set_selection_start(sci, pos - str_len); + sci_set_selection_end(sci, pos); + sci_replace_sel(sci, ""); + pos -= str_len; // pos has changed while deleting + + // replace 'special' completions + specials = g_hash_table_lookup(editor_prefs.auto_completions, "Special"); + if (specials != NULL) { - sci_insert_text(sci, pos, " "); // prefix all constructs with a space + // ugly hack using global_pattern + global_pattern = pattern; + g_hash_table_foreach(specials, ac_replace_specials, NULL); + pattern = global_pattern; } - g_free(construct); - return result; + + // replace line breaks and whitespaces + pattern = utils_str_replace(pattern, "\n", "%newline%"); // to avoid endless replacing of \n + pattern = utils_str_replace(pattern, "%newline%", lindent); + + pattern = utils_str_replace(pattern, "\t", "%ws%"); // to avoid endless replacing of \t + pattern = utils_str_replace(pattern, "%ws%", whitespace); + + // find the %cursor% pos (has to be done after all other operations) + step = utils_strpos(pattern, "%cursor%"); + if (step != -1) + pattern = utils_str_replace(pattern, "%cursor%", ""); + + // finally insert the text and set the cursor + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) pattern); + if (step != -1) + sci_goto_pos(sci, pos + step, TRUE); + else + sci_goto_pos(sci, pos + strlen(pattern), TRUE); + + utils_free_pointers(pattern, whitespace, lindent, str, NULL); + return TRUE; } @@ -1226,24 +1208,12 @@ gboolean editor_auto_forif(gint idx, gint pos) { gboolean result; - gchar buf[16]; - gchar *eol; - gchar *space; + gchar *word; gint lexer, style; gint i; ScintillaObject *sci; - if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; - - // only for C, C++, D, Ferite, Java, JavaScript, Perl and PHP - if (doc_list[idx].file_type->id != GEANY_FILETYPES_PHP && - doc_list[idx].file_type->id != GEANY_FILETYPES_C && - doc_list[idx].file_type->id != GEANY_FILETYPES_D && - doc_list[idx].file_type->id != GEANY_FILETYPES_CPP && - doc_list[idx].file_type->id != GEANY_FILETYPES_PERL && - doc_list[idx].file_type->id != GEANY_FILETYPES_JAVA && - doc_list[idx].file_type->id != GEANY_FILETYPES_JS && - doc_list[idx].file_type->id != GEANY_FILETYPES_FERITE) + if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) return FALSE; sci = doc_list[idx].sci; @@ -1260,35 +1230,30 @@ if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) return FALSE; - sci_get_text_range(sci, pos - 15, pos, buf); - if (sizeof(buf) != strlen(buf) + 1) - return FALSE; // not enough chars in document + // get the current line contents + word = sci_get_line(sci, SSM(sci, SCI_LINEFROMPOSITION, pos, 0)); /* check that the chars before the current word are only whitespace (on this line). * this prevents completion of '} while ' */ - i = 14; // index before \0 char - while (i >= 0 && isalpha(buf[i])) i--; // find pos before keyword - while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to stay in this line('\n' check) + i = strlen(word) - 1; + while (i >= 0 && isspace(word[i])) i--; // skip trailing whitespace + while (i >= 0 && isalpha(word[i])) i--; // find pos before keyword + while (i >= 0 && word[i] != '\n' && word[i] != '\r') // we want to stay in this line('\n' check) { - if (! isspace(buf[i])) - { + if (! isspace(word[i])) return FALSE; - } i--; } // get the indentation - if (doc_list[idx].auto_indent) get_indent(sci, pos, TRUE); - eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); + if (doc_list[idx].auto_indent) + get_indent(sci, pos, TRUE); - // get the whitespace for additional indentation - space = get_whitespace(editor_prefs.tab_width, FALSE); - - sci_start_undo_action(sci); // needed while we insert a space separately from construct - result = complete_constructs(idx, pos, buf, space, eol); + sci_start_undo_action(sci); // needed because we insert a space separately from construct + result = ac_complete_constructs(idx, pos, word); sci_end_undo_action(sci); - utils_free_pointers(eol, space, NULL); + utils_free_pointers(word, NULL); return result; } @@ -2331,3 +2296,9 @@ } +void editor_finalize() +{ + g_hash_table_destroy(editor_prefs.auto_completions); + + scintilla_release_resources(); +} Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/src/editor.h 2007-06-17 17:56:48 UTC (rev 1628) @@ -18,6 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * + * $Id$ */ #ifndef GEANY_SCI_CB_H @@ -58,12 +59,14 @@ gboolean unfold_all_children; gboolean show_scrollbars; gint tab_width; + gint caret_blink_time; gboolean use_tabs; gint default_encoding; gboolean new_line; gboolean replace_tabs; gboolean trail_space; gboolean disable_dnd; + GHashTable *auto_completions; } EditorPrefs; extern EditorPrefs editor_prefs; @@ -78,6 +81,15 @@ extern EditorInfo editor_info; +typedef struct +{ + gchar *type; // represents in most cases the filetype(two exceptions: default and special) + gchar *name; // name of the key in config file, represents the entered text to complete + gchar *value; +} AutoCompletion; + + + gboolean on_editor_button_press_event (GtkWidget *widget, GdkEventButton *event, @@ -125,4 +137,6 @@ void editor_insert_alternative_whitespace(ScintillaObject *sci); +void editor_finalize(); + #endif Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/src/keyfile.c 2007-06-17 17:56:48 UTC (rev 1628) @@ -771,3 +771,79 @@ g_key_file_free(sysconfig); g_key_file_free(userconfig); } + + +void configuration_read_autocompletions() +{ + gsize i, j, len = 0, len_keys = 0; + gchar *sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, + "autocomplete.conf", NULL); + gchar *userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, + "autocomplete.conf", NULL); + gchar **groups_user, **groups_sys; + gchar **keys_user, **keys_sys; + gchar *value; + GKeyFile *sysconfig = g_key_file_new(); + GKeyFile *userconfig = g_key_file_new(); + GHashTable *tmp; + + g_key_file_load_from_file(sysconfig, sysconfigfile, G_KEY_FILE_NONE, NULL); + g_key_file_load_from_file(userconfig, userconfigfile, G_KEY_FILE_NONE, NULL); + + // keys are strings, values are GHashTables, so use g_free and g_hash_table_destroy + editor_prefs.auto_completions = + g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_destroy); + + // first read all globally defined auto completions + groups_sys = g_key_file_get_groups(sysconfig, &len); + for (i = 0; i < len; i++) + { + keys_sys = g_key_file_get_keys(sysconfig, groups_sys[i], &len_keys, NULL); + // create new hash table for the read section (=> filetype) + tmp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + g_hash_table_insert(editor_prefs.auto_completions, g_strdup(groups_sys[i]), tmp); + + for (j = 0; j < len_keys; j++) + { + g_hash_table_insert(tmp, g_strdup(keys_sys[j]), + utils_get_setting_string(sysconfig, groups_sys[i], keys_sys[j], "")); + } + g_strfreev(keys_sys); + } + + // now read defined completions in user's configuration directory and add / replace them + groups_user = g_key_file_get_groups(userconfig, &len); + for (i = 0; i < len; i++) + { + keys_user = g_key_file_get_keys(userconfig, groups_user[i], &len_keys, NULL); + + tmp = g_hash_table_lookup(editor_prefs.auto_completions, groups_user[i]); + if (tmp == NULL) + { // new key found, create hash table + tmp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + g_hash_table_insert(editor_prefs.auto_completions, g_strdup(groups_user[i]), tmp); + } + for (j = 0; j < len_keys; j++) + { + value = g_hash_table_lookup(tmp, keys_user[j]); + if (value == NULL) + { // value = NULL means the key doesn't yet exist, so insert + g_hash_table_insert(tmp, g_strdup(keys_user[j]), + utils_get_setting_string(userconfig, groups_user[i], keys_user[j], "")); + } + else + { // old key and value will be freed by destroy function (g_free) + g_hash_table_replace(tmp, g_strdup(keys_user[j]), + utils_get_setting_string(userconfig, groups_user[i], keys_user[j], "")); + } + } + g_strfreev(keys_user); + } + + g_free(sysconfigfile); + g_free(userconfigfile); + g_strfreev(groups_sys); + g_strfreev(groups_user); + g_key_file_free(sysconfig); + g_key_file_free(userconfig); +} Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/src/keyfile.h 2007-06-17 17:56:48 UTC (rev 1628) @@ -33,6 +33,8 @@ void configuration_read_filetype_extensions(); +void configuration_read_autocompletions(); + /* set some settings which are already read from the config file, but need other things, like the * realisation of the main window */ void configuration_apply_settings(); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-06-17 16:55:25 UTC (rev 1627) +++ trunk/src/main.c 2007-06-17 17:56:48 UTC (rev 1628) @@ -89,12 +89,14 @@ #endif static gboolean generate_datafiles = FALSE; static gboolean generate_tags = FALSE; +static gboolean ft_names = FALSE; static GOptionEntry entries[] = { { "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("set initial column number for the first opened file (useful in conjunction with --line)"), NULL }, { "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("use an alternate configuration directory"), NULL }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode, N_("runs in debug mode (means being verbose)"), NULL }, + { "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("print internal filetype names"), NULL }, { "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("generate global tags file (see documentation)"), NULL }, { "generate-data-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, "", NULL }, #ifdef HAVE_SOCKET @@ -482,7 +484,20 @@ exit(ret); } + if (ft_names) + { + int i; + printf("Geany's internal filetype names:\n"); + filetypes_init_types(); + for (i = 0; i < GEANY_MAX_FILE_TYPES; i++) + { + printf("%s\n", filetypes[i]->name); + } + filetypes_free_types(); + exit(0); + } + #ifdef HAVE_SOCKET socket_info.ignore_socket = ignore_socket; #endif @@ -665,6 +680,7 @@ templates_init(); document_init_doclist(); configuration_read_filetype_extensions(); + configuration_read_autocompletions(); // set window icon { @@ -785,6 +801,7 @@ build_finalize(); document_finalize(); symbols_finalize(); + editor_finalize(); if (app->project != NULL) project_close(); tm_workspace_free(TM_WORK_OBJECT(app->tm_workspace)); @@ -825,7 +842,6 @@ g_object_unref(app->default_tag_tree); gtk_widget_destroy(app->default_tag_tree); } - scintilla_release_resources(); #ifdef HAVE_VTE if (vte_info.have_vte) vte_close(); g_free(vte_info.lib_vte); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1627] trunk/po
by eht16＠users.sourceforge.net 17 Jun '07

17 Jun '07

Revision: 1627 http://svn.sourceforge.net/geany/?rev=1627&view=rev Author: eht16 Date: 2007-06-17 09:55:25 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-06-17 15:14:04 UTC (rev 1626) +++ trunk/po/ChangeLog 2007-06-17 16:55:25 UTC (rev 1627) @@ -1,3 +1,8 @@ +2007-06-17 Enrico Tröger <enrico.troeger(a)uvena.de> + + * de.po: Fix typo + + 2007-06-15 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of Gemran translation @@ -6,8 +11,8 @@ 2007-06-14 Frank Lanitz <frank(a)frank.uvena.de> - * de.po: Update of German translation - * pt_BR.po: Update of Brasilian Portuguese translation + * de.po: Update of German translation + * pt_BR.po: Update of Brasilian Portuguese translation (Thanks to Adrovane Marques Kade) @@ -19,7 +24,7 @@ 2007-06-08 Frank Lanitz <frank(a)frank.uvena.de> - * pt_BR.po: Update of Brasilian Portuguese translation + * pt_BR.po: Update of Brasilian Portuguese translation (Thanks to Adrovane Marques Kade) Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2007-06-17 15:14:04 UTC (rev 1626) +++ trunk/po/de.po 2007-06-17 16:55:25 UTC (rev 1627) @@ -947,7 +947,7 @@ #: src/filetypes.c:325 msgid "Ferite source file" -msgstr "Ferite Qulldatei" +msgstr "Ferite Quelldatei" #: src/filetypes.c:337 msgid "Haskell source file" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1626] trunk
by eht16＠users.sourceforge.net 17 Jun '07

17 Jun '07

Revision: 1626 http://svn.sourceforge.net/geany/?rev=1626&view=rev Author: eht16 Date: 2007-06-17 08:14:04 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Apply patch from Alexander Rodin to improve the class builder code(thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-15 17:16:06 UTC (rev 1625) +++ trunk/ChangeLog 2007-06-17 15:14:04 UTC (rev 1626) @@ -1,3 +1,9 @@ +2007-06-17 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/templates.c, src/tools.c: Apply patch from Alexander Rodin to + improve the class builder code(thanks). + + 2007-06-15 Frank Lanitz <frank(a)frank.uvena.de> * src/about.c: Update of about dialog. Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-06-15 17:16:06 UTC (rev 1625) +++ trunk/src/templates.c 2007-06-17 15:14:04 UTC (rev 1626) @@ -315,7 +315,7 @@ static void {class_name_low}_class_init({class_name}Class *klass)\n\ {\n\ {gtk_destructor_registration}\n\ - parent_class = gtk_type_class({base_gtype});\n\ + parent_class = ({base_name}Class*)g_type_class_peek({base_gtype});\n\ g_type_class_add_private((gpointer)klass, sizeof({class_name}Private));\n\ }\n\ \n\ Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-06-15 17:16:06 UTC (rev 1625) +++ trunk/src/tools.c 2007-06-17 15:14:04 UTC (rev 1626) @@ -83,10 +83,10 @@ static void sc_fill_store(GtkTreeStore *store); static gboolean sc_insert(GtkTreeModel *model, GtkTreeIter *iter); -static void on_set_sensitive_toggled(GtkWidget *toggle_button, GtkWidget *target_widget); -static void on_class_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg); -static void on_base_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg); -static void on_create_class(CreateClassDialog *cc_dlg); +static void cc_dlg_on_set_sensitive_toggled(GtkWidget *toggle_button, GtkWidget *target_widget); +static void cc_dlg_on_class_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg); +static void cc_dlg_on_base_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg); +static void cc_dlg_on_create_class(CreateClassDialog *cc_dlg); void tools_show_dialog_insert_special_chars() @@ -932,15 +932,16 @@ GtkWidget *vbox; GtkWidget *hbox; GtkWidget *label; - GtkWidget *action_area; - GtkWidget *cancel_button; - GtkWidget *ok_button; cc_dlg = g_new0(CreateClassDialog, 1); cc_dlg->class_type = type; - cc_dlg->dialog = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(cc_dlg->dialog), _("Create class")); + cc_dlg->dialog = gtk_dialog_new_with_buttons(_("Create class"), + GTK_WINDOW(app->window), + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); gtk_container_set_border_width(GTK_CONTAINER(cc_dlg->dialog), 5); g_signal_connect_swapped(G_OBJECT(cc_dlg->dialog), "destroy", G_CALLBACK(g_free), (gpointer)cc_dlg); @@ -969,7 +970,7 @@ gtk_box_pack_start(GTK_BOX(hbox), cc_dlg->class_name_entry, TRUE, TRUE, 0); gtk_widget_show(cc_dlg->class_name_entry); g_signal_connect(G_OBJECT(cc_dlg->class_name_entry), "changed", - G_CALLBACK(on_class_name_entry_changed), cc_dlg); + G_CALLBACK(cc_dlg_on_class_name_entry_changed), cc_dlg); hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); @@ -1014,11 +1015,11 @@ cc_dlg->base_name_entry = gtk_entry_new(); if (type == GEANY_CLASS_TYPE_GTK) - gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_name_entry), "GtkObject"); + gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_name_entry), "GObject"); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_name_entry); gtk_widget_show(cc_dlg->base_name_entry); g_signal_connect(G_OBJECT(cc_dlg->base_name_entry), "changed", - G_CALLBACK(on_base_name_entry_changed), (gpointer)cc_dlg); + G_CALLBACK(cc_dlg_on_base_name_entry_changed), (gpointer)cc_dlg); hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); @@ -1030,7 +1031,7 @@ cc_dlg->base_header_entry = gtk_entry_new(); if (type == GEANY_CLASS_TYPE_GTK) - gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), "gtk/gtkobject.h"); + gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), "glib-object.h"); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_header_entry); gtk_widget_show(cc_dlg->base_header_entry); @@ -1082,38 +1083,27 @@ gtk_container_add(GTK_CONTAINER(vbox), hbox); gtk_widget_show(hbox); g_signal_connect(G_OBJECT(cc_dlg->create_constructor_box), "toggled", - G_CALLBACK(on_set_sensitive_toggled), (gpointer)hbox); + G_CALLBACK(cc_dlg_on_set_sensitive_toggled), (gpointer)hbox); label = gtk_label_new(_("GTK+ constructor type")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); cc_dlg->gtk_constructor_type_entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry), "GtkObject"); + gtk_entry_set_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry), "GObject"); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->gtk_constructor_type_entry); gtk_widget_show(cc_dlg->gtk_constructor_type_entry); } - action_area = GTK_DIALOG(cc_dlg->dialog)->action_area; + if (gtk_dialog_run(GTK_DIALOG(cc_dlg->dialog)) == GTK_RESPONSE_OK) + cc_dlg_on_create_class(cc_dlg); - cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - gtk_container_add(GTK_CONTAINER(action_area), cancel_button); - gtk_widget_show(cancel_button); - - g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked", - G_CALLBACK(gtk_object_destroy), (gpointer)cc_dlg->dialog); - - ok_button = gtk_button_new_from_stock(GTK_STOCK_OK); - gtk_container_add(GTK_CONTAINER(action_area), ok_button); - gtk_widget_show(ok_button); - g_signal_connect_swapped(G_OBJECT(ok_button), "clicked", - G_CALLBACK(on_create_class), (gpointer)cc_dlg); - - gtk_widget_show(cc_dlg->dialog); + gtk_widget_destroy(cc_dlg->dialog); +// g_object_unref(G_OBJECT(cc_dlg->dialog)); } -static void on_set_sensitive_toggled(GtkWidget *toggle_button, GtkWidget *target_widget) +static void cc_dlg_on_set_sensitive_toggled(GtkWidget *toggle_button, GtkWidget *target_widget) { g_return_if_fail(toggle_button != NULL); g_return_if_fail(GTK_IS_TOGGLE_BUTTON(toggle_button)); @@ -1125,7 +1115,7 @@ } -static void on_class_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg) +static void cc_dlg_on_class_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg) { gchar *class_name_down; gchar *class_header; @@ -1171,7 +1161,7 @@ } -static void on_base_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg) +static void cc_dlg_on_base_name_entry_changed(GtkWidget *entry, CreateClassDialog *cc_dlg) { gchar *base_name_splitted; gchar *base_header; @@ -1182,9 +1172,12 @@ g_return_if_fail(cc_dlg != NULL); base_name_splitted = str_case_split(gtk_entry_get_text(GTK_ENTRY(entry)), '_'); - tmp = g_strdup_printf("%s%s.h", - g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(entry)), "gtk", 3) ? "": "gtk/", - gtk_entry_get_text(GTK_ENTRY(entry))); + if (! g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(entry)), "gtk", 3)) + tmp = g_strconcat("gtk/", gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL); + else if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) + tmp = g_strdup("glib-object.h"); + else + tmp = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL); base_header = g_ascii_strdown(tmp, -1); g_free(tmp); @@ -1194,11 +1187,11 @@ { gchar *base_gtype; if (! g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(entry)), "gtk", 3)) - { tmp = g_strdup_printf("%.3s_TYPE%s", base_name_splitted, base_name_splitted + 3); - } + else if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "GObject")) + tmp = g_strdup("G_TYPE_OBJECT"); else tmp = g_strconcat(base_name_splitted, "_TYPE", NULL); base_gtype = g_ascii_strup(tmp, -1); @@ -1213,7 +1206,7 @@ } -static void on_create_class(CreateClassDialog *cc_dlg) +static void cc_dlg_on_create_class(CreateClassDialog *cc_dlg) { ClassInfo *class_info; gint idx; @@ -1231,7 +1224,7 @@ tmp = str_case_split(class_info->class_name, '_'); class_info->class_name_up = g_ascii_strup(tmp, -1); class_info->class_name_low = g_ascii_strdown(class_info->class_name_up, -1); - if (*gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry)) != '\0') + if (! utils_str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry)), "")) { class_info->base_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry))); class_info->base_include = g_strdup_printf("\n#include %c%s%c\n", @@ -1241,6 +1234,11 @@ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->base_header_global_box)) ? '>' : '\"'); } + else + { + class_info->base_name = g_strdup(""); + class_info->base_include = g_strdup(""); + } class_info->header = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->header_entry))); class_info->header_guard = g_ascii_strup(class_info->header, -1); g_strdelimit(class_info->header_guard, ".", '_'); @@ -1249,13 +1247,15 @@ case GEANY_CLASS_TYPE_CPP: { class_info->source = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->source_entry))); - if (class_info->base_name != NULL) + if (! utils_str_equal(class_info->base_name, "")) class_info->base_decl = g_strdup_printf(": public %s", class_info->base_name); + else + class_info->base_decl = g_strdup(""); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box))) { gchar *base_constructor; - if (class_info->base_name == NULL) + if (utils_str_equal(class_info->base_name, "")) base_constructor = g_strdup(""); else base_constructor = g_strdup_printf("\t: %s()\n", class_info->base_name); @@ -1264,6 +1264,11 @@ class_info->class_name, class_info->class_name, base_constructor); g_free(base_constructor); } + else + { + class_info->constructor_decl = g_strdup(""); + class_info->constructor_impl = g_strdup(""); + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_destructor_box))) { class_info->destructor_decl = @@ -1271,6 +1276,11 @@ class_info->destructor_impl = g_strdup_printf("\n%s::~%s()\n{\n\t\n}\n", class_info->class_name, class_info->class_name); } + else + { + class_info->destructor_decl = g_strdup(""); + class_info->destructor_impl = g_strdup(""); + } break; } case GEANY_CLASS_TYPE_GTK: @@ -1293,37 +1303,48 @@ gtk_entry_get_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry)), class_info->class_name_up); } + else + { + class_info->constructor_decl = g_strdup(""); + class_info->constructor_impl = g_strdup(""); + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_destructor_box))) { class_info->gtk_destructor_registration = - g_strdup_printf("GtkObjectClass *object_class;\n\n" - "\tobject_class = (GtkObjectClass*)klass;\n\n" - "\tobject_class->destroy = %s_destroy;\n", + g_strdup_printf("GObjectClass *g_object_class;\n\n" + "\tg_object_class = G_OBJECT_CLASS(klass);\n\n" + "\tg_object_class->finalize = %s_finalize;\n", class_info->class_name_low); class_info->destructor_decl = - g_strdup_printf("static void %s_destroy\t\t\t(GtkObject *object);\n", + g_strdup_printf("static void %s_finalize\t\t\t(GObject *object);\n", class_info->class_name_low); class_info->destructor_impl = g_strdup_printf("\n" - "void %s_destroy(GtkObject *object)\n" + "void %s_finalize(GObject *object)\n" "{\n" "\t%s *self;\n\n" "\tg_return_if_fail(object != NULL);\n" "\tg_return_if_fail(IS_%s(object));\n\n" "\tself = %s(object);\n\n" - "\tif (GTK_OBJECT_CLASS(parent_class)->destroy)\n" - "\t\t(* GTK_OBJECT_CLASS(parent_class)->destroy)(object);\n" + "\tif (G_OBJECT_CLASS(parent_class)->finalize)\n" + "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(object);\n" "}\n", class_info->class_name_low, class_info->class_name, class_info->class_name_up, class_info->class_name_up); } + else + { + class_info->gtk_destructor_registration = g_strdup(""); + class_info->destructor_decl = g_strdup(""); + class_info->destructor_impl = g_strdup(""); + } break; } } // only create the files if the filename is not empty - if (*class_info->source != '\0') + if (! utils_str_equal(class_info->source, "")) { text = templates_get_template_class_source(class_info); idx = document_new_file(class_info->source, NULL); @@ -1331,7 +1352,7 @@ g_free(text); } - if (*class_info->header != '\0') + if (! utils_str_equal(class_info->header, "")) { text = templates_get_template_class_header(class_info); idx = document_new_file(class_info->header, NULL); @@ -1339,8 +1360,6 @@ g_free(text); } - gtk_object_destroy(GTK_OBJECT(cc_dlg->dialog)); - utils_free_pointers(tmp, class_info->class_name, class_info->class_name_up, class_info->base_name, class_info->class_name_low, class_info->base_include, class_info->header, class_info->header_guard, class_info->source, class_info->base_decl, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2007