Plugins-Commits August 2011

plugins-commits@lists.geany.org

8 participants
73 discussions

SF.net SVN: geany-plugins:[2187] trunk/geany-plugins/pretty-printer/src/ PrettyPrinter.c
by ctabin＠users.sourceforge.net 01 Sep '11

01 Sep '11

Revision: 2187 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2187&view=rev Author: ctabin Date: 2011-08-31 22:24:52 +0000 (Wed, 31 Aug 2011) Log Message: ----------- Pretty-Printer: reallocation bugfix (C.Wendling) Modified Paths: -------------- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-08-31 19:52:27 UTC (rev 2186) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-08-31 22:24:52 UTC (rev 2187) @@ -73,6 +73,8 @@ //============================================ GENERAL FUNCTIONS ======================================= +#define PP_ERROR(format, ...) fprintf(stderr, format "\n", ##__VA_ARGS__); + int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* ppOptions) { //empty buffer, nothing to process @@ -101,7 +103,7 @@ xmlPrettyPrintedLength = *length; xmlPrettyPrinted = (char*)malloc(sizeof(char)*(*length)); - if (xmlPrettyPrinted == NULL) { fprintf(stderr, "Allocation error"); return PRETTY_PRINTING_SYSTEM_ERROR; } + if (xmlPrettyPrinted == NULL) { PP_ERROR("Allocation error (initialisation)"); return PRETTY_PRINTING_SYSTEM_ERROR; } //go to the first char readWhites(TRUE); @@ -113,8 +115,9 @@ putCharInBuffer('\0'); //adjust the final size - xmlPrettyPrinted = realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); - if (xmlPrettyPrinted == NULL) { fprintf(stderr, "Allocation error"); return PRETTY_PRINTING_SYSTEM_ERROR; } + char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); + if (reallocated == NULL) { PP_ERROR("Allocation error (reallocation size is %d)", xmlPrettyPrintedIndex); return PRETTY_PRINTING_SYSTEM_ERROR; } + xmlPrettyPrinted = reallocated; //freeing the unused values if (freeOptions) { free(options); } @@ -147,7 +150,7 @@ PrettyPrintingOptions* defaultOptions = (PrettyPrintingOptions*)malloc(sizeof(PrettyPrintingOptions)); if (defaultOptions == NULL) { - fprintf(stderr, "Unable to allocate memory for PrettyPrintingOptions"); + PP_ERROR("Unable to allocate memory for PrettyPrintingOptions"); return NULL; } @@ -189,8 +192,9 @@ { if (charToAdd == '\0') { ++xmlPrettyPrintedLength; } else { xmlPrettyPrintedLength += inputBufferLength; } - xmlPrettyPrinted = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); - if (xmlPrettyPrinted == NULL) { fprintf(stderr, "Allocation error"); return; } + char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); + if (reallocated == NULL) { PP_ERROR("Allocation error (char was %c)", charToAdd); return; } + xmlPrettyPrinted = reallocated; } //putting the char and increase the index for the next one @@ -576,7 +580,7 @@ //store the name char* nodeName = (char*)malloc(sizeof(char)*nodeNameLength+1); - if (nodeName == NULL) { fprintf(stderr, "Allocation error"); return ; } + if (nodeName == NULL) { PP_ERROR("Allocation error (node name length is %d)", nodeNameLength); return ; } nodeName[nodeNameLength] = '\0'; int i; for (i=0 ; i<nodeNameLength ; ++i) @@ -1083,7 +1087,7 @@ #ifdef HAVE_GLIB g_warning(msg, va); #else - fprintf(stderr, msg, va); + PP_ERROR(msg, va); #endif va_end(va); @@ -1100,7 +1104,7 @@ xmlPrettyPrintedLength, xmlPrettyPrintedIndex); #else - fprintf(stderr, "\n===== INPUT =====\n%s\n=================\ninputLength = %d\ninputIndex = %d\noutputLength = %d\noutputIndex = %d\n", + PP_ERROR("\n===== INPUT =====\n%s\n=================\ninputLength = %d\ninputIndex = %d\noutputLength = %d\noutputIndex = %d\n", inputBuffer, inputBufferLength, inputBufferIndex, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2186] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 31 Aug '11

31 Aug '11

