Commits March 2008

commits@lists.geany.org

3 participants
133 discussions

SF.net SVN: geany: [2311] trunk/src/keyfile.c
by eht16＠users.sourceforge.net 07 Mar '08

07 Mar '08

Revision: 2311 http://geany.svn.sourceforge.net/geany/?rev=2311&view=rev Author: eht16 Date: 2008-03-07 06:21:01 -0800 (Fri, 07 Mar 2008) Log Message: ----------- When opening session files, don't try to set document properties if the document can't be opened. Modified Paths: -------------- trunk/src/keyfile.c Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-03-07 14:20:25 UTC (rev 2310) +++ trunk/src/keyfile.c 2008-03-07 14:21:01 UTC (rev 2311) @@ -855,10 +855,14 @@ -1, locale_filename, pos, ro, ft, (enc_idx >= 0 && enc_idx < GEANY_ENCODINGS_MAX) ? encodings[enc_idx].charset : NULL); - document_set_use_tabs(new_idx, use_tabs); - doc_list[new_idx].auto_indent = auto_indent; - document_set_line_wrapping(new_idx, line_wrapping); - ret = TRUE; + + if (DOC_IDX_VALID(new_idx)) + { + document_set_use_tabs(new_idx, use_tabs); + document_set_line_wrapping(new_idx, line_wrapping); + doc_list[new_idx].auto_indent = auto_indent; + ret = TRUE; + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2310] trunk
by eht16＠users.sourceforge.net 07 Mar '08

07 Mar '08

Revision: 2310 http://geany.svn.sourceforge.net/geany/?rev=2310&view=rev Author: eht16 Date: 2008-03-07 06:20:25 -0800 (Fri, 07 Mar 2008) Log Message: ----------- Use doxygen option QUIET to disable non-warning messages instead of redirecting output to /dev/null. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Doxyfile.in trunk/doc/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-06 15:47:43 UTC (rev 2309) +++ trunk/ChangeLog 2008-03-07 14:20:25 UTC (rev 2310) @@ -1,3 +1,13 @@ +2008-03-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/Doxyfile.in, doc/Makefile.am: + Use doxygen option QUIET to disable non-warning messages instead of + redirecting output to /dev/null. + * src/keyfile.c: + When opening session files, don't try to set document properties if + the document can't be opened. + + 2008-03-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/callbacks.c: Modified: trunk/doc/Doxyfile.in =================================================================== --- trunk/doc/Doxyfile.in 2008-03-06 15:47:43 UTC (rev 2309) +++ trunk/doc/Doxyfile.in 2008-03-07 14:20:25 UTC (rev 2310) @@ -85,7 +85,7 @@ #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -QUIET = NO +QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-03-06 15:47:43 UTC (rev 2309) +++ trunk/doc/Makefile.am 2008-03-07 14:20:25 UTC (rev 2310) @@ -11,7 +11,7 @@ mv $(srcdir)/geany.pdf geany-$(VERSION).pdf api-doc: Doxyfile - doxygen >/dev/null + doxygen doc: geany.txt rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2309] trunk
by eht16＠users.sourceforge.net 06 Mar '08

06 Mar '08

Revision: 2309 http://geany.svn.sourceforge.net/geany/?rev=2309&view=rev Author: eht16 Date: 2008-03-06 07:47:43 -0800 (Thu, 06 Mar 2008) Log Message: ----------- Apply patch from Jeff Pohlmeyer (thanks) to fix toggle case with rectangular selections (works only for Ascii characters). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-05 18:18:19 UTC (rev 2308) +++ trunk/ChangeLog 2008-03-06 15:47:43 UTC (rev 2309) @@ -1,3 +1,10 @@ +2008-03-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/callbacks.c: + Apply patch from Jeff Pohlmeyer (thanks) to fix toggle case with + rectangular selections (works only for Ascii characters). + + 2008-03-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/filetypes.c, src/filetypes.h, src/symbols.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-03-05 18:18:19 UTC (rev 2308) +++ trunk/src/callbacks.c 2008-03-06 15:47:43 UTC (rev 2309) @@ -931,24 +931,43 @@ if (sci_can_copy(sci)) { - gchar *result; + gchar *result = NULL; + gint cmd; gint text_len = sci_get_selected_text_length(sci); + gboolean rectsel = scintilla_send_message(sci, SCI_SELECTIONISRECTANGLE, 0, 0); text = g_malloc(text_len + 1); sci_get_selected_text(sci, text); if (utils_str_has_upper(text)) - result = g_utf8_strdown(text, -1); + { + if (rectsel) + cmd = SCI_LOWERCASE; + else + result = g_utf8_strdown(text, -1); + + } else - result = g_utf8_strup(text, -1); + { + if (rectsel) + cmd = SCI_UPPERCASE; + else + result = g_utf8_strup(text, -1); - sci_replace_sel(sci, result); + } - g_free(result); + if (result != NULL) + { + sci_replace_sel(sci, result); + g_free(result); + if (keep_sel) + sci_set_selection_start(sci, sci_get_current_position(sci) - text_len + 1); + } + else + sci_cmd(sci, cmd); + g_free(text); - if (keep_sel) - sci_set_selection_start(sci, sci_get_current_position(sci) - text_len + 1); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2308] trunk
by eht16＠users.sourceforge.net 05 Mar '08

05 Mar '08

