Plugins-Commits August 2011

plugins-commits@lists.geany.org

8 participants
73 discussions

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

06 Aug '11

Revision: 2127 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2127&view=rev Author: cesspit Date: 2011-08-06 21:58:41 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - fixed bug with setting frame markers for files that are not open - adding frame markers on open file event if a current file has stack traced code Modified Paths: -------------- trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/markers.c Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 21:02:48 UTC (rev 2126) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 21:58:41 UTC (rev 2127) @@ -112,6 +112,31 @@ 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); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-06 21:02:48 UTC (rev 2126) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-06 21:58:41 UTC (rev 2127) @@ -957,6 +957,14 @@ } /* + * gets current stack frames lisy + */ +GList* debug_get_stack() +{ + return stack; +} + +/* * gets debug module index from name * arguments: * modulename - debug module name Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-08-06 21:02:48 UTC (rev 2126) +++ trunk/geany-plugins/debugger/src/debug.h 2011-08-06 21:58:41 UTC (rev 2127) @@ -34,25 +34,26 @@ /* function type to execute on interrupt */ typedef void (*bs_callback)(breakpoint*, break_set_activity); -void debug_init(GtkWidget* nb); +void debug_init(GtkWidget* nb); enum dbs debug_get_state(); -void debug_run(); -void debug_stop(); -void debug_step_over(); -void debug_step_into(); -void debug_step_out(); -void debug_execute_until(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); +void debug_run(); +void debug_stop(); +void debug_step_over(); +void debug_step_into(); +void debug_step_out(); +void debug_execute_until(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); gchar* debug_error_message(); -GList* debug_get_modules(); -int debug_get_module_index(gchar *modulename); -gboolean debug_supports_async_breaks(); -void debug_destroy(); +GList* debug_get_modules(); +int debug_get_module_index(gchar *modulename); +gboolean debug_supports_async_breaks(); +void debug_destroy(); gchar* debug_evaluate_expression(gchar *expression); -gboolean debug_current_instruction_have_sources(); -void debug_jump_to_current_instruction(); -void debug_on_file_open(GeanyDocument *doc); -gchar* debug_get_calltip_for_expression(gchar* expression); +gboolean debug_current_instruction_have_sources(); +void debug_jump_to_current_instruction(); +void debug_on_file_open(GeanyDocument *doc); +gchar* debug_get_calltip_for_expression(gchar* expression); +GList* debug_get_stack(); Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-06 21:02:48 UTC (rev 2126) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-06 21:58:41 UTC (rev 2127) @@ -213,8 +213,11 @@ void markers_add_current_instruction(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); - sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); + if (doc) + { + sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); + sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); + } } /* @@ -223,9 +226,12 @@ void markers_remove_current_instruction(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); - sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); - scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); + if (doc) + { + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); + scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); + } } /* @@ -234,7 +240,10 @@ void markers_add_frame(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_set_marker_at_line(doc->editor->sci, line - 1, M_FRAME); + if (doc) + { + sci_set_marker_at_line(doc->editor->sci, line - 1, M_FRAME); + } } /* @@ -243,6 +252,9 @@ void markers_remove_frame(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_delete_marker_at_line(doc->editor->sci, line - 1, M_FRAME); - scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); + if (doc) + { + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_FRAME); + scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); + } } 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:[2126] trunk/geany-plugins/debugger/src/debug.c
by cesspit＠users.sourceforge.net 06 Aug '11

06 Aug '11

Revision: 2126 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2126&view=rev Author: cesspit Date: 2011-08-06 21:02:48 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - fixed bug with several frames with no sources when setting frame markers Modified Paths: -------------- trunk/geany-plugins/debugger/src/debug.c Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-06 20:44:03 UTC (rev 2125) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-06 21:02:48 UTC (rev 2126) @@ -159,7 +159,10 @@ while (iter) { frame *next = (frame*)iter->data; - markers_remove_frame(next->file, next->line); + if (next->have_source) + { + markers_remove_frame(next->file, next->line); + } iter = iter->next; } } @@ -178,7 +181,10 @@ while (iter) { frame *next = (frame*)iter->data; - markers_add_frame(next->file, next->line); + if (next->have_source) + { + markers_add_frame(next->file, next->line); + } iter = iter->next; } } 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:[2125] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 06 Aug '11

06 Aug '11

Revision: 2125 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2125&view=rev Author: cesspit Date: 2011-08-06 20:44:03 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - distinct markers for conditional/with hitscount breakpoints - stack frames markers for frames other than top Modified Paths: -------------- trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/markers.c trunk/geany-plugins/debugger/src/markers.h trunk/geany-plugins/debugger/src/stree.c Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 13:30:45 UTC (rev 2124) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 20:44:03 UTC (rev 2125) @@ -183,7 +183,11 @@ void handle_hitscount_set(breakpoint* bp, gboolean success) { if (success) + { bptree_set_hitscount(bp->iter, bp->hitscount); + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); + } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); } @@ -200,6 +204,8 @@ { /* set condition in breaks tree */ bptree_set_condition(bp->iter, bp->condition); + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); } else { @@ -221,16 +227,9 @@ void handle_switch(breakpoint* bp, gboolean success) { /* remove old and set new marker */ - if (bp->enabled) - { - markers_remove_breakpoint_disabled(bp->file, bp->line); - markers_add_breakpoint(bp); - } - else - { - markers_remove_breakpoint(bp); - markers_add_breakpoint_disabled(bp->file, bp->line); - } + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); + /* set checkbox in breaks tree */ bptree_set_enabled(bp->iter, bp->enabled); } Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-06 13:30:45 UTC (rev 2124) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-06 20:44:03 UTC (rev 2125) @@ -124,13 +124,10 @@ static GtkWidget **sensitive_widget[] = {&stree, &wtree, &ltree, NULL}; /* - * information about current instruction - * used to remove markers when stepping forward + * current stack for holding + * position of ffreames markers */ -struct ci { - char file[FILENAME_MAX + 1]; - int line; -} current_instruction; +static GList* stack = NULL; /* * pages which are loaded in debugger and therefore, are set readonly @@ -149,6 +146,44 @@ static GHashTable *calltips = NULL; /* + * removes stack margin markers + */ + void remove_stack_markers() +{ + frame *current = (frame*)stack->data; + if (current->have_source) + { + markers_remove_current_instruction(current->file, current->line); + } + GList *iter = stack->next; + while (iter) + { + frame *next = (frame*)iter->data; + markers_remove_frame(next->file, next->line); + iter = iter->next; + } +} + +/* + * removes stack margin markers + */ + void add_stack_markers() +{ + frame *current = (frame*)stack->data; + if (current->have_source) + { + markers_add_current_instruction(current->file, current->line); + } + GList *iter = stack->next; + while (iter) + { + frame *next = (frame*)iter->data; + markers_add_frame(next->file, next->line); + iter = iter->next; + } +} + +/* * Handlers for GUI maked changes in watches */ @@ -532,16 +567,18 @@ debug_state = DBS_RUNNING; /* if curren instruction marker was set previously - remove it */ - if (strlen(current_instruction.file)) + if (stack) { - markers_remove_current_instruction(current_instruction.file, current_instruction.line); - strcpy(current_instruction.file, ""); + remove_stack_markers(); + g_list_free(stack); + stack = NULL; } /* disable widgets */ enable_sensitive_widgets(FALSE); } + /* * called from debug module when debugger is being stopped */ @@ -574,19 +611,8 @@ stree_clear(); /* get current stack trace and put in the tree view */ - GList* stack = active_module->get_stack(); - - /* if upper frame has source file - remember the file and the line for - the current instruction marker */ - frame *f = (frame*)stack->data; - if (f->have_source) - { - strcpy(current_instruction.file, f->file); - current_instruction.line = (int)f->line; - } + stack = active_module->get_stack(); - stack = g_list_reverse(stack); - GList *iter = stack; while (iter) { @@ -594,8 +620,6 @@ stree_add(f); iter = g_list_next(iter); } - g_list_foreach(stack, (GFunc)g_free, NULL); - g_list_free(stack); stree_select_first(); /* files */ @@ -654,14 +678,19 @@ GList *watches = active_module->get_watches(); update_variables(GTK_TREE_VIEW(wtree), NULL, watches); gtk_tree_view_columns_autosize (GTK_TREE_VIEW(wtree)); - - if (strlen(current_instruction.file)) + + if (stack) { - /* open current instruction position */ - editor_open_position(current_instruction.file, current_instruction.line); + frame *current = (frame*)stack->data; + if (current->have_source) + { + /* open current instruction position */ + editor_open_position(current->file, current->line); + } + /* add current instruction marker */ - markers_add_current_instruction(current_instruction.file, current_instruction.line); + add_stack_markers(); } /* enable widgets */ @@ -678,10 +707,11 @@ static void on_debugger_exited (int code) { /* remove marker for current instruction if was set */ - if (strlen(current_instruction.file)) + if (stack) { - markers_remove_current_instruction(current_instruction.file, current_instruction.line); - strcpy(current_instruction.file, ""); + remove_stack_markers(); + g_list_free(stack); + stack = NULL; } /* clear watch page */ @@ -903,9 +933,13 @@ close(pty_master); close(pty_slave); - /* remove current instruction marker if present */ - if (strlen(current_instruction.file)) - markers_remove_current_instruction(current_instruction.file, current_instruction.line); + /* remove stack markers if present */ + if (stack) + { + remove_stack_markers(); + g_list_free(stack); + stack = NULL; + } } /* @@ -1224,7 +1258,8 @@ */ gboolean debug_current_instruction_have_sources() { - return strlen(current_instruction.file); + frame *current = (frame*)stack->data; + return current->have_source ? strlen(current->file) : 0; } /* @@ -1232,7 +1267,8 @@ */ void debug_jump_to_current_instruction() { - editor_open_position(current_instruction.file, current_instruction.line); + frame *current = (frame*)stack->data; + editor_open_position(current->file, current->line); } /* Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-06 13:30:45 UTC (rev 2124) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-06 20:44:03 UTC (rev 2125) @@ -31,21 +31,30 @@ #include "breakpoints.h" /* markers identifiers */ -#define MARKER_FIRST 12 -#define MARKER_BREAKPOINT_ENABLED MARKER_FIRST -#define MARKER_BREAKPOINT_DISABLED (MARKER_FIRST + 1) -#define MARKER_CURRENT_INSTRUCTION_BACKGROUND (MARKER_FIRST + 2) -#define MARKER_CURRENT_INSTRUCTION_ARROW (MARKER_FIRST + 3) -#define MARKER_FRAME (MARKER_FIRST + 4) +#define M_FIRST 12 +#define M_BP_ENABLED M_FIRST +#define M_BP_DISABLED (M_FIRST + 1) +#define M_CI_BACKGROUND (M_FIRST + 2) +#define M_BP_ENABLED_CONDITIONAL (M_FIRST + 3) +#define M_BP_ENABLED_HITS (M_FIRST + 4) +#define M_BP_ENABLED_HITS_CONDITIONAL (M_FIRST + 5) +#define M_BP_DISABLED_CONDITIONAL (M_FIRST + 6) +#define M_BP_DISABLED_HITS (M_FIRST + 7) +#define M_BP_DISABLED_HITS_CONDITIONAL (M_FIRST + 8) +#define M_CI_ARROW (M_FIRST + 9) +#define M_FRAME (M_FIRST + 10) +#define MARKER_PRESENT(mask, marker) (mask && (0x01 << marker)) + /* markers colors */ #define RGB(R,G,B) (R | (G << 8) | (B << 16)) -#define RED RGB(255,0,0) +#define RED RGB(255,0,0) #define GREEN RGB(0,255,0) -#define BLUE RGB(0,0,255) +#define BLUE RGB(0,0,255) #define YELLOW RGB(255,255,0) #define BLACK RGB(0,0,0) #define WHITE RGB(255,255,255) +#define PINK RGB(255,192,203) #define LIGHT_YELLOW RGB(200,200,0) @@ -55,30 +64,57 @@ void markers_set_for_document(ScintillaObject *sci) { /* enabled breakpoint */ - scintilla_send_message(sci, SCI_MARKERDEFINE, MARKER_BREAKPOINT_ENABLED, SC_MARK_SMALLRECT); - scintilla_send_message(sci, SCI_MARKERSETBACK, MARKER_BREAKPOINT_ENABLED, RED); - scintilla_send_message(sci, SCI_MARKERSETFORE, MARKER_BREAKPOINT_ENABLED, RED); + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED, RED); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED, RED); + + /* enabled breakpoint - condition */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_CONDITIONAL, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_CONDITIONAL, BLUE); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_CONDITIONAL, BLUE); + /* enabled breakpoint - hits */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_HITS, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_HITS, YELLOW); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_HITS, YELLOW); + + /* enabled breakpoint - hits, condition */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_HITS_CONDITIONAL, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_HITS_CONDITIONAL, GREEN); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_HITS_CONDITIONAL, GREEN); + /* disabled breakpoint */ - scintilla_send_message(sci, SCI_MARKERDEFINE, MARKER_BREAKPOINT_DISABLED, SC_MARK_SMALLRECT); - scintilla_send_message(sci, SCI_MARKERSETFORE, MARKER_BREAKPOINT_DISABLED, RED); + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED, RED); + /* disabled breakpoint - condition */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_CONDITIONAL, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_CONDITIONAL, BLUE); + + /* disabled breakpoint - hits */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_HITS, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_HITS, YELLOW); + + /* disabled breakpoint - hits, condition */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_HITS_CONDITIONAL, SC_MARK_ROUNDRECT); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_HITS_CONDITIONAL, GREEN); + /* currect instruction background */ - scintilla_send_message(sci, SCI_MARKERDEFINE, MARKER_CURRENT_INSTRUCTION_BACKGROUND, SC_MARK_BACKGROUND); - scintilla_send_message(sci, SCI_MARKERSETBACK, MARKER_CURRENT_INSTRUCTION_BACKGROUND, YELLOW); - scintilla_send_message(sci, SCI_MARKERSETFORE, MARKER_CURRENT_INSTRUCTION_BACKGROUND, YELLOW); - scintilla_send_message(sci, SCI_MARKERSETALPHA, MARKER_CURRENT_INSTRUCTION_BACKGROUND, 75); + scintilla_send_message(sci, SCI_MARKERDEFINE, M_CI_BACKGROUND, SC_MARK_BACKGROUND); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_CI_BACKGROUND, YELLOW); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_CI_BACKGROUND, YELLOW); + scintilla_send_message(sci, SCI_MARKERSETALPHA, M_CI_BACKGROUND, 75); /* currect instruction arrow */ - scintilla_send_message(sci, SCI_MARKERDEFINE, MARKER_CURRENT_INSTRUCTION_ARROW, SC_MARK_SHORTARROW); - scintilla_send_message(sci, SCI_MARKERSETBACK, MARKER_CURRENT_INSTRUCTION_ARROW, YELLOW); - scintilla_send_message(sci, SCI_MARKERSETFORE, MARKER_CURRENT_INSTRUCTION_ARROW, BLACK); - scintilla_send_message(sci, SCI_MARKERSETALPHA, MARKER_CURRENT_INSTRUCTION_ARROW, 75); + scintilla_send_message(sci, SCI_MARKERDEFINE, M_CI_ARROW, SC_MARK_SHORTARROW); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_CI_ARROW, YELLOW); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_CI_ARROW, BLACK); + scintilla_send_message(sci, SCI_MARKERSETALPHA, M_CI_ARROW, 75); - /* frame marker */ - scintilla_send_message(sci, SCI_MARKERDEFINE, MARKER_FRAME, SC_MARK_SHORTARROW); - scintilla_send_message(sci, SCI_MARKERSETBACK, MARKER_FRAME, LIGHT_YELLOW); - scintilla_send_message(sci, SCI_MARKERSETFORE, MARKER_FRAME, LIGHT_YELLOW); + /* frame marker current */ + scintilla_send_message(sci, SCI_MARKERDEFINE, M_FRAME, SC_MARK_SHORTARROW); + scintilla_send_message(sci, SCI_MARKERSETBACK, M_FRAME, WHITE); + scintilla_send_message(sci, SCI_MARKERSETFORE, M_FRAME, BLACK); } /* @@ -103,62 +139,110 @@ GeanyDocument *doc = document_find_by_filename(bp->file); if (doc) { - sci_set_marker_at_line(doc->editor->sci, bp->line - 1, - bp->enabled ? MARKER_BREAKPOINT_ENABLED : MARKER_BREAKPOINT_DISABLED); + int marker; + if (bp->enabled) + { + if (strlen(bp->condition)) + { + marker = bp->hitscount ? M_BP_ENABLED_HITS_CONDITIONAL : M_BP_ENABLED_CONDITIONAL; + } + else if (bp->hitscount) + { + marker = M_BP_ENABLED_HITS; + } + else + { + marker = M_BP_ENABLED; + } + } + else + { + if (strlen(bp->condition)) + { + marker = bp->hitscount ? M_BP_DISABLED_HITS_CONDITIONAL : M_BP_DISABLED_CONDITIONAL; + } + else if (bp->hitscount) + { + marker = M_BP_DISABLED_HITS; + } + else + { + marker = M_BP_DISABLED; + } + } + sci_set_marker_at_line(doc->editor->sci, bp->line - 1, marker); } } /* * removes breakpoints marker */ -void markers_remove_breakpoint(breakpoint* bp) +void markers_remove_breakpoint(breakpoint *bp) { + static int breakpoint_markers[] = { + M_BP_ENABLED, + M_BP_ENABLED_CONDITIONAL, + M_BP_ENABLED_HITS, + M_BP_ENABLED_HITS_CONDITIONAL, + M_BP_DISABLED, + M_BP_DISABLED_CONDITIONAL, + M_BP_DISABLED_HITS, + M_BP_DISABLED_HITS_CONDITIONAL + }; + GeanyDocument *doc = document_find_by_filename(bp->file); if (doc) { - /* delete enabled marker */ - sci_delete_marker_at_line(doc->editor->sci, bp->line - 1, MARKER_BREAKPOINT_ENABLED); - /* delete disabled marker */ - sci_delete_marker_at_line(doc->editor->sci, bp->line - 1, MARKER_BREAKPOINT_DISABLED); + int markers = scintilla_send_message(doc->editor->sci, SCI_MARKERGET, bp->line - 1, (long)NULL); + int markers_count = sizeof(breakpoint_markers) / sizeof(breakpoint_markers[0]); + int i = 0; + for (; i < markers_count; i++) + { + int marker = breakpoint_markers[i]; + if (markers & (0x01 << marker)) + { + sci_delete_marker_at_line(doc->editor->sci, bp->line - 1, marker); + } + } } } /* - * adds disabled breakpoint marker + * adds current instruction marker */ -void markers_add_breakpoint_disabled(char* file, int line) +void markers_add_current_instruction(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_set_marker_at_line(doc->editor->sci, line - 1, MARKER_BREAKPOINT_DISABLED); + sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); + sci_set_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); } /* - * removes disabled breakpoint marker + * removes current instruction marker */ -void markers_remove_breakpoint_disabled(char* file, int line) +void markers_remove_current_instruction(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_delete_marker_at_line(doc->editor->sci, line - 1, MARKER_BREAKPOINT_DISABLED); + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_ARROW); + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_CI_BACKGROUND); + scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } /* - * adds current instruction marker + * adds frame marker */ -void markers_add_current_instruction(char* file, int line) +void markers_add_frame(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_set_marker_at_line(doc->editor->sci, line - 1, MARKER_CURRENT_INSTRUCTION_ARROW); - sci_set_marker_at_line(doc->editor->sci, line - 1, MARKER_CURRENT_INSTRUCTION_BACKGROUND); + sci_set_marker_at_line(doc->editor->sci, line - 1, M_FRAME); } /* - * removes current instruction marker + * removes frame marker */ -void markers_remove_current_instruction(char* file, int line) +void markers_remove_frame(char* file, int line) { GeanyDocument *doc = document_find_by_filename(file); - sci_delete_marker_at_line(doc->editor->sci, line - 1, MARKER_CURRENT_INSTRUCTION_ARROW); - sci_delete_marker_at_line(doc->editor->sci, line - 1, MARKER_CURRENT_INSTRUCTION_BACKGROUND); + sci_delete_marker_at_line(doc->editor->sci, line - 1, M_FRAME); scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } - Modified: trunk/geany-plugins/debugger/src/markers.h =================================================================== --- trunk/geany-plugins/debugger/src/markers.h 2011-08-06 13:30:45 UTC (rev 2124) +++ trunk/geany-plugins/debugger/src/markers.h 2011-08-06 20:44:03 UTC (rev 2125) @@ -25,5 +25,7 @@ void markers_remove_breakpoint(breakpoint* bp); void markers_add_current_instruction(char* file, int line); 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); Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-06 13:30:45 UTC (rev 2124) +++ trunk/geany-plugins/debugger/src/stree.c 2011-08-06 20:44:03 UTC (rev 2125) @@ -194,7 +194,7 @@ void stree_add(frame *f) { GtkTreeIter iter; - gtk_list_store_prepend (store, &iter); + gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, S_ADRESS, f->address, S_FUNCTION, f->function, 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:[2124] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 06 Aug '11

