Commits July 2007

commits@lists.geany.org

3 participants
112 discussions

SF.net SVN: geany: [1757] trunk/src/tools.c
by eht16＠users.sourceforge.net 28 Jul '07

28 Jul '07

Revision: 1757 http://geany.svn.sourceforge.net/geany/?rev=1757&view=rev Author: eht16 Date: 2007-07-28 08:18:01 -0700 (Sat, 28 Jul 2007) Log Message: ----------- Fix compiler warnings on Windows Modified Paths: -------------- trunk/src/tools.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-07-28 14:10:49 UTC (rev 1756) +++ trunk/src/tools.c 2007-07-28 15:18:01 UTC (rev 1757) @@ -48,6 +48,7 @@ #include "msgwindow.h" #include "keybindings.h" #include "templates.h" +#include "win32.h" /* custom commands code*/ @@ -609,6 +610,7 @@ /* * color dialog callbacks */ +#ifndef G_OS_WIN32 static void on_color_cancel_button_clicked (GtkButton *button, gpointer user_data) @@ -635,6 +637,7 @@ document_insert_colour(idx, hex); g_free(hex); } +#endif /* This shows the color selection dialog to choose a color. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1756] trunk
by eht16＠users.sourceforge.net 28 Jul '07

28 Jul '07

Revision: 1756 http://geany.svn.sourceforge.net/geany/?rev=1756&view=rev Author: eht16 Date: 2007-07-28 07:10:49 -0700 (Sat, 28 Jul 2007) Log Message: ----------- Hide empty symbol types in the symbol list. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-28 11:47:56 UTC (rev 1755) +++ trunk/ChangeLog 2007-07-28 14:10:49 UTC (rev 1756) @@ -10,6 +10,7 @@ if there are any plugins. Use PACKAGE_LIB_DIR. Load plugins in ~/.geany/plugins/ prior to the default location. + * src/symbols.c: Hide empty symbol types in the symbol list. 2007-07-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-07-28 11:47:56 UTC (rev 1755) +++ trunk/src/symbols.c 2007-07-28 14:10:49 UTC (rev 1756) @@ -43,6 +43,9 @@ #include "msgwindow.h" #include "treeviews.h" + +#define MAX_SYMBOL_TYPES 8 // amount of types in the symbol list (currently max. 8 are used) + const guint TM_GLOBAL_TYPE_MASK = tm_tag_class_t | tm_tag_enum_t | tm_tag_interface_t | tm_tag_struct_t | tm_tag_typedef_t | tm_tag_union_t; @@ -640,6 +643,34 @@ } +/* the following code surely can be improved, at the moment it collects some iters + * for removal and after that the actual removal is done. I didn't find a way to find and remove + * an empty row in one loop (next iter fails then) */ +static void hide_empty_rows(GtkTreeModel *model, GtkTreeStore *store) +{ + GtkTreeIter iter, *iters[MAX_SYMBOL_TYPES] = { NULL }; + gint i = 0; + + if (! gtk_tree_model_get_iter_first(model, &iter)) + return; // stop when first iter is invalid, i.e. no elements + + do // first collect the iters we need to delete empty rows + { + if (! gtk_tree_model_iter_has_child(model, &iter)) + iters[i++] = gtk_tree_iter_copy(&iter); + } while (gtk_tree_model_iter_next(model, &iter)); + + // now actually delete the collected iters + for (i = 0; i < MAX_SYMBOL_TYPES; i++) + { + if (iters[i] == NULL) + break; + gtk_tree_store_remove(store, iters[i]); + gtk_tree_iter_free(iters[i]); + } +} + + gboolean symbols_recreate_tag_list(gint idx) { GList *tmp; @@ -742,6 +773,7 @@ g_object_unref(icon); } } + hide_empty_rows(model, doc_list[idx].tag_store); gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), model); // Re-attach model to view g_object_unref(model); gtk_tree_view_expand_all(GTK_TREE_VIEW(doc_list[idx].tag_tree)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1755] trunk
by eht16＠users.sourceforge.net 28 Jul '07

28 Jul '07

Revision: 1755 http://geany.svn.sourceforge.net/geany/?rev=1755&view=rev Author: eht16 Date: 2007-07-28 04:47:56 -0700 (Sat, 28 Jul 2007) Log Message: ----------- Only show the separator between built-in Tools menu items and plugins if there are any plugins. Use PACKAGE_LIB_DIR. Load plugins in ~/.geany/plugins/ prior to the default location. Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-28 10:27:42 UTC (rev 1754) +++ trunk/ChangeLog 2007-07-28 11:47:56 UTC (rev 1755) @@ -5,6 +5,11 @@ Allow using auto completion in PHP files outside of the PHP tags, generally in comments, for news files without filetype and on non-empty lines. + * src/Makefile.am, src/plugins.c: + Only show the separator between built-in Tools menu items and plugins + if there are any plugins. + Use PACKAGE_LIB_DIR. + Load plugins in ~/.geany/plugins/ prior to the default location. 2007-07-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-07-28 10:27:42 UTC (rev 1754) +++ trunk/src/Makefile.am 2007-07-28 11:47:56 UTC (rev 1755) @@ -80,7 +80,8 @@ endif INCLUDES = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@ clean-local: Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-07-28 10:27:42 UTC (rev 1754) +++ trunk/src/plugins.c 2007-07-28 11:47:56 UTC (rev 1755) @@ -263,15 +263,9 @@ } -// TODO: Pass -DLIBDIR=\"$(libdir)/geany\" in Makefile.am -#define LIBDIR \ - PACKAGE_DATA_DIR G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "lib" \ - G_DIR_SEPARATOR_S PACKAGE - static void -load_plugins() +load_plugins(const gchar *path) { - const gchar *path = LIBDIR; GSList *list, *item; list = utils_get_file_list(path, NULL, NULL); @@ -297,14 +291,22 @@ void plugins_init() { GtkWidget *widget; + gchar *path_user; geany_data_init(); widget = gtk_separator_menu_item_new(); - gtk_widget_show(widget); gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), widget); - load_plugins(); + path_user = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", NULL); + // first load plugins in ~/.geany/plugins/, then in $prefix/lib/geany + load_plugins(path_user); + load_plugins(PACKAGE_LIB_DIR G_DIR_SEPARATOR_S "geany"); + + if (g_list_length(plugin_list) > 0) + gtk_widget_show(widget); + + g_free(path_user); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1754] trunk
by eht16＠users.sourceforge.net 28 Jul '07

