Plugins-Commits May 2013

plugins-commits@lists.geany.org

1 participants
26 discussions

[geany/geany-plugins] 139793: pairtaghighliter: Remove a global variable
by Colomban Wendling 10 May '13

10 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 09 May 2013 22:40:04 UTC Commit: 139793f8401d132aa312bfcc67c3de398abe320e https://github.com/geany/geany-plugins/commit/139793f8401d132aa312bfcc67c3d… Log Message: ----------- pairtaghighliter: Remove a global variable Remove use of the 'sci' global variable and instead pass it as an argument to each function requiring this data. The use of global variables makes code harder to understand and debug, and often leads to unexpected issues. Here, it lead to a crash when unloading the the plugin because an apparently innocent call used this global variable before its initialization. This was fixed in previous commit, but removing use of the global variable hopefully will prevent such bugs from reappearing later. Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 80 files changed, 37 insertions(+), 43 deletions(-) =================================================================== @@ -24,8 +24,6 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; -static ScintillaObject *sci; - /* Is needed for clearing highlighting after moving cursor out * from the tag */ static gint highlightedBrackets[] = {0, 0, 0, 0}; @@ -43,7 +41,7 @@ * FALSE - to the left * from the current cursor position to the start of the line. */ -static gint findBracket(gint position, gint endOfSearchPos, +static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos, gchar searchedBracket, gchar breakBracket, gboolean direction) { gint foundBracket = -1; @@ -84,7 +82,7 @@ static gint findBracket(gint position, gint endOfSearchPos, } -static void highlight_tag(gint openingBracket, gint closingBracket) +static void highlight_tag(ScintillaObject *sci, gint openingBracket, gint closingBracket) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); scintilla_send_message(sci, SCI_INDICSETSTYLE, @@ -96,14 +94,14 @@ static void highlight_tag(gint openingBracket, gint closingBracket) } -static void clear_previous_highlighting(gint rangeStart, gint rangeEnd) +static void clear_previous_highlighting(ScintillaObject *sci, gint rangeStart, gint rangeEnd) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); scintilla_send_message(sci, SCI_INDICATORCLEARRANGE, rangeStart, rangeEnd+1); } -static gboolean is_tag_self_closing(gint closingBracket) +static gboolean is_tag_self_closing(ScintillaObject *sci, gint closingBracket) { gboolean isTagSelfClosing = FALSE; gchar charBeforeBracket = sci_get_char_at(sci, closingBracket-1); @@ -114,7 +112,7 @@ static gboolean is_tag_self_closing(gint closingBracket) } -static gboolean is_tag_opening(gint openingBracket) +static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) { gboolean isTagOpening = TRUE; gchar charAfterBracket = sci_get_char_at(sci, openingBracket+1); @@ -125,7 +123,7 @@ static gboolean is_tag_opening(gint openingBracket) } -static void get_tag_name(gint openingBracket, gint closingBracket, +static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, gchar tagName[], gboolean isTagOpening) { gint nameStart = openingBracket + (TRUE == isTagOpening ? 1 : 2); @@ -144,7 +142,7 @@ static void get_tag_name(gint openingBracket, gint closingBracket, } -static void findMatchingOpeningTag(gchar *tagName, gint openingBracket) +static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint openingBracket) { gint pos; gint openingTagsCount = 0; @@ -155,16 +153,16 @@ static void findMatchingOpeningTag(gchar *tagName, gint openingBracket) /* are we inside tag? */ gint lineNumber = sci_get_line_from_position(sci, pos); gint lineStart = sci_get_position_from_line(sci, lineNumber); - gint matchingOpeningBracket = findBracket(pos, lineStart, '<', '\0', FALSE); - gint matchingClosingBracket = findBracket(pos, lineStart, '>', '\0', FALSE); + gint matchingOpeningBracket = findBracket(sci, pos, lineStart, '<', '\0', FALSE); + gint matchingClosingBracket = findBracket(sci, pos, lineStart, '>', '\0', FALSE); if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ gchar matchingTagName[MAX_TAG_NAME]; - gboolean isMatchingTagOpening = is_tag_opening(matchingOpeningBracket); - get_tag_name(matchingOpeningBracket, matchingClosingBracket, + gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); + get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, matchingTagName, isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { @@ -186,7 +184,7 @@ static void findMatchingOpeningTag(gchar *tagName, gint openingBracket) if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(matchingOpeningBracket, matchingClosingBracket); + highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; break; @@ -195,7 +193,7 @@ static void findMatchingOpeningTag(gchar *tagName, gint openingBracket) } -static void findMatchingClosingTag(gchar *tagName, gint closingBracket) +static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint closingBracket) { gint pos; gint linesInDocument = sci_get_line_count(sci); @@ -208,16 +206,16 @@ static void findMatchingClosingTag(gchar *tagName, gint closingBracket) /* are we inside tag? */ gint lineNumber = sci_get_line_from_position(sci, pos); gint lineEnd = sci_get_line_end_position(sci, lineNumber); - gint matchingOpeningBracket = findBracket(pos, endOfDocument, '<', '\0', TRUE); - gint matchingClosingBracket = findBracket(pos, endOfDocument, '>', '\0', TRUE); + gint matchingOpeningBracket = findBracket(sci, pos, endOfDocument, '<', '\0', TRUE); + gint matchingClosingBracket = findBracket(sci, pos, endOfDocument, '>', '\0', TRUE); if(-1 != matchingOpeningBracket && -1 != matchingClosingBracket && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ gchar matchingTagName[64]; - gboolean isMatchingTagOpening = is_tag_opening(matchingOpeningBracket); - get_tag_name(matchingOpeningBracket, matchingClosingBracket, + gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); + get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, matchingTagName, isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { @@ -239,7 +237,7 @@ static void findMatchingClosingTag(gchar *tagName, gint closingBracket) if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(matchingOpeningBracket, matchingClosingBracket); + highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; break; @@ -248,33 +246,33 @@ static void findMatchingClosingTag(gchar *tagName, gint closingBracket) } -static void findMatchingTag(gint openingBracket, gint closingBracket) +static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint closingBracket) { gchar tagName[MAX_TAG_NAME]; - gboolean isTagOpening = is_tag_opening(openingBracket); - get_tag_name(openingBracket, closingBracket, tagName, isTagOpening); + gboolean isTagOpening = is_tag_opening(sci, openingBracket); + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); if(TRUE == isTagOpening) - findMatchingClosingTag(tagName, closingBracket); + findMatchingClosingTag(sci, tagName, closingBracket); else - findMatchingOpeningTag(tagName, openingBracket); + findMatchingOpeningTag(sci, tagName, openingBracket); } -static void run_tag_highlighter(void) +static void run_tag_highlighter(ScintillaObject *sci) { gint position = sci_get_current_position(sci); gint lineNumber = sci_get_current_line(sci); gint lineStart = sci_get_position_from_line(sci, lineNumber); gint lineEnd = sci_get_line_end_position(sci, lineNumber); - gint openingBracket = findBracket(position, lineStart, '<', '>', FALSE); - gint closingBracket = findBracket(position, lineEnd, '>', '<', TRUE); + gint openingBracket = findBracket(sci, position, lineStart, '<', '>', FALSE); + gint closingBracket = findBracket(sci, position, lineEnd, '>', '<', TRUE); int i; if(-1 == openingBracket || -1 == closingBracket) { - clear_previous_highlighting(highlightedBrackets[0], highlightedBrackets[1]); - clear_previous_highlighting(highlightedBrackets[2], highlightedBrackets[3]); + clear_previous_highlighting(sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); for(i=0; i<3; i++) highlightedBrackets[i] = 0; return; @@ -285,8 +283,8 @@ static void run_tag_highlighter(void) if(openingBracket != highlightedBrackets[0] || closingBracket != highlightedBrackets[1]) { - clear_previous_highlighting(highlightedBrackets[0], highlightedBrackets[1]); - clear_previous_highlighting(highlightedBrackets[2], highlightedBrackets[3]); + clear_previous_highlighting(sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(sci, highlightedBrackets[2], highlightedBrackets[3]); } highlightedBrackets[0] = openingBracket; @@ -294,11 +292,11 @@ static void run_tag_highlighter(void) /* Highlight current tag. Matching tag will be highlighted from * findMatchingTag() functiong */ - highlight_tag(openingBracket, closingBracket); + highlight_tag(sci, openingBracket, closingBracket); /* Find matching tag only if a tag is not self-closing */ - if(FALSE == is_tag_self_closing(closingBracket)) - findMatchingTag(openingBracket, closingBracket); + if(FALSE == is_tag_self_closing(sci, closingBracket)) + findMatchingTag(sci, openingBracket, closingBracket); } @@ -308,10 +306,7 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, { gint lexer; - /* setting global sci variable to be available in other functions */ - sci = editor->sci; - - lexer = sci_get_lexer(sci); + lexer = sci_get_lexer(editor->sci); if(lexer != SCLEX_HTML) { return FALSE; @@ -321,7 +316,7 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, switch (nt->nmhdr.code) { case SCN_UPDATEUI: - run_tag_highlighter(); + run_tag_highlighter(editor->sci); break; } @@ -348,8 +343,7 @@ void plugin_cleanup(void) if (doc) { - sci = doc->editor->sci; - clear_previous_highlighting(highlightedBrackets[0], highlightedBrackets[1]); - clear_previous_highlighting(highlightedBrackets[2], highlightedBrackets[3]); + clear_previous_highlighting(doc->editor->sci, highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(doc->editor->sci, highlightedBrackets[2], highlightedBrackets[3]); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fdcf8f: pairtaghighliter: Fix crash on plugin unload
by Colomban Wendling 10 May '13