Revision: 2186 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2186&view=rev Author: cesspit Date: 2011-08-31 19:52:27 +0000 (Wed, 31 Aug 2011) Log Message: ----------- debugger: several gui fixes Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/vtree.c trunk/geany-plugins/debugger/src/watch_model.h Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -331,7 +331,6 @@ /* set tree view properties */ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), 1); - gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(tree), GTK_TREE_VIEW_GRID_LINES_VERTICAL); /* multiple selection */ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -717,12 +717,10 @@ /* locals */ GList *locals = active_module->get_locals(); update_variables(GTK_TREE_VIEW(ltree), NULL, locals); - gtk_tree_view_columns_autosize (GTK_TREE_VIEW(ltree)); /* watches */ GList *watches = active_module->get_watches(); update_variables(GTK_TREE_VIEW(wtree), NULL, watches); - gtk_tree_view_columns_autosize (GTK_TREE_VIEW(wtree)); if (stack) { @@ -937,6 +935,7 @@ GtkWidget *scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(terminal)->adjustment)); GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); GtkWidget *_frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type (GTK_FRAME(_frame), GTK_SHADOW_NONE); GtkWidget *hbox = gtk_hbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(_frame), hbox); gtk_box_pack_start(GTK_BOX(hbox), terminal, TRUE, TRUE, 0); Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/stree.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -172,7 +172,6 @@ /* set tree view properties */ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), 1); - gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(tree), GTK_TREE_VIEW_GRID_LINES_VERTICAL); g_object_set(tree, "rules-hint", TRUE, NULL); /* connect signals */ Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -676,7 +676,6 @@ model = GTK_TREE_MODEL(store); envtree = gtk_tree_view_new_with_model (model); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(envtree), TRUE); - gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(envtree), GTK_TREE_VIEW_GRID_LINES_VERTICAL); g_object_set(envtree, "rules-hint", TRUE, NULL); g_signal_connect(G_OBJECT(envtree), "key-press-event", G_CALLBACK (on_envtree_keypressed), NULL); Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -38,10 +38,6 @@ /* character to calculate width */ #define CHAR_TESTED "W" -/* left / right paddings from the header text to the columns border */ -#define RENDERER_X_PADDING 5 -#define RENDERER_Y_PADDING 2 - /* * get character width in a widget */ @@ -74,14 +70,12 @@ */ GtkTreeViewColumn *create_column(const gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value) { - gtk_cell_renderer_set_padding(renderer, RENDERER_X_PADDING, RENDERER_Y_PADDING); - GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (name, renderer, arg, value, NULL); if (expandable) gtk_tree_view_column_set_expand(column, expandable); - else + else if (minwidth) gtk_tree_view_column_set_min_width(column, minwidth); return column; Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-08-31 19:52:27 UTC (rev 2186) @@ -34,20 +34,9 @@ #include "utils.h" /* columns minumum width in characters */ -#define MW_NAME 20 -#define MW_VALUE 0 -#define MW_TYPE 10 +#define MIN_COLUMN_CHARS 15 /* - * on row collapsed handler - */ -void on_row_collapsed (GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) -{ - /* autosize tree view columns */ - gtk_tree_view_columns_autosize (GTK_TREE_VIEW(tree_view)); -} - -/* * key pressed event */ static gboolean on_key_pressed(GtkWidget *widget, GdkEvent *event, gpointer user_data) @@ -111,6 +100,7 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); GtkWidget* tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); @@ -118,11 +108,9 @@ /* set tree view parameters */ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE); gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(tree), TRUE); - gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(tree), GTK_TREE_VIEW_GRID_LINES_VERTICAL); g_object_set(tree, "rules-hint", TRUE, NULL); /* connect signals */ - g_signal_connect(G_OBJECT(tree), "row-collapsed", G_CALLBACK (on_row_collapsed), NULL); g_signal_connect(G_OBJECT(tree), "key-press-event", G_CALLBACK (on_key_pressed), NULL); /* create columns */ @@ -130,14 +118,16 @@ GtkTreeViewColumn *column; const gchar *header; - int char_width = get_char_width(tree); + int min_column_with = MIN_COLUMN_CHARS * get_char_width(tree); /* Name */ header = _("Name"); renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_NAME, char_width), + min_column_with, "text", W_NAME); + gtk_tree_view_column_set_resizable (column, TRUE); if (on_render_name) gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_name, NULL, NULL); if (on_expression_changed) @@ -150,20 +140,33 @@ /* Value */ header = _("Value"); renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); column = create_column(header, renderer, TRUE, - get_header_string_width(header, MW_VALUE, char_width), + min_column_with, "text", W_VALUE); gtk_tree_view_column_set_cell_data_func(column, renderer, render_value, NULL, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Type */ header = _("Type"); renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_TYPE, char_width), + min_column_with, "text", W_TYPE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* Last invisible column */ + header = _(""); + renderer = gtk_cell_renderer_text_new (); + column = create_column(header, renderer, FALSE, + 0, + "text", W_LAST_VISIBLE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* Internal (unvisible column) */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Internal", renderer, "text", W_INTERNAL, NULL); Modified: trunk/geany-plugins/debugger/src/watch_model.h =================================================================== --- trunk/geany-plugins/debugger/src/watch_model.h 2011-08-30 20:24:21 UTC (rev 2185) +++ trunk/geany-plugins/debugger/src/watch_model.h 2011-08-31 19:52:27 UTC (rev 2186) @@ -25,6 +25,7 @@ W_NAME, W_VALUE, W_TYPE, + W_LAST_VISIBLE, W_INTERNAL, W_EXPRESSION, W_STUB, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2185] trunk/geany-plugins/devhelp/ wscript_configure
by eht16＠users.sourceforge.net 30 Aug '11

30 Aug '11

Revision: 2185 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2185&view=rev Author: eht16 Date: 2011-08-30 20:24:21 +0000 (Tue, 30 Aug 2011) Log Message: ----------- Fix Waf build if no suitable libdevhelp library is found Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_configure Modified: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure 2011-08-30 01:11:28 UTC (rev 2184) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-08-30 20:24:21 UTC (rev 2185) @@ -21,6 +21,7 @@ # # $Id: wscript_configure 1735 2010-11-09 17:03:40Z eht16 $ +from waflib.Errors import ConfigurationError from build.wafutils import add_to_env_and_define, check_cfg_cached packages = [ @@ -47,7 +48,10 @@ mandatory=False, args='--cflags --libs') -if not conf.env['HAVE_LIBDEVHELP'] == 1: + +if conf.env['HAVE_LIBDEVHELP'] == 1: + add_to_env_and_define(conf, 'HAVE_BOOK_MANAGER', 1) +else: # fallback check_cfg_cached(conf, package='libdevhelp-1.0', @@ -55,7 +59,6 @@ uselib_store='LIBDEVHELP', mandatory=False, args='--cflags --libs') -else: - add_to_env_and_define(conf, 'HAVE_BOOK_MANAGER', 1) - - + # finally raise an error if we didn't find any suitable devhelp library to disable this plugin + if not conf.env['HAVE_LIBDEVHELP'] == 1: + raise ConfigurationError(u'libdevhelp is necessary for the devhelp plugin') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2184] trunk/geany-plugins/devhelp
by codebrainz＠users.sourceforge.net 30 Aug '11

30 Aug '11