28 Jul '07

Revision: 1754 http://geany.svn.sourceforge.net/geany/?rev=1754&view=rev Author: eht16 Date: 2007-07-28 03:27:42 -0700 (Sat, 28 Jul 2007) Log Message: ----------- Rename editor_auto_forif() in editor_auto_complete(). Allow using auto completion in PHP files outside of the PHP tags, generally in comments, for news files without filetype and on non-empty lines. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/editor.h trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-27 11:56:50 UTC (rev 1753) +++ trunk/ChangeLog 2007-07-28 10:27:42 UTC (rev 1754) @@ -1,3 +1,12 @@ +2007-07-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c, src/editor.h, src/keybindings.c: + Rename editor_auto_forif() in editor_auto_complete(). + Allow using auto completion in PHP files outside of the PHP tags, + generally in comments, for news files without filetype and on + non-empty lines. + + 2007-07-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/demoplugin.c, plugins/htmlchars.c, plugins/classbuilder.c, Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-07-27 11:56:50 UTC (rev 1753) +++ trunk/src/editor.c 2007-07-28 10:27:42 UTC (rev 1754) @@ -1133,13 +1133,15 @@ gchar *lindent; gchar *whitespace; gint step, str_len; + gint ft_id = FILETYPE_ID(doc_list[idx].file_type); GHashTable *specials; ScintillaObject *sci = doc_list[idx].sci; str = g_strdup(word); g_strstrip(str); - pattern = ac_find_completion_by_name(doc_list[idx].file_type->name, str); + pattern = ac_find_completion_by_name(filetypes[ft_id]->name, str); + geany_debug("-%s- -%s-", word, pattern); if (pattern == NULL || pattern[0] == '\0') { utils_free_pointers(str, pattern, NULL); // free pattern in case it is "" @@ -1201,15 +1203,13 @@ } -gboolean editor_auto_forif(gint idx, gint pos) +gboolean editor_auto_complete(gint idx, gint pos) { gboolean result = FALSE; - gchar *word; gint lexer, style; - gint i; ScintillaObject *sci; - if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) + if (! DOC_IDX_VALID(idx)) return FALSE; sci = doc_list[idx].sci; @@ -1219,40 +1219,17 @@ lexer = SSM(sci, SCI_GETLEXER, 0, 0); style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); - // return, if we are in a comment - if (is_comment(lexer, style)) - return FALSE; - // never auto complete in a PHP file outside of the <? ?> tags - if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) - return FALSE; - // get the current line contents - word = sci_get_line(sci, SSM(sci, SCI_LINEFROMPOSITION, pos, 0)); + editor_find_current_word(sci, pos, current_word, sizeof current_word, NULL); - /* check that the chars before the current word are only whitespace (on this line). - * this prevents completion of '} while ' */ - i = strlen(word) - 1; - while (i >= 0 && isspace(word[i])) i--; // skip trailing whitespace - while (i >= 0 && isalpha(word[i])) i--; // find pos before keyword - while (i >= 0 && word[i] != '\n' && word[i] != '\r') // we want to stay in this line('\n' check) - { - if (! isspace(word[i])) - { - g_free(word); - return FALSE; - } - i--; - } - // prevent completion of "for " if (! isspace(sci_get_char_at(sci, pos - 1))) // pos points to the line end char so use pos -1 { sci_start_undo_action(sci); // needed because we insert a space separately from construct - result = ac_complete_constructs(idx, pos, word); + result = ac_complete_constructs(idx, pos, current_word); sci_end_undo_action(sci); } - utils_free_pointers(word, NULL); return result; } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2007-07-27 11:56:50 UTC (rev 1753) +++ trunk/src/editor.h 2007-07-28 10:27:42 UTC (rev 1754) @@ -104,7 +104,7 @@ void editor_close_block(gint idx, gint pos); -gboolean editor_auto_forif(gint idx, gint pos); +gboolean editor_auto_complete(gint idx, gint pos); void editor_auto_latex(gint idx, gint pos); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-27 11:56:50 UTC (rev 1753) +++ trunk/src/keybindings.c 2007-07-28 10:27:42 UTC (rev 1754) @@ -632,7 +632,7 @@ gint pos = sci_get_current_position(sci); if (editor_prefs.auto_complete_constructs) - return editor_auto_forif(idx, pos); + return editor_auto_complete(idx, pos); } } return 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: [1753] trunk
by ntrel＠users.sourceforge.net 27 Jul '07

27 Jul '07