06 Aug '11

Revision: 2124 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2124&view=rev Author: cesspit Date: 2011-08-06 13:30:45 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - fixing gdb output parsing bug - adjusting margin click breakpoint switching behaviour Modified Paths: -------------- 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/dbm_gdb.c Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 10:15:27 UTC (rev 2123) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 13:30:45 UTC (rev 2124) @@ -504,18 +504,22 @@ * file - breakpoints filename * line - breakpoints line */ -gboolean breaks_is_set(char* file, int line) +break_state breaks_get_state(char* file, int line) { + break_state bs = BS_NOT_SET; + /* first look for the tree for the given file */ GTree *tree; - if (!(tree = g_hash_table_lookup(files, file))) - return FALSE; - else + if (tree = g_hash_table_lookup(files, file)) { - /* lookup for the break in GTree*/ - gpointer p = g_tree_lookup(tree, GINT_TO_POINTER(line)); - return p && ((breakpoint*)p)->enabled; + breakpoint *bp = g_tree_lookup(tree, GINT_TO_POINTER(line)); + if (bp) + { + bs = bp->enabled ? BS_ENABLED : BS_DISABLED; + } } + + return bs; } /* Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-06 10:15:27 UTC (rev 2123) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-06 13:30:45 UTC (rev 2124) @@ -19,6 +19,12 @@ * MA 02110-1301, USA. */ +typedef enum _break_state { + BS_NOT_SET, + BS_ENABLED, + BS_DISABLED +} break_state; + typedef void (*move_to_line_cb)(char* file, int line); gboolean breaks_init(move_to_line_cb callback); @@ -30,7 +36,7 @@ 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); -gboolean breaks_is_set(char* file, int line); +break_state breaks_get_state(char* file, int line); GtkWidget* breaks_get_widget(); GList* breaks_get_for_document(char* file); GList* breaks_get_all(); Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 10:15:27 UTC (rev 2123) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 13:30:45 UTC (rev 2124) @@ -134,11 +134,14 @@ char* file = editor->document->file_name; int line = sci_get_line_from_position(editor->sci, nt->position) + 1; - - if (!breaks_is_set(file, line)) + + break_state bs = breaks_get_state(file, line); + if (BS_NOT_SET == bs) breaks_add(file, line, NULL, TRUE, 0); - else + else if (BS_ENABLED == bs) breaks_remove(file, line); + else if (BS_DISABLED == bs) + breaks_switch(file, line); scintilla_send_message(editor->sci, SCI_SETFOCUS, TRUE, 0); @@ -261,10 +264,14 @@ if (doc) { int line = sci_get_current_line(doc->editor->sci) + 1; - if (!breaks_is_set(DOC_FILENAME(doc), line)) + break_state bs = breaks_get_state(DOC_FILENAME(doc), line); + if (BS_NOT_SET == bs) breaks_add(DOC_FILENAME(doc), line, NULL, TRUE, 0); - else + else if (BS_ENABLED == bs) breaks_remove(DOC_FILENAME(doc), line); + else if (BS_DISABLED == bs) + breaks_switch(DOC_FILENAME(doc), line); + scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } break; Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-06 10:15:27 UTC (rev 2123) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-08-06 13:30:45 UTC (rev 2124) @@ -799,12 +799,11 @@ int num = atoi(bstart); bstart += strlen(bstart) + 1; - bstart = strstr(bstart, "fullname=\"") + strlen("fullname=\""); - *strchr(bstart, '\"') = '\0'; + bstart = strstr(bstart, "original-location=\"") + strlen("original-location=\""); + *strchr(bstart, ':') = '\0'; gchar *fname = bstart; bstart += strlen(bstart) + 1; - bstart = strstr(bstart, "line=\"") + strlen("line=\""); *strchr(bstart, '\"') = '\0'; int bline = atoi(bstart); 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:[2123] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 06 Aug '11

