Commits December 2006

commits@lists.geany.org

3 participants
113 discussions

SF.net SVN: geany: [1151] trunk
by eht16＠users.sourceforge.net 31 Dec '06

31 Dec '06

Revision: 1151 http://svn.sourceforge.net/geany/?rev=1151&view=rev Author: eht16 Date: 2006-12-31 07:47:37 -0800 (Sun, 31 Dec 2006) Log Message: ----------- When opening a file, set the current selected entry in the open files list to the file's filename. Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-30 16:18:15 UTC (rev 1150) +++ trunk/ChangeLog 2006-12-31 15:47:37 UTC (rev 1151) @@ -1,3 +1,9 @@ +2006-12-31 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/treeviews.c: When opening a file, set the current selected + entry in the open files list to the file's filename. + + 2006-12-30 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/ui_utils.c: Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2006-12-30 16:18:15 UTC (rev 1150) +++ trunk/src/treeviews.c 2006-12-31 15:47:37 UTC (rev 1151) @@ -332,6 +332,10 @@ gtk_list_store_append(tv.store_openfiles, iter); treeviews_openfiles_update(idx); + + // select opened file + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); + gtk_tree_selection_select_iter(sel, iter); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1150] trunk/THANKS
by ntrel＠users.sourceforge.net 30 Dec '06

30 Dec '06

Revision: 1150 http://svn.sourceforge.net/geany/?rev=1150&view=rev Author: ntrel Date: 2006-12-30 08:18:15 -0800 (Sat, 30 Dec 2006) Log Message: ----------- Update Modified Paths: -------------- trunk/THANKS Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2006-12-30 16:16:59 UTC (rev 1149) +++ trunk/THANKS 2006-12-30 16:18:15 UTC (rev 1150) @@ -20,6 +20,7 @@ Stefan Oltmanns <stefan(dot)oltmanns(at)abi2006(dot)gymnasium-achim(dot)de> - escape sequences patch Bob Doan <bdoan(at)sicom(dot)com> - some patches Rob van der Linde <robvdl(at)paradise(dot)net(dot)nz> - fixed wrong vte height on some systems +Josef Whiter <josef(at)toxicpanda(dot)com> - parse 'Entering directory' build messages. Translators: ---------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1149] trunk
by ntrel＠users.sourceforge.net 30 Dec '06

30 Dec '06