Revision: 1753 http://geany.svn.sourceforge.net/geany/?rev=1753&view=rev Author: ntrel Date: 2007-07-27 04:56:50 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Use AE spelling of 'color'. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-27 11:34:16 UTC (rev 1752) +++ trunk/ChangeLog 2007-07-27 11:56:50 UTC (rev 1753) @@ -12,6 +12,8 @@ Move Color Chooser and Word Count tools to tools.c. * src/plugins.c: Add separator between built-in Tools menu items and plugins. + * src/interface.c, src/keybindings.c, geany.glade: + Use AE spelling of 'color'. 2007-07-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-07-27 11:34:16 UTC (rev 1752) +++ trunk/geany.glade 2007-07-27 11:56:50 UTC (rev 1753) @@ -1340,7 +1340,7 @@ <widget class="GtkImageMenuItem" id="menu_choose_color1"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Open a color chooser dialog, to interactively pick colors from a palette.</property> - <property name="label" translatable="yes">_Colour Chooser</property> + <property name="label" translatable="yes">_Color Chooser</property> <property name="use_underline">True</property> <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> @@ -4408,8 +4408,8 @@ <child> <widget class="GtkCheckButton" id="check_toolbar_colour"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Display the Colour Chooser button in the toolbar</property> - <property name="label" translatable="yes">Show Colour Chooser button</property> + <property name="tooltip" translatable="yes">Display the Color Chooser button in the toolbar</property> + <property name="label" translatable="yes">Show Color Chooser button</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">False</property> @@ -4829,7 +4829,7 @@ <widget class="GtkCheckButton" id="checkbutton1"> <property name="tooltip" translatable="yes">Use white text on a black background.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Invert syntax highlighting colours</property> + <property name="label" translatable="yes">Invert syntax highlighting colors</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5121,7 +5121,7 @@ <child> <widget class="GtkRadioButton" id="radio_long_line_background"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)</property> + <property name="tooltip" translatable="yes">The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Background</property> <property name="use_underline">True</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-07-27 11:34:16 UTC (rev 1752) +++ trunk/src/interface.c 2007-07-27 11:56:50 UTC (rev 1753) @@ -937,7 +937,7 @@ tools1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (tools1), tools1_menu); - menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("_Colour Chooser")); + menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("_Color Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); @@ -3113,11 +3113,11 @@ gtk_tooltips_set_tip (tooltips, check_toolbar_compile, _("Display the Compile and Run buttons in the toolbar"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_compile), FALSE); - check_toolbar_colour = gtk_check_button_new_with_mnemonic (_("Show Colour Chooser button")); + check_toolbar_colour = gtk_check_button_new_with_mnemonic (_("Show Color Chooser button")); gtk_widget_show (check_toolbar_colour); gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_colour, FALSE, FALSE, 0); GTK_WIDGET_UNSET_FLAGS (check_toolbar_colour, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, check_toolbar_colour, _("Display the Colour Chooser button in the toolbar"), NULL); + gtk_tooltips_set_tip (tooltips, check_toolbar_colour, _("Display the Color Chooser button in the toolbar"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_colour), FALSE); check_toolbar_zoom = gtk_check_button_new_with_mnemonic (_("Show Zoom In and Zoom Out buttons")); @@ -3250,7 +3250,7 @@ gtk_widget_show (vbox12); gtk_container_add (GTK_CONTAINER (alignment6), vbox12); - checkbutton1 = gtk_check_button_new_with_mnemonic (_("Invert syntax highlighting colours")); + checkbutton1 = gtk_check_button_new_with_mnemonic (_("Invert syntax highlighting colors")); gtk_box_pack_start (GTK_BOX (vbox12), checkbutton1, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, checkbutton1, _("Use white text on a black background."), NULL); @@ -3348,7 +3348,7 @@ radio_long_line_background = gtk_radio_button_new_with_mnemonic (NULL, _("Background")); gtk_widget_show (radio_long_line_background); gtk_box_pack_start (GTK_BOX (hbox5), radio_long_line_background, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_long_line_background, _("The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)"), NULL); + gtk_tooltips_set_tip (tooltips, radio_long_line_background, _("The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)"), NULL); gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_background), radio_long_line_line_group); radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_background)); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-27 11:34:16 UTC (rev 1752) +++ trunk/src/keybindings.c 2007-07-27 11:56:50 UTC (rev 1753) @@ -187,7 +187,7 @@ GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out")); keys[GEANY_KEYS_MENU_OPENCOLORCHOOSER] = fill(cb_func_menu_opencolorchooser, - 0, 0, "menu_opencolorchooser", _("Show Colour Chooser")); + 0, 0, "menu_opencolorchooser", _("Show Color Chooser")); keys[GEANY_KEYS_MENU_INSERTSPECIALCHARS] = fill(cb_func_menu_insert_specialchars, 0, 0, "menu_insert_specialchars", _("Insert Special HTML Characters")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1752] trunk
by ntrel＠users.sourceforge.net 27 Jul '07

27 Jul '07