06 Aug '11

Revision: 2123 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2123&view=rev Author: cesspit Date: 2011-08-06 10:15:27 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - fixing bug with the breakpoint removing when deleting a corresponding line from the document - some refactoring Modified Paths: -------------- 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/debug.c trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/utils.h Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-08-06 10:15:27 UTC (rev 2123) @@ -44,10 +44,12 @@ * Functions for breakpoint iteration support */ +typedef void (*breaks_iterate_function)(void* bp); + /* * Iterates through GTree for the particular file */ -gboolean tree_foreach(gpointer key, gpointer value, gpointer data) +gboolean tree_foreach_call_function(gpointer key, gpointer value, gpointer data) { ((breaks_iterate_function)data)(value); return FALSE; @@ -56,16 +58,46 @@ /* * Iterates through hash table of GTree-s */ -void hash_table_foreach(gpointer key, gpointer value, gpointer user_data) +void hash_table_foreach_call_function(gpointer key, gpointer value, gpointer user_data) { - g_tree_foreach((GTree*)value, tree_foreach, user_data); + g_tree_foreach((GTree*)value, tree_foreach_call_function, user_data); } /* + * Iterates through GTree + * adding each item to GList that is passed through data variable + */ +gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data) +{ + GList **list = (GList**)data; + *list = g_list_append(*list, value); + return FALSE; +} + +/* + * Iterates through hash table of GTree-s + * calling list collection functions on each tree + */ +void hash_table_foreach_add_to_list(gpointer key, gpointer value, gpointer user_data) +{ + g_tree_foreach((GTree*)value, tree_foreach_add_to_list, user_data); +} + +/* * Helper functions */ /* + * Remove breakpoint while iterating through GTree. + * arguments: + * bp - breakpoint + */ +void breaks_remove_internal(breakpoint *bp) +{ + handle_break_remove(bp, TRUE); +} + +/* * lookup for breakpoint * arguments: * file - breakpoints filename @@ -260,7 +292,15 @@ void breaks_destroy() { /* remove all markers */ - breaks_iterate((breaks_iterate_function)markers_remove_breakpoint); + GList *breaks, *iter; + breaks = iter = breaks_get_all(); + while (iter) + { + markers_remove_breakpoint((breakpoint*)iter->data); + iter = iter->next; + } + g_list_free(breaks); + /* free storage */ g_hash_table_destroy(files); } @@ -333,6 +373,16 @@ } /* + * Removes all breakpoints. + * arguments: + */ +void breaks_remove_all() +{ + g_hash_table_foreach(files, hash_table_foreach_call_function, (gpointer)breaks_remove_internal); + g_hash_table_remove_all(files); +} + +/* * Switch breakpoints state. * arguments: * file - breakpoints filename @@ -425,6 +475,30 @@ } /* + * Moves a breakpoint from to another line + * arguments: + * file - breakpoints filename + * line_from - old line number + * line_to - new line number + */ +void breaks_move_to_line(char* file, int line_from, int line_to) +{ + /* first look for the tree for the given file */ + GTree *tree = NULL; + if (tree = g_hash_table_lookup(files, file)) + { + /* lookup for the break in GTree*/ + breakpoint *bp = (breakpoint*)g_tree_lookup(tree, GINT_TO_POINTER(line_from)); + if (bp) + { + g_tree_steal(tree, GINT_TO_POINTER(line_from)); + bp->line = line_to; + g_tree_insert(tree, GINT_TO_POINTER(line_to), bp); + } + } +} + +/* * Checks whether breakpoint is set. * arguments: * file - breakpoints filename @@ -449,25 +523,32 @@ * arguments: * file - file name to get breaks for */ -GTree *breaks_get_for_document(char* file) +GList *breaks_get_for_document(char* file) { - return g_hash_table_lookup(files, file); + GList *breaks = NULL; + GTree *tree = g_hash_table_lookup(files, file); + if (tree) + { + g_tree_foreach(tree, tree_foreach_add_to_list, &breaks); + } + return breaks; } /* - * Get breakpoints widget + * Gets all breakpoints + * arguments: */ -GtkWidget* breaks_get_widget() +GList* breaks_get_all() { - return bptree_get_widget(); + GList *breaks = NULL; + g_hash_table_foreach(files, hash_table_foreach_add_to_list, &breaks); + return breaks; } /* - * Calls specified function on every breakpoint - * arguments: - * bif - function to call + * Get breakpoints widget */ -void breaks_iterate(breaks_iterate_function bif) +GtkWidget* breaks_get_widget() { - g_hash_table_foreach(files, hash_table_foreach, (gpointer)bif); + return bptree_get_widget(); } Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-06 10:15:27 UTC (rev 2123) @@ -20,16 +20,18 @@ */ typedef void (*move_to_line_cb)(char* file, int line); -typedef void (*breaks_iterate_function)(void* bp); 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_remove_all(); void breaks_switch(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_iterate(breaks_iterate_function bif); +void breaks_move_to_line(char* file, int line_from, int line_to); gboolean breaks_is_set(char* file, int line); GtkWidget* breaks_get_widget(); -GTree* breaks_get_for_document(char* file); +GList* breaks_get_for_document(char* file); +GList* breaks_get_all(); + Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 10:15:27 UTC (rev 2123) @@ -98,9 +98,19 @@ /* check if current path contains config file */ tpage_on_document_activate(doc); - GTree *tree; - if (tree = breaks_get_for_document(file)) - g_tree_foreach(tree, tree_foreach_set_marker, NULL); + 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); + } /* if debug is active - tell the debug module that a file was opened */ if (DBS_IDLE != debug_get_state()) @@ -174,21 +184,17 @@ { int line = sci_get_line_from_position(editor->sci, nt->position) + 1; - GTree *breakpoints = breaks_get_for_document(editor->document->file_name); - if (breakpoints && g_tree_nnodes(breakpoints)) + GList *breaks = breaks_get_for_document(editor->document->file_name); + if (breaks) { - - GList *breaks_list = NULL; - g_tree_foreach(breakpoints, tree_foreach_add_to_list, &breaks_list); - - GList *iter = breaks_list; + GList *iter = breaks; while (iter) { breakpoint *bp = (breakpoint*)iter->data; if (nt->linesAdded > 0 && bp->line >= line) { - bp->line += nt->linesAdded; + breaks_move_to_line(bp->file, bp->line, bp->line + nt->linesAdded); bptree_update_breakpoint(bp); } else if (nt->linesAdded < 0 && bp->line >= line) @@ -199,14 +205,14 @@ } else { - bp->line += nt->linesAdded; + breaks_move_to_line(bp->file, bp->line, bp->line + nt->linesAdded); bptree_update_breakpoint(bp); } } iter = iter->next; } - g_list_free(breaks_list); + g_list_free(breaks); } } break; Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-06 10:15:27 UTC (rev 2123) @@ -772,21 +772,6 @@ }; /* - * iterating staff to add breakpoints on startup - * erroneous_break - pointer to the breakpoint that caused error - * when setting. - */ -breakpoint* erroneous_break; -void set_new_break(void* bp) -{ - if (erroneous_break) - return; - - if(!active_module->set_break((breakpoint*)bp, BSA_NEW_BREAK)) - erroneous_break = (breakpoint*)bp; -} - -/* * Interface functions */ @@ -1000,14 +985,26 @@ if (active_module->load(target, commandline, env, watches)) { /* set breaks */ - erroneous_break = NULL; - breaks_iterate(set_new_break); - - if (erroneous_break) + + GList *breaks = breaks_get_all(); + + GList *iter = breaks; + while (iter) { + breakpoint *bp = (breakpoint*)iter->data; + if(!active_module->set_break(bp, BSA_NEW_BREAK)) + { + break; + } + iter = iter->next; + } + + if (iter) + { + breakpoint *bad_break = (breakpoint*)iter->data; gchar msg[1000]; sprintf(msg, _("Breakpoint at %s:%i cannot be set\nDebugger message: %s"), - erroneous_break->file, erroneous_break->line, active_module->error_message()); + bad_break->file, bad_break->line, active_module->error_message()); dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", msg); @@ -1015,6 +1012,8 @@ debug_state = DBS_STOP_REQUESTED; return; } + + g_list_free(breaks); /* set target page - readonly */ tpage_set_readonly(TRUE); Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-08-06 10:15:27 UTC (rev 2123) @@ -406,15 +406,6 @@ } /* - * GList and function to collect breaks from breakpoints page to save in config - */ -GList *breaks = NULL; -void collect_breaks(void* bp) -{ - breaks = g_list_append(breaks, bp); -} - -/* * save config */ void on_save_config(GtkButton *button, gpointer user_data) @@ -470,7 +461,7 @@ while (gtk_tree_model_iter_next(model, &iter)); /* breakpoints */ - breaks_iterate(collect_breaks); + GList *breaks = breaks_get_all(); GList *biter = breaks; while (biter) { @@ -525,16 +516,6 @@ } /* - * function to remove a break when loading config and iterating through - * existing breaks - */ -void removebreak(void *p) -{ - breakpoint *bp = (breakpoint*)p; - breaks_remove(bp->file, bp->line); -} - -/* * load config file */ void on_load_config(GtkButton *button, gpointer user_data) @@ -565,9 +546,9 @@ readline(config, arguments, FILENAME_MAX - 1); GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); gtk_text_buffer_set_text(buffer, arguments, -1); - + /* breakpoints and environment variables */ - breaks_iterate(removebreak); + breaks_remove_all(); wtree_remove_all(); gboolean wrongbreaks = FALSE; @@ -647,7 +628,7 @@ void on_clear(GtkButton *button, gpointer user_data) { /* breakpoints */ - breaks_iterate(removebreak); + breaks_remove_all(); /* watches */ wtree_remove_all(); Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-06 10:15:27 UTC (rev 2123) @@ -103,26 +103,6 @@ } /* - * GTree iteration functions that sets marker for each breakpoint in the tree - */ -gboolean tree_foreach_set_marker(gpointer key, gpointer value, gpointer data) -{ - breakpoint *bp = (breakpoint*)value; - markers_add_breakpoint(bp); - return FALSE; -} - -/* - * GTree iteration functions that adds data to the list supplied in "data" parameter - */ -gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data) -{ - GList **list = (GList**)data; - *list = g_list_append(*list, value); - return FALSE; -} - -/* * get word at "position" in Scintilla document */ GString* get_word_at_position(ScintillaObject *sci, int position) Modified: trunk/geany-plugins/debugger/src/utils.h =================================================================== --- trunk/geany-plugins/debugger/src/utils.h 2011-08-06 06:02:50 UTC (rev 2122) +++ trunk/geany-plugins/debugger/src/utils.h 2011-08-06 10:15:27 UTC (rev 2123) @@ -23,6 +23,4 @@ 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, gchar *arg, int value); -gboolean tree_foreach_set_marker(gpointer key, gpointer value, gpointer data); GString* get_word_at_position(ScintillaObject *sci, int position); -gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data); 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:[2122] trunk/geany-plugins/debugger/src/callbacks .c
by cesspit＠users.sourceforge.net 06 Aug '11

06 Aug '11

Revision: 2122 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2122&view=rev Author: cesspit Date: 2011-08-06 06:02:50 +0000 (Sat, 06 Aug 2011) Log Message: ----------- debugger plugin: - fixing bug with double breakpoint removing from the breakpoints tab Modified Paths: -------------- trunk/geany-plugins/debugger/src/callbacks.c Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-05 21:28:14 UTC (rev 2121) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-06 06:02:50 UTC (rev 2122) @@ -195,7 +195,6 @@ { if (bp->line < line - nt->linesAdded) { - bptree_remove_breakpoint(bp); breaks_remove(bp->file, bp->line); } else 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:[2121] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 05 Aug '11

05 Aug '11

Revision: 2121 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2121&view=rev Author: cesspit Date: 2011-08-05 21:28:14 +0000 (Fri, 05 Aug 2011) Log Message: ----------- debugger plugin: - adjusting breakpoints lines when one modifies a document - fixed a bug with in-panel watch editing - code formatting Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.h trunk/geany-plugins/debugger/src/breakpoints.h trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/utils.h Modified: trunk/geany-plugins/debugger/src/bptree.h =================================================================== --- trunk/geany-plugins/debugger/src/bptree.h 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/bptree.h 2011-08-05 21:28:14 UTC (rev 2121) @@ -19,13 +19,13 @@ * MA 02110-1301, USA. */ -gboolean bptree_init(move_to_line_cb callback); +gboolean bptree_init(move_to_line_cb callback); GtkWidget* bptree_get_widget(); -void bptree_add_breakpoint(breakpoint* bp); -void bptree_update_breakpoint(breakpoint* bp); -void bptree_remove_breakpoint(breakpoint* bp); -void bptree_set_condition(GtkTreeIter iter, gchar* condition); -void bptree_set_hitscount(GtkTreeIter iter, int hitscount); -void bptree_set_enabled(GtkTreeIter iter, gboolean enabled); +void bptree_add_breakpoint(breakpoint* bp); +void bptree_update_breakpoint(breakpoint* bp); +void bptree_remove_breakpoint(breakpoint* bp); +void bptree_set_condition(GtkTreeIter iter, gchar* condition); +void bptree_set_hitscount(GtkTreeIter iter, int hitscount); +void bptree_set_enabled(GtkTreeIter iter, gboolean enabled); gchar* bptree_get_condition(GtkTreeIter iter); -void bptree_set_readonly(gboolean readonly); +void bptree_set_readonly(gboolean readonly); Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-08-05 21:28:14 UTC (rev 2121) @@ -31,5 +31,5 @@ void breaks_set_condition(char* file, int line, char* condition); void breaks_iterate(breaks_iterate_function bif); gboolean breaks_is_set(char* file, int line); -GtkWidget* breaks_get_widget(); -GTree* breaks_get_for_document(char* file); +GtkWidget* breaks_get_widget(); +GTree* breaks_get_for_document(char* file); Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-05 21:28:14 UTC (rev 2121) @@ -35,6 +35,7 @@ #include "stree.h" #include "markers.h" #include "utils.h" +#include "bptree.h" extern GeanyFunctions *geany_functions; @@ -167,6 +168,50 @@ dialogs_show_msgbox(GTK_MESSAGE_INFO, _("To edit source files stop debugging session")); break; } + case SCN_MODIFIED: + { + if(((SC_MOD_INSERTTEXT & nt->modificationType) || (SC_MOD_DELETETEXT && nt->modificationType)) && nt->linesAdded) + { + int line = sci_get_line_from_position(editor->sci, nt->position) + 1; + + GTree *breakpoints = breaks_get_for_document(editor->document->file_name); + if (breakpoints && g_tree_nnodes(breakpoints)) + { + + GList *breaks_list = NULL; + g_tree_foreach(breakpoints, tree_foreach_add_to_list, &breaks_list); + + GList *iter = breaks_list; + while (iter) + { + breakpoint *bp = (breakpoint*)iter->data; + + if (nt->linesAdded > 0 && bp->line >= line) + { + bp->line += nt->linesAdded; + bptree_update_breakpoint(bp); + } + else if (nt->linesAdded < 0 && bp->line >= line) + { + if (bp->line < line - nt->linesAdded) + { + bptree_remove_breakpoint(bp); + breaks_remove(bp->file, bp->line); + } + else + { + bp->line += nt->linesAdded; + bptree_update_breakpoint(bp); + } + } + iter = iter->next; + } + + g_list_free(breaks_list); + } + } + break; + } } return FALSE; Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-05 21:28:14 UTC (rev 2121) @@ -177,7 +177,7 @@ wmodel, &iter, W_INTERNAL, &internal, - 1); + -1); /* check if it is empty row */ gboolean is_empty_row = !gtk_tree_path_compare (tree_path, wtree_empty_path()); Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/utils.c 2011-08-05 21:28:14 UTC (rev 2121) @@ -103,7 +103,7 @@ } /* - * GTree iteratin functions that sets marker for each breakpoint in the tree + * GTree iteration functions that sets marker for each breakpoint in the tree */ gboolean tree_foreach_set_marker(gpointer key, gpointer value, gpointer data) { @@ -113,6 +113,16 @@ } /* + * GTree iteration functions that adds data to the list supplied in "data" parameter + */ +gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data) +{ + GList **list = (GList**)data; + *list = g_list_append(*list, value); + return FALSE; +} + +/* * get word at "position" in Scintilla document */ GString* get_word_at_position(ScintillaObject *sci, int position) Modified: trunk/geany-plugins/debugger/src/utils.h =================================================================== --- trunk/geany-plugins/debugger/src/utils.h 2011-08-05 12:25:20 UTC (rev 2120) +++ trunk/geany-plugins/debugger/src/utils.h 2011-08-05 21:28:14 UTC (rev 2121) @@ -25,3 +25,4 @@ GtkTreeViewColumn* create_column(gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, gchar *arg, int value); gboolean tree_foreach_set_marker(gpointer key, gpointer value, gpointer data); GString* get_word_at_position(ScintillaObject *sci, int position); +gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data); 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:[2120] trunk/geanylatex
by frlan＠users.sourceforge.net 05 Aug '11

05 Aug '11

Revision: 2120 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2120&view=rev Author: frlan Date: 2011-08-05 12:25:20 +0000 (Fri, 05 Aug 2011) Log Message: ----------- GeanyLaTeX: Backport svn r2119: Fixing an error with wrong sorted format type which causes issues on using keybindings to insert typewriter format string Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/src/formatutils.h Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2011-08-05 12:24:36 UTC (rev 2119) +++ trunk/geanylatex/ChangeLog 2011-08-05 12:25:20 UTC (rev 2120) @@ -1,3 +1,8 @@ +2011-08-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Fixing an bug when using keybindings to insert typewriter format + + 2011-07-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Resorting LaTeX menu. Modified: trunk/geanylatex/src/formatutils.h =================================================================== --- trunk/geanylatex/src/formatutils.h 2011-08-05 12:24:36 UTC (rev 2119) +++ trunk/geanylatex/src/formatutils.h 2011-08-05 12:25:20 UTC (rev 2120) @@ -28,8 +28,8 @@ LATEX_ITALIC = 0, LATEX_BOLD, LATEX_UNDERLINE, + LATEX_TYPEWRITER, LATEX_SLANTED, - LATEX_TYPEWRITER, LATEX_SMALLCAPS, LATEX_EMPHASIS, LATEX_CENTER, 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:[2119] trunk/geany-plugins/geanylatex
by frlan＠users.sourceforge.net 05 Aug '11

05 Aug '11

Revision: 2119 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2119&view=rev Author: frlan Date: 2011-08-05 12:24:36 +0000 (Fri, 05 Aug 2011) Log Message: ----------- GeanyLaTeX: Fixing an error with wrong sorted format type which causes issues on using keybindings to insert typewriter format string Modified Paths: -------------- trunk/geany-plugins/geanylatex/ChangeLog trunk/geany-plugins/geanylatex/src/formatutils.h Modified: trunk/geany-plugins/geanylatex/ChangeLog =================================================================== --- trunk/geany-plugins/geanylatex/ChangeLog 2011-08-04 05:48:55 UTC (rev 2118) +++ trunk/geany-plugins/geanylatex/ChangeLog 2011-08-05 12:24:36 UTC (rev 2119) @@ -1,3 +1,8 @@ +2011-08-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Fixing an bug when using keybindings to insert typewriter format + + 2011-03-17 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Attempt to fix a couple of compiling warnings came up with updates Modified: trunk/geany-plugins/geanylatex/src/formatutils.h =================================================================== --- trunk/geany-plugins/geanylatex/src/formatutils.h 2011-08-04 05:48:55 UTC (rev 2118) +++ trunk/geany-plugins/geanylatex/src/formatutils.h 2011-08-05 12:24:36 UTC (rev 2119) @@ -28,8 +28,8 @@ LATEX_ITALIC = 0, LATEX_BOLD, LATEX_UNDERLINE, + LATEX_TYPEWRITER, LATEX_SLANTED, - LATEX_TYPEWRITER, LATEX_SMALLCAPS, LATEX_EMPHASIS, LATEX_CENTER, 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:[2118] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 04 Aug '11

04 Aug '11

Revision: 2118 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2118&view=rev Author: cesspit Date: 2011-08-04 05:48:55 +0000 (Thu, 04 Aug 2011) Log Message: ----------- debugger calltips cache Modified Paths: -------------- trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-03 09:49:27 UTC (rev 2117) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-08-04 05:48:55 UTC (rev 2118) @@ -89,7 +89,7 @@ scintilla_send_message(doc->editor->sci, SCI_SETMOUSEDWELLTIME, 500, 0); /* set tab size for calltips */ - scintilla_send_message(doc->editor->sci, SCI_CALLTIPUSESTYLE, 20, NULL); + scintilla_send_message(doc->editor->sci, SCI_CALLTIPUSESTYLE, 20, (long)NULL); /* set caret policy */ scintilla_send_message(doc->editor->sci, SCI_SETYCARETPOLICY, CARET_SLOP | CARET_JUMPS | CARET_EVEN , 3); @@ -143,11 +143,10 @@ if (word->len) { - GString *calltip = debug_get_calltip_for_expression(word->str); + gchar *calltip = debug_get_calltip_for_expression(word->str); if (calltip) { - scintilla_send_message (editor->sci, SCI_CALLTIPSHOW, nt->position, (long)calltip->str); - g_string_free(calltip, TRUE); + scintilla_send_message (editor->sci, SCI_CALLTIPSHOW, nt->position, (long)calltip); } } Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-03 09:49:27 UTC (rev 2117) +++ trunk/geany-plugins/debugger/src/debug.c 2011-08-04 05:48:55 UTC (rev 2118) @@ -145,6 +145,9 @@ { NULL, NULL } }; +/* calltips cache */ +static GHashTable *calltips = NULL; + /* * Handlers for GUI maked changes in watches */ @@ -547,6 +550,9 @@ /* update debug state */ debug_state = DBS_STOPPED; + /* clear calltips cache */ + g_hash_table_remove_all(calltips); + /* if the stop was requested for asyncronous exitig - * stop debug module and exit */ if (exit_pending) @@ -719,6 +725,10 @@ g_list_free(read_only_pages); read_only_pages = NULL; + /* clear and destroy calltips cache */ + g_hash_table_destroy(calltips); + calltips = NULL; + /* enable widgets */ enable_sensitive_widgets(TRUE); @@ -1160,41 +1170,52 @@ * return list of strings for the calltip * first line is a header, others should be shifted right with tab */ -GString* debug_get_calltip_for_expression(gchar* expression) +gchar* debug_get_calltip_for_expression(gchar* expression) { - GString *calltip = NULL; - - variable *var = active_module->add_watch(expression); - if (var) + gchar *calltip = NULL; + if (!calltips || !(calltip = g_hash_table_lookup(calltips, expression))) { - calltip = get_calltip_line(var, TRUE); - if (var->has_children) + GString *calltip_str = NULL; + variable *var = active_module->add_watch(expression); + if (var) { - int lines_left = MAX_CALLTIP_HEIGHT - 1; - GList* children = active_module->get_children(var->internal->str); - GList* child = children; - while(child && lines_left) + calltip_str = get_calltip_line(var, TRUE); + if (var->has_children) { - variable *varchild = (variable*)child->data; - GString *child_string = get_calltip_line(varchild, FALSE); - g_string_append_printf(calltip, "\n%s", child_string->str); - g_string_free(child_string, TRUE); + int lines_left = MAX_CALLTIP_HEIGHT - 1; + GList* children = active_module->get_children(var->internal->str); + GList* child = children; + while(child && lines_left) + { + variable *varchild = (variable*)child->data; + GString *child_string = get_calltip_line(varchild, FALSE); + g_string_append_printf(calltip_str, "\n%s", child_string->str); + g_string_free(child_string, TRUE); - child = child->next; - lines_left--; + child = child->next; + lines_left--; + } + if (!lines_left && child) + { + g_string_append(calltip_str, "\n\t\t........"); + } + g_list_foreach(children, (GFunc)variable_free, NULL); + g_list_free(children); } - if (!lines_left && child) + + active_module->remove_watch(var->internal->str); + variable_free(var); + + calltip = g_string_free(calltip_str, FALSE); + + if (!calltips) { - g_string_append(calltip, "\n\t\t........"); + calltips = g_hash_table_new_full(g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free); } - g_list_foreach(children, (GFunc)variable_free, NULL); - g_list_free(children); + g_hash_table_insert(calltips, g_strdup(expression), calltip); } + } - active_module->remove_watch(var->internal->str); - variable_free(var); - } - return calltip; } Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-08-03 09:49:27 UTC (rev 2117) +++ trunk/geany-plugins/debugger/src/debug.h 2011-08-04 05:48:55 UTC (rev 2118) @@ -54,5 +54,5 @@ gboolean debug_current_instruction_have_sources(); void debug_jump_to_current_instruction(); void debug_on_file_open(GeanyDocument *doc); -GString* debug_get_calltip_for_expression(gchar* expression); +gchar* debug_get_calltip_for_expression(gchar* expression); 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