Plugins-Commits August 2011

plugins-commits@lists.geany.org

8 participants
73 discussions

SF.net SVN: geany-plugins:[2177] trunk/geany-plugins/xmlsnippets
by frlan＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2177 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2177&view=rev Author: frlan Date: 2011-08-27 20:48:00 +0000 (Sat, 27 Aug 2011) Log Message: ----------- xmlsnippets: Adding wscript_configure to fix make distcheck Modified Paths: -------------- trunk/geany-plugins/xmlsnippets/ChangeLog Added Paths: ----------- trunk/geany-plugins/xmlsnippets/wscript_configure Modified: trunk/geany-plugins/xmlsnippets/ChangeLog =================================================================== --- trunk/geany-plugins/xmlsnippets/ChangeLog 2011-08-27 20:43:56 UTC (rev 2176) +++ trunk/geany-plugins/xmlsnippets/ChangeLog 2011-08-27 20:48:00 UTC (rev 2177) @@ -1,3 +1,8 @@ +2011-08-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Adding wscript_configure to fix make distcheck + + 2010-11-13 Eugene Arshinov <earshinov(at)gmail(dot)com> * *.*: Added: trunk/geany-plugins/xmlsnippets/wscript_configure =================================================================== 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:[2176] trunk/geany-plugins/build/devhelp.m4
by colombanw＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2176 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2176&view=rev Author: colombanw Date: 2011-08-27 20:43:56 +0000 (Sat, 27 Aug 2011) Log Message: ----------- DevHelp: properly define HAVE_BOOK_MANAGER when using libdevhelp2 (oops) Modified Paths: -------------- trunk/geany-plugins/build/devhelp.m4 Modified: trunk/geany-plugins/build/devhelp.m4 =================================================================== --- trunk/geany-plugins/build/devhelp.m4 2011-08-27 20:22:03 UTC (rev 2175) +++ trunk/geany-plugins/build/devhelp.m4 2011-08-27 20:43:56 UTC (rev 2176) @@ -13,7 +13,7 @@ libdevhelp_version=${DEVHELP2_VERSION} AS_IF([test "x$enable_devhelp" != "xno"], [PKG_CHECK_EXISTS([${libdevhelp_pkg} >= ${libdevhelp_version}], - [], + [AC_DEFINE([HAVE_BOOK_MANAGER], [1], [Use libdevhelp-2.0])], [libdevhelp_pkg=libdevhelp-1.0 libdevhelp_version=${DEVHELP1_VERSION}])]) 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:[2175] trunk/geany-plugins
by colombanw＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2175 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2175&view=rev Author: colombanw Date: 2011-08-27 20:22:03 +0000 (Sat, 27 Aug 2011) Log Message: ----------- DevHelp: fix check for libdevhelp Modified Paths: -------------- trunk/geany-plugins/build/devhelp.m4 trunk/geany-plugins/devhelp/src/Makefile.am Modified: trunk/geany-plugins/build/devhelp.m4 =================================================================== --- trunk/geany-plugins/build/devhelp.m4 2011-08-27 17:51:57 UTC (rev 2174) +++ trunk/geany-plugins/build/devhelp.m4 2011-08-27 20:22:03 UTC (rev 2175) @@ -8,41 +8,22 @@ DEVHELP1_VERSION=2.30.1 DEVHELP2_VERSION=2.32.0 - GP_CHECK_PLUGIN_DEPS([devhelp], [DHPLUG], - [gtk+-2.0 >= ${GTK_VERSION} - glib-2.0 >= ${GLIB_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION} - gthread-2.0]) + # Use newer libdevhelp-2.0 if present, and fallback on older libdevhelp-1.0 + libdevhelp_pkg=libdevhelp-2.0 + libdevhelp_version=${DEVHELP2_VERSION} + AS_IF([test "x$enable_devhelp" != "xno"], + [PKG_CHECK_EXISTS([${libdevhelp_pkg} >= ${libdevhelp_version}], + [], + [libdevhelp_pkg=libdevhelp-1.0 + libdevhelp_version=${DEVHELP1_VERSION}])]) - # First tries newer library version libdevhelp-2.0 and if that - # fails, tries to find older version libdevhelp-1.0. - if test "$m4_tolower(AS_TR_SH(enable_devhelp))" = "yes"; then - PKG_CHECK_MODULES( - [DEVHELP], - [libdevhelp-2.0 >= ${DEVHELP2_VERSION}], - [AC_DEFINE([HAVE_BOOK_MANAGER], [1], [Use libdevhelp-2.0])], - [PKG_CHECK_MODULES( - [DEVHELP], - [libdevhelp-1.0 >= ${DEVHELP1_VERSION}]) - ] - ) - elif test "$m4_tolower(AS_TR_SH(enable_devhelp))" = "auto"; then - PKG_CHECK_MODULES( - [DEVHELP], - [libdevhelp-2.0 >= ${DEVHELP2_VERSION}], - [AC_DEFINE(HAVE_BOOK_MANAGER)], - [PKG_CHECK_MODULES( - [DEVHELP], - [libdevhelp-1.0 >= ${DEVHELP1_VERSION}], - [m4_tolower(AS_TR_SH(enable_devhelp))=yes], - [m4_tolower(AS_TR_SH(enable_devhelp))=no]) - ] - ) - fi + GP_CHECK_PLUGIN_DEPS([devhelp], [DEVHELP], + [gtk+-2.0 >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION} + ${libdevhelp_pkg} >= ${libdevhelp_version} + gthread-2.0]) - AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_devhelp)), - test "$m4_tolower(AS_TR_SH(enable_devhelp))" = yes) - GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp]) AC_CONFIG_FILES([ Modified: trunk/geany-plugins/devhelp/src/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/src/Makefile.am 2011-08-27 17:51:57 UTC (rev 2174) +++ trunk/geany-plugins/devhelp/src/Makefile.am 2011-08-27 20:22:03 UTC (rev 2175) @@ -21,10 +21,9 @@ devhelp_la_CFLAGS = \ $(AM_CFLAGS) \ - $(DHPLUG_CFLAGS) \ $(DEVHELP_CFLAGS) \ -DDHPLUG_DATA_DIR=\"$(plugindatadir)\" -devhelp_la_LIBADD = $(DHPLUG_LIBS) $(DEVHELP_LIBS) +devhelp_la_LIBADD = $(DEVHELP_LIBS) include $(top_srcdir)/build/cppcheck.mk 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:[2174] trunk/geany-plugins/addons/src
by colombanw＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2174 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2174&view=rev Author: colombanw Date: 2011-08-27 17:51:57 +0000 (Sat, 27 Aug 2011) Log Message: ----------- Addons: fix a few pedantic warnings Modified Paths: -------------- trunk/geany-plugins/addons/src/ao_blanklines.c trunk/geany-plugins/addons/src/ao_bookmarklist.c trunk/geany-plugins/addons/src/ao_doclist.c trunk/geany-plugins/addons/src/ao_markword.c trunk/geany-plugins/addons/src/ao_openuri.c trunk/geany-plugins/addons/src/ao_systray.c trunk/geany-plugins/addons/src/ao_tasks.c trunk/geany-plugins/addons/src/ao_xmltagging.c Modified: trunk/geany-plugins/addons/src/ao_blanklines.c =================================================================== --- trunk/geany-plugins/addons/src/ao_blanklines.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_blanklines.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -31,7 +31,7 @@ const gint maxline = sci_get_line_count(editor->sci) - 1; const gint maxpos = sci_get_line_end_position(editor->sci, maxline); - gint line, start, end, pos; + gint line, start, end, pos = 0; gchar ch; /* Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -79,7 +79,7 @@ static void ao_bookmark_list_show (AoBookmarkList *bm); static void ao_bookmark_list_hide (AoBookmarkList *bm); -G_DEFINE_TYPE(AoBookmarkList, ao_bookmark_list, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoBookmarkList, ao_bookmark_list, G_TYPE_OBJECT) static void ao_bookmark_list_set_property(GObject *object, guint prop_id, Modified: trunk/geany-plugins/addons/src/ao_doclist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_doclist.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_doclist.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -68,7 +68,7 @@ static void ao_doclist_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -G_DEFINE_TYPE(AoDocList, ao_doc_list, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoDocList, ao_doc_list, G_TYPE_OBJECT) static void ao_doc_list_class_init(AoDocListClass *klass) Modified: trunk/geany-plugins/addons/src/ao_markword.c =================================================================== --- trunk/geany-plugins/addons/src/ao_markword.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_markword.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -59,7 +59,7 @@ static void ao_mark_word_finalize (GObject *object); -G_DEFINE_TYPE(AoMarkWord, ao_mark_word, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoMarkWord, ao_mark_word, G_TYPE_OBJECT) static void ao_mark_word_set_property(GObject *object, guint prop_id, Modified: trunk/geany-plugins/addons/src/ao_openuri.c =================================================================== --- trunk/geany-plugins/addons/src/ao_openuri.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_openuri.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -66,7 +66,7 @@ const GValue *value, GParamSpec *pspec); -G_DEFINE_TYPE(AoOpenUri, ao_open_uri, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoOpenUri, ao_open_uri, G_TYPE_OBJECT) @@ -243,7 +243,7 @@ if (sci_has_selection(doc->editor->sci)) { gint len = sci_get_selected_text_length(doc->editor->sci); - text = g_malloc0(len + 1); + text = g_malloc0((guint)len + 1); sci_get_selected_text(doc->editor->sci, text); } else @@ -252,7 +252,7 @@ /* TODO be more restrictive when handling selections as there are too many hits by now */ if (text != NULL && (ao_uri_has_scheme(text) || ao_uri_is_link(text))) { - guint len = strlen(text); + gsize len = strlen(text); /* remove trailing dots and colons */ if (text[len - 1] == '.' || text[len - 1] == ':') text[len - 1] = '\0'; Modified: trunk/geany-plugins/addons/src/ao_systray.c =================================================================== --- trunk/geany-plugins/addons/src/ao_systray.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_systray.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -63,7 +63,7 @@ WIDGET_PREFERENCES }; -G_DEFINE_TYPE(AoSystray, ao_systray, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoSystray, ao_systray, G_TYPE_OBJECT) static void ao_systray_finalize(GObject *object) @@ -134,7 +134,7 @@ static void icon_popup_menu_cmd_clicked_cb(GtkMenuItem *item, gpointer data) { GtkWidget *widget; - const gchar *widget_name; + const gchar *widget_name = NULL; switch (GPOINTER_TO_INT(data)) { Modified: trunk/geany-plugins/addons/src/ao_tasks.c =================================================================== --- trunk/geany-plugins/addons/src/ao_tasks.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_tasks.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -93,7 +93,7 @@ static void ao_tasks_show (AoTasks *t); static void ao_tasks_hide (AoTasks *t); -G_DEFINE_TYPE(AoTasks, ao_tasks, G_TYPE_OBJECT); +G_DEFINE_TYPE(AoTasks, ao_tasks, G_TYPE_OBJECT) static void ao_tasks_set_property(GObject *object, guint prop_id, @@ -551,7 +551,7 @@ static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc) { - guint lines, line; + gint lines, line; gchar *line_buf, *display_name, *task_start; gchar **token; AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t); @@ -611,7 +611,7 @@ AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(data); gint line, selected_line; gchar *filename = NULL; - gchar *selected_filename = NULL; + const gchar *selected_filename = NULL; gboolean ret = FALSE; if (priv->scan_all_documents) Modified: trunk/geany-plugins/addons/src/ao_xmltagging.c =================================================================== --- trunk/geany-plugins/addons/src/ao_xmltagging.c 2011-08-27 17:27:07 UTC (rev 2173) +++ trunk/geany-plugins/addons/src/ao_xmltagging.c 2011-08-27 17:51:57 UTC (rev 2174) @@ -88,7 +88,7 @@ tag = g_strdup(gtk_entry_get_text(GTK_ENTRY(textbox))); if (NZV(tag)) { - gint end = 0; + gsize end = 0; GString *tmp = NULL; const gchar *end_tag; 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:[2173] trunk/geanyembrace/
by frlan＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2173 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2173&view=rev Author: frlan Date: 2011-08-27 17:27:07 +0000 (Sat, 27 Aug 2011) Log Message: ----------- Remove geanyembrace from repo as its not maintained anymore and most of its functions are available through other plugins Removed Paths: ------------- trunk/geanyembrace/ 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:[2172] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 27 Aug '11

27 Aug '11

Revision: 2172 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2172&view=rev Author: cesspit Date: 2011-08-27 12:45:36 +0000 (Sat, 27 Aug 2011) Log Message: ----------- debugger: Correcting markers when "savings as", removing or modifying a file from outside geany. Another portion of compiler casting warning removed. Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c 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/callbacks.c trunk/geany-plugins/debugger/src/callbacks.h trunk/geany-plugins/debugger/src/dbm_gdb.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/debug_module.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/tpage.c trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/utils.h trunk/geany-plugins/debugger/src/vtree.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -343,7 +343,7 @@ /* creating columns */ GtkTreeViewColumn *column; - gchar *header; + const gchar *header; int char_width = get_char_width(tree); Modified: trunk/geany-plugins/debugger/src/breakpoint.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoint.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/breakpoint.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -47,7 +47,7 @@ * enabled - is new breakpoint enabled * hitscount - breakpoints hitscount */ -breakpoint* break_new_full(char* file, int line, char* condition, int enabled, int hitscount) +breakpoint* break_new_full(const char* file, int line, const char* condition, int enabled, int hitscount) { breakpoint* bp = break_new(); strcpy(bp->file, file); Modified: trunk/geany-plugins/debugger/src/breakpoint.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoint.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/breakpoint.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -33,4 +33,4 @@ } breakpoint; breakpoint* break_new(); -breakpoint* break_new_full(char* file, int line, char* condition, int enabled, int hitscount); +breakpoint* break_new_full(const char* file, int line, const char* condition, int enabled, int hitscount); Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -105,7 +105,7 @@ * file - breakpoints filename * line - breakpoints line */ -breakpoint* lookup_breakpoint(gchar* file, int line) +breakpoint* lookup_breakpoint(const gchar* file, int line) { breakpoint* bp = NULL; GTree* tree = NULL; @@ -315,7 +315,7 @@ * enabled - is new breakpoint enabled * hitscount - breakpoints hitscount */ -void breaks_add(char* file, int line, char* condition, int enabled, int hitscount) +void breaks_add(const char* file, int line, char* condition, int enabled, int hitscount) { /* do not process async break manipulation on modules that do not support async interuppt */ @@ -352,7 +352,7 @@ * file - breakpoints filename * line - breakpoints line */ -void breaks_remove(char* file, int line) +void breaks_remove(const char* file, int line) { /* do not process async break manipulation on modules that do not support async interuppt */ @@ -389,7 +389,7 @@ * file - breakpoints filename * line - breakpoints line */ -void breaks_switch(char* file, int line) +void breaks_switch(const char* file, int line) { /* do not process async break manipulation on modules that do not support async interuppt */ @@ -505,7 +505,7 @@ * file - breakpoints filename * line - breakpoints line */ -break_state breaks_get_state(char* file, int line) +break_state breaks_get_state(const char* file, int line) { break_state bs = BS_NOT_SET; @@ -528,7 +528,7 @@ * arguments: * file - file name to get breaks for */ -GList *breaks_get_for_document(char* file) +GList *breaks_get_for_document(const char* file) { GList *breaks = NULL; GTree *tree = g_hash_table_lookup(files, file); Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -29,16 +29,16 @@ gboolean breaks_init(move_to_line_cb callback); void breaks_destroy(); -void breaks_add(char* file, int line, char* condition, int enable, int hitscount); -void breaks_remove(char* file, int line); +void breaks_add(const char* file, int line, char* condition, int enable, int hitscount); +void breaks_remove(const char* file, int line); void breaks_remove_all(); -void breaks_switch(char* file, int line); +void breaks_switch(const char* file, int line); void breaks_set_hits_count(char* file, int line, int count); void breaks_set_condition(char* file, int line, char* condition); void breaks_move_to_line(char* file, int line_from, int line_to); -break_state breaks_get_state(char* file, int line); +break_state breaks_get_state(const char* file, int line); GtkWidget* breaks_get_widget(); -GList* breaks_get_for_document(char* file); +GList* breaks_get_for_document(const char* file); GList* breaks_get_all(); void breaks_read_config(); Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -42,12 +42,72 @@ extern GeanyFunctions *geany_functions; /* + * Set breakpoint and stack markers for a file + */ +void set_markers_for_file(const gchar* file) +{ + GList *breaks; + if ( (breaks = breaks_get_for_document(file)) ) + { + GList *iter = breaks; + while (iter) + { + breakpoint *bp = (breakpoint*)iter->data; + markers_add_breakpoint(bp); + + iter = iter->next; + } + g_list_free(breaks); + } + + /* set frames markers if exists */ + if (DBS_STOPPED == debug_get_state()) + { + GList *iter = debug_get_stack(); + if (iter) + { + frame *f = (frame*)iter->data; + if (f->have_source && !strcmp(f->file, file)) + { + markers_add_current_instruction(f->file, f->line); + } + + iter = iter->next; + while (iter) + { + f = (frame*)iter->data; + if (f->have_source && !strcmp(f->file, file)) + { + markers_add_frame(f->file, f->line); + } + iter = iter->next; + } + } + } +} + +/* * Following group of callbacks are used for * checking of existance of the config file * and changing buttons state in the target page */ /* + * Occures before document is going to be saved + */ +static gboolean _unexisting_file = FALSE; +void on_document_before_save(GObject *obj, GeanyDocument *doc, gpointer user_data) +{ + if (!doc->real_path) + { + /* we can fall here if we are saving new document + (that doesn't exists on a filesystem) or if we're "Saving As" */ + + _unexisting_file = TRUE; + } +} + +/* * Occures on closing document */ void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) @@ -60,6 +120,21 @@ */ void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_data) { + if (_unexisting_file) + { + /* if we are saving as - remove all markers at first */ + markers_remove_all(doc); + + /* next, lets try to find and insert markers for the file, current document is being saved to*/ + set_markers_for_file(doc->file_name); + + /* if debug is active - tell the debug module that a file was opened */ + if (DBS_IDLE != debug_get_state()) + debug_on_file_open(doc); + + _unexisting_file = FALSE; + } + btnpanel_on_document_activate(doc); } @@ -84,7 +159,7 @@ */ void on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data) { - char* file = DOC_FILENAME(doc); + const gchar* file = DOC_FILENAME(doc); /*set markers*/ markers_set_for_document(doc->editor->sci); @@ -97,50 +172,14 @@ /* set caret policy */ scintilla_send_message(doc->editor->sci, SCI_SETYCARETPOLICY, CARET_SLOP | CARET_JUMPS | CARET_EVEN , 3); + /* set breakpoint and frame markers */ + set_markers_for_file(file); + /* check if current path contains config file */ gchar *folder = g_path_get_dirname(DOC_FILENAME(doc)); btnpanel_set_have_config(dconfig_is_found_at(folder)); g_free(folder); - GList *breaks; - if ( (breaks = breaks_get_for_document(file)) ) - { - GList *iter = breaks; - while (iter) - { - breakpoint *bp = (breakpoint*)iter->data; - markers_add_breakpoint(bp); - - iter = iter->next; - } - g_list_free(breaks); - } - - /* set frames markers if exists */ - if (DBS_STOPPED == debug_get_state()) - { - GList *iter = debug_get_stack(); - if (iter) - { - frame *f = (frame*)iter->data; - if (f->have_source && !strcmp(f->file, file)) - { - markers_add_current_instruction(f->file, f->line); - } - - iter = iter->next; - while (iter) - { - f = (frame*)iter->data; - if (f->have_source && !strcmp(f->file, file)) - { - markers_add_frame(f->file, f->line); - } - iter = iter->next; - } - } - } - /* if debug is active - tell the debug module that a file was opened */ if (DBS_IDLE != debug_get_state()) debug_on_file_open(doc); @@ -154,6 +193,12 @@ GObject *object, GeanyEditor *editor, SCNotification *nt, gpointer data) { + if (!editor->document->real_path) + { + /* no other way to handle removing a file from outside of geany */ + markers_remove_all(editor->document); + } + switch (nt->nmhdr.code) { case SCN_MARGINCLICK: Modified: trunk/geany-plugins/debugger/src/callbacks.h =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/callbacks.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -23,6 +23,7 @@ void on_document_activate(GObject *obj, GeanyDocument *doc, gpointer user_data); void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data); void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_data); +void on_document_before_save(GObject *obj, GeanyDocument *doc, gpointer user_data); void on_document_new(GObject *obj, GeanyDocument *doc, gpointer user_data); gboolean on_editor_notify(GObject *object, GeanyEditor *editor, SCNotification *nt, gpointer data); gboolean keys_callback(guint key_id); Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -717,7 +717,7 @@ /* * execute until */ -void execute_until(gchar *file, int line) +void execute_until(const gchar *file, int line) { gchar command[1000]; sprintf(command, "-exec-until %s:%i", file, line); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -837,7 +837,7 @@ /* * called from debugger module to show an error message box */ -static void on_debugger_error (gchar* message) +static void on_debugger_error (const gchar* message) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", message); } @@ -1209,7 +1209,7 @@ /* * step to position */ -void debug_execute_until(gchar *file, int line) +void debug_execute_until(const gchar *file, int line) { if (DBS_STOPPED == debug_state) active_module->execute_until(file, line); @@ -1355,7 +1355,7 @@ */ void debug_on_file_open(GeanyDocument *doc) { - gchar *file = DOC_FILENAME(doc); + const gchar *file = DOC_FILENAME(doc); if (g_list_find_custom(read_only_pages, (gpointer)file, (GCompareFunc)g_strcmp0)) scintilla_send_message(doc->editor->sci, SCI_SETREADONLY, 1, 0); } Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/debug.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -41,7 +41,7 @@ void debug_step_over(); void debug_step_into(); void debug_step_out(); -void debug_execute_until(gchar *file, int line); +void debug_execute_until(const gchar *file, int line); gboolean debug_set_break(breakpoint* bp, break_set_activity bsa); gboolean debug_remove_break(breakpoint* bp); void debug_request_interrupt(bs_callback cb, breakpoint* bp, break_set_activity flags); Modified: trunk/geany-plugins/debugger/src/debug_module.h =================================================================== --- trunk/geany-plugins/debugger/src/debug_module.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/debug_module.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -26,7 +26,7 @@ void (*set_exited) (int code); void (*send_message) (const gchar* message, const gchar *color); void (*clear_messages) (); - void (*report_error) (gchar* message); + void (*report_error) (const gchar* message); } dbg_callbacks; /* type to hold information about a variable */ @@ -84,7 +84,7 @@ void (*step_over) (); void (*step_into) (); void (*step_out) (); - void (*execute_until)(gchar *file, int line); + void (*execute_until)(const gchar *file, int line); gboolean (*set_break) (breakpoint* bp, break_set_activity bsa); gboolean (*remove_break) (breakpoint* bp); Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -208,3 +208,16 @@ scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } } + +/* + * removes all markers from GeanyDocument + */ +void markers_remove_all(GeanyDocument *doc) +{ + static int markers[] = { M_BP_ENABLED, M_BP_DISABLED, M_BP_CONDITIONAL, M_CI_BACKGROUND, M_CI_ARROW, M_FRAME }; + int i = 0, size = sizeof(markers) / sizeof(int); + for (; i < size; i++) + { + scintilla_send_message(doc->editor->sci, SCI_MARKERDELETEALL, markers[i], 0); + } +} Modified: trunk/geany-plugins/debugger/src/markers.h =================================================================== --- trunk/geany-plugins/debugger/src/markers.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/markers.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -27,5 +27,6 @@ void markers_remove_current_instruction(char* file, int line); void markers_add_frame(char* file, int line); void markers_remove_frame(char* file, int line); +void markers_remove_all(GeanyDocument *doc); Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -68,6 +68,7 @@ { "document_activate", (GCallback) &on_document_activate, FALSE, NULL }, { "document_close", (GCallback) &on_document_close, FALSE, NULL }, { "document_save", (GCallback) &on_document_save, FALSE, NULL }, + { "document_before_save", (GCallback) &on_document_before_save, FALSE, NULL }, { "document_new", (GCallback) &on_document_new, FALSE, NULL }, { NULL, NULL, FALSE, NULL } Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/stree.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -134,7 +134,7 @@ /* creating columns */ GtkCellRenderer *renderer; GtkTreeViewColumn *column; - gchar *header; + const gchar *header; int char_width = get_char_width(tree); Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -635,7 +635,7 @@ g_object_set(envtree, "rules-hint", TRUE, NULL); g_signal_connect(G_OBJECT(envtree), "key-press-event", G_CALLBACK (on_envtree_keypressed), NULL); - gchar *header; + const gchar *header; int char_width = get_char_width(envtree); header = _("Name"); Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -62,7 +62,7 @@ /* * get string width if string length is bigger than minwidth or minwidth * char_width */ -int get_header_string_width(gchar *header, int minchars, int char_width) +int get_header_string_width(const gchar *header, int minchars, int char_width) { return strlen(header) > minchars ? strlen(header) : minchars * char_width; } @@ -70,7 +70,7 @@ /* * create tree view column */ -GtkTreeViewColumn *create_column(gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value) +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); @@ -101,6 +101,10 @@ sci_goto_line(doc->editor->sci, line - 1, TRUE); scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Can't find a source file \"%s\""), file); + } } /* Modified: trunk/geany-plugins/debugger/src/utils.h =================================================================== --- trunk/geany-plugins/debugger/src/utils.h 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/utils.h 2011-08-27 12:45:36 UTC (rev 2172) @@ -21,6 +21,6 @@ void editor_open_position(char* file, int line); int get_char_width(GtkWidget *widget); -int get_header_string_width(gchar *header, int minchars, int char_width); -GtkTreeViewColumn* create_column(gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value); +int get_header_string_width(const gchar *header, int minchars, int char_width); +GtkTreeViewColumn* create_column(const gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value); GString* get_word_at_position(ScintillaObject *sci, int position); Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-08-25 19:34:37 UTC (rev 2171) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-08-27 12:45:36 UTC (rev 2172) @@ -128,7 +128,7 @@ /* create columns */ GtkCellRenderer *renderer; GtkTreeViewColumn *column; - gchar *header; + const gchar *header; int char_width = get_char_width(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-plugins:[2171] trunk/externdbg/
by yurand＠users.sourceforge.net 25 Aug '11

25 Aug '11

Revision: 2171 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2171&view=rev Author: yurand Date: 2011-08-25 19:34:37 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Deleting externdbg plugin (no longer build) Removed Paths: ------------- trunk/externdbg/ 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:[2170] trunk/geany-plugins/debugger
by cesspit＠users.sourceforge.net 24 Aug '11

24 Aug '11

Revision: 2170 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2170&view=rev Author: cesspit Date: 2011-08-24 20:34:42 +0000 (Wed, 24 Aug 2011) Log Message: ----------- debugger: waf build fixed, compiler warnings removed Modified Paths: -------------- trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/debug_module.c trunk/geany-plugins/debugger/src/markers.c trunk/geany-plugins/debugger/wscript_build Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-08-24 08:14:32 UTC (rev 2169) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-08-24 20:34:42 UTC (rev 2170) @@ -25,6 +25,7 @@ */ #include <sys/stat.h> +#include <memory.h> #include "geanyplugin.h" extern GeanyFunctions *geany_functions; Modified: trunk/geany-plugins/debugger/src/debug_module.c =================================================================== --- trunk/geany-plugins/debugger/src/debug_module.c 2011-08-24 08:14:32 UTC (rev 2169) +++ trunk/geany-plugins/debugger/src/debug_module.c 2011-08-24 20:34:42 UTC (rev 2170) @@ -47,7 +47,7 @@ variable *variable_new2(gchar *name, gchar *internal) { variable *var = variable_new(name); - g_string_append(var->internal, internal); + g_string_assign(var->internal, internal); return var; } @@ -67,6 +67,7 @@ void variable_reset(variable *var) { g_string_assign(var->internal, ""); + g_string_assign(var->expression, ""); g_string_assign(var->type, ""); g_string_assign(var->value, ""); var->has_children = var->evaluated = FALSE; Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-24 08:14:32 UTC (rev 2169) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-24 20:34:42 UTC (rev 2170) @@ -23,6 +23,8 @@ * Contains functions for manipulating margin and background markers. */ +#include <string.h> + #include "geanyplugin.h" extern GeanyFunctions *geany_functions; extern GeanyData *geany_data; Modified: trunk/geany-plugins/debugger/wscript_build =================================================================== --- trunk/geany-plugins/debugger/wscript_build 2011-08-24 08:14:32 UTC (rev 2169) +++ trunk/geany-plugins/debugger/wscript_build 2011-08-24 20:34:42 UTC (rev 2170) @@ -22,9 +22,17 @@ from build.wafutils import build_plugin - name = 'Debugger' includes = ['debugger/src'] libraries = ['VTE', 'UTIL'] -build_plugin(bld, name, includes=includes, libraries=libraries) +pludin_datadir = conf.env['GEANYPLUGINS_DATADIR'] + '/geany-plugins/debugger' + +defines=[ 'DBGPLUG_DATA_DIR="' + pludin_datadir + '"'] + +build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines) + +# Icons +start_dir = bld.path.find_dir('img') +bld.install_files(pludin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir) +bld.install_files(pludin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir) 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:[2169] trunk/geany-plugins/build/devhelp.m4
by codebrainz＠users.sourceforge.net 24 Aug '11

24 Aug '11

Revision: 2169 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2169&view=rev Author: codebrainz Date: 2011-08-24 08:14:32 +0000 (Wed, 24 Aug 2011) Log Message: ----------- Fix case of Autotools building Devhelp plugin auto (oops). Used the code copied from common.m4 directly with wrong substituions. Now uses hardcoded 'enable_devhelp'. Modified Paths: -------------- trunk/geany-plugins/build/devhelp.m4 Modified: trunk/geany-plugins/build/devhelp.m4 =================================================================== --- trunk/geany-plugins/build/devhelp.m4 2011-08-24 07:58:32 UTC (rev 2168) +++ trunk/geany-plugins/build/devhelp.m4 2011-08-24 08:14:32 UTC (rev 2169) @@ -34,14 +34,14 @@ [PKG_CHECK_MODULES( [DEVHELP], [libdevhelp-1.0 >= ${DEVHELP1_VERSION}], - [m4_tolower(AS_TR_SH(enable_$1))=yes], - [m4_tolower(AS_TR_SH(enable_$1))=no]) + [m4_tolower(AS_TR_SH(enable_devhelp))=yes], + [m4_tolower(AS_TR_SH(enable_devhelp))=no]) ] ) fi - AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_$1)), - test "$m4_tolower(AS_TR_SH(enable_$1))" = yes) + AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_devhelp)), + test "$m4_tolower(AS_TR_SH(enable_devhelp))" = yes) GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp]) 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:[2168] trunk/geany-plugins/devhelp/ wscript_configure
by codebrainz＠users.sourceforge.net 24 Aug '11

24 Aug '11

Revision: 2168 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2168&view=rev Author: codebrainz Date: 2011-08-24 07:58:32 +0000 (Wed, 24 Aug 2011) Log Message: ----------- Adjust Waf build system to require newer Devhelp library. Building with Waf now requires 'libdevhelp-2.0' (>=2.32.0) since I don't know how to make Waf use older or new library. Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_configure Modified: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure 2011-08-24 07:50:51 UTC (rev 2167) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-08-24 07:58:32 UTC (rev 2168) @@ -27,7 +27,7 @@ ('gtk+-2.0', '2.16', 'GTK'), ('glib-2.0', '2.16', 'GLIB'), ('gthread-2.0','','GTHREAD'), - ('libdevhelp-1.0', '2.30.1', 'LIBDEVHELP'), + ('libdevhelp-2.0', '2.32.0', 'LIBDEVHELP'), ('webkit-1.0', '1.1.18', 'WEBKIT') ] 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