Plugins-Commits January 2013

plugins-commits@lists.geany.org

1 participants
33 discussions

[geany/geany-plugins] 84d841: scope - small fixes
by Dimitar Zhekov 23 Jan '13

23 Jan '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Wed, 23 Jan 2013 19:22:08 UTC Commit: 84d841ecae18cb9a533fe6e44751c0f4d6761f60 https://github.com/geany/geany-plugins/commit/84d841ecae18cb9a533fe6e44751c… Log Message: ----------- scope - small fixes Modified Paths: -------------- scope/ChangeLog scope/docs/scope.html scope/src/break.c scope/src/debug.c scope/wscript_build Modified: scope/ChangeLog 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,12 @@ +2013-01-22 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/debug.c: + Win32 waitpid()/kill() emulation depends on glibconfig.h only and + sets errno = EINVAL on error. + * wscript_build: + Define empty libraries for win32 only. + + 2013-01-20 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/debug.c: Modified: scope/docs/scope.html 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -325,7 +325,8 @@ <a name="threads">Threads</a> -Refresh - will not append or remove threads, only update the currently listed +The thread list is updated by asynchronous gdb messages. Normally you should not need to +refresh it, and Refresh won't append or remove threads, only update the current ones. Synchronize - refresh and select the current gdb thread. Shift-click: Modified: scope/src/break.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1162,7 +1162,7 @@ static gboolean on_break_query_tooltip(G_GNUC_UNUSED GtkWidget *widget, gint x, has_tip = TRUE; g_free(file); } - + if (func) { if (has_tip) Modified: scope/src/debug.c 35 files changed, 23 insertions(+), 12 deletions(-) =================================================================== @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include "common.h" +#include <glibconfig.h> #ifdef G_OS_UNIX #include <sys/types.h> @@ -31,32 +31,43 @@ #else /* G_OS_UNIX */ #include <windows.h> -static int waitpid(HANDLE pid, int *stat_loc) -{ - DWORD status; +#define WNOHANG 0 - if (GetExitCodeProcess(pid, &status)) +static int waitpid(HANDLE pid, int *stat_loc, int options) +{ + if (options == WNOHANG) { - if (status == STILL_ACTIVE) - return 0; + DWORD status; + + if (GetExitCodeProcess(pid, &status)) + { + if (status == STILL_ACTIVE) + return 0; - if (stat_loc) - *stat_loc = status; - return 1; + if (stat_loc) + *stat_loc = status; + return 1; + } } + errno = EINVAL; return -1; } -#define waitpid(pid, stat_loc, options) waitpid((pid), (stat_loc)) #define SIGKILL 9 static int kill(HANDLE pid, int sig) { - return TerminateProcess(pid, sig) ? 0 : -1; + if (TerminateProcess(pid, sig)) + return 0; + + errno = EINVAL; + return -1; } #endif /* G_OS_UNIX */ +#include "common.h" + extern guint thread_count; extern guint thread_prompt; Modified: scope/wscript_build 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -25,11 +25,11 @@ from build.wafutils import build_plugin, target_is_win32 name = 'Scope' includes = ['scope/src'] -libraries = [] if target_is_win32(bld): datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' docdir = '${G_PREFIX}/doc/plugins/scope' + libraries = [] else: datadir = '${GEANYPLUGINS_DATADIR}' docdir = '${DOCDIR}/scope' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fd233b: Merge pull request #77 from vkochan/scope_win32_build_fix
by Frank Lanitz 22 Jan '13

22 Jan '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 22 Jan 2013 09:33:01 UTC Commit: fd233b724e7693897c3112dfdea8d60e0ca41bcb https://github.com/geany/geany-plugins/commit/fd233b724e7693897c3112dfdea8d… Log Message: ----------- Merge pull request #77 from vkochan/scope_win32_build_fix wscript_build was failed on win32 OS. Please further test it on Windows Modified Paths: -------------- scope/wscript_build Modified: scope/wscript_build 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -25,6 +25,7 @@ from build.wafutils import build_plugin, target_is_win32 name = 'Scope' includes = ['scope/src'] +libraries = [] if target_is_win32(bld): datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e840db: wscript_build was failed on win32 OS.
by vkochan 22 Jan '13

22 Jan '13

Branch: refs/heads/master Author: vkochan <vadim4j(a)gmail.com> Committer: vkochan <vadim4j(a)gmail.com> Date: Tue, 22 Jan 2013 09:27:25 UTC Commit: e840db66a6e787a39d42f6ffb6c739d52eee87e0 https://github.com/geany/geany-plugins/commit/e840db66a6e787a39d42f6ffb6c73… Log Message: ----------- wscript_build was failed on win32 OS. "libraries" variable was missed. Modified Paths: -------------- scope/wscript_build Modified: scope/wscript_build 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -25,6 +25,7 @@ from build.wafutils import build_plugin, target_is_win32 name = 'Scope' includes = ['scope/src'] +libraries = [] if target_is_win32(bld): datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d63ea1: scope - memory leaks and other fixes, tips about Memory
by Dimitar Zhekov 20 Jan '13

20 Jan '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sun, 20 Jan 2013 19:06:58 UTC Commit: d63ea124412de54da2502670179e9338a8d25c6c https://github.com/geany/geany-plugins/commit/d63ea124412de54da2502670179e9… Log Message: ----------- scope - memory leaks and other fixes, tips about Memory Modified Paths: -------------- scope/ChangeLog scope/NOTES scope/docs/scope.html scope/src/break.c scope/src/debug.c scope/src/gtk216.c scope/src/inspect.c scope/src/local.c scope/src/memory.c scope/src/menu.c scope/src/scope.c scope/src/stack.c scope/src/stack.h scope/src/thread.c scope/src/thread.h scope/src/utils.c scope/src/utils.h scope/src/views.c scope/src/views.h scope/src/watch.c Modified: scope/ChangeLog 36 files changed, 28 insertions(+), 8 deletions(-) =================================================================== @@ -1,3 +1,30 @@ +2013-01-20 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/debug.c: + Reduced dependency of win32 waitpid()/kill() emulation on glib. + * src/thread.c: + Change frame id to 0 or none immediately after thread change. + * src/stack.c: + Select frame 0 instead of the first available if the current frame + is no longer valid. + * src/local.c, src/views.c, src/views.h, src/watch.c: + Skip stack update if frame 0 for watches only. + * src/stack.c: + Select and focus only if the current frame is not valid any more. + * docs/scope.html: + Added tips about Memory. + * src/memory.c: + Distinguish between memory Clear and auto clear. + Fixed menu extra state bug. + * src/views.c: + Mark memory as auto clear. + * src/break.c, src/inspect.c, src/local.c, src/menu.c, src/stack.c, + src/thread.c, src/views.c, src/utils.c, src/watch.c: + Free string values returned by gtk_tree_model_get(). + * docs/scope.html, src/scope.c: + Increased version to 0.83. + + 2013-01-15 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, docs/codes.html, docs/scope.html, src/common.h, @@ -43,23 +70,16 @@ * src/debug.c, src/scope.c: Ask user whether to terminate debugging on build actions. - * src/debug.c: Ignore "Auto run/exit" on Terminate if neither an executable nor a load script is specified. - - -2013-01-02 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> - * docs/codes.html, src/inspect.c, src/inspect.h, src/local.c, src/local.h, src/menu.c, src/menu.h, src/parse.c, src/views.c, src/views.h, src/watch.c, src/watch.h: Unified/simplified all "modified" tokens. The original version was an overkill, and did not update all possible value references. - * src/thread.c: Small "modified" tokens unification related changes. - * docs/scope.html, src/scope.c: Increased version to 0.80. @@ -140,7 +160,7 @@ * src/common.h, src/menu.h: Fixed forward declarations (though my gcc accepts them). * src/menu.c, src/tooltip.c, src/views.c, src/views.h: - Clear scid_gen on program exit. No real risk of overflow, + Clear scid_gen on program exit. No real risk of overflow, but smaller values look better in Debug Console. * src/menu.c: Position cursor in modify dialog after " = ". Modified: scope/NOTES 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +when switching to stack...memory and update is not possible, the subpage +contents will be kept if an update command for this page was sent on the +last thread stop/changed; otherwise it'll be cleared + "^done,value=\"", '7' matches 07-var-assign, handled later as "^done", '7' the only way to fix unnecessary inspect drop target expansion is to block Modified: scope/docs/scope.html 19 files changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -47,6 +47,7 @@ <li><a href="#stack">Stack</a></li> <li><a href="#local">Locals</a></li> <li><a href="#watch">Watches</a></li> + <li><a href="#memory">Memory</a></li> <li><a href="#local_watch">Locals/Watches</a></li> <li><a href="#console">Debug Console</a></li> </ul></li> @@ -425,6 +426,19 @@ Show .names - display member names. Shift+Click resets it to the value specified in Setup Program. +<a name="memory">Memory</a> + +Group by is for visual convinience only and ignores endian. + +Groups are not wrapped, so with Group by > 1, less than +memory_line_bytes may be displayed. + +A maximum of 16K may be displayed (128 lines * 128 bytes); gdb_buffer_length also +limits the size. + +Memory empty but Clear available means that the subpage can not be +updated ATM; if you explicitly Clear it, no further updates will take place. + <a name="console">Debug Console</a> <div><table> @@ -537,6 +551,9 @@ pref_tooltips_length - maximum length of a tooltip message, 0 = unlimited. Default = 2048. +memory_line_bytes - maximum bytes per Memory line. + + [terminal] (*nix only) width, height - VTE widget (not terminal window) size @@ -686,7 +703,7 @@ <a name="copyright">Copyright</a> -Scope 0.82, Copyright (C) 2013 Dimitar Toshkov Zhekov +Scope 0.83, 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/break.c 111 files changed, 76 insertions(+), 35 deletions(-) =================================================================== @@ -50,7 +50,7 @@ enum static gint break_id_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, G_GNUC_UNUSED gpointer gdata) { - const char *s1, *s2; + char *s1, *s2; gint result; gtk_tree_model_get(model, a, BREAK_ID, &s1, -1); @@ -67,6 +67,8 @@ static gint break_id_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b result = atoi(p1 + (*p1 == '.')) - atoi(p2 + (*p2 == '.')); } + g_free(s1); + g_free(s2); return result; } @@ -136,13 +138,14 @@ static void break_type_set_data_func(G_GNUC_UNUSED GtkTreeViewColumn *column, static void break_mark(GtkTreeIter *iter, gboolean mark) { - const char *file; + char *file; gint line; gboolean enabled; gtk_tree_model_get(model, iter, BREAK_FILE, &file, BREAK_LINE, &line, BREAK_ENABLED, &enabled, -1); utils_mark(file, line, mark, MARKER_BREAKPT + enabled); + g_free(file); } static void break_enable(GtkTreeIter *iter, gboolean enable) @@ -157,7 +160,7 @@ static void on_break_enabled_toggled(G_GNUC_UNUSED GtkCellRendererToggle *render { GtkTreeIter iter; DebugState state = debug_state(); - const char *id; + char *id; gint scid; gboolean enabled; @@ -177,6 +180,8 @@ static void on_break_enabled_toggled(G_GNUC_UNUSED GtkCellRendererToggle *render } else plugin_beep(); + + g_free(id); } #define EDITCOLS 3 @@ -193,7 +198,7 @@ static void on_break_column_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, gint index = GPOINTER_TO_INT(gdata) - 1; const gchar *set_text = validate_column(new_text, index > 0); GtkTreeIter iter; - const char *id; + char *id; char type; gtk_tree_model_get_iter_from_string(model, &iter, path_str); @@ -211,6 +216,8 @@ static void on_break_column_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, gtk_list_store_set(store, &iter, index + BREAK_IGNORE, set_text, -1); else plugin_beep(); + + g_free(id); } static void on_break_ignore_editing_started(G_GNUC_UNUSED GtkCellRenderer *cell, @@ -273,7 +280,7 @@ static void append_script_command(const ParseNode *node, GString *string) static void break_iter_applied(GtkTreeIter *iter, const char *id) { - const gchar *columns[EDITCOLS]; + gchar *columns[EDITCOLS]; gboolean enabled; char type; gint index; @@ -284,7 +291,11 @@ static void break_iter_applied(GtkTreeIter *iter, const char *id) if (strchr(BP_BORTS, type)) { if (strchr(BP_BREAKS, type)) + { + g_free(columns[0]); columns[0] = NULL; + } + g_free(columns[1]); columns[1] = NULL; } else if (!enabled) @@ -300,6 +311,7 @@ static void break_iter_applied(GtkTreeIter *iter, const char *id) locale); g_free(locale); } + g_free(columns[index]); } } @@ -497,9 +509,9 @@ static void break_apply(GtkTreeIter *iter, gboolean thread) GString *command = g_string_sized_new(0x1FF); gint scid; char type; - const char *ignore, *location; + char *ignore, *location; gboolean enabled, pending, temporary; - const gchar *cond; + gchar *cond; gboolean borts; gtk_tree_model_get(model, iter, BREAK_SCID, &scid, BREAK_TYPE, &type, BREAK_ENABLED, @@ -547,6 +559,9 @@ static void break_apply(GtkTreeIter *iter, gboolean thread) g_string_append_printf(command, " %s", location); debug_send_command(F, command->str); g_string_free(command, TRUE); + g_free(ignore); + g_free(location); + g_free(cond); } static void break_clear(GtkTreeIter *iter) @@ -573,7 +588,7 @@ static gboolean break_remove_all(const char *pref, gboolean force) while (valid) { - const char *id; + char *id; gboolean discard; gtk_tree_model_get(model, &iter, BREAK_ID, &id, BREAK_DISCARD, &discard, -1); @@ -585,12 +600,14 @@ static gboolean break_remove_all(const char *pref, gboolean force) if (discard || force) { valid = break_remove(&iter); + g_free(id); continue; } break_clear(&iter); } + g_free(id); valid = gtk_tree_model_iter_next(model, &iter); } @@ -641,21 +658,23 @@ static void breaks_missing(void) while (valid) { - const char *id; + char *id; gboolean discard, missing; gtk_tree_model_get(model, &iter, BREAK_ID, &id, BREAK_DISCARD, &discard, BREAK_MISSING, &missing, -1); + g_free(id); if (id && missing) { if (discard) { valid = break_remove(&iter); + g_free(id); continue; } - else - break_clear(&iter); + + break_clear(&iter); } valid = gtk_tree_model_iter_next(model, &iter); @@ -739,7 +758,7 @@ void on_break_features(GArray *nodes) static void break_delete(GtkTreeIter *iter) { - const char *id; + char *id; gtk_tree_model_get(model, iter, BREAK_ID, &id, -1); @@ -747,11 +766,13 @@ static void break_delete(GtkTreeIter *iter) break_remove(iter); else debug_send_format(N, "023%s-break-delete %s", id, id); + + g_free(id); } static void break_iter_mark(GtkTreeIter *iter, GeanyDocument *doc) { - const char *file; + char *file; gint line; gboolean enabled; @@ -760,6 +781,7 @@ static void break_iter_mark(GtkTreeIter *iter, GeanyDocument *doc) if (line && !utils_filenamecmp(file, doc->real_path)) sci_set_marker_at_line(doc->editor->sci, line - 1, MARKER_BREAKPT + enabled); + g_free(file); } void breaks_mark(GeanyDocument *doc) @@ -843,10 +865,10 @@ void breaks_delta(ScintillaObject *sci, const char *real_path, gint start, gint while (valid) { - const char *file; + char *file; gint line; gboolean enabled; - const char *location; + char *location; gtk_tree_model_get(model, &iter, BREAK_FILE, &file, BREAK_LINE, &line, BREAK_ENABLED, &enabled, BREAK_LOCATION, &location, -1); @@ -872,21 +894,26 @@ void breaks_delta(ScintillaObject *sci, const char *real_path, gint start, gint { sci_delete_marker_at_line(sci, start, MARKER_BREAKPT + enabled); valid = gtk_list_store_remove(store, &iter); + g_free(file); + g_free(location); continue; } } + g_free(file); + g_free(location); valid = gtk_tree_model_iter_next(model, &iter); } } static void break_iter_check(GtkTreeIter *iter, guint *active) { - const char *id; + char *id; gboolean enabled; gtk_tree_model_get(model, iter, BREAK_ID, &id, BREAK_ENABLED, &enabled, -1); *active += enabled && id; + g_free(id); } guint breaks_active(void) @@ -902,11 +929,11 @@ void on_break_toggle(G_GNUC_UNUSED const MenuItem *menu_item) gint doc_line = utils_current_line(doc); GtkTreeIter iter, iter1; gboolean valid = gtk_tree_model_get_iter_first(model, &iter); - const char *found = NULL; + gint found = 0; while (valid) { - const char *id, *file; + char *id, *file; gint line; gtk_tree_model_get(model, &iter, BREAK_ID, &id, BREAK_FILE, &file, BREAK_LINE, @@ -914,19 +941,23 @@ void on_break_toggle(G_GNUC_UNUSED const MenuItem *menu_item) if (line == doc_line && !utils_filenamecmp(file, doc->real_path)) { - if (found && atoi(found) != utils_atoi0(id)) + if (found && found != utils_atoi0(id)) { dialogs_show_msgbox(GTK_MESSAGE_INFO, _("There are two or more breakpoints at %s:%d.\n" "Use the breakpoint list to remove the exact one."), doc->file_name, doc_line); + g_free(id); + g_free(file); return; } - found = id ? id : "-1"; + found = id ? atoi(id) : -1; iter1 = iter; } + g_free(id); + g_free(file); valid = gtk_tree_model_iter_next(model, &iter); } @@ -1030,22 +1061,26 @@ void breaks_load(GKeyFile *config) static gboolean break_save(GKeyFile *config, const char *section, GtkTreeIter *iter) { - guint i; - gint line; - char type; - gboolean enabled, pending, discard, run_apply, temporary; - const char *strings[STRING_COUNT]; + gboolean discard; - gtk_tree_model_get(model, iter, BREAK_FILE, &strings[STRING_FILE], BREAK_LINE, &line, - BREAK_TYPE, &type, BREAK_ENABLED, &enabled, BREAK_DISPLAY, - &strings[STRING_DISPLAY], BREAK_FUNC, &strings[STRING_FUNC], BREAK_IGNORE, - &strings[STRING_IGNORE], BREAK_COND, &strings[STRING_COND], BREAK_SCRIPT, - &strings[STRING_SCRIPT], BREAK_PENDING, &pending, BREAK_DISCARD, &discard, - BREAK_LOCATION, &strings[STRING_LOCATION], BREAK_RUN_APPLY, &run_apply, - BREAK_TEMPORARY, &temporary, -1); + gtk_tree_model_get(model, iter, BREAK_DISCARD, &discard, -1); if (!discard) { + guint i; + gint line; + char type; + gboolean enabled, pending, run_apply, temporary; + char *strings[STRING_COUNT]; + + gtk_tree_model_get(model, iter, BREAK_FILE, &strings[STRING_FILE], BREAK_LINE, + &line, BREAK_TYPE, &type, BREAK_ENABLED, &enabled, BREAK_DISPLAY, + &strings[STRING_DISPLAY], BREAK_FUNC, &strings[STRING_FUNC], BREAK_IGNORE, + &strings[STRING_IGNORE], BREAK_COND, &strings[STRING_COND], BREAK_SCRIPT, + &strings[STRING_SCRIPT], BREAK_PENDING, &pending, BREAK_LOCATION, + &strings[STRING_LOCATION], BREAK_RUN_APPLY, &run_apply, BREAK_TEMPORARY, + &temporary, -1); + if (line) g_key_file_set_integer(config, section, "line", line); else @@ -1059,7 +1094,7 @@ static gboolean break_save(GKeyFile *config, const char *section, GtkTreeIter *i for (i = 0; i < STRING_COUNT; i++) { if (strings[i]) - g_key_file_set_string(config, section, string_names[i], strings[i]); + utils_key_file_set_string(config, section, string_names[i], strings[i]); else g_key_file_remove_key(config, section, string_names[i], NULL); } @@ -1089,7 +1124,7 @@ static void on_break_selection_changed(GtkTreeSelection *selection, if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *id; + char *id; gboolean editable; gint index; @@ -1097,6 +1132,7 @@ static void on_break_selection_changed(GtkTreeSelection *selection, editable = !id || !strchr(id, '.'); for (index = 0; index < EDITCOLS; index++) g_object_set(block_cells[index], "editable", editable, NULL); + g_free(id); } } @@ -1124,13 +1160,16 @@ static gboolean on_break_query_tooltip(G_GNUC_UNUSED GtkWidget *widget, gint x, if (line) g_string_append_printf(text, ":%d", line); has_tip = TRUE; + g_free(file); } + if (func) { if (has_tip) g_string_append(text, ", "); g_string_append(text, func); has_tip = TRUE; + g_free(func); } gtk_tooltip_set_text(tooltip, text->str); @@ -1255,9 +1294,11 @@ static guint break_menu_extra_state(void) if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *id, *file; + char *id, *file; gtk_tree_model_get(model, &iter, BREAK_ID, &id, BREAK_FILE, &file, -1); + g_free(id); + g_free(file); return (!id << DS_INDEX_1) | ((file != NULL) << DS_INDEX_2) | ((!id || !strchr(id, '.')) << DS_INDEX_3); Modified: scope/src/debug.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -31,9 +31,7 @@ #else /* G_OS_UNIX */ #include <windows.h> -#define WNOHANG 0 - -static int waitpid(GPid pid, int *stat_loc, G_GNUC_UNUSED int options) +static int waitpid(HANDLE pid, int *stat_loc) { DWORD status; @@ -49,10 +47,11 @@ static int waitpid(GPid pid, int *stat_loc, G_GNUC_UNUSED int options) return -1; } +#define waitpid(pid, stat_loc, options) waitpid((pid), (stat_loc)) #define SIGKILL 9 -static int kill(GPid pid, int sig) +static int kill(HANDLE pid, int sig) { return TerminateProcess(pid, sig) ? 0 : -1; } Modified: scope/src/gtk216.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -31,10 +31,10 @@ static ArraySize *find_array_size(GArray *array) { - guint i; - gchar *data = array_sizes->data; + gchar *end = array_sizes->data + sizeof(ArraySize) * array>len; + gchar *data; - for (i = 0; i < array_sizes->len; i++, data += sizeof(ArraySize)) + for (data = array_sizes->data; data < end; data += sizeof(ArraySize)) if (*(GArray **) data == array) return (ArraySize *) data; Modified: scope/src/inspect.c 110 files changed, 72 insertions(+), 38 deletions(-) =================================================================== @@ -92,13 +92,16 @@ static gboolean inspect_find_recursive(GtkTreeIter *iter, gint i, const char *ke } else { - const char *var1; + char *var1; size_t len; + gboolean match; gtk_tree_model_get(model, iter, INSPECT_VAR1, &var1, -1); len = var1 ? strlen(var1) : 0; + match = var1 && !strncmp(key, var1, len); + g_free(var1); - if (var1 && !strncmp(key, var1, len)) + if (match) { if (key[len] == '\0') return TRUE; @@ -150,9 +153,8 @@ static gint inspect_get_scid(GtkTreeIter *iter) static void inspect_expand(GtkTreeIter *iter) { - const char *var1; + char *var1, *s; gint scid, start, count, numchild; - gchar *s; scid = inspect_get_scid(iter); gtk_tree_model_get(model, iter, INSPECT_VAR1, &var1, INSPECT_START, &start, @@ -160,6 +162,7 @@ static void inspect_expand(GtkTreeIter *iter) s = g_strdup_printf("%d", start); debug_send_format(N, "07%c%d%d-var-list-children 1 %s %d %d", '0' + (int) strlen(s) - 1, start, scid, var1, start, count ? start + count : numchild); + g_free(var1); g_free(s); } @@ -174,7 +177,7 @@ static void on_jump_to_menu_item_activate(GtkMenuItem *menuitem, G_GNUC_UNUSED g static GtkWidget *jump_to_item; static GtkContainer *jump_to_menu; -static const gchar *jump_to_expr; +static gchar *jump_to_expr = NULL; static void on_inspect_row_inserted(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, G_GNUC_UNUSED gpointer gdata) @@ -184,6 +187,7 @@ static void on_inspect_row_inserted(GtkTreeModel *model, GtkTreePath *path, GtkT GtkWidget *item; const gint *index = gtk_tree_path_get_indices(path); + g_free(jump_to_expr); gtk_tree_model_get(model, iter, INSPECT_EXPR, &jump_to_expr, -1); item = gtk_menu_item_new_with_label(jump_to_expr ? jump_to_expr : ""); gtk_widget_show(item); @@ -343,8 +347,7 @@ void on_inspect_children(GArray *nodes) if (inspect_find(&iter, FALSE, token + size)) { - gint from, numchild, end; - const char *var1; + gint from; GtkTreePath *path = gtk_tree_model_get_path(model, &iter); token[size] = '\0'; @@ -355,6 +358,9 @@ void on_inspect_children(GArray *nodes) append_stub(&iter, _("no children in range"), FALSE); else { + gint numchild, end; + char *var1; + if (from) append_ellipsis(&iter, FALSE); @@ -369,6 +375,7 @@ void on_inspect_children(GArray *nodes) debug_send_format(N, "04-var-set-update-range %s %d %d", var1, from, end); } + g_free(var1); if (nodes->len ? end < numchild : !from) append_ellipsis(&iter, FALSE); @@ -470,14 +477,16 @@ void on_inspect_changelist(GArray *nodes) static void inspect_apply(GtkTreeIter *iter) { gint scid; - const gchar *expr; - const char *name, *frame; - char *locale; + gchar *expr; + char *name, *frame, *locale; gtk_tree_model_get(model, iter, INSPECT_EXPR, &expr, INSPECT_SCID, &scid, INSPECT_NAME, &name, INSPECT_FRAME, &frame, -1); locale = utils_get_locale_from_utf8(expr); debug_send_format(F, "07%d-var-create %s %s %s", scid, name, frame, locale); + g_free(expr); + g_free(name); + g_free(frame); g_free(locale); } @@ -489,9 +498,10 @@ void on_inspect_signal(const char *name) { iff (model_find(model, &iter, INSPECT_NAME, name), "%s: var not found", name) { - const char *var1; + char *var1; gtk_tree_model_get(model, &iter, INSPECT_VAR1, &var1, -1); + g_free(var1); iff (!var1, "%s: already applied", name) inspect_apply(&iter); @@ -521,7 +531,7 @@ gboolean inspects_current(void) static void inspect_iter_apply(GtkTreeIter *iter, G_GNUC_UNUSED gpointer gdata) { - const char *frame; + char *frame; gboolean run_apply; gtk_tree_model_get(model, iter, INSPECT_FRAME, &frame, INSPECT_RUN_APPLY, &run_apply, @@ -529,6 +539,7 @@ static void inspect_iter_apply(GtkTreeIter *iter, G_GNUC_UNUSED gpointer gdata) if (run_apply && !isdigit(*frame)) inspect_apply(iter); + g_free(frame); } void inspects_apply(void) @@ -640,7 +651,7 @@ void inspects_update_state(DebugState state) static gboolean last_active = FALSE; gboolean active = state != DS_INACTIVE; GtkTreeIter iter; - const char *var1 = NULL; + char *var1 = NULL; gint numchild = 0; if ((state & DS_SENDABLE) && gtk_tree_selection_get_selected(selection, NULL, &iter)) @@ -649,6 +660,7 @@ void inspects_update_state(DebugState state) -1); } g_object_set(inspect_display, "editable", var1 && !numchild, NULL); + g_free(var1); if (active != last_active) { @@ -707,18 +719,18 @@ void inspects_load(GKeyFile *config) static gboolean inspect_save(GKeyFile *config, const char *section, GtkTreeIter *iter) { gint hb_mode, start, count, format; - const char *name, *frame; - const gchar *expr; + char *name, *frame; + gchar *expr; gboolean run_apply, expand; gtk_tree_model_get(model, iter, INSPECT_EXPR, &expr, INSPECT_HB_MODE, &hb_mode, INSPECT_NAME, &name, INSPECT_FRAME, &frame, INSPECT_RUN_APPLY, &run_apply, INSPECT_START, &start, INSPECT_COUNT, &count, INSPECT_EXPAND, &expand, INSPECT_FORMAT, &format, -1); - g_key_file_set_string(config, section, "name", name); - g_key_file_set_string(config, section, "expr", expr); + utils_key_file_set_string(config, section, "name", name); + utils_key_file_set_string(config, section, "expr", expr); g_key_file_set_integer(config, section, "hbit", hb_mode); - g_key_file_set_string(config, section, "frame", frame); + utils_key_file_set_string(config, section, "frame", frame); g_key_file_set_boolean(config, section, "run_apply", run_apply); g_key_file_set_integer(config, section, "start", start); g_key_file_set_integer(config, section, "count", count); @@ -740,26 +752,25 @@ static void on_inspect_refresh(G_GNUC_UNUSED const MenuItem *menu_item) static void on_inspect_add(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const gchar *expr = NULL; + gchar *expr = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) gtk_tree_model_get(model, &iter, INSPECT_PATH_EXPR, &expr, -1); inspect_add(expr); + g_free(expr); } static void on_inspect_edit(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const gchar *expr; - char *name; - const char *frame; + gchar *expr; + char *name, *frame; gboolean run_apply; gtk_tree_selection_get_selected(selection, NULL, &iter); gtk_tree_model_get(model, &iter, INSPECT_EXPR, &expr, INSPECT_NAME, &name, INSPECT_FRAME, &frame, INSPECT_RUN_APPLY, &run_apply, -1); - name = strdup(name); gtk_tree_store_set(store, &iter, INSPECT_NAME, "-", -1); /* for duplicate name check */ gtk_entry_set_text(inspect_expr, expr); @@ -770,26 +781,32 @@ static void on_inspect_edit(G_GNUC_UNUSED const MenuItem *menu_item) if (gtk_dialog_run(GTK_DIALOG(inspect_dialog)) == GTK_RESPONSE_ACCEPT) { + g_free(jump_to_expr); jump_to_expr = NULL; inspect_dialog_store(&iter); } else gtk_tree_store_set(store, &iter, INSPECT_NAME, name, -1); + g_free(expr); g_free(name); + g_free(frame); } static void on_inspect_apply(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const char *var1; + char *var1; gint scid; gtk_tree_selection_get_selected(selection, NULL, &iter); gtk_tree_model_get(model, &iter, INSPECT_SCID, &scid, INSPECT_VAR1, &var1, -1); if (var1) + { debug_send_format(N, "070%d-var-delete %s", scid, var1); + g_free(var1); + } else inspect_apply(&iter); } @@ -802,7 +819,7 @@ static void on_inspect_apply(G_GNUC_UNUSED const MenuItem *menu_item) static void on_inspect_expand(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const char *name; + char *name; gint start, count; gboolean expand; @@ -813,6 +830,7 @@ static void on_inspect_expand(G_GNUC_UNUSED const MenuItem *menu_item) gtk_spin_button_set_value(expand_count, count); gtk_toggle_button_set_active(expand_automatic, expand); gtk_widget_set_sensitive(GTK_WIDGET(expand_automatic), name != NULL); + g_free(name); if (gtk_dialog_run(GTK_DIALOG(expand_dialog)) == GTK_RESPONSE_ACCEPT) { @@ -842,7 +860,7 @@ static void on_inspect_format_update(const MenuItem *menu_item) { GtkTreeIter iter; gint format = GPOINTER_TO_INT(menu_item->gdata); - const char *var1; + char *var1; gtk_tree_selection_get_selected(selection, NULL, &iter); gtk_tree_model_get(model, &iter, INSPECT_VAR1, &var1, -1); @@ -851,6 +869,7 @@ static void on_inspect_format_update(const MenuItem *menu_item) { debug_send_format(N, "07%d-var-set-format %s %s", inspect_get_scid(&iter), var1, inspect_formats[format]); + g_free(var1); } else gtk_tree_store_set(store, &iter, INSPECT_FORMAT, format, -1); @@ -863,20 +882,21 @@ static void on_inspect_hbit_display(const MenuItem *menu_item) static void inspect_hbit_update_iter(GtkTreeIter *iter, gint hb_mode) { - const char *value; + char *value; gchar *display; gtk_tree_model_get(model, iter, INSPECT_VALUE, &value, -1); display = utils_get_display_from_7bit(value, hb_mode); gtk_tree_store_set(store, iter, INSPECT_HB_MODE, hb_mode, value ? INSPECT_DISPLAY : -1, display, -1); + g_free(value); g_free(display); } static void on_inspect_hbit_update(const MenuItem *menu_item) { GtkTreeIter iter; - const char *expr, *name; + char *expr, *name; gint hb_mode = GPOINTER_TO_INT(menu_item->gdata); gtk_tree_selection_get_selected(selection, NULL, &iter); @@ -892,18 +912,24 @@ static void on_inspect_hbit_update(const MenuItem *menu_item) inspect_hbit_update_iter(&iter, hb_mode); g_free(reverse); } + + g_free(expr); + g_free(name); } static void on_inspect_delete(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const char *var1; + char *var1; gtk_tree_selection_get_selected(selection, NULL, &iter); gtk_tree_model_get(model, &iter, INSPECT_VAR1, &var1, -1); if (var1) + { debug_send_format(N, "071%d-var-delete %s", inspect_get_scid(&iter), var1); + g_free(var1); + } else gtk_tree_store_remove(store, &iter); } @@ -942,19 +968,20 @@ static void on_inspect_delete(G_GNUC_UNUSED const MenuItem *menu_item) static guint inspect_menu_extra_state(void) { GtkTreeIter iter; - guint state = gtk_tree_selection_get_selected(selection, NULL, &iter) << DS_INDEX_1; - if (state) + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *var1, *name; + char *var1, *name; gint numchild; gtk_tree_model_get(model, &iter, INSPECT_VAR1, &var1, INSPECT_NAME, &name, INSPECT_NUMCHILD, &numchild, -1); + g_free(var1); + g_free(name); if (name || var1) { - return state | ((name && !var1) << DS_INDEX_2) | + return (1 << DS_INDEX_1) | ((name && !var1) << DS_INDEX_2) | ((name != NULL) << DS_INDEX_3) | ((numchild != 0) << DS_INDEX_4); } } @@ -968,7 +995,7 @@ static void on_inspect_selection_changed(G_GNUC_UNUSED GtkTreeSelection *selecti G_GNUC_UNUSED gpointer gdata) { GtkTreeIter iter; - const char *name = NULL; + char *name = NULL; if (gtk_widget_get_visible(inspect_dialog)) gtk_widget_hide(inspect_dialog); @@ -977,20 +1004,22 @@ static void on_inspect_selection_changed(G_GNUC_UNUSED GtkTreeSelection *selecti if (gtk_tree_selection_get_selected(selection, NULL, &iter)) gtk_tree_model_get(model, &iter, INSPECT_NAME, &name, -1); - gtk_tree_view_set_reorderable(tree, name != NULL); + gtk_tree_view_set_reorderable(tree, name != NULL); inspects_update_state(debug_state()); + g_free(name); } static gboolean inspect_test_expand_row(G_GNUC_UNUSED GtkTreeView *tree_view, GtkTreeIter *iter, G_GNUC_UNUSED GtkTreePath *path, G_GNUC_UNUSED gpointer gdata) { GtkTreeIter child; - const char *var1; + char *var1; gboolean expand; gtk_tree_model_iter_children(model, &child, iter); gtk_tree_model_get(model, &child, INSPECT_VAR1, &var1, INSPECT_EXPAND, &expand, -1); + g_free(var1); if (var1 || !expand) return FALSE; @@ -1038,11 +1067,12 @@ gboolean on_inspect_drag_motion(G_GNUC_UNUSED GtkWidget *widget, if (gtk_tree_view_get_dest_row_at_pos(tree, x, y, &path, &pos)) { GtkTreeIter iter; - const char *name; + char *name; gtk_tree_model_get_iter(model, &iter, path); gtk_tree_path_free(path); gtk_tree_model_get(model, &iter, INSPECT_NAME, &name, -1); + g_free(name); if (!name || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE || pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) @@ -1060,7 +1090,7 @@ static void on_inspect_menu_show(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *var1, *path_expr; + char *var1, *path_expr; gtk_tree_model_get(model, &iter, INSPECT_VAR1, &var1, INSPECT_PATH_EXPR, &path_expr, -1); @@ -1071,6 +1101,9 @@ static void on_inspect_menu_show(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED debug_send_format(N, "04%d-var-info-path-expression %s", inspect_get_scid(&iter), var1); } + + g_free(var1); + g_free(path_expr); } } @@ -1137,4 +1170,5 @@ void inspect_finalize(void) gtk_widget_destroy(inspect_page); gtk_widget_destroy(inspect_dialog); gtk_widget_destroy(expand_dialog); + g_free(jump_to_expr); } Modified: scope/src/local.c 9 files changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -89,15 +89,11 @@ void on_local_variables(GArray *nodes) if (thread_id && frame_id && len == strlen(thread_id) && !memcmp(++token, thread_id, len) && !strcmp(token + len, frame_id)) { - char *name = NULL; GtkTreeIter iter; LocalData ld = { NULL, stack_entry() }; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - { gtk_tree_model_get(model, &iter, LOCAL_NAME, &ld.name, -1); - name = g_strdup(name); - } locals_clear(); array_foreach(parse_lead_array(nodes), (GFunc) local_node_variable, &ld); @@ -118,7 +114,7 @@ static void local_send_update(char token) gboolean locals_update(void) { - if (view_select_frame()) + if (view_stack_update()) return FALSE; if (frame_id) @@ -160,11 +156,12 @@ static void on_local_modify(const MenuItem *menu_item) static void on_local_watch(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const char *name; + char *name; gtk_tree_selection_get_selected(selection, NULL, &iter); gtk_tree_model_get(model, &iter, LOCAL_NAME, &name, -1); watch_add(name); + g_free(name); } static void on_local_inspect(G_GNUC_UNUSED const MenuItem *menu_item) Modified: scope/src/memory.c 24 files changed, 14 insertions(+), 10 deletions(-) =================================================================== @@ -41,7 +41,7 @@ static void on_memory_bytes_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, if (*new_text && (debug_state() & DS_SENDABLE)) { GtkTreeIter iter; - const char *addr, *bytes; + char *addr, *bytes; guint i; gtk_tree_model_get_iter_from_string(model, &iter, path_str); @@ -58,6 +58,9 @@ static void on_memory_bytes_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, utils_strchrepl(new_text, ' ', '\0'); debug_send_format(T, "07-data-write-memory-bytes 0x%s%s", addr, new_text); } + + g_free(addr); + g_free(bytes); } else plugin_blink(); @@ -232,12 +235,10 @@ void on_memory_read_bytes(GArray *nodes) char *addr = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - { gtk_tree_model_get(model, &iter, MEMORY_ADDR, &addr, -1); - addr = strdup(addr); - } - memory_clear(); + gtk_list_store_clear(store); + memory_count = 0; if (pref_memory_bytes_per_line != back_bytes_per_line) { @@ -261,7 +262,6 @@ void on_memory_read_bytes(GArray *nodes) void memory_clear(void) { gtk_list_store_clear(store); - memory_count = 0; } gboolean memory_update(void) @@ -304,8 +304,8 @@ static void on_memory_copy(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeModel *model; GtkTreeIter iter; - const char *addr, *bytes; - const gchar *ascii; + char *addr, *bytes; + gchar *ascii; gchar *string; gtk_tree_selection_get_selected(selection, &model, &iter); @@ -314,12 +314,16 @@ static void on_memory_copy(G_GNUC_UNUSED const MenuItem *menu_item) string = g_strdup_printf("%s%s%s", addr, bytes, ascii); gtk_clipboard_set_text(gtk_widget_get_clipboard(menu_item->widget, GDK_SELECTION_CLIPBOARD), string, -1); + g_free(addr); + g_free(bytes); + g_free(ascii); g_free(string); } static void on_memory_clear(G_GNUC_UNUSED const MenuItem *menu_item) { - memory_clear(); + gtk_list_store_clear(store); + memory_count = 0; } static void on_memory_group_display(const MenuItem *menu_item) @@ -364,7 +368,7 @@ static void on_memory_group_update(const MenuItem *menu_item) static guint memory_menu_extra_state(void) { return (gtk_tree_selection_get_selected(selection, NULL, NULL) << DS_INDEX_1) | - (memory_count != 0) << DS_INDEX_1; + (memory_count != 0) << DS_INDEX_2; } static MenuInfo memory_menu_info = { memory_menu_items, memory_menu_extra_state, 0 }; Modified: scope/src/menu.c 23 files changed, 16 insertions(+), 7 deletions(-) =================================================================== @@ -208,7 +208,7 @@ static void menu_mode_update_iter(GtkTreeModel *model, GtkTreeIter *iter, gint n gboolean hbit) { gint hb_mode, mr_mode; - const char *value; + char *value; gchar *display; gtk_tree_model_get(model, iter, COLUMN_VALUE, &value, COLUMN_HB_MODE, &hb_mode, @@ -222,6 +222,7 @@ static void menu_mode_update_iter(GtkTreeModel *model, GtkTreeIter *iter, gint n display = parse_get_display_from_7bit(value, hb_mode, mr_mode); gtk_list_store_set(GTK_LIST_STORE(model), iter, COLUMN_HB_MODE, hb_mode, COLUMN_MR_MODE, mr_mode, value ? COLUMN_DISPLAY : -1, display, -1); + g_free(value); g_free(display); } @@ -229,7 +230,7 @@ void menu_mode_update(GtkTreeSelection *selection, gint new_mode, gboolean hbit) { GtkTreeModel *model; GtkTreeIter iter; - const char *name; + char *name; gtk_tree_selection_get_selected(selection, &model, &iter); gtk_tree_model_get(model, &iter, COLUMN_NAME, &name, -1); @@ -244,6 +245,7 @@ void menu_mode_update(GtkTreeSelection *selection, gint new_mode, gboolean hbit) menu_mode_update_iter(model, &iter, new_mode, TRUE); g_free(reverse); } + g_free(name); } void menu_mber_display(GtkTreeSelection *selection, const MenuItem *menu_item) @@ -298,8 +300,8 @@ void menu_copy(GtkTreeSelection *selection, const MenuItem *menu_item) { GtkTreeModel *model; GtkTreeIter iter; - const gchar *name, *display; - const char *value; + gchar *name, *display; + char *value; GString *string; gtk_tree_selection_get_selected(selection, &model, &iter); @@ -312,6 +314,10 @@ void menu_copy(GtkTreeSelection *selection, const MenuItem *menu_item) gtk_clipboard_set_text(gtk_widget_get_clipboard(menu_item->widget, GDK_SELECTION_CLIPBOARD), string->str, string->len); + + g_free(name); + g_free(display); + g_free(value); g_string_free(string, TRUE); } @@ -364,8 +370,8 @@ void menu_modify(GtkTreeSelection *selection, const MenuItem *menu_item) { GtkTreeModel *model; GtkTreeIter iter; - const gchar *name; - const char *value; + gchar *name; + char *value; gint hb_mode; gtk_tree_selection_get_selected(selection, &model, &iter); @@ -373,17 +379,20 @@ void menu_modify(GtkTreeSelection *selection, const MenuItem *menu_item) &hb_mode, -1); menu_evaluate_modify(name, value, _("Modify"), hb_mode, menu_item ? MR_MODIFY : MR_MODSTR, "07"); + g_free(name); + g_free(value); } void menu_inspect(GtkTreeSelection *selection) { GtkTreeModel *model; GtkTreeIter iter; - const char *name; + char *name; gtk_tree_selection_get_selected(selection, &model, &iter); gtk_tree_model_get(model, &iter, COLUMN_NAME, &name, -1); inspect_add(name); + g_free(name); } void on_menu_display_booleans(const MenuItem *menu_item) Modified: scope/src/scope.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(215) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Simple GDB front-end."), "0.82" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + _("Simple GDB front-end."), "0.83" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum @@ -602,6 +602,7 @@ void plugin_cleanup(void) thread_finalize(); break_finalize(); memory_finalize(); + stack_finalize(); menu_finalize(); views_finalize(); utils_finalize(); Modified: scope/src/stack.c 66 files changed, 43 insertions(+), 23 deletions(-) =================================================================== @@ -59,12 +59,12 @@ static void stack_node_location(const ParseNode *node, const char *fid) parse_location_free(&loc); if (!g_strcmp0(id, fid)) - utils_tree_set_cursor(selection, &iter, -1); + gtk_tree_selection_select_iter(selection, &iter); } } } -const char *frame_id = NULL; +char *frame_id = NULL; void on_stack_frames(GArray *nodes) { @@ -80,7 +80,7 @@ void on_stack_frames(GArray *nodes) { GtkTreeIter iter; - if (gtk_tree_model_get_iter_first(model, &iter)) + if (model_find(model, &iter, STACK_ID, "0")) utils_tree_set_cursor(selection, &iter, -1); } } @@ -135,10 +135,11 @@ static void stack_node_arguments(const ParseNode *node, ArgsData *ad) { if (ad->valid) { - const char *fid; + char *fid; gtk_tree_model_get(model, &ad->iter, STACK_ID, &fid, -1); ad->valid = !strcmp(id, fid); + g_free(fid); } if (!ad->valid) @@ -223,6 +224,8 @@ static void on_stack_selection_changed(GtkTreeSelection *selection, { GtkTreeIter iter; + g_free(frame_id); + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) gtk_tree_model_get(model, &iter, STACK_ID, &frame_id, -1); else @@ -271,31 +274,41 @@ static void on_stack_show_address(const MenuItem *menu_item) view_column_set_visible("stack_addr_column", stack_show_address); } +typedef struct _EntryData +{ + char *func; + gboolean entry; + gint count; +} EntryData; + +static void stack_iter_show_entry(GtkTreeIter *iter, EntryData *ed) +{ + char *func; + + gtk_tree_model_get(model, iter, STACK_FUNC, &func, -1); + + if (func && !strcmp(func, ed->func)) + { + gtk_list_store_set(store, iter, STACK_ENTRY, ed->entry, -1); + ed->count++; + } + g_free(func); +} + static void on_stack_show_entry(const MenuItem *menu_item) { - gboolean entry = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_item->widget)); + EntryData ed = { NULL, + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_item->widget)), 0 }; GtkTreeIter iter; - const char *func; - guint count = 0; view_dirty(VIEW_LOCALS); gtk_tree_selection_get_selected(selection, NULL, &iter); - gtk_tree_model_get(model, &iter, STACK_FUNC, &func, -1); - parse_mode_update(func, MODE_ENTRY, entry); - gtk_tree_model_get_iter_first(model, &iter); - do - { - const char *func1; + gtk_tree_model_get(model, &iter, STACK_FUNC, &ed.func, -1); + parse_mode_update(ed.func, MODE_ENTRY, ed.entry); + model_foreach(model, (GFunc) stack_iter_show_entry, &ed); + g_free(ed.func); - gtk_tree_model_get(model, &iter, STACK_FUNC, &func1, -1); - if (!strcmp(func, func1)) - { - gtk_list_store_set(store, &iter, STACK_ENTRY, entry, -1); - count++; - } - } while (gtk_tree_model_iter_next(model, &iter)); - - if (count == 1) + if (ed.count == 1) { debug_send_format(T, "04%s-stack-list-arguments 1 %s %s", thread_id, frame_id, frame_id); @@ -324,9 +337,11 @@ static guint stack_menu_extra_state(void) if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *file, *func; + char *file, *func; gtk_tree_model_get(model, &iter, STACK_FILE, &file, STACK_FUNC, &func, -1); + g_free(file); + g_free(func); return ((file != NULL) << DS_INDEX_2) | ((func != NULL) << DS_INDEX_3); } @@ -379,3 +394,8 @@ void stack_init(void) g_signal_connect(get_widget("stack_synchronize"), "button-release-event", G_CALLBACK(on_stack_synchronize_button_release), menu); } + +void stack_finalize(void) +{ + g_free(frame_id); +} Modified: scope/src/stack.h 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -19,7 +19,7 @@ #ifndef STACK_H -extern const char *frame_id; +extern char *frame_id; void on_stack_frames(GArray *nodes); void on_stack_arguments(GArray *nodes); @@ -30,6 +30,7 @@ gboolean stack_update(void); void stack_init(void); +void stack_finalize(void); #define STACK_H 1 #endif Modified: scope/src/thread.c 85 files changed, 60 insertions(+), 25 deletions(-) =================================================================== @@ -140,10 +140,12 @@ enum static gint thread_ident_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer gdata) { - const char *s1, *s2; + char *s1, *s2; + gint result; gtk_tree_model_get(model, a, GPOINTER_TO_INT(gdata), &s1, -1); gtk_tree_model_get(model, b, GPOINTER_TO_INT(gdata), &s2, -1); + result = g_strcmp0(s1, s2); if (s1 && s2) { @@ -153,10 +155,12 @@ static gint thread_ident_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIte for (p2 = s2; *p2 && !isdigit(*p2); p2++); if (p1 - s1 == p2 - s2 && !memcmp(s1, s2, p1 - s1)) - return atoi(p1) - atoi(p2); + result = atoi(p1) - atoi(p2); } - return g_strcmp0(s1, s2); + g_free(s1); + g_free(s2); + return result; } static GtkListStore *store; @@ -188,14 +192,14 @@ static void auto_select_thread(void) } guint thread_count = 0; -const char *thread_id = NULL; +char *thread_id = NULL; ThreadState thread_state = THREAD_BLANK; guint thread_prompt = 0; -const char *thread_group_id(void) +char *thread_group_id(void) { GtkTreeIter iter; - const char *gid = NULL; + char *gid = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) gtk_tree_model_get(model, &iter, THREAD_GROUP_ID, &gid, -1); @@ -205,7 +209,8 @@ const char *thread_group_id(void) static void thread_iter_unmark(GtkTreeIter *iter, gpointer gdata) { - const char *file, *state; + char *file; + gchar *state; gint line; gboolean stopped; @@ -216,6 +221,9 @@ static void thread_iter_unmark(GtkTreeIter *iter, gpointer gdata) if (GPOINTER_TO_INT(gdata) != 2) utils_mark(file, line, FALSE, MARKER_EXECUTE); + + g_free(file); + g_free(state); } static void thread_iter_running(GtkTreeIter *iter, const char *tid) @@ -228,11 +236,15 @@ static void thread_iter_running(GtkTreeIter *iter, const char *tid) if (thread_id) { - if (!tid) - gtk_tree_model_get(model, iter, THREAD_ID, &tid, -1); + char *tid1 = g_strdup(tid); + + if (!tid1) + gtk_tree_model_get(model, iter, THREAD_ID, &tid1, -1); - if (!strcmp(tid, thread_id)) + if (!strcmp(tid1, thread_id)) thread_state = THREAD_RUNNING; + + g_free(tid1); } } @@ -313,10 +325,12 @@ static void thread_parse_frame(GArray *frame, const char *tid, GtkTreeIter *iter static void thread_iter_stopped(GtkTreeIter *iter, StopData *sd) { - const char *tid = sd->tid, *state, *addr; + char *tid = g_strdup(sd->tid), *addr; + gchar *state; gtk_tree_model_get(model, iter, THREAD_STATE, &state, THREAD_ADDR, &addr, tid ? -1 : THREAD_ID, &tid, -1); + if (strcmp(state, STOPPED)) thread_prompt++; gtk_list_store_set(store, iter, THREAD_STATE, STOPPED, -1); @@ -336,6 +350,10 @@ static void thread_iter_stopped(GtkTreeIter *iter, StopData *sd) sd->iter = *iter; sd->found = TRUE; } + + g_free(tid); + g_free(state); + g_free(addr); } static void thread_node_stopped(const ParseNode *node, StopData *sd) @@ -527,11 +545,12 @@ static void thread_parse(GArray *nodes, const char *tid, gboolean stopped) } else { - const gchar *state; + gchar *state; gtk_tree_model_get(model, &iter, THREAD_STATE, &state, -1); if (strcmp(state, RUNNING)) thread_iter_running(&iter, tid); + g_free(state); } thread_parse_extra(nodes, &iter, "target-id", THREAD_TARGET_ID); @@ -582,13 +601,14 @@ void on_thread_frame(GArray *nodes) static void thread_iter_mark(GtkTreeIter *iter, GeanyDocument *doc) { - const char *file; + char *file; gint line; gtk_tree_model_get(model, iter, THREAD_FILE, &file, THREAD_LINE, &line, -1); if (line && !utils_filenamecmp(file, doc->real_path)) sci_set_marker_at_line(doc->editor->sci, line - 1, MARKER_EXECUTE); + g_free(file); } void threads_mark(GeanyDocument *doc) @@ -613,7 +633,7 @@ void threads_delta(ScintillaObject *sci, const char *real_path, gint start, gint while (valid) { - const char *file; + char *file; gint line; gtk_tree_model_get(model, &iter, THREAD_FILE, &file, THREAD_LINE, &line, -1); @@ -621,6 +641,7 @@ void threads_delta(ScintillaObject *sci, const char *real_path, gint start, gint if (--line >= 0 && start <= line && !utils_filenamecmp(file, real_path)) utils_move_mark(sci, line, start, delta, MARKER_EXECUTE); + g_free(file); valid = gtk_tree_model_iter_next(model, &iter); } } @@ -647,17 +668,22 @@ static void on_thread_selection_changed(GtkTreeSelection *selection, { GtkTreeIter iter; + free(thread_id); + free(frame_id); + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const gchar *state; + gchar *state; gint line; - const char *addr; + char *addr; gtk_tree_model_get(model, &iter, THREAD_ID, &thread_id, THREAD_STATE, &state, THREAD_LINE, &line, THREAD_ADDR, &addr, -1); if (strcmp(state, STOPPED)) + { thread_state = *state ? THREAD_RUNNING : THREAD_BLANK; + } else if (addr) { if (line) @@ -677,10 +703,14 @@ static void on_thread_selection_changed(GtkTreeSelection *selection, else thread_state = THREAD_QUERY_FRAME; } + + frame_id = strdup("0"); + g_free(state); + g_free(addr); } else { - thread_id = NULL; + thread_id = frame_id = NULL; thread_state = THREAD_BLANK; } @@ -726,11 +756,12 @@ static void send_signal(int sig) if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *pid; + char *pid; gtk_tree_model_get(model, &iter, THREAD_PID, &pid, -1); if (kill(atoi(pid), sig) == -1) show_errno("kill(pid)"); + g_free(pid); } else plugin_beep(); @@ -763,7 +794,7 @@ static void on_thread_send_signal(G_GNUC_UNUSED const MenuItem *menu_item) #else /* G_OS_UNIX */ static HANDLE iter_to_handle(GtkTreeIter *iter) { - const char *pid; + char *pid; HANDLE hid; gtk_tree_model_get(model, iter, THREAD_PID, &pid, -1); @@ -771,6 +802,7 @@ static HANDLE iter_to_handle(GtkTreeIter *iter) if (!hid) show_errno("OpenProcess"); + g_free(pid); return hid; } @@ -833,8 +865,6 @@ static void on_thread_show_core(const MenuItem *menu_item) } #define DS_VIEWABLE (DS_ACTIVE | DS_EXTRA_2) -#define DS_INTRABLE (DS_ACTIVE | DS_EXTRA_3) -#define DS_TERMABLE (DS_ACTIVE | DS_EXTRA_3) #define DS_SIGNABLE (DS_ACTIVE | DS_EXTRA_3) static MenuItem thread_menu_items[] = @@ -843,8 +873,8 @@ static void on_thread_show_core(const MenuItem *menu_item) { "thread_unsorted", on_thread_unsorted, 0, NULL, NULL }, { "thread_view_source", on_thread_view_source, DS_VIEWABLE, NULL, NULL }, { "thread_synchronize", on_thread_synchronize, DS_SENDABLE, NULL, NULL }, - { "thread_interrupt", on_thread_interrupt, DS_INTRABLE, NULL, NULL }, - { "thread_terminate", on_thread_terminate, DS_TERMABLE, NULL, NULL }, + { "thread_interrupt", on_thread_interrupt, DS_SIGNABLE, NULL, NULL }, + { "thread_terminate", on_thread_terminate, DS_SIGNABLE, NULL, NULL }, #ifdef G_OS_UNIX { "thread_send_signal", on_thread_send_signal, DS_SIGNABLE, NULL, NULL }, #endif @@ -865,10 +895,14 @@ static guint thread_menu_extra_state(void) if (gtk_tree_selection_get_selected(selection, NULL, &iter)) { - const char *pid, *file; + char *pid, *file; + gboolean has_pid; gtk_tree_model_get(model, &iter, THREAD_PID, &pid, THREAD_FILE, &file, -1); - return ((file != NULL) << DS_INDEX_2) | ((utils_atoi0(pid) > 0) << DS_INDEX_3); + has_pid = utils_atoi0(pid) > 0; + g_free(pid); + g_free(file); + return ((file != NULL) << DS_INDEX_2) | (has_pid << DS_INDEX_3); } return 0; @@ -920,4 +954,5 @@ void thread_finalize(void) model_foreach(model, (GFunc) thread_iter_unmark, NULL); array_free(thread_groups, (GFreeFunc) thread_group_free); set_gdb_thread(NULL, FALSE); + free(thread_id); } Modified: scope/src/thread.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -34,9 +34,9 @@ THREAD_AT_ASSEMBLER } ThreadState; -extern const char *thread_id; /* gdb id, NULL if none selected */ +extern char *thread_id; extern ThreadState thread_state; -const char *thread_group_id(void); +char *thread_group_id(void); void on_thread_running(GArray *nodes); void on_thread_stopped(GArray *nodes); Modified: scope/src/utils.c 57 files changed, 41 insertions(+), 16 deletions(-) =================================================================== @@ -146,16 +146,16 @@ gchar *array_find(GArray *array, const char *key, G_GNUC_UNUSED gboolean filenam gchar *array_find(GArray *array, const char *key, gboolean filename) #endif { - guint i; - gchar *data = array->data; 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 (i = 0; i < array->len; i++, data += size) + for (data = array->data; data < end; data += size) if (!compare(*(const char **) data, key)) return data; @@ -164,11 +164,11 @@ gchar *array_find(GArray *array, const char *key, gboolean filename) void array_foreach(GArray *array, GFunc each_func, gpointer gdata) { - guint i; - gchar *data = array->data; guint size = g_array_get_element_size(array); + gchar *end = array->data + size * array->len; + gchar *data; - for (i = 0; i < array->len; i++, data += size) + for (data = array->data; data < end; data += size) each_func(data, gdata); } @@ -213,11 +213,12 @@ static void utils_clear_sections(GKeyFile *config, const char *prefix, guint i) void array_save(GArray *array, GKeyFile *config, const gchar *prefix, ASaveFunc save_func) { - guint i, n = 0; - gchar *data = array->data; guint size = g_array_get_element_size(array); + gchar *end = array->data + size * array->len; + gchar *data; + guint n = 0; - for (i = 0; i < array->len; i++, data += size) + for (data = array->data; data < end; data += size) { char *section = g_strdup_printf("%s_%d", prefix, n); n += save_func(config, section, data); @@ -235,15 +236,24 @@ gboolean model_find(GtkTreeModel *model, GtkTreeIter *iter, guint column, const while (valid) { + gboolean match; union { - const gchar *s; + gchar *s; gint i; } data; gtk_tree_model_get(model, iter, column, &data, -1); - if (string ? g_strcmp0(data.s, key) == 0 : data.i == i) + if (string) + { + match = !g_strcmp0(data.s, key); + g_free(data.s); + } + else + match = data.i == i; + + if (match) return TRUE; valid = gtk_tree_model_iter_next(model, iter); @@ -285,18 +295,26 @@ void model_save(GtkTreeModel *model, GKeyFile *config, const gchar *prefix, gint model_string_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gint column) { - const gchar *s1, *s2; + gchar *s1, *s2; + gint result; gtk_tree_model_get(model, a, column, &s1, -1); gtk_tree_model_get(model, b, column, &s2, -1); - return g_strcmp0(s1, s2); + result = g_strcmp0(s1, s2); + g_free(s1); + g_free(s2); + return result; } -static int model_atoint(GtkTreeModel *model, GtkTreeIter *iter, gpointer gdata) +static gint model_atoint(GtkTreeModel *model, GtkTreeIter *iter, gpointer gdata) { - const gchar *s; + gchar *s; + gint i; + gtk_tree_model_get(model, iter, GPOINTER_TO_INT(gdata), &s, -1); - return utils_atoi0(s); + i = utils_atoi0(s); + g_free(s); + return i; } gint model_gint_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer gdata) @@ -567,6 +585,13 @@ gchar *utils_key_file_get_string(GKeyFile *config, const char *section, const ch return string; } +void utils_key_file_set_string(GKeyFile *config, const char *section, const char *key, + char *value) +{ + g_key_file_set_string(config, section, key, value); + g_free(value); +} + gchar *utils_get_utf8_basename(const char *file) { gchar *utf8 = utils_get_utf8_from_locale(file); Modified: scope/src/utils.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,8 @@ void utils_load(GKeyFile *config, const char *prefix, guint utils_parse_sci_color(const gchar *string); gboolean utils_key_file_write_to_file(GKeyFile *config, const char *configfile); gchar *utils_key_file_get_string(GKeyFile *config, const char *section, const char *key); +void utils_key_file_set_string(GKeyFile *config, const char *section, const char *key, + char *value); /* frees value */ gchar *utils_get_utf8_basename(const char *file); char *utils_7bit_to_locale(char *text); /* == text */ Modified: scope/src/views.c 37 files changed, 25 insertions(+), 12 deletions(-) =================================================================== @@ -40,7 +40,7 @@ { 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, FALSE, DS_SENDABLE }, + { 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 }, @@ -143,9 +143,9 @@ void views_update(DebugState state) } } -gboolean view_select_frame(void) +gboolean view_stack_update(void) { - if (g_strcmp0(frame_id, "0") && views[VIEW_STACK].dirty) + if (views[VIEW_STACK].dirty) { DebugState state = thread_state >= THREAD_STOPPED ? DS_DEBUG : DS_READY; view_update_unconditional(VIEW_STACK, state); @@ -199,7 +199,7 @@ gboolean on_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keybo if (gtk_tree_view_get_tooltip_context(tree, &x, &y, keyboard_tip, NULL, NULL, &iter)) { - const char *file; + char *file; gtk_tree_view_set_tooltip_cell(tree, tooltip, NULL, base_name_column, NULL); gtk_tree_model_get(gtk_tree_view_get_model(tree), &iter, COLUMN_FILE, &file, -1); @@ -209,6 +209,7 @@ gboolean on_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keybo gchar *utf8 = utils_get_utf8_from_locale(file); gtk_tooltip_set_text(tooltip, utf8); + g_free(file); g_free(utf8); return TRUE; } @@ -250,7 +251,7 @@ static void on_display_editing_started(G_GNUC_UNUSED GtkCellRenderer *cell, GtkCellEditable *editable, const gchar *path_str, GtkTreeModel *model) { GtkTreeIter iter; - const char *value; + char *value; gint hb_mode; g_assert(GTK_IS_EDITABLE(editable)); @@ -259,6 +260,7 @@ static void on_display_editing_started(G_GNUC_UNUSED GtkCellRenderer *cell, /* scrolling editable to the proper position is left as an exercise for the reader */ g_signal_connect(editable, "map-event", G_CALLBACK(on_display_editable_map_event), parse_get_display_from_7bit(value, hb_mode, MR_EDITVC)); + g_free(value); } GtkTreeView *view_connect(const char *name, GtkTreeModel **model, GtkTreeSelection **selection, @@ -331,7 +333,7 @@ void view_display_edited(GtkTreeModel *model, gboolean condition, const gchar *p if (condition) { GtkTreeIter iter; - const char *name; + char *name; gint hb_mode; char *locale; @@ -341,6 +343,7 @@ void view_display_edited(GtkTreeModel *model, gboolean condition, const gchar *p locale = utils_get_locale_from_display(new_text, hb_mode); utils_strchrepl(locale, '\n', ' '); debug_send_format(F, format, name, locale); + g_free(name); g_free(locale); } else @@ -357,14 +360,19 @@ void view_seek_selected(GtkTreeSelection *selection, gboolean focus, SeekerType { GtkTreeModel *model; GtkTreeIter iter; - const char *file; - gint line; if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + char *file; + gint line; + gtk_tree_model_get(model, &iter, COLUMN_FILE, &file, COLUMN_LINE, &line, -1); + if (file) + { utils_seek(file, line, focus, seeker); + g_free(file); + } } } @@ -428,7 +436,7 @@ static void on_command_history_changed(GtkComboBox *command_history, if (gtk_combo_box_get_active_iter(command_history, &iter)) { - const gchar *text; + gchar *text; gboolean locale; gtk_tree_model_get(command_model, &iter, COMMAND_TEXT, &text, COMMAND_LOCALE, @@ -437,24 +445,29 @@ static void on_command_history_changed(GtkComboBox *command_history, gtk_toggle_button_set_active(command_locale, locale); gtk_widget_grab_focus(command_view); gtk_combo_box_set_active_iter(command_history, NULL); + g_free(text); } } static void on_command_insert_button_clicked(G_GNUC_UNUSED GtkButton *button, gpointer gdata) { - const char *prefix, *id; + const char *prefix; + char *id; GString *text = g_string_new("--"); switch (GPOINTER_TO_INT(gdata)) { - case 't' : prefix = "thread"; id = thread_id; break; + case 't' : prefix = "thread"; id = g_strdup(thread_id); break; case 'g' : prefix = "group"; id = thread_group_id(); break; - default : prefix = "frame"; id = frame_id; + default : prefix = "frame"; id = g_strdup(frame_id); } g_string_append_printf(text, "%s ", prefix); if (id) + { g_string_append_printf(text, "%s ", id); + g_free(id); + } gtk_text_buffer_delete_selection(command_text, FALSE, TRUE); gtk_text_buffer_insert_at_cursor(command_text, text->str, -1); g_string_free(text, TRUE); Modified: scope/src/views.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -39,7 +39,7 @@ void views_data_dirty(void); void views_clear(void); void views_update(DebugState state); -gboolean view_select_frame(void); +gboolean view_stack_update(void); void view_inspect_update(void); void on_view_changed(GtkNotebook *notebook, gpointer page, gint page_num, gpointer gdata); Modified: scope/src/watch.c 13 files changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -51,7 +51,7 @@ static void on_watch_enabled_toggled(G_GNUC_UNUSED GtkCellRendererToggle *render static void watch_iter_update(GtkTreeIter *iter, gpointer gdata) { - const gchar *expr; + gchar *expr; gint scid; gboolean enabled; @@ -60,6 +60,7 @@ static void watch_iter_update(GtkTreeIter *iter, gpointer gdata) if (enabled || GPOINTER_TO_INT(gdata)) g_free(debug_send_evaluate('6', scid, expr)); + g_free(expr); } static void on_watch_expr_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, @@ -68,7 +69,7 @@ static void on_watch_expr_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, if (validate_column(new_text, TRUE)) { GtkTreeIter iter; - const gchar *expr; + gchar *expr; gboolean enabled; gtk_tree_model_get_iter_from_string(model, &iter, path_str); @@ -85,6 +86,7 @@ static void on_watch_expr_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, if (enabled && (debug_state() & DS_DEBUG)) watch_iter_update(&iter, GINT_TO_POINTER(TRUE)); } + g_free(expr); } } @@ -161,7 +163,7 @@ void watches_clear(void) gboolean watches_update(void) { - if (view_select_frame()) + if (g_strcmp0(frame_id, "0") && view_stack_update()) return FALSE; model_foreach(model, (GFunc) watch_iter_update, GPOINTER_TO_INT(FALSE)); @@ -241,7 +243,7 @@ static gboolean watch_save(GKeyFile *config, const char *section, GtkTreeIter *i gtk_tree_model_get(model, iter, WATCH_EXPR, &expr, WATCH_HB_MODE, &hb_mode, WATCH_MR_MODE, &mr_mode, WATCH_ENABLED, &enabled, -1); - g_key_file_set_string(config, section, "expr", expr); + utils_key_file_set_string(config, section, "expr", expr); 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, "enabled", enabled); @@ -267,12 +269,13 @@ static void on_watch_unsorted(G_GNUC_UNUSED const MenuItem *menu_item) static void on_watch_add(G_GNUC_UNUSED const MenuItem *menu_item) { GtkTreeIter iter; - const gchar *expr = NULL; + gchar *expr = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) gtk_tree_model_get(model, &iter, WATCH_EXPR, &expr, -1); watch_add(expr); + g_free(expr); } static void on_watch_copy(const MenuItem *menu_item) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3881eb: Add scope/memory.c to POTFILES.in
by Enrico Tröger 20 Jan '13

20 Jan '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Jan 2013 09:40:42 UTC Commit: 3881ebcb2ed8aa4eddead9683c2232723c62c66e https://github.com/geany/geany-plugins/commit/3881ebcb2ed8aa4eddead9683c223… Log Message: ----------- Add scope/memory.c to POTFILES.in Modified Paths: -------------- po/POTFILES.in Modified: po/POTFILES.in 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -223,6 +223,7 @@ scope/src/break.c scope/src/conterm.c scope/src/debug.c scope/src/inspect.c +scope/src/memory.c scope/src/menu.c scope/src/parse.c scope/src/plugme.c -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1be281: Tableconvert: Little update of LaTeX-part of documentation
by Frank Lanitz 20 Jan '13

20 Jan '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 20 Jan 2013 00:41:52 UTC Commit: 1be2819bfb2ce1405ca55acdfd1c47bb676a42cd https://github.com/geany/geany-plugins/commit/1be2819bfb2ce1405ca55acdfd1c4… Log Message: ----------- Tableconvert: Little update of LaTeX-part of documentation Modified Paths: -------------- tableconvert/README Modified: tableconvert/README 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -59,6 +59,10 @@ Rectangle selections are currently not supported and might lead to some weird output you didn't expect -- just don't try it if you have heart issues or working on an important document :) +However, after you transformed your selection to a table you might +want to update the number and orientation of columns at begin of +tabular-environment. + SQL ^^^ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 001f76: Tableconvert: Add table-environment when transforming into a LaTeX-table
by Frank Lanitz 20 Jan '13

20 Jan '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 20 Jan 2013 00:41:52 UTC Commit: 001f76e2793c2e4e6ec4416d47b6618b317df4da https://github.com/geany/geany-plugins/commit/001f76e2793c2e4e6ec4416d47b66… Log Message: ----------- Tableconvert: Add table-environment when transforming into a LaTeX-table Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -117,7 +117,7 @@ static GString* convert_to_table_latex(gchar** rows, gboolean header) g_return_val_if_fail(rows != NULL, NULL); /* Adding header to replacement */ - replacement_str = g_string_new("\\begin{tabular}{}\n"); + replacement_str = g_string_new("\\begin{table}[h]\n\\begin{tabular}{}\n"); /* Iteration onto rows and building up lines of table for * replacement */ @@ -141,7 +141,7 @@ static GString* convert_to_table_latex(gchar** rows, gboolean header) } /* Adding the footer of table */ - g_string_append(replacement_str, "\\end{tabular}\n"); + g_string_append(replacement_str, "\\end{tabular}\n\\end{table}"); return replacement_str; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f194ba: scope - added memory.c, memory.h
by Dimitar Zhekov 17 Jan '13

17 Jan '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Thu, 17 Jan 2013 17:42:57 UTC Commit: f194ba8c143198dfb499a7169809ba2198b7350f https://github.com/geany/geany-plugins/commit/f194ba8c143198dfb499a7169809b… Log Message: ----------- scope - added memory.c, memory.h Modified Paths: -------------- scope/src/memory.c scope/src/memory.h Modified: scope/src/memory.c 414 files changed, 414 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,414 @@ +/* + * memory.c + * + * Copyright 2013 Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <gdk/gdkkeysyms.h> + +#include "common.h" + +enum +{ + MEMORY_ADDR, + MEMORY_BYTES, + MEMORY_ASCII +}; + +static GtkListStore *store; +static GtkTreeModel *model; +static GtkTreeSelection *selection; + +static void on_memory_bytes_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, gchar *path_str, + gchar *new_text, G_GNUC_UNUSED gpointer gdata) +{ + if (*new_text && (debug_state() & DS_SENDABLE)) + { + GtkTreeIter iter; + const char *addr, *bytes; + guint i; + + gtk_tree_model_get_iter_from_string(model, &iter, path_str); + gtk_tree_model_get(model, &iter, MEMORY_ADDR, &addr, MEMORY_BYTES, &bytes, -1); + + for (i = 0; bytes[i]; i++) + if (!(isxdigit(bytes[i]) ? isxdigit(new_text[i]) : new_text[i] == ' ')) + break; + + if (bytes[i] || new_text[i]) + dc_error("memory: invalid format"); + else + { + utils_strchrepl(new_text, ' ', '\0'); + debug_send_format(T, "07-data-write-memory-bytes 0x%s%s", addr, new_text); + } + } + else + plugin_blink(); +} + +static gboolean on_memory_entry_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event, + GtkEditable *editable) +{ + const char *text = gtk_entry_get_text(GTK_ENTRY(editable)); + gint pos = gtk_editable_get_position(editable); + + if (event->keyval <= 0x7F && ((isxdigit(event->keyval) && isxdigit(text[pos])) || + (event->keyval == ' ' && text[pos] == ' ')) && event->state <= GDK_SHIFT_MASK) + { + char c = event->keyval; + + gtk_editable_set_editable(editable, TRUE); + gtk_editable_delete_text(editable, pos, pos + 1); + gtk_editable_insert_text(editable, &c, 1, &pos); + gtk_editable_set_position(editable, pos); + gtk_editable_set_editable(editable, FALSE); + return TRUE; + } + + return event->keyval == GDK_Insert || event->keyval == GDK_KP_Insert || + event->keyval == GDK_space || event->keyval == GDK_KP_Space; +} + +static const char *memory_font; + +static void on_memory_bytes_editing_started(G_GNUC_UNUSED GtkCellRenderer *cell, + GtkCellEditable *cell_editable, G_GNUC_UNUSED const gchar *path, + G_GNUC_UNUSED gpointer gdata) +{ + iff (GTK_IS_ENTRY(cell_editable), "memory_bytes: not an entry") + { + GtkEditable *editable = GTK_EDITABLE(cell_editable); + + ui_widget_modify_font_from_string(GTK_WIDGET(editable), memory_font); + gtk_entry_set_overwrite_mode(GTK_ENTRY(editable), TRUE); + gtk_editable_set_editable(editable, FALSE); + gtk_editable_set_position(editable, 0); + g_signal_connect(editable, "key-press-event", G_CALLBACK(on_memory_entry_key_press), + editable); + } +} + +static const TreeCell memory_cells[] = +{ + { "memory_bytes", G_CALLBACK(on_memory_bytes_edited) }, + { NULL, NULL } +}; + +static guint pointer_size; +static char *addr_format; +#define MAX_BYTES_PER_LINE 128 +#define MAX_POINTER_SIZE 8 + +static gint back_bytes_per_line; +static gint bytes_per_line; +static gint bytes_per_group = 1; + +static void memory_configure(void) +{ + gint groups_per_line; + + back_bytes_per_line = pref_memory_bytes_per_line; + bytes_per_line = pref_memory_bytes_per_line; + if ((unsigned) (bytes_per_line - 8) > MAX_BYTES_PER_LINE - 8) + bytes_per_line = 16; + + groups_per_line = bytes_per_line / bytes_per_group; + bytes_per_line = groups_per_line * bytes_per_group; +} + +static guint64 memory_start; +static guint memory_count = 0; +#define MAX_BYTES (128 * MAX_BYTES_PER_LINE) /* +1 incomplete line */ + +static void write_block(guint64 start, const char *contents, guint count) +{ + if (!memory_count) + memory_start = start; + + while (memory_count < MAX_BYTES) + { + GtkTreeIter iter; + char *addr = g_strdup_printf(addr_format, start); + GString *bytes = g_string_sized_new(bytes_per_line * 3); + GString *ascii = g_string_new(" "); + gint n = 0; + + gtk_list_store_append(store, &iter); + + while (n < bytes_per_line) + { + char locale; + gchar *utf8; + + g_string_append_len(bytes, contents, 2); + contents += 2; + memory_count++; + locale = strtol(bytes->str + bytes->len - 2, NULL, 16); + utf8 = locale >= 0x20 ? g_locale_to_utf8(&locale, 1, NULL, NULL, NULL) : NULL; + + if (utf8) + { + g_string_append(ascii, utf8); + g_free(utf8); + } + else + g_string_append_c(ascii, '.'); /* 0xfffd? */ + + if (++n % bytes_per_group == 0) + g_string_append_c(bytes, ' '); + + if (!--count) + break; + } + + while (n < bytes_per_line) + { + g_string_append(bytes, " "); + + if (++n % bytes_per_group == 0) + g_string_append_c(bytes, ' '); + } + + gtk_list_store_set(store, &iter, MEMORY_ADDR, addr, MEMORY_BYTES, bytes->str, + MEMORY_ASCII, ascii->str, -1); + + g_free(addr); + g_string_free(bytes, TRUE); + g_string_free(ascii, TRUE); + + if (!count) + break; + + start += bytes_per_line; + } + + if (count) + dc_error("memory: too much data"); +} + +static void memory_node_read(const ParseNode *node, G_GNUC_UNUSED gpointer gdata) +{ + iff (node->type == PT_ARRAY, "memory: contains value") + { + GArray *nodes = (GArray *) node->value; + const char *begin = parse_find_value(nodes, "begin"); + const char *contents = parse_find_value(nodes, "contents"); + + iff (begin && contents, "memory: no begin or contents") + { + guint64 start; + guint64 count = strlen(contents) / 2; + + sscanf(begin, "%" G_GINT64_MODIFIER "i", &start); + + iff (count, "memory: contents too short") + write_block(start, contents, count); + } + } +} + +void on_memory_read_bytes(GArray *nodes) +{ + if (pointer_size <= MAX_POINTER_SIZE) + { + GtkTreeIter iter; + char *addr = NULL; + + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + { + gtk_tree_model_get(model, &iter, MEMORY_ADDR, &addr, -1); + addr = strdup(addr); + } + + memory_clear(); + + if (pref_memory_bytes_per_line != back_bytes_per_line) + { + memory_configure(); + gtk_tree_view_column_queue_resize(get_column("memory_bytes_column")); + gtk_tree_view_column_queue_resize(get_column("memory_ascii_column")); + } + + array_foreach(parse_lead_array(nodes), (GFunc) memory_node_read, + GINT_TO_POINTER(TRUE)); + + if (addr) + { + if (model_find(model, &iter, MEMORY_ADDR, addr)) + utils_tree_set_cursor(selection, &iter, -1); + g_free(addr); + } + } +} + +void memory_clear(void) +{ + gtk_list_store_clear(store); + memory_count = 0; +} + +gboolean memory_update(void) +{ + if (memory_count) + { + debug_send_format(T, "04-data-read-memory-bytes 0x%" G_GINT64_MODIFIER "x %u", + memory_start, memory_count); + } + return TRUE; +} + +static void on_memory_refresh(G_GNUC_UNUSED const MenuItem *menu_item) +{ + debug_send_format(T, "-data-read-memory-bytes 0x%" G_GINT64_MODIFIER "x %u", + memory_start, memory_count); +} + +static void on_memory_read(G_GNUC_UNUSED const MenuItem *menu_item) +{ + GString *command = g_string_new("-data-read-memory-bytes "); + gchar *expr = utils_get_default_selection(); + + if (expr) + { + g_string_append(command, expr); + g_free(expr); + } + else if (memory_count) + { + g_string_append_printf(command, "0x%" G_GINT64_MODIFIER "x %u", memory_start, + memory_count); + } + + view_command_line(command->str, _("Read Memory"), " ", TRUE); + g_string_free(command, TRUE); +} + +static void on_memory_copy(G_GNUC_UNUSED const MenuItem *menu_item) +{ + GtkTreeModel *model; + GtkTreeIter iter; + const char *addr, *bytes; + const gchar *ascii; + gchar *string; + + gtk_tree_selection_get_selected(selection, &model, &iter); + gtk_tree_model_get(model, &iter, MEMORY_ADDR, &addr, MEMORY_BYTES, &bytes, + MEMORY_ASCII, &ascii, -1); + string = g_strdup_printf("%s%s%s", addr, bytes, ascii); + gtk_clipboard_set_text(gtk_widget_get_clipboard(menu_item->widget, + GDK_SELECTION_CLIPBOARD), string, -1); + g_free(string); +} + +static void on_memory_clear(G_GNUC_UNUSED const MenuItem *menu_item) +{ + memory_clear(); +} + +static void on_memory_group_display(const MenuItem *menu_item) +{ + guint i; + + for (i = 0; (1 << i) < bytes_per_group; i++); + menu_item_set_active(menu_item + i + 1, TRUE); +} + +static void on_memory_group_update(const MenuItem *menu_item) +{ + bytes_per_group = 1 << GPOINTER_TO_INT(menu_item->gdata); + back_bytes_per_line = 0; + + if (memory_count) + on_memory_refresh(menu_item); +} + +#define DS_FRESHABLE (DS_SENDABLE | DS_EXTRA_2) +#define DS_COPYABLE (DS_BASICS | DS_EXTRA_1) +#define DS_CLEARABLE (DS_ACTIVE | DS_EXTRA_2) + +#define GROUP_ITEM(count, POWER) \ + { ("memory_group_"count), on_memory_group_update, DS_SENDABLE, NULL, \ + GINT_TO_POINTER(POWER) } + +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 }, + GROUP_ITEM("1", 0), + GROUP_ITEM("2", 1), + GROUP_ITEM("4", 2), + GROUP_ITEM("8", 3), + { NULL, NULL, 0, NULL, NULL } +}; + +static guint memory_menu_extra_state(void) +{ + return (gtk_tree_selection_get_selected(selection, NULL, NULL) << DS_INDEX_1) | + (memory_count != 0) << DS_INDEX_1; +} + +static MenuInfo memory_menu_info = { memory_menu_items, memory_menu_extra_state, 0 }; + +static gboolean on_memory_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event, + gpointer gdata) +{ + if (event->keyval == GDK_Insert || event->keyval == GDK_KP_Insert) + { + menu_item_execute(&memory_menu_info, (const MenuItem *) gdata, FALSE); + return TRUE; + } + + return FALSE; +} + +void memory_init(void) +{ + GtkWidget *tree = GTK_WIDGET(view_connect("memory_view", &model, &selection, + memory_cells, "memory_window", NULL)); + + store = GTK_LIST_STORE(model); + memory_font = *pref_memory_font ? pref_memory_font : pref_vte_font; + ui_widget_modify_font_from_string(tree, memory_font); + g_signal_connect(get_object("memory_bytes"), "editing-started", + G_CALLBACK(on_memory_bytes_editing_started), NULL); + g_signal_connect(tree, "key-press-event", G_CALLBACK(on_memory_key_press), + (gpointer) menu_item_find(memory_menu_items, "memory_read")); + + pointer_size = sizeof(void *) > sizeof &memory_init ? sizeof(void *) : + sizeof &memory_init; + addr_format = g_strdup_printf("%%0%u" G_GINT64_MODIFIER "x ", pointer_size * 2); + memory_configure(); + + if (pointer_size > MAX_POINTER_SIZE) + { + msgwin_status_add(_("Scope: pointer size > 8, Data disabled.")); + gtk_widget_hide(tree); + } + else + menu_connect("memory_menu", &memory_menu_info, tree); +} + +void memory_finalize(void) +{ + g_free(addr_format); +} Modified: scope/src/memory.h 32 files changed, 32 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,32 @@ +/* + * utils.h + * + * Copyright 2013 Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MEMORY_H + +void on_memory_read_bytes(GArray *nodes); +void on_memory_modified(GArray *nodes); + +void memory_clear(void); +gboolean memory_update(void); + +void memory_init(void); +void memory_finalize(void); + +#define MEMORY_H 1 +#endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 554167: scope - added memory view, fixed glib compatibility
by Dimitar Zhekov 15 Jan '13

15 Jan '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Tue, 15 Jan 2013 17:42:58 UTC Commit: 5541671bdc4ebb4ea65bd89d2f12583a2de5d0fa https://github.com/geany/geany-plugins/commit/5541671bdc4ebb4ea65bd89d2f125… Log Message: ----------- scope - added memory view, fixed glib compatibility Modified Paths: -------------- scope/ChangeLog scope/NEWS scope/data/scope.glade scope/docs/codes.html scope/docs/scope.html scope/src/Makefile.am scope/src/break.c scope/src/common.h scope/src/conterm.c scope/src/conterm.h scope/src/debug.c scope/src/gtk216.c scope/src/gtk216.h scope/src/inspect.c scope/src/menu.c scope/src/parse.c scope/src/plugme.c scope/src/prefs.c scope/src/prefs.h scope/src/scope.c scope/src/scope.h scope/src/stack.c scope/src/thread.c scope/src/tooltip.c scope/src/utils.c scope/src/utils.h scope/src/views.c scope/src/views.h Modified: scope/ChangeLog 43 files changed, 42 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,47 @@ +2013-01-15 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * data/scope.glade, docs/codes.html, docs/scope.html, src/common.h, + src/Makefile.am, src/memory.c, src/memory.h, src/parse.c, + src/prefs.c, src/prefs.h, src/scope.c, src/views.c, src/views.h: + Added Memory subpage. + * data/scope.glade, src/conterm.c: + GtkTextView "debug_console" -> "debug_context". + * src/break.c, src/gtk216.c, src/scope.h, src/stack.c, src/thread.c, + src/views.c: + GTK_TREE_COLUMN(get_object(name)) -> get_column(name). + * src/conterm.c, src/menu.c, src/views.c: + Handle GDK_KP_Insert/GDK_KP_Delete/GTK_ISO_Space. + * src/conterm.c: + Don't invoke console on Ctrl/Alt/Mod ASCII characters. + Don't set debug_context properties already defined in scope.glade. + * src/conterm.h: + Properly declare dc_output/dc_output_nl as extern. + * src/debug.c, src/scope.c: + Invoke finalizers in (hopefully) proper order instead of processing + pending gtk+ events on finalize. + * src/debug.c: + Small initial wait for gdb kill in finalize instead of waiting + gdb_wait_death + 1. + * src/gtk216.c, src/gtk216.h, src/scope.c: + Emulate g_array_get_element_size() under glib 2.20. + * src/menu.c, src/plugme.c, src/utils.c, src/utils.h, src/views.c: + utils_str_replace_all() -> utils_strchrepl(). + * src/scope.c: + Properly initialize inspects state. + * src/stack.c: + Select and focus the current frame instead of simply selecting. + * src/tooltip.c: + Unlimited toolbar length on pref_tooltips_length = 0, as described + in scope.html. + * src/utils.c: + Invoke g_array_get_element_size() only once in array_save(). + * docs/scope.html, src/scope.c: + Increased version to 0.82. + + 2013-01-03 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> - * src/debug.c, src/scope.c + * src/debug.c, src/scope.c: Ask user whether to terminate debugging on build actions. * src/debug.c: Modified: scope/NEWS 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,10 @@ +Scope 0.82 (2013-01-15) + + * Added Memory subpage. + + * Fixed compatibility with glib-2.20. + + Scope 0.80 (2013-01-02) * Mark all data views for update when a value is modified. Modified: scope/data/scope.glade 186 files changed, 177 insertions(+), 9 deletions(-) =================================================================== @@ -122,6 +122,11 @@ <property name="stock">gtk-find</property> <property name="icon-size">1</property> </object> + <object class="GtkImage" id="memory_read_icon"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> <object class="GtkImage" id="command_send_icon"> <property name="visible">True</property> <property name="stock">gtk-ok</property> @@ -910,6 +915,93 @@ </object> </child> </object> + <object class="GtkMenu" id="memory_menu"> + <child> + <object class="GtkImageMenuItem" id="memory_refresh"> + <property name="label">gtk-refresh</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="memory_separator1"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="memory_read"> + <property name="label" translatable="yes">R_ead</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">memory_read_icon</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="memory_copy"> + <property name="label">gtk-copy</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="memory_clear"> + <property name="label">gtk-clear</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="memory_separator2"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="memory_group"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Group by</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="memory_group_menu"> + <child> + <object class="GtkRadioMenuItem" id="memory_group_1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_1</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkRadioMenuItem" id="memory_group_2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_2</property> + <property name="use_underline">True</property> + <property name="group">memory_group_1</property> + </object> + </child> + <child> + <object class="GtkRadioMenuItem" id="memory_group_4"> + <property name="visible">True</property> + <property name="label" translatable="yes">_4</property> + <property name="use_underline">True</property> + <property name="group">memory_group_1</property> + </object> + </child> + <child> + <object class="GtkRadioMenuItem" id="memory_group_8"> + <property name="visible">True</property> + <property name="label" translatable="yes">_8</property> + <property name="use_underline">True</property> + <property name="group">memory_group_1</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> <object class="GtkMenu" id="console_menu"> <child> <object class="GtkImageMenuItem" id="console_copy"> @@ -1257,6 +1349,16 @@ <column type="gboolean"/> </columns> </object> + <object class="GtkListStore" id="memory_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkTreeStore" id="inspect_store"> <columns>  @@ -1844,22 +1946,85 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="debug_window"> + <object class="GtkScrolledWindow" id="memory_window"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="memory_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">memory_store</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <child> + <object class="GtkTreeViewColumn" id="memory_addr_column"> + <property name="resizable">True</property> + <child> + <object class="GtkCellRendererText" id="memory_addr"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="memory_bytes_column"> + <property name="resizable">True</property> + <child> + <object class="GtkCellRendererText" id="memory_bytes"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="memory_ascii_column"> + <property name="resizable">True</property> + <child> + <object class="GtkCellRendererText" id="memory_ascii"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="position">6</property> </packing> </child> <child type="tab"> + <object class="GtkLabel" id="memory_view_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Memory</property> + </object> + <packing> + <property name="position">6</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="debug_window"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + </object> + <packing> + <property name="position">7</property> + </packing> + </child> + <child type="tab"> <object class="GtkLabel" id="debug_console_label"> <property name="visible">True</property> <property name="label" translatable="yes">Debug Console</property> </object> <packing> - <property name="position">6</property> + <property name="position">7</property> <property name="tab_fill">False</property> </packing> </child> @@ -2607,6 +2772,9 @@ </packing> </child> </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -2880,10 +3048,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="width_chars">7</property> <property name="adjustment">option_inspect_count_adjustment</property> <property name="climb_rate">1</property> <property name="numeric">True</property> - <property name="width_chars">7</property> </object> </child> </object> @@ -3548,7 +3716,7 @@ </object> </child> </object> - <object class="GtkTextView" id="debug_console"> + <object class="GtkTextView" id="debug_context"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> @@ -3566,17 +3734,17 @@ </object> <object class="GtkSizeGroup" id="program_size_group"> <widgets> - <widget name="program_executable_label"/> - <widget name="program_arguments_label"/> - <widget name="program_environment_label"/> - <widget name="program_working_dir_label"/> <widget name="program_load_script_label"/> + <widget name="program_working_dir_label"/> + <widget name="program_environment_label"/> + <widget name="program_arguments_label"/> + <widget name="program_executable_label"/> </widgets> </object> <object class="GtkSizeGroup" id="inspect_size_group"> <widgets> - <widget name="inspect_expr_label"/> <widget name="inspect_name_label"/> + <widget name="inspect_expr_label"/> </widgets> </object> </interface> Modified: scope/docs/codes.html 26 files changed, 17 insertions(+), 9 deletions(-) =================================================================== @@ -41,11 +41,11 @@ <tr><td class="nowrap">022<id>-break-condition</td> <td class="tab">breakpoint Condition column edited</td> - <td class="tab">-''-</td></tr> + <td class="tab"><id>-break-info</td></tr> <tr><td class="nowrap">022<id>-break-commands</td> <td class="tab">breakpoint Script column edited</td> - <td class="tab">-''-</td></tr> + <td class="tab"><id>-break-info</td></tr> <tr><td class="nowrap">023<id>-break-delete</td> <td class="tab">Delete or un-Toggle breakpoint</td> @@ -131,6 +131,10 @@ <td class="tab">views idle update</td> <td class="tab">same as 02<tid>-stack-list-variables</td></tr> +<tr><td class="nowrap">04-data-read-memory-bytes</td> + <td class="tab">views idle update</td> + <td class="tab">fill Memory with data</td></tr> + <tr><td class="nowrap">04<tid>-stack-info-frame</td> <td class="tab">at stopped thread without address</td> <td class="tab">fill the thread columns</td></tr> @@ -141,13 +145,13 @@ <td class="tab">gdb startup if autorun</td> <td class="tab">-exec-run if active breaks & no errors</td></tr> -<tr><td class="nowrap">-''-</td> +<tr><td class="nowrap">05</td> <td class="tab">after temp break insert location</td> - <td class="tab">-''-</td></tr> + <td class="tab">-exec-run if active breaks & no errors</td></tr> -<tr><td class="nowrap">-''-</td> +<tr><td class="nowrap">05</td> <td class="tab">after temp break insert 1st loc</td> - <td class="tab">-''-</td></tr> + <td class="tab">-exec-run if active breaks & no errors</td></tr> <tr><td class="nowrap">05-list-features</td> <td class="tab">first time gdb startup</td> @@ -183,11 +187,15 @@ <tr><td class="nowrap">07-gdb-set</td> <td class="tab">local Modify / Value column edited</td> - <td class="tab">-''-</td></tr> + <td class="tab">mark data views as dirty</td></tr> -<tr><td class="nowrap">-''-</td> +<tr><td class="nowrap">07-gdb-set</td> <td class="tab">watch Modify / Value column edited</td> - <td class="tab">-''-</td></tr> + <td class="tab">mark data views as dirty</td></tr> + +<tr><td class="nowrap">07-data-write-memory-bytes</td> + <td class="tab">memory hex values column edited</td> + <td class="tab">mark data views as dirty</td></tr> <tr><td class="nowrap">070<scid>-var-delete</td> <td class="tab">un-Apply inspect</td> Modified: scope/docs/scope.html 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -534,7 +534,8 @@ tooltips_send_delay - increase this setting to reduce the CPU time and GDB traffic used by the tooltips, or decrease it if they appear slower than your gtk+ setting. -pref_tooltips_length - maximum length of a tooltip message, 0 = unlimited. +pref_tooltips_length - maximum length of a tooltip message, 0 = unlimited. +Default = 2048. [terminal] (*nix only) @@ -685,7 +686,7 @@ <a name="copyright">Copyright</a> -Scope 0.80, Copyright (C) 2012 Dimitar Toshkov Zhekov +Scope 0.82, 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/Makefile.am 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,8 @@ scope_la_SOURCES = \ inspect.h \ local.c \ local.h \ + memory.c \ + memory.h \ menu.c \ menu.h \ parse.c \ Modified: scope/src/break.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -214,7 +214,7 @@ static void on_break_column_edited(G_GNUC_UNUSED GtkCellRendererText *renderer, } static void on_break_ignore_editing_started(G_GNUC_UNUSED GtkCellRenderer *cell, - GtkCellEditable *editable, G_GNUC_UNUSED const gchar *path, gpointer G_GNUC_UNUSED gdata) + GtkCellEditable *editable, G_GNUC_UNUSED const gchar *path, G_GNUC_UNUSED gpointer gdata) { if (GTK_IS_EDITABLE(editable)) validator_attach(GTK_EDITABLE(editable), VALIDATOR_NUMERIC); @@ -1295,14 +1295,13 @@ static void on_break_apply_button_release(GtkWidget *widget, GdkEventButton *eve void break_init(void) { - GObject *break_type_column = get_object("break_type_column"); GtkWidget *menu; guint i; tree = view_connect("break_view", &model, &selection, break_cells, "break_window", NULL); store = GTK_LIST_STORE(model); sortable = GTK_TREE_SORTABLE(store); - gtk_tree_view_column_set_cell_data_func(GTK_TREE_VIEW_COLUMN(break_type_column), + gtk_tree_view_column_set_cell_data_func(get_column("break_type_column"), GTK_CELL_RENDERER(get_object("break_type")), break_type_set_data_func, NULL, NULL); g_signal_connect(get_object("break_ignore"), "editing-started", G_CALLBACK(on_break_ignore_editing_started), NULL); @@ -1315,7 +1314,7 @@ void break_init(void) g_signal_connect(selection, "changed", G_CALLBACK(on_break_selection_changed), NULL); gtk_widget_set_has_tooltip(GTK_WIDGET(tree), TRUE); g_signal_connect(tree, "query-tooltip", G_CALLBACK(on_break_query_tooltip), - GTK_TREE_VIEW_COLUMN(get_object("break_display_column"))); + get_column("break_display_column")); menu = menu_select("break_menu", &break_menu_info, selection); g_signal_connect(tree, "key-press-event", G_CALLBACK(on_break_key_press), NULL); Modified: scope/src/common.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -31,6 +31,7 @@ #include "gtk216.h" #include "inspect.h" #include "local.h" +#include "memory.h" #include "menu.h" #include "parse.h" #include "plugme.h" Modified: scope/src/conterm.c 15 files changed, 7 insertions(+), 8 deletions(-) =================================================================== @@ -349,10 +349,13 @@ static void on_console_clear(G_GNUC_UNUSED const MenuItem *menu_item) static gboolean on_console_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event, G_GNUC_UNUSED gpointer gdata) { - if (event->keyval == GDK_Insert || (event->keyval >= 0x21 && event->keyval <= 0x7F)) + gboolean insert = event->keyval == GDK_Insert || event->keyval == GDK_KP_Insert; + + if (insert || (event->keyval >= 0x21 && event->keyval <= 0x7F && + event->state <= GDK_SHIFT_MASK)) { char command[2] = { event->keyval, '\0' }; - view_command_line(event->keyval == GDK_Insert ? NULL : command, NULL, NULL, TRUE); + view_command_line(insert ? NULL : command, NULL, NULL, TRUE); } return FALSE; @@ -487,7 +490,7 @@ void conterm_init(void) "#C0C0C0", "#C000C0" }; guint i; - console = get_widget("debug_console"); + console = get_widget("debug_context"); gtk_widget_modify_base(console, GTK_STATE_NORMAL, &pref_vte_colour_back); gtk_widget_modify_cursor(console, &pref_vte_colour_fore, &pref_vte_colour_back); ui_widget_modify_font_from_string(console, pref_vte_font); @@ -495,12 +498,8 @@ void conterm_init(void) debug_context = GTK_TEXT_VIEW(console); dc_output = context_output; dc_output_nl = context_output_nl; - gtk_text_view_set_editable(debug_context, FALSE); - gtk_text_view_set_wrap_mode(debug_context, GTK_WRAP_CHAR); - gtk_text_view_set_left_margin(debug_context, 2); - gtk_text_view_set_right_margin(debug_context, 2); - context = gtk_text_view_get_buffer(debug_context); + for (i = 0; i < NFD; i++) { fd_tags[i] = gtk_text_buffer_create_tag(context, NULL, "foreground", Modified: scope/src/conterm.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,8 @@ #endif /* G_OS_UNIX */ /* pseudo-fd; 3 = prompt, 4 = scope error */ -void (*dc_output)(int fd, const char *text, gint length); -void (*dc_output_nl)(int fd, const char *text, gint length); +extern void (*dc_output)(int fd, const char *text, gint length); +extern void (*dc_output_nl)(int fd, const char *text, gint length); void dc_error(const char *format, ...) G_GNUC_PRINTF(1, 2); void dc_clear(void); Modified: scope/src/debug.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -748,9 +748,6 @@ void debug_finalize(void) { signal(SIGINT, SIG_DFL); g_source_remove(source_id); - /* avoid faults in g_main_context_dispatch() */ - while (gtk_events_pending()) - gtk_main_iteration(); } if (gdb_state != INACTIVE) @@ -758,8 +755,11 @@ void debug_finalize(void) gint count = 0; if (kill(gdb_pid, SIGKILL) == 0) - while (waitpid(gdb_pid, NULL, WNOHANG) == 0 && count++ <= pref_gdb_wait_death) + { + g_usleep(G_USEC_PER_SEC / 1000); + while (waitpid(gdb_pid, NULL, WNOHANG) == 0 && count++ < pref_gdb_wait_death) g_usleep(G_USEC_PER_SEC / 100); + } free_gdb(); /* may be still alive, but we can't do anything more */ statusbar_update_state(DS_INACTIVE); Modified: scope/src/gtk216.c 64 files changed, 60 insertions(+), 4 deletions(-) =================================================================== @@ -19,6 +19,54 @@ #include "common.h" +#if !GLIB_CHECK_VERSION(2, 20, 0) +/* :-( */ +typedef struct _ArraySize +{ + GArray *array; + guint element_size; +} ArraySize; + +GArray *array_sizes; + +static ArraySize *find_array_size(GArray *array) +{ + guint i; + gchar *data = array_sizes->data; + + for (i = 0; i < array_sizes->len; i++, 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.20.0 */ + #if !GTK_CHECK_VERSION(2, 18, 0) void gtk_widget_set_visible(GtkWidget *widget, gboolean visible) { @@ -74,8 +122,16 @@ void gtk216_init(void) SortColumnId *scd; for (scd = sort_column_ids; scd->id; scd++) - { - GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(get_object(scd->id)); - gtk_tree_view_column_set_sort_column_id(column, scd->sort_column_id); - } + gtk_tree_view_column_set_sort_column_id(get_column(scd->id), scd->sort_column_id); + +#if !GLIB_CHECK_VERSION(2, 20, 0) + array_sizes = g_array_sized_new(FALSE, FALSE, sizeof(ArraySize), 0x10); +#endif +} + +void gtk216_finalize(void) +{ +#if !GLIB_CHECK_VERSION(2, 20, 0) + g_array_free(array_sizes, TRUE); +#endif } Modified: scope/src/gtk216.h 14 files changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,19 @@ #ifndef GTK216_H +#if !GLIB_CHECK_VERSION(2, 20, 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.20.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) @@ -26,6 +39,7 @@ #endif void gtk216_init(void); +void gtk216_finalize(void); #define GTK216_H 1 #endif Modified: scope/src/inspect.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -397,7 +397,7 @@ void on_inspect_ndeleted(GArray *nodes) iff (*token <= '1', "%s: invalid i_oper", token) { GtkTreeIter iter; - + if (inspect_find(&iter, FALSE, token + 1)) { if (*token == '0') Modified: scope/src/menu.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -65,9 +65,9 @@ gboolean menu_insert_delete(const GdkEventKey *event, const MenuInfo *menu_info, { const char *name; - if (event->keyval == GDK_Insert) + if (event->keyval == GDK_Insert || event->keyval == GDK_KP_Insert) name = insert_name; - else if (event->keyval == GDK_Delete) + else if (event->keyval == GDK_Delete || event->keyval == GDK_KP_Delete) name = delete_name; else return FALSE; @@ -348,7 +348,7 @@ static void menu_evaluate_modify(const gchar *expr, const char *value, const gch if (gtk_dialog_run(GTK_DIALOG(modify_dialog)) == GTK_RESPONSE_ACCEPT) { text = utils_text_buffer_get_text(modify_text, -1); - utils_str_replace_all(&text, "\n", " "); + utils_strchrepl(text, '\n', ' '); if (validate_column(text, TRUE)) { Modified: scope/src/parse.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -93,6 +93,7 @@ static void on_data_modified(G_GNUC_UNUSED GArray *nodes) { "^done,ndeleted=\"", on_inspect_ndeleted, '7', '\0', 0 }, { "^done,path_expr=\"", on_inspect_path_expr, '4', '\0', 1 }, { "^done,changelist=[", on_inspect_changelist, '\0', '\0', 1 }, + { "^done,memory=[", on_memory_read_bytes, '\0', '\0', 1 }, { "^done,features=[", on_break_features, '5', '\0', 1 }, { "^done,features=[", on_target_features, '7', '\0', 1 }, { "^running", on_debug_loaded, '1', '\0', 0 }, Modified: scope/src/plugme.c 16 files changed, 0 insertions(+), 16 deletions(-) =================================================================== @@ -205,19 +205,3 @@ GtkWidget *plugme_ui_add_config_file_menu_item(const gchar *real_path, const gch return item; } - -#ifndef utils_str_replace_all -void utils_str_replace_all(gchar **haystack, const gchar *needle, const gchar *replacement) -{ - GString *str; - - g_return_if_fail(*haystack != NULL); - - str = g_string_new(*haystack); - - g_free(*haystack); - utils_string_replace_all(str, needle, replacement); - - *haystack = g_string_free(str, FALSE); -} -#endif /* utils_str_replace_all */ Modified: scope/src/prefs.c 9 files changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -58,6 +58,9 @@ gint pref_tooltips_send_delay; gint pref_tooltips_length; +gint pref_memory_bytes_per_line; +gchar *pref_memory_font; + #ifdef G_OS_UNIX static gboolean pref_terminal_save_pos; gboolean pref_terminal_padding; @@ -265,7 +268,7 @@ void prefs_init(void) group = stash_group_new("scope"); stash_group_add_string(group, &pref_gdb_executable, "gdb_executable", "gdb"); stash_group_add_boolean(group, &pref_gdb_async_mode, "gdb_async_mode", FALSE); - stash_group_add_integer(group, &pref_gdb_buffer_length, "gdb_buffer_length", 0x3FFF); + stash_group_add_integer(group, &pref_gdb_buffer_length, "gdb_buffer_length", 16383); stash_group_add_integer(group, &pref_gdb_wait_death, "gdb_wait_death", 20); #ifndef G_OS_UNIX stash_group_add_integer(group, &pref_gdb_send_interval, "gdb_send_interval", 5); @@ -289,7 +292,9 @@ void prefs_init(void) stash_group_add_integer(group, &pref_show_toolbar_items, "show_toolbar_items", 0xFF); stash_group_add_integer(group, &pref_tooltips_fail_action, "tooltips_fail_action", 25); stash_group_add_integer(group, &pref_tooltips_send_delay, "tooltips_send_delay", 25); - stash_group_add_integer(group, &pref_tooltips_length, "tooltips_length", 0x7FF); + stash_group_add_integer(group, &pref_tooltips_length, "tooltips_length", 2048); + stash_group_add_integer(group, &pref_memory_bytes_per_line, "memory_line_bytes", 16); + stash_group_add_string(group, &pref_memory_font, "memory_font", ""); scope_group = group; #ifdef stash_tree_setup Modified: scope/src/prefs.h 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -50,6 +50,9 @@ extern gint pref_tooltips_send_delay; extern gint pref_tooltips_length; +extern gint pref_memory_bytes_per_line; +extern gchar *pref_memory_font; + #ifdef G_OS_UNIX extern gboolean pref_terminal_padding; extern gint pref_terminal_window_x; Modified: scope/src/scope.c 15 files changed, 9 insertions(+), 6 deletions(-) =================================================================== @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(215) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Simple GDB front-end."), "0.80" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + _("Simple GDB front-end."), "0.82" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum @@ -553,6 +553,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) watch_init(); stack_init(); local_init(); + memory_init(); menu_init(); menu_set_popup_keybindings(item); @@ -572,7 +573,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) } toolbar_update_state(DS_INACTIVE); - watches_update_state(DS_INACTIVE); + views_update_state(DS_INACTIVE); scope_configure(); g_signal_connect(debug_panel, "switch-page", G_CALLBACK(on_view_changed), NULL); @@ -588,7 +589,6 @@ void plugin_cleanup(void) return; gtk_widget_destroy(debug_item); - gtk_widget_destroy(debug_statusbar); gtk_widget_destroy(debug_panel); for (item = toolbar_items; item->index != -1; item++) @@ -601,12 +601,15 @@ void plugin_cleanup(void) inspect_finalize(); thread_finalize(); break_finalize(); - utils_finalize(); + memory_finalize(); + menu_finalize(); views_finalize(); - debug_finalize(); + utils_finalize(); parse_finalize(); prefs_finalize(); - menu_finalize(); + debug_finalize(); + gtk216_finalize(); + gtk_widget_destroy(debug_statusbar); g_object_unref(builder); } Modified: scope/src/scope.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -25,6 +25,7 @@ void update_state(DebugState state); GObject *get_object(const char *name); GtkWidget *get_widget(const char *name); +#define get_column(name) GTK_TREE_VIEW_COLUMN(get_object(name)) #define find_widget(parent, name) GTK_WIDGET(g_object_get_data(G_OBJECT(parent), (name))) void open_debug_panel(void); void scope_configure(void); Modified: scope/src/stack.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -59,7 +59,7 @@ static void stack_node_location(const ParseNode *node, const char *fid) parse_location_free(&loc); if (!g_strcmp0(id, fid)) - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, -1); } } } @@ -81,7 +81,7 @@ void on_stack_frames(GArray *nodes) GtkTreeIter iter; if (gtk_tree_model_get_iter_first(model, &iter)) - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, -1); } } } @@ -286,7 +286,7 @@ static void on_stack_show_entry(const MenuItem *menu_item) do { const char *func1; - + gtk_tree_model_get(model, &iter, STACK_FUNC, &func1, -1); if (!strcmp(func, func1)) { @@ -366,7 +366,7 @@ void stack_init(void) view_set_line_data_func("stack_line_column", "stack_line", STACK_LINE); gtk_widget_set_has_tooltip(GTK_WIDGET(tree), TRUE); g_signal_connect(tree, "query-tooltip", G_CALLBACK(on_view_query_tooltip), - GTK_TREE_VIEW_COLUMN(get_object("stack_base_name_column"))); + get_column("stack_base_name_column")); g_signal_connect(tree, "key-press-event", G_CALLBACK(on_view_key_press), stack_seek_selected); Modified: scope/src/thread.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -481,7 +481,7 @@ void on_thread_exited(GArray *nodes) if (!g_strcmp0(tid, gdb_thread)) set_gdb_thread(NULL, FALSE); - + if (find_thread(tid, &iter)) { gboolean was_selected = !g_strcmp0(tid, thread_id); @@ -897,7 +897,7 @@ void thread_init(void) view_set_sort_func(sortable, THREAD_TARGET_ID, thread_ident_compare); gtk_widget_set_has_tooltip(GTK_WIDGET(tree), TRUE); g_signal_connect(tree, "query-tooltip", G_CALLBACK(on_view_query_tooltip), - GTK_TREE_VIEW_COLUMN(get_object("thread_base_name_column"))); + get_column("thread_base_name_column")); thread_groups = array_new(ThreadGroup, 0x10); RUNNING = _("Running"); Modified: scope/src/tooltip.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -56,7 +56,7 @@ static void tooltip_set(gchar *text) if (show) { - if (strlen(output) > (guint) pref_tooltips_length + 3) + if (pref_tooltips_length && strlen(output) > (size_t) pref_tooltips_length + 3) strcpy(output + pref_tooltips_length, "..."); tooltip_trigger(); Modified: scope/src/utils.c 26 files changed, 24 insertions(+), 2 deletions(-) =================================================================== @@ -113,6 +113,27 @@ const gchar *utils_skip_spaces(const gchar *text) return text; } +void utils_strchrepl(char *text, char c, char rep) +{ + char *p = text; + + while (*text) + { + if (*text == c) + { + if (rep) + *text = rep; + } + else if (!rep) + *p++ = *text; + + text++; + } + + if (!rep) + *p = '\0'; +} + gchar *array_append(GArray *array) { g_array_set_size(array, array->len + 1); @@ -194,8 +215,9 @@ void array_save(GArray *array, GKeyFile *config, const gchar *prefix, ASaveFunc { guint i, n = 0; gchar *data = array->data; + guint size = g_array_get_element_size(array); - for (i = 0; i < array->len; i++, data += g_array_get_element_size(array)) + for (i = 0; i < array->len; i++, data += size) { char *section = g_strdup_printf("%s_%d", prefix, n); n += save_func(config, section, data); @@ -663,7 +685,7 @@ static void on_insert_text(GtkEditable *editable, gchar *new_text, gint new_text G_GNUC_UNUSED gint *position, gpointer gdata) { gboolean valid = TRUE; - + if (new_text_length == -1) new_text_length = (gint) strlen(new_text); Modified: scope/src/utils.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,7 @@ void utils_handle_button_release(GtkWidget *widget, GdkEventButton *event); gboolean utils_check_path(const char *pathname, gboolean file, int mode); /* "" ok */ 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); Modified: scope/src/views.c 13 files changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -40,6 +40,7 @@ { 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, FALSE, 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 }, @@ -56,6 +57,7 @@ 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); } @@ -171,7 +173,7 @@ gboolean on_view_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event, /* from msgwindow.c */ gboolean enter_or_return = ui_is_keyval_enter_or_return(event->keyval); - if (enter_or_return || event->keyval == GDK_space) + if (enter_or_return || event->keyval == GDK_space || event->keyval == GDK_KP_Space) seeker(enter_or_return); return FALSE; @@ -316,7 +318,7 @@ static void view_line_cell_data_func(G_GNUC_UNUSED GtkTreeViewColumn *column, void view_set_line_data_func(const char *column, const char *cell, gint column_id) { - gtk_tree_view_column_set_cell_data_func(GTK_TREE_VIEW_COLUMN(get_object(column)), + gtk_tree_view_column_set_cell_data_func(get_column(column), GTK_CELL_RENDERER(get_object(cell)), view_line_cell_data_func, GINT_TO_POINTER(column_id), NULL); } @@ -337,7 +339,7 @@ void view_display_edited(GtkTreeModel *model, gboolean condition, const gchar *p gtk_tree_model_get(model, &iter, COLUMN_NAME, &name, COLUMN_HB_MODE, &hb_mode, -1); locale = utils_get_locale_from_display(new_text, hb_mode); - utils_str_replace_all(&locale, "\n", " "); + utils_strchrepl(locale, '\n', ' '); debug_send_format(F, format, name, locale); g_free(locale); } @@ -348,7 +350,7 @@ void view_display_edited(GtkTreeModel *model, gboolean condition, const gchar *p void view_column_set_visible(const char *name, gboolean visible) { - gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(get_object(name)), visible); + gtk_tree_view_column_set_visible(get_column(name), visible); } void view_seek_selected(GtkTreeSelection *selection, gboolean focus, SeekerType seeker) @@ -467,7 +469,8 @@ static void on_command_send_button_clicked(G_GNUC_UNUSED GtkButton *button, char *locale; thread_synchronize(); - utils_str_replace_all(&text, "\n", " "); + utils_strchrepl(text, '\n', ' '); + gtk_text_buffer_set_text(command_text, text, -1); start = utils_skip_spaces(text); locale = gtk_toggle_button_get_active(command_locale) ? utils_get_locale_from_utf8(start) : strdup(start); Modified: scope/src/views.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,7 @@ VIEW_STACK, VIEW_LOCALS, VIEW_WATCHES, + VIEW_MEMORY, VIEW_CONSOLE, VIEW_INSPECT, VIEW_TOOLTIP, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 33c9ae: Merge branch 'wip/webhelper'
by Colomban Wendling 13 Jan '13

13 Jan '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 13 Jan 2013 15:02:42 UTC Commit: 33c9ae1967f3ae8cd5dc0dfc61277856c42eef04 https://github.com/geany/geany-plugins/commit/33c9ae1967f3ae8cd5dc0dfc61277… Log Message: ----------- Merge branch 'wip/webhelper' Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 18 files changed, 13 insertions(+), 5 deletions(-) =================================================================== @@ -76,6 +76,7 @@ struct _GwhBrowserPrivate GtkToolItem *item_reload; GtkToolItem *item_inspector; + GtkWidget *statusbar; gchar *hovered_link; }; @@ -647,6 +648,7 @@ static void inspector_set_detached (GwhBrowser *self, g_object_unref (self->priv->default_icon); } g_object_unref (self->priv->settings); + g_object_unref (self->priv->statusbar); g_free (self->priv->hovered_link); G_OBJECT_CLASS (gwh_browser_parent_class)->finalize (object); @@ -892,8 +894,7 @@ static void inspector_set_detached (GwhBrowser *self, static guint id = 0; if (id == 0) { - id = gtk_statusbar_get_context_id (GTK_STATUSBAR (ui_widgets.statusbar), - "gwh-browser-hovered-link"); + id = gtk_statusbar_get_context_id (statusbar, "gwh-browser-hovered-link"); } return id; @@ -905,7 +906,7 @@ static void inspector_set_detached (GwhBrowser *self, gchar *uri, GwhBrowser *self) { - GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + GtkStatusbar *statusbar = GTK_STATUSBAR (self->priv->statusbar); if (self->priv->hovered_link) { gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); @@ -925,7 +926,7 @@ static void inspector_set_detached (GwhBrowser *self, GwhBrowser *self) { if (self->priv->hovered_link) { - GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + GtkStatusbar *statusbar = GTK_STATUSBAR (self->priv->statusbar); gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); } @@ -937,7 +938,7 @@ static void inspector_set_detached (GwhBrowser *self, GwhBrowser *self) { if (self->priv->hovered_link) { - GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + GtkStatusbar *statusbar = GTK_STATUSBAR (self->priv->statusbar); gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), self->priv->hovered_link); @@ -996,6 +997,13 @@ static void inspector_set_detached (GwhBrowser *self, : self->priv->paned), self->priv->inspector_view); + self->priv->statusbar = ui_lookup_widget (geany->main_widgets->window, "statusbar"); + if (self->priv->statusbar) { + g_object_ref (self->priv->statusbar); + } else { + /* in the unlikely case we can't get the Geany statusbar, fake one */ + self->priv->statusbar = gtk_statusbar_new (); + } self->priv->hovered_link = NULL; g_signal_connect (self, "notify::orientation", -------------- 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 January 2013