Revision: 2184 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2184&view=rev Author: codebrainz Date: 2011-08-30 01:11:28 +0000 (Tue, 30 Aug 2011) Log Message: ----------- Devhelp: Review and update plugin documentation files. Modified Paths: -------------- trunk/geany-plugins/devhelp/AUTHORS trunk/geany-plugins/devhelp/NEWS trunk/geany-plugins/devhelp/README Modified: trunk/geany-plugins/devhelp/AUTHORS =================================================================== --- trunk/geany-plugins/devhelp/AUTHORS 2011-08-28 20:12:29 UTC (rev 2183) +++ trunk/geany-plugins/devhelp/AUTHORS 2011-08-30 01:11:28 UTC (rev 2184) @@ -1 +1 @@ -Matthew Brush <mbrush(a)leftclick.ca> +Matthew Brush <mbrush(a)codebrainz.ca> Modified: trunk/geany-plugins/devhelp/NEWS =================================================================== --- trunk/geany-plugins/devhelp/NEWS 2011-08-28 20:12:29 UTC (rev 2183) +++ trunk/geany-plugins/devhelp/NEWS 2011-08-30 01:11:28 UTC (rev 2184) @@ -0,0 +1,16 @@ +Version 0.21 +------------ + + - Add support for searching Manual pages (if `man` program is available). + - Add support for search Google Code and loading the results into the + embedded WebKit browser. + - Code cleanups, bug fixes and refactoring. + + + +Initial Release - Post 0.20 +--------------------------- + + - Add the Devhelp plugin which integrates Devhelp user-interface directly + into Geany's user-interface, allowing to jump directly to relevant + GTK-DOC documentation from a selected symbol. Modified: trunk/geany-plugins/devhelp/README =================================================================== --- trunk/geany-plugins/devhelp/README 2011-08-28 20:12:29 UTC (rev 2183) +++ trunk/geany-plugins/devhelp/README 2011-08-30 01:11:28 UTC (rev 2184) @@ -7,12 +7,12 @@ About ===== -This plugin uses libdevhelp to integrate Devhelp UI components and -functionality directly into Geany's user interface. In case you didn't know, -Devhelp is an API documentation browser mainly aimed at GNOME-related libraries, -although there are Devhelp books for a wide range of library APIs. Check your -package manager and/or Google and you should have no trouble finding books that -can be viewed with Devhelp. +This plugin embeds an API documentation browser and search functionality +directly into Geany's user interface. In case you didn't know, Devhelp is an +API documentation browser mainly aimed at GNOME-related libraries, although +there are Devhelp books for a wide range of library APIs. Check your package +manager and/or Google and you should have no trouble finding books that can +be viewed with Devhelp. Usage ===== @@ -23,37 +23,71 @@ When you load the plugin, two things are added to Geany's UI. The first is a new tab labeled 'Devhelp' in the Sidebar notebook. Inside this notebook page are two sub-tabs; Contents and Search. Contents lets you browse all of the -books at once and see their table of contents in a tree view. Search, not +books at once and see their table of contents in a tree view. Search, not surprisingly lets you search all of the books for a search term. The second -UI element that gets added to Geany is the 'Documentation' tab. Depending on -your preference choice, this new tab is either found in the main area, where -it will be next to a new tab called 'Code' which now holds the existing -documents tabs. If you choose to, you can also have the 'Documentation' tab -appear in the bottom message area, allowing you to see the documentation and -your code at the same time. There is also a preference for whether you want -to move the main Sidebar tabs to the bottom position or leave them at your -previously selected location. +UI element that gets added to Geany is the 'Documentation' tab. This new tab +is added in the main area, where it will be next to a new tab called 'Code' +which now holds the existing documents tabs. Keybindings ----------- -There are three keybindings that can be set using the Geany Preferences dialog. -The first keybinding is called 'Toggle Devhelp (Contents Tab)' and it will -activate the Devhelp tab in the Sidebar and it's Contents sub-tab. The second -keybinding is called 'Toggle Devhelp (Search Tab)' and does the same thing -but with the Search tab. The third keybinding is called 'Search for Current -Symbol/Tag' and when activate it will take the word/symbol where the cursor is -in the current document and search for it, activating both the Devhelp Sidebar -tab and the Documentation tab for you. +There are several keybindings available when the Devhelp plugin is loaded to +make it faster to access documentation. The following keybindings are +available: +Toggle sidebar contents tab ++++++++++++++++++++++++++++ + +Activates the "Contents" tab under the Devhelp sidebar tab. The previous tab +will be saved so that when this keybinding is fired again, the previous tab +selection will be activated. + +Toggle sidebar search tab ++++++++++++++++++++++++++ + +Just like the previous keybinding but with the "Search" tab. + +Toggle documentation tab +++++++++++++++++++++++++ + +Flips between the main documentation viewer and your current code. + +Search for current tag in Devhelp ++++++++++++++++++++++++++++++++++ + +While coding in the editor, the current tag, that is, the word that is +nearest to the cursor that looks like a programming symbol, or the current +selection, can be search for quickly by activating this keybinding. Once +activated, the Devhelp books repository on your system will be searched for +the current tag and if an exact match is found, it will be loaded into the +documentation view and the view will be made active. + +Search for current tag in Manual pages +++++++++++++++++++++++++++++++++++++++ + +Like the previous keybinding, but rather than searching Devhelp books, the +systems manual pages will be searched, assuming a `man` program is available. +The manual page sections will be searched in the order most likely to yield +manual pages relevant to programming. For example, a search for `mkdir` should +locate the `mkdir()` function from section 2 before it finds the `mkdir` shell +utility in section 1. + +Search for current tag in Google Code Search +++++++++++++++++++++++++++++++++++++++++++++ +Like the previous two keybindings, except that a search will be performed +online using Google's Code Search service. The search results page will be +displayed in the documentation view. + Context Menu ------------ -There's one more way to invoke a search for the current symbol. If you right -click on the current document, on a tag/symbol you want help on, the context -menu that appears will have an item called 'Search Devhelp for "foo"...", -which, when activated, will do the same thing as the 'Search for Current -Symbol/Tag' keybinding explained above. +There's also another way to invoke a search for the current symbol for our +mouse loving friends out there. If you right click on the current document, +on a tag/symbol you want help on, the context menu that appears will have an +menu called `Search for "Foo" documentation in`. Under this menu are 3 items +for the searches discussed under the `Keybindings` section which, when +activated, will perform the same searches as described above. Downloads ========= @@ -65,7 +99,7 @@ Development Code ================ -Get the code from: +You can checkout the latest development code from SVN using: svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-… @@ -73,13 +107,56 @@ Dependencies ============ -The Devhelp plugin depends on 'libdevhelp-1.0' and 'webkit-1.0', on top of the -regular Geany depenedencies (ie glib-2.0, gtk+-2.0, etc). +The Devhelp plugin depends on a few critical libraries, including: +Geany and GTK+/GLib +------------------- + +Of course these go without saying as you won't be able to run the plugin +without Geany and you won't be able to run Geany without GTK+/GLib. The plugin +should work with any modern version of GTK+/GLib greater than 2.16, as long +as it's supported by Geany (ie. not GTK+ 3 yet). + +Devhelp Library +--------------- + +The Devhelp library is a bit of a moving target as far as versions go. Just +like most GNOME projects, little effort is put into maintaing previous versions +of the library once a new version is released. The Geany Devhelp plugin +supports the 1.0 or 2.0 series of libdevhelp, as long as their versions are +greater than or equal to 2.30.1 or 2.32.0, respectively. Unless you're using +a GTK+ 3.0 version of Devhelp (the latest), pretty much any recent version +should be supported. + +Hint: If you're on a Debian-based distro (and probably others), the package +needed will be called `libdevhelp-<version>-dev`. + +WebKit +------ + +The Devhelp plugin uses the awesome WebKit GTK+ widget to display documentation +in. You will need at least version 1.1.18 of the 1.0 series of WebKit to +build the Devhelp plugin. If you can compile the `Webhelper` plugin, which +is also a part of the combined Geany plugins package, you should have +everything needed to satisfy this dependency. + +Hint: If you're on a Debian-based distro (and probably others), the package +needed will be called `libwebkitgtk-<version>-dev`. + +See Also +======== + +If you'd rather have your documentation opened in a separate window, not +integrated into Geany's user-interface, make sure to check out the `GeanyDoc` +plugin, which is also a part of the combined Geany plugins package. This +plugin will let you execute external commands with the current word (or +interactively) to view documentation. See the plugin's documentation for more +information. + License ======= -The Devhelp plugin is distributed under the terms of the GNU General Public +The Devhelp plugin is distributed under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You should have received a copy of the GNU General Public License along with the Devhelp plugin, in the COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2183] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 28 Aug '11

28 Aug '11