Revision: 1149 http://svn.sourceforge.net/geany/?rev=1149&view=rev Author: ntrel Date: 2006-12-30 08:16:59 -0800 (Sat, 30 Dec 2006) Log Message: ----------- Applied patch from Josef Whiter to parse 'Entering directory' build messages so that subsequent error messages are handled correctly (thanks). Assume gcc-style error messages when filetype is not set. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/msgwindow.c trunk/src/msgwindow.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-30 11:49:47 UTC (rev 1148) +++ trunk/ChangeLog 2006-12-30 16:16:59 UTC (rev 1149) @@ -3,6 +3,11 @@ * src/ui_utils.c: Don't use gtk_rc_get_style() in ui_update_tab_status() because it can cause an invalid memory read on some systems. + * src/build.c, src/build.h, src/msgwindow.c, src/msgwindow.h: + Applied patch from Josef Whiter to parse 'Entering directory' build + messages so that subsequent error messages are handled correctly + (thanks). + Assume gcc-style error messages when filetype is not set. 2006-12-26 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-12-30 11:49:47 UTC (rev 1148) +++ trunk/src/build.c 2006-12-30 16:16:59 UTC (rev 1149) @@ -685,7 +685,7 @@ if (cond & (G_IO_IN | G_IO_PRI)) { //GIOStatus s; - gchar *msg; + gchar *msg, *dir = NULL; while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { @@ -694,11 +694,18 @@ color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; g_strstrip(msg); + if (strstr(msg, "Entering directory") != NULL) { + if (dir != NULL) + g_free(dir); + build_parse_make_dir(msg, &dir); + } + if (app->pref_editor_use_indicators) { gchar *filename; gint line; - msgwin_parse_compiler_error_line(msg, &filename, &line); + + msgwin_parse_compiler_error_line(msg, dir, &filename, &line); if (line != -1 && filename != NULL) { gint idx = document_find_by_filename(filename, FALSE); @@ -711,6 +718,9 @@ g_free(msg); } + + if (dir != NULL) + g_free(dir); } if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) return FALSE; @@ -719,6 +729,43 @@ } +gboolean build_parse_make_dir(gchar *string, gchar **prefix) +{ + gchar *pos, *input; + + *prefix = NULL; + + input = g_strdup(string); + if (input == NULL) + return FALSE; + + if ((pos = strstr(input, "Entering directory")) != NULL) + { + gsize len = strlen(input); + + //get the start of the path + pos = strstr(input, "/"); + + if (pos == NULL) { + g_free(input); + return FALSE; + } + + //kill the ' at the end of the path + input[len-1] = '\0'; + + //duplicate + *prefix = g_strdup(pos); + + g_free(input); + return TRUE; + } + + g_free(input); + return FALSE; +} + + #ifndef G_OS_WIN32 static void show_build_result_message(gboolean failure) { Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2006-12-30 11:49:47 UTC (rev 1148) +++ trunk/src/build.h 2006-12-30 16:16:59 UTC (rev 1149) @@ -74,6 +74,8 @@ GPid build_run_cmd(gint idx); +gboolean build_parse_make_dir(gchar *string, gchar **prefix); + void build_menu_update(gint idx); BuildMenuItems *build_get_menu_items(gint filetype_id); @@ -106,4 +108,5 @@ void on_build_next_error (GtkMenuItem *menuitem, gpointer user_data); + #endif Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-12-30 11:49:47 UTC (rev 1148) +++ trunk/src/msgwindow.c 2006-12-30 16:16:59 UTC (rev 1149) @@ -416,6 +416,32 @@ } +/* look back up from the current path and find the directory we came from */ +static gboolean +find_prev_build_dir(GtkTreePath *cur, GtkTreeModel *model, gchar **prefix) +{ + GtkTreeIter iter; + *prefix = NULL; + + while (gtk_tree_path_prev(cur)) + { + if (gtk_tree_model_get_iter(model, &iter, cur)) + { + gchar *string; + gtk_tree_model_get(model, &iter, 1, &string, -1); + if (string != NULL && build_parse_make_dir(string, prefix)) + { + g_free(string); + return TRUE; + } + g_free(string); + } + } + + return FALSE; +} + + gboolean msgwin_goto_compiler_file_line() { GtkTreeIter iter; @@ -442,8 +468,17 @@ { gint line; gint idx; - gchar *filename; - msgwin_parse_compiler_error_line(string, &filename, &line); + gchar *filename, *dir; + GtkTreePath *path; + + path = gtk_tree_model_get_path(model, &iter); + find_prev_build_dir(path, model, &dir); + gtk_tree_path_free(path); + msgwin_parse_compiler_error_line(string, dir, &filename, &line); + + if (dir != NULL) + g_free(dir); + if (filename != NULL && line > -1) { gchar *utf8_filename = utils_get_utf8_from_locale(filename); @@ -533,22 +568,21 @@ * relevant file with the error in *filename. * *line will be -1 if no error was found in string. * *filename must be freed unless it is NULL. */ -void msgwin_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line) +void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line) { ParseData data = {string, build_info.dir, NULL, 0, 0, 0}; *filename = NULL; *line = -1; - g_return_if_fail(build_info.dir != NULL); + if (dir != NULL) + data.dir = dir; + + g_return_if_fail(build_info.dir != NULL || dir != NULL); if (string == NULL) return; switch (build_info.file_type_id) { - case GEANY_FILETYPES_ALL: - { - return; - } case GEANY_FILETYPES_PHP: { // Parse error: parse error, unexpected T_CASE in brace_bug.php on line 3 @@ -668,6 +702,7 @@ case GEANY_FILETYPES_LATEX: // ./kommtechnik_2b.tex:18: Emergency stop. case GEANY_FILETYPES_MAKE: // Assume makefile is building with gcc + case GEANY_FILETYPES_ALL: default: // The default is a GNU gcc type error { // don't accidently find libtool versions x:y:x and think it is a file name Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-12-30 11:49:47 UTC (rev 1148) +++ trunk/src/msgwindow.h 2006-12-30 16:16:59 UTC (rev 1149) @@ -79,7 +79,7 @@ gboolean msgwin_goto_compiler_file_line(); -void msgwin_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line); +void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line); gboolean msgwin_goto_messages_file_line(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1148] trunk
by ntrel＠users.sourceforge.net 30 Dec '06