10 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 09 May 2013 22:28:58 UTC Commit: fdcf8f8d08983f1f7e63b8b5a0492d3765e9e7ba https://github.com/geany/geany-plugins/commit/fdcf8f8d08983f1f7e63b8b5a0492… Log Message: ----------- pairtaghighliter: Fix crash on plugin unload Fix crash on plugin unload if the plugin didn't run on any editor, or if the last editor it ran on became invalid. The global 'sci' variable wasn't set in 'plugin_cleanup()' and thus may either have been uninitialized or initialized to a value not valid anymore. The simplest way to reproduce the crash was to load and then immediately unload the plugin, without leaving the plugin manager dialog. Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 10 files changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -344,6 +344,12 @@ void plugin_init(GeanyData *data) void plugin_cleanup(void) { - clear_previous_highlighting(highlightedBrackets[0], highlightedBrackets[1]); - clear_previous_highlighting(highlightedBrackets[2], highlightedBrackets[3]); + GeanyDocument *doc = document_get_current(); + + if (doc) + { + sci = doc->editor->sci; + clear_previous_highlighting(highlightedBrackets[0], highlightedBrackets[1]); + clear_previous_highlighting(highlightedBrackets[2], highlightedBrackets[3]); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 37ecd6: scope - ChangeLog fix
by Dimitar Zhekov 08 May '13

08 May '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Wed, 08 May 2013 17:53:13 UTC Commit: 37ecd6a6be15098b2f3a4e2353aa722ee7421350 https://github.com/geany/geany-plugins/commit/37ecd6a6be15098b2f3a4e2353aa7… Log Message: ----------- scope - ChangeLog fix Modified Paths: -------------- scope/ChangeLog Modified: scope/ChangeLog 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ Note that ScpTreeStore can not be currently used with Glade. * src/view.c: Small improvements. + * docs/scope.html, src/scope.c: + Increased version to 0.87. 2013-05-04 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6b7eb4: scope - small improvements, increased version to 0.88
by Dimitar Zhekov 08 May '13

08 May '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Wed, 08 May 2013 17:26:05 UTC Commit: 6b7eb44b0c9eab15277ee8c4c649139af97883c9 https://github.com/geany/geany-plugins/commit/6b7eb44b0c9eab15277ee8c4c6491… Log Message: ----------- scope - small improvements, increased version to 0.88 Modified Paths: -------------- scope/ChangeLog scope/docs/scope.html scope/src/conterm.c scope/src/scope.c scope/src/store/scptreestore.html scope/src/views.c Modified: scope/ChangeLog 11 files changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,14 @@ +2013-05-08 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/conterm.c: + Insert or typing into console brings up the command dialog only if + gdb is loaded. + * src/store/scptreestore.html: + Note that ScpTreeStore can not be currently used with Glade. + * src/view.c: + Small improvements. + + 2013-05-04 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, src/break.c, src/gtk216.c, src/gtk216.h, Modified: scope/docs/scope.html 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -713,7 +713,7 @@ <a name="copyright">Copyright</a> -Scope 0.87, Copyright (C) 2013 Dimitar Toshkov Zhekov +Scope 0.88, Copyright (C) 2013 Dimitar Toshkov Zhekov The menu and toolbar icons are from <a href="http://netbeans.org">Netbeans</a>, except for BreakPoint. Modified: scope/src/conterm.c 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -351,11 +351,12 @@ static gboolean on_console_key_press(G_GNUC_UNUSED GtkWidget *widget, { gboolean insert = event->keyval == GDK_Insert || event->keyval == GDK_KP_Insert; - if (insert || (event->keyval >= 0x21 && event->keyval <= 0x7F && - event->state <= GDK_SHIFT_MASK)) + if ((insert || (event->keyval >= 0x21 && event->keyval <= 0x7F && + event->state <= GDK_SHIFT_MASK)) && (debug_state() & DS_ACTIVE)) { char command[2] = { event->keyval, '\0' }; view_command_line(insert ? NULL : command, NULL, NULL, TRUE); + return TRUE; } return FALSE; Modified: scope/src/scope.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(215) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Relatively simple GDB front-end."), "0.87" , + _("Relatively simple GDB front-end."), "0.88" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: scope/src/store/scptreestore.html 6 files changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -630,8 +630,10 @@ <h3><a name="bugs">Bugs</a></h3> -Probably. In particular, the linguistically correct string comparision is not well tested. - +Incomplete Glade support. You can include ScpTreeStore-s in .glade files with a text +editor, but editing such files with Glade will discard the stores. + +The linguistically correct string comparision is not well tested. Report bugs to <tt><dimitar.zhekov(a)gmail.com></tt>. Modified: scope/src/views.c 39 files changed, 22 insertions(+), 17 deletions(-) =================================================================== @@ -26,6 +26,7 @@ typedef struct _ViewInfo { gboolean dirty; + gboolean data; void (*clear)(void); gboolean (*update)(void); gboolean flush; @@ -34,17 +35,17 @@ static ViewInfo views[VIEW_COUNT] = { - { FALSE, NULL, NULL, FALSE, 0 }, - { FALSE, threads_clear, threads_update, FALSE, DS_SENDABLE }, - { FALSE, breaks_clear, breaks_update, FALSE, DS_SENDABLE }, - { FALSE, stack_clear, stack_update, TRUE, DS_DEBUG }, - { FALSE, locals_clear, locals_update, TRUE, DS_DEBUG }, - { FALSE, watches_clear, watches_update, TRUE, DS_DEBUG }, - { FALSE, memory_clear, memory_update, TRUE, DS_SENDABLE }, - { FALSE, NULL, dc_update, FALSE, DS_DEBUG }, - { FALSE, inspects_clear, inspects_update, FALSE, DS_DEBUG }, - { FALSE, tooltip_clear, tooltip_update, FALSE, DS_SENDABLE }, - { FALSE, menu_clear, NULL, FALSE, 0 } + { FALSE, FALSE, NULL, NULL, FALSE, 0 }, + { FALSE, FALSE, threads_clear, threads_update, FALSE, DS_SENDABLE }, + { FALSE, FALSE, breaks_clear, breaks_update, FALSE, DS_SENDABLE }, + { FALSE, TRUE, stack_clear, stack_update, TRUE, DS_DEBUG }, + { FALSE, TRUE, locals_clear, locals_update, TRUE, DS_DEBUG }, + { FALSE, TRUE, watches_clear, watches_update, TRUE, DS_DEBUG }, + { FALSE, TRUE, memory_clear, memory_update, TRUE, DS_SENDABLE }, + { FALSE, FALSE, NULL, dc_update, FALSE, DS_DEBUG }, + { FALSE, TRUE, inspects_clear, inspects_update, FALSE, DS_DEBUG }, + { FALSE, TRUE, tooltip_clear, tooltip_update, FALSE, DS_SENDABLE }, + { FALSE, FALSE, menu_clear, NULL, FALSE, 0 } }; void view_dirty(ViewIndex index) @@ -54,12 +55,11 @@ void view_dirty(ViewIndex index) void views_data_dirty(void) { - view_dirty(VIEW_STACK); - view_dirty(VIEW_LOCALS); - view_dirty(VIEW_WATCHES); - view_dirty(VIEW_MEMORY); - view_dirty(VIEW_INSPECT); - view_dirty(VIEW_TOOLTIP); + ViewIndex i; + + for (i = 0; i < VIEW_COUNT; i++) + if (views[i].data) + view_dirty(i); } static void view_update_unconditional(ViewIndex index, DebugState state) @@ -523,6 +523,8 @@ static void command_line_update_state(DebugState state) void view_command_line(const gchar *text, const gchar *title, const gchar *seek, gboolean seek_after) { + GtkTextIter start, end; + gtk_window_set_title(GTK_WINDOW(command_dialog), title ? title : _("GDB Command")); gtk_widget_grab_focus(command_view); @@ -539,6 +541,9 @@ void view_command_line(const gchar *text, const gchar *title, const gchar *seek, on_command_text_changed(command_text, NULL); command_line_update_state(debug_state()); + gtk_text_buffer_get_start_iter(command_text, &start); + gtk_text_buffer_get_end_iter(command_text, &end); + gtk_text_buffer_select_range(command_text, &start, &end); gtk_combo_box_set_active_iter(command_history, NULL); gtk_dialog_run(GTK_DIALOG(command_dialog)); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a1bd3e: scope - GArray parse_modes, recent_programs, thread_groups -> ScpTreeStore
by Dimitar Zhekov 06 May '13