Revision: 2183 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2183&view=rev Author: cesspit Date: 2011-08-28 20:12:29 +0000 (Sun, 28 Aug 2011) Log Message: ----------- debugger: small gui bugfixes Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/utils.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-08-28 16:07:34 UTC (rev 2182) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-08-28 20:12:29 UTC (rev 2183) @@ -59,6 +59,7 @@ }; /* tree view and store handles */ +static GtkWidget *scrolled_window = NULL; static GtkWidget *tree = NULL; static GtkTreeModel *model = NULL; static GtkListStore *store = NULL; @@ -358,12 +359,12 @@ /* hits count */ header = _("Hit count"); hcount_renderer = gtk_cell_renderer_spin_new (); - GtkAdjustment* adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100000.0, 1.0, 2.0, 2.0)); - g_object_set (hcount_renderer, + GtkAdjustment* adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100000.0, 1.0, 2.0, 2.0)); + g_object_set (hcount_renderer, "editable", TRUE, "adjustment", adj, "digits", 0, NULL); - g_signal_connect (G_OBJECT (hcount_renderer), "edited", G_CALLBACK (on_hitscount_changed), NULL); + g_signal_connect (G_OBJECT (hcount_renderer), "edited", G_CALLBACK (on_hitscount_changed), NULL); column = create_column(header, hcount_renderer, FALSE, get_header_string_width(header, MW_HITSCOUNT, char_width), "text", HITSCOUNT); @@ -392,6 +393,13 @@ "text", LINE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolled_window); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_NONE); + + gtk_container_add (GTK_CONTAINER (scrolled_window), tree); + return TRUE; } @@ -464,7 +472,7 @@ */ GtkWidget* bptree_get_widget() { - return tree; + return scrolled_window; } /* Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-28 16:07:34 UTC (rev 2182) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-28 20:12:29 UTC (rev 2183) @@ -257,5 +257,12 @@ gtk_widget_set_sensitive(stepoutbtn, DBS_STOPPED == state); gtk_widget_set_sensitive(runcursorbtn, DBS_STOPPED == state); - gtk_widget_set_sensitive(loadbtn, DBS_IDLE == state); + if (DBS_IDLE == state) + { + btnpanel_on_document_activate(document_get_current()); + } + else + { + gtk_widget_set_sensitive(loadbtn, FALSE); + } } Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-28 16:07:34 UTC (rev 2182) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-28 20:12:29 UTC (rev 2183) @@ -64,7 +64,9 @@ */ int get_header_string_width(const gchar *header, int minchars, int char_width) { - return strlen(header) > minchars ? strlen(header) : minchars * char_width; + int header_length = strlen(header); + int width = (header_length > minchars ? header_length : minchars) * char_width; + return width; } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2182] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 28 Aug '11

28 Aug '11