30 Dec '06

Revision: 1148 http://svn.sourceforge.net/geany/?rev=1148&view=rev Author: ntrel Date: 2006-12-30 03:49:47 -0800 (Sat, 30 Dec 2006) Log Message: ----------- Don't use gtk_rc_get_style() in ui_update_tab_status() because it can cause an invalid memory read on some systems. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-26 15:49:35 UTC (rev 1147) +++ trunk/ChangeLog 2006-12-30 11:49:47 UTC (rev 1148) @@ -1,3 +1,10 @@ +2006-12-30 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/ui_utils.c: + Don't use gtk_rc_get_style() in ui_update_tab_status() because it + can cause an invalid memory read on some systems. + + 2006-12-26 Nick Treleaven <nick.treleaven(a)btinternet.com> * tagmanager/tm_tag.c, tagmanager/include/tm_tag.h: Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-12-26 15:49:35 UTC (rev 1147) +++ trunk/src/ui_utils.c 2006-12-30 11:49:47 UTC (rev 1148) @@ -1179,16 +1179,11 @@ void ui_update_tab_status(gint idx) { GdkColor *color = document_get_status(idx); - static GtkStyle *style = NULL; - if (style == NULL) // use and store default foreground colour - style = gtk_rc_get_style(doc_list[idx].tab_label); + // NULL color will reset to default + gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_NORMAL, color); + gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_ACTIVE, color); - gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_NORMAL, - color ? color : &(style->fg[GTK_STATE_NORMAL])); - gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_ACTIVE, - color ? color : &(style->fg[GTK_STATE_ACTIVE])); - treeviews_openfiles_update(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: [1147] trunk
by ntrel＠users.sourceforge.net 26 Dec '06

26 Dec '06

