Plugins-Commits September 2015

plugins-commits@lists.geany.org

1 participants
4 discussions

[geany/geany-plugins] 38bf4b: Merge pull request #284 from eht16/addons_bookmark_refresh_fix
by Enrico Tröger 20 Sep '15

20 Sep '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Sep 2015 20:25:23 UTC Commit: 38bf4b0f3b25bbb2cd6ef69f132e49d82611f986 https://github.com/geany/geany-plugins/commit/38bf4b0f3b25bbb2cd6ef69f132e4… Log Message: ----------- Merge pull request #284 from eht16/addons_bookmark_refresh_fix Update bookmark list also on any line changes in the document In addition to updating the bookmark list on document notebook tab change and adding/removing line markers, also rebuild the bookmark list when the text in the document changes with lines added or deleted. Should fix SF bugs #129 and #39. Modified Paths: -------------- addons/src/ao_bookmarklist.c Modified: addons/src/ao_bookmarklist.c 60 lines changed, 51 insertions(+), 9 deletions(-) =================================================================== @@ -62,8 +62,16 @@ struct _AoBookmarkListPrivate gint search_line; GtkTreeIter *search_iter; + + guint refresh_idle_source_id; }; +typedef struct +{ + AoBookmarkList *bm; + guint document_id; +} AoBookmarkListRefreshContainer; + enum { PROP_0, @@ -401,15 +409,19 @@ void ao_bookmark_list_activate(AoBookmarkList *bm) } -void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) +static gboolean update_bookmark_list_delayed(gpointer data) { gint line_nr = 0; gint mask = 1 << 1; - ScintillaObject *sci = doc->editor->sci; + AoBookmarkListRefreshContainer *container = data; + AoBookmarkList *bm = container->bm; AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + GeanyDocument *doc = document_find_by_id(container->document_id); - if (priv->enable_bookmarklist) + if (priv->enable_bookmarklist && doc != NULL) { + ScintillaObject *sci = doc->editor->sci; + gtk_list_store_clear(priv->store); while ((line_nr = scintilla_send_message(sci, SCI_MARKERNEXT, line_nr, mask)) != -1) { @@ -417,6 +429,28 @@ void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) line_nr++; } } + + g_free(container); + priv->refresh_idle_source_id = 0; + return FALSE; +} + + +void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) +{ + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + + if (priv->refresh_idle_source_id == 0) + { + AoBookmarkListRefreshContainer *container = g_new0(AoBookmarkListRefreshContainer, 1); + + container->bm = bm; + container->document_id = doc->id; + priv->refresh_idle_source_id = plugin_idle_add( + geany_plugin, + update_bookmark_list_delayed, + container); + } } @@ -424,16 +458,23 @@ void ao_bookmark_list_update_marker(AoBookmarkList *bm, GeanyEditor *editor, SCN { AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); - if (priv->enable_bookmarklist && - nt->nmhdr.code == SCN_MODIFIED && nt->modificationType == SC_MOD_CHANGEMARKER) + if (priv->enable_bookmarklist && nt->nmhdr.code == SCN_MODIFIED) { - if (sci_is_marker_set_at_line(editor->sci, nt->line, 1)) + if (nt->modificationType == SC_MOD_CHANGEMARKER) { - add_line(bm, editor->sci, nt->line); + if (sci_is_marker_set_at_line(editor->sci, nt->line, 1)) + { + add_line(bm, editor->sci, nt->line); + } + else + { + delete_line(bm, nt->line); + } } - else + else if (nt->linesAdded != 0) { - delete_line(bm, nt->line); + /* if any lines changed, refresh the whole list as we refer line numbers */ + ao_bookmark_list_update(bm, editor->document); } } } @@ -444,6 +485,7 @@ static void ao_bookmark_list_init(AoBookmarkList *self) AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(self); priv->page = NULL; + priv->refresh_idle_source_id = 0; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 002718: Move bookmark list refresh into an idle callback
by Enrico Tröger 20 Sep '15

20 Sep '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Sep 2015 20:21:27 UTC Commit: 00271842a395d195c405ce300b773ede5b8060cc https://github.com/geany/geany-plugins/commit/00271842a395d195c405ce300b773… Log Message: ----------- Move bookmark list refresh into an idle callback This should delay updates on Scintilla events until the GLib main loop is idling, assuming the typing or other text modifications are finished. Modified Paths: -------------- addons/src/ao_bookmarklist.c Modified: addons/src/ao_bookmarklist.c 38 lines changed, 35 insertions(+), 3 deletions(-) =================================================================== @@ -62,8 +62,16 @@ struct _AoBookmarkListPrivate gint search_line; GtkTreeIter *search_iter; + + guint refresh_idle_source_id; }; +typedef struct +{ + AoBookmarkList *bm; + GeanyDocument *document; +} AoBookmarkListRefreshContainer; + enum { PROP_0, @@ -401,14 +409,17 @@ void ao_bookmark_list_activate(AoBookmarkList *bm) } -void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) +static gboolean update_bookmark_list_delayed(gpointer data) { gint line_nr = 0; gint mask = 1 << 1; - ScintillaObject *sci = doc->editor->sci; + AoBookmarkListRefreshContainer *container = data; + AoBookmarkList *bm = container->bm; AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + GeanyDocument *doc = container->document; + ScintillaObject *sci = doc->editor->sci; - if (priv->enable_bookmarklist) + if (priv->enable_bookmarklist && DOC_VALID(doc)) { gtk_list_store_clear(priv->store); while ((line_nr = scintilla_send_message(sci, SCI_MARKERNEXT, line_nr, mask)) != -1) @@ -417,6 +428,26 @@ void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) line_nr++; } } + + g_free(container); + priv->refresh_idle_source_id = 0; + return FALSE; +} + + +void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) +{ + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + if (priv->refresh_idle_source_id == 0) + { + AoBookmarkListRefreshContainer *container = g_new0(AoBookmarkListRefreshContainer, 1); + container->bm = bm; + container->document = doc; + priv->refresh_idle_source_id = plugin_idle_add( + geany_plugin, + update_bookmark_list_delayed, + container); + } } @@ -444,6 +475,7 @@ static void ao_bookmark_list_init(AoBookmarkList *self) AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(self); priv->page = NULL; + priv->refresh_idle_source_id = 0; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0ecdc4: Update bookmark list also on any line changes in the document
by Enrico Tröger 20 Sep '15