Revision: 2308 http://geany.svn.sourceforge.net/geany/?rev=2308&view=rev Author: eht16 Date: 2008-03-05 10:18:19 -0800 (Wed, 05 Mar 2008) Log Message: ----------- Backport js.c and asm.c from CTags SVN. Fix Assembler tagmanager support and add appropriate symbol types. Fix JavaScript parse bug (#1895242). Change default return value of lookupKeyword() in keyword.c as it was done in CTags SVN(r339) and adjust affected parsers. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/asm.c trunk/tagmanager/c.c trunk/tagmanager/fortran.c trunk/tagmanager/js.c trunk/tagmanager/keyword.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/ChangeLog 2008-03-05 18:18:19 UTC (rev 2308) @@ -6,6 +6,13 @@ from this feature. * src/document.c: Don't open zero byte sized files read-only (e.g. files in /proc). + * src/symbols.c, tagmanager/fortran.c, tagmanager/keyword.c, + tagmanager/js.c, tagmanager/asm.c, tagmanager/c.c: + Backport js.c and asm.c from CTags SVN. + Fix Assembler tagmanager support and add appropriate symbol types. + Fix JavaScript parse bug (#1895242). + Change default return value of lookupKeyword() in keyword.c as it was + done in CTags SVN(r339) and adjust affected parsers. 2008-03-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/src/symbols.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -718,6 +718,16 @@ NULL); break; } + case GEANY_FILETYPES_ASM: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_namespace), _("Labels"), "classviewer-namespace", + &(tv_iters.tag_function), _("Macros"), "classviewer-method", + &(tv_iters.tag_macro), _("Defines"), "classviewer-macro", + &(tv_iters.tag_struct), _("Types"), "classviewer-struct", + NULL); + break; + } case GEANY_FILETYPES_D: default: { Modified: trunk/tagmanager/asm.c =================================================================== --- trunk/tagmanager/asm.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/tagmanager/asm.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -1,6 +1,7 @@ /* +* $Id$ * -* Copyright (c) 2000-2001, Darren Hiebert +* Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -12,94 +13,374 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> +#include "keyword.h" #include "parse.h" #include "read.h" +#include "main.h" #include "vstring.h" /* -* DATA DEFINITIONS +* DATA DECLARATIONS */ typedef enum { - K_DEFINE, K_LABEL, K_MACRO -} asmKind; + K_NONE = -1, K_DEFINE, K_LABEL, K_MACRO, K_TYPE +} AsmKind; -/* indexed by asmKind */ +typedef enum { + OP_UNDEFINED = -1, + OP_ALIGN, + OP_COLON_EQUAL, + OP_END, + OP_ENDM, + OP_ENDMACRO, + OP_ENDP, + OP_ENDS, + OP_EQU, + OP_EQUAL, + OP_LABEL, + OP_MACRO, + OP_PROC, + OP_RECORD, + OP_SECTIONS, + OP_SET, + OP_STRUCT, + OP_LAST +} opKeyword; + +typedef struct { + const char *operator; + opKeyword keyword; +} asmKeyword; + +typedef struct { + opKeyword keyword; + AsmKind kind; +} opKind; + +/* +* DATA DEFINITIONS +*/ +static langType Lang_asm; + static kindOption AsmKinds [] = { - { TRUE, 'd', "define", "defines (names assigned a specified value)"}, - { TRUE, 'l', "label", "labels (names assigned an address)"}, - { TRUE, 'm', "macro", "macros"} + { TRUE, 'd', "macro", "defines" }, + { TRUE, 'l', "namespace", "labels" }, + { TRUE, 'm', "function", "macros" }, + { TRUE, 't', "struct", "types (structs and records)" } }; +static const asmKeyword AsmKeywords [] = { + { "align", OP_ALIGN }, + { "endmacro", OP_ENDMACRO }, + { "endm", OP_ENDM }, + { "end", OP_END }, + { "endp", OP_ENDP }, + { "ends", OP_ENDS }, + { "equ", OP_EQU }, + { "label", OP_LABEL }, + { "macro", OP_MACRO }, + { ":=", OP_COLON_EQUAL }, + { "=", OP_EQUAL }, + { "proc", OP_PROC }, + { "record", OP_RECORD }, + { "sections", OP_SECTIONS }, + { "set", OP_SET }, + { "struct", OP_STRUCT } +}; + +static const opKind OpKinds [] = { + /* must be ordered same as opKeyword enumeration */ + { OP_ALIGN, K_NONE }, + { OP_COLON_EQUAL, K_DEFINE }, + { OP_END, K_NONE }, + { OP_ENDM, K_NONE }, + { OP_ENDMACRO, K_NONE }, + { OP_ENDP, K_NONE }, + { OP_ENDS, K_NONE }, + { OP_EQU, K_DEFINE }, + { OP_EQUAL, K_DEFINE }, + { OP_LABEL, K_LABEL }, + { OP_MACRO, K_MACRO }, + { OP_PROC, K_LABEL }, + { OP_RECORD, K_TYPE }, + { OP_SECTIONS, K_NONE }, + { OP_SET, K_DEFINE }, + { OP_STRUCT, K_TYPE } +}; + /* * FUNCTION DEFINITIONS */ +static void buildAsmKeywordHash (void) +{ + const size_t count = sizeof (AsmKeywords) / sizeof (AsmKeywords [0]); + size_t i; + for (i = 0 ; i < count ; ++i) + { + const asmKeyword* const p = AsmKeywords + i; + addKeyword (p->operator, Lang_asm, (int) p->keyword); + } +} -/* Algorithm adapted from from GNU etags. - * By Bob Weiner, Motorola Inc., 4/3/94 - * Unix and microcontroller assembly tag handling - * look for '^ [a-zA-Z_.$] [a-zA_Z0-9_.$]*[: ^I^J]' - */ -static void findAsmTags (void) +static opKeyword analyzeOperator (const vString *const op) { - vString *name = vStringNew (); - const unsigned char *line; + vString *keyword = vStringNew (); + opKeyword result; - while ((line = fileReadLine ()) != NULL) - { + vStringCopyToLower (keyword, op); + result = (opKeyword) lookupKeyword (vStringValue (keyword), Lang_asm); + vStringDelete (keyword); + return result; +} + +static boolean isInitialSymbolCharacter (int c) +{ + return (boolean) (c != '\0' && (isalpha (c) || strchr ("_$", c) != NULL)); +} + +static boolean isSymbolCharacter (int c) +{ + /* '?' character is allowed in AMD 29K family */ + return (boolean) (c != '\0' && (isalnum (c) || strchr ("_$?", c) != NULL)); +} + +static boolean readPreProc (const unsigned char *const line) +{ + boolean result; const unsigned char *cp = line; - int c = *cp; - - /* If first char is alphabetic or one of [_.$], test for colon - * following identifier. - */ - if (isalpha (c) || c == '_' || c == '.' || c == '$') + vString *name = vStringNew (); + while (isSymbolCharacter ((int) *cp)) { - vStringPut (name, c); - c = *++cp; - while (isalnum (c) || c == '_' || c == '.' || c == '$') - { - vStringPut (name, c); - c = *++cp; - } - vStringTerminate (name); - while (isspace (c)) - c = *++cp; - if (c == ':') - makeSimpleTag (name, AsmKinds, K_LABEL); - else if (c == '=' || - strncmp ((const char*) cp, "equ", (size_t) 3) == 0) - makeSimpleTag (name, AsmKinds, K_DEFINE); - else if (strcmp (vStringValue (name), ".macro") == 0) - { + vStringPut (name, *cp); + ++cp; + } + vStringTerminate (name); + result = (boolean) (strcmp (vStringValue (name), "define") == 0); + if (result) + { + while (isspace ((int) *cp)) + ++cp; vStringClear (name); - while (isalnum (c) || c == '_') + while (isSymbolCharacter ((int) *cp)) { - vStringPut (name, c); - c = *++cp; + vStringPut (name, *cp); + ++cp; } vStringTerminate (name); - if (vStringLength (name) > 0) - makeSimpleTag (name, AsmKinds, K_MACRO); - } - vStringClear (name); + makeSimpleTag (name, AsmKinds, K_DEFINE); } - } - vStringDelete (name); + vStringDelete (name); + return result; } +static AsmKind operatorKind ( + const vString *const operator, + boolean *const found) +{ + AsmKind result = K_NONE; + const opKeyword kw = analyzeOperator (operator); + *found = (boolean) (kw != OP_UNDEFINED); + if (*found) + { + result = OpKinds [kw].kind; + Assert (OpKinds [kw].keyword == kw); + } + return result; +} + +/* We must check for "DB", "DB.L", "DCB.W" (68000) + */ +static boolean isDefineOperator (const vString *const operator) +{ + const unsigned char *const op = + (unsigned char*) vStringValue (operator); + const size_t length = vStringLength (operator); + const boolean result = (boolean) (length > 0 && + toupper ((int) *op) == 'D' && + (length == 2 || + (length == 4 && (int) op [2] == '.') || + (length == 5 && (int) op [3] == '.'))); + return result; +} + +static void makeAsmTag ( + const vString *const name, + const vString *const operator, + const boolean labelCandidate, + const boolean nameFollows) +{ + if (vStringLength (name) > 0) + { + boolean found; + const AsmKind kind = operatorKind (operator, &found); + if (found) + { + if (kind != K_NONE) + makeSimpleTag (name, AsmKinds, kind); + } + else if (isDefineOperator (operator)) + { + if (! nameFollows) + makeSimpleTag (name, AsmKinds, K_DEFINE); + } + else if (labelCandidate) + { + operatorKind (name, &found); + if (! found) + makeSimpleTag (name, AsmKinds, K_LABEL); + } + } +} + +static const unsigned char *readSymbol ( + const unsigned char *const start, + vString *const sym) +{ + const unsigned char *cp = start; + vStringClear (sym); + if (isInitialSymbolCharacter ((int) *cp)) + { + while (isSymbolCharacter ((int) *cp)) + { + vStringPut (sym, *cp); + ++cp; + } + vStringTerminate (sym); + } + return cp; +} + +static const unsigned char *readOperator ( + const unsigned char *const start, + vString *const operator) +{ + const unsigned char *cp = start; + vStringClear (operator); + while (*cp != '\0' && ! isspace ((int) *cp)) + { + vStringPut (operator, *cp); + ++cp; + } + vStringTerminate (operator); + return cp; +} + +static void findAsmTags (void) +{ + vString *name = vStringNew (); + vString *operator = vStringNew (); + const unsigned char *line; + boolean inCComment = FALSE; + + while ((line = fileReadLine ()) != NULL) + { + const unsigned char *cp = line; + boolean labelCandidate = (boolean) (! isspace ((int) *cp)); + boolean nameFollows = FALSE; + const boolean isComment = (boolean) + (*cp != '\0' && strchr (";*@", *cp) != NULL); + + /* skip comments */ + if (strncmp ((const char*) cp, "/*", (size_t) 2) == 0) + { + inCComment = TRUE; + cp += 2; + } + if (inCComment) + { + do + { + if (strncmp ((const char*) cp, "*/", (size_t) 2) == 0) + { + inCComment = FALSE; + cp += 2; + break; + } + ++cp; + } while (*cp != '\0'); + } + if (isComment || inCComment) + continue; + + /* read preprocessor defines */ + if (*cp == '#') + { + ++cp; + readPreProc (cp); + continue; + } + + /* skip white space */ + while (isspace ((int) *cp)) + ++cp; + + /* read symbol */ + cp = readSymbol (cp, name); + if (vStringLength (name) > 0 && *cp == ':') + { + labelCandidate = TRUE; + ++cp; + } + + if (! isspace ((int) *cp) && *cp != '\0') + continue; + + /* skip white space */ + while (isspace ((int) *cp)) + ++cp; + + /* skip leading dot */ +#if 0 + if (*cp == '.') + ++cp; +#endif + + cp = readOperator (cp, operator); + + /* attempt second read of symbol */ + if (vStringLength (name) == 0) + { + while (isspace ((int) *cp)) + ++cp; + cp = readSymbol (cp, name); + nameFollows = TRUE; + } + makeAsmTag (name, operator, labelCandidate, nameFollows); + } + vStringDelete (name); + vStringDelete (operator); +} + +static void initialize (const langType language) +{ + Lang_asm = language; + buildAsmKeywordHash (); +} + extern parserDefinition* AsmParser (void) { - static const char *const extensions [] = { "asm", "s", "S", NULL }; - parserDefinition* def = parserNew ("ASM"); - def->kinds = AsmKinds; - def->kindCount = KIND_COUNT (AsmKinds); - def->extensions = extensions; - def->parser = findAsmTags; - return def; + static const char *const extensions [] = { + "asm", "ASM", "s", "S", NULL + }; + static const char *const patterns [] = { + "*.A51", + "*.29[kK]", + "*.[68][68][kKsSxX]", + "*.[xX][68][68]", + NULL + }; + parserDefinition* def = parserNew ("Asm"); + def->kinds = AsmKinds; + def->kindCount = KIND_COUNT (AsmKinds); + def->extensions = extensions; + def->patterns = patterns; + def->parser = findAsmTags; + def->initialize = initialize; + return def; } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/tagmanager/c.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -54,7 +54,7 @@ /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE, + KEYWORD_NONE = -1, KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, KEYWORD_BOOLEAN, KEYWORD_BYTE, KEYWORD_BAD_STATE, KEYWORD_BAD_TRANS, KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT, Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/tagmanager/fortran.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -58,7 +58,7 @@ /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE, + KEYWORD_NONE = -1, KEYWORD_allocatable, KEYWORD_assignment, KEYWORD_block, Modified: trunk/tagmanager/js.c =================================================================== --- trunk/tagmanager/js.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/tagmanager/js.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -1,4 +1,6 @@ /* + * $Id$ + * * Copyright (c) 2003, Darren Hiebert * * This source code is released for free distribution under the terms of the @@ -9,6 +11,8 @@ * * This is a good reference for different forms of the function statement: * http://www.permadi.com/tutorial/jsFunc/ + * Another good reference: + * http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Guide */ /* @@ -21,11 +25,10 @@ #include <stdio.h> #endif -#include "main.h" -#include "entry.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "main.h" #include "vstring.h" /* @@ -52,6 +55,8 @@ KEYWORD_NONE = -1, KEYWORD_function, KEYWORD_capital_function, + KEYWORD_object, + KEYWORD_capital_object, KEYWORD_prototype, KEYWORD_var, KEYWORD_new, @@ -61,7 +66,10 @@ KEYWORD_do, KEYWORD_if, KEYWORD_else, - KEYWORD_switch + KEYWORD_switch, + KEYWORD_try, + KEYWORD_catch, + KEYWORD_finally } keywordId; /* Used to determine whether keyword is valid for the token language and @@ -88,17 +96,20 @@ TOKEN_OPEN_CURLY, TOKEN_CLOSE_CURLY, TOKEN_EQUAL_SIGN, - TOKEN_FORWARD_SLASH + TOKEN_FORWARD_SLASH, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE } tokenType; typedef struct sTokenInfo { - tokenType type; - keywordId keyword; - vString * string; - vString * scope; - unsigned long lineNumber; - fpos_t filePosition; - int nestLevel; + tokenType type; + keywordId keyword; + vString * string; + vString * scope; + unsigned long lineNumber; + fpos_t filePosition; + int nestLevel; + boolean ignoreTag; } tokenInfo; /* @@ -113,21 +124,25 @@ JSTAG_FUNCTION, JSTAG_CLASS, JSTAG_METHOD, + JSTAG_PROPERTY, JSTAG_VARIABLE, JSTAG_COUNT } jsKind; static kindOption JsKinds [] = { - { TRUE, 'f', "function", "functions" }, + { TRUE, 'f', "function", "functions" }, { TRUE, 'c', "class", "classes" }, { TRUE, 'm', "method", "methods" }, - { TRUE, 'v', "variable", "global variables" } + { TRUE, 'p', "property", "properties" }, + { TRUE, 'v', "variable", "global variables" } }; static const keywordDesc JsKeywordTable [] = { /* keyword keyword ID */ { "function", KEYWORD_function }, { "Function", KEYWORD_capital_function }, + { "object", KEYWORD_object }, + { "Object", KEYWORD_capital_object }, { "prototype", KEYWORD_prototype }, { "var", KEYWORD_var }, { "new", KEYWORD_new }, @@ -137,7 +152,10 @@ { "do", KEYWORD_do }, { "if", KEYWORD_if }, { "else", KEYWORD_else }, - { "switch", KEYWORD_switch } + { "switch", KEYWORD_switch }, + { "try", KEYWORD_try }, + { "catch", KEYWORD_catch }, + { "finally", KEYWORD_finally } }; /* @@ -149,18 +167,6 @@ static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent); static boolean parseLine (tokenInfo *const token, boolean is_inside_class); -static boolean isIdentChar1 (const int c) -{ - /* - * Other databases are less restrictive on the first character of - * an identifier. - * isIdentChar1 is used to identify the first character of an - * identifier, so we are removing some restrictions. - */ - return (boolean) - (isalpha (c) || c == '@' || c == '_' ); -} - static boolean isIdentChar (const int c) { return (boolean) @@ -189,6 +195,9 @@ token->string = vStringNew (); token->scope = vStringNew (); token->nestLevel = 0; + token->ignoreTag = FALSE; + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); return token; } @@ -206,7 +215,7 @@ static void makeConstTag (tokenInfo *const token, const jsKind kind) { - if (JsKinds [kind].enabled) + if (JsKinds [kind].enabled && ! token->ignoreTag ) { const char *const name = vStringValue (token->string); tagEntryInfo e; @@ -225,7 +234,7 @@ { vString * fulltag; - if (JsKinds [kind].enabled) + if (JsKinds [kind].enabled && ! token->ignoreTag ) { /* * If a scope has been added to the token, change the token @@ -247,19 +256,25 @@ static void makeClassTag (tokenInfo *const token) { - if ( ! stringListHas(ClassNames, vStringValue (token->string)) ) + if ( ! token->ignoreTag ) { - stringListAdd (ClassNames, vStringNewCopy (token->string)); - makeJsTag (token, JSTAG_CLASS); + if ( ! stringListHas(ClassNames, vStringValue (token->string)) ) + { + stringListAdd (ClassNames, vStringNewCopy (token->string)); + makeJsTag (token, JSTAG_CLASS); + } } } static void makeFunctionTag (tokenInfo *const token) { - if ( ! stringListHas(FunctionNames, vStringValue (token->string)) ) + if ( ! token->ignoreTag ) { - stringListAdd (FunctionNames, vStringNewCopy (token->string)); - makeJsTag (token, JSTAG_FUNCTION); + if ( ! stringListHas(FunctionNames, vStringValue (token->string)) ) + { + stringListAdd (FunctionNames, vStringNewCopy (token->string)); + makeJsTag (token, JSTAG_FUNCTION); + } } } @@ -280,12 +295,16 @@ static void parseString (vString *const string, const int delimiter) { boolean end = FALSE; - int c; while (! end) { - c = fileGetc (); + int c = fileGetc (); if (c == EOF) end = TRUE; + else if (c == '\\') + { + c = fileGetc(); /* This maybe a ' or ". */ + vStringPut(string, c); + } else if (c == delimiter) end = TRUE; else @@ -300,7 +319,7 @@ static void parseIdentifier (vString *const string, const int firstChar) { int c = firstChar; - Assert (isIdentChar1 (c)); + Assert (isIdentChar (c)); do { vStringPut (string, c); @@ -313,11 +332,12 @@ static keywordId analyzeToken (vString *const name) { - static vString *keyword = NULL; - if (keyword == NULL) - keyword = vStringNew (); + vString *keyword = vStringNew (); + keywordId result; vStringCopyToLower (keyword, name); - return (keywordId) lookupKeyword (vStringValue (keyword), Lang_js); + result = (keywordId) lookupKeyword (vStringValue (keyword), Lang_js); + vStringDelete (keyword); + return result; } static void readToken (tokenInfo *const token) @@ -332,26 +352,25 @@ do { c = fileGetc (); - /* - * Added " to the list of ignores, not sure what this - * might break but it gets by this issue: - * create table "t1" (...) - */ + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); } while (c == '\t' || c == ' ' || c == '\n'); switch (c) { case EOF: longjmp (Exception, (int)ExceptionEOF); break; - case '(': token->type = TOKEN_OPEN_PAREN; break; - case ')': token->type = TOKEN_CLOSE_PAREN; break; - case ';': token->type = TOKEN_SEMICOLON; break; - case ',': token->type = TOKEN_COMMA; break; + case '(': token->type = TOKEN_OPEN_PAREN; break; + case ')': token->type = TOKEN_CLOSE_PAREN; break; + case ';': token->type = TOKEN_SEMICOLON; break; + case ',': token->type = TOKEN_COMMA; break; case '.': token->type = TOKEN_PERIOD; break; - case ':': token->type = TOKEN_COLON; break; - case '{': token->type = TOKEN_OPEN_CURLY; break; - case '}': token->type = TOKEN_CLOSE_CURLY; break; + case ':': token->type = TOKEN_COLON; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; case '=': token->type = TOKEN_EQUAL_SIGN; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; case '\'': case '"': @@ -361,6 +380,15 @@ token->filePosition = getInputFilePosition (); break; + case '\\': + c = fileGetc (); + if (c != '\\' && c != '"' && !isspace (c)) + fileUngetc (c); + token->type = TOKEN_CHARACTER; + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + break; + case '/': { int d = fileGetc (); @@ -395,7 +423,7 @@ } default: - if (! isIdentChar1 (c)) + if (! isIdentChar (c)) token->type = TOKEN_UNDEFINED; else { @@ -460,6 +488,38 @@ } } +static void skipArrayList (tokenInfo *const token) +{ + int nest_level = 0; + + /* + * Handle square brackets + * var name[1] + * So we must check for nested open and closing square brackets + */ + + if (isType (token, TOKEN_OPEN_SQUARE)) /* arguments? */ + { + nest_level++; + while (! (isType (token, TOKEN_CLOSE_SQUARE) && (nest_level == 0))) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + { + nest_level++; + } + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + if (nest_level > 0) + { + nest_level--; + } + } + } + readToken (token); + } +} + static void addContext (tokenInfo* const parent, const tokenInfo* const child) { if (vStringLength (parent->string) > 0) @@ -498,6 +558,10 @@ { parseBlock (token, token); } + else if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token); + } else { readToken (token); @@ -632,22 +696,40 @@ } } -static void parseIf (tokenInfo *const token) +static boolean parseIf (tokenInfo *const token) { + boolean read_next_token = TRUE; /* * If statements have two forms * if ( ... ) * one line; * + * if ( ... ) + * statement; + * else + * statement + * * if ( ... ) { * multiple; * statements; * } * + * * if ( ... ) { * return elem * } * + * This example if correctly written, but the + * else contains only 1 statement without a terminator + * since the function finishes with the closing brace. + * + * function a(flag){ + * if(flag) + * test(1); + * else + * test(2) + * } + * * TODO: Deal with statements that can optional end * without a semi-colon. Currently this messes up * the parsing of blocks. @@ -681,7 +763,39 @@ else { findCmdTerm (token); + + /* + * The IF could be followed by an ELSE statement. + * This too could have two formats, a curly braced + * multiline section, or another single line. + */ + + if (isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * This statement did not have a line terminator. + */ + read_next_token = FALSE; + } + else + { + readToken (token); + + if (isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * This statement did not have a line terminator. + */ + read_next_token = FALSE; + } + else + { + if (isKeyword (token, KEYWORD_else)) + read_next_token = parseIf (token); + } + } } + return read_next_token; } static void parseFunction (tokenInfo *const token) @@ -756,20 +870,19 @@ if (isKeyword (token, KEYWORD_this)) { /* - * Then we are inside a class and we have found + * Means we are inside a class and have found * a class, not a function */ is_class = TRUE; vStringCopy(saveScope, token->scope); addToScope (token, parent->string); - /* Move past this */ - readToken(token); - /* Move past a potential . */ - if ( isType (token, TOKEN_PERIOD) ) - readToken(token); + /* + * Ignore the remainder of the line + * findCmdTerm(token); + */ + parseLine (token, is_class); - parseLine (token, is_class); vStringCopy(token->scope, saveScope); } else if (isKeyword (token, KEYWORD_var)) @@ -832,13 +945,15 @@ /* * This deals with these formats - * 'validMethod' : function(a,b) {} + * validProperty : 2, + * validMethod : function(a,b) {} + * 'validMethod2' : function(a,b) {} */ do { readToken (token); - if (isType (token, TOKEN_STRING)) + if (isType (token, TOKEN_STRING) || isKeyword(token, KEYWORD_NONE)) { copyToken(name, token); @@ -862,11 +977,22 @@ /* * Read to the closing curly, check next - * token, if comma, we must loop again + * token, if a comma, we must loop again */ readToken (token); } } + else + { + addToScope (name, class->string); + makeJsTag (name, JSTAG_PROPERTY); + + /* + * Read the next token, if a comma + * we must loop again + */ + readToken (token); + } } } } while ( isType(token, TOKEN_COMMA) ); @@ -884,6 +1010,7 @@ boolean is_class = FALSE; boolean is_terminated = TRUE; boolean is_global = FALSE; + boolean is_prototype = FALSE; vStringClear(saveScope); /* @@ -905,7 +1032,13 @@ * 'validMethodOne' : function(a,b) {}, * 'validMethodTwo' : function(a,b) {} * } - * Database.prototype.getTodaysDate = Database_getTodaysDate; + * ValidClassTwo = function () + * { + * this.validMethodThree = function() {} + * // unnamed method + * this.validMethodFour = () {} + * } + * Database.prototype.validMethodThree = Database_getTodaysDate; */ if ( is_inside_class ) @@ -925,43 +1058,178 @@ readToken(token); } + if ( isKeyword(token, KEYWORD_this) ) + { + readToken(token); + if (isType (token, TOKEN_PERIOD)) + { + readToken(token); + } + } + copyToken(name, token); - /* Potentially the name of the function */ - readToken (token); - if (isType (token, TOKEN_PERIOD)) + while (! isType (token, TOKEN_CLOSE_CURLY) && + ! isType (token, TOKEN_SEMICOLON) && + ! isType (token, TOKEN_EQUAL_SIGN) ) { - /* - * Cannot be a global variable is it has dot references in the name - */ - is_global = FALSE; - do + /* Potentially the name of the function */ + readToken (token); + if (isType (token, TOKEN_PERIOD)) { - readToken (token); - if ( isKeyword(token, KEYWORD_NONE) ) + /* + * Cannot be a global variable is it has dot references in the name + */ + is_global = FALSE; + do { - if ( is_class ) + readToken (token); + if ( isKeyword(token, KEYWORD_NONE) ) { - vStringCopy(saveScope, token->scope); - addToScope(token, name->string); - makeJsTag (token, JSTAG_METHOD); + if ( is_class ) + { + vStringCopy(saveScope, token->scope); + addToScope(token, name->string); + } + else + addContext (name, token); + } + else if ( isKeyword(token, KEYWORD_prototype) ) + { + /* + * When we reach the "prototype" tag, we infer: + * "BindAgent" is a class + * "build" is a method + * + * function BindAgent( repeatableIdName, newParentIdName ) { + * } + * + * CASE 1 + * Specified function name: "build" + * BindAgent.prototype.build = function( mode ) { + * ignore everything within this function + * } + * + * CASE 2 + * Prototype listing + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * + */ + makeClassTag (name); + is_class = TRUE; + is_prototype = TRUE; - /* Find to the end of the statement */ - findCmdTerm (token); - goto cleanUp; + /* + * There should a ".function_name" next. + */ + readToken (token); + if (isType (token, TOKEN_PERIOD)) + { + /* + * Handle CASE 1 + */ + readToken (token); + if ( isKeyword(token, KEYWORD_NONE) ) + { + vStringCopy(saveScope, token->scope); + addToScope(token, name->string); + + makeJsTag (token, JSTAG_METHOD); + /* + * We can read until the end of the block / statement. + * We need to correctly parse any nested blocks, but + * we do NOT want to create any tags based on what is + * within the blocks. + */ + token->ignoreTag = TRUE; + /* + * Find to the end of the statement + */ + findCmdTerm (token); + token->ignoreTag = FALSE; + is_terminated = TRUE; + goto cleanUp; + } + } + else if (isType (token, TOKEN_EQUAL_SIGN)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Handle CASE 2 + * + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ + parseMethods(token, name); + /* + * Find to the end of the statement + */ + findCmdTerm (token); + token->ignoreTag = FALSE; + is_terminated = TRUE; + goto cleanUp; + } + } } - else - addContext (name, token); - } - else if ( isKeyword(token, KEYWORD_prototype) ) - { - makeClassTag (name); - is_class = TRUE; - } - readToken (token); - } while (isType (token, TOKEN_PERIOD)); + readToken (token); + } while (isType (token, TOKEN_PERIOD)); + } + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token); + + if ( isType (token, TOKEN_OPEN_SQUARE) ) + skipArrayList(token); + + /* + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + is_class = parseBlock (token, name); + } + */ } + if ( isType (token, TOKEN_CLOSE_CURLY) ) + { + /* + * Reaching this section without having + * processed an open curly brace indicates + * the statement is most likely not terminated. + */ + is_terminated = FALSE; + goto cleanUp; + } + + if ( isType (token, TOKEN_SEMICOLON) ) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * Handles this syntax: + * var g_var2; + */ + if (isType (token, TOKEN_SEMICOLON)) + makeJsTag (name, JSTAG_VARIABLE); + } + /* + * Statement has ended. + * This deals with calls to functions, like: + * alert(..); + */ + goto cleanUp; + } + if ( isType (token, TOKEN_EQUAL_SIGN) ) { readToken (token); @@ -975,14 +1243,14 @@ { /* * Functions of this format: - * var D2A=function theAdd(a, b) + * var D2A = function theAdd(a, b) * { * return a+b; * } - * Are really two separately defined functions and + * Are really two separate defined functions and * can be referenced in two ways: - * alert(D2A(1,2)); // produces 3 - * alert(theAdd(1,2)); // also produces 3 + * alert( D2A(1,2) ); // produces 3 + * alert( theAdd(1,2) ); // also produces 3 * So it must have two tags: * D2A * theAdd @@ -1022,24 +1290,26 @@ if ( vStringLength(secondary_name->string) > 0 ) makeFunctionTag (secondary_name); + + /* + * Find to the end of the statement + */ + goto cleanUp; } } } else if (isType (token, TOKEN_OPEN_PAREN)) { /* - * Handle nameless functions, these will only - * be considered methods. + * Handle nameless functions + * this.method_name = () {} */ skipArgumentList(token); if (isType (token, TOKEN_OPEN_CURLY)) { /* - * This will be either a function or a class. - * We can only determine this by checking the body - * of the function. If we find a "this." we know - * it is a class, otherwise it is a function. + * Nameless functions are only setup as methods. */ makeJsTag (name, JSTAG_METHOD); parseBlock (token, name); @@ -1047,20 +1317,40 @@ } else if (isType (token, TOKEN_OPEN_CURLY)) { + /* + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ parseMethods(token, name); } else if (isKeyword (token, KEYWORD_new)) { readToken (token); if ( isKeyword (token, KEYWORD_function) || - isKeyword (token, KEYWORD_capital_function) ) + isKeyword (token, KEYWORD_capital_function) || + isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) { + if ( isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) + is_class = TRUE; + readToken (token); if ( isType (token, TOKEN_OPEN_PAREN) ) skipArgumentList(token); if (isType (token, TOKEN_SEMICOLON)) - makeFunctionTag (name); + { + if ( is_class ) + { + makeClassTag (name); + } else { + makeFunctionTag (name); + } + } } } else if (isKeyword (token, KEYWORD_NONE)) @@ -1086,28 +1376,13 @@ if ( ! stringListHas(FunctionNames, vStringValue (token->string)) && ! stringListHas(ClassNames, vStringValue (token->string)) ) { - readToken (token); + findCmdTerm (token); if (isType (token, TOKEN_SEMICOLON)) makeJsTag (name, JSTAG_VARIABLE); } } } } - else - { - /* - * Only create variables for global scope - */ - if ( token->nestLevel == 0 && is_global ) - { - /* - * Handles this syntax: - * var g_var2; - */ - if (isType (token, TOKEN_SEMICOLON)) - makeJsTag (name, JSTAG_VARIABLE); - } - } findCmdTerm (token); /* @@ -1159,7 +1434,11 @@ break; case KEYWORD_if: case KEYWORD_else: - parseIf (token); + case KEYWORD_try: + case KEYWORD_catch: + case KEYWORD_finally: + /* Common semantics */ + is_terminated = parseIf (token); break; case KEYWORD_switch: parseSwitch (token); @@ -1173,7 +1452,7 @@ { /* * Special case where single line statements may not be - * SEMICOLON termianted. parseBlock needs to know this + * SEMICOLON terminated. parseBlock needs to know this * so that it does not read the next token. */ is_terminated = parseStatement (token, is_inside_class); @@ -1212,10 +1491,12 @@ static void findJsTags (void) { tokenInfo *const token = newToken (); - exception_t exception = (exception_t) (setjmp (Exception)); + exception_t exception; + ClassNames = stringListNew (); FunctionNames = stringListNew (); + exception = (exception_t) (setjmp (Exception)); while (exception == ExceptionNone) parseJsFile (token); @@ -1230,8 +1511,7 @@ extern parserDefinition* JavaScriptParser (void) { static const char *const extensions [] = { "js", NULL }; - - parserDefinition *const def = parserNew ("Javascript"); + parserDefinition *const def = parserNew ("JavaScript"); def->extensions = extensions; /* * New definitions for parsing instead of regex @@ -1243,5 +1523,4 @@ return def; } - /* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ Modified: trunk/tagmanager/keyword.c =================================================================== --- trunk/tagmanager/keyword.c 2008-03-05 17:34:00 UTC (rev 2307) +++ trunk/tagmanager/keyword.c 2008-03-05 18:18:19 UTC (rev 2308) @@ -162,7 +162,7 @@ { const unsigned long hashedValue = hashValue (string); hashEntry *entry = getHashTableEntry (hashedValue); - int value = 0; + int value = -1; while (entry != NULL) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2307] trunk
by eht16＠users.sourceforge.net 05 Mar '08