Revision: 1147 http://svn.sourceforge.net/geany/?rev=1147&view=rev Author: ntrel Date: 2006-12-26 07:49:35 -0800 (Tue, 26 Dec 2006) Log Message: ----------- Add calltip support for D constructors. Add tm_workspace_find_scoped() (adapted from Anjuta 2.02 tm_workspace_find()). Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-26 15:43:50 UTC (rev 1146) +++ trunk/ChangeLog 2006-12-26 15:49:35 UTC (rev 1147) @@ -2,6 +2,11 @@ * tagmanager/tm_tag.c, tagmanager/include/tm_tag.h: Fix missed matches in tm_tags_find(). + * src/sci_cb.c, tagmanager/tm_workspace.c, + tagmanager/include/tm_workspace.h: + Add calltip support for D constructors. + Add tm_workspace_find_scoped() (adapted from Anjuta 2.02 + tm_workspace_find()). 2006-12-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-12-26 15:43:50 UTC (rev 1146) +++ trunk/src/sci_cb.c 2006-12-26 15:49:35 UTC (rev 1147) @@ -544,17 +544,35 @@ g_return_val_if_fail(ft && word && *word, NULL); tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, ft->lang); - if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) + + if (tags->len == 0) + return NULL; + + tag = TM_TAG(tags->pdata[0]); + if (tag->atts.entry.arglist) { - tag = TM_TAG(tags->pdata[0]); if (tag->atts.entry.var_type) return g_strconcat(tag->atts.entry.var_type, " ", tag->name, " ", tag->atts.entry.arglist, NULL); else return g_strconcat(tag->name, " ", tag->atts.entry.arglist, NULL); } - else - return NULL; + else if (tag->type == tm_tag_class_t && FILETYPE_ID(ft) == GEANY_FILETYPES_D) + { + TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; + + // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() + tags = tm_workspace_find_scoped("this", tag->name, tm_tag_function_t | tm_tag_prototype_t, + attrs, FALSE, ft->lang, TRUE); + if (tags->len != 0) + { + tag = TM_TAG(tags->pdata[0]); + if (tag->atts.entry.arglist) + return g_strconcat(tag->atts.entry.scope, ".this ", + tag->atts.entry.arglist, NULL); + } + } + return NULL; } Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2006-12-26 15:43:50 UTC (rev 1146) +++ trunk/tagmanager/include/tm_workspace.h 2006-12-26 15:49:35 UTC (rev 1147) @@ -138,6 +138,20 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs , gboolean partial, langType lang); +/*! Returns all matching tags found in the workspace. + \param name The name of the tag to find. + \param scope The scope name of the tag to find, or NULL. + \param type The tag types to return (TMTagType). Can be a bitmask. + \param attrs The attributes to sort and dedup on (0 terminated integer array). + \param partial Whether partial match is allowed. + \param lang Specifies the language(see the table in parsers.h) of the tags to be found, + -1 for all + \return Array of matching tags. Do not free() it since it is a static member. +*/ +const GPtrArray * +tm_workspace_find_scoped (const char *name, const char *scope, gint type, + TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); + /*! Returns TMTag to function which "own" given line \param line Current line in edited file. \param file_tags A GPtrArray of edited file TMTag pointers. Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2006-12-26 15:43:50 UTC (rev 1146) +++ trunk/tagmanager/tm_workspace.c 2006-12-26 15:49:35 UTC (rev 1147) @@ -526,6 +526,70 @@ } +/* scope can be NULL. + * lang can be -1 */ +static int +fill_find_tags_array (GPtrArray * dst, const GPtrArray * src, + const char *name, const char *scope, int type, gboolean partial, + gint lang, gboolean first) +{ + TMTag **match; + int tagIter, count; + + if ((!src) || (!dst) || (!name) || (!*name)) + return 0; + + match = tm_tags_find (src, name, partial, &count); + if (count && match && *match) + { + for (tagIter = 0; tagIter < count; ++tagIter) + { + if (! scope || (match[tagIter]->atts.entry.scope && + 0 == strcmp(match[tagIter]->atts.entry.scope, scope))) + { + if ((lang == -1 || lang == match[tagIter]->atts.entry.file->lang) && + type & match[tagIter]->type) + { + g_ptr_array_add (dst, match[tagIter]); + if (first) + break; + } + } + } + } + return dst->len; +} + + +// adapted from tm_workspace_find, Anjuta 2.02 +const GPtrArray * +tm_workspace_find_scoped (const char *name, const char *scope, gint type, + TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search) +{ + static GPtrArray *tags = NULL; + + if ((!theWorkspace)) + return NULL; + + if (tags) + g_ptr_array_set_size (tags, 0); + else + tags = g_ptr_array_new (); + + fill_find_tags_array (tags, theWorkspace->work_object.tags_array, + name, scope, type, partial, lang, TRUE); + if (global_search) + { + // for a scoped tag, I think we always want the same language + fill_find_tags_array (tags, theWorkspace->global_tags, + name, scope, type, partial, lang, TRUE); + } + if (attrs) + tm_tags_sort (tags, attrs, TRUE); + return tags; +} + + const TMTag * tm_get_current_function (GPtrArray * file_tags, const gulong line) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1146] trunk
by ntrel＠users.sourceforge.net 26 Dec '06

26 Dec '06