Revision: 1752 http://geany.svn.sourceforge.net/geany/?rev=1752&view=rev Author: ntrel Date: 2007-07-27 04:34:16 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Add separator between built-in Tools menu items and plugins. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-27 11:28:17 UTC (rev 1751) +++ trunk/ChangeLog 2007-07-27 11:34:16 UTC (rev 1752) @@ -10,6 +10,8 @@ * src/utils.c, src/utils.h, src/tools.c, src/tools.h, src/dialogs.c, src/callbacks.c, src/callbacks.h: Move Color Chooser and Word Count tools to tools.c. + * src/plugins.c: + Add separator between built-in Tools menu items and plugins. 2007-07-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-07-27 11:28:17 UTC (rev 1751) +++ trunk/src/plugins.c 2007-07-27 11:34:16 UTC (rev 1752) @@ -296,7 +296,14 @@ void plugins_init() { + GtkWidget *widget; + geany_data_init(); + + widget = gtk_separator_menu_item_new(); + gtk_widget_show(widget); + gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), widget); + load_plugins(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1751] trunk
by ntrel＠users.sourceforge.net 27 Jul '07

27 Jul '07

Revision: 1751 http://geany.svn.sourceforge.net/geany/?rev=1751&view=rev Author: ntrel Date: 2007-07-27 04:28:17 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Move Color Chooser and Word Count tools to tools.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/tools.c trunk/src/tools.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/ChangeLog 2007-07-27 11:28:17 UTC (rev 1751) @@ -7,6 +7,9 @@ Rename PluginData GeanyData (but use a typedef for backward compatibility). Update plugins to use newer API symbols. + * src/utils.c, src/utils.h, src/tools.c, src/tools.h, src/dialogs.c, + src/callbacks.c, src/callbacks.h: + Move Color Chooser and Word Count tools to tools.c. 2007-07-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/callbacks.c 2007-07-27 11:28:17 UTC (rev 1751) @@ -795,37 +795,6 @@ } -/* - * color dialog callbacks - */ -void -on_color_cancel_button_clicked (GtkButton *button, - gpointer user_data) -{ - gtk_widget_hide(app->open_colorsel); -} - - -void -on_color_ok_button_clicked (GtkButton *button, - gpointer user_data) -{ - GdkColor color; - gint idx = document_get_cur_idx(); - gchar *hex; - - gtk_widget_hide(app->open_colorsel); - if (idx == -1 || ! doc_list[idx].is_valid) return; - - gtk_color_selection_get_current_color( - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &color); - - hex = utils_get_hex_from_color(&color); - document_insert_colour(idx, hex); - g_free(hex); -} - - gboolean on_window_key_press_event (GtkWidget *widget, GdkEventKey *event, @@ -1104,7 +1073,7 @@ on_count_words1_activate (GtkMenuItem *menuitem, gpointer user_data) { - dialogs_show_word_count(); + tools_word_count(); } @@ -1120,7 +1089,7 @@ return; editor_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour, GEANY_WORDCHARS"#"); - dialogs_show_color(colour); + tools_color_chooser(colour); } Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/callbacks.h 2007-07-27 11:28:17 UTC (rev 1751) @@ -95,14 +95,6 @@ gpointer user_data); void -on_color_ok_button_clicked (GtkButton *button, - gpointer user_data); - -void -on_color_cancel_button_clicked (GtkButton *button, - gpointer user_data); - -void on_save_all1_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/dialogs.c 2007-07-27 11:28:17 UTC (rev 1751) @@ -22,7 +22,7 @@ */ /* - * File related dialogs, miscellaneous dialogs. + * File related dialogs, miscellaneous dialogs, font dialog. */ #include "geany.h" @@ -721,149 +721,6 @@ } -void dialogs_show_word_count() -{ - GtkWidget *dialog, *label, *vbox, *table; - gint idx; - guint chars, lines, words; - gchar *text, *range; - - idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - - dialog = gtk_dialog_new_with_buttons(_("Word Count"), GTK_WINDOW(app->window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - - if (sci_can_copy(doc_list[idx].sci)) - { - text = g_malloc0(sci_get_selected_text_length(doc_list[idx].sci) + 1); - sci_get_selected_text(doc_list[idx].sci, text); - range = _("selection"); - } - else - { - text = g_malloc(sci_get_length(doc_list[idx].sci) + 1); - sci_get_text(doc_list[idx].sci, sci_get_length(doc_list[idx].sci) + 1 , text); - range = _("whole document"); - } - utils_wordcount(text, &chars, &lines, &words); - g_free(text); - - table = gtk_table_new(4, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 5); - gtk_table_set_col_spacings(GTK_TABLE(table), 10); - - label = gtk_label_new(_("Range:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - label = gtk_label_new(range); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 20, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - - label = gtk_label_new(_("Lines:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - text = g_strdup_printf("%d", lines); - label = gtk_label_new(text); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 20, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - g_free(text); - - label = gtk_label_new(_("Words:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - text = g_strdup_printf("%d", words); - label = gtk_label_new(text); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 20, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - g_free(text); - - label = gtk_label_new(_("Characters:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - text = g_strdup_printf("%d", chars); - label = gtk_label_new(text); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 20, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - g_free(text); - - gtk_container_add(GTK_CONTAINER(vbox), table); - - g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); - g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_destroy), dialog); - - gtk_widget_show_all(dialog); -} - - -/* This shows the color selection dialog to choose a color. */ -void dialogs_show_color(gchar *colour) -{ -#ifdef G_OS_WIN32 - win32_show_color_dialog(colour); -#else - - if (app->open_colorsel == NULL) - { - app->open_colorsel = gtk_color_selection_dialog_new(_("Color Chooser")); - gtk_widget_set_name(app->open_colorsel, "GeanyDialog"); - gtk_window_set_transient_for(GTK_WINDOW(app->open_colorsel), GTK_WINDOW(app->window)); - gtk_color_selection_set_has_palette( - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), TRUE); - - g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->cancel_button, "clicked", - G_CALLBACK(on_color_cancel_button_clicked), NULL); - g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->ok_button, "clicked", - G_CALLBACK(on_color_ok_button_clicked), NULL); - g_signal_connect(app->open_colorsel, "delete_event", - G_CALLBACK(gtk_widget_hide_on_delete), NULL); - } - // if colour is non-NULL set it in the dialog as preselected colour - if (colour != NULL && (colour[0] == '0' || colour[0] == '#')) - { - GdkColor gc; - - if (colour[0] == '0' && colour[1] == 'x') - { // we have a string of the format "0x00ff00" and we need it to "#00ff00" - colour[1] = '#'; - colour++; - } - gdk_color_parse(colour, &gc); - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( - GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &gc); - gtk_color_selection_set_previous_color(GTK_COLOR_SELECTION( - GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &gc); - } - - // We make sure the dialog is visible. - gtk_window_present(GTK_WINDOW(app->open_colorsel)); -#endif -} - - void dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, GCallback cb_dialog, GCallback cb_entry) { Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/tools.c 2007-07-27 11:28:17 UTC (rev 1751) @@ -22,7 +22,8 @@ */ /* - * Miscellaneous code for the Tools menu items. + * Miscellaneous code for the built-in Tools menu items, and custom command code. + * For Plugins code see plugins.c. */ #include "geany.h" @@ -454,3 +455,230 @@ } } + +/* (stolen from bluefish, thanks) + * Returns number of characters, lines and words in the supplied gchar*. + * Handles UTF-8 correctly. Input must be properly encoded UTF-8. + * Words are defined as any characters grouped, separated with spaces. + */ +static void +word_count(gchar *text, guint *chars, guint *lines, guint *words) +{ + guint in_word = 0; + gunichar utext; + + if (!text) return; // politely refuse to operate on NULL + + *chars = *words = *lines = 0; + while (*text != '\0') + { + (*chars)++; + + switch (*text) + { + case '\n': + (*lines)++; + case '\r': + case '\f': + case '\t': + case ' ': + case '\v': + mb_word_separator: + if (in_word) + { + in_word = 0; + (*words)++; + } + break; + default: + utext = g_utf8_get_char_validated(text, 2); // This might be an utf-8 char + if (g_unichar_isspace(utext)) // Unicode encoded space? + goto mb_word_separator; + if (g_unichar_isgraph(utext)) // Is this something printable? + in_word = 1; + break; + } + text = g_utf8_next_char(text); // Even if the current char is 2 bytes, this will iterate correctly. + } + + // Capture last word, if there's no whitespace at the end of the file. + if (in_word) (*words)++; + // We start counting line numbers from 1 + if (*chars > 0) (*lines)++; +} + + +void tools_word_count() +{ + GtkWidget *dialog, *label, *vbox, *table; + gint idx; + guint chars = 0, lines = 0, words = 0; + gchar *text, *range; + + idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; + + dialog = gtk_dialog_new_with_buttons(_("Word Count"), GTK_WINDOW(app->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); + vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); + + if (sci_can_copy(doc_list[idx].sci)) + { + text = g_malloc0(sci_get_selected_text_length(doc_list[idx].sci) + 1); + sci_get_selected_text(doc_list[idx].sci, text); + range = _("selection"); + } + else + { + text = g_malloc(sci_get_length(doc_list[idx].sci) + 1); + sci_get_text(doc_list[idx].sci, sci_get_length(doc_list[idx].sci) + 1 , text); + range = _("whole document"); + } + word_count(text, &chars, &lines, &words); + g_free(text); + + table = gtk_table_new(4, 2, FALSE); + gtk_table_set_row_spacings(GTK_TABLE(table), 5); + gtk_table_set_col_spacings(GTK_TABLE(table), 10); + + label = gtk_label_new(_("Range:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + + label = gtk_label_new(range); + gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 20, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + + label = gtk_label_new(_("Lines:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + + text = g_strdup_printf("%d", lines); + label = gtk_label_new(text); + gtk_table_attach(GTK_TABLE(table), label, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 20, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + g_free(text); + + label = gtk_label_new(_("Words:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + + text = g_strdup_printf("%d", words); + label = gtk_label_new(text); + gtk_table_attach(GTK_TABLE(table), label, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 20, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + g_free(text); + + label = gtk_label_new(_("Characters:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + + text = g_strdup_printf("%d", chars); + label = gtk_label_new(text); + gtk_table_attach(GTK_TABLE(table), label, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 20, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + g_free(text); + + gtk_container_add(GTK_CONTAINER(vbox), table); + + g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); + g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_destroy), dialog); + + gtk_widget_show_all(dialog); +} + + +/* + * color dialog callbacks + */ +static void +on_color_cancel_button_clicked (GtkButton *button, + gpointer user_data) +{ + gtk_widget_hide(app->open_colorsel); +} + + +static void +on_color_ok_button_clicked (GtkButton *button, + gpointer user_data) +{ + GdkColor color; + gint idx = document_get_cur_idx(); + gchar *hex; + + gtk_widget_hide(app->open_colorsel); + if (idx == -1 || ! doc_list[idx].is_valid) return; + + gtk_color_selection_get_current_color( + GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &color); + + hex = utils_get_hex_from_color(&color); + document_insert_colour(idx, hex); + g_free(hex); +} + + +/* This shows the color selection dialog to choose a color. */ +void tools_color_chooser(gchar *color) +{ +#ifdef G_OS_WIN32 + win32_show_color_dialog(color); +#else + + if (app->open_colorsel == NULL) + { + app->open_colorsel = gtk_color_selection_dialog_new(_("Color Chooser")); + gtk_widget_set_name(app->open_colorsel, "GeanyDialog"); + gtk_window_set_transient_for(GTK_WINDOW(app->open_colorsel), GTK_WINDOW(app->window)); + gtk_color_selection_set_has_palette( + GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), TRUE); + + g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->cancel_button, "clicked", + G_CALLBACK(on_color_cancel_button_clicked), NULL); + g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->ok_button, "clicked", + G_CALLBACK(on_color_ok_button_clicked), NULL); + g_signal_connect(app->open_colorsel, "delete_event", + G_CALLBACK(gtk_widget_hide_on_delete), NULL); + } + // if color is non-NULL set it in the dialog as preselected color + if (color != NULL && (color[0] == '0' || color[0] == '#')) + { + GdkColor gc; + + if (color[0] == '0' && color[1] == 'x') + { // we have a string of the format "0x00ff00" and we need it to "#00ff00" + color[1] = '#'; + color++; + } + gdk_color_parse(color, &gc); + gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( + GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &gc); + gtk_color_selection_set_previous_color(GTK_COLOR_SELECTION( + GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), &gc); + } + + // We make sure the dialog is visible. + gtk_window_present(GTK_WINDOW(app->open_colorsel)); +#endif +} + + Modified: trunk/src/tools.h =================================================================== --- trunk/src/tools.h 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/tools.h 2007-07-27 11:28:17 UTC (rev 1751) @@ -29,4 +29,9 @@ void tools_execute_custom_command(gint idx, const gchar *command); + +void tools_word_count(); + +void tools_color_chooser(gchar *color); + #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/utils.c 2007-07-27 11:28:17 UTC (rev 1751) @@ -617,57 +617,6 @@ } -/* (stolen from bluefish, thanks) - * Returns number of characters, lines and words in the supplied gchar*. - * Handles UTF-8 correctly. Input must be properly encoded UTF-8. - * Words are defined as any characters grouped, separated with spaces. - */ -void utils_wordcount(gchar *text, guint *chars, guint *lines, guint *words) -{ - guint in_word = 0; - gunichar utext; - - if (!text) return; // politely refuse to operate on NULL - - *chars = *words = *lines = 0; - while (*text != '\0') - { - (*chars)++; - - switch (*text) - { - case '\n': - (*lines)++; - case '\r': - case '\f': - case '\t': - case ' ': - case '\v': - mb_word_separator: - if (in_word) - { - in_word = 0; - (*words)++; - } - break; - default: - utext = g_utf8_get_char_validated(text, 2); // This might be an utf-8 char - if (g_unichar_isspace(utext)) // Unicode encoded space? - goto mb_word_separator; - if (g_unichar_isgraph(utext)) // Is this something printable? - in_word = 1; - break; - } - text = g_utf8_next_char(text); // Even if the current char is 2 bytes, this will iterate correctly. - } - - // Capture last word, if there's no whitespace at the end of the file. - if (in_word) (*words)++; - // We start counting line numbers from 1 - if (*chars > 0) (*lines)++; -} - - /* currently unused */ gboolean utils_is_absolute_path(const gchar *path) { Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-07-27 10:43:25 UTC (rev 1750) +++ trunk/src/utils.h 2007-07-27 11:28:17 UTC (rev 1751) @@ -78,8 +78,6 @@ gboolean utils_atob(const gchar *str); -void utils_wordcount(gchar *text, guint *chars, guint *lines, guint *words); - gboolean utils_is_absolute_path(const gchar *path); gdouble utils_scale_round(gdouble val, gdouble factor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1750] trunk/ChangeLog
by ntrel＠users.sourceforge.net 27 Jul '07

