Plugins-Commits September 2014

plugins-commits@lists.geany.org

1 participants
38 discussions

[geany/geany-plugins] 7c9c31: Merge remote-tracking branch 'upstream/master' into autoclose-v0.2.1
by Pavel Roschin 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Wed, 23 Jul 2014 17:47:00 UTC Commit: 7c9c31022ebebf43560fe915d25f8a52a5aa5499 https://github.com/geany/geany-plugins/commit/7c9c31022ebebf43560fe915d25f8… Log Message: ----------- Merge remote-tracking branch 'upstream/master' into autoclose-v0.2.1 Modified Paths: -------------- HACKING geanyextrasel/src/extrasel.c geanyinsertnum/src/insertnum.c geniuspaste/src/geniuspaste.c gproject/src/gproject-project.c gproject/src/gproject-sidebar.c pairtaghighlighter/src/pair_tag_highlighter.c po/fr.po scope/ChangeLog scope/docs/scope.html scope/src/break.c scope/src/menu.c scope/src/scope.c scope/src/scope.h scope/src/store/ChangeLog scope/src/store/fullspeed.html scope/src/store/scptreestore.html scope/src/utils.c scope/src/utils.h Modified: HACKING 26 lines changed, 25 insertions(+), 1 deletions(-) =================================================================== @@ -192,13 +192,37 @@ build files, which macro is called from configure.ac:: AC_DEFUN([GP_CHECK_YOURFANCYPLUGINNAME], [ GP_ARG_DISABLE([yourfancypluginname], [auto]) - GP_STATUS_PLUGIN_ADD([yourfancypluginname], [$enable_yourfancxpluginname]) + GP_COMMIT_PLUGIN_STATUS([yourfancypluginname]) AC_CONFIG_FILES([ yourplugin/Makefile yourplugin/src/Makefile ]) ]) +You may add checks for dependencies of your plugin between the +``GP_ARG_DISABLE`` and ``GP_COMMIT_PLUGIN_STATUS`` calls. Note that you +must respect the ``$enable_yourfancypluginname`` (lowercase) variable +and try to avoid performing checks if it is set to ``no``, and never +abort unless it is set to ``yes``. If a required dependency is not met +and ``$enable_yourfancypluginname`` is not set to ``yes``, you should +update ``enable_yourfancypluginname`` and set it to ``no`` to disable +building of your plugin. + +To ease checking for modules using *pkg-config*, the +``GP_CHECK_PLUGIN_DEPS`` macro is provided, which wraps +``PKG_CHECK_MODULES`` and follows the above rules about plugin +enabling/disabling. + +While we recommend plugins to work with both GTK 2 and 3, you can use +the ``GP_CHECK_PLUGIN_GTK2_ONLY`` or ``GP_CHECK_PLUGIN_GTK3_ONLY`` +macros if your plugin only works with one version. + +You may also check which GTK version is used for the build using either +the ``$GP_GTK_VERSION`` or ``$GP_GTK_PACKAGE`` variables, or the +``GP_CHECK_GTK3`` macro. For example, if your plugin works with both +GTK 2 and 3 but you want to check for a minimal GTK2 version, you may +use ``$GP_GTK_PACKAGE >= 2.XX`` in a ``GP_CHECK_PLUGIN_DEPS`` call. + Makefile inside your plugin folder ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Modified: geanyextrasel/src/extrasel.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -32,7 +32,7 @@ GeanyFunctions *geany_functions; PLUGIN_VERSION_CHECK(189) PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / brace / anchor."), - "0.51", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + "0.52", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum @@ -47,8 +47,6 @@ enum COUNT_KB }; -PLUGIN_KEY_GROUP(extra_select, COUNT_KB) - static GtkWidget *main_menu_item = NULL; static GtkCheckMenuItem *column_mode_item; static GtkWidget *anchor_rect_select_item; @@ -496,8 +494,10 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data) { GtkContainer *menu; GtkWidget *item; + GeanyKeyGroup *plugin_key_group; main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + plugin_key_group = plugin_set_key_group(geany_plugin, "extra_select", COUNT_KB, NULL); item = gtk_menu_item_new_with_mnemonic(_("E_xtra Selection")); main_menu_item = item; Modified: geanyinsertnum/src/insertnum.c 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -42,7 +42,7 @@ GeanyFunctions *geany_functions; PLUGIN_VERSION_CHECK(189) PLUGIN_SET_INFO(_("Insert Numbers"), _("Insert/Fill columns with numbers."), - "0.2.1", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + "0.2.2", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum @@ -51,8 +51,6 @@ enum COUNT_KB }; -PLUGIN_KEY_GROUP(insert_numbers, COUNT_KB) - /* when altering the RANGE_ or MAX_LINES, make sure that RANGE_ * MAX_LINES fit in gint64, and that RANGE_LEN is enough for RANGE_ digits and sign */ #define RANGE_MIN (-2147483647 - 1) @@ -468,7 +466,10 @@ static void on_tools_show(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpo void plugin_init(G_GNUC_UNUSED GeanyData *data) { + GeanyKeyGroup *plugin_key_group; + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + plugin_key_group = plugin_set_key_group(geany_plugin, "insert_numbers", COUNT_KB, NULL); start_value = 1; step_value = 1; Modified: geniuspaste/src/geniuspaste.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -201,7 +201,7 @@ static void paste(GeanyDocument * doc, const gchar * website) }; gint occ_position; - gint i; + guint i; guint status; gsize f_length; @@ -440,7 +440,7 @@ static void on_configure_response(GtkDialog * dialog, gint response, gpointer * GtkWidget *plugin_configure(GtkDialog * dialog) { - gint i; + guint i; GtkWidget *label, *vbox, *author_label; vbox = gtk_vbox_new(FALSE, 6); Modified: gproject/src/gproject-project.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -381,9 +381,9 @@ void gprj_project_read_properties_tab(void) source_patterns, header_patterns, ignored_dirs_patterns, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(e->generate_tags))); - g_free(source_patterns); - g_free(header_patterns); - g_free(ignored_dirs_patterns); + g_strfreev(source_patterns); + g_strfreev(header_patterns); + g_strfreev(ignored_dirs_patterns); } @@ -473,9 +473,9 @@ void gprj_project_close(void) deferred_op_queue_clean(); - g_free(g_prj->source_patterns); - g_free(g_prj->header_patterns); - g_free(g_prj->ignored_dirs_patterns); + g_strfreev(g_prj->source_patterns); + g_strfreev(g_prj->header_patterns); + g_strfreev(g_prj->ignored_dirs_patterns); g_hash_table_destroy(g_prj->file_tag_table); Modified: gproject/src/gproject-sidebar.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -185,12 +185,14 @@ static gchar *build_path(GtkTreeIter *iter) path = g_strdup(name); else setptr(path, g_build_filename(name, path, NULL)); + g_free(name); node = parent; } gtk_tree_model_get(model, &node, FILEVIEW_COLUMN_NAME, &name, -1); setptr(path, g_build_filename(name, path, NULL)); + g_free(name); setptr(path, g_build_filename(geany_data->app->project->base_path, path, NULL)); Modified: pairtaghighlighter/src/pair_tag_highlighter.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -171,7 +171,7 @@ static gboolean is_tag_empty(gchar *tagName) "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr", "!DOCTYPE"}; - int i; + unsigned int i; for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++) { if(strcmp(tagName, emptyTags[i]) == 0) Modified: po/fr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -6420,7 +6420,7 @@ msgstr "Voulez-vous vraiment supprimer « %s » ?" #: ../treebrowser/src/treebrowser.c:1207 ../treebrowser/src/treebrowser.c:1738 msgid "Go up" -msgstr "Dossier parant" +msgstr "Dossier parent" #: ../treebrowser/src/treebrowser.c:1211 ../treebrowser/src/treebrowser.c:1753 msgid "Set path from document" Modified: scope/ChangeLog 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,17 @@ +2014-06-12 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * docs/scope.html: + Small changes in the "Temporary breakpoint on load" description. + * src/menu.c, src/scope.c, src/scope.h: + Replaced scope find_widget() with Geany ui_lookup_widget(). + * src/scope.c: + Insert the Debug menu after Build if possible, instead of using + a fixed position. + * src/scope.c, src/utils.c, src/utils.h: + Sync Geany "Document -> [ ] Read only" state of the current + document if possible when locking/unlocking it on Run/Terminate. + + 2014-04-27 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/conterm.c: Modified: scope/docs/scope.html 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -204,11 +204,10 @@ from Scope preferences to take advantage of this. Temporary breakpoint on load at - set a temporary breakpoint when the program is -loaded. If you leave the text field empty, Scope will try to detect the 1st line of code and +loaded. If you leave the text field empty, Scope will try to find the 1st line of code and place a breakpoint on it. Any breakpoint options and location are allowed in the text, for -example main for C/C++ programs. Since setting a breakpoint requires a program, the -temporary breakpoint on load will be disabled if both Executable and Load -script are empty. +example main for C/C++ programs. Since setting a breakpoint requires a program, this +option will be disabled if both Executable and Load script are empty. Delete all breakpoints, watches and inspects - usually when setting up a new program. Scope will ask for confirmation. Modified: scope/src/break.c 12 lines changed, 5 insertions(+), 7 deletions(-) =================================================================== @@ -1201,6 +1201,9 @@ static GtkTreeView *tree; static GtkTreeViewColumn *break_type_column; static GtkTreeViewColumn *break_display_column; +#define gdk_rectangle_point_in(rect, x, y) ((guint) (x - rect.x) < (guint) rect.width && \ + (guint) (y - rect.y) < (guint) rect.height) + static gboolean on_break_query_tooltip(G_GNUC_UNUSED GtkWidget *widget, gint x, gint y, gboolean keyboard_tip, GtkTooltip *tooltip, G_GNUC_UNUSED gpointer gdata) { @@ -1218,21 +1221,16 @@ static gboolean on_break_query_tooltip(G_GNUC_UNUSED GtkWidget *widget, gint x, else { GdkRectangle rect; - GdkRegion *region; gtk_tree_view_get_background_area(tree, path, break_type_column, &rect); - region = gdk_region_rectangle(&rect); - tip_column = gdk_region_point_in(region, x, y) ? break_type_column : NULL; - gdk_region_destroy(region); + tip_column = gdk_rectangle_point_in(rect, x, y) ? break_type_column : NULL; if (!tip_column) { gtk_tree_view_get_background_area(tree, path, break_display_column, &rect); - region = gdk_region_rectangle(&rect); - if (gdk_region_point_in(region, x, y)) + if (gdk_rectangle_point_in(rect, x, y)) tip_column = break_display_column; - gdk_region_destroy(region); } } Modified: scope/src/menu.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -517,7 +517,7 @@ void menu_init(void) { GtkMenuShell *shell = GTK_MENU_SHELL(geany->main_widgets->editor_menu); GList *children = gtk_container_get_children(GTK_CONTAINER(shell)); - GtkWidget *search2 = find_widget(shell, "search2"); + GtkWidget *search2 = ui_lookup_widget(GTK_WIDGET(shell), "search2"); popup_item = get_widget("popup_item"); menu_connect("popup_menu", &popup_menu_info, NULL); Modified: scope/src/scope.c 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -533,7 +533,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) GeanyKeyGroup *scope_key_group; char *gladefile = g_build_filename(PLUGINDATADIR, "scope.glade", NULL); GError *gerror = NULL; - GtkWidget *menubar1 = find_widget(geany->main_widgets->window, "menubar1"); + GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1"); guint item; const MenuKey *menu_key = debug_menu_keys; ToolItem *tool_item = toolbar_items; @@ -564,7 +564,13 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) #endif debug_item = get_widget("debug_item"); if (menubar1) - gtk_menu_shell_insert(GTK_MENU_SHELL(menubar1), debug_item, DEBUG_MENU_ITEM_POS); + { + GList *children = gtk_container_get_children(GTK_CONTAINER(menubar1)); + GtkWidget *menu_build1 = ui_lookup_widget(menubar1, "menu_build1"); + + gtk_menu_shell_insert(GTK_MENU_SHELL(menubar1), debug_item, + menu_build1 ? g_list_index(children, menu_build1) + 1 : DEBUG_MENU_ITEM_POS); + } else gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), debug_item); @@ -595,6 +601,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) inspect_init(); register_init(); parse_init(); + utils_init(); debug_init(); views_init(); thread_init(); Modified: scope/src/scope.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,6 @@ void update_state(DebugState state); GObject *get_object(const char *name); GtkWidget *get_widget(const char *name); #define get_column(name) GTK_TREE_VIEW_COLUMN(get_object(name)) -#define find_widget(parent, name) GTK_WIDGET(g_object_get_data(G_OBJECT(parent), (name))) void configure_toolbar(void); void open_debug_panel(void); void configure_panel(void); Modified: scope/src/store/ChangeLog 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,19 @@ +2014-03-29 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * scptreestore.html: + Clarification about Glade support. + * scptreestore.html, wscript: + Increased version to 0.86.1. + * wscript: + Added ChangeLog to the distribution package. + + +2014-02-18 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * scptreestore.c: + Avoid warning when sorting an empty branch. + + 2013-09-29 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * scptreestore.c, scptreestore.h, scptreestore.html: @@ -6,7 +22,7 @@ Added command line arguments. Different default # of searches for >= 1000 elements. Level 2: is #define, speed test fix. - * scptreestore.html: + * scptreestore.html, wscript: Increased version to 0.86. @@ -16,6 +32,7 @@ Added scp_tree_store_register_dynamic(). * scptreestore.html, fullspeed.html: Moved the full speed test results to a separate file. + * scptreestore.html, wscript: Increased version to 0.85. * speed.c: Replaced // with /* */ for glib/gtk+ compliance. @@ -29,6 +46,7 @@ Added scp_tree_store_traverse(). * scptreestore.html: Documentation and speed test results for scp_tree_store_traverse(). + * scptreestore.html, wscript Increased version to 0.84. * speed.c: Added speed test for scp_tree_store_traverse(). Modified: scope/src/store/fullspeed.html 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -171,7 +171,7 @@ <tr><td>sublevel 1 set </td><td>10000</td><td>1.159 </td><td>0.110</td><td></td></tr> <tr><td>sublevel 1 remove </td><td>10000</td><td>0.971 </td><td>0.120</td><td></td></tr> <tr><td>sublevel 1 insert with values </td><td>10000</td><td>1.039 </td><td>0.140</td><td></td></tr> -<tr><td>both levels model foreach </td><td>10000</td><td>n/a </td><td>3.218</td><td>2510</td></tr> +<tr><td>both levels model foreach </td><td>10000</td><td>16.602</td><td>3.218</td><td>2510</td></tr> <tr><td>both levels store traverse </td><td>10000</td><td>n/a </td><td>2.224</td><td>2510</td></tr> <tr><td>both levels quick sort double </td><td>10000</td><td>0.218 </td><td>0.046</td><td></td></tr> <tr><td>both levels quick sort string </td><td>10000</td><td>1.383 </td><td>1.083</td><td></td></tr> @@ -272,6 +272,7 @@ <li>top-level only quick sort is always 2x faster</li> <li>all defensive checks are enabled</li> <li>all string tests are with utf8 collation</li> +<li>GtkTreeStore is converted to model with (GtkTreeModel *), not GTK_TREE_MODEL()</li> <li>GtkListStore speed is practically identical to GtkTreeStore.</li> </ul> Modified: scope/src/store/scptreestore.html 21 lines changed, 12 insertions(+), 9 deletions(-) =================================================================== @@ -454,10 +454,10 @@ <h3><a name="speed">Speed</a></h3> An unsorted ScpTreeStore is faster than GtkTreeStore, but the difference is not big (20% -on average, depending on the operation and number of elements), and not significant (< 0.5+ -seconds) for stores with less than 10000 elements. Normally, inserting into and removing from -a list is faster than using an array, but all store operations must emit a signal, containing -the row path (numeric index), which negates this advantage. +on average, depending on the operation and number of elements), and not significant for stores +with less than 10000 elements (except foreach or lots of searches). Normally, inserting into +and removing from a list is faster than using an array, but all store operations must emit a +signal, containing the row path (element indexes), which negates this advantage. The sorted gtk+ stores are slow, since they are based on lists, and sorting by a string with utf-8 collation makes them even slower. @@ -496,15 +496,18 @@ </table> -The full speed test is <a href="fullspeed.html">here</a>. In general, a sorted ScpTreeStore -can be used as a normal data structure, which is not the case with GtkTree/ListStore. +The full speed test is <a href="fullspeed.html">here</a>. In general, a large sorted +ScpTreeStore can be used as a normal data structure, unlike a GtkTree/ListStore. And, since +ScpTreeStore is not part of gtk+, you can easily recompile it with -DG_DISABLE_CHECKS, but +don't expect any significant difference. <hr> <h3><a name="bugs">Bugs</a></h3> -Incomplete Glade support. You can include ScpTreeStore-s in .glade files with a text -editor, but editing such files with Glade will discard the stores. +Incomplete Glade support. ScpTreeStore-s can be included in .glade files with a text +editor, but saving such files with Glade will discard the stores. I don't plan to fix this. + The linguistically correct string comparision is not well tested. @@ -520,7 +523,7 @@ ScpTreeStore was written for the Scope plugin of Geany light IDE, which relies heavily on stores. -ScpTreeStore 0.85, Copyright (C) 2013 Dimitar Toshkov Zhekov +ScpTreeStore 0.86.1, Copyright (C) 2014 Dimitar Toshkov Zhekov ScpTreeStore is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any Modified: scope/src/utils.c 23 lines changed, 20 insertions(+), 3 deletions(-) =================================================================== @@ -344,11 +344,22 @@ static void line_mark_unmark(GeanyDocument *doc, gboolean lock) } } +static GtkCheckMenuItem *set_file_readonly1; + static void doc_lock_unlock(GeanyDocument *doc, gboolean lock) { - scintilla_send_message(doc->editor->sci, SCI_SETREADONLY, lock, 0); - doc->readonly = lock; - document_set_text_changed(doc, doc->changed); /* to redraw tab and update sidebar */ + if (set_file_readonly1 && doc == document_get_current()) + { + /* to ensure correct state of Document -> [ ] Read Only */ + if (gtk_check_menu_item_get_active(set_file_readonly1) != lock) + gtk_check_menu_item_set_active(set_file_readonly1, lock); + } + else + { + scintilla_send_message(doc->editor->sci, SCI_SETREADONLY, lock, 0); + doc->readonly = lock; + document_set_text_changed(doc, doc->changed); /* to redraw tab & update sidebar */ + } } void utils_lock(GeanyDocument *doc) @@ -708,6 +719,12 @@ void utils_tree_set_cursor(GtkTreeSelection *selection, GtkTreeIter *iter, gdoub gtk_tree_path_free(path); } +void utils_init(void) +{ + set_file_readonly1 = GTK_CHECK_MENU_ITEM(ui_lookup_widget(geany->main_widgets->window, + "set_file_readonly1")); +} + void utils_finalize(void) { guint i; Modified: scope/src/utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -104,6 +104,7 @@ gchar *utils_text_buffer_get_text(GtkTextBuffer *text, gint maxlen); void utils_enter_to_clicked(GtkWidget *widget, GtkWidget *button); void utils_tree_set_cursor(GtkTreeSelection *selection, GtkTreeIter *iter, gdouble alignment); +void utils_init(void); void utils_finalize(void); #define UTILS_H 1 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d22d0a: Revert "Auto-close: fix possible crash at exit"
by Pavel Roschin 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Fri, 02 May 2014 18:36:26 UTC Commit: d22d0ace38a99713460c82687dd933f8eca73213 https://github.com/geany/geany-plugins/commit/d22d0ace38a99713460c82687dd93… Log Message: ----------- Revert "Auto-close: fix possible crash at exit" This reverts commit 4c4bcb5c2fa498b5f0bcefa20822dd252c4c0c8f. Conflicts: autoclose/src/autoclose.c Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 58 lines changed, 23 insertions(+), 35 deletions(-) =================================================================== @@ -43,7 +43,7 @@ GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(216) +PLUGIN_VERSION_CHECK(218) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, @@ -83,7 +83,6 @@ typedef struct { static AutocloseInfo *ac_info = NULL; typedef struct { - gulong notify_handler[2]; /* used to place the caret after autoclosed items on tab (similar to eclipse) */ gint jump_on_tab; /* used to reset jump_on_tab when needed */ @@ -798,7 +797,6 @@ on_sci_notify(ScintillaObject *sci, gint scn, SCNotification *nt, gpointer user_ data->last_line = new_line; } - static void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) { @@ -808,42 +806,15 @@ on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) sci = doc->editor->sci; data = g_new0(AutocloseUserData, 1); - g_return_if_fail(data); data->doc = doc; - data->notify_handler[0] = g_signal_connect(G_OBJECT(sci), "sci-notify", - G_CALLBACK(on_sci_notify), data); - data->notify_handler[1] = g_signal_connect(G_OBJECT(sci), "key-press-event", - G_CALLBACK(on_key_press), data); + plugin_signal_connect(geany_plugin, G_OBJECT(sci), "sci-notify", + FALSE, G_CALLBACK(on_sci_notify), data); + plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event", + FALSE, G_CALLBACK(on_key_press), data); /* This will free the data when the sci is destroyed */ g_object_set_data_full(G_OBJECT(sci), "autoclose-userdata", data, g_free); } -static void -autoclose_handlers_cleanup(void) -{ - gint i; - - foreach_document(i) - { - gint j; - gpointer data; - ScintillaObject *sci; - AutocloseUserData *autoclose_data; - - sci = documents[i]->editor->sci; - data = g_object_steal_data(G_OBJECT(sci), "autoclose-userdata"); - if (!data) - continue; - autoclose_data = (AutocloseUserData*)data; - for (j = 0; j < 2; j++) - { - gulong handler = autoclose_data->notify_handler[j]; - g_signal_handler_disconnect(sci, handler); - } - g_free(data); - } -} - PluginCallback plugin_callbacks[] = { { "document-open", (GCallback) &on_document_open, FALSE, NULL }, @@ -913,6 +884,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data) { guint i; + foreach_document(i) { on_document_open(NULL, documents[i], NULL); @@ -1124,11 +1096,27 @@ plugin_configure(GtkDialog *dialog) return scrollbox; } +static void +autoclose_cleanup(void) +{ + guint i; + + foreach_document(i) + { + gpointer data; + ScintillaObject *sci; + + sci = documents[i]->editor->sci; + data = g_object_steal_data(G_OBJECT(sci), "autoclose-userdata"); + g_free(data); + } +} + /* Called by Geany before unloading the plugin. */ void plugin_cleanup(void) { - autoclose_handlers_cleanup(); + autoclose_cleanup(); g_free(ac_info->config_file); g_free(ac_info); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 083281: Added a brackets formatting ability according to the Whitesmith coding style.
by Eduard E. Tikhenko 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Eduard E. Tikhenko <aquaried(a)gmail.com> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Wed, 23 Jul 2014 17:44:16 UTC Commit: 083281c3b0d2c1f26fbe09c664d92ae45760a157 https://github.com/geany/geany-plugins/commit/083281c3b0d2c1f26fbe09c664d92… Log Message: ----------- Added a brackets formatting ability according to the Whitesmith coding style. Conflicts: autoclose/src/autoclose.c Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 30 lines changed, 26 insertions(+), 4 deletions(-) =================================================================== @@ -73,6 +73,7 @@ typedef struct { gboolean make_indent_for_cbracket; gboolean move_cursor_to_beginning; gboolean improved_cbracket_indent; + gboolean whitesmiths_style; gboolean close_functions; gboolean bcksp_remove_pair; gboolean jump_on_tab; @@ -356,8 +357,17 @@ improve_indent( SSM(sci, SCI_ADDTEXT, 2, (sptr_t)"\n\n"); else SSM(sci, SCI_ADDTEXT, 3, (sptr_t)"\n\n}"); - sci_set_line_indentation(sci, line + 1, indent + indent_width); - sci_set_line_indentation(sci, line + 2, indent); + if (ac_info->whitesmiths_style) + { + sci_set_line_indentation(sci, line, indent); + sci_set_line_indentation(sci, line + 1, indent); + sci_set_line_indentation(sci, line + 2, indent); + } + else + { + sci_set_line_indentation(sci, line + 1, indent + indent_width); + sci_set_line_indentation(sci, line + 2, indent); + } /* move to the end of added line */ end_pos = sci_get_line_end_position(sci, line + 1); sci_set_current_position(sci, end_pos, TRUE); @@ -493,11 +503,17 @@ enclose_selection( start_indent = sci_get_line_indentation(sci, start_line); indent_width = editor_get_indent_prefs(editor)->width; sci_set_line_indentation(sci, start_line, start_indent); - sci_set_line_indentation(sci, start_line + 1, start_indent + indent_width); + if (!ac_info->whitesmiths_style) + sci_set_line_indentation(sci, start_line + 1, start_indent + indent_width); + else + sci_set_line_indentation(sci, start_line + 1, start_indent); for (i = start_line + 2; i <= end_line; i++) { current_indent = sci_get_line_indentation(sci, i); - sci_set_line_indentation(sci, i, current_indent + indent_width); + if (!ac_info->whitesmiths_style) + sci_set_line_indentation(sci, i, current_indent + indent_width); + else + sci_set_line_indentation(sci, i, current_indent); } text_end_pos = sci_get_line_end_position(sci, i - 1); sci_set_current_position(sci, text_end_pos, FALSE); @@ -856,6 +872,7 @@ configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) SAVE_CONF_BOOL(make_indent_for_cbracket); SAVE_CONF_BOOL(move_cursor_to_beginning); SAVE_CONF_BOOL(improved_cbracket_indent); + SAVE_CONF_BOOL(whitesmiths_style); SAVE_CONF_BOOL(close_functions); SAVE_CONF_BOOL(bcksp_remove_pair); SAVE_CONF_BOOL(jump_on_tab); @@ -919,6 +936,7 @@ plugin_init(G_GNUC_UNUSED GeanyData *data) GET_CONF_BOOL(make_indent_for_cbracket, TRUE); GET_CONF_BOOL(move_cursor_to_beginning, TRUE); GET_CONF_BOOL(improved_cbracket_indent, TRUE); + GET_CONF_BOOL(whitesmiths_style, FALSE); GET_CONF_BOOL(close_functions, TRUE); GET_CONF_BOOL(bcksp_remove_pair, FALSE); GET_CONF_BOOL(jump_on_tab, TRUE); @@ -1051,6 +1069,10 @@ plugin_configure(GtkDialog *dialog) _("Improved auto-indent for curly brackets: type \"{\" " "and then press Enter - plugin will create full indented block. " "Works without \"auto-close { }\" checkbox.")); + WIDGET_CONF_BOOL(whitesmiths_style, _("\tWhitesmiths style"), + _("This style puts the brace associated with a control statement on " + "the next line, indented. Statements within the braces are indented " + "to the same level as the braces.")); container = vbox; WIDGET_CONF_BOOL(delete_pairing_brace, _("Delete pairing character while backspacing first"), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7cbe7d: Auto-close: bump version because of changing Geany API version
by Pavel Roschin 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Fri, 02 May 2014 18:37:40 UTC Commit: 7cbe7ddfbccc5937168af709f3c5e44afdffaee3 https://github.com/geany/geany-plugins/commit/7cbe7ddfbccc5937168af709f3c5e… Log Message: ----------- Auto-close: bump version because of changing Geany API version Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -49,7 +49,7 @@ PLUGIN_SET_TRANSLATABLE_INFO( GETTEXT_PACKAGE, _("Auto-close"), _("Auto-close braces and brackets with lot of features"), - "0.2", + "0.3", "Pavel Roschin <rpg89(at)post(dot)ru>") typedef struct { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 650ed7: Auto-close: fix style
by Pavel Roschin 08 Sep '14