05 Mar '08

Revision: 2307 http://geany.svn.sourceforge.net/geany/?rev=2307&view=rev Author: eht16 Date: 2008-03-05 09:34:00 -0800 (Wed, 05 Mar 2008) Log Message: ----------- Don't open zero byte sized files read-only (e.g. files in /proc). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-05 17:09:57 UTC (rev 2306) +++ trunk/ChangeLog 2008-03-05 17:34:00 UTC (rev 2307) @@ -4,6 +4,8 @@ Apply patch from Yura Siamashka to use she-bang filetype detection also in filetypes_detect_from_filename() which let plugins benefit from this feature. + * src/document.c: + Don't open zero byte sized files read-only (e.g. files in /proc). 2008-03-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-03-05 17:09:57 UTC (rev 2306) +++ trunk/src/document.c 2008-03-05 17:34:00 UTC (rev 2307) @@ -842,7 +842,9 @@ tmp_enc_idx = encodings_scan_unicode_bom(filedata->data, filedata->size, NULL); /* check whether the size of the loaded data is equal to the size of the file in the filesystem */ - if (filedata->len != filedata->size && ( + /* file size may be 0 to allow opening files in /proc/ which have typically a file size + * of 0 bytes */ + if (filedata->len != filedata->size && filedata->size != 0 && ( tmp_enc_idx == GEANY_ENCODING_UTF_8 || /* tmp_enc_idx can be UTF-7/8/16/32, UCS and None */ tmp_enc_idx == GEANY_ENCODING_UTF_7 || /* filter out UTF-7/8 and None where no NULL bytes */ tmp_enc_idx == GEANY_ENCODING_NONE)) /* are allowed */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2306] trunk
by eht16＠users.sourceforge.net 05 Mar '08