Revision: 1146 http://svn.sourceforge.net/geany/?rev=1146&view=rev Author: ntrel Date: 2006-12-26 07:43:50 -0800 (Tue, 26 Dec 2006) Log Message: ----------- Fix missed matches in tm_tags_find(). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/include/tm_tag.h trunk/tagmanager/tm_tag.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-24 12:32:52 UTC (rev 1145) +++ trunk/ChangeLog 2006-12-26 15:43:50 UTC (rev 1146) @@ -1,3 +1,9 @@ +2006-12-26 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * tagmanager/tm_tag.c, tagmanager/include/tm_tag.h: + Fix missed matches in tm_tags_find(). + + 2006-12-24 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c, src/sci_cb.c: Modified: trunk/tagmanager/include/tm_tag.h =================================================================== --- trunk/tagmanager/include/tm_tag.h 2006-12-24 12:32:52 UTC (rev 1145) +++ trunk/tagmanager/include/tm_tag.h 2006-12-26 15:43:50 UTC (rev 1146) @@ -281,7 +281,8 @@ \param name Name of the tag to locate. \param partial If TRUE, matches the first part of the name instead of doing exact match. */ -TMTag **tm_tags_find(GPtrArray *sorted_tags_array, const char *name, gboolean partial, int * tagCount); +TMTag **tm_tags_find(const GPtrArray *sorted_tags_array, const char *name, + gboolean partial, int * tagCount); /*! Completely frees an array of tags. Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2006-12-24 12:32:52 UTC (rev 1145) +++ trunk/tagmanager/tm_tag.c 2006-12-26 15:43:50 UTC (rev 1146) @@ -562,7 +562,8 @@ } } -TMTag **tm_tags_find(GPtrArray *sorted_tags_array, const char *name, gboolean partial, int * tagCount) +TMTag **tm_tags_find(const GPtrArray *sorted_tags_array, const char *name, + gboolean partial, int * tagCount) { static TMTag *tag = NULL; TMTag **result; @@ -578,15 +579,30 @@ s_partial = partial; result = (TMTag **) bsearch(&tag, sorted_tags_array->pdata, sorted_tags_array->len , sizeof(gpointer), tm_tag_compare); + // there can be matches on both sides of result if (result) { - for (; result >= (TMTag **) sorted_tags_array->pdata; -- result) { + TMTag **last = (TMTag **) &sorted_tags_array->pdata[sorted_tags_array->len - 1]; + TMTag **adv; + + // First look for any matches after result + adv = result; + adv++; + for (; *adv && adv <= last; ++ adv) + { + if (0 != tm_tag_compare(&tag, adv)) + break; + ++tagMatches; + } + // Now look for matches from result and below + for (; result >= (TMTag **) sorted_tags_array->pdata; -- result) + { if (0 != tm_tag_compare(&tag, (TMTag **) result)) break; ++tagMatches; } *tagCount=tagMatches; - ++ result; + ++ result; // correct address for the last successful match } s_partial = FALSE; return (TMTag **) 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: [1145] trunk
by ntrel＠users.sourceforge.net 24 Dec '06

24 Dec '06

Revision: 1145 http://svn.sourceforge.net/geany/?rev=1145&view=rev Author: ntrel Date: 2006-12-24 04:32:52 -0800 (Sun, 24 Dec 2006) Log Message: ----------- Improve accuracy of sci_scroll_to_line() when line wrapping and/or folding is used. Modified Paths: -------------- trunk/ChangeLog trunk/src/sciwrappers.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-24 12:07:35 UTC (rev 1144) +++ trunk/ChangeLog 2006-12-24 12:32:52 UTC (rev 1145) @@ -3,6 +3,9 @@ * src/utils.c, src/sci_cb.c: Only call SCI_BRACEMATCH once in sci_cb_highlight_braces(). Separate find_calltip() from sci_cb_show_calltip(). + * src/sciwrappers.c: + Improve accuracy of sci_scroll_to_line() when line wrapping and/or + folding is used. 2006-12-22 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-12-24 12:07:35 UTC (rev 1144) +++ trunk/src/sciwrappers.c 2006-12-24 12:32:52 UTC (rev 1145) @@ -678,17 +678,19 @@ { gint vis1, los, delta; - if (GTK_WIDGET(sci)->allocation.height <= 1) return; // prevent gdk_window_scroll warning + if (GTK_WIDGET(sci)->allocation.height <= 1) return; // try to prevent gdk_window_scroll warning if (line == -1) line = sci_get_current_line(sci, -1); - // sci 'visible line' != file line number + // sci 'visible line' != doc line number because of folding and line wrapping + /* calling SCI_VISIBLEFROMDOCLINE for line is more accurate than calling + * SCI_DOCLINEFROMVISIBLE for vis1. */ + line = SSM(sci, SCI_VISIBLEFROMDOCLINE, line, 0); vis1 = SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0); - vis1 = SSM(sci, SCI_DOCLINEFROMVISIBLE, vis1, 0); los = SSM(sci, SCI_LINESONSCREEN, 0, 0); delta = (line - vis1) - los * percent_of_view; sci_scroll_lines(sci, delta); - sci_scroll_caret(sci); //ensure visible, in case of excessive folding/wrapping + sci_scroll_caret(sci); // ensure visible (maybe not needed now) } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1144] trunk
by ntrel＠users.sourceforge.net 24 Dec '06

