Commits October 2011

commits@lists.geany.org

14 participants
110 discussions

SF.net SVN: geany:[5996] trunk/HACKING
by ntrel＠users.sourceforge.net 04 Oct '11

04 Oct '11

Revision: 5996 http://geany.svn.sourceforge.net/geany/?rev=5996&view=rev Author: ntrel Date: 2011-10-04 17:10:42 +0000 (Tue, 04 Oct 2011) Log Message: ----------- Add note about using GRegex for tag parsers instead of POSIX regex. Modified Paths: -------------- trunk/HACKING Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2011-10-04 12:22:36 UTC (rev 5995) +++ trunk/HACKING 2011-10-04 17:10:42 UTC (rev 5996) @@ -410,6 +410,18 @@ (You can also try the Anjuta project's tagmanager codebase.) +.. note:: + From Geany 1.22 GLib's GRegex engine is used instead of POSIX + regex, unlike CTags. It should be close enough to POSIX to work + OK. + We no longer support regex parsers with the "b" regex flag + option set and Geany will print debug warnings if it's used. + CTags supports it but doesn't currently (2011) include any + parsers that use it. It should be easy to convert to extended + regex syntax anyway. + +Method +`````` * Add foo.c to SRCS in Makefile.am. * Add foo.o to OBJS in makefile.win32. * Add path/foo.c to geany_sources in wscript. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5995] trunk
by ntrel＠users.sourceforge.net 04 Oct '11

04 Oct '11