20 Sep '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Sep 2015 20:21:27 UTC Commit: 0ecdc4253a5c2d3032a9d8c5e2b26a645d7b0b3e https://github.com/geany/geany-plugins/commit/0ecdc4253a5c2d3032a9d8c5e2b26… Log Message: ----------- Update bookmark list also on any line changes in the document In addition to updating the bookmark list on document notebook tab change and adding/removing line markers, also rebuild the bookmark list when the text in the document changes with lines added or deleted. Should fix SF bugs #129 and #39. Modified Paths: -------------- addons/src/ao_bookmarklist.c Modified: addons/src/ao_bookmarklist.c 32 lines changed, 21 insertions(+), 11 deletions(-) =================================================================== @@ -69,7 +69,7 @@ struct _AoBookmarkListPrivate typedef struct { AoBookmarkList *bm; - GeanyDocument *document; + guint document_id; } AoBookmarkListRefreshContainer; enum @@ -416,11 +416,12 @@ static gboolean update_bookmark_list_delayed(gpointer data) AoBookmarkListRefreshContainer *container = data; AoBookmarkList *bm = container->bm; AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); - GeanyDocument *doc = container->document; - ScintillaObject *sci = doc->editor->sci; + GeanyDocument *doc = document_find_by_id(container->document_id); - if (priv->enable_bookmarklist && DOC_VALID(doc)) + if (priv->enable_bookmarklist && doc != NULL) { + ScintillaObject *sci = doc->editor->sci; + gtk_list_store_clear(priv->store); while ((line_nr = scintilla_send_message(sci, SCI_MARKERNEXT, line_nr, mask)) != -1) { @@ -438,11 +439,13 @@ static gboolean update_bookmark_list_delayed(gpointer data) void ao_bookmark_list_update(AoBookmarkList *bm, GeanyDocument *doc) { AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + if (priv->refresh_idle_source_id == 0) { AoBookmarkListRefreshContainer *container = g_new0(AoBookmarkListRefreshContainer, 1); + container->bm = bm; - container->document = doc; + container->document_id = doc->id; priv->refresh_idle_source_id = plugin_idle_add( geany_plugin, update_bookmark_list_delayed, @@ -455,16 +458,23 @@ void ao_bookmark_list_update_marker(AoBookmarkList *bm, GeanyEditor *editor, SCN { AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); - if (priv->enable_bookmarklist && - nt->nmhdr.code == SCN_MODIFIED && nt->modificationType == SC_MOD_CHANGEMARKER) + if (priv->enable_bookmarklist && nt->nmhdr.code == SCN_MODIFIED) { - if (sci_is_marker_set_at_line(editor->sci, nt->line, 1)) + if (nt->modificationType == SC_MOD_CHANGEMARKER) { - add_line(bm, editor->sci, nt->line); + if (sci_is_marker_set_at_line(editor->sci, nt->line, 1)) + { + add_line(bm, editor->sci, nt->line); + } + else + { + delete_line(bm, nt->line); + } } - else + else if (nt->linesAdded != 0) { - delete_line(bm, nt->line); + /* if any lines changed, refresh the whole list as we refer line numbers */ + ao_bookmark_list_update(bm, editor->document); } } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 37aa25: git-changebar: Add support for libgit2 >= 0.23
by Colomban Wendling 10 Sep '15

10 Sep '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 10 Sep 2015 12:29:14 UTC Commit: 37aa25a1a4508c3d7559c0a2d00663b9c8d322c6 https://github.com/geany/geany-plugins/commit/37aa25a1a4508c3d7559c0a2d0066… Log Message: ----------- git-changebar: Add support for libgit2 >= 0.23 Closes #283. Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 12 lines changed, 11 insertions(+), 1 deletions(-) =================================================================== @@ -36,6 +36,15 @@ # define git_libgit2_init git_threads_init # define git_libgit2_shutdown git_threads_shutdown #endif +#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 +/* 0.23 added @p binary_cb */ +# define git_diff_buffers(old_buffer, old_len, old_as_path, \ + new_buffer, new_len, new_as_path, options, \ + file_cb, binary_cb, hunk_cb, line_cb, payload) \ + git_diff_buffers (old_buffer, old_len, old_as_path, \ + new_buffer, new_len, new_as_path, options, \ + file_cb, hunk_cb, line_cb, payload) +#endif GeanyPlugin *geany_plugin; @@ -656,7 +665,8 @@ diff_buf_to_doc (const git_buf *old_buf, opts.flags = GIT_DIFF_FORCE_TEXT; ret = git_diff_buffers (old_buf->ptr, old_buf->size, NULL, - buf, len, NULL, &opts, NULL, hunk_cb, NULL, payload); + buf, len, NULL, &opts, NULL, NULL, hunk_cb, NULL, + payload); if (free_buf) { g_free (buf); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2015