24 Dec '06

Revision: 1144 http://svn.sourceforge.net/geany/?rev=1144&view=rev Author: ntrel Date: 2006-12-24 04:07:35 -0800 (Sun, 24 Dec 2006) Log Message: ----------- Only call SCI_BRACEMATCH once in sci_cb_highlight_braces(). Separate find_calltip() from sci_cb_show_calltip(). Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-22 15:59:01 UTC (rev 1143) +++ trunk/ChangeLog 2006-12-24 12:07:35 UTC (rev 1144) @@ -1,3 +1,10 @@ +2006-12-24 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c, src/sci_cb.c: + Only call SCI_BRACEMATCH once in sci_cb_highlight_braces(). + Separate find_calltip() from sci_cb_show_calltip(). + + 2006-12-22 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-12-22 15:59:01 UTC (rev 1143) +++ trunk/src/sci_cb.c 2006-12-24 12:07:35 UTC (rev 1144) @@ -536,14 +536,35 @@ } +static gchar *find_calltip(const gchar *word, filetype *ft) +{ + TMTag *tag; + const GPtrArray *tags; + + g_return_val_if_fail(ft && word && *word, NULL); + + tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, ft->lang); + if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) + { + tag = TM_TAG(tags->pdata[0]); + if (tag->atts.entry.var_type) + return g_strconcat(tag->atts.entry.var_type, " ", tag->name, + " ", tag->atts.entry.arglist, NULL); + else + return g_strconcat(tag->name, " ", tag->atts.entry.arglist, NULL); + } + else + return NULL; +} + + gboolean sci_cb_show_calltip(gint idx, gint pos) { gint orig_pos = pos; // the position for the calltip gint lexer; gint style; gchar word[GEANY_MAX_WORD_LENGTH]; - TMTag *tag; - const GPtrArray *tags; + gchar *str; ScintillaObject *sci; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; @@ -573,23 +594,17 @@ sci_cb_find_current_word(sci, pos - 1, word, sizeof word); if (word[0] == '\0') return FALSE; - tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang); - if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) + str = find_calltip(word, doc_list[idx].file_type); + if (str) { - tag = TM_TAG(tags->pdata[0]); g_free(calltip.text); // free the old calltip + calltip.text = str; calltip.set = TRUE; - if (tag->atts.entry.var_type) - calltip.text = g_strconcat(tag->atts.entry.var_type, " ", tag->name, - " ", tag->atts.entry.arglist, NULL); - else - calltip.text = g_strconcat(tag->name, " ", tag->atts.entry.arglist, NULL); - utils_wrap_string(calltip.text, -1); SSM(sci, SCI_CALLTIPSHOW, orig_pos, (sptr_t) calltip.text); + return TRUE; } - - return TRUE; + return FALSE; } @@ -1627,48 +1642,24 @@ void sci_cb_highlight_braces(ScintillaObject *sci, gint cur_pos) { -#if 0 - // is it useful (or performant) to check for lexer and style, only to prevent brace highlighting in comments - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); - gint style = SSM(sci, SCI_GETSTYLEAT, cur_pos - 2, 0); + gint brace_pos = cur_pos - 1; + gint end_pos; - if (lexer == SCLEX_CPP && ( - style == SCE_C_COMMENT || - style == SCE_C_COMMENTLINE || - style == SCE_C_COMMENTDOC || - style == SCE_C_COMMENTLINEDOC || - style == SCE_C_STRING || - style == SCE_C_PREPROCESSOR)) return; - if (lexer == SCLEX_HTML && (style == SCE_HPHP_COMMENT || - style == SCE_H_COMMENT || - style == SCE_H_SGML_COMMENT || - style == SCE_H_XCCOMMENT)) return; - if (lexer == SCLEX_PASCAL && ( - style == SCE_C_COMMENT || - style == SCE_C_COMMENTLINE || - style == SCE_C_COMMENTDOC || - style == SCE_C_COMMENTLINEDOC)) return; -#endif - if (utils_isbrace(sci_get_char_at(sci, cur_pos)) || utils_isbrace(sci_get_char_at(sci, cur_pos - 1))) + if (! utils_isbrace(sci_get_char_at(sci, brace_pos))) { - gint end_pos = SSM(sci, SCI_BRACEMATCH, cur_pos, 0); - gint end_pos_prev = SSM(sci, SCI_BRACEMATCH, (cur_pos - 1), 0); - if (end_pos >= 0) - SSM(sci, SCI_BRACEHIGHLIGHT, cur_pos, end_pos); - else if (end_pos_prev >= 0) - SSM(sci, SCI_BRACEHIGHLIGHT, (cur_pos - 1), end_pos_prev); - else + brace_pos++; + if (! utils_isbrace(sci_get_char_at(sci, brace_pos))) { - if (utils_isbrace(sci_get_char_at(sci, cur_pos))) - SSM(sci, SCI_BRACEBADLIGHT, cur_pos, 0); - if (utils_isbrace(sci_get_char_at(sci, cur_pos - 1))) - SSM(sci, SCI_BRACEBADLIGHT, cur_pos - 1, 0); + SSM(sci, SCI_BRACEBADLIGHT, -1, 0); + return; } } + end_pos = SSM(sci, SCI_BRACEMATCH, brace_pos, 0); + + if (end_pos >= 0) + SSM(sci, SCI_BRACEHIGHLIGHT, brace_pos, end_pos); else - { - SSM(sci, SCI_BRACEBADLIGHT, -1, 0); - } + SSM(sci, SCI_BRACEBADLIGHT, brace_pos, 0); } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-12-22 15:59:01 UTC (rev 1143) +++ trunk/src/utils.c 2006-12-24 12:07:35 UTC (rev 1144) @@ -141,18 +141,13 @@ gboolean utils_isbrace(gchar c) { - // match < and > only if desired, because I don't like it, but some people do - if (app->brace_match_ltgt) - { - switch (c) - { - case '<': - case '>': return TRUE; - } - } - switch (c) { + // match < and > only if desired, because I don't like it, but some people do + case '<': + case '>': + return app->brace_match_ltgt; + case '(': case ')': case '{': @@ -168,17 +163,12 @@ gboolean utils_is_opening_brace(gchar c) { - // match < only if desired, because I don't like it, but some people do - if (app->brace_match_ltgt) - { - switch (c) - { - case '<': return TRUE; - } - } - switch (c) { + // match < only if desired, because I don't like it, but some people do + case '<': + return app->brace_match_ltgt; + case '(': case '{': case '[': return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1143] trunk
by ntrel＠users.sourceforge.net 22 Dec '06