Revision: 2182 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2182&view=rev Author: cesspit Date: 2011-08-28 16:07:34 +0000 (Sun, 28 Aug 2011) Log Message: ----------- debugger: developer email updated :) Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/bptree.h trunk/geany-plugins/debugger/src/breakpoint.c trunk/geany-plugins/debugger/src/breakpoint.h trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/breakpoints.h trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/btnpanel.h trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/callbacks.h trunk/geany-plugins/debugger/src/calltip.h trunk/geany-plugins/debugger/src/dbm_gdb.c trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/dconfig.h trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/debug_module.c trunk/geany-plugins/debugger/src/debug_module.h trunk/geany-plugins/debugger/src/gui.c trunk/geany-plugins/debugger/src/gui.h trunk/geany-plugins/debugger/src/keys.c trunk/geany-plugins/debugger/src/keys.h trunk/geany-plugins/debugger/src/ltree.c trunk/geany-plugins/debugger/src/ltree.h trunk/geany-plugins/debugger/src/markers.c trunk/geany-plugins/debugger/src/markers.h trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/stree.h trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/tpage.h trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/utils.h trunk/geany-plugins/debugger/src/vtree.c trunk/geany-plugins/debugger/src/vtree.h trunk/geany-plugins/debugger/src/watch_model.c trunk/geany-plugins/debugger/src/watch_model.h trunk/geany-plugins/debugger/src/wtree.c trunk/geany-plugins/debugger/src/wtree.h Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * bptree.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/bptree.h =================================================================== --- trunk/geany-plugins/debugger/src/bptree.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/bptree.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * bptree.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/breakpoint.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoint.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/breakpoint.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * breakpoint.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/breakpoint.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoint.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/breakpoint.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * breakpoint.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * breakpoints.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * breakpoints.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * btnpanel.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/btnpanel.h =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/btnpanel.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * btnpanel.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * callbacks.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/callbacks.h =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/callbacks.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * callbacks.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/calltip.h =================================================================== --- trunk/geany-plugins/debugger/src/calltip.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/calltip.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * calltip.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * dbm_gdm.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -2,7 +2,7 @@ * * dconfig.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/dconfig.h =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/dconfig.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * dconfig.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * debug.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/debug.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * debug.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/debug_module.c =================================================================== --- trunk/geany-plugins/debugger/src/debug_module.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/debug_module.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * debug_module.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/debug_module.h =================================================================== --- trunk/geany-plugins/debugger/src/debug_module.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/debug_module.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * debug_module.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/gui.c =================================================================== --- trunk/geany-plugins/debugger/src/gui.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/gui.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * gui.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/gui.h =================================================================== --- trunk/geany-plugins/debugger/src/gui.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/gui.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * gui.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/keys.c =================================================================== --- trunk/geany-plugins/debugger/src/keys.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/keys.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * keys.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/keys.h =================================================================== --- trunk/geany-plugins/debugger/src/keys.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/keys.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * keys.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/ltree.c =================================================================== --- trunk/geany-plugins/debugger/src/ltree.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/ltree.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * ltree.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/ltree.h =================================================================== --- trunk/geany-plugins/debugger/src/ltree.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/ltree.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * ltree.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * markers.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/markers.h =================================================================== --- trunk/geany-plugins/debugger/src/markers.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/markers.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * markers.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * plugin.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/stree.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * stree.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/stree.h =================================================================== --- trunk/geany-plugins/debugger/src/stree.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/stree.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * stree.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * tpage.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/tpage.h =================================================================== --- trunk/geany-plugins/debugger/src/tpage.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/tpage.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * tpage.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * utils.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/utils.h =================================================================== --- trunk/geany-plugins/debugger/src/utils.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/utils.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * utils.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * vtree.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/vtree.h =================================================================== --- trunk/geany-plugins/debugger/src/vtree.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/vtree.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * vtree.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/watch_model.c =================================================================== --- trunk/geany-plugins/debugger/src/watch_model.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/watch_model.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * watch_model.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/watch_model.h =================================================================== --- trunk/geany-plugins/debugger/src/watch_model.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/watch_model.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * watch_model.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/wtree.c =================================================================== --- trunk/geany-plugins/debugger/src/wtree.c 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/wtree.c 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * wtree.c * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/debugger/src/wtree.h =================================================================== --- trunk/geany-plugins/debugger/src/wtree.h 2011-08-28 15:40:56 UTC (rev 2181) +++ trunk/geany-plugins/debugger/src/wtree.h 2011-08-28 16:07:34 UTC (rev 2182) @@ -1,7 +1,7 @@ /* * wtree.h * - * Copyright 2010 Alexander Petukhov <Alexander(dot)Petukhov(at)mail(dot)ru> + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2181] trunk/geany-plugins/debugger/src/dconfig.c
by cesspit＠users.sourceforge.net 28 Aug '11

28 Aug '11

Revision: 2181 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2181&view=rev Author: cesspit Date: 2011-08-28 15:40:56 +0000 (Sun, 28 Aug 2011) Log Message: ----------- debugger: casting and shadowing gcc warnings Modified Paths: -------------- trunk/geany-plugins/debugger/src/dconfig.c Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-08-28 15:06:23 UTC (rev 2180) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-08-28 15:40:56 UTC (rev 2181) @@ -71,15 +71,15 @@ int readline(FILE *file, gchar *buffer, int buffersize) { gchar c; - int read = 0; + int read_count = 0; while (buffersize && fread(&c, 1, 1, file) && '\n' != c) { - buffer[read++] = c; + buffer[read_count++] = c; buffersize--; } - buffer[read] = '\0'; + buffer[read_count] = '\0'; - return read; + return read_count; } /* @@ -351,5 +351,5 @@ g_free(config_file); - return (gboolean)config; + return config ? TRUE : 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-plugins:[2180] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 28 Aug '11

28 Aug '11

Revision: 2180 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2180&view=rev Author: cesspit Date: 2011-08-28 15:06:23 +0000 (Sun, 28 Aug 2011) Log Message: ----------- debugger: config auto save, stack tree click on already selected item opens frame location Modified Paths: -------------- trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/breakpoints.h trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/dconfig.h trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/tpage.h trunk/geany-plugins/debugger/src/wtree.c trunk/geany-plugins/debugger/src/wtree.h Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -149,6 +149,8 @@ bptree_add_breakpoint(bp); /* add marker */ markers_add_breakpoint(bp); + /* mark config for saving */ + dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); @@ -171,6 +173,9 @@ /* remove from internal storage */ GTree *tree = g_hash_table_lookup(files,bp->file); g_tree_remove(tree, GINT_TO_POINTER(bp->line)); + + /* mark config for saving */ + dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); @@ -189,6 +194,8 @@ bptree_set_hitscount(bp->iter, bp->hitscount); markers_remove_breakpoint(bp); markers_add_breakpoint(bp); + /* mark config for saving */ + dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); @@ -208,6 +215,8 @@ bptree_set_condition(bp->iter, bp->condition); markers_remove_breakpoint(bp); markers_add_breakpoint(bp); + /* mark config for saving */ + dconfig_set_changed(); } else { @@ -234,6 +243,9 @@ /* set checkbox in breaks tree */ bptree_set_enabled(bp->iter, bp->enabled); + + /* mark config for saving */ + dconfig_set_changed(); } /* @@ -495,6 +507,9 @@ g_tree_steal(tree, GINT_TO_POINTER(line_from)); bp->line = line_to; g_tree_insert(tree, GINT_TO_POINTER(line_to), bp); + + /* mark config for saving */ + dconfig_set_changed(); } } } @@ -557,21 +572,3 @@ { return bptree_get_widget(); } - -/* - * Read new breakpoints from dconfig - */ -void breaks_read_config() -{ - /* clear all breaks */ - breaks_remove_all(); - - GList *list = dconfig_breaks_get(); - - while(list) - { - breakpoint *bp = (breakpoint*)list->data; - breaks_add(bp->file, bp->line, bp->condition, bp->enabled, bp->hitscount); - list = list->next; - } -} Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-28 15:06:23 UTC (rev 2180) @@ -40,5 +40,4 @@ GtkWidget* breaks_get_widget(); GList* breaks_get_for_document(const char* file); GList* breaks_get_all(); -void breaks_read_config(); Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -42,9 +42,7 @@ #define CP_BUTTONS_PAD 5 #define CONFIG_NAME ".debugger" -static GtkWidget *savebtn = NULL; static GtkWidget *loadbtn = NULL; -static GtkWidget *clearbtn = NULL; static GtkWidget *runbtn = NULL; static GtkWidget *restartbtn = NULL; @@ -77,38 +75,11 @@ { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Error reading config file")); } - else - { - /* update target page */ - tpage_read_config(); - /* breakpoints */ - breaks_read_config(); - /* watches */ - wtree_read_config(); - } g_free(folder); } } /* - * save config button handler - */ -void on_config_save(GtkButton *button, gpointer user_data) -{ - GeanyDocument *doc = document_get_current(); - if (doc && doc->real_path) - { - /* open config file */ - gchar *folder = g_path_get_dirname(DOC_FILENAME(doc)); - if (!dconfig_save(folder)) - { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Error saving config file")); - } - g_free(folder); - } -} - -/* * clear config values button handler */ void on_config_clear(GtkButton *button, gpointer user_data) @@ -203,14 +174,6 @@ g_signal_connect(G_OBJECT(loadbtn), "clicked", G_CALLBACK (on_config_load), (gpointer)TRUE); gtk_box_pack_start(GTK_BOX(vbutton_box), loadbtn, FALSE, TRUE, 0); - savebtn = create_stock_button(GTK_STOCK_SAVE, _("Save settings")); - g_signal_connect(G_OBJECT(savebtn), "clicked", G_CALLBACK (on_config_save), NULL); - gtk_box_pack_start(GTK_BOX(vbutton_box), savebtn, FALSE, TRUE, 0); - - clearbtn = create_stock_button(GTK_STOCK_CLEAR, _("Clear settings")); - g_signal_connect(G_OBJECT(clearbtn), "clicked", G_CALLBACK (on_config_clear), NULL); - gtk_box_pack_start(GTK_BOX(vbutton_box), clearbtn, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox_panels_buttons), vbutton_box, TRUE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), vbox_panels_buttons, TRUE, FALSE, 0); @@ -233,7 +196,6 @@ void btnpanel_on_document_close() { gtk_widget_set_sensitive(loadbtn, FALSE); - gtk_widget_set_sensitive(savebtn, FALSE); } /* @@ -251,8 +213,6 @@ return; } - gtk_widget_set_sensitive(savebtn, TRUE); - gchar *dirname = g_path_get_dirname(DOC_FILENAME(doc)); gchar *config = g_build_path(G_DIR_SEPARATOR_S, dirname, CONFIG_NAME, NULL); struct stat st; @@ -298,5 +258,4 @@ gtk_widget_set_sensitive(runcursorbtn, DBS_STOPPED == state); gtk_widget_set_sensitive(loadbtn, DBS_IDLE == state); - gtk_widget_set_sensitive(clearbtn, DBS_IDLE == state); } Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -49,13 +49,22 @@ /* maximus config file line length */ #define MAXLINE 1000 -static gchar *target = NULL; -static int module = -1; -static gchar *args = NULL; -static GList *env = NULL; -static GList *breaks = NULL; -static GList *watches = NULL; +/* saving interval */ +#define SAVING_INTERVAL 2000000 +/* idle callback staff */ +static GMutex *change_config_mutex; +static GCond *cond; +static GThread *saving_thread; +static gboolean config_changed = FALSE; +static gboolean loading_or_cleaning = FALSE; + +/* the folder, config has been loaded from */ +static gchar *current_folder = NULL; + +/* forward declaration */ +gboolean dconfig_save(gchar *folder); + /* * reads line from a file */ @@ -71,11 +80,79 @@ buffer[read] = '\0'; return read; -} +} /* - * checks whether a config fileis founs in the folder + * function for a config file background saving if changed */ +gpointer saving_thread_func(gpointer data) +{ + GTimeVal interval; + GMutex *m = g_mutex_new(); + do + { + g_mutex_lock(change_config_mutex); + if (config_changed && current_folder) + { + dconfig_save(current_folder); + config_changed = FALSE; + } + g_mutex_unlock(change_config_mutex); + + g_get_current_time(&interval); + g_time_val_add(&interval, SAVING_INTERVAL); + } + while (!g_cond_timed_wait(cond, m, &interval)); + g_mutex_free(m); + + return NULL; +} + +/* + * set "changed" flag to save it on "saving_thread" thread + */ +void dconfig_set_changed() +{ + if (!loading_or_cleaning) + { + g_mutex_lock(change_config_mutex); + config_changed = TRUE; + g_mutex_unlock(change_config_mutex); + } +} + +/* + * init config + */ +void dconfig_init() +{ + change_config_mutex = g_mutex_new(); + cond = g_cond_new(); + + saving_thread = g_thread_create(saving_thread_func, NULL, TRUE, NULL); +} + +/* + * destroys config + */ +void dconfig_destroy() +{ + g_cond_signal(cond); + /* ??? g_thread_join(saving_thread); */ + + g_mutex_free(change_config_mutex); + g_cond_free(cond); + + if (current_folder) + { + g_free(current_folder); + current_folder = NULL; + } +} + +/* + * checks whether a config file is founs in the folder + */ gboolean dconfig_is_found_at(gchar *folder) { gchar *config = g_build_path(G_DIR_SEPARATOR_S, folder, CONFIG_NAME, NULL); @@ -90,40 +167,50 @@ */ gboolean dconfig_load(gchar *folder) { - dconfig_clear(); + loading_or_cleaning = TRUE; + g_mutex_lock(change_config_mutex); + + tpage_clear(); + wtree_remove_all(); + breaks_remove_all(); + if (current_folder) + { + g_free(current_folder); + } + current_folder = g_strdup(folder); + gchar *path = g_build_path(G_DIR_SEPARATOR_S, folder, CONFIG_NAME, NULL); FILE *file = fopen(path, "r"); if (!file) { + config_changed = FALSE; + + loading_or_cleaning = FALSE; + g_mutex_unlock(change_config_mutex); + return FALSE; } /* target */ gchar buffer[FILENAME_MAX]; - if(!readline(file, buffer, FILENAME_MAX - 1)) + if(readline(file, buffer, FILENAME_MAX - 1)) { - memset(target, 0, FILENAME_MAX * sizeof(gchar)); + tpage_set_target(buffer); } - target = g_strdup(buffer); /* debugger */ gchar debugger[FILENAME_MAX]; if(readline(file, debugger, FILENAME_MAX - 1)) { - module = debug_get_module_index(debugger); - if (-1 == module) - { - module = 0; - } + tpage_set_debugger(debugger); } /* arguments */ - if(!readline(file, buffer, FILENAME_MAX - 1)) + if(readline(file, buffer, FILENAME_MAX - 1)) { - memset(buffer, 0, FILENAME_MAX * sizeof(gchar)); + tpage_set_commandline(buffer); } - args = g_strdup(buffer); /* breakpoints and environment variables */ gchar line[MAXLINE]; @@ -158,8 +245,7 @@ struct stat st; if(!stat(_path, &st)) { - breakpoint *bp = break_new_full(_path, nline, condition, enabled, hitscount); - breaks = g_list_append(breaks, bp); + breaks_add(_path, nline, condition, enabled, hitscount); } } else if (!strcmp(line, ENVIRONMENT_MARKER)) @@ -167,8 +253,7 @@ gchar name[MAXLINE], value[1000]; if(readline(file, name, MAXLINE) && readline(file, value, MAXLINE)) { - env = g_list_append(env, name); - env = g_list_append(env, value); + tpage_add_environment(name, value); } } else if (!strcmp(line, WATCH_MARKER)) @@ -176,10 +261,15 @@ gchar watch[MAXLINE]; if(readline(file, watch, MAXLINE)) { - watches = g_list_append(watches, g_strdup(watch)); + wtree_add_watch(watch); } } } + + config_changed = FALSE; + + loading_or_cleaning = FALSE; + g_mutex_unlock(change_config_mutex); return TRUE; } @@ -263,127 +353,3 @@ return (gboolean)config; } - -/* - * gets target - */ -gchar* dconfig_target_get() -{ - return target; -} - -/* - * sets target - */ -void dconfig_target_set(gchar *newvalue) -{ - if (target) - { - g_free(target); - } - target = newvalue; -} - -/* - * gets debugger module index - */ -int dconfig_module_get() -{ - return module; -} - -/* - * sets debugger module index - */ -void dconfig_module_set(int newvalue) -{ - module = newvalue; -} - -/* - * gets command line arguments - */ -gchar* dconfig_args_get() -{ - return args; -} - -/* - * sets command line arguments - */ -void dconfig_args_set(gchar *newvalue) -{ - if (args) - { - g_free(args); - } - args = newvalue; -} - -/* - * gets environment variables - */ -GList* dconfig_env_get() -{ - return env; -} - -/* - * removes all environment variables - */ -void dconfig_env_clear() -{ - g_list_foreach(env, (GFunc)g_free, NULL); - g_list_free(env); - env = NULL; -} - -/* - * gets breakpoints - */ -GList* dconfig_breaks_get() -{ - return breaks; -} - -/* - * clears breakpoints - */ -void dconfig_breaks_clear() -{ - g_list_foreach(breaks, (GFunc)g_free, NULL); - g_list_free(breaks); - breaks = NULL; -} - -/* - * gets watches - */ -GList* dconfig_watches_get() -{ - return watches; -} - -/* - * clears watches - */ -void dconfig_watches_clear() -{ - g_list_foreach(watches, (GFunc)g_free, NULL); - g_list_free(watches); - watches = NULL; -} - -/* - * clears all config values - */ -void dconfig_clear() -{ - dconfig_target_set(NULL); - dconfig_module_set(0); - dconfig_args_set(NULL); - dconfig_env_clear(); - - dconfig_breaks_clear(); - dconfig_watches_clear(); -} Modified: trunk/geany-plugins/debugger/src/dconfig.h =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.h 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/dconfig.h 2011-08-28 15:06:23 UTC (rev 2180) @@ -18,17 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ - + +void dconfig_init(); +void dconfig_destroy(); + gboolean dconfig_is_found_at(gchar *folder); gboolean dconfig_load(gchar *folder); -gboolean dconfig_save(gchar *folder); -void dconfig_clear(); -gchar* dconfig_target_get(); -int dconfig_module_get(); -gchar* dconfig_args_get(); -GList* dconfig_env_get(); -GList* dconfig_breaks_get(); -GList* dconfig_watches_get(); +void dconfig_set_changed(); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -59,6 +59,7 @@ #include "calltip.h" #include "bptree.h" #include "btnpanel.h" +#include "dconfig.h" /* * calltip size @@ -244,6 +245,8 @@ gtk_tree_store_remove(wstore, &iter); if (DBS_STOPPED == debug_state) active_module->remove_watch(internal); + + dconfig_set_changed(); } else if (strcmp(oldvalue, striped)) { @@ -274,6 +277,8 @@ gtk_tree_selection_select_path(selection, _path); gtk_tree_path_free(_path); } + + dconfig_set_changed(); } /* free resources */ @@ -339,6 +344,8 @@ } else variable_set_name_only(wstore, &newvar, expression); + + dconfig_set_changed(); } /* @@ -453,6 +460,8 @@ /* free references list */ g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); g_list_free (references); + + dconfig_set_changed(); } /* free rows list */ @@ -499,6 +508,7 @@ else variable_set_name_only(wstore, &newvar, expression); + dconfig_set_changed(); } g_free(expression); @@ -1014,7 +1024,7 @@ * arguments: * modulename - debug module name */ -int debug_get_module_index(gchar *modulename) +int debug_get_module_index(const gchar *modulename) { int _index = 0; while (modules[_index].title) @@ -1059,7 +1069,7 @@ if (DBS_IDLE == debug_state) { /* init selected debugger module */ - if((active_module = modules[tpage_get_module_index()].module)->init(&callbacks)) + if((active_module = modules[tpage_get_debug_module_index()].module)->init(&callbacks)) { /* gets parameters from the target page */ gchar *target = g_strstrip(tpage_get_target()); Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/debug.h 2011-08-28 15:06:23 UTC (rev 2180) @@ -47,7 +47,7 @@ void debug_request_interrupt(bs_callback cb, breakpoint* bp, break_set_activity flags); gchar* debug_error_message(); GList* debug_get_modules(); -int debug_get_module_index(gchar *modulename); +int debug_get_module_index(const gchar *modulename); gboolean debug_supports_async_breaks(); void debug_destroy(); gchar* debug_evaluate_expression(gchar *expression); Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -40,7 +40,7 @@ /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; -GeanyData *geany_data; +GeanyData *geany_data; GeanyFunctions *geany_functions; @@ -121,10 +121,12 @@ GTK_NOTEBOOK(geany->main_widgets->message_window_notebook), hbox, gtk_label_new(_("Debug"))); + + /* init config */ + dconfig_init(); } - /* Called by Geany to show the plugin's configure dialog. This function is always called after * plugin_init() was called. * You can omit this function if the plugin doesn't need to be configured. @@ -160,7 +162,7 @@ breaks_destroy(); /* clears config */ - dconfig_clear(); + dconfig_destroy(); /* release other allocated strings and objects */ gtk_widget_destroy(hbox); Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/stree.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -69,6 +69,54 @@ static gboolean handle_selection = TRUE; /* + * Handles same tree row click to open frame position + */ +static gboolean on_msgwin_button_press(GtkWidget *widget, GdkEventButton *event, gpointer user_data) +{ + if (event->type == GDK_BUTTON_PRESS) + { + GtkTreePath *pressed_path = NULL; + if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tree), (int)event->x, (int)event->y, &pressed_path, NULL, NULL, NULL)) + { + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); + GtkTreePath *selected_path = (GtkTreePath*)rows->data; + + if (!gtk_tree_path_compare(pressed_path, selected_path)) + { + GtkTreeIter iter; + gtk_tree_model_get_iter ( + model, + &iter, + pressed_path); + + gchar *file; + int line; + gtk_tree_model_get ( + model, + &iter, + S_FILEPATH, &file, + S_LINE, &line, + -1); + + /* check if file name is not empty and we have source files for the frame */ + if (strlen(file) && GPOINTER_TO_INT(g_hash_table_lookup(frames, (gpointer)file))) + callback(file, line); + + g_free(file); + } + + g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (rows); + + gtk_tree_path_free(pressed_path); + } + } + + return FALSE; +} + +/* * Tree view selection changed callback */ void on_selection_changed(GtkTreeSelection *treeselection, gpointer user_data) @@ -131,6 +179,10 @@ g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree))), "changed", G_CALLBACK (on_selection_changed), NULL); + /* for clicking on already selected frame */ + g_signal_connect(tree, "button-press-event", + G_CALLBACK(on_msgwin_button_press), NULL); + /* creating columns */ GtkCellRenderer *renderer; GtkTreeViewColumn *column; Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -97,6 +97,22 @@ GtkCellRenderer *renderer_value = NULL; /* + * tells config to update when target arguments change + */ +void on_arguments_changed(GtkTextBuffer *textbuffer, gpointer user_data) +{ + dconfig_set_changed(); +} + +/* + * tells config to update when target changes + */ +void on_target_changed (GtkEditable *editable, gpointer user_data) +{ + dconfig_set_changed(); +} + +/* * delete selected rows from env variables page */ void delete_selected_rows() @@ -193,7 +209,10 @@ guint keyval = ((GdkEventKey*)event)->keyval; if (GDK_Delete == keyval) + { delete_selected_rows(); + dconfig_set_changed(); + } return GDK_Tab == keyval; } @@ -247,7 +266,7 @@ static void on_value_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) { GtkTreeIter iter; - GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); + GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); @@ -269,6 +288,8 @@ if (dialogs_show_question(_("Delete variable?"))) { delete_selected_rows(); + dconfig_set_changed(); + gtk_widget_grab_focus(envtree); } } @@ -290,6 +311,7 @@ add_empty_row(); g_object_set (renderer_value, "editable", FALSE, NULL); + dconfig_set_changed(); } g_free(oldvalue); @@ -345,7 +367,7 @@ static void on_name_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) { GtkTreeIter iter; - GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); + GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); @@ -369,6 +391,8 @@ if (!empty && dialogs_show_question(_("Delete variable?"))) { delete_selected_rows(); + dconfig_set_changed(); + gtk_widget_grab_focus(envtree); } } @@ -381,6 +405,10 @@ entering_new_var = TRUE; gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(envtree), tree_path, column_value, renderer_value, TRUE); } + if (!empty) + { + dconfig_set_changed(); + } } gtk_tree_path_free(tree_path); @@ -388,37 +416,49 @@ g_free(striped); } -void tpage_read_config() +/* + * set target + */ +void tpage_set_target(const gchar *newvalue) { - /* remove old values */ - tpage_clear(); + gtk_entry_set_text(GTK_ENTRY(targetname), newvalue); +} - /* target */ - gtk_entry_set_text(GTK_ENTRY(targetname), dconfig_target_get()); +/* + * set debugger + */ +void tpage_set_debugger(const gchar *newvalue) +{ + int module = debug_get_module_index(newvalue); + if (-1 == module) + { + module = 0; + } + gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_debugger), module); +} - /* debugger */ - gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_debugger), dconfig_module_get()); - - /* arguments */ +/* + * set command line + */ +void tpage_set_commandline(const gchar *newvalue) +{ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); - gtk_text_buffer_set_text(buffer, dconfig_args_get(), -1); + gtk_text_buffer_set_text(buffer, newvalue, -1); +} - /* environment */ - GList *env = dconfig_env_get(); - while (env) - { - gchar *name = (gchar*)env->data; - env = env->next; - gchar *value = (gchar*)env->data; - - GtkTreeIter iter; - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, NAME, name, VALUE, value, -1); - - env = env->next; - } +/* + * add environment variable + */ +void tpage_add_environment(const gchar *name, const gchar *value) +{ + GtkTreeIter iter; + gtk_list_store_prepend(store, &iter); + gtk_list_store_set(store, &iter, NAME, name, VALUE, value, -1); } +/* + * removes all data (clears widgets) + */ void tpage_clear() { /* target */ @@ -482,7 +522,7 @@ /* * get selected debugger module index */ -int tpage_get_module_index() +int tpage_get_debug_module_index() { return gtk_combo_box_get_active(GTK_COMBO_BOX(cmb_debugger)); } @@ -570,6 +610,8 @@ gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); targetname = gtk_entry_new (); + g_signal_connect(G_OBJECT(targetname), "changed", G_CALLBACK (on_target_changed), NULL); + button_browse = gtk_button_new_with_label(_("Browse")); g_signal_connect(G_OBJECT(button_browse), "clicked", G_CALLBACK (on_target_browse_clicked), NULL); @@ -611,6 +653,9 @@ textview = gtk_text_view_new (); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_CHAR); + + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK (on_arguments_changed), NULL); gtk_box_pack_start(GTK_BOX(hbox), textview, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(_frame), hbox); Modified: trunk/geany-plugins/debugger/src/tpage.h =================================================================== --- trunk/geany-plugins/debugger/src/tpage.h 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/tpage.h 2011-08-28 15:06:23 UTC (rev 2180) @@ -21,11 +21,21 @@ void tpage_init(); GtkWidget* tpage_get_widget(); + gchar* tpage_get_target(); +void tpage_set_target(const gchar *newvalue); + gchar* tpage_get_debugger(); -int tpage_get_module_index(); +void tpage_set_debugger(const gchar *newvalue); + +int tpage_get_debug_module_index(); + gchar* tpage_get_commandline(); +void tpage_set_commandline(const gchar *newvalue); + GList* tpage_get_environment(); +void tpage_add_environment(const gchar *name, const gchar *value); + void tpage_set_readonly(gboolean readonly); -void tpage_read_config(); void tpage_clear(); + Modified: trunk/geany-plugins/debugger/src/wtree.c =================================================================== --- trunk/geany-plugins/debugger/src/wtree.c 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/wtree.c 2011-08-28 15:06:23 UTC (rev 2180) @@ -199,18 +199,3 @@ variable_set_name_only(store, &newvar, watch); } - -/* - * reads watches from config - */ -void wtree_read_config() -{ - wtree_remove_all(); - GList *list = dconfig_watches_get(); - while(list) - { - gchar *expression = (gchar*)list->data; - wtree_add_watch(expression); - list = list->next; - } -} Modified: trunk/geany-plugins/debugger/src/wtree.h =================================================================== --- trunk/geany-plugins/debugger/src/wtree.h 2011-08-27 21:52:56 UTC (rev 2179) +++ trunk/geany-plugins/debugger/src/wtree.h 2011-08-28 15:06:23 UTC (rev 2180) @@ -29,6 +29,5 @@ GList* wtree_get_watches(); void wtree_remove_all(); void wtree_add_watch(gchar *watch); -void wtree_read_config(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2179] trunk/geany-plugins/devhelp/ wscript_configure
by eht16＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2179 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2179&view=rev Author: eht16 Date: 2011-08-27 21:52:56 +0000 (Sat, 27 Aug 2011) Log Message: ----------- Adjust devhelp build for libdevhelp-[1|2].0 versions Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_configure Modified: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure 2011-08-27 21:04:41 UTC (rev 2178) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-08-27 21:52:56 UTC (rev 2179) @@ -21,13 +21,12 @@ # # $Id: wscript_configure 1735 2010-11-09 17:03:40Z eht16 $ -from build.wafutils import check_cfg_cached +from build.wafutils import add_to_env_and_define, check_cfg_cached packages = [ ('gtk+-2.0', '2.16', 'GTK'), ('glib-2.0', '2.16', 'GLIB'), ('gthread-2.0','','GTHREAD'), - ('libdevhelp-2.0', '2.32.0', 'LIBDEVHELP'), ('webkit-1.0', '1.1.18', 'WEBKIT') ] @@ -38,3 +37,25 @@ uselib_store=uselib_store, mandatory=True, args='--cflags --libs') + + +# Use newer libdevhelp-2.0 if present, and fallback on older libdevhelp-1.0 +check_cfg_cached(conf, + package='libdevhelp-2.0', + atleast_version='2.32.0', + uselib_store='LIBDEVHELP', + mandatory=False, + args='--cflags --libs') + +if not conf.env['HAVE_LIBDEVHELP'] == 1: + # fallback + check_cfg_cached(conf, + package='libdevhelp-1.0', + atleast_version='2.30.1', + uselib_store='LIBDEVHELP', + mandatory=False, + args='--cflags --libs') +else: + add_to_env_and_define(conf, 'HAVE_BOOK_MANAGER', 1) + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2178] trunk/geany-plugins/devhelp/src/dhp-object .c
by codebrainz＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2178 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2178&view=rev Author: codebrainz Date: 2011-08-27 21:04:41 +0000 (Sat, 27 Aug 2011) Log Message: ----------- Use config.h to detect whether HAVE_BOOK_MANAGER is defined. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/dhp-object.c Modified: trunk/geany-plugins/devhelp/src/dhp-object.c =================================================================== --- trunk/geany-plugins/devhelp/src/dhp-object.c 2011-08-27 20:48:00 UTC (rev 2177) +++ trunk/geany-plugins/devhelp/src/dhp-object.c 2011-08-27 21:04:41 UTC (rev 2178) @@ -23,6 +23,9 @@ #include <string.h> #include <gtk/gtk.h> #include <geanyplugin.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <devhelp/dh-base.h> #include <devhelp/dh-book-tree.h> 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

Plugins-Commits August 2011