Revision: 5995 http://geany.svn.sourceforge.net/geany/?rev=5995&view=rev Author: ntrel Date: 2011-10-04 12:22:36 +0000 (Tue, 04 Oct 2011) Log Message: ----------- Update from CTags SVN jscript.c. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/js.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 17:06:12 UTC (rev 5994) +++ trunk/ChangeLog 2011-10-04 12:22:36 UTC (rev 5995) @@ -1,3 +1,9 @@ +2011-10-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * tagmanager/js.c: + Update from CTags SVN jscript.c. + + 2011-10-03 Colomban Wendling <colomban(at)geany(dot)org> * TODO, configure.ac, doc/geany.txt, geany.nsi, geany_private.rc, Modified: trunk/tagmanager/js.c =================================================================== --- trunk/tagmanager/js.c 2011-10-03 17:06:12 UTC (rev 5994) +++ trunk/tagmanager/js.c 2011-10-04 12:22:36 UTC (rev 5995) @@ -256,26 +256,56 @@ } static void makeClassTag (tokenInfo *const token) -{ +{ + vString * fulltag; + if ( ! token->ignoreTag ) { - if ( ! stringListHas(ClassNames, vStringValue (token->string)) ) + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) { - stringListAdd (ClassNames, vStringNewCopy (token->string)); + vStringCopy(fulltag, token->scope); + vStringCatS (fulltag, "."); + vStringCatS (fulltag, vStringValue(token->string)); + } + else + { + vStringCopy(fulltag, token->string); + } + vStringTerminate(fulltag); + if ( ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + stringListAdd (ClassNames, vStringNewCopy (fulltag)); makeJsTag (token, JSTAG_CLASS); } + vStringDelete (fulltag); } } static void makeFunctionTag (tokenInfo *const token) -{ +{ + vString * fulltag; + if ( ! token->ignoreTag ) { - if ( ! stringListHas(FunctionNames, vStringValue (token->string)) ) + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) { - stringListAdd (FunctionNames, vStringNewCopy (token->string)); + vStringCopy(fulltag, token->scope); + vStringCatS (fulltag, "."); + vStringCatS (fulltag, vStringValue(token->string)); + } + else + { + vStringCopy(fulltag, token->string); + } + vStringTerminate(fulltag); + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) ) + { + stringListAdd (FunctionNames, vStringNewCopy (fulltag)); makeJsTag (token, JSTAG_FUNCTION); } + vStringDelete (fulltag); } } @@ -742,6 +772,14 @@ readToken (token); + if (isKeyword (token, KEYWORD_if)) + { + /* + * Check for an "else if" and consume the "if" + */ + readToken (token); + } + if (isType (token, TOKEN_OPEN_PAREN)) { /* @@ -940,20 +978,32 @@ return is_class; } -static void parseMethods (tokenInfo *const token, tokenInfo *const class) +static boolean parseMethods (tokenInfo *const token, tokenInfo *const class) { tokenInfo *const name = newToken (); + boolean has_methods = FALSE; /* * This deals with these formats * validProperty : 2, * validMethod : function(a,b) {} * 'validMethod2' : function(a,b) {} + * container.dirtyTab = {'url': false, 'title':false, 'snapshot':false, '*': false} */ do { readToken (token); + if (isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * This was most likely a variable declaration of a hash table. + * indicate there were no methods and return. + */ + has_methods = FALSE; + goto cleanUp; + } + if (isType (token, TOKEN_STRING) || isKeyword(token, KEYWORD_NONE)) { copyToken(name, token); @@ -972,6 +1022,7 @@ if (isType (token, TOKEN_OPEN_CURLY)) { + has_methods = TRUE; addToScope (name, class->string); makeJsTag (name, JSTAG_METHOD); parseBlock (token, name); @@ -985,6 +1036,7 @@ } else { + has_methods = TRUE; addToScope (name, class->string); makeJsTag (name, JSTAG_PROPERTY); @@ -1000,7 +1052,10 @@ findCmdTerm (token); +cleanUp: deleteToken (name); + + return has_methods; } static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) @@ -1012,6 +1067,8 @@ boolean is_terminated = TRUE; boolean is_global = FALSE; boolean is_prototype = FALSE; + boolean has_methods = FALSE; + vString * fulltag; vStringClear(saveScope); /* @@ -1324,8 +1381,62 @@ * 'validMethodOne' : function(a,b) {}, * 'validMethodTwo' : function(a,b) {} * } + * Or checks if this is a hash variable. + * var z = {}; */ - parseMethods(token, name); + has_methods = parseMethods(token, name); + if ( ! has_methods ) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * A pointer can be created to the function. + * If we recognize the function/class name ignore the variable. + * This format looks identical to a variable definition. + * A variable defined outside of a block is considered + * a global variable: + * var g_var1 = 1; + * var g_var2; + * This is not a global variable: + * var g_var = function; + * This is a global variable: + * var g_var = different_var_name; + */ + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) + { + vStringCopy(fulltag, token->scope); + vStringCatS (fulltag, "."); + vStringCatS (fulltag, vStringValue(token->string)); + } + else + { + vStringCopy(fulltag, token->string); + } + vStringTerminate(fulltag); + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) && + ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + readToken (token); + if ( ! isType (token, TOKEN_SEMICOLON)) + findCmdTerm (token); + if (isType (token, TOKEN_SEMICOLON)) + makeJsTag (name, JSTAG_VARIABLE); + } + vStringDelete (fulltag); + } + } + if (isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * Assume the closing parantheses terminates + * this statements. + */ + is_terminated = TRUE; + } } else if (isKeyword (token, KEYWORD_new)) { @@ -1345,11 +1456,14 @@ if (isType (token, TOKEN_SEMICOLON)) { - if ( is_class ) + if ( token->nestLevel == 0 ) { - makeClassTag (name); - } else { - makeFunctionTag (name); + if ( is_class ) + { + makeClassTag (name); + } else { + makeFunctionTag (name); + } } } } @@ -1374,13 +1488,26 @@ * This is a global variable: * var g_var = different_var_name; */ - if ( ! stringListHas(FunctionNames, vStringValue (token->string)) && - ! stringListHas(ClassNames, vStringValue (token->string)) ) + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) { + vStringCopy(fulltag, token->scope); + vStringCatS (fulltag, "."); + vStringCatS (fulltag, vStringValue(token->string)); + } + else + { + vStringCopy(fulltag, token->string); + } + vStringTerminate(fulltag); + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) && + ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { findCmdTerm (token); if (isType (token, TOKEN_SEMICOLON)) makeJsTag (name, JSTAG_VARIABLE); } + vStringDelete (fulltag); } } } @@ -1398,7 +1525,7 @@ * return 1; * } */ - if (isType (token, TOKEN_CLOSE_CURLY)) + if ( ! is_terminated && isType (token, TOKEN_CLOSE_CURLY)) is_terminated = FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5994] trunk/src/utils.c
by colombanw＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5994 http://geany.svn.sourceforge.net/geany/?rev=5994&view=rev Author: colombanw Date: 2011-10-03 17:06:12 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Cleanup utils_strpos() Use strstr() to find the substring, which makes the code simpler and is way faster (new version is nearly 2 times faster on my machine). Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-10-03 17:05:57 UTC (rev 5993) +++ trunk/src/utils.c 2011-10-03 17:06:12 UTC (rev 5994) @@ -697,39 +697,16 @@ gint utils_strpos(const gchar *haystack, const gchar *needle) { - gint haystack_length = strlen(haystack); - gint needle_length = strlen(needle); - gint i, j, pos = -1; + const gchar *sub; - if (needle_length > haystack_length) - { + if (! *needle) return -1; - } - else - { - for (i = 0; (i < haystack_length) && pos == -1; i++) - { - if (haystack[i] == needle[0] && needle_length == 1) - return i; - else if (haystack[i] == needle[0]) - { - for (j = 1; (j < needle_length); j++) - { - if (haystack[i + j] == needle[j]) - { - if (pos == -1) - pos = i; - } - else - { - pos = -1; - break; - } - } - } - } - return pos; - } + + sub = strstr(haystack, needle); + if (! sub) + return -1; + + return sub - haystack; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5993] trunk/src/utils.c
by colombanw＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5993 http://geany.svn.sourceforge.net/geany/?rev=5993&view=rev Author: colombanw Date: 2011-10-03 17:05:57 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Cleanup utils_remove_ext_from_filename() Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-10-03 17:05:41 UTC (rev 5992) +++ trunk/src/utils.c 2011-10-03 17:05:57 UTC (rev 5993) @@ -596,7 +596,7 @@ { gchar *last_dot; gchar *result; - gint i; + gsize len; g_return_val_if_fail(filename != NULL, NULL); @@ -604,15 +604,11 @@ if (! last_dot) return g_strdup(filename); - /* assumes extension is small, so extra bytes don't matter */ - result = g_malloc(strlen(filename)); - i = 0; - while ((filename + i) != last_dot) - { - result[i] = filename[i]; - i++; - } - result[i] = 0; + len = (gsize) (last_dot - filename); + result = g_malloc(len + 1); + memcpy(result, filename, len); + result[len] = 0; + 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:[5992] trunk/src/utils.c
by colombanw＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5992 http://geany.svn.sourceforge.net/geany/?rev=5992&view=rev Author: colombanw Date: 2011-10-03 17:05:41 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Avoid an unnecessary string duplication in utils_str_casecmp() Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-10-03 17:05:25 UTC (rev 5991) +++ trunk/src/utils.c 2011-10-03 17:05:41 UTC (rev 5992) @@ -444,6 +444,25 @@ } +/* like g_utf8_strdown() but if @str is not valid UTF8, convert it from locale first. + * returns NULL on charset conversion failure */ +static gchar *utf8_strdown(const gchar *str) +{ + gchar *down; + + if (g_utf8_validate(str, -1, NULL)) + down = g_utf8_strdown(str, -1); + else + { + down = g_locale_to_utf8(str, -1, NULL, NULL, NULL); + if (down) + setptr(down, g_utf8_strdown(down, -1)); + } + + return down; +} + + /** * A replacement function for g_strncasecmp() to compare strings case-insensitive. * It converts both strings into lowercase using g_utf8_strdown() and then compare @@ -469,30 +488,17 @@ g_return_val_if_fail(s1 != NULL, 1); g_return_val_if_fail(s2 != NULL, -1); - tmp1 = g_strdup(s1); - tmp2 = g_strdup(s2); - - /* first ensure strings are UTF-8 */ - if (! g_utf8_validate(s1, -1, NULL)) - setptr(tmp1, g_locale_to_utf8(s1, -1, NULL, NULL, NULL)); - if (! g_utf8_validate(s2, -1, NULL)) - setptr(tmp2, g_locale_to_utf8(s2, -1, NULL, NULL, NULL)); - - if (tmp1 == NULL) - { - g_free(tmp2); + /* ensure strings are UTF-8 and lowercase */ + tmp1 = utf8_strdown(s1); + if (! tmp1) return 1; - } - if (tmp2 == NULL) + tmp2 = utf8_strdown(s2); + if (! tmp2) { g_free(tmp1); return -1; } - /* then convert the strings into a case-insensitive form */ - setptr(tmp1, g_utf8_strdown(tmp1, -1)); - setptr(tmp2, g_utf8_strdown(tmp2, -1)); - /* compare */ result = strcmp(tmp1, tmp2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5991] trunk
by colombanw＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5991 http://geany.svn.sourceforge.net/geany/?rev=5991&view=rev Author: colombanw Date: 2011-10-03 17:05:25 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Fix "toggle case" when there is no selection Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 14:57:02 UTC (rev 5990) +++ trunk/ChangeLog 2011-10-03 17:05:25 UTC (rev 5991) @@ -3,6 +3,8 @@ * TODO, configure.ac, doc/geany.txt, geany.nsi, geany_private.rc, src/geany.h, win32-config.h, wscript: Post-release version bump. + * src/callbacks.c: + Fix "toggle case" when there is no selection. 2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2011-10-03 14:57:02 UTC (rev 5990) +++ trunk/src/callbacks.c 2011-10-03 17:05:25 UTC (rev 5991) @@ -740,7 +740,9 @@ keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_WORD); keep_sel = FALSE; } - else + + /* either we already had a selection or we created one for current word */ + if (sci_has_selection(sci)) { gchar *result = NULL; gint cmd = SCI_LOWERCASE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5990] trunk
by ntrel＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5990 http://geany.svn.sourceforge.net/geany/?rev=5990&view=rev Author: ntrel Date: 2011-10-03 14:57:02 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Support visual reordering of keybinding groups without breaking the plugin ABI. Reorder Project group to follow main menu order. Move Focus, Notebook tab groups last as they don't have corresponding menu items. Use keybindings_get_core_group() for fixed group IDs instead of indexing keybinding_groups. Make keybindings_lookup_item() only work with a GEANY_KEY_GROUP_ ID, not an index into keybinding_groups. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 14:39:01 UTC (rev 5989) +++ trunk/ChangeLog 2011-10-03 14:57:02 UTC (rev 5990) @@ -31,6 +31,16 @@ - src/win32.c, src/win32.h, src/dialogs.c: Use GTK unsaved file dialog on Windows too because the button names should be specific. + * src/build.c, src/keybindings.c, src/keybindings.h, src/prefs.c: + Support visual reordering of keybinding groups without breaking the + plugin ABI. + Reorder Project group to follow main menu order. + Move Focus, Notebook tab groups last as they don't have + corresponding menu items. + Use keybindings_get_core_group() for fixed group IDs instead of + indexing keybinding_groups. + Make keybindings_lookup_item() only work with a GEANY_KEY_GROUP_ + ID, not an index into keybinding_groups. 2011-10-02 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2011-10-03 14:39:01 UTC (rev 5989) +++ trunk/src/build.c 2011-10-03 14:57:02 UTC (rev 5990) @@ -1409,7 +1409,7 @@ { GtkWidget *menu; GtkAccelGroup *accel_group = gtk_accel_group_new(); - GeanyKeyGroup *keygroup = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); + GeanyKeyGroup *keygroup = keybindings_get_core_group(GEANY_KEY_GROUP_BUILD); gint i, j; menu = gtk_menu_new(); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-10-03 14:39:01 UTC (rev 5989) +++ trunk/src/keybindings.c 2011-10-03 14:57:02 UTC (rev 5990) @@ -62,7 +62,7 @@ #endif -GPtrArray *keybinding_groups; /* array of GeanyKeyGroup pointers */ +GPtrArray *keybinding_groups; /* array of GeanyKeyGroup pointers, in visual order */ /* keyfile group name for non-plugin KB groups */ static const gchar keybindings_keyfile_group_name[] = "Bindings"; @@ -184,7 +184,7 @@ } -static GeanyKeyGroup *add_kb_group(GeanyKeyGroup *group, +static void add_kb_group(GeanyKeyGroup *group, const gchar *name, const gchar *label, GeanyKeyGroupCallback callback, gboolean plugin) { g_ptr_array_add(keybinding_groups, group); @@ -194,31 +194,56 @@ group->callback = callback; group->plugin = plugin; group->key_items = g_ptr_array_new(); - return group; } +GeanyKeyGroup *keybindings_get_core_group(guint id) +{ + static GeanyKeyGroup groups[GEANY_KEY_GROUP_COUNT]; + + g_return_val_if_fail(id < GEANY_KEY_GROUP_COUNT, NULL); + + return &groups[id]; +} + + /* Lookup a widget in the main window */ #define LW(widget_name) \ ui_lookup_widget(main_widgets.window, G_STRINGIFY(widget_name)) -/* Expansion for group_id = FILE: - * add_kb_group(&groups[GEANY_KEY_GROUP_FILE], - * keybindings_keyfile_group_name, _("File menu"), callback); */ #define ADD_KB_GROUP(group_id, label, callback) \ - add_kb_group(&groups[GEANY_KEY_GROUP_ ## group_id],\ + add_kb_group(keybindings_get_core_group(group_id),\ keybindings_keyfile_group_name, label, callback, FALSE) -/* Init all fields of keys with default values. - * The menu_item field is always the main menu item, popup menu accelerators are - * set in add_popup_menu_accels(). */ static void init_default_kb(void) { - static GeanyKeyGroup groups[GEANY_KEY_GROUP_COUNT]; GeanyKeyGroup *group; - group = ADD_KB_GROUP(FILE, _("File"), cb_func_file_action); + /* visual group order */ + ADD_KB_GROUP(GEANY_KEY_GROUP_FILE, _("File"), cb_func_file_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_EDITOR, _("Editor"), cb_func_editor_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_CLIPBOARD, _("Clipboard"), cb_func_clipboard_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_SELECT, _("Select"), cb_func_select_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_FORMAT, _("Format"), cb_func_format_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_INSERT, _("Insert"), cb_func_insert_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_SETTINGS, _("Settings"), NULL); + ADD_KB_GROUP(GEANY_KEY_GROUP_SEARCH, _("Search"), cb_func_search_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_GOTO, _("Go to"), cb_func_goto_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_VIEW, _("View"), cb_func_view_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_DOCUMENT, _("Document"), cb_func_document_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_PROJECT, _("Project"), cb_func_project_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_BUILD, _("Build"), cb_func_build_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_TOOLS, _("Tools"), NULL); + ADD_KB_GROUP(GEANY_KEY_GROUP_HELP, _("Help"), NULL); + ADD_KB_GROUP(GEANY_KEY_GROUP_FOCUS, _("Focus"), cb_func_switch_action); + ADD_KB_GROUP(GEANY_KEY_GROUP_NOTEBOOK, _("Notebook tab"), NULL); + /* Init all fields of keys with default values. + * The menu_item field is always the main menu item, popup menu accelerators are + * set in add_popup_menu_accels(). */ + + group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); + keybindings_set_item(group, GEANY_KEYS_FILE_NEW, NULL, GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL); keybindings_set_item(group, GEANY_KEYS_FILE_OPEN, NULL, @@ -245,12 +270,12 @@ keybindings_set_item(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, 0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL); - group = ADD_KB_GROUP(PROJECT, _("Project"), cb_func_project_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_PROJECT); keybindings_set_item(group, GEANY_KEYS_PROJECT_PROPERTIES, NULL, 0, 0, "project_properties", _("Project properties"), LW(project_properties1)); - group = ADD_KB_GROUP(EDITOR, _("Editor"), cb_func_editor_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_EDITOR); keybindings_set_item(group, GEANY_KEYS_EDITOR_UNDO, NULL, GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo"), LW(menu_undo2)); @@ -296,7 +321,7 @@ keybindings_set_item(group, GEANY_KEYS_EDITOR_MOVELINEDOWN, NULL, 0, 0, "edit_movelinedown", _("Move line(s) down"), NULL); - group = ADD_KB_GROUP(CLIPBOARD, _("Clipboard"), cb_func_clipboard_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL); @@ -311,7 +336,7 @@ GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("_Cut Current Line(s)"), LW(cut_current_line_s_1)); - group = ADD_KB_GROUP(SELECT, _("Select"), cb_func_select_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); keybindings_set_item(group, GEANY_KEYS_SELECT_ALL, NULL, GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All"), LW(menu_select_all1)); @@ -328,7 +353,7 @@ keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTRIGHT, NULL, 0, 0, "edit_selectwordpartright", _("Select to next word part"), NULL); - group = ADD_KB_GROUP(FORMAT, _("Format"), cb_func_format_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_FORMAT); keybindings_set_item(group, GEANY_KEYS_FORMAT_TOGGLECASE, NULL, GDK_u, GDK_CONTROL_MASK | GDK_MOD1_MASK, "edit_togglecase", @@ -365,7 +390,7 @@ GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), LW(reflow_lines_block1)); - group = ADD_KB_GROUP(INSERT, _("Insert"), cb_func_insert_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_INSERT); keybindings_set_item(group, GEANY_KEYS_INSERT_DATE, NULL, GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"), @@ -378,7 +403,7 @@ keybindings_set_item(group, GEANY_KEYS_INSERT_LINEAFTER, NULL, 0, 0, "edit_insertlineafter", _("Insert New Line After Current"), NULL); - group = ADD_KB_GROUP(SETTINGS, _("Settings"), NULL); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SETTINGS); keybindings_set_item(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), @@ -386,7 +411,7 @@ keybindings_set_item(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), LW(plugin_preferences1)); - group = ADD_KB_GROUP(SEARCH, _("Search"), cb_func_search_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SEARCH); keybindings_set_item(group, GEANY_KEYS_SEARCH_FIND, NULL, GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find"), LW(find1)); @@ -415,7 +440,7 @@ keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, NULL, GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), LW(mark_all1)); - group = ADD_KB_GROUP(GOTO, _("Go to"), cb_func_goto_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_GOTO); keybindings_set_item(group, GEANY_KEYS_GOTO_BACK, NULL, 0, 0, "nav_back", _("Navigate back a location"), NULL); @@ -450,7 +475,7 @@ keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTWORDPART, NULL, GDK_backslash, GDK_CONTROL_MASK, "edit_nextwordstart", _("Go to Next Word Part"), NULL); - group = ADD_KB_GROUP(VIEW, _("View"), cb_func_view_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_VIEW); keybindings_set_item(group, GEANY_KEYS_VIEW_TOGGLEALL, NULL, 0, 0, "menu_toggleall", _("Toggle All Additional Widgets"), @@ -469,7 +494,7 @@ keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMRESET, NULL, GDK_0, GDK_CONTROL_MASK, "normal_size", _("Zoom Reset"), LW(normal_size1)); - group = ADD_KB_GROUP(FOCUS, _("Focus"), cb_func_switch_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_FOCUS); keybindings_set_item(group, GEANY_KEYS_FOCUS_EDITOR, NULL, GDK_F2, 0, "switch_editor", _("Switch to Editor"), NULL); @@ -492,7 +517,7 @@ keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST, NULL, 0, 0, "switch_sidebar_doc_list", _("Switch to Sidebar Document List"), NULL); - group = ADD_KB_GROUP(NOTEBOOK, _("Notebook tab"), NULL); + group = keybindings_get_core_group(GEANY_KEY_GROUP_NOTEBOOK); keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, cb_func_switch_tableft, GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document"), NULL); @@ -509,7 +534,7 @@ keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABLAST, cb_func_move_tab, 0, 0, "move_tablast", _("Move document last"), NULL); - group = ADD_KB_GROUP(DOCUMENT, _("Document"), cb_func_document_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_DOCUMENT); keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEWRAP, NULL, 0, 0, "menu_linewrap", _("Toggle Line wrapping"), LW(menu_line_wrapping1)); @@ -534,7 +559,7 @@ keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS_INDICATORS, NULL, 0, 0, "remove_markers_and_indicators", _("Remove Markers and Error Indicators"), NULL); - group = ADD_KB_GROUP(BUILD, _("Build"), cb_func_build_action); + group = keybindings_get_core_group(GEANY_KEY_GROUP_BUILD); keybindings_set_item(group, GEANY_KEYS_BUILD_COMPILE, NULL, GDK_F8, 0, "build_compile", _("Compile"), NULL); @@ -556,12 +581,12 @@ keybindings_set_item(group, GEANY_KEYS_BUILD_OPTIONS, NULL, 0, 0, "build_options", _("Build options"), NULL); - group = ADD_KB_GROUP(TOOLS, _("Tools"), NULL); + group = keybindings_get_core_group(GEANY_KEY_GROUP_TOOLS); keybindings_set_item(group, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, cb_func_menu_opencolorchooser, 0, 0, "menu_opencolorchooser", _("Show Color Chooser"), LW(menu_choose_color1)); - group = ADD_KB_GROUP(HELP, _("Help"), NULL); + group = keybindings_get_core_group(GEANY_KEY_GROUP_HELP); keybindings_set_item(group, GEANY_KEYS_HELP_HELP, cb_func_menu_help, GDK_F1, 0, "menu_help", _("Help"), LW(help1)); @@ -717,26 +742,26 @@ { GeanyKeyGroup *group; - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_EDITOR); + group = keybindings_get_core_group(GEANY_KEY_GROUP_EDITOR); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_UNDO, undo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SELECT); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SELECT_ALL, menu_select_all2); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_INSERT); + group = keybindings_get_core_group(GEANY_KEY_GROUP_INSERT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_INSERT_DATE, insert_date_custom2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_INSERT_ALTWHITESPACE, insert_alternative_white_space1); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FILE); + group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FILE_OPENSELECTED, menu_open_selected_file2); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SEARCH); + group = keybindings_get_core_group(GEANY_KEY_GROUP_SEARCH); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDUSAGE, find_usage1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, find_document_usage1); - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_GOTO); + group = keybindings_get_core_group(GEANY_KEY_GROUP_GOTO); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDEFINITION, goto_tag_definition1); /* Format and Commands share the menu bar submenus */ @@ -1090,7 +1115,7 @@ return FALSE; /* make focus commands override any bash commands */ - group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FOCUS); + group = keybindings_get_core_group(GEANY_KEY_GROUP_FOCUS); foreach_ptr_array(kb, i, group->key_items) { if (state == kb->mods && keyval == kb->key) @@ -1259,13 +1284,15 @@ } +/* group_id must be a core group, e.g. GEANY_KEY_GROUP_EDITOR + * key_id e.g. GEANY_KEYS_EDITOR_CALLTIP */ GeanyKeyBinding *keybindings_lookup_item(guint group_id, guint key_id) { GeanyKeyGroup *group; - g_return_val_if_fail(group_id < keybinding_groups->len, NULL); + g_return_val_if_fail(group_id < GEANY_KEY_GROUP_COUNT, NULL); /* can't use this for plugin groups */ - group = g_ptr_array_index(keybinding_groups, group_id); + group = keybindings_get_core_group(group_id); g_return_val_if_fail(group, NULL); return keybindings_get_item(group, key_id); @@ -1280,8 +1307,6 @@ { GeanyKeyBinding *kb; - g_return_if_fail(group_id < GEANY_KEY_GROUP_COUNT); /* can't use this for plugin groups */ - kb = keybindings_lookup_item(group_id, key_id); if (kb) { @@ -1289,7 +1314,7 @@ kb->callback(key_id); else { - GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, group_id); + GeanyKeyGroup *group = keybindings_get_core_group(group_id); if (group->callback) group->callback(key_id); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2011-10-03 14:39:01 UTC (rev 5989) +++ trunk/src/keybindings.h 2011-10-03 14:57:02 UTC (rev 5990) @@ -78,7 +78,7 @@ * the existing enum values stay the same. */ /** Keybinding group IDs for use with keybindings_send_command(). */ -/* Groups must be added in this order. */ +/* These IDs are used to lookup a group. */ enum GeanyKeyGroupID { GEANY_KEY_GROUP_FILE, /**< Group. */ @@ -102,7 +102,7 @@ }; /** Keybinding command IDs for use with keybindings_send_command(). */ -/* These IDs are used to lookup a keybinding; keybindings can be added in any order. */ +/* These IDs are used to lookup a keybinding. */ enum GeanyKeyBindingID { GEANY_KEYS_EDITOR_TRANSPOSELINE, /**< Keybinding. */ @@ -249,6 +249,8 @@ void keybindings_free(void); +GeanyKeyGroup *keybindings_get_core_group(guint id); + GeanyKeyGroup *keybindings_set_group(GeanyKeyGroup *group, const gchar *section_name, const gchar *label, gsize count, GeanyKeyGroupCallback callback) G_GNUC_WARN_UNUSED_RESULT; Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-10-03 14:39:01 UTC (rev 5989) +++ trunk/src/prefs.c 2011-10-03 14:57:02 UTC (rev 5990) @@ -753,6 +753,16 @@ } +/* note: uses group index, not group id, unlike keybindings_lookup_item(). */ +static GeanyKeyBinding *kb_index(guint gidx, guint kid) +{ + GeanyKeyGroup *group; + + group = g_ptr_array_index(keybinding_groups, gidx); + return keybindings_get_item(group, kid); +} + + /* read the treeview shortcut fields into keybindings */ static void kb_update(void) { @@ -783,7 +793,7 @@ gtk_tree_model_get(model, &child, KB_TREE_INDEX, &kid, KB_TREE_SHORTCUT, &str, -1); gtk_accelerator_parse(str, &key, &mods); g_free(str); - kb = keybindings_lookup_item(gid, kid); + kb = kb_index(gid, kid); if (kb->key != key || kb->mods != mods) keybindings_update_combo(kb, key, mods); @@ -1317,7 +1327,7 @@ gtk_tree_model_iter_parent(GTK_TREE_MODEL(store), &parent, iter); gtk_tree_model_get(GTK_TREE_MODEL(store), &parent, KB_TREE_INDEX, &group_idx, -1); - return keybindings_lookup_item(group_idx, keybinding_idx); + return kb_index(group_idx, keybinding_idx); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5989] trunk
by colombanw＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5989 http://geany.svn.sourceforge.net/geany/?rev=5989&view=rev Author: colombanw Date: 2011-10-03 14:39:01 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Post-release version bump Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/configure.ac trunk/doc/geany.txt trunk/geany.nsi trunk/geany_private.rc trunk/src/geany.h trunk/win32-config.h trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/ChangeLog 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,3 +1,10 @@ +2011-10-03 Colomban Wendling <colomban(at)geany(dot)org> + + * TODO, configure.ac, doc/geany.txt, geany.nsi, geany_private.rc, + src/geany.h, win32-config.h, wscript: + Post-release version bump. + + 2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Merge branches/unstable: Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/TODO 2011-10-03 14:39:01 UTC (rev 5989) @@ -27,9 +27,9 @@ workspace-sockets branch) - 1.0: - o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs, - GeanyKeyCommand enum into groups) + Someday: + o stable plugin ABI? (Split up geany_data, prefs, GeanyKeyCommand + enum into groups) o review documentation Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/configure.ac 2011-10-03 14:39:01 UTC (rev 5989) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(geany, 0.21) +AM_INIT_AUTOMAKE(geany, 1.22) AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/doc/geany.txt 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.21 +.. |(version)| replace:: 1.22 ======= Geany Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/geany.nsi 2011-10-03 14:39:01 UTC (rev 5989) @@ -33,8 +33,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.21" -!define PRODUCT_VERSION_ID "0.21.0.0" +!define PRODUCT_VERSION "1.22" +!define PRODUCT_VERSION_ID "1.22.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/geany_private.rc 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 0,21,0,0 -#define VER_FILEVERSION_STR "0.21" +#define VER_FILEVERSION 1,22,0,0 +#define VER_FILEVERSION_STR "1.22" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/src/geany.h 2011-10-03 14:39:01 UTC (rev 5989) @@ -47,7 +47,7 @@ * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Gromia" +#define GEANY_CODENAME "Tavira" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_DEFAULT_DIALOG_HEIGHT 350 Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/win32-config.h 2011-10-03 14:39:01 UTC (rev 5989) @@ -314,7 +314,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "0.21" +#define VERSION "1.22" #define REVISION "-1" Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/wscript 2011-10-03 14:39:01 UTC (rev 5989) @@ -52,7 +52,7 @@ APPNAME = 'geany' -VERSION = '0.21' +VERSION = '1.22' LINGUAS_FILE = 'po/LINGUAS' top = '.' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5988] branches/unstable/
by ntrel＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5988 http://geany.svn.sourceforge.net/geany/?rev=5988&view=rev Author: ntrel Date: 2011-10-03 14:37:06 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Remove completed branch. Removed Paths: ------------- branches/unstable/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5987] trunk
by ntrel＠users.sourceforge.net 03 Oct '11