22 Dec '06

Revision: 1143 http://svn.sourceforge.net/geany/?rev=1143&view=rev Author: ntrel Date: 2006-12-22 07:59:01 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Don't reparse the current function when fold level is higher than the function fold level (when the line has only changed by 1). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-21 22:21:09 UTC (rev 1142) +++ trunk/ChangeLog 2006-12-22 15:59:01 UTC (rev 1143) @@ -1,3 +1,10 @@ +2006-12-22 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c: + Don't reparse the current function when fold level is higher than + the function fold level (when the line has only changed by 1). + + 2006-12-21 Enrico Tröger <enrico.troeger(a)uvena.de> * doc/geany.1.in, doc/Makefile.am, doc/geany.docbook, doc/images/*, Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-12-21 22:21:09 UTC (rev 1142) +++ trunk/src/utils.c 2006-12-22 15:59:01 UTC (rev 1143) @@ -371,12 +371,24 @@ } +/* This could perhaps be improved to check for #if, class etc. */ +static gint get_function_fold_number(gint idx) +{ + // for Java the functions are always one fold level above the class scope + if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_JAVA) + return SC_FOLDLEVELBASE + 1; + else + return SC_FOLDLEVELBASE; +} + + /* Should be used only with utils_get_current_function. */ static gboolean current_function_changed(gint cur_idx, gint cur_line, gint fold_level) { static gint old_line = -2; static gint old_idx = -1; - static gint old_fold_level = -1; + static gint old_fold_num = -1; + const gint fold_num = fold_level & SC_FOLDLEVELNUMBERMASK; gboolean ret; // check if the cached line and file index have changed since last time: @@ -387,18 +399,26 @@ ret = FALSE; else { - // if the line has only changed by 1 and fold_level is the same, return unchanged. + // if the line has only changed by 1 if (abs(cur_line - old_line) == 1) { - ret = (fold_level != old_fold_level); + const gint fn_fold = + get_function_fold_number(cur_idx); + /* It's the same function if the fold number hasn't changed, or both the new + * and old fold numbers are above the function fold number. */ + gboolean same = + fold_num == old_fold_num || + (old_fold_num > fn_fold && fold_num > fn_fold); + + ret = ! same; } else ret = TRUE; } - //record current line and file index for next time + // record current line and file index for next time old_line = cur_line; old_idx = cur_idx; - old_fold_level = fold_level; + old_fold_num = fold_num; return ret; } @@ -527,9 +547,7 @@ if (doc_list[idx].file_type != NULL && doc_list[idx].file_type->id != GEANY_FILETYPES_ALL) { - // for Java the functions are one fold level above the class scope - gint top_fold_level = (doc_list[idx].file_type->id == GEANY_FILETYPES_JAVA) ? - SC_FOLDLEVELBASE + 1 : SC_FOLDLEVELBASE; + const gint fn_fold = get_function_fold_number(idx); tag_line = line; do // find the top level fold point @@ -537,7 +555,7 @@ tag_line = sci_get_fold_parent(doc_list[idx].sci, tag_line); fold_level = sci_get_fold_level(doc_list[idx].sci, tag_line); } while (tag_line >= 0 && - (fold_level & SC_FOLDLEVELNUMBERMASK) != top_fold_level); + (fold_level & SC_FOLDLEVELNUMBERMASK) != fn_fold); if (tag_line >= 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1142] trunk
by eht16＠users.sourceforge.net 21 Dec '06