05 Mar '08

Revision: 2306 http://geany.svn.sourceforge.net/geany/?rev=2306&view=rev Author: eht16 Date: 2008-03-05 09:09:57 -0800 (Wed, 05 Mar 2008) Log Message: ----------- Apply patch from Yura Siamashka to use she-bang filetype detection also in filetypes_detect_from_filename() which let plugins benefit from this feature. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-04 16:11:59 UTC (rev 2305) +++ trunk/ChangeLog 2008-03-05 17:09:57 UTC (rev 2306) @@ -1,3 +1,11 @@ +2008-03-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/filetypes.c, src/filetypes.h, src/symbols.c: + Apply patch from Yura Siamashka to use she-bang filetype detection + also in filetypes_detect_from_filename() which let plugins benefit + from this feature. + + 2008-03-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/fortran.c, src/symbols.c: @@ -54,7 +62,7 @@ * tagmanager/options.c, src/symbols.c, src/symbols.h: Define c_tags_ignore in options.c (tagmanager) instead of symbols.c. * configure.in: - Apply patch Yura Siamashka to add a check for the presence of + Apply patch from Yura Siamashka to add a check for the presence of fnmatch(), thanks. * THANKS, plugins/vcdiff.c, src/plugindata.h, src/plugins.c, src/utils.c, src/utils.h, src/win32.c, src/win32.h: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-03-04 16:11:59 UTC (rev 2305) +++ trunk/src/filetypes.c 2008-03-05 17:09:57 UTC (rev 2306) @@ -26,6 +26,7 @@ */ #include <string.h> +#include <glib/gstdio.h> #include "geany.h" #include "filetypes.h" @@ -569,9 +570,43 @@ } -static filetype *find_shebang(gint idx) +/* Detect filetype only based on the filename extension. + * utf8_filename can include the full path. */ +filetype *filetypes_detect_from_extension(const gchar *utf8_filename) { - gchar *line = sci_get_line(doc_list[idx].sci, 0); + GPatternSpec *pattern; + gchar *base_filename; + gint i, j; + + /* to match against the basename of the file(because of Makefile*) */ + base_filename = g_path_get_basename(utf8_filename); +#ifdef G_OS_WIN32 + /* use lower case basename */ + setptr(base_filename, g_utf8_strdown(base_filename, -1)); +#endif + + for(i = 0; i < GEANY_MAX_FILE_TYPES; i++) + { + for (j = 0; filetypes[i]->pattern[j] != NULL; j++) + { + pattern = g_pattern_spec_new(filetypes[i]->pattern[j]); + if (g_pattern_match_string(pattern, base_filename)) + { + g_free(base_filename); + g_pattern_spec_free(pattern); + return filetypes[i]; + } + g_pattern_spec_free(pattern); + } + } + + g_free(base_filename); + return filetypes[GEANY_FILETYPES_ALL]; +} + + +static filetype *find_shebang(const gchar *utf8_filename, const gchar *line) +{ filetype *ft = NULL; if (strlen(line) > 2 && line[0] == '#' && line[1] == '!') @@ -614,81 +649,83 @@ g_free(tmp); } /* detect XML files */ - if (strncmp(line, "<?xml", 5) == 0) + if (utf8_filename && strncmp(line, "<?xml", 5) == 0) { /* HTML and DocBook files might also start with <?xml, so detect them based on filename * extension and use the detected filetype, else assume XML */ - ft = filetypes_detect_from_filename(doc_list[idx].file_name); + ft = filetypes_detect_from_extension(utf8_filename); if (FILETYPE_ID(ft) != GEANY_FILETYPES_HTML && FILETYPE_ID(ft) != GEANY_FILETYPES_DOCBOOK && FILETYPE_ID(ft) != GEANY_FILETYPES_PERL && /* Perl, Python and PHP only to be safe */ FILETYPE_ID(ft) != GEANY_FILETYPES_PHP && FILETYPE_ID(ft) != GEANY_FILETYPES_PYTHON) - + { ft = filetypes[GEANY_FILETYPES_XML]; + } } else if (strncmp(line, "<?php", 5) == 0) { ft = filetypes[GEANY_FILETYPES_PHP]; } - g_free(line); return ft; } -/* Detect the filetype for document idx, checking for a shebang, then filename extension. */ -filetype *filetypes_detect_from_file(gint idx) +/* Detect the filetype checking for a shebang, then filename extension. */ +static filetype *filetypes_detect_from_file_internal(const gchar *utf8_filename, const gchar *line) { filetype *ft; - if (! DOC_IDX_VALID(idx)) - return filetypes[GEANY_FILETYPES_ALL]; - /* try to find a shebang and if found use it prior to the filename extension * also checks for <?xml */ - ft = find_shebang(idx); - if (ft != NULL) return ft; + ft = find_shebang(utf8_filename, line); + if (ft != NULL) + return ft; - if (doc_list[idx].file_name == NULL) + if (utf8_filename == NULL) return filetypes[GEANY_FILETYPES_ALL]; - return filetypes_detect_from_filename(doc_list[idx].file_name); + return filetypes_detect_from_extension(utf8_filename); } +/* Detect the filetype for document idx. */ +filetype *filetypes_detect_from_file(gint idx) +{ + filetype *ft; + gchar *line; + + if (! DOC_IDX_VALID(idx)) + return filetypes[GEANY_FILETYPES_ALL]; + + line = sci_get_line(doc_list[idx].sci, 0); + ft = filetypes_detect_from_file_internal(doc_list[idx].file_name, line); + g_free(line); + return ft; +} + + /* Detect filetype based on the filename extension. * utf8_filename can include the full path. */ filetype *filetypes_detect_from_filename(const gchar *utf8_filename) { - GPatternSpec *pattern; - gchar *base_filename; - gint i, j; + gchar line[1024]; + FILE *f; + gchar *locale_name = utils_get_locale_from_utf8(utf8_filename); - /* to match against the basename of the file(because of Makefile*) */ - base_filename = g_path_get_basename(utf8_filename); -#ifdef G_OS_WIN32 - /* use lower case basename */ - setptr(base_filename, g_utf8_strdown(base_filename, -1)); -#endif - - for(i = 0; i < GEANY_MAX_FILE_TYPES; i++) + f = g_fopen(locale_name, "r"); + g_free(locale_name); + if (f != NULL) { - for (j = 0; filetypes[i]->pattern[j] != NULL; j++) + if (fgets(line, sizeof(line), f) != NULL) { - pattern = g_pattern_spec_new(filetypes[i]->pattern[j]); - if (g_pattern_match_string(pattern, base_filename)) - { - g_free(base_filename); - g_pattern_spec_free(pattern); - return filetypes[i]; - } - g_pattern_spec_free(pattern); + fclose(f); + return filetypes_detect_from_file_internal(utf8_filename, line); } + fclose(f); } - - g_free(base_filename); - return filetypes[GEANY_FILETYPES_ALL]; + return filetypes_detect_from_extension(utf8_filename); } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-03-04 16:11:59 UTC (rev 2305) +++ trunk/src/filetypes.h 2008-03-05 17:09:57 UTC (rev 2306) @@ -136,6 +136,8 @@ /* Detect the filetype for document idx, checking for a shebang, then filename extension. */ filetype *filetypes_detect_from_file(gint idx); +filetype *filetypes_detect_from_extension(const gchar *utf8_filename); + /* Detect filetype based on the filename extension. * utf8_filename can include the full path. */ filetype *filetypes_detect_from_filename(const gchar *utf8_filename); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-03-04 16:11:59 UTC (rev 2305) +++ trunk/src/symbols.c 2008-03-05 17:09:57 UTC (rev 2306) @@ -912,7 +912,7 @@ if (tags_ext) { *tags_ext = '\0'; /* remove .tags extension */ - ft = filetypes_detect_from_filename(shortname); + ft = filetypes_detect_from_extension(shortname); } g_free(shortname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2305] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 04 Mar '08