06 May '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Mon, 06 May 2013 13:56:18 UTC Commit: a1bd3e69b8151606e0c5acaaae3d1643ab80db88 https://github.com/geany/geany-plugins/commit/a1bd3e69b8151606e0c5acaaae3d1… Log Message: ----------- scope - GArray parse_modes, recent_programs, thread_groups -> ScpTreeStore Modified Paths: -------------- scope/ChangeLog scope/data/scope.glade scope/src/break.c scope/src/gtk216.c scope/src/gtk216.h scope/src/inspect.c scope/src/local.c scope/src/memory.c scope/src/menu.c scope/src/parse.c scope/src/parse.h scope/src/program.c scope/src/scope.c scope/src/stack.c scope/src/thread.c scope/src/tooltip.c scope/src/utils.c scope/src/utils.h scope/src/watch.c Modified: scope/ChangeLog 14 files changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,15 @@ +2013-05-04 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * data/scope.glade, src/break.c, src/gtk216.c, src/gtk216.h, + src/inspect.c, src/local.c, src/memory.c, src/menu.c, src/parse.c, + src/parse.h, src/program.c, src/scope.c, src/stack.c, src/thread.c, + src/tooltip.c, src/utils.c, src/utils.h, src/watch.c: + GArray parse_modes -> ScpTreeStore. + GArray recent_programs -> ScpTreeStore. + Removed get array element size emulation. + Removed all array utility functions. + + 2013-05-02 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, src/thread.c: @@ -46,7 +58,7 @@ 2013-03-07 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/gtk216.c: - Fixed a bug in array size emulation + Fixed a bug in array size emulation. 2013-02-21 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Modified: scope/data/scope.glade 22 files changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -1227,6 +1227,28 @@ </object> </child> </object> + <object class="ScpTreeStore" id="recent_program_store"> + <property name="sublevels">False</property> + <columns> +  + <column type="gchararray" utf8_collate="false"/> +  + <column type="gint"/> + </columns> + </object> + <object class="ScpTreeStore" id="parse_mode_store"> + <property name="sublevels">False</property> + <columns> +  + <column type="gint"/> +  + <column type="gint"/> +  + <column type="gboolean"/> +  + <column type="gchararray" utf8_collate="false"/> + </columns> + </object> <object class="ScpTreeStore" id="thread_group_store"> <property name="sublevels">False</property> <columns> Modified: scope/src/break.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -424,7 +424,7 @@ static void break_node_parse(const ParseNode *node, BreakData *bd) append_script_command(script, string); else { - array_foreach((GArray *) script->value, + parse_foreach((GArray *) script->value, (GFunc) append_script_command, string); } @@ -485,7 +485,7 @@ void on_break_inserted(GArray *nodes) bd.stage = BG_DISCARD; } - array_foreach(nodes, (GFunc) break_node_parse, &bd); + parse_foreach(nodes, (GFunc) break_node_parse, &bd); } static void break_apply(GtkTreeIter *iter, gboolean thread) @@ -669,7 +669,7 @@ void on_break_list(GArray *nodes) store_foreach(store, (GFunc) break_iter_missing, NULL); bd.stage = BG_DISCARD; - array_foreach(nodes, (GFunc) break_node_parse, &bd); + parse_foreach(nodes, (GFunc) break_node_parse, &bd); if (refresh) breaks_missing(); @@ -710,7 +710,7 @@ void on_break_created(GArray *nodes) { BreakData bd; bd.stage = BG_DISCARD; - array_foreach(nodes, (GFunc) break_node_parse, &bd); + parse_foreach(nodes, (GFunc) break_node_parse, &bd); } break_async = TRUE; @@ -730,7 +730,7 @@ static void break_feature_node_check(const ParseNode *node, G_GNUC_UNUSED gpoint void on_break_features(GArray *nodes) { - array_foreach(parse_lead_array(nodes), (GFunc) break_feature_node_check, NULL); + parse_foreach(parse_lead_array(nodes), (GFunc) break_feature_node_check, NULL); } static void break_delete(GtkTreeIter *iter) Modified: scope/src/gtk216.c 59 files changed, 0 insertions(+), 59 deletions(-) =================================================================== @@ -19,54 +19,6 @@ #include "common.h" -#if !GLIB_CHECK_VERSION(2, 22, 0) -/* :-( */ -typedef struct _ArraySize -{ - GArray *array; - guint element_size; -} ArraySize; - -GArray *array_sizes; - -static ArraySize *find_array_size(GArray *array) -{ - gchar *end = array_sizes->data + sizeof(ArraySize) * array_sizes->len; - gchar *data; - - for (data = array_sizes->data; data < end; data += sizeof(ArraySize)) - if (*(GArray **) data == array) - return (ArraySize *) data; - - return NULL; -} - -#undef g_array_sized_new -GArray *scope_array_sized_new(gboolean zero_terminated, gboolean clear, guint element_size, - guint reserved_size) -{ - GArray *array = g_array_sized_new(zero_terminated, clear, element_size, reserved_size); - ArraySize array_size = { array, element_size }; - - g_array_append_val(array_sizes, array_size); - return array; -} - -guint scope_array_get_element_size(GArray *array) -{ - return find_array_size(array)->element_size; -} - -#undef g_array_free -gchar *scope_array_free(GArray *array, gboolean free_segment) -{ - g_array_remove_index(array_sizes, - find_array_size(array) - (ArraySize *) array_sizes->data); - - return g_array_free(array, free_segment); -} -#endif /* GLIB 2.22.0 */ - #if !GTK_CHECK_VERSION(2, 18, 0) void gtk_widget_set_visible(GtkWidget *widget, gboolean visible) { @@ -123,15 +75,4 @@ void gtk216_init(void) for (scd = sort_column_ids; scd->id; scd++) gtk_tree_view_column_set_sort_column_id(get_column(scd->id), scd->sort_column_id); - -#if !GLIB_CHECK_VERSION(2, 22, 0) - array_sizes = g_array_sized_new(FALSE, FALSE, sizeof(ArraySize), 0x10); -#endif -} - -void gtk216_finalize(void) -{ -#if !GLIB_CHECK_VERSION(2, 22, 0) - g_array_free(array_sizes, TRUE); -#endif } Modified: scope/src/gtk216.h 13 files changed, 0 insertions(+), 13 deletions(-) =================================================================== @@ -19,19 +19,6 @@ #ifndef GTK216_H -#if !GLIB_CHECK_VERSION(2, 22, 0) -GArray *scope_array_sized_new(gboolean zero_terminated, gboolean clear, guint element_size, - guint reserved_size); -#define g_array_sized_new(zero_terminated, clear, element_size, reserved_size) \ - scope_array_sized_new((zero_terminated), (clear), (element_size), (reserved_size)) -#define g_array_new(zero_terminated, clear, elt_size) \ - g_array_sized_new((zero_terminated), (clear), (elt_size), 0) -guint scope_array_get_element_size(GArray *array); -#define g_array_get_element_size(array) scope_array_get_element_size(array) -gchar *scope_array_free(GArray *array, gboolean free_segment); -#define g_array_free(array, free_segment) scope_array_free((array), (free_segment)) -#endif /* GLIB 2.22.0 */ - #if !GTK_CHECK_VERSION(2, 18, 0) #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget) #define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget) Modified: scope/src/inspect.c 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -351,7 +351,7 @@ void on_inspect_children(GArray *nodes) scp_tree_store_get(store, &iter, INSPECT_VAR1, &var1, INSPECT_NUMCHILD, &numchild, -1); - array_foreach(nodes, (GFunc) inspect_node_append, &iter); + parse_foreach(nodes, (GFunc) inspect_node_append, &iter); end = from + nodes->len; if (nodes->len && (from || end < numchild)) @@ -453,7 +453,7 @@ static void inspect_node_change(const ParseNode *node, G_GNUC_UNUSED gpointer gd void on_inspect_changelist(GArray *nodes) { - array_foreach(parse_lead_array(nodes), (GFunc) inspect_node_change, NULL); + parse_foreach(parse_lead_array(nodes), (GFunc) inspect_node_change, NULL); } static void inspect_apply(GtkTreeIter *iter) @@ -593,11 +593,11 @@ void inspect_add(const gchar *text) { GtkTreeIter iter; const gchar *expr = gtk_entry_get_text(inspect_expr); - const ParseMode *pm = parse_mode_find(expr); - scp_tree_store_append_with_values(store, &iter, NULL, INSPECT_HB_MODE, pm->hb_mode, - INSPECT_SCID, ++scid_gen, INSPECT_FORMAT, FORMAT_NATURAL, INSPECT_COUNT, - option_inspect_count, INSPECT_EXPAND, option_inspect_expand, -1); + scp_tree_store_append_with_values(store, &iter, NULL, INSPECT_HB_MODE, + parse_mode_get(expr, MODE_HBIT), INSPECT_SCID, ++scid_gen, INSPECT_FORMAT, + FORMAT_NATURAL, INSPECT_COUNT, option_inspect_count, INSPECT_EXPAND, + option_inspect_expand, -1); inspect_dialog_store(&iter); utils_tree_set_cursor(selection, &iter, -1); Modified: scope/src/local.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -95,7 +95,7 @@ void on_local_variables(GArray *nodes) gtk_tree_model_get((GtkTreeModel *) store, &iter, LOCAL_NAME, &ld.name, -1); locals_clear(); - array_foreach(parse_lead_array(nodes), (GFunc) local_node_variable, &ld); + parse_foreach(parse_lead_array(nodes), (GFunc) local_node_variable, &ld); g_free(ld.name); } } Modified: scope/src/memory.c 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -243,7 +243,7 @@ void on_memory_read_bytes(GArray *nodes) gtk_tree_view_column_queue_resize(get_column("memory_ascii_column")); } - array_foreach(parse_lead_array(nodes), (GFunc) memory_node_read, + parse_foreach(parse_lead_array(nodes), (GFunc) memory_node_read, GINT_TO_POINTER(TRUE)); if (addr) @@ -345,11 +345,11 @@ static void on_memory_group_update(const MenuItem *menu_item) static MenuItem memory_menu_items[] = { - { "memory_refresh", on_memory_refresh, DS_FRESHABLE, NULL, NULL }, - { "memory_read", on_memory_read, DS_SENDABLE, NULL, NULL }, - { "memory_copy", on_memory_copy, DS_COPYABLE, NULL, NULL }, - { "memory_clear", on_memory_clear, DS_CLEARABLE, NULL, NULL }, - { "memory_group", on_memory_group_display, DS_SENDABLE, NULL, NULL }, + { "memory_refresh", on_memory_refresh, DS_FRESHABLE, NULL, NULL }, + { "memory_read", on_memory_read, DS_SENDABLE, NULL, NULL }, + { "memory_copy", on_memory_copy, DS_COPYABLE, NULL, NULL }, + { "memory_clear", on_memory_clear, DS_CLEARABLE, NULL, NULL }, + { "memory_group", on_memory_group_display, DS_SENDABLE, NULL, NULL }, GROUP_ITEM("1", 0), GROUP_ITEM("2", 1), GROUP_ITEM("4", 2), Modified: scope/src/menu.c 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -412,11 +412,10 @@ void on_menu_evaluate_value(GArray *nodes) { if (atoi(parse_grab_token(nodes)) == scid_gen && !gtk_widget_get_visible(modify_dialog)) { - const ParseMode *pm = parse_mode_find(input); gchar *expr = utils_get_utf8_from_locale(input); menu_evaluate_modify(expr, parse_lead_value(nodes), "Evaluate/Modify", - pm->hb_mode, eval_mr_mode, NULL); + parse_mode_get(input, MODE_HBIT), eval_mr_mode, NULL); g_free(expr); } } Modified: scope/src/parse.c 166 files changed, 85 insertions(+), 81 deletions(-) =================================================================== @@ -23,6 +23,24 @@ #include "common.h" +static void parse_node_free(ParseNode *node, G_GNUC_UNUSED gpointer gdata) +{ + if (node->type == PT_ARRAY) + { + parse_foreach((GArray *) node->value, (GFunc) parse_node_free, NULL); + g_array_free((GArray *) node->value, TRUE); + } +} + +void parse_foreach(GArray *nodes, GFunc func, gpointer gdata) +{ + const ParseNode *node = (const ParseNode *) nodes->data; + const ParseNode *end = node + nodes->len; + + for (; node < end; node++) + func((gpointer) node, gdata); +} + static void target_feature_node_check(const ParseNode *node, G_GNUC_UNUSED gpointer gdata) { if (!strcmp((const char *) node->value, "async")) @@ -32,7 +50,7 @@ static void target_feature_node_check(const ParseNode *node, G_GNUC_UNUSED gpoin static void on_target_features(GArray *nodes) { pref_gdb_async_mode = FALSE; - array_foreach(parse_lead_array(nodes), (GFunc) target_feature_node_check, NULL); + parse_foreach(parse_lead_array(nodes), (GFunc) target_feature_node_check, NULL); } static void on_quiet_error(G_GNUC_UNUSED GArray *nodes) @@ -109,21 +127,6 @@ static void on_data_modified(G_GNUC_UNUSED GArray *nodes) { NULL, NULL, '\0', '\0', 0 } }; -static void parse_array_append(GArray *nodes, const char *name, ParseNodeType type, void *value) -{ - ParseNode *node = (ParseNode *) array_append(nodes); - - node->name = name; - node->type = type; - node->value = value; -} - -static void parse_node_free(ParseNode *node) -{ - if (node->type == PT_ARRAY) - array_free((GArray *) node->value, (GFreeFunc) parse_node_free); -} - static char *parse_error(const char *text) { dc_error("%s", text); @@ -189,7 +192,8 @@ static char *parse_text(GArray *nodes, char *text, char end, char newline) if (!text && !newline) { - array_clear(nodes, (GFreeFunc) parse_node_free); + parse_foreach(nodes, (GFunc) parse_node_free, NULL); + g_array_set_size(nodes, 0); return NULL; } } @@ -203,7 +207,7 @@ static char *parse_text(GArray *nodes, char *text, char end, char newline) if (!brace && *text != '[') return parse_error("\" { or [ expected"); - array = array_new(ParseNode, 0x10); + array = g_array_new(FALSE, FALSE, sizeof(ParseNode)); node.type = PT_ARRAY; node.value = array; @@ -235,7 +239,7 @@ void parse_message(char *message, const char *token) if (route->callback) { - GArray *nodes = array_new(ParseNode, 0x10); + GArray *nodes = g_array_new(FALSE, FALSE, sizeof(ParseNode)); const char *comma = strchr(route->prefix, ','); if (comma) @@ -244,12 +248,16 @@ void parse_message(char *message, const char *token) iff (nodes->len >= route->args, "missing argument(s)") { if (token) - parse_array_append(nodes, "=token", PT_VALUE, (char *) token + 1); + { + ParseNode node = { "=token", PT_VALUE, (char *) token + 1 }; + g_array_append_val(nodes, node); + } route->callback(nodes); } - array_free(nodes, (GFreeFunc) parse_node_free); + parse_foreach(nodes, (GFunc) parse_node_free, NULL); + g_array_free(nodes, TRUE); } } @@ -379,7 +387,14 @@ gchar *parse_get_display_from_7bit(const char *text, gint hb_mode, gint mr_mode) const ParseNode *parse_find_node(GArray *nodes, const char *name) { - return (const ParseNode *) array_find(nodes, name, FALSE); + const ParseNode *node = (const ParseNode *) nodes->data; + const ParseNode *end = node + nodes->len; + + for (; node < end; node++) + if (!strcmp(node->name, name)) + return node; + + return NULL; } const void *parse_find_node_type(GArray *nodes, const char *name, ParseNodeType type) @@ -403,13 +418,13 @@ const char *parse_grab_token(GArray *nodes) if (node) { token = (const char *) node->value; - array_remove(nodes, node); + g_array_remove_index(nodes, node - (const ParseNode *) nodes->data); } return token; } -gchar *parse_find_error(GArray *nodes) +gchar *parse_get_error(GArray *nodes) { gchar *error = parse_find_value(nodes, "msg"); return error && *error ? utils_get_utf8_from_locale(error) : @@ -431,7 +446,7 @@ static gboolean errors_show(G_GNUC_UNUSED gpointer gdata) void on_error(GArray *nodes) { - gchar *error = parse_find_error(nodes); + gchar *error = parse_get_error(nodes); if (errors_id) g_string_append_c(errors, '\n'); @@ -478,12 +493,8 @@ void parse_location(GArray *nodes, ParseLocation *loc) loc->line = 0; } -static GArray *parse_modes; - -static void parse_mode_free(ParseMode *pm) -{ - g_free(pm->name); -} +static ScpTreeStore *parse_modes; +enum { MODE_NAME = MODE_ENTRY + 1 }; static gboolean parse_mode_load(GKeyFile *config, const char *section) { @@ -491,33 +502,38 @@ static gboolean parse_mode_load(GKeyFile *config, const char *section) gint hb_mode = utils_get_setting_integer(config, section, "hbit", HB_DEFAULT); gint mr_mode = utils_get_setting_integer(config, section, "member", MR_DEFAULT); gboolean entry = utils_get_setting_boolean(config, section, "entry", TRUE); + gboolean valid = FALSE; if (name && (unsigned) hb_mode < HB_COUNT && (unsigned) mr_mode < MR_MODIFY) { - ParseMode *pm = (ParseMode *) array_append(parse_modes); - - pm->name = name; - pm->hb_mode = hb_mode; - pm->mr_mode = mr_mode; - pm->entry = entry; - return TRUE; + scp_tree_store_append_with_values(parse_modes, NULL, NULL, MODE_NAME, name, + MODE_HBIT, hb_mode, MODE_MEMBER, mr_mode, MODE_ENTRY, entry, -1); + valid = TRUE; } g_free(name); - return FALSE; + return valid; } -static gboolean parse_mode_save(GKeyFile *config, const char *section, ParseMode *pm) +static gboolean parse_mode_save(GKeyFile *config, const char *section, GtkTreeIter *iter) { - g_key_file_set_string(config, section, "name", pm->name); - g_key_file_set_integer(config, section, "hbit", pm->hb_mode); - g_key_file_set_integer(config, section, "member", pm->mr_mode); - g_key_file_set_boolean(config, section, "entry", pm->entry); + const char *name; + gint hb_mode, mr_mode; + gboolean entry; + + scp_tree_store_get(parse_modes, iter, MODE_NAME, &name, MODE_HBIT, &hb_mode, + MODE_MEMBER, &mr_mode, MODE_ENTRY, &entry, -1); + + if (hb_mode == HB_DEFAULT && mr_mode == MR_DEFAULT && entry) + return FALSE; + + g_key_file_set_string(config, section, "name", name); + g_key_file_set_integer(config, section, "hbit", hb_mode); + g_key_file_set_integer(config, section, "member", mr_mode); + g_key_file_set_boolean(config, section, "entry", entry); return TRUE; } -static ParseMode parse_mode_default = { NULL, HB_DEFAULT, MR_DEFAULT, TRUE }; - char *parse_mode_reentry(const char *name) { return g_str_has_suffix(name, "@entry") ? g_strndup(name, strlen(name) - 6) : @@ -529,42 +545,34 @@ static char *parse_mode_pm_name(const char *name) return g_strndup(name, strlen(name) - (g_str_has_suffix(name, "@entry") ? 6 : 0)); } -const ParseMode *parse_mode_find(const char *name) +gint parse_mode_get(const char *name, gint mode) { char *pm_name = parse_mode_pm_name(name); - ParseMode *pm = (ParseMode *) array_find(parse_modes, pm_name, FALSE); + GtkTreeIter iter; + gint value; + + if (store_find(parse_modes, &iter, MODE_NAME, pm_name)) + scp_tree_store_get(parse_modes, &iter, mode, &value, -1); + else + value = mode == MODE_HBIT ? HB_DEFAULT : mode == MODE_MEMBER ? MR_DEFAULT : TRUE; + g_free(pm_name); - return pm ? pm : &parse_mode_default; + return value; } void parse_mode_update(const char *name, gint mode, gint value) { char *pm_name = parse_mode_pm_name(name); - ParseMode *pm = (ParseMode *) array_find(parse_modes, pm_name, FALSE); + GtkTreeIter iter; - if (!pm) + if (!store_find(parse_modes, &iter, MODE_NAME, name)) { - pm = (ParseMode *) array_append(parse_modes); - pm->name = g_strdup(pm_name); - pm->hb_mode = HB_DEFAULT; - pm->mr_mode = MR_DEFAULT; - pm->entry = TRUE; + scp_tree_store_append_with_values(parse_modes, &iter, NULL, MODE_NAME, pm_name, + MODE_HBIT, HB_DEFAULT, MODE_MEMBER, MR_DEFAULT, MODE_ENTRY, TRUE, -1); } - g_free(pm_name); - switch (mode) - { - case MODE_HBIT : pm->hb_mode = value; break; - case MODE_MEMBER : pm->mr_mode = value; break; - default : - { - g_assert(mode == MODE_ENTRY); - pm->entry = value; - } - } - - if (pm->hb_mode == HB_DEFAULT && pm->mr_mode == MR_DEFAULT && pm->entry) - array_remove(parse_modes, pm); + g_free(pm_name); + scp_tree_store_set(parse_modes, &iter, mode, value, -1); } gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children) @@ -573,8 +581,6 @@ gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children) iff (name, "no name") { - const ParseMode *pm = parse_mode_find(name); - var->name = name; var->value = parse_find_value(nodes, "value"); var->expr = NULL; @@ -586,11 +592,9 @@ gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children) var->numchild = utils_atoi0(var->children); } - pm = parse_mode_find(var->expr ? var->expr : name); - var->hb_mode = pm->hb_mode; - var->mr_mode = pm->mr_mode; - var->display = parse_get_display_from_7bit(var->value, pm->hb_mode, pm->mr_mode); - + var->hb_mode = parse_mode_get(var->expr ? var->expr : name, MODE_HBIT); + var->mr_mode = parse_mode_get(var->expr ? var->expr : name, MODE_MEMBER); + var->display = parse_get_display_from_7bit(var->value, var->hb_mode, var->mr_mode); return TRUE; } @@ -599,23 +603,23 @@ gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children) void parse_load(GKeyFile *config) { - array_clear(parse_modes, (GFreeFunc) parse_mode_free); + store_clear(parse_modes); utils_load(config, "parse", parse_mode_load); } void parse_save(GKeyFile *config) { - array_save(parse_modes, config, "parse", (ASaveFunc) parse_mode_save); + store_save(parse_modes, config, "parse", parse_mode_save); } void parse_init(void) { errors = g_string_sized_new(MAXLEN); - parse_modes = array_new(ParseMode, 0x10); + parse_modes = SCP_TREE_STORE(get_object("parse_mode_store")); + scp_tree_store_set_sort_column_id(parse_modes, MODE_NAME, GTK_SORT_ASCENDING); } void parse_finalize(void) { g_string_free(errors, TRUE); - array_free(parse_modes, (GFreeFunc) parse_mode_free); } Modified: scope/src/parse.h 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -32,6 +32,7 @@ void *value; } ParseNode; +void parse_foreach(GArray *nodes, GFunc func, gpointer gdata); char *parse_string(char *text, char newline); void parse_message(char *message, const char *token); gchar *parse_get_display_from_7bit(const char *text, gint hb_mode, gint mr_mode); @@ -43,11 +44,11 @@ #define parse_find_locale(nodes, name) utils_7bit_to_locale(parse_find_value((nodes), (name))) #define parse_find_array(nodes, name) \ ((GArray *) parse_find_node_type((nodes), (name), PT_ARRAY)) -const char *parse_grab_token(GArray *nodes); /* removes from nodes */ +const char *parse_grab_token(GArray *nodes); /* removes token from nodes */ #define parse_lead_array(nodes) ((GArray *) ((ParseNode *) nodes->data)->value) #define parse_lead_value(nodes) ((char *) ((ParseNode *) nodes->data)->value) -gchar *parse_find_error(GArray *nodes); +gchar *parse_get_error(GArray *nodes); void on_error(GArray *nodes); typedef struct _ParseLocation @@ -110,7 +111,7 @@ enum } ParseVariable; char *parse_mode_reentry(const char *name); -const ParseMode *parse_mode_find(const char *name); +gint parse_mode_get(const char *name, gint mode); void parse_mode_update(const char *name, gint mode, gint value); gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children); #define parse_variable_free(var) g_free((var)->display) Modified: scope/src/program.c 142 files changed, 83 insertions(+), 59 deletions(-) =================================================================== @@ -41,48 +41,44 @@ static void stash_group_destroy(StashGroup *group, G_GNUC_UNUSED gpointer gdata) utils_stash_group_free(group); } -typedef struct _RecentProgram +enum { - gchar *name; - guint id; -} RecentProgram; + PROGRAM_NAME, + PROGRAM_ID /* 1-based */ +}; #define RECENT_COUNT 28 -static GArray *recent_programs; +static ScpTreeStore *recent_programs; static guint recent_bitmap; static GtkWidget *recent_menu; -static void recent_program_free(RecentProgram *program) -{ - g_free(program->name); -} - static gboolean recent_program_load(GKeyFile *config, const char *section) { gchar *name = utils_get_setting_string(config, section, "name", NULL); gint id = utils_get_setting_integer(config, section, "id", 0); + gboolean valid = FALSE; - if (name && *name && id > 0 && (recent_bitmap & (1 << id)) == 0 && - recent_programs->len < RECENT_COUNT) + if (name && id > 0 && id <= RECENT_COUNT && (recent_bitmap & (1 << id)) == 0) { - RecentProgram *recent = (RecentProgram *) array_append(recent_programs); - - recent->name = name; - recent->id = id; + scp_tree_store_append_with_values(recent_programs, NULL, NULL, PROGRAM_NAME, name, + PROGRAM_ID, id, -1); recent_bitmap |= 1 << id; - return TRUE; + valid = TRUE; } g_free(name); - return FALSE; + return valid; } -static gboolean recent_program_save(GKeyFile *config, const char *section, - RecentProgram *recent) +static gboolean recent_program_save(GKeyFile *config, const char *section, GtkTreeIter *iter) { - g_key_file_set_string(config, section, "name", recent->name); - g_key_file_set_integer(config, section, "id", recent->id); + const gchar *name; + gint id; + + scp_tree_store_get(recent_programs, iter, PROGRAM_NAME, &name, PROGRAM_ID, &id, -1); + g_key_file_set_string(config, section, "name", name); + g_key_file_set_integer(config, section, "id", id); return TRUE; } @@ -95,15 +91,18 @@ static void recent_menu_item_destroy(GtkWidget *widget, G_GNUC_UNUSED gpointer g static gint recent_menu_count; -static void recent_menu_item_create(RecentProgram *recent, G_GNUC_UNUSED gpointer gdata) +static void recent_menu_item_create(GtkTreeIter *iter, G_GNUC_UNUSED gpointer gdata) { if (recent_menu_count < pref_show_recent_items) { - GtkWidget *item = gtk_menu_item_new_with_label(recent->name); + const gchar *name; + GtkWidget *item; + scp_tree_store_get(recent_programs, iter, PROGRAM_NAME, &name, -1); + item = gtk_menu_item_new_with_label(name); gtk_menu_shell_append(GTK_MENU_SHELL(recent_menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_recent_menu_item_activate), - recent->name); + (gpointer) name); recent_menu_count++; } } @@ -112,7 +111,7 @@ static void recent_menu_create(void) { gtk_container_foreach(GTK_CONTAINER(recent_menu), recent_menu_item_destroy, NULL); recent_menu_count = 0; - array_foreach(recent_programs, (GFunc) recent_menu_item_create, NULL); + store_foreach(recent_programs, (GFunc) recent_menu_item_create, NULL); gtk_widget_show_all(GTK_WIDGET(recent_menu)); } @@ -136,6 +135,23 @@ static char *recent_file_name(gint id) gboolean program_temp_breakpoint; gchar *program_temp_break_location; +static gboolean program_find(GtkTreeIter *iter, const char *name) +{ + gboolean valid = scp_tree_store_get_iter_first(recent_programs, iter); + + while (valid) + { + const char *name1; + + scp_tree_store_get(recent_programs, iter, PROGRAM_NAME, &name1, -1); + if (!utils_filenamecmp(name1, name)) + break; + valid = scp_tree_store_iter_next(recent_programs, iter); + } + + return valid; +} + static void save_program_settings(void) { const gchar *program_name = *program_executable ? program_executable : @@ -143,24 +159,38 @@ static void save_program_settings(void) if (*program_name) { - RecentProgram *recent = (RecentProgram *) array_find(recent_programs, program_name, - TRUE); + GtkTreeIter iter; + gint id; GKeyFile *config = g_key_file_new(); char *configfile; - if (!recent) + if (program_find(&iter, program_name)) { - recent = (RecentProgram *) array_append(recent_programs); - recent->name = g_strdup(program_name); - - for (recent->id = 1; recent->id < RECENT_COUNT; recent->id++) - if ((recent_bitmap & (1 << recent->id)) == 0) - break; - - recent_bitmap |= 1 << recent->id; + scp_tree_store_get(recent_programs, &iter, PROGRAM_ID, &id, -1); + scp_tree_store_move(recent_programs, &iter, 0); + } + else + { + if (scp_tree_store_iter_nth_child(recent_programs, &iter, NULL, + RECENT_COUNT - 1)) + { + scp_tree_store_get(recent_programs, &iter, PROGRAM_ID, &id, -1); + scp_tree_store_remove(recent_programs, &iter); + } + else + { + for (id = 1; id < RECENT_COUNT; id++) + if ((recent_bitmap & (1 << id)) == 0) + break; + + recent_bitmap |= 1 << id; + } + + scp_tree_store_prepend_with_values(recent_programs, &iter, NULL, + PROGRAM_NAME, program_name, PROGRAM_ID, id, -1); } - configfile = recent_file_name(recent->id); + configfile = recent_file_name(id); stash_foreach((GFunc) stash_group_save_to_key_file, config); breaks_save(config); watches_save(config); @@ -169,16 +199,6 @@ static void save_program_settings(void) utils_key_file_write_to_file(config, configfile); g_free(configfile); g_key_file_free(config); - - g_array_insert_vals(recent_programs, 0, ++recent, 1); - array_remove(recent_programs, recent); - recent_menu_create(); - - if (recent_programs->len > RECENT_COUNT) - { - recent_bitmap &= ~(1 << recent->id); - array_remove(recent_programs, recent); - } } } @@ -207,20 +227,24 @@ static void program_configure(void) static void on_recent_menu_item_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, const gchar *name) { - RecentProgram *recent = (RecentProgram *) array_find(recent_programs, name, TRUE); + GtkTreeIter iter; - if (recent && utils_filenamecmp(recent->name, *program_executable ? program_executable : - program_load_script)) + if (utils_filenamecmp(name, *program_executable ? program_executable : + program_load_script) && program_find(&iter, name)) { - char *configfile = recent_file_name(recent->id); + gint id; + char *configfile; GKeyFile *config = g_key_file_new(); GError *gerror = NULL; gchar *message; + scp_tree_store_get(recent_programs, &iter, PROGRAM_ID, &id, -1); + configfile = recent_file_name(id); + if (g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, &gerror)) { + scp_tree_store_move(recent_programs, &iter, 0); save_program_settings(); - recent = (RecentProgram *) array_find(recent_programs, name, TRUE); stash_foreach((GFunc) stash_group_load_from_key_file, config); if ((unsigned) option_inspect_expand > EXPAND_MAX) option_inspect_expand = 100; @@ -228,9 +252,9 @@ static void on_recent_menu_item_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, co watches_load(config); inspects_load(config); parse_load(config); - message = g_strdup_printf(_("Loaded debug settings for %s."), recent->name); - g_array_insert_vals(recent_programs, 0, ++recent, 1); - array_remove(recent_programs, recent); + message = g_strdup_printf(_("Loaded debug settings for %s."), name); + program_find(&iter, name); + scp_tree_store_move(recent_programs, &iter, 0); recent_menu_create(); program_configure(); } @@ -387,6 +411,7 @@ static void on_program_ok_button_clicked(G_GNUC_UNUSED GtkButton *button, g_free(program_environment); program_environment = utils_text_buffer_get_text(environment, -1); save_program_settings(); + recent_menu_create(); program_configure(); gtk_widget_hide(program_dialog); @@ -531,7 +556,7 @@ void program_init(void) stash_group_add_boolean(group, &thread_show_core, "show_core", TRUE); thread_group = group; - recent_programs = array_new(RecentProgram, RECENT_COUNT + 2); + recent_programs = SCP_TREE_STORE(get_object("recent_program_store")); recent_bitmap = 0; recent_menu = get_widget("program_recent_menu"); } @@ -543,12 +568,11 @@ void program_finalize(void) save_program_settings(); g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); - array_save(recent_programs, config, "recent", (ASaveFunc) recent_program_save); + store_save(recent_programs, config, "recent", recent_program_save); utils_key_file_write_to_file(config, configfile); g_key_file_free(config); g_free(configfile); - array_free(recent_programs, (GFreeFunc) recent_program_free); gtk_widget_destroy(program_dialog); stash_foreach((GFunc) stash_group_destroy, NULL); } Modified: scope/src/scope.c 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -623,7 +623,6 @@ void plugin_cleanup(void) parse_finalize(); prefs_finalize(); debug_finalize(); - gtk216_finalize(); gtk_widget_destroy(debug_statusbar); g_object_unref(builder); Modified: scope/src/stack.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -52,8 +52,8 @@ static void stack_node_location(const ParseNode *node, const char *fid) scp_tree_store_append_with_values(store, &iter, NULL, STACK_ID, id, STACK_FILE, loc.file, STACK_LINE, loc.line, STACK_BASE_NAME, loc.base_name, STACK_FUNC, loc.func, STACK_ARGS, NULL, STACK_ADDR, - loc.addr, STACK_ENTRY, !loc.func || parse_mode_find(loc.func)->entry, - -1); + loc.addr, STACK_ENTRY, !loc.func || + parse_mode_get(loc.func, MODE_ENTRY), -1); parse_location_free(&loc); if (!g_strcmp0(id, fid)) @@ -71,7 +71,7 @@ void on_stack_frames(GArray *nodes) char *fid = g_strdup(frame_id); stack_clear(); - array_foreach(parse_lead_array(nodes), (GFunc) stack_node_location, fid); + parse_foreach(parse_lead_array(nodes), (GFunc) stack_node_location, fid); g_free(fid); if (!frame_id) @@ -132,7 +132,7 @@ static void stack_node_arguments(const ParseNode *node, G_GNUC_UNUSED gpointer g sd.string = g_string_sized_new(0xFF); scp_tree_store_get(store, &iter, STACK_ENTRY, &sd.entry, -1); - array_foreach(nodes, (GFunc) append_argument_variable, &sd); + parse_foreach(nodes, (GFunc) append_argument_variable, &sd); scp_tree_store_set(store, &iter, STACK_ARGS, sd.string->str, -1); g_string_free(sd.string, TRUE); } @@ -143,7 +143,7 @@ static void stack_node_arguments(const ParseNode *node, G_GNUC_UNUSED gpointer g void on_stack_arguments(GArray *nodes) { if (!g_strcmp0(parse_grab_token(nodes), thread_id)) - array_foreach(parse_lead_array(nodes), (GFunc) stack_node_arguments, NULL); + parse_foreach(parse_lead_array(nodes), (GFunc) stack_node_arguments, NULL); } void on_stack_follow(GArray *nodes) Modified: scope/src/thread.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -388,7 +388,7 @@ void on_thread_stopped(GArray *nodes) } } else - array_foreach((GArray *) stopped->value, (GFunc) thread_node_stopped, &sd); + parse_foreach((GArray *) stopped->value, (GFunc) thread_node_stopped, &sd); } if (thread_select_on_stopped && thread_state <= THREAD_RUNNING && sd.found) @@ -541,7 +541,7 @@ static const char *thread_info_parse(GArray *nodes, gboolean select) { const char *tid = parse_find_value(nodes, "current-thread-id"); - array_foreach(parse_lead_array(nodes), (GFunc) thread_node_parse, NULL); + parse_foreach(parse_lead_array(nodes), (GFunc) thread_node_parse, NULL); if (tid) set_gdb_thread(tid, select); Modified: scope/src/tooltip.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -76,7 +76,7 @@ void on_tooltip_error(GArray *nodes) if (atoi(parse_grab_token(nodes)) == scid_gen) { if (pref_tooltips_fail_action == 1) - tooltip_set(parse_find_error(nodes)); + tooltip_set(parse_get_error(nodes)); else { tooltip_set(NULL); @@ -92,9 +92,8 @@ void on_tooltip_value(GArray *nodes) { if (atoi(parse_grab_token(nodes)) == scid_gen) { - const ParseMode *pm = parse_mode_find(input); - tooltip_set(parse_get_display_from_7bit(parse_lead_value(nodes), pm->hb_mode, - pm->mr_mode)); + tooltip_set(parse_get_display_from_7bit(parse_lead_value(nodes), + parse_mode_get(input, MODE_HBIT), parse_mode_get(input, MODE_MEMBER))); } } Modified: scope/src/utils.c 101 files changed, 6 insertions(+), 95 deletions(-) =================================================================== @@ -134,100 +134,6 @@ void utils_strchrepl(char *text, char c, char rep) *p = '\0'; } -gchar *array_append(GArray *array) -{ - g_array_set_size(array, array->len + 1); - return array->data + g_array_get_element_size(array) * (array->len - 1); -} - -#ifdef G_OS_UNIX -gchar *array_find(GArray *array, const char *key, G_GNUC_UNUSED gboolean filename) -#else -gchar *array_find(GArray *array, const char *key, gboolean filename) -#endif -{ - guint size = g_array_get_element_size(array); - gchar *end = array->data + size * array->len; - gchar *data; -#ifdef G_OS_UNIX - int (*const compare)(const char *s1, const char *s2) = strcmp; -#else - int (*compare)(const char *s1, const char *s2) = filename ? utils_str_casecmp : strcmp; -#endif - - for (data = array->data; data < end; data += size) - if (!compare(*(const char **) data, key)) - return data; - - return NULL; -} - -void array_foreach(GArray *array, GFunc each_func, gpointer gdata) -{ - guint size = g_array_get_element_size(array); - gchar *end = array->data + size * array->len; - gchar *data; - - for (data = array->data; data < end; data += size) - each_func(data, gdata); -} - -guint array_index(GArray *array, gconstpointer element) -{ - return ((const gchar *) element - array->data) / g_array_get_element_size(array); -} - -void array_remove(GArray *array, gconstpointer element) -{ - g_array_remove_index(array, array_index(array, element)); -} - -static void array_free_element(gpointer element, GFreeFunc free_func) -{ - free_func(element); -} - -void array_clear(GArray *array, GFreeFunc free_func) -{ - array_foreach(array, (GFunc) array_free_element, free_func); - g_array_set_size(array, 0); -} - -void array_free(GArray *array, GFreeFunc free_func) -{ - array_foreach(array, (GFunc) array_free_element, free_func); - g_array_free(array, TRUE); -} - -static void utils_clear_sections(GKeyFile *config, const char *prefix, guint i) -{ - gboolean valid; - - do - { - char *section = g_strdup_printf("%s_%d", prefix, i++); - valid = g_key_file_remove_group(config, section, NULL); - g_free(section); - } while (valid); -} - -void array_save(GArray *array, GKeyFile *config, const gchar *prefix, ASaveFunc save_func) -{ - guint size = g_array_get_element_size(array); - gchar *end = array->data + size * array->len; - gchar *data; - guint n = 0; - - for (data = array->data; data < end; data += size) - { - char *section = g_strdup_printf("%s_%d", prefix, n); - n += save_func(config, section, data); - g_free(section); - } - - utils_clear_sections(config, prefix, n); -} - gboolean store_find(ScpTreeStore *store, GtkTreeIter *iter, guint column, const char *key) { if (scp_tree_store_get_column_type(store, column) == G_TYPE_STRING) @@ -264,7 +170,12 @@ void store_save(ScpTreeStore *store, GKeyFile *config, const gchar *prefix, g_free(section); } - utils_clear_sections(config, prefix, i); + do + { + char *section = g_strdup_printf("%s_%d", prefix, i++); + valid = g_key_file_remove_group(config, section, NULL); + g_free(section); + } while (valid); } gint store_gint_compare(ScpTreeStore *store, GtkTreeIter *a, GtkTreeIter *b, gpointer gdata) Modified: scope/src/utils.h 11 files changed, 0 insertions(+), 11 deletions(-) =================================================================== @@ -29,17 +29,6 @@ const gchar *utils_skip_spaces(const gchar *text); void utils_strchrepl(char *text, char c, char repl); -#define array_new(type, start) g_array_sized_new(FALSE, FALSE, sizeof(type), (start)) -gchar *array_append(GArray *array); -gchar *array_find(GArray *array, const char *key, gboolean filename); -void array_foreach(GArray *array, GFunc each_func, gpointer gdata); -guint array_index(GArray *array, const void *data); -void array_remove(GArray *array, const void *data); -void array_clear(GArray *array, GFreeFunc free_func); -void array_free(GArray *array, GFreeFunc free_func); -typedef gboolean (*ASaveFunc)(GKeyFile *config, const char *section, void *data); -void array_save(GArray *array, GKeyFile *config, const char *prefix, ASaveFunc save_func); - #define iff(expr, ...) if (G_UNLIKELY(!(expr))) dc_error(__VA_ARGS__); else #define utils_atoi0(s) ((s) ? atoi(s) : 0) /* note: 2 references to s */ Modified: scope/src/watch.c 18 files changed, 7 insertions(+), 11 deletions(-) =================================================================== @@ -75,11 +75,9 @@ static void on_watch_expr_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, if (strcmp(new_text, expr)) { - const ParseMode *pm = parse_mode_find(new_text); - scp_tree_store_set(store, &iter, WATCH_EXPR, new_text, WATCH_DISPLAY, NULL, - WATCH_VALUE, NULL, WATCH_HB_MODE, pm->hb_mode, WATCH_MR_MODE, - pm->mr_mode, -1); + WATCH_VALUE, NULL, WATCH_HB_MODE, parse_mode_get(new_text, MODE_HBIT), + WATCH_MR_MODE, parse_mode_get(new_text, MODE_MEMBER), -1); if (enabled && (debug_state() & DS_DEBUG)) watch_iter_update(&iter, GINT_TO_POINTER(TRUE)); @@ -131,7 +129,7 @@ void on_watch_value(GArray *nodes) void on_watch_error(GArray *nodes) { - watch_set(nodes, parse_find_error(nodes), NULL); + watch_set(nodes, parse_get_error(nodes), NULL); } static void watch_iter_clear(GtkTreeIter *iter, G_GNUC_UNUSED gpointer gdata) @@ -160,12 +158,12 @@ void watch_add(const gchar *text) if (validate_column(expr, TRUE)) { - const ParseMode *pm = parse_mode_find(expr); GtkTreeIter iter; scp_tree_store_append_with_values(store, &iter, NULL, WATCH_EXPR, expr, - WATCH_HB_MODE, pm->hb_mode, WATCH_MR_MODE, pm->mr_mode, WATCH_SCID, - ++scid_gen, WATCH_ENABLED, TRUE, -1); + WATCH_HB_MODE, parse_mode_get(expr, MODE_HBIT), WATCH_MR_MODE, + parse_mode_get(expr, MODE_MEMBER), WATCH_SCID, ++scid_gen, WATCH_ENABLED, + TRUE, -1); utils_tree_set_cursor(selection, &iter, 0.5); if (debug_state() & DS_DEBUG) @@ -198,9 +196,7 @@ static gboolean watch_load(GKeyFile *config, const char *section) if (expr && (unsigned) hb_mode < HB_COUNT && (unsigned) mr_mode < MR_MODIFY) { - GtkTreeIter iter; - - scp_tree_store_append_with_values(store, &iter, NULL, WATCH_EXPR, expr, + scp_tree_store_append_with_values(store, NULL, NULL, WATCH_EXPR, expr, WATCH_HB_MODE, hb_mode, WATCH_MR_MODE, mr_mode, WATCH_SCID, ++scid_gen, WATCH_ENABLED, enabled, -1); valid = TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e46117: scope - GArray thread_groups -> ScpTreeStore
by Dimitar Zhekov 02 May '13

02 May '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Thu, 02 May 2013 14:57:52 UTC Commit: e46117189722ddef2c4643bd2cc8496dd00a8800 https://github.com/geany/geany-plugins/commit/e46117189722ddef2c4643bd2cc84… Log Message: ----------- scope - GArray thread_groups -> ScpTreeStore Modified Paths: -------------- scope/ChangeLog scope/data/scope.glade scope/src/thread.c Modified: scope/ChangeLog 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,9 @@ +2013-05-02 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * data/scope.glade, src/thread.c: + GArray thread_groups -> ScpTreeStore. + + 2013-04-25 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/break.c, src/utils.c: @@ -7,6 +13,7 @@ * src/store/scptreestore.html: ScpTreeStore documentation fixes. + 2013-04-04 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, src/Makefile.am, src/break.c, src/common.h, Modified: scope/data/scope.glade 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1227,6 +1227,15 @@ </object> </child> </object> + <object class="ScpTreeStore" id="thread_group_store"> + <property name="sublevels">False</property> + <columns> +  + <column type="gchararray" utf8_collate="false"/> +  + <column type="gchararray" utf8_collate="false"/> + </columns> + </object> <object class="ScpTreeStore" id="thread_store"> <property name="sublevels">False</property> <columns> Modified: scope/src/thread.c 93 files changed, 38 insertions(+), 55 deletions(-) =================================================================== @@ -32,40 +32,27 @@ #include <windows.h> #endif -typedef struct _ThreadGroup -{ - char *gid; - char *pid; -} ThreadGroup; - -static GArray *thread_groups = NULL; - -static ThreadGroup *find_thread_group(const char *gid) +enum { - ThreadGroup *group = (ThreadGroup *) array_find(thread_groups, gid, FALSE); - - if (G_UNLIKELY(!group)) - dc_error("%s: gid not found", gid); + GROUP_ID, + GROUP_PID +}; - return group; -} +static ScpTreeStore *groups = NULL; void on_thread_group_started(GArray *nodes) { const char *gid = parse_lead_value(nodes); const char *pid = parse_find_value(nodes, "pid"); - ui_set_statusbar(TRUE, _("Thread group %s started."), pid ? pid : gid ? gid : ""); + ui_set_statusbar(TRUE, _("Thread group %s started."), pid ? pid : gid); iff (pid, "no pid") { - ThreadGroup *group = find_thread_group(gid); + GtkTreeIter iter; - if (group) - { - g_free(group->pid); - group->pid = g_strdup(pid); - } + iff (store_find(groups, &iter, GROUP_ID, gid), "%s: gid not found", gid) + scp_tree_store_set(groups, &iter, GROUP_PID, pid, -1); } } @@ -74,16 +61,24 @@ void on_thread_group_exited(GArray *nodes) const char *gid = parse_lead_value(nodes); const char *exit_code = parse_find_value(nodes, "exit-code"); GString *status = g_string_new(_("Thread group ")); - ThreadGroup *group = find_thread_group(gid); + GtkTreeIter iter; - if (group && group->pid) + if (store_find(groups, &iter, GROUP_ID, gid)) { - g_string_append(status, group->pid); - g_free(group->pid); - group->pid = NULL; + const char *pid; + + scp_tree_store_get(groups, &iter, GROUP_PID, &pid, -1); + if (pid) + { + g_string_append(status, pid); + scp_tree_store_set(groups, &iter, GROUP_PID, NULL, -1); + } } else + { + dc_error("%s: gid not found", gid); g_string_append(status, gid); + } g_string_append(status, _(" exited")); if (exit_code) @@ -100,26 +95,18 @@ void on_thread_group_exited(GArray *nodes) void on_thread_group_added(GArray *nodes) { - ThreadGroup *group = (ThreadGroup *) array_append(thread_groups); - group->gid = g_strdup(parse_lead_value(nodes)); - group->pid = NULL; -} - -static void thread_group_free(ThreadGroup *group) -{ - g_free(group->gid); - g_free(group->pid); + GtkTreeIter iter; + scp_tree_store_append(groups, &iter, NULL); + scp_tree_store_set(groups, &iter, GROUP_ID, parse_lead_value(nodes), -1); } void on_thread_group_removed(GArray *nodes) { - ThreadGroup *group = find_thread_group(parse_lead_value(nodes)); + const char *gid = parse_lead_value(nodes); + GtkTreeIter iter; - if (group) - { - thread_group_free(group); - array_remove(thread_groups, group); - } + iff (store_find(groups, &iter, GROUP_ID, gid), "%s: gid not found", gid) + scp_tree_store_remove(groups, &iter); } enum @@ -454,20 +441,16 @@ void on_thread_created(GArray *nodes) iff (tid, "no tid") { GtkTreeIter iter; + const char *pid = NULL; + + iff (gid, "no gid") + iff (store_find(groups, &iter, GROUP_ID, gid), "%s: gid not found", gid) + scp_tree_store_get(groups, &iter, GROUP_PID, &pid, -1); scp_tree_store_append_with_values(store, &iter, NULL, THREAD_ID, tid, THREAD_STATE, - "", -1); + "", THREAD_GROUP_ID, gid, THREAD_PID, pid, -1); debug_send_format(N, "04-thread-info %s", tid); - if (gid) - { - ThreadGroup *group = find_thread_group(gid); - - scp_tree_store_set(store, &iter, THREAD_GROUP_ID, gid, -1); - if (group && group->pid) - scp_tree_store_set(store, &iter, THREAD_PID, group->pid, -1); - } - if (thread_count == 1) set_gdb_thread(tid, TRUE); } @@ -602,7 +585,7 @@ void threads_mark(GeanyDocument *doc) void threads_clear(void) { store_foreach(store, (GFunc) thread_iter_unmark, GINT_TO_POINTER(TRUE)); - array_clear(thread_groups, (GFreeFunc) thread_group_free); + store_clear(groups); store_clear(store); set_gdb_thread(NULL, FALSE); thread_count = 0; @@ -901,7 +884,8 @@ void thread_init(void) g_signal_connect(tree, "query-tooltip", G_CALLBACK(on_view_query_tooltip), get_column("thread_base_name_column")); - thread_groups = array_new(ThreadGroup, 0x10); + groups = SCP_TREE_STORE(get_object("thread_group_store")); + scp_tree_store_set_sort_column_id(groups, GROUP_ID, GTK_SORT_ASCENDING); RUNNING = _("Running"); STOPPED = _("Stopped"); g_signal_connect(tree, "key-press-event", G_CALLBACK(on_view_key_press), @@ -920,6 +904,5 @@ void thread_init(void) void thread_finalize(void) { store_foreach(store, (GFunc) thread_iter_unmark, NULL); - array_free(thread_groups, (GFreeFunc) thread_group_free); set_gdb_thread(NULL, FALSE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits May 2013