21 Dec '06

Revision: 1142 http://svn.sourceforge.net/geany/?rev=1142&view=rev Author: eht16 Date: 2006-12-21 14:21:09 -0800 (Thu, 21 Dec 2006) Log Message: ----------- Version bump and updated codename for the next release. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/geany_private.rc trunk/src/geany.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-21 22:15:34 UTC (rev 1141) +++ trunk/ChangeLog 2006-12-21 22:21:09 UTC (rev 1142) @@ -8,6 +8,9 @@ * src/callbacks.c: Fixed wrong paste behaviour under Windows with some applications. * src/ui_utils.c: Start column count from 0 in the statusbar display. + * New release: Geany 0.10 "Sander". + * configure.in, src/geany.h, geany_private.rc: + Version bump and updated codename for the next release. 2006-12-20 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-12-21 22:15:34 UTC (rev 1141) +++ trunk/configure.in 2006-12-21 22:21:09 UTC (rev 1142) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.in) -AM_INIT_AUTOMAKE(geany, 0.10) +AM_INIT_AUTOMAKE(geany, 0.11) AM_CONFIG_HEADER(config.h) Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2006-12-21 22:15:34 UTC (rev 1141) +++ trunk/geany_private.rc 2006-12-21 22:21:09 UTC (rev 1142) @@ -5,8 +5,8 @@ A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" 1 VERSIONINFO -FILEVERSION 0,10,0,0 -PRODUCTVERSION 0,10,0,0 +FILEVERSION 0,10,9,0 +PRODUCTVERSION 0,10,9,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -14,14 +14,14 @@ BLOCK "040704E4" { VALUE "CompanyName", "" - VALUE "FileVersion", "0.10" + VALUE "FileVersion", "0.11svn" VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" VALUE "InternalName", "geany" VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "geany" VALUE "ProductName", "geany" - VALUE "ProductVersion", "0.10" + VALUE "ProductVersion", "0.11svn" } } BLOCK "VarFileInfo" Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-12-21 22:15:34 UTC (rev 1141) +++ trunk/src/geany.h 2006-12-21 22:21:09 UTC (rev 1142) @@ -36,7 +36,7 @@ // listed in the documentation should not be changed ;-) #define GEANY_HOME_DIR g_get_home_dir() #define GEANY_FILEDEFS_SUBDIR "filedefs" -#define GEANY_CODENAME "Sander" +#define GEANY_CODENAME "Bandor" #define GEANY_HOMEPAGE "http://geany.uvena.de/" #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_CHECK_FILE_DELAY 30 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 December 2006