08 Sep '14

1 0

[geany/geany-plugins] 94b6cc: Auto-close: Use G_STMT macro for defines
by Pavel Roschin 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Fri, 02 May 2014 18:36:25 UTC Commit: 94b6cc6c761f672647ea6efa10bb9e2183060ea2 https://github.com/geany/geany-plugins/commit/94b6cc6c761f672647ea6efa10bb9… Log Message: ----------- Auto-close: Use G_STMT macro for defines Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -865,11 +865,11 @@ configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL); -#define SAVE_CONF_BOOL(name) do { \ +#define SAVE_CONF_BOOL(name) G_STMT_START { \ ac_info->name = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( \ - g_object_get_data(G_OBJECT(dialog), "check_" #name))); \ + g_object_get_data(G_OBJECT(dialog), "check_" #name))); \ g_key_file_set_boolean(config, "autoclose", #name, ac_info->name); \ -} while (0) +} G_STMT_END SAVE_CONF_BOOL(parenthesis); SAVE_CONF_BOOL(abracket); @@ -1028,21 +1028,21 @@ plugin_configure(GtkDialog *dialog) gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -#define WIDGET_FRAME(description) do { \ +#define WIDGET_FRAME(description) G_STMT_START { \ container = gtk_vbox_new(FALSE, 0); \ frame = gtk_frame_new(NULL); \ gtk_frame_set_label(GTK_FRAME(frame), description); \ gtk_container_add(GTK_CONTAINER(frame), container); \ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 3); \ -} while (0) +} G_STMT_END -#define WIDGET_CONF_BOOL(name, description, tooltip) do { \ +#define WIDGET_CONF_BOOL(name, description, tooltip) G_STMT_START { \ widget = gtk_check_button_new_with_label(description); \ if (tooltip) gtk_widget_set_tooltip_text(widget, tooltip); \ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ac_info->name); \ gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 3); \ g_object_set_data(G_OBJECT(dialog), "check_" #name, widget); \ -} while (0) +} G_STMT_END WIDGET_FRAME(_("Auto-close quotes and brackets")); WIDGET_CONF_BOOL(parenthesis, _("Parenthesis ( )"), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5e5631: Auto-close: Remove broken macro because it was fixed in Geany
by Pavel Roschin 08 Sep '14