04 Mar '08

Revision: 2305 http://geany.svn.sourceforge.net/geany/?rev=2305&view=rev Author: ntrel Date: 2008-03-04 08:11:59 -0800 (Tue, 04 Mar 2008) Log Message: ----------- Re-enable setting menu accelerators. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/build.c branches/plugin-keybindings/src/keybindings.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-03-03 20:16:52 UTC (rev 2304) +++ branches/plugin-keybindings/ChangeLog 2008-03-04 16:11:59 UTC (rev 2305) @@ -7,6 +7,8 @@ Re-enable focus commands in the VTE. Re-enable snippets completion. Re-enable Keyboard Shortcuts dialog. + * src/build.c, src/keybindings.c: + Re-enable setting menu accelerators. 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/plugin-keybindings/src/build.c =================================================================== --- branches/plugin-keybindings/src/build.c 2008-03-03 20:16:52 UTC (rev 2304) +++ branches/plugin-keybindings/src/build.c 2008-03-04 16:11:59 UTC (rev 2305) @@ -1087,20 +1087,29 @@ } -#if 1 /* tmp */ -#define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) -#else -#define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) \ - if (keys[(gkey)]->key != 0) \ - gtk_widget_add_accelerator(menuitem, "activate", accel_group, \ - keys[(gkey)]->key, keys[(gkey)]->mods, GTK_ACCEL_VISIBLE) -#endif +/* note: copied from keybindings.c. + * Perhaps the separate Tex menu could be merged with the default build menu? + * Then this could be done with Glade and set the accels in keybindings.c. */ +static void add_menu_accel(KeyBindingGroup *group, guint kb_id, + GtkAccelGroup *accel_group, GtkWidget *menuitem) +{ + KeyBinding *kb = &group->keys[kb_id]; + if (kb->key != 0) + gtk_widget_add_accelerator(menuitem, "activate", accel_group, + kb->key, kb->mods, GTK_ACCEL_VISIBLE); +} + + +#define GEANY_ADD_WIDGET_ACCEL(kb_id, menuitem) \ + add_menu_accel(group, kb_id, accel_group, menuitem) + static void create_build_menu_gen(BuildMenuItems *menu_items) { GtkWidget *menu, *item = NULL, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_BUILD); menu = gtk_menu_new(); @@ -1217,6 +1226,7 @@ GtkWidget *menu, *item, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_BUILD); menu = gtk_menu_new(); Modified: branches/plugin-keybindings/src/keybindings.c =================================================================== --- branches/plugin-keybindings/src/keybindings.c 2008-03-03 20:16:52 UTC (rev 2304) +++ branches/plugin-keybindings/src/keybindings.c 2008-03-04 16:11:59 UTC (rev 2305) @@ -483,26 +483,30 @@ } -#define GEANY_ADD_ACCEL(gkey, wid) \ - if (keys[(gkey)]->key != 0) \ - gtk_widget_add_accelerator( \ - lookup_widget(app->window, G_STRINGIFY(wid)), \ - "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ - GTK_ACCEL_VISIBLE) +static void add_menu_accel(KeyBindingGroup *group, guint kb_id, + GtkAccelGroup *accel_group, GtkWidget *menuitem) +{ + KeyBinding *kb = &group->keys[kb_id]; -#define GEANY_ADD_POPUP_ACCEL(gkey, wid) \ - if (keys[(gkey)]->key != 0) \ - gtk_widget_add_accelerator( \ - lookup_widget(app->popup_menu, G_STRINGIFY(wid)), \ - "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ - GTK_ACCEL_VISIBLE) + if (kb->key != 0) + gtk_widget_add_accelerator(menuitem, "activate", accel_group, + kb->key, kb->mods, GTK_ACCEL_VISIBLE); +} + +#define GEANY_ADD_ACCEL(kb_id, wid) \ + add_menu_accel(group, kb_id, accel_group, lookup_widget(app->window, G_STRINGIFY(wid))) + +#define GEANY_ADD_POPUP_ACCEL(kb_id, wid) \ + add_menu_accel(group, kb_id, accel_group, lookup_widget(app->popup_menu, G_STRINGIFY(wid))) + +/* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */ static void add_menu_accels() { -#if 0 /* tmp */ GtkAccelGroup *accel_group = gtk_accel_group_new(); + KeyBindingGroup *group; - /* apply the settings */ + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_FILE); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_OPENSELECTED, menu_open_selected_file1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SAVEALL, menu_save_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SAVEAS, menu_save_as1); @@ -510,13 +514,18 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSE, menu_close1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSEALL, menu_close_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_RELOADFILE, menu_reload1); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_EDIT); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNDO, menu_undo2); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REDO, menu_redo2); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_INSERTDATE, insert_date_custom1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PREFERENCES, preferences1); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_HELP); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_HELP, help1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_SEARCH); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FIND, find1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDNEXT, find_next1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDPREVIOUS, find_previous1); @@ -527,6 +536,7 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_NEXTMESSAGE, next_message1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_VIEW); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_TOGGLEALL, menu_toggle_all_additional_widgets1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FULLSCREEN, menu_fullscreen1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_MESSAGEWINDOW, menu_show_messages_window1); @@ -534,15 +544,19 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMIN, menu_zoom_in1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMOUT, menu_zoom_out1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_DOCUMENT); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REPLACETABS, menu_replace_tabs); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FOLDALL, menu_fold_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNFOLDALL, menu_unfold_all1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_FILE); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PROJECTPROPERTIES, project_properties1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_TOOLS); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_OPENCOLORCHOOSER, menu_choose_color1); /*GEANY_ADD_ACCEL(GEANY_KEYS_MENU_INSERTSPECIALCHARS, menu_insert_special_chars1);*/ + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_EDITING); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_TOGGLECASE, menu_toggle_case2); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_COMMENTLINE, menu_comment_line1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_UNCOMMENTLINE, menu_uncomment_line1); @@ -551,16 +565,27 @@ GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_INCREASEINDENT, menu_increase_indent1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_DECREASEINDENT, menu_decrease_indent1); + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_EDIT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_UNDO, undo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_REDO, redo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_INSERTDATE, insert_date_custom2); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_FILE); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_OPENSELECTED, menu_open_selected_file2); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_EDITING); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_FINDUSAGE, find_usage1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_CONTEXTACTION, context_action1); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_TAGS); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDEFINITION, goto_tag_definition1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDECLARATION, goto_tag_declaration1); - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_CONTEXTACTION, context_action1); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_SEARCH); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line); + + group = g_ptr_array_index(keybinding_groups, GEANY_KEYGROUP_EDITING); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_TOGGLECASE, toggle_case1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_COMMENTLINE, menu_comment_line2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_UNCOMMENTLINE, menu_uncomment_line2); @@ -572,7 +597,6 @@ /* the build menu items are set if the build menus are created */ gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); -#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2304] trunk
by eht16＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2304 http://geany.svn.sourceforge.net/geany/?rev=2304&view=rev Author: eht16 Date: 2008-03-03 12:16:52 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Adjust available symbol types between Fortran parser and symbols.c to make some more of the possbile symbol types available. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/fortran.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-03 17:54:59 UTC (rev 2303) +++ trunk/ChangeLog 2008-03-03 20:16:52 UTC (rev 2304) @@ -1,3 +1,10 @@ +2008-03-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/fortran.c, src/symbols.c: + Adjust available symbol types between Fortran parser and symbols.c to + make some more of the possbile symbol types available. + + 2008-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/utils.c, src/utils.h, tagmanager/parse.h: Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-03-03 17:54:59 UTC (rev 2303) +++ trunk/src/symbols.c 2008-03-03 20:16:52 UTC (rev 2304) @@ -704,6 +704,20 @@ NULL); break; } + case GEANY_FILETYPES_FORTRAN: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_namespace), _("Module"), NULL, + &(tv_iters.tag_struct), _("Interfaces"), "classviewer-struct", + &(tv_iters.tag_function), _("Functions"), "classviewer-method", + &(tv_iters.tag_member), _("Subroutines"), "classviewer-method", + &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + &(tv_iters.tag_type), _("Types"), "classviewer-namespace", + &(tv_iters.tag_macro), _("Blocks"), "classviewer-member", + &(tv_iters.tag_other), _("Other"), "classviewer-other", + NULL); + break; + } case GEANY_FILETYPES_D: default: { Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2008-03-03 17:54:59 UTC (rev 2303) +++ trunk/tagmanager/fortran.c 2008-03-03 20:16:52 UTC (rev 2304) @@ -171,17 +171,17 @@ /* indexed by tagType */ static kindOption FortranKinds [] = { { TRUE, 'b', "block data", "block data"}, - { TRUE, 'c', "common", "common blocks"}, + { TRUE, 'c', "macro", "common blocks"}, { TRUE, 'e', "entry", "entry points"}, { TRUE, 'f', "function", "functions"}, - { TRUE, 'i', "interface", "interfaces"}, + { TRUE, 'i', "struct", "interfaces"}, { TRUE, 'k', "component", "type components"}, { TRUE, 'l', "label", "labels"}, { FALSE, 'L', "local", "local and common block variables"}, - { TRUE, 'm', "module", "modules"}, + { TRUE, 'm', "namespace", "modules"}, { TRUE, 'n', "namelist", "namelists"}, - { TRUE, 'p', "program", "programs"}, - { TRUE, 's', "subroutine", "subroutines"}, + { TRUE, 'p', "package", "programs"}, + { TRUE, 's', "member", "subroutines"}, { TRUE, 't', "type", "derived types"}, { TRUE, 'v', "variable", "module variables"} }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2303] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2303 http://geany.svn.sourceforge.net/geany/?rev=2303&view=rev Author: ntrel Date: 2008-03-03 09:54:59 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Re-enable Keyboard Shortcuts dialog. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/keybindings.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-03-03 17:35:32 UTC (rev 2302) +++ branches/plugin-keybindings/ChangeLog 2008-03-03 17:54:59 UTC (rev 2303) @@ -6,6 +6,7 @@ * src/keybindings.c: Re-enable focus commands in the VTE. Re-enable snippets completion. + Re-enable Keyboard Shortcuts dialog. 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/plugin-keybindings/src/keybindings.c =================================================================== --- branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:35:32 UTC (rev 2302) +++ branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:54:59 UTC (rev 2303) @@ -620,40 +620,41 @@ static void get_shortcut_labels_text(GString **text_names_str, GString **text_keys_str) { -#if 0 - guint i; + gsize g, i; GString *text_names = g_string_sized_new(600); GString *text_keys = g_string_sized_new(600); *text_names_str = text_names; *text_keys_str = text_keys; - for (i = 0; i < GEANY_MAX_KEYS; i++) + for (g = 0; g < keybinding_groups->len; g++) { - gchar *shortcut; + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, g); - if (keys[i]->section != NULL) + if (g == 0) { - if (i == GEANY_KEYS_MENU_NEW) - { - g_string_append_printf(text_names, "%s\n", keys[i]->section); - g_string_append(text_keys, "\n"); - } - else - { - g_string_append_printf(text_names, "\n%s\n", keys[i]->section); - g_string_append(text_keys, "\n\n"); - } + g_string_append_printf(text_names, "%s\n", group->label); + g_string_append(text_keys, "\n"); } + else + { + g_string_append_printf(text_names, "\n%s\n", group->label); + g_string_append(text_keys, "\n\n"); + } - shortcut = gtk_accelerator_get_label(keys[i]->key, keys[i]->mods); - g_string_append(text_names, keys[i]->label); - g_string_append(text_names, "\n"); - g_string_append(text_keys, shortcut); - g_string_append(text_keys, "\n"); - g_free(shortcut); + for (i = 0; i < group->count; i++) + { + KeyBinding *kb = &group->keys[i]; + gchar *shortcut; + + shortcut = gtk_accelerator_get_label(kb->key, kb->mods); + g_string_append(text_names, kb->label); + g_string_append(text_names, "\n"); + g_string_append(text_keys, shortcut); + g_string_append(text_keys, "\n"); + g_free(shortcut); + } } -#endif } @@ -663,7 +664,7 @@ GString *text_names; GString *text_keys; gint height, response; -return;/* tmp */ + dialog = gtk_dialog_new_with_buttons(_("Keyboard Shortcuts"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_EDIT, GTK_RESPONSE_APPLY, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2302] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 03 Mar '08