03 Oct '11

Revision: 5987 http://geany.svn.sourceforge.net/geany/?rev=5987&view=rev Author: ntrel Date: 2011-10-03 14:35:11 +0000 (Mon, 03 Oct 2011) Log Message: ----------- * Merge branches/unstable: - tagmanager/php.c: Fix parsing keyword-qualified functions strictly, e.g. don't parse 'staticfunction' or 'fatfunction'. - src/utils.c, src/utils.h, src/editor.c: Use GRegex for snippet indentation replacement - fixes wrong behaviour with Mac line endings. - tagmanager/lregex.c, TODO: Use GRegex for CTags instead of POSIX regex - GRegex is more powerful. This also fixes a (HTML) performance issue on Windows. Geany will now print a debug warning when using the "b" CTags regex flag option for non-extended syntax. This is not currently used by Geany's parsers. Note: GNU regex can't be removed yet as it's still used elsewhere by Geany. - src/build.c, doc/pluginsignals.c: When saving on build, prompt for a filename if necessary. Emit the "build-start" signal only if saving succeeds. - src/build.c: Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with glib's asynchronous spawning (which doesn't work on Windows). - src/win32.c, src/win32.h, src/dialogs.c: Use GTK unsaved file dialog on Windows too because the button names should be specific. Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/doc/pluginsignals.c trunk/src/build.c trunk/src/dialogs.c trunk/src/editor.c trunk/src/socket.c trunk/src/utils.c trunk/src/utils.h trunk/src/win32.c trunk/src/win32.h trunk/tagmanager/lregex.c trunk/tagmanager/php.c Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/build-system:3867-4119 + /branches/build-system:3867-4119 /branches/unstable:5939-5986 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/ChangeLog 2011-10-03 14:35:11 UTC (rev 5987) @@ -1,3 +1,31 @@ +2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * Merge branches/unstable: + - tagmanager/php.c: + Fix parsing keyword-qualified functions strictly, e.g. don't + parse 'staticfunction' or 'fatfunction'. + - src/utils.c, src/utils.h, src/editor.c: + Use GRegex for snippet indentation replacement - fixes wrong + behaviour with Mac line endings. + - tagmanager/lregex.c, TODO: + Use GRegex for CTags instead of POSIX regex - GRegex is more + powerful. This also fixes a (HTML) performance issue on Windows. + Geany will now print a debug warning when using the "b" CTags + regex flag option for non-extended syntax. This is not currently + used by Geany's parsers. + Note: GNU regex can't be removed yet as it's still used elsewhere + by Geany. + - src/build.c, doc/pluginsignals.c: + When saving on build, prompt for a filename if necessary. + Emit the "build-start" signal only if saving succeeds. + - src/build.c: + Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with + glib's asynchronous spawning (which doesn't work on Windows). + - src/win32.c, src/win32.h, src/dialogs.c: + Use GTK unsaved file dialog on Windows too because the button names + should be specific. + + 2011-10-02 Colomban Wendling <colomban(at)geany(dot)org> * doc/geany.txt, doc/geany.html: Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/TODO 2011-10-03 14:35:11 UTC (rev 5987) @@ -14,7 +14,7 @@ o common default highlighting styles configurable for all programming languages (done for C-like filetypes using filetypes.common named styles) - o update included regex library (and other CTags improvements) + o use GRegex only and remove GNU regex o asynchronous build commands on Windows o (filetype-independent run command in build dialog & keybinding) o (better custom filetype support) Modified: trunk/doc/pluginsignals.c =================================================================== --- trunk/doc/pluginsignals.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/doc/pluginsignals.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -187,7 +187,7 @@ */ signal void (*geany_startup_complete)(GObject *obj, gpointer user_data); -/** Sent before build is started. Plugins can use this signal e.g. to save the opened documents +/** Sent before build is started. A plugin could use this signal e.g. to save all unsaved documents * before the build starts. * * @param obj a GeanyObject instance, should be ignored. Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/build.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -64,6 +64,11 @@ #include "toolbar.h" #include "geanymenubuttonaction.h" +/* g_spawn_async_with_pipes doesn't work on Windows */ +#ifdef G_OS_WIN32 +#define SYNC_SPAWN +#endif + /* Number of editor indicators to draw - limited as this can affect performance */ #define GEANY_BUILD_ERR_HIGHLIGHT_MAX 50 @@ -114,7 +119,7 @@ static gint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2 }; static gint build_items_count = 9; -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); #endif @@ -571,7 +576,7 @@ } -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN static void parse_build_output(const gchar **output, gint status) { guint x, i, len; @@ -590,7 +595,7 @@ { line = lines[i]; while (*line != '\0') - { /* replace any conrol characters in the output */ + { /* replace any control characters in the output */ if (*line < 32) *line = 32; line++; @@ -679,7 +684,7 @@ gchar *utf8_working_dir; gchar *cmd_string; gchar *utf8_cmd_string; -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN gchar *output[2]; gint status; #else @@ -726,7 +731,7 @@ build_info.file_type_id = (doc == NULL) ? GEANY_FILETYPES_NONE : doc->file_type->id; build_info.message_count = 0; -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN if (! utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &output[0], &output[1], &status, &error)) #else @@ -744,7 +749,7 @@ return (GPid) 0; } -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN parse_build_output((const gchar**) output, status); g_free(output[0]); g_free(output[1]); @@ -1026,7 +1031,7 @@ } -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) { if (cond & (G_IO_IN | G_IO_PRI)) @@ -1121,11 +1126,14 @@ } -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { gboolean failure = FALSE; +#ifdef G_OS_WIN32 + failure = status; +#else if (WIFEXITED(status)) { if (WEXITSTATUS(status) != EXIT_SUCCESS) @@ -1140,6 +1148,7 @@ { /* any other failure occured */ failure = TRUE; } +#endif show_build_result_message(failure); utils_beep(); @@ -1261,10 +1270,16 @@ gint grp = GPOINTER_TO_GRP(user_data); gint cmd = GPOINTER_TO_CMD(user_data); + if (doc && doc->changed) + { + if (document_need_save_as(doc) && !dialogs_show_save_as()) + return; + + if (!document_save_file(doc, FALSE)) + return; + } g_signal_emit_by_name(geany_object, "build-start"); - if (doc && doc->changed) - document_save_file(doc, FALSE); if (grp == GEANY_GBG_NON_FT && cmd == GBO_TO_CMD(GEANY_GBO_CUSTOM)) { static GtkWidget *dialog = NULL; /* keep dialog for combo history */ Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/dialogs.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -804,7 +804,6 @@ } -#ifndef G_OS_WIN32 static gint run_unsaved_dialog(const gchar *msg, const gchar *msg2) { GtkWidget *dialog, *button; @@ -812,6 +811,7 @@ dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", msg2); gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); @@ -828,7 +828,6 @@ return ret; } -#endif gboolean dialogs_show_unsaved_file(GeanyDocument *doc) @@ -851,12 +850,7 @@ msg2 = _("Do you want to save it before closing?"); g_free(short_fn); -#ifdef G_OS_WIN32 - setptr(msg, g_strconcat(msg, "\n", msg2, NULL)); - ret = win32_message_dialog_unsaved(msg); -#else ret = run_unsaved_dialog(msg, msg2); -#endif g_free(msg); switch (ret) Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/editor.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -2272,63 +2272,18 @@ } -static gboolean utils_regex_find(regex_t *regex, const gchar *haystack, gsize start, - gsize nmatches, regmatch_t *matches) -{ - gint eflags = 0; - - if (start > 0) - { - gchar c = haystack[start - 1]; - - if (c == '\n' || c == '\r') - eflags = REG_NOTBOL; - } - return regexec(regex, haystack + start, nmatches, matches, eflags) == 0; -} - - -/* match_index: which match to replace, 0 for whole regex. - * note: this doesn't support backreferences in replacements */ -static guint utils_string_regex_replace_all(GString *haystack, - regex_t *regex, guint match_index, const gchar *replace) -{ - gssize pos; - regmatch_t matches[10]; - guint ret = 0; - - g_return_val_if_fail(match_index < 10, 0); - - /* ensure haystack->str is not null */ - if (haystack->len == 0) - return 0; - - pos = 0; - while (utils_regex_find(regex, haystack->str, pos, G_N_ELEMENTS(matches), matches)) - { - regmatch_t *match = &matches[match_index]; - - g_return_val_if_fail(match->rm_so >= 0, FALSE); - pos += match->rm_so; - pos = utils_string_replace(haystack, pos, match->rm_eo - match->rm_so, replace); - ret++; - } - return ret; -} - - static void fix_indentation(GeanyEditor *editor, GString *buf) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); gchar *whitespace; - regex_t regex; - gint cflags = REG_EXTENDED | REG_NEWLINE; + GRegex *regex; + gint cflags = G_REGEX_MULTILINE; /* transform leading tabs into indent widths (in spaces) */ whitespace = g_strnfill(iprefs->width, ' '); - regcomp(&regex, "^ *(\t)", cflags); - while (utils_string_regex_replace_all(buf, &regex, 1, whitespace)); - regfree(&regex); + regex = g_regex_new("^ *(\t)", cflags, 0, NULL); + while (utils_string_regex_replace_all(buf, regex, 1, whitespace, TRUE)); + g_regex_unref(regex); /* remaining tabs are for alignment */ if (iprefs->type != GEANY_INDENT_TYPE_TABS) @@ -2343,9 +2298,9 @@ setptr(whitespace, g_strnfill(sci_get_tab_width(editor->sci), ' ')); str = g_strdup_printf("^\t*(%s)", whitespace); - regcomp(&regex, str, cflags); - while (utils_string_regex_replace_all(buf, &regex, 1, "\t")); - regfree(&regex); + regex = g_regex_new(str, cflags, 0, NULL); + while (utils_string_regex_replace_all(buf, regex, 1, "\t", TRUE)); + g_regex_unref(regex); g_free(str); } g_free(whitespace); Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/socket.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -588,7 +588,7 @@ gint fd, sock; gchar buf[BUFFER_LENGTH]; struct sockaddr_in caddr; - guint caddr_len = sizeof(caddr); + socklen_t caddr_len = sizeof(caddr); GtkWidget *window = data; gboolean popup = FALSE; Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/utils.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -1622,6 +1622,45 @@ } +/* Similar to g_regex_replace but allows matching a subgroup. + * match_num: which match to replace, 0 for whole match. + * literal: FALSE to interpret escape sequences in @a replace. + * returns: number of replacements. + * bug: replaced text can affect matching of ^ or \b */ +guint utils_string_regex_replace_all(GString *haystack, GRegex *regex, + guint match_num, const gchar *replace, gboolean literal) +{ + GMatchInfo *minfo; + guint ret = 0; + gint start = 0; + + g_assert(literal); /* escapes not implemented yet */ + g_return_val_if_fail(replace, 0); + + /* ensure haystack->str is not null */ + if (haystack->len == 0) + return 0; + + /* passing a start position makes G_REGEX_MATCH_NOTBOL automatic */ + while (g_regex_match_full(regex, haystack->str, -1, start, 0, &minfo, NULL)) + { + gint end, len; + + g_match_info_fetch_pos(minfo, match_num, &start, &end); + len = end - start; + utils_string_replace(haystack, start, len, replace); + ret++; + + /* skip past whole match */ + g_match_info_fetch_pos(minfo, 0, NULL, &end); + start = end - len + strlen(replace); + g_match_info_free(minfo); + } + g_match_info_free(minfo); + return ret; +} + + /* Get project or default startup directory (if set), or NULL. */ const gchar *utils_get_default_dir_utf8(void) { Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/utils.h 2011-10-03 14:35:11 UTC (rev 5987) @@ -178,6 +178,9 @@ guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace); +guint utils_string_regex_replace_all(GString *haystack, GRegex *regex, + guint match_num, const gchar *replace, gboolean literal); + void utils_str_replace_all(gchar **haystack, const gchar *needle, const gchar *replacement); gint utils_strpos(const gchar* haystack, const gchar *needle); Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/win32.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -732,33 +732,6 @@ } -/* Special dialog to ask for an action when closing an unsaved file */ -gint win32_message_dialog_unsaved(const gchar *msg) -{ - static wchar_t w_msg[512]; - static wchar_t w_title[512]; - HWND parent_hwnd = NULL; - gint ret; - - /* convert the Unicode chars to wide chars */ - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, G_N_ELEMENTS(w_msg)); - MultiByteToWideChar(CP_UTF8, 0, _("Question"), -1, w_title, G_N_ELEMENTS(w_title)); - - if (main_widgets.window != NULL) - parent_hwnd = GDK_WINDOW_HWND(main_widgets.window->window); - - ret = MessageBoxW(parent_hwnd, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION); - switch (ret) - { - case IDYES: ret = GTK_RESPONSE_YES; break; - case IDNO: ret = GTK_RESPONSE_NO; break; - case IDCANCEL: ret = GTK_RESPONSE_CANCEL; break; - } - - return ret; -} - - /* Just a simple wrapper function to open a browser window */ void win32_open_browser(const gchar *uri) { Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/src/win32.h 2011-10-03 14:35:11 UTC (rev 5987) @@ -40,8 +40,6 @@ gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg); -gint win32_message_dialog_unsaved(const gchar *msg); - void win32_open_browser(const gchar *uri); gchar *win32_show_project_open_dialog(GtkWidget *parent, const gchar *title, Modified: trunk/tagmanager/lregex.c =================================================================== --- trunk/tagmanager/lregex.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/tagmanager/lregex.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -28,11 +28,6 @@ # ifdef HAVE_SYS_TYPES_H # include <sys/types.h> /* declare off_t (not known to regex.h on FreeBSD) */ # endif -# ifdef HAVE_REGEX_H -# include <regex.h> -# else -# include "gnuregex.h" -# endif #endif #include "main.h" @@ -70,7 +65,7 @@ enum pType { PTRN_TAG, PTRN_CALLBACK }; typedef struct { - regex_t *pattern; + GRegex *pattern; enum pType type; union { struct { @@ -113,10 +108,7 @@ for (i = 0 ; i < set->count ; ++i) { regexPattern *p = &set->patterns [i]; -#if defined (POSIX_REGEX) - regfree (p->pattern); -#endif - eFree (p->pattern); + g_regex_unref(p->pattern); p->pattern = NULL; if (p->type == PTRN_TAG) @@ -255,7 +247,7 @@ } static void addCompiledTagPattern ( - const langType language, regex_t* const pattern, + const langType language, GRegex* const pattern, char* const name, const char kind, char* const kindName, char *const description) { @@ -287,7 +279,7 @@ } static void addCompiledCallbackPattern ( - const langType language, regex_t* const pattern, + const langType language, GRegex* const pattern, const regexCallback callback) { patternSet* set; @@ -315,32 +307,27 @@ #if defined (POSIX_REGEX) -static regex_t* compileRegex (const char* const regexp, const char* const flags) +static GRegex* compileRegex (const char* const regexp, const char* const flags) { - int cflags = REG_EXTENDED | REG_NEWLINE; - regex_t *result = NULL; - int errcode; + int cflags = G_REGEX_MULTILINE; + GRegex *result = NULL; + GError *error = NULL; int i; for (i = 0 ; flags != NULL && flags [i] != '\0' ; ++i) { switch ((int) flags [i]) { - case 'b': cflags &= ~REG_EXTENDED; break; - case 'e': cflags |= REG_EXTENDED; break; - case 'i': cflags |= REG_ICASE; break; + case 'b': g_warning("CTags 'b' flag not supported by Geany!"); break; + case 'e': break; + case 'i': cflags |= G_REGEX_CASELESS; break; default: printf ("regex: unknown regex flag: '%c'\n", *flags); break; } } - result = xMalloc (1, regex_t); - errcode = regcomp (result, regexp, cflags); - if (errcode != 0) + result = g_regex_new(regexp, cflags, 0, &error); + if (error) { - char errmsg[256]; - regerror (errcode, result, errmsg, 256); - printf ("regex: regcomp %s: %s\n", regexp, errmsg); - regfree (result); - eFree (result); - result = NULL; + printf ("regex: regcomp %s: %s\n", regexp, error->message); + g_error_free(error); } return result; } @@ -433,7 +420,7 @@ static vString* substitute ( const char* const in, const char* out, - const int nmatch, const regmatch_t* const pmatch) + const int nmatch, const GMatchInfo* const minfo) { vString* result = vStringNew (); const char* p; @@ -442,10 +429,12 @@ if (*p == '\\' && isdigit ((int) *++p)) { const int dig = *p - '0'; - if (0 < dig && dig < nmatch && pmatch [dig].rm_so != -1) + int so, eo; + if (0 < dig && dig < nmatch && + g_match_info_fetch_pos(minfo, dig, &so, &eo) && so != -1) { - const int diglen = pmatch [dig].rm_eo - pmatch [dig].rm_so; - vStringNCatS (result, in + pmatch [dig].rm_so, diglen); + const int diglen = eo - so; + vStringNCatS (result, in + so, diglen); } } else if (*p != '\n' && *p != '\r') @@ -457,10 +446,10 @@ static void matchTagPattern (const vString* const line, const regexPattern* const patbuf, - const regmatch_t* const pmatch) + const GMatchInfo* const minfo) { vString *const name = substitute (vStringValue (line), - patbuf->u.tag.name_pattern, BACK_REFERENCE_COUNT, pmatch); + patbuf->u.tag.name_pattern, BACK_REFERENCE_COUNT, minfo); vStringStripLeading (name); vStringStripTrailing (name); if (vStringLength (name) > 0) @@ -474,15 +463,18 @@ static void matchCallbackPattern ( const vString* const line, const regexPattern* const patbuf, - const regmatch_t* const pmatch) + const GMatchInfo* const minfo) { regexMatch matches [BACK_REFERENCE_COUNT]; unsigned int count = 0; int i; - for (i = 0 ; i < BACK_REFERENCE_COUNT && pmatch [i].rm_so != -1 ; ++i) + for (i = 0 ; i < BACK_REFERENCE_COUNT ; ++i) { - matches [i].start = pmatch [i].rm_so; - matches [i].length = pmatch [i].rm_eo - pmatch [i].rm_so; + int so, eo; + if (!g_match_info_fetch_pos(minfo, i, &so, &eo) || so == -1) + break; + matches [i].start = so; + matches [i].length = eo - so; ++count; } patbuf->u.callback.function (vStringValue (line), matches, count); @@ -492,22 +484,21 @@ const regexPattern* const patbuf) { boolean result = FALSE; - regmatch_t pmatch [BACK_REFERENCE_COUNT]; - const int match = regexec (patbuf->pattern, vStringValue (line), - BACK_REFERENCE_COUNT, pmatch, 0); - if (match == 0) + GMatchInfo *minfo; + if (g_regex_match(patbuf->pattern, vStringValue(line), 0, &minfo)) { result = TRUE; if (patbuf->type == PTRN_TAG) - matchTagPattern (line, patbuf, pmatch); + matchTagPattern (line, patbuf, minfo); else if (patbuf->type == PTRN_CALLBACK) - matchCallbackPattern (line, patbuf, pmatch); + matchCallbackPattern (line, patbuf, minfo); else { Assert ("invalid pattern type" == NULL); result = FALSE; } } + g_match_info_free(minfo); return result; } @@ -554,7 +545,7 @@ Assert (name != NULL); if (! regexBroken) { - regex_t* const cp = compileRegex (regex, flags); + GRegex* const cp = compileRegex (regex, flags); if (cp != NULL) { char kind; @@ -578,7 +569,7 @@ Assert (regex != NULL); if (! regexBroken) { - regex_t* const cp = compileRegex (regex, flags); + GRegex* const cp = compileRegex (regex, flags); if (cp != NULL) addCompiledCallbackPattern (language, cp, callback); } @@ -695,7 +686,7 @@ /* Check for broken regcomp() on Cygwin */ extern void checkRegex (void) { -#if defined (HAVE_REGEX) && defined (CHECK_REGCOMP) +#if 0 && defined (HAVE_REGEX) && defined (CHECK_REGCOMP) regex_t patbuf; int errcode; if (regcomp (&patbuf, "/hello/", 0) != 0) Modified: trunk/tagmanager/php.c =================================================================== --- trunk/tagmanager/php.c 2011-10-03 14:14:33 UTC (rev 5986) +++ trunk/tagmanager/php.c 2011-10-03 14:35:11 UTC (rev 5987) @@ -79,10 +79,14 @@ "\\1", "m,macro,macros", NULL); addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", "\\1", "m,macro,macros", NULL); - /* Note: Using [] to match words is wrong, but using () doesn't seem to match 'function' on its own */ addCallbackRegex(language, - "^[ \t]*[(public|protected|private|static|final)[ \t]*]*[ \t]*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\$.*\$)", + "^[ \t]*((public|protected|private|static|final)[ \t]+)+function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\$.*\$)", NULL, function_cb); + /* note: using (qualifiers)* instead of (qualifiers)+ in the above regex doesn't seem to + * match 'function' on its own, so we handle that separately: */ + addCallbackRegex(language, + "^[ \t]*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\$.*\$)", + NULL, function_cb); addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", "\\2", "v,variable,variables", NULL); addTagRegex(language, "^[ \t]*((var|public|protected|private|static)[ \t]+)+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", 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 October 2011