08 Sep '14

1 0

[geany/geany-plugins] deb48c: Auto-close: Steal plugin data to free it manually
by Pavel Roschin 08 Sep '14

08 Sep '14

1 0

[geany/geany-plugins] 97f663: Auto-close: fix settings window minimum size
by Pavel Roschin 08 Sep '14

08 Sep '14

1 0

[geany/geany-plugins] 0c399d: Auto-close: fix strings to be translatable
by Pavel Roschin 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Pavel Roschin <roshin(a)scriptumplus.ru> Committer: Pavel Roschin <roshin(a)scriptumplus.ru> Date: Thu, 01 May 2014 15:08:02 UTC Commit: 0c399dfc3a8780abce5cc8e800f8b7f50d323008 https://github.com/geany/geany-plugins/commit/0c399dfc3a8780abce5cc8e800f8b… Log Message: ----------- Auto-close: fix strings to be translatable Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 126 lines changed, 64 insertions(+), 62 deletions(-) =================================================================== @@ -709,13 +709,15 @@ auto_close_chars( style = sci_get_style_at(sci, pos + lex_offset); /* add ; after functions */ - if (lexer_cpp_like(lexer, style) && - chars_left[0] == '(' && - !has_sel && - ac_info->close_functions && - pos == get_end_pos(sci, line) && - sci_get_line_indentation(sci, line) != 0 && - !check_define(sci, line)) + if ( + !has_sel && + ac_info->close_functions && + chars_left[0] == '(' && + lexer_cpp_like(lexer, style) && + pos == get_end_pos(sci, line) && + sci_get_line_indentation(sci, line) != 0 && + !check_define(sci, line) + ) chars_right[1] = ';'; style = sci_get_style_at(sci, pos); @@ -858,7 +860,6 @@ configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) if (response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY) return; GKeyFile *config = g_key_file_new(); - gchar *data; gchar *config_dir = g_path_get_dirname(ac_info->config_file); g_key_file_load_from_file(config, ac_info->config_file, G_KEY_FILE_NONE, NULL); @@ -901,6 +902,7 @@ configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) else { /* write config to file */ + gchar *data; data = g_key_file_to_data(config, NULL, NULL); utils_write_file(ac_info->config_file, data); g_free(data); @@ -1027,88 +1029,88 @@ plugin_configure(GtkDialog *dialog) #define WIDGET_FRAME(description) do { \ container = gtk_vbox_new(FALSE, 0); \ frame = gtk_frame_new(NULL); \ - gtk_frame_set_label(GTK_FRAME(frame), _(description)); \ + gtk_frame_set_label(GTK_FRAME(frame), description); \ gtk_container_add(GTK_CONTAINER(frame), container); \ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 3); \ } while (0) #define WIDGET_CONF_BOOL(name, description, tooltip) do { \ - widget = gtk_check_button_new_with_label(_(description)); \ - if (tooltip) gtk_widget_set_tooltip_text(widget, _(tooltip)); \ + widget = gtk_check_button_new_with_label(description); \ + if (tooltip) gtk_widget_set_tooltip_text(widget, tooltip); \ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ac_info->name); \ gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 3); \ g_object_set_data(G_OBJECT(dialog), "check_" #name, widget); \ } while (0) - WIDGET_FRAME("Auto-close quotes and brackets"); - WIDGET_CONF_BOOL(parenthesis, "Parenthesis ( )", - "Auto-close parenthesis \"(\" -> \"(|)\""); + WIDGET_FRAME(_("Auto-close quotes and brackets")); + WIDGET_CONF_BOOL(parenthesis, _("Parenthesis ( )"), + _("Auto-close parenthesis \"(\" -> \"(|)\"")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_parenthesis_cb), dialog); - WIDGET_CONF_BOOL(cbracket, "Curly brackets { }", - "Auto-close curly brackets \"{\" -> \"{|}\""); + WIDGET_CONF_BOOL(cbracket, _("Curly brackets { }"), + _("Auto-close curly brackets \"{\" -> \"{|}\"")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_cbracket_cb), dialog); - WIDGET_CONF_BOOL(sbracket, "Square brackets [ ]", - "Auto-close square brackets \"[\" -> \"[|]\""); - WIDGET_CONF_BOOL(abracket, "Angular brackets < >", - "Auto-close angular brackets \"<\" -> \"<|>\""); + WIDGET_CONF_BOOL(sbracket, _("Square brackets [ ]"), + _("Auto-close square brackets \"[\" -> \"[|]\"")); + WIDGET_CONF_BOOL(abracket, _("Angular brackets < >"), + _("Auto-close angular brackets \"<\" -> \"<|>\"")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_abracket_htmlonly_cb), dialog); - WIDGET_CONF_BOOL(abracket_htmlonly, "\tOnly for HTML", - "Auto-close angular brackets only in HTML documents"); - WIDGET_CONF_BOOL(dquote, "Double quotes \" \"", - "Auto-close double quotes \" -> \"|\""); - WIDGET_CONF_BOOL(squote, "Single quotes \' \'", - "Auto-close single quotes ' -> '|'"); - WIDGET_CONF_BOOL(backquote, "Backquote ` `", - "Auto-close backquote ` -> `|`"); + WIDGET_CONF_BOOL(abracket_htmlonly, _("\tOnly for HTML"), + _("Auto-close angular brackets only in HTML documents")); + WIDGET_CONF_BOOL(dquote, _("Double quotes \" \""), + _("Auto-close double quotes \" -> \"|\"")); + WIDGET_CONF_BOOL(squote, _("Single quotes \' \'"), + _("Auto-close single quotes ' -> '|'")); + WIDGET_CONF_BOOL(backquote, _("Backquote ` `"), + _("Auto-close backquote ` -> `|`")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_backquote_bashonly_cb), dialog); - WIDGET_CONF_BOOL(backquote_bashonly, "\tOnly for Bash", - "Auto-close backquote only in Bash"); + WIDGET_CONF_BOOL(backquote_bashonly, _("\tOnly for Bash"), + _("Auto-close backquote only in Bash")); - WIDGET_FRAME("Improve curly brackets completion"); - WIDGET_CONF_BOOL(make_indent_for_cbracket, "Indent when enclosing", - "If you select some text and press \"{\" or \"}\", plugin " + WIDGET_FRAME(_("Improve curly brackets completion")); + WIDGET_CONF_BOOL(make_indent_for_cbracket, _("Indent when enclosing"), + _("If you select some text and press \"{\" or \"}\", plugin " "will auto-close selected lines and make new block with indent." "\nYou do not need to select block precisely - block enclosing " - "takes into account only lines."); + "takes into account only lines.")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_make_indent_for_cbracket_cb), dialog); - WIDGET_CONF_BOOL(move_cursor_to_beginning, "Move cursor to beginning", - "If you checked \"Indent when enclosing\", moving cursor " + WIDGET_CONF_BOOL(move_cursor_to_beginning, _("Move cursor to beginning"), + _("If you checked \"Indent when enclosing\", moving cursor " "to beginning may be useful: usually you make new block " - "and need to create new statement before this block."); - WIDGET_CONF_BOOL(improved_cbracket_indent, "Improved auto-indentation", - "Improved auto-indent for curly brackets: type \"{\" " + "and need to create new statement before this block.")); + WIDGET_CONF_BOOL(improved_cbracket_indent, _("Improved auto-indentation"), + _("Improved auto-indent for curly brackets: type \"{\" " "and then press Enter - plugin will create full indented block. " - "Works without \"auto-close { }\" checkbox."); + "Works without \"auto-close { }\" checkbox.")); container = vbox; - WIDGET_CONF_BOOL(delete_pairing_brace, "Delete pairing character while backspacing first", - "Check if you want to delete pairing bracket by pressing BackSpace."); + WIDGET_CONF_BOOL(delete_pairing_brace, _("Delete pairing character while backspacing first"), + _("Check if you want to delete pairing bracket by pressing BackSpace.")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_delete_pairing_brace_cb), dialog); - WIDGET_CONF_BOOL(suppress_doubling, "Suppress double-completion", - "Check if you want to allow editor automatically fix mistypes " - "with brackets: if you type \"{}\" you will get \"{}\", not \"{}}\"."); - WIDGET_CONF_BOOL(enclose_selections, "Enclose selections", - "Automatically enclose selected text by pressing just one bracket key."); + WIDGET_CONF_BOOL(suppress_doubling, _("Suppress double-completion"), + _("Check if you want to allow editor automatically fix mistypes " + "with brackets: if you type \"{}\" you will get \"{}\", not \"{}}\".")); + WIDGET_CONF_BOOL(enclose_selections, _("Enclose selections"), + _("Automatically enclose selected text by pressing just one bracket key.")); g_signal_connect(widget, "toggled", G_CALLBACK(ac_enclose_selections_cb), dialog); - WIDGET_CONF_BOOL(keep_selection, "Keep selection when enclosing", - "Keep your previously selected text after enclosing."); + WIDGET_CONF_BOOL(keep_selection, _("Keep selection when enclosing"), + _("Keep your previously selected text after enclosing.")); - WIDGET_FRAME("Behaviour inside comments and strings"); - WIDGET_CONF_BOOL(comments_ac_enable, "Allow auto-closing in strings and comments", - "Check if you wan to keep auto-closing inside strings and comments too."); - WIDGET_CONF_BOOL(comments_enclose, "Enclose selections in strings and comments", - "Check if you wan to enclose selections inside strings and comments too."); + WIDGET_FRAME(_("Behaviour inside comments and strings")); + WIDGET_CONF_BOOL(comments_ac_enable, _("Allow auto-closing in strings and comments"), + _("Check if you wan to keep auto-closing inside strings and comments too.")); + WIDGET_CONF_BOOL(comments_enclose, _("Enclose selections in strings and comments"), + _("Check if you wan to enclose selections inside strings and comments too.")); container = vbox; - WIDGET_CONF_BOOL(close_functions, "Auto-complete \";\" for functions", - "Full function auto-closing (works only for C/C++): type \"sin(\" " - "and you will get \"sin(|);\"."); - WIDGET_CONF_BOOL(bcksp_remove_pair, "Shift+BackSpace removes pairing brace too", - "Remove left and right brace while pressing Shift+BackSpace.\nTip: " + WIDGET_CONF_BOOL(close_functions, _("Auto-complete \";\" for functions"), + _("Full function auto-closing (works only for C/C++): type \"sin(\" " + "and you will get \"sin(|);\".")); + WIDGET_CONF_BOOL(bcksp_remove_pair, _("Shift+BackSpace removes pairing brace too"), + _("Remove left and right brace while pressing Shift+BackSpace.\nTip: " "to completely remove indented block just Shift+BackSpace first \"{\" " - "or last \"}\"."); - WIDGET_CONF_BOOL(jump_on_tab, "Jump on Tab to enclosed char", - "Jump behind autoclosed items on Tab press."); + "or last \"}\".")); + WIDGET_CONF_BOOL(jump_on_tab, _("Jump on Tab to enclosed char"), + _("Jump behind autoclosed items on Tab press.")); #undef WIDGET_CONF_BOOL #undef WIDGET_FRAME -------------- 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 2014