03 Mar '08

Revision: 2302 http://geany.svn.sourceforge.net/geany/?rev=2302&view=rev Author: ntrel Date: 2008-03-03 09:35:32 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Re-enable snippets completion. Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/src/keybindings.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-03-03 17:28:15 UTC (rev 2301) +++ branches/plugin-keybindings/ChangeLog 2008-03-03 17:35:32 UTC (rev 2302) @@ -5,6 +5,7 @@ Fix clearing a shortcut when overriding it in Prefs dialog. * src/keybindings.c: Re-enable focus commands in the VTE. + Re-enable snippets completion. 2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/plugin-keybindings/src/keybindings.c =================================================================== --- branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:28:15 UTC (rev 2301) +++ branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:35:32 UTC (rev 2302) @@ -765,10 +765,10 @@ * return FALSE if no completion occurs, so the tab or space is handled normally. */ static gboolean check_snippet_completion(guint keyval, guint state) { -return FALSE; /* tmp */ -#if 0 - const guint i = GEANY_KEYS_EDIT_COMPLETESNIPPET; - if (keys[i]->key == keyval && keys[i]->mods == state) + KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_TAGS, + GEANY_KEYS_EDIT_COMPLETESNIPPET); + + if (kb->key == keyval && kb->mods == state) { gint idx = document_get_cur_idx(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window)); @@ -784,7 +784,6 @@ } } return FALSE; -#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2008