27 Jul '07

Revision: 1750 http://geany.svn.sourceforge.net/geany/?rev=1750&view=rev Author: ntrel Date: 2007-07-27 03:43:25 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Use new email address. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-27 10:37:22 UTC (rev 1749) +++ trunk/ChangeLog 2007-07-27 10:43:25 UTC (rev 1750) @@ -1,4 +1,4 @@ -2007-07-27 Nick Treleaven <nick.treleaven(a)btinternet.com> +2007-07-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/demoplugin.c, plugins/htmlchars.c, plugins/classbuilder.c, src/plugindata.h, src/plugins.c: @@ -9,7 +9,7 @@ Update plugins to use newer API symbols. -2007-07-26 Nick Treleaven <nick.treleaven(a)btinternet.com> +2007-07-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/highlighting.c: Ignore whitespace_chars for Haxe. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1749] trunk
by ntrel＠users.sourceforge.net 27 Jul '07

27 Jul '07

Revision: 1749 http://geany.svn.sourceforge.net/geany/?rev=1749&view=rev Author: ntrel Date: 2007-07-27 03:37:22 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Add GeanyData* geany_data symbol for plugins so they don't have to keep a copy of the init() argument. Rename PluginData GeanyData (but use a typedef for backward compatibility). Update plugins to use newer API symbols. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c trunk/plugins/demoplugin.c trunk/plugins/htmlchars.c trunk/src/plugindata.h trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/ChangeLog 2007-07-27 10:37:22 UTC (rev 1749) @@ -1,3 +1,14 @@ +2007-07-27 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * plugins/demoplugin.c, plugins/htmlchars.c, plugins/classbuilder.c, + src/plugindata.h, src/plugins.c: + Add GeanyData* geany_data symbol for plugins so they don't have to + keep a copy of the init() argument. + Rename PluginData GeanyData (but use a typedef for backward + compatibility). + Update plugins to use newer API symbols. + + 2007-07-26 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/highlighting.c: Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/plugins/classbuilder.c 2007-07-27 10:37:22 UTC (rev 1749) @@ -32,26 +32,20 @@ #include "document.h" -static PluginData *plugin_data; +PluginFields *plugin_fields; +GeanyData *geany_data; -#define doc_array plugin_data->doc_array +#define doc_array geany_data->doc_array // can't use document as a macro because it's currently a typename -#define documents plugin_data->document -#define scintilla plugin_data->sci -#define templates plugin_data->templates -#define utils plugin_data->utils -#define ui plugin_data->ui +#define documents geany_data->document +#define scintilla geany_data->sci +#define templates geany_data->templates +#define utils geany_data->utils +#define ui geany_data->ui -static struct -{ - GtkWidget *menu_item; -} -local_data; +VERSION_CHECK(7) - -VERSION_CHECK(4) - PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types.")) @@ -369,7 +363,7 @@ cc_dlg->class_type = type; cc_dlg->dialog = gtk_dialog_new_with_buttons(_("Create Class"), - GTK_WINDOW(plugin_data->app->window), + GTK_WINDOW(geany_data->app->window), GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -783,7 +777,7 @@ } -void init(PluginData *data) +void init(GeanyData *data) { GtkWidget *menu_create_class1; GtkWidget *image1861; @@ -791,8 +785,6 @@ GtkWidget *menu_create_cpp_class; GtkWidget *menu_create_gtk_class; - plugin_data = data; - menu_create_class1 = gtk_image_menu_item_new_with_mnemonic (_("Create Cla_ss")); gtk_container_add (GTK_CONTAINER (data->tools_menu), menu_create_class1); @@ -817,11 +809,11 @@ gtk_widget_show_all(menu_create_class1); - local_data.menu_item = menu_create_class1; + plugin_fields->menu_item = menu_create_class1; } void cleanup() { - gtk_widget_destroy(local_data.menu_item); + gtk_widget_destroy(plugin_fields->menu_item); } Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/plugins/demoplugin.c 2007-07-27 10:37:22 UTC (rev 1749) @@ -29,18 +29,13 @@ #include "plugindata.h" -static PluginData *plugin_data; +PluginFields *plugin_fields; +GeanyData *geany_data; -static struct -{ - GtkWidget *menu_item; -} -local_data; - /* Check that Geany supports plugin API version 2 or later, and check * for binary compatibility. */ -VERSION_CHECK(2) +VERSION_CHECK(7) /* All plugins must set name and description */ PLUGIN_INFO(_("Demo"), _("Example plugin.")) @@ -53,7 +48,7 @@ GtkWidget *dialog; dialog = gtk_message_dialog_new( - GTK_WINDOW(plugin_data->app->window), + GTK_WINDOW(geany_data->app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, @@ -67,20 +62,18 @@ /* Called by Geany to initialize the plugin */ -void init(PluginData *data) +void init(GeanyData *data) { GtkWidget *demo_item; - plugin_data = data; // keep a pointer to the main application fields & functions - // Add an item to the Tools menu demo_item = gtk_menu_item_new_with_mnemonic(_("_Demo Plugin")); gtk_widget_show(demo_item); - gtk_container_add(GTK_CONTAINER(plugin_data->tools_menu), demo_item); + gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), demo_item); g_signal_connect(G_OBJECT(demo_item), "activate", G_CALLBACK(item_activate), NULL); // keep a pointer to the menu item, so we can remove it when the plugin is unloaded - local_data.menu_item = demo_item; + plugin_fields->menu_item = demo_item; } @@ -89,5 +82,5 @@ void cleanup() { // remove the menu item added in init() - gtk_widget_destroy(local_data.menu_item); + gtk_widget_destroy(plugin_fields->menu_item); } Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/plugins/htmlchars.c 2007-07-27 10:37:22 UTC (rev 1749) @@ -30,18 +30,17 @@ #include "document.h" -PluginFields *plugin_fields; +PluginFields *plugin_fields; +GeanyData *geany_data; -static PluginData *plugin_data; - -#define doc_array plugin_data->doc_array +#define doc_array geany_data->doc_array // can't use document as a macro because it's currently a typename -#define documents plugin_data->document -#define scintilla plugin_data->sci -#define ui plugin_data->ui +#define documents geany_data->document +#define scintilla geany_data->sci +#define ui geany_data->ui -VERSION_CHECK(5) +VERSION_CHECK(7) PLUGIN_INFO(_("HTML Characters"), _("Inserts HTML character entities like '&'.")) @@ -76,7 +75,7 @@ GtkWidget *swin, *vbox, *label; sc_dialog = gtk_dialog_new_with_buttons( - _("Special Characters"), GTK_WINDOW(plugin_data->app->window), + _("Special Characters"), GTK_WINDOW(geany_data->app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Insert"), GTK_RESPONSE_OK, NULL); vbox = ui->dialog_vbox_new(GTK_DIALOG(sc_dialog)); @@ -509,16 +508,14 @@ /* Called by Geany to initialize the plugin */ -void init(PluginData *data) +void init(GeanyData *data) { GtkWidget *demo_item; - plugin_data = data; // keep a pointer to the main application fields & functions - // Add an item to the Tools menu demo_item = gtk_menu_item_new_with_mnemonic(_("_Insert Special HTML Characters")); gtk_widget_show(demo_item); - gtk_container_add(GTK_CONTAINER(plugin_data->tools_menu), demo_item); + gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), demo_item); g_signal_connect(G_OBJECT(demo_item), "activate", G_CALLBACK(item_activate), NULL); // disable menu_item when there are no documents open Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/src/plugindata.h 2007-07-27 10:37:22 UTC (rev 1749) @@ -34,11 +34,14 @@ * PluginInfo* info() * Use PLUGIN_INFO() macro to define it. Required by Geany. * + * GeanyData* geany_data + * Geany owned fields and functions. + * * PluginFields* plugin_fields * Plugin owned fields, including flags. * - * void init(PluginData *data) - * Called after loading the plugin. + * void init(GeanyData *data) + * Called after loading the plugin. data is the same as geany_data. * * void cleanup() * Called before unloading the plugin. Required for normal plugins - it should undo @@ -48,7 +51,7 @@ /* The API version should be incremented whenever any plugin data types below are * modified. */ -static const gint api_version = 6; +static const gint api_version = 7; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields @@ -95,7 +98,9 @@ } PluginFlags; -/* Fields set and owned by the plugin */ +/* Fields set and owned by the plugin. + * Note: Remember to increment api_version (and abi_version if necessary) when + * making changes. */ typedef struct PluginFields { PluginFlags flags; @@ -111,10 +116,10 @@ typedef struct UIUtilsFuncs UIUtilsFuncs; /* These are fields and functions owned by Geany. - * Fields will be appended when needed by plugin authors. + * Fields and functions will be appended when needed by plugin authors. * Note: Remember to increment api_version (and abi_version if necessary) when * making changes. */ -typedef struct PluginData +typedef struct GeanyData { MyApp *app; // Geany application data fields GtkWidget *tools_menu; // Almost all plugins should add menu items to the Tools menu only @@ -126,11 +131,13 @@ UtilsFuncs *utils; UIUtilsFuncs *ui; } -PluginData; +GeanyData; +typedef GeanyData PluginData; // for compatibility with API < 7 + /* For more info about these functions, see the main source code. - * E.g. for PluginData::document->new_file(), see document_new_file() in document.[hc]. */ + * E.g. for GeanyData::document->new_file(), see document_new_file() in document.[hc]. */ struct filetype; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-07-26 12:12:54 UTC (rev 1748) +++ trunk/src/plugins.c 2007-07-27 10:37:22 UTC (rev 1749) @@ -45,7 +45,7 @@ PluginFields fields; PluginInfo* (*info) (); /* Returns plugin name, description */ - void (*init) (PluginData *data); /* Called when the plugin is enabled */ + void (*init) (GeanyData *data); /* Called when the plugin is enabled */ void (*cleanup) (); /* Called when the plugin is disabled or when Geany exits */ } Plugin; @@ -85,7 +85,8 @@ &ui_frame_new_with_alignment }; -static PluginData geany_data = { + +static GeanyData geany_data = { NULL, NULL, NULL, @@ -162,6 +163,7 @@ GModule *module; PluginInfo* (*info)(); PluginFields **plugin_fields; + GeanyData **p_geany_data; g_return_val_if_fail(fname, NULL); g_return_val_if_fail(g_module_supported(), NULL); @@ -211,6 +213,9 @@ plugin->filename = g_strdup(fname); plugin->module = module; + g_module_symbol(module, "geany_data", (void *) &p_geany_data); + if (p_geany_data) + *p_geany_data = &geany_data; g_module_symbol(module, "plugin_fields", (void *) &plugin_fields); if (plugin_fields) *plugin_fields = &plugin->fields; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1748] trunk
by ntrel＠users.sourceforge.net 26 Jul '07

26 Jul '07

Revision: 1748 http://geany.svn.sourceforge.net/geany/?rev=1748&view=rev Author: ntrel Date: 2007-07-26 05:12:54 -0700 (Thu, 26 Jul 2007) Log Message: ----------- Ignore intltool, geany.desktop.in, po/stamp.it. Property Changed: ---------------- trunk/ trunk/po/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in aclocal.m4 config.h config.h.in config.log config.status configure libtool stamp-h stamp-h1 stamp-h.in global.tags.old autom4te.cache config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs codenames geany.glade.bak geany.gladep.bak TODO.* RUN make_deb.sh build-stamp geany.1 geany.spec geany.desktop *.tar.* debian + Makefile Makefile.in aclocal.m4 config.h config.h.in config.log config.status configure libtool stamp-h stamp-h1 stamp-h.in global.tags.old autom4te.cache config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs codenames geany.glade.bak geany.gladep.bak TODO.* RUN make_deb.sh build-stamp geany.1 geany.spec geany.desktop geany.desktop.in *.tar.* debian intltool intltool-* Property changes on: trunk/po ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in Makefile.in.in POTFILES POTFILES.in.missing POTFILES.in.noi18n POTFILES.ignore Rules-quot *.gmo *.mo Makevars *.sed *.header *.sin ChangeLog.save + Makefile Makefile.in Makefile.in.in POTFILES POTFILES.in.missing POTFILES.in.noi18n POTFILES.ignore Rules-quot *.gmo *.mo Makevars *.sed *.header *.sin ChangeLog.save stamp-it .intltool-merge-cache 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 July 2007