Plugins-Commits December 2012

plugins-commits@lists.geany.org

1 participants
25 discussions

[geany/geany-plugins] 788156: scope - select tree element -> select + focus + align
by Dimitar Zhekov 31 Dec '12

31 Dec '12

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Mon, 31 Dec 2012 16:38:43 UTC Commit: 7881564f8ffbe99cdaadc4d4166725ebf69c28d0 https://github.com/geany/geany-plugins/commit/7881564f8ffbe99cdaadc4d416672… Log Message: ----------- scope - select tree element -> select + focus + align Modified Paths: -------------- scope/ChangeLog scope/src/break.c scope/src/inspect.c scope/src/stack.c scope/src/thread.c scope/src/utils.c scope/src/utils.h scope/src/watch.c Modified: scope/ChangeLog 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,10 @@ +2012-12-30 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/break.c, src/inspect.c, src/stack.c, src/thread.c, src/utils.c, + src/utils.h, src/watch.c: + Select, focus and align tree elements instead of simply selecting. + + 2012-12-28 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/break.c, src/inspect.c, src/parse.c, src/program.c, Modified: scope/src/break.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -412,7 +412,7 @@ static void break_node_parse(const ParseNode *node, BreakData *bd) BREAK_DISCARD, !persist, -1); if (persist) - gtk_tree_selection_select_iter(selection, iter); + utils_tree_set_cursor(selection, iter, 0.5); g_free(original); g_free(display); @@ -940,7 +940,7 @@ void on_break_toggle(G_GNUC_UNUSED const MenuItem *menu_item) break_relocate(&iter, doc->real_path, doc_line); gtk_list_store_set(store, &iter, BREAK_SCID, ++scid_gen, BREAK_TYPE, 'b', BREAK_ENABLED, TRUE, BREAK_RUN_APPLY, TRUE, -1); - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, 0.5); sci_set_marker_at_line(doc->editor->sci, doc_line - 1, MARKER_BREAKPT + TRUE); } } Modified: scope/src/inspect.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -169,7 +169,7 @@ static void on_jump_to_menu_item_activate(GtkMenuItem *menuitem, G_GNUC_UNUSED g const gchar *expr = gtk_menu_item_get_label(menuitem); if (model_find(model, &iter, INSPECT_EXPR, expr)) - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, 0); } static GtkWidget *jump_to_item; @@ -632,7 +632,7 @@ void inspect_add(const gchar *text) gtk_tree_store_set(store, &iter, INSPECT_HB_MODE, pm->hb_mode, INSPECT_SCID, ++scid_gen, INSPECT_FORMAT, FORMAT_NATURAL, INSPECT_COUNT, option_inspect_count, INSPECT_EXPAND, option_inspect_expand, -1); - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, -1); if (debug_state() & DS_DEBUG) inspect_apply(&iter); Modified: scope/src/stack.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -186,7 +186,7 @@ void on_stack_follow(GArray *nodes) GtkTreeIter iter; iff (model_find(model, &iter, STACK_ID, id), "%s: level not found", id) - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, 0.5); } } } Modified: scope/src/thread.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -182,7 +182,7 @@ static void auto_select_thread(void) if (model_find(model, &iter, THREAD_STATE, STOPPED)) { - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, -1); view_seek_selected(selection, FALSE, SK_EXECUTE); } } @@ -409,7 +409,7 @@ void on_thread_stopped(GArray *nodes) if (thread_select_on_stopped && thread_state <= THREAD_RUNNING && sd.found) { - gtk_tree_selection_select_iter(selection, &sd.iter); + utils_tree_set_cursor(selection, &sd.iter, -1); view_seek_selected(selection, FALSE, SK_EXECUTE); } @@ -432,7 +432,7 @@ static void set_gdb_thread(const char *tid, gboolean select) GtkTreeIter iter; if (find_thread(gdb_thread, &iter)) - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, -1); } } Modified: scope/src/utils.c 12 files changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -780,6 +780,18 @@ void utils_enter_to_clicked(GtkWidget *widget, GtkWidget *button) g_signal_connect(widget, "key-press-event", G_CALLBACK(on_widget_key_press), button); } +void utils_tree_set_cursor(GtkTreeSelection *selection, GtkTreeIter *iter, gdouble align) +{ + GtkTreeView *tree = gtk_tree_selection_get_tree_view(selection); + GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(tree), iter); + + if (align >= 0) + gtk_tree_view_scroll_to_cell(tree, path, NULL, TRUE, align, 0); + + gtk_tree_view_set_cursor(tree, path, NULL, FALSE); + gtk_tree_path_free(path); +} + void utils_finalize(void) { guint i; Modified: scope/src/utils.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -110,8 +110,8 @@ enum gchar *utils_text_buffer_get_text(GtkTextBuffer *text, gint maxlen); void utils_enter_to_clicked(GtkWidget *widget, GtkWidget *button); +void utils_tree_set_cursor(GtkTreeSelection *selection, GtkTreeIter *iter, gdouble align); -void utils_init(void); void utils_finalize(void); #define UTILS_H 1 Modified: scope/src/watch.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -210,7 +210,7 @@ void watch_add(const gchar *text) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, WATCH_EXPR, expr, WATCH_HB_MODE, pm->hb_mode, WATCH_MR_MODE, pm->mr_mode, WATCH_SCID, ++scid_gen, WATCH_ENABLED, TRUE, -1); - gtk_tree_selection_select_iter(selection, &iter); + utils_tree_set_cursor(selection, &iter, 0.5); if (debug_state() & DS_DEBUG) watch_fetch(&iter); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 81f314: scope - use geany wrappers for some gtk+ functions
by Dimitar Zhekov 28 Dec '12

28 Dec '12

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Fri, 28 Dec 2012 19:09:29 UTC Commit: 81f31425d3fc08170507a84fe45b54943f0357f3 https://github.com/geany/geany-plugins/commit/81f31425d3fc08170507a84fe45b5… Log Message: ----------- scope - use geany wrappers for some gtk+ functions Modified Paths: -------------- scope/ChangeLog scope/docs/codes.html scope/src/break.c scope/src/conterm.c scope/src/inspect.c scope/src/parse.c scope/src/program.c scope/src/utils.c scope/src/watch.c Modified: scope/ChangeLog 11 files changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,14 @@ +2012-12-28 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/break.c, src/inspect.c, src/parse.c, src/program.c, + src/watch.c: + g_key_file_get_*() -> utils_get_setting_*(), provide reasonable + defaults for some settings on load error. + + * src/conterm.c: + gtk_widget_modify_font() -> ui_widget_modify_font_from_string(). + + 2012-12-27 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, docs/codes.html, docs/scope.html, src/parse.c, Modified: scope/docs/codes.html 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -132,7 +132,7 @@ <td class="tab">same as 02<tid>-stack-list-variables</td></tr> <tr><td class="nowrap">04<tid>-stack-info-frame</td> - <td class="tab">at stopped thread without frame</td> + <td class="tab">at stopped thread without address</td> <td class="tab">fill the thread columns</td></tr> <tr><td class="nowrap"> </td><td class="tab"> </td><td class="tab"> </td></tr> Modified: scope/src/break.c 13 files changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -986,12 +986,13 @@ static gboolean break_load(GKeyFile *config, const char *section) char *strings[STRING_COUNT]; gboolean valid = FALSE; - line = g_key_file_get_integer(config, section, "line", NULL); - type = g_key_file_get_integer(config, section, "type", NULL); - enabled = g_key_file_get_boolean(config, section, "enabled", NULL); - pending = g_key_file_get_boolean(config, section, "pending", NULL); - run_apply = g_key_file_get_boolean(config, section, "run_apply", NULL); - temporary = g_key_file_get_boolean(config, section, "temporary", NULL); + line = utils_get_setting_integer(config, section, "line", 0); + type = utils_get_setting_integer(config, section, "type", 0); + enabled = utils_get_setting_boolean(config, section, "enabled", TRUE); + pending = utils_get_setting_boolean(config, section, "pending", FALSE); + run_apply = utils_get_setting_boolean(config, section, "run_apply", + strchr(BP_BORTS, type) != NULL); + temporary = utils_get_setting_boolean(config, section, "temporary", FALSE); for (i = 0; i < STRING_COUNT; i++) strings[i] = utils_key_file_get_string(config, section, string_names[i]); Modified: scope/src/conterm.c 4 files changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -485,14 +485,12 @@ void conterm_init(void) { static const char *const colors[NFD] = { "#00C0C0", "#C0C0C0", "#C00000", "#C0C0C0", "#C000C0" }; - PangoFontDescription *font_desc = pango_font_description_from_string(pref_vte_font); guint i; console = get_widget("debug_console"); 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); - gtk_widget_modify_font(console, font_desc); - pango_font_description_free(font_desc); + ui_widget_modify_font_from_string(console, pref_vte_font); debug_context = GTK_TEXT_VIEW(console); dc_output = context_output; Modified: scope/src/inspect.c 13 files changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -701,13 +701,14 @@ static gboolean inspect_load(GKeyFile *config, const char *section) { char *name = utils_key_file_get_string(config, section, "name"); gchar *expr = utils_key_file_get_string(config, section, "expr"); - gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL); + gint hb_mode = utils_get_setting_integer(config, section, "hbit", HB_DEFAULT); char *frame = utils_key_file_get_string(config, section, "frame"); - gboolean run_apply = g_key_file_get_boolean(config, section, "run_apply", NULL); - gint start = g_key_file_get_integer(config, section, "start", NULL); - gint count = g_key_file_get_integer(config, section, "count", NULL); - gboolean expand = g_key_file_get_boolean(config, section, "expand", NULL); - gint format = g_key_file_get_integer(config, section, "format", NULL); + gboolean run_apply = utils_get_setting_boolean(config, section, "run_apply", FALSE); + gint start = utils_get_setting_integer(config, section, "start", 0); + gint count = utils_get_setting_integer(config, section, "count", option_inspect_count); + gboolean expand = utils_get_setting_boolean(config, section, "expand", + option_inspect_expand); + gint format = utils_get_setting_integer(config, section, "format", FORMAT_NATURAL); gboolean valid = FALSE; if (name && inspect_name_valid(name) && expr && (unsigned) hb_mode < HB_COUNT && Modified: scope/src/parse.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -484,9 +484,9 @@ static void parse_mode_free(ParseMode *pm) static gboolean parse_mode_load(GKeyFile *config, const char *section) { char *name = utils_key_file_get_string(config, section, "name"); - gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL); - gint mr_mode = g_key_file_get_integer(config, section, "member", NULL); - gboolean entry = g_key_file_get_boolean(config, section, "entry", NULL); + gint hb_mode = utils_get_setting_integer(config, section, "hbit", HB_DEFAULT); + gint mr_mode = utils_get_setting_integer(config, section, "member", MR_DEFAULT); + gboolean entry = utils_get_setting_boolean(config, section, "entry", TRUE); if (name && (unsigned) hb_mode < HB_COUNT && (unsigned) mr_mode < MR_MODIFY) { @@ -559,7 +559,7 @@ void parse_mode_update(const char *name, gint mode, gint value) } } - if (pm->hb_mode == HB_DEFAULT && pm->mr_mode == MR_DEFAULT && pm->entry == TRUE) + if (pm->hb_mode == HB_DEFAULT && pm->mr_mode == MR_DEFAULT && pm->entry) array_remove(parse_modes, pm); } Modified: scope/src/program.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -60,8 +60,8 @@ static void recent_program_free(RecentProgram *program) static gboolean recent_program_load(GKeyFile *config, const char *section) { - gchar *name = g_key_file_get_string(config, section, "name", NULL); - gint id = g_key_file_get_integer(config, section, "id", NULL); + gchar *name = utils_get_setting_string(config, section, "name", NULL); + gint id = utils_get_setting_integer(config, section, "id", 0); if (name && *name && id > 0 && (recent_bitmap & (1 << id)) == 0 && recent_programs->len < RECENT_COUNT) Modified: scope/src/utils.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -534,7 +534,7 @@ 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) { - gchar *string = g_key_file_get_string(config, section, key, NULL); + gchar *string = utils_get_setting_string(config, section, key, NULL); if (!validate_column(string, TRUE)) { Modified: scope/src/watch.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -236,9 +236,9 @@ void watches_delete_all(void) static gboolean watch_load(GKeyFile *config, const char *section) { gchar *expr = utils_key_file_get_string(config, section, "expr"); - gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL); - gint mr_mode = g_key_file_get_integer(config, section, "member", NULL); - gboolean enabled = g_key_file_get_boolean(config, section, "enabled", NULL); + gint hb_mode = utils_get_setting_integer(config, section, "hbit", HB_DEFAULT); + gint mr_mode = utils_get_setting_integer(config, section, "member", MR_DEFAULT); + gboolean enabled = utils_get_setting_boolean(config, section, "enabled", TRUE); gboolean valid = FALSE; if (expr && (unsigned) hb_mode < HB_COUNT && (unsigned) mr_mode < MR_MODIFY) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 20223b: Actually stop looking for Lua packages once we found one
by Enrico Tröger 28 Dec '12

28 Dec '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 28 Dec 2012 14:37:53 UTC Commit: 20223b5b42f700e897c5517a8b1322a1a61c8ed9 https://github.com/geany/geany-plugins/commit/20223b5b42f700e897c5517a8b132… Log Message: ----------- Actually stop looking for Lua packages once we found one Before the loop ran through all package names and just took the last item. Modified Paths: -------------- build/geanylua.m4 Modified: build/geanylua.m4 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -10,7 +10,7 @@ AC_DEFUN([GP_CHECK_GEANYLUA], for L in lua5.1 lua51 lua-5.1 lua; do PKG_CHECK_EXISTS([$L], - [LUA_PKG_NAME=$L],[]) + [LUA_PKG_NAME=$L]; break,[]) done]) LUA_VERSION=5.1 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7b65ae: Remove obsolete call to GP_CHECK_GEANYGDB
by Enrico Tröger 28 Dec '12

28 Dec '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 28 Dec 2012 14:32:33 UTC Commit: 7b65ae195e655e32b15ca8b54c13753e00ab42e7 https://github.com/geany/geany-plugins/commit/7b65ae195e655e32b15ca8b54c137… Log Message: ----------- Remove obsolete call to GP_CHECK_GEANYGDB Modified Paths: -------------- configure.ac Modified: configure.ac 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,6 @@ GP_CHECK_DEBUGGER GP_CHECK_DEVHELP GP_CHECK_GEANYDOC GP_CHECK_GEANYEXTRASEL -GP_CHECK_GEANYGDB GP_CHECK_GEANYGENDOC GP_CHECK_GEANYINSERTNUM GP_CHECK_GEANYLATEX -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e1f2b6: Re-order Lua package names for lookup
by Enrico Tröger 28 Dec '12

28 Dec '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 28 Dec 2012 14:06:32 UTC Commit: e1f2b6a31b1699430435d52f45e461889febef88 https://github.com/geany/geany-plugins/commit/e1f2b6a31b1699430435d52f45e46… Log Message: ----------- Re-order Lua package names for lookup Now we use the same order as the autotools based build and look for most specific version first (5.1). This fixes the build on distros like ArchLinux where the package "lua" is Lua 5.2. Modified Paths: -------------- geanylua/wscript_configure Modified: geanylua/wscript_configure 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,7 @@ from waflib.Errors import ConfigurationError from build.wafutils import check_cfg_cached -package_names = ['lua', 'lua5.1', 'lua51', 'lua-5.1'] +package_names = ['lua5.1', 'lua51', 'lua-5.1', 'lua'] def try_to_find_lua_package(): # try various package names as distributions like to use different ones -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] bcd1f5: scope - easier sync between GDB/Scope thread/frame, small fixes
by Dimitar Zhekov 27 Dec '12

27 Dec '12

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Thu, 27 Dec 2012 18:43:16 UTC Commit: bcd1f59cf85bcd3d783ea5c351cf4c9ea0fb28b4 https://github.com/geany/geany-plugins/commit/bcd1f59cf85bcd3d783ea5c351cf4… Log Message: ----------- scope - easier sync between GDB/Scope thread/frame, small fixes Modified Paths: -------------- scope/ChangeLog scope/NEWS scope/data/scope.glade scope/docs/codes.html scope/docs/scope.html scope/src/break.c scope/src/inspect.c scope/src/local.c scope/src/menu.c scope/src/parse.c scope/src/program.c scope/src/scope.c scope/src/stack.c scope/src/stack.h scope/src/thread.c scope/src/thread.h scope/src/views.c scope/src/views.h scope/src/watch.c Modified: scope/ChangeLog 28 files changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,27 @@ +2012-12-27 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * data/scope.glade, docs/codes.html, docs/scope.html, src/parse.c, + src/stack.c, src/stack.h, src/thread.c, src/thread.h, src/views.c: + Easier sync between GDB/Scope thread/frame. + + * docs/scope.html, src/scope.c: + Increased version to 0.79. + + +2012-12-26 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * data/scope.glade, docs/codes.html, src/break.c, src/inspect.c, + src/local.c, src/menu.c, src/stack.c, src/thread.c, src/views.h, + src/watch.c: + Small fixes, simplified menu action debug states. + + +2012-12-24 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/thread.c: + Limit TerminateProcess() exit code to UINT_MAX, not NSIG. + + 2012-12-23 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * docs/scope.html, src/prefs.c, src/prefs.h, src/thread.c: @@ -6,6 +30,7 @@ * docs/scope.html, src/scope.c: Increased version to 0.78. + 2012-12-22 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * NEWS: @@ -18,12 +43,14 @@ Removed parse_lead_locale(), not used. * src/program.c, src/scope.c: Unified error message format. + 2012-12-18 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * build/scope.m4, scope/src/Makefile.am: No -lutil under win32. + 2012-12-16 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/common.h, src/menu.h: @@ -40,6 +67,7 @@ * docs/scope.html, src/scope.c: Increased version to 0.77. + 2012-12-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * data/scope.glade, src/local.c, src/parse.c, src/parse.h, Modified: scope/NEWS 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -1,12 +1,19 @@ +Scope 0.79 (2012-12-27) + + * Easier sync between Scope/GDB thread/frame. + + Scope 0.78 (2012-12-23) * Added option "keep_exec_point" to keep the execution point marker and Threads location columns when a thread execution is resumed. + Scope 0.77 (2012-12-16) * Support for " and \ in evaluate expressions. + Scope 0.76 (2012-12-13) * Per-function display of @entry arguments. Modified: scope/data/scope.glade 23 files changed, 22 insertions(+), 1 deletions(-) =================================================================== @@ -461,6 +461,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="thread_synchronize"> + <property name="visible">True</property> + <property name="label" translatable="yes">S_ynchronize</property> + <property name="use_underline">True</property> + </object> + </child> + <child> <object class="GtkImageMenuItem" id="thread_interrupt"> <property name="label" translatable="yes">_Interrupt</property> <property name="visible">True</property> @@ -518,6 +525,13 @@ <property name="use_underline">True</property> </object> </child> + <child> + <object class="GtkCheckMenuItem" id="thread_select_follow"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Follow</property> + <property name="use_underline">True</property> + </object> + </child> </object> </child> </object> @@ -651,9 +665,16 @@ </object> </child> <child> + <object class="GtkMenuItem" id="stack_synchronize"> + <property name="visible">True</property> + <property name="label" translatable="yes">S_ynchronize</property> + <property name="use_underline">True</property> + </object> + </child> + <child> <object class="GtkCheckMenuItem" id="stack_show_entry"> <property name="visible">True</property> - <property name="label" translatable="yes">Show _@entry</property> + <property name="label" translatable="yes">_Show @entry</property> <property name="use_underline">True</property> </object> </child> Modified: scope/docs/codes.html 22 files changed, 17 insertions(+), 5 deletions(-) =================================================================== @@ -21,13 +21,13 @@ <tr><td class="nowrap"> </td><td class="tab"> </td><td class="tab"> </td></tr> -<tr><td class="nowrap">016source</td> +<tr><td class="nowrap">010-file-exec-and-symbols</td> <td class="tab">program startup</td> - <td class="tab">apply breaks/inspects, send autorun commands</td></tr> + <td class="tab">same as 011 if no run script, otherwise nop</td></tr> -<tr><td class="nowrap">015-file-exec-and-symbols</td> +<tr><td class="nowrap">011source</td> <td class="tab">program startup</td> - <td class="tab">same as 016 if no run script, otherwise nop</td></tr> + <td class="tab">apply breaks/inspects, send autorun commands</td></tr> <tr><td class="nowrap"> </td><td class="tab"> </td><td class="tab"> </td></tr> @@ -71,6 +71,10 @@ <td class="tab">re-Apply breakpoint (obsolete)</td> <td class="tab">apply breakpoint (after being deleted in gdb)</td></tr> +<tr><td class="nowrap">02-thread-info</td> + <td class="tab">Synchronize threads</td> + <td class="tab">refresh threads & select the current gdb thread</td></tr> + <tr><td class="nowrap">02<tid>-stack-list-frames</td> <td class="tab">Refresh stack</td> <td class="tab">clear stack list and load stack frames into it</td></tr> @@ -79,6 +83,10 @@ <td class="tab">Refresh stack</td> <td class="tab">fill stack Arguments column</td></tr> +<tr><td class="nowrap">02<tid>-stack-info-frame</td> + <td class="tab">Syncronize stack</td> + <td class="tab">select the current gdb frame</td></tr> + <tr><td class="nowrap">02<tid><fid>-stack-list-variables</td> <td class="tab">Refresh locals</td> <td class="tab">clear locals list and load local variables into it</td></tr> @@ -123,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<tid>-stack-info-frame</td> + <td class="tab">at stopped thread without frame</td> + <td class="tab">fill the thread columns</td></tr> + <tr><td class="nowrap"> </td><td class="tab"> </td><td class="tab"> </td></tr> <tr><td class="nowrap">05</td> @@ -134,7 +146,7 @@ <td class="tab">-''-</td></tr> <tr><td class="nowrap">-''-</td> - <td class="tab">after temp break insert first loc</td> + <td class="tab">after temp break insert 1st loc</td> <td class="tab">-''-</td></tr> <tr><td class="nowrap">05-list-features</td> Modified: scope/docs/scope.html 18 files changed, 15 insertions(+), 3 deletions(-) =================================================================== @@ -279,6 +279,11 @@ Commands starting with 0<digit> are used internally by Scope and will be blocked. +Scope tries to keep track of the current gdb thread, and to emit a -thread-select command +on Send/Busy if the gdb thread does not match the one (if any) selected in +Threads. Tracking the current gdb frame asynchronously is impossible, so you must use +a gdb frame selection command or --frame for the non-zero frames. + Writing a full combo box for multi-line text is outside the scope of this project. <a name="reset markers">Reset Markers</a> @@ -322,6 +327,9 @@ Refresh - will not append or remove threads, only update the currently listed ones. +Synchronize - refresh and select the current gdb thread. Shift-click: +-thread-select. + Interrupt - *nix: SIGINT, win~1: DebugBreakProcess. Terminate - *nix: SIGTERM, win~1: TerminateProcess. @@ -329,7 +337,7 @@ Both Interrupt and Terminate require an extra Step deliver a signal/*process to a stopped thread, and an extra Step to terminate a process. -<div>Re-select on:</div> +<div>Select on:</div> <table border="0"> <tr><td class="tab">Running</td><td class="tab">Select a stopped thread (if any) when the current thread becomes running. Useful when starting/stopping lots of threads, but may be @@ -339,6 +347,8 @@ there is no stopped thread already selected).</td></tr> <tr><td class="tab">Exited</td><td class="tab">Select a stopped thread (if any) when the current thread is exited.</td></tr> +<tr><td class="tab">Follow</td><td class="tab">Follow gdb =thread-selected. It'll be +better to clear the other options.</td></tr> </table> <a name="break">Breakpoints</a> @@ -361,7 +371,7 @@ Apply on run is off by default for watchpoints, because they are often related to a local expression. -Shift-Clicking Apply applies the breakpoint for the currently selected thread +Shift-clicking Apply applies the breakpoint for the currently selected thread only. GDB may report an error for invalid Condition and/or Script, but still @@ -388,6 +398,8 @@ The function arguments are subject to 8-bit text conversion. Their individual modes may be set via Locals. +Synchronize - select the current gdb frame. Shift-click: -stack-select-frame. + Show @entry - display any @entry arguments reported by gdb for the selected frame function. Depends on GDB "print entry-values". Applies to Locals too. @@ -673,7 +685,7 @@ <a name="copyright">Copyright</a> -Scope 0.78, Copyright (C) 2012 Dimitar Toshkov Zhekov +Scope 0.79, Copyright (C) 2012 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 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1238,7 +1238,7 @@ static void on_break_view_source(G_GNUC_UNUSED const MenuItem *menu_item) static MenuItem break_menu_items[] = { { "break_refresh", on_break_refresh, DS_SENDABLE, NULL, NULL }, - { "break_unsorted", on_break_unsorted, DS_SORTABLE, NULL, NULL }, + { "break_unsorted", on_break_unsorted, 0, NULL, NULL }, { "break_view_source", on_break_view_source, DS_VIEWABLE, NULL, NULL }, { "break_insert", on_break_insert, DS_SENDABLE, NULL, NULL }, { "break_watch", on_break_watch, DS_SENDABLE, NULL, NULL }, Modified: scope/src/inspect.c 16 files changed, 7 insertions(+), 9 deletions(-) =================================================================== @@ -940,8 +940,6 @@ static void on_inspect_delete(G_GNUC_UNUSED const MenuItem *menu_item) gtk_tree_store_remove(store, &iter); } -#define DS_FRESHABLE DS_SENDABLE -#define DS_INSPECTABLE DS_NOT_BUSY #define DS_EDITABLE (DS_BASICS | DS_EXTRA_2) #define DS_APPLIABLE (DS_SENDABLE | DS_EXTRA_3) #define DS_EXPANDABLE (DS_SENDABLE | DS_EXTRA_4) @@ -956,13 +954,13 @@ static void on_inspect_delete(G_GNUC_UNUSED const MenuItem *menu_item) static MenuItem inspect_menu_items[] = { - { "inspect_refresh", on_inspect_refresh, DS_FRESHABLE, NULL, NULL }, - { "inspect_add", on_inspect_add, DS_INSPECTABLE, NULL, NULL }, - { "inspect_edit", on_inspect_edit, DS_EDITABLE, NULL, NULL }, - { "inspect_apply", on_inspect_apply, DS_APPLIABLE, NULL, NULL }, - { "inspect_expand", on_inspect_expand, DS_EXPANDABLE, NULL, NULL }, - { "inspect_copy", on_inspect_copy, DS_COPYABLE, NULL, NULL }, - { "inspect_format", on_inspect_format_display, DS_FORMATABLE, NULL, NULL }, + { "inspect_refresh", on_inspect_refresh, DS_SENDABLE, NULL, NULL }, + { "inspect_add", on_inspect_add, DS_NOT_BUSY, NULL, NULL }, + { "inspect_edit", on_inspect_edit, DS_EDITABLE, NULL, NULL }, + { "inspect_apply", on_inspect_apply, DS_APPLIABLE, NULL, NULL }, + { "inspect_expand", on_inspect_expand, DS_EXPANDABLE, NULL, NULL }, + { "inspect_copy", on_inspect_copy, DS_COPYABLE, NULL, NULL }, + { "inspect_format", on_inspect_format_display, DS_FORMATABLE, NULL, NULL }, FORMAT_ITEM("natural", FORMAT_NATURAL), FORMAT_ITEM("decimal", FORMAT_DECIMAL), FORMAT_ITEM("hex", FORMAT_HEX), Modified: scope/src/local.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -230,7 +230,7 @@ static void on_local_mr_mode(const MenuItem *menu_item) static MenuItem local_menu_items[] = { { "local_refresh", on_local_refresh, DS_FRESHABLE, NULL, NULL }, - { "local_unsorted", on_local_unsorted, DS_SORTABLE, NULL, NULL }, + { "local_unsorted", on_local_unsorted, 0, NULL, NULL }, { "local_copy", on_local_copy, DS_COPYABLE, NULL, NULL }, { "local_modify", on_local_modify, DS_MODIFYABLE, NULL, NULL }, { "local_watch", on_local_watch, DS_WATCHABLE, NULL, NULL }, Modified: scope/src/menu.c 8 files changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -441,14 +441,12 @@ static void on_popup_inspect(G_GNUC_UNUSED const MenuItem *menu_item) } #define DS_EVALUATE (DS_SENDABLE | DS_EXTRA_1) -#define DS_WATCHABLE 0 -#define DS_INSPECTABLE DS_NOT_BUSY static MenuItem popup_menu_items[] = { - { "popup_evaluate", on_popup_evaluate, DS_EVALUATE, NULL, NULL }, - { "popup_watch", on_popup_watch, DS_WATCHABLE, NULL, NULL }, - { "popup_inspect", on_popup_inspect, DS_WATCHABLE, NULL, NULL }, + { "popup_evaluate", on_popup_evaluate, DS_EVALUATE, NULL, NULL }, + { "popup_watch", on_popup_watch, 0, NULL, NULL }, + { "popup_inspect", on_popup_inspect, DS_NOT_BUSY, NULL, NULL }, { NULL, NULL, 0, NULL, NULL } }; Modified: scope/src/parse.c 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -57,6 +57,7 @@ static void on_quiet_error(G_GNUC_UNUSED GArray *nodes) { "*stopped,", on_thread_stopped, '\0', '\0', 0 }, { "=thread-created,", on_thread_created, '\0', '\0', 0 }, { "=thread-exited,", on_thread_exited, '\0', '\0', 0 }, + { "=thread-selected,id=\"", on_thread_selected, '\0', '\0', 1 }, { "=thread-group-started,id=\"", on_thread_group_started, '\0', '\0', 1 }, { "=thread-group-exited,id=\"", on_thread_group_exited, '\0', '\0', 1 }, { "=thread-group-added,id=\"", on_thread_group_added, '\0', '\0', 1 }, @@ -68,8 +69,11 @@ static void on_quiet_error(G_GNUC_UNUSED GArray *nodes) { "^done,wpt={", on_break_inserted, '\0', '\0', 1 }, { "^done,hw-awpt={", on_break_inserted, '\0', '\0', 1 }, { "^done,hw-rwpt={", on_break_inserted, '\0', '\0', 1 }, + { "^done,threads=[", on_thread_follow, '2', '\0', 1 }, { "^done,threads=[", on_thread_info, '\0', '\0', 1 }, + { "^done,new-thread-id=\"", on_thread_selected, '\0', '\0', 1 }, { "^done,BreakpointTable={", on_break_list, '\0', '\0', 1 }, + { "^done,frame={", on_stack_follow, '2', '\0', 0 }, { "^done,frame={", on_thread_frame, '4', '\0', 0 }, { "^done,stack=[", on_stack_frames, '*', '\0', 1 }, { "^done,stack-args=[", on_stack_arguments, '*', '\0', 1 }, Modified: scope/src/program.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -418,6 +418,7 @@ void program_init(void) extern gboolean thread_select_on_running; extern gboolean thread_select_on_stopped; extern gboolean thread_select_on_exited; + extern gboolean thread_select_follow; program_dialog = dialog_connect("program_dialog"); program_page_vbox = get_widget("program_page_vbox"); @@ -525,6 +526,7 @@ void program_init(void) stash_group_add_boolean(group, &thread_select_on_running, "select_on_running", FALSE); stash_group_add_boolean(group, &thread_select_on_stopped, "select_on_stopped", TRUE); stash_group_add_boolean(group, &thread_select_on_exited, "select_on_exited", TRUE); + stash_group_add_boolean(group, &thread_select_follow, "select_follow", TRUE); stash_group_add_boolean(group, &thread_show_group, "show_group", TRUE); stash_group_add_boolean(group, &thread_show_core, "show_core", TRUE); thread_group = group; Modified: scope/src/scope.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(215) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Simple GDB front-end."), "0.78" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + _("Simple GDB front-end."), "0.79" , "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum Modified: scope/src/stack.c 85 files changed, 61 insertions(+), 24 deletions(-) =================================================================== @@ -68,9 +68,7 @@ static void stack_node_location(const ParseNode *node, const char *fid) void on_stack_frames(GArray *nodes) { - const char *token = parse_grab_token(nodes); - - if (!g_strcmp0(token, thread_id)) + if (!g_strcmp0(parse_grab_token(nodes), thread_id)) { char *fid = g_strdup(frame_id); @@ -163,17 +161,34 @@ static void stack_node_arguments(const ParseNode *node, ArgsData *ad) void on_stack_arguments(GArray *nodes) { - gint column_id; - GtkSortType order; - ArgsData ad; - - gtk_tree_sortable_get_sort_column_id(sortable, &column_id, &order); - ad.sorted = column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID || - (column_id == STACK_ID && order == GTK_SORT_ASCENDING); - ad.valid = ad.sorted && gtk_tree_model_get_iter_first(model, &ad.iter); - if (!g_strcmp0(parse_grab_token(nodes), thread_id)) + { + gint column_id; + GtkSortType order; + ArgsData ad; + + gtk_tree_sortable_get_sort_column_id(sortable, &column_id, &order); + ad.sorted = column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID || + (column_id == STACK_ID && order == GTK_SORT_ASCENDING); + ad.valid = ad.sorted && gtk_tree_model_get_iter_first(model, &ad.iter); array_foreach(parse_lead_array(nodes), (GFunc) stack_node_arguments, &ad); + } +} + +void on_stack_follow(GArray *nodes) +{ + if (!g_strcmp0(parse_grab_token(nodes), thread_id)) + { + const char *id = parse_find_value(parse_lead_array(nodes), "level"); + + iff (id, "no level") + { + GtkTreeIter iter; + + iff (model_find(model, &iter, STACK_ID, id), "%s: level not found", id) + gtk_tree_selection_select_iter(selection, &iter); + } + } } gboolean stack_entry(void) @@ -227,6 +242,16 @@ static void on_stack_refresh(G_GNUC_UNUSED const MenuItem *menu_item) stack_send_update('2'); } +static void on_stack_synchronize(const MenuItem *menu_item) +{ + if (menu_item) + thread_query_frame('2'); + else if (frame_id) + debug_send_format(T, "-stack-select-frame %s", frame_id); + else + plugin_blink(); +} + static void on_stack_unsorted(G_GNUC_UNUSED const MenuItem *menu_item) { gtk_tree_sortable_set_sort_column_id(sortable, GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, @@ -279,30 +304,33 @@ static void on_stack_show_entry(const MenuItem *menu_item) debug_send_format(T, "04%s-stack-list-arguments 1", thread_id); } -#define DS_FRESHABLE (DS_DEBUG | DS_EXTRA_1) -#define DS_ENTRABLE (DS_ACTIVE | DS_EXTRA_2) -#define DS_VIEWABLE (DS_ACTIVE | DS_EXTRA_3) +#define DS_VIEWABLE (DS_ACTIVE | DS_EXTRA_2) +#define DS_ENTRABLE (DS_ACTIVE | DS_EXTRA_3) static MenuItem stack_menu_items[] = { - { "stack_refresh", on_stack_refresh, DS_FRESHABLE, NULL, NULL }, - { "stack_unsorted", on_stack_unsorted, DS_SORTABLE, NULL, NULL }, - { "stack_view_source", on_stack_view_source, DS_VIEWABLE, NULL, NULL }, - { "stack_show_entry", on_stack_show_entry, DS_ENTRABLE, NULL, NULL }, - { "stack_show_address", on_stack_show_address, 0, NULL, &stack_show_address }, + { "stack_refresh", on_stack_refresh, DS_DEBUG, NULL, NULL }, + { "stack_unsorted", on_stack_unsorted, 0, NULL, NULL }, + { "stack_view_source", on_stack_view_source, DS_VIEWABLE, NULL, NULL }, + { "stack_synchronize", on_stack_synchronize, DS_DEBUG, NULL, NULL }, + { "stack_show_entry", on_stack_show_entry, DS_ENTRABLE, NULL, NULL }, + { "stack_show_address", on_stack_show_address, 0, NULL, &stack_show_address }, { NULL, NULL, 0, NULL, NULL } }; static guint stack_menu_extra_state(void) { GtkTreeIter iter; - const char *func = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - gtk_tree_model_get(model, &iter, STACK_FUNC, &func, -1); + { + const char *file, *func; + + gtk_tree_model_get(model, &iter, STACK_FILE, &file, STACK_FUNC, &func, -1); + return ((file != NULL) << DS_INDEX_2) | ((func != NULL) << DS_INDEX_3); + } - return ((thread_id != NULL) << DS_INDEX_1) | ((func != NULL) << DS_INDEX_2) | - ((frame_id != NULL) << DS_INDEX_3); + return 0; } static MenuInfo stack_menu_info = { stack_menu_items, stack_menu_extra_state, 0 }; @@ -320,6 +348,12 @@ static void on_stack_menu_show(G_GNUC_UNUSED GtkWidget *widget, const MenuItem * menu_item_set_active(menu_item + 1, stack_show_address); } +static void on_stack_synchronize_button_release(GtkWidget *widget, GdkEventButton *event, + GtkWidget *menu) +{ + menu_shift_button_release(widget, event, menu, on_stack_synchronize); +} + void stack_init(void) { GtkTreeView *tree = view_create("stack_view", &model, &selection); @@ -339,6 +373,9 @@ void stack_init(void) g_signal_connect(tree, "button-press-event", G_CALLBACK(on_view_button_1_press), stack_seek_selected); g_signal_connect(selection, "changed", G_CALLBACK(on_stack_selection_changed), NULL); + g_signal_connect(menu, "show", G_CALLBACK(on_stack_menu_show), (gpointer) menu_item_find(stack_menu_items, "stack_show_entry")); + g_signal_connect(get_widget("stack_synchronize"), "button-release-event", + G_CALLBACK(on_stack_synchronize_button_release), menu); } Modified: scope/src/stack.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -23,6 +23,7 @@ void on_stack_frames(GArray *nodes); void on_stack_arguments(GArray *nodes); +void on_stack_follow(GArray *nodes); gboolean stack_entry(void); void stack_clear(void); Modified: scope/src/thread.c 112 files changed, 96 insertions(+), 16 deletions(-) =================================================================== @@ -28,6 +28,7 @@ #include <signal.h> #else #define WINVER 0x0501 +#include <limits.h> #include <windows.h> #endif @@ -235,12 +236,10 @@ static void thread_iter_running(GtkTreeIter *iter, const char *tid) } } -/* select a stopped thread when the current thread becomes running */ gboolean thread_select_on_running; -/* select a thread when it stops (unless already at stopped thread) */ gboolean thread_select_on_stopped; -/* select a stopped thread when the current thread exits */ gboolean thread_select_on_exited; +gboolean thread_select_follow; void on_thread_running(GArray *nodes) { @@ -421,6 +420,22 @@ void on_thread_stopped(GArray *nodes) view_dirty(VIEW_BREAKS); } +static char *gdb_thread = NULL; + +static void set_gdb_thread(const char *tid, gboolean select) +{ + g_free(gdb_thread); + gdb_thread = g_strdup(tid); + + if (select) + { + GtkTreeIter iter; + + if (find_thread(gdb_thread, &iter)) + gtk_tree_selection_select_iter(selection, &iter); + } +} + void on_thread_created(GArray *nodes) { const char *tid = parse_find_value(nodes, "id"); @@ -454,6 +469,9 @@ void on_thread_created(GArray *nodes) if (group && group->pid) gtk_list_store_set(store, &iter, THREAD_PID, group->pid, -1); } + + if (thread_count == 1) + set_gdb_thread(tid, TRUE); } } @@ -465,6 +483,9 @@ void on_thread_exited(GArray *nodes) { GtkTreeIter iter; + if (!g_strcmp0(tid, gdb_thread)) + set_gdb_thread(NULL, FALSE); + if (find_thread(tid, &iter)) { gboolean was_selected = !g_strcmp0(tid, thread_id); @@ -490,6 +511,11 @@ void on_thread_exited(GArray *nodes) } } +void on_thread_selected(GArray *nodes) +{ + set_gdb_thread(parse_lead_value(nodes), thread_select_follow); +} + static void thread_parse(GArray *nodes, const char *tid, gboolean stopped) { GtkTreeIter iter; @@ -530,9 +556,27 @@ static void thread_node_parse(const ParseNode *node, G_GNUC_UNUSED gpointer gdat } } -void on_thread_info(GArray *nodes) +static const char *thread_info_parse(GArray *nodes, gboolean select) { + const char *tid = parse_find_value(nodes, "current-thread-id"); + array_foreach(parse_lead_array(nodes), (GFunc) thread_node_parse, NULL); + + if (tid) + set_gdb_thread(tid, select); + + return tid; +} + +void on_thread_info(GArray *nodes) +{ + thread_info_parse(nodes, thread_select_follow); +} + +void on_thread_follow(GArray *nodes) +{ + if (!thread_info_parse(nodes, TRUE)) + dc_error("no current tid"); } void on_thread_frame(GArray *nodes) @@ -562,6 +606,7 @@ void threads_clear(void) model_foreach(model, (GFunc) thread_iter_unmark, GINT_TO_POINTER(TRUE)); array_clear(thread_groups, (GFreeFunc) thread_group_free); gtk_list_store_clear(store); + set_gdb_thread(NULL, FALSE); thread_count = 0; } @@ -590,6 +635,17 @@ gboolean threads_update(void) return TRUE; } +void thread_query_frame(char token) +{ + debug_send_format(T, "0%c%s-stack-info-frame", token, thread_id); +} + +void thread_synchronize(void) +{ + if (thread_id && g_strcmp0(thread_id, gdb_thread)) + debug_send_format(N, "04-thread-select %s", thread_id); +} + static void on_thread_selection_changed(GtkTreeSelection *selection, G_GNUC_UNUSED gpointer gdata) { @@ -621,7 +677,7 @@ static void on_thread_selection_changed(GtkTreeSelection *selection, thread_state = THREAD_STOPPED; if (debug_state() & DS_DEBUG) - thread_query_frame(); + thread_query_frame('4'); else thread_state = THREAD_QUERY_FRAME; } @@ -661,6 +717,16 @@ static void on_thread_view_source(G_GNUC_UNUSED const MenuItem *menu_item) thread_seek_selected(FALSE); } +static void on_thread_synchronize(const MenuItem *menu_item) +{ + if (menu_item) + debug_send_command(N, "02-thread-info"); + else if (thread_id) + debug_send_format(N, "-thread-select %s", thread_id); + else + plugin_blink(); +} + #ifdef G_OS_UNIX static void send_signal(int sig) { @@ -696,11 +762,13 @@ static void on_thread_send_signal(G_GNUC_UNUSED const MenuItem *menu_item) { gdouble value = 1; - if (dialogs_show_input_numeric(_("Send Signal"), _("Enter signal #:"), &value, 1, NSIG, 1)) + if (dialogs_show_input_numeric(_("Send Signal"), _("Enter signal #:"), &value, 1, NSIG, + 1)) + { send_signal(value); + } } #else /* G_OS_UNIX */ - static HANDLE iter_to_handle(GtkTreeIter *iter) { const char *pid; @@ -735,7 +803,7 @@ static void on_thread_terminate(G_GNUC_UNUSED const MenuItem *menu_item) gdouble value = 1; if (dialogs_show_input_numeric(_("Terminate Process"), _("Enter exit code:"), &value, 1, - NSIG, 1)) + UINT_MAX, 1)) { GtkTreeIter iter; @@ -772,25 +840,27 @@ static void on_thread_show_core(const MenuItem *menu_item) view_column_set_visible("thread_core_column", thread_show_core); } -#define DS_INTRABLE (DS_ACTIVE | DS_EXTRA_2) -#define DS_TERMABLE (DS_ACTIVE | DS_EXTRA_2) -#define DS_SIGNABLE (DS_ACTIVE | DS_EXTRA_2) -#define DS_VIEWABLE (DS_ACTIVE | DS_EXTRA_3) +#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[] = { { "thread_refresh", on_thread_refresh, DS_SENDABLE, NULL, NULL }, - { "thread_unsorted", on_thread_unsorted, DS_SORTABLE, NULL, NULL }, + { "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 }, #ifdef G_OS_UNIX { "thread_send_signal", on_thread_send_signal, DS_SIGNABLE, NULL, NULL }, #endif - { "thread_auto_select", on_menu_display_booleans, 0, NULL, GINT_TO_POINTER(3) }, + { "thread_auto_select", on_menu_display_booleans, 0, NULL, GINT_TO_POINTER(4) }, { "thread_select_on_running", on_menu_update_boolean, 0, NULL, &thread_select_on_running }, { "thread_select_on_stopped", on_menu_update_boolean, 0, NULL, &thread_select_on_stopped }, { "thread_select_on_exited", on_menu_update_boolean, 0, NULL, &thread_select_on_exited }, + { "thread_select_follow", on_menu_update_boolean, 0, NULL, &thread_select_follow }, { "thread_show_columns", on_menu_display_booleans, 0, NULL, GINT_TO_POINTER(2) }, { "thread_show_group", on_thread_show_group, 0, NULL, &thread_show_group }, { "thread_show_core", on_thread_show_core, 0, NULL, &thread_show_core }, @@ -806,7 +876,7 @@ static guint thread_menu_extra_state(void) const char *pid, *file; gtk_tree_model_get(model, &iter, THREAD_PID, &pid, THREAD_FILE, &file, -1); - return ((pid && atoi(pid) > 0) << DS_INDEX_2) | ((file != NULL) << DS_INDEX_3); + return ((file != NULL) << DS_INDEX_2) | ((utils_atoi0(pid) > 0) << DS_INDEX_3); } return 0; @@ -814,9 +884,16 @@ static guint thread_menu_extra_state(void) static MenuInfo thread_menu_info = { thread_menu_items, thread_menu_extra_state, 0 }; +static void on_thread_synchronize_button_release(GtkWidget *widget, GdkEventButton *event, + GtkWidget *menu) +{ + menu_shift_button_release(widget, event, menu, on_thread_synchronize); +} + void thread_init(void) { GtkTreeView *tree = view_create("thread_view", &model, &selection); + GtkWidget *menu = menu_select("thread_menu", &thread_menu_info, selection); store = GTK_LIST_STORE(model); sortable = GTK_TREE_SORTABLE(model); @@ -837,8 +914,10 @@ void thread_init(void) thread_seek_selected); g_signal_connect(tree, "button-press-event", G_CALLBACK(on_view_button_1_press), thread_seek_selected); + g_signal_connect(selection, "changed", G_CALLBACK(on_thread_selection_changed), NULL); - menu_select("thread_menu", &thread_menu_info, selection); + g_signal_connect(get_widget("thread_synchronize"), "button-release-event", + G_CALLBACK(on_thread_synchronize_button_release), menu); #ifndef G_OS_UNIX gtk_widget_hide(get_widget("thread_send_signal")); #endif @@ -848,4 +927,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); } Modified: scope/src/thread.h 8 files changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -42,16 +42,18 @@ void on_thread_stopped(GArray *nodes); void on_thread_created(GArray *nodes); void on_thread_exited(GArray *nodes); +void on_thread_selected(GArray *nodes); void on_thread_info(GArray *nodes); +void on_thread_follow(GArray *nodes); void on_thread_frame(GArray *nodes); void threads_mark(GeanyDocument *doc); void threads_clear(void); void threads_delta(ScintillaObject *sci, const char *real_path, gint start, gint delta); - gboolean threads_update(void); -#define thread_query_frame() \ - debug_send_format(T, "04%s-stack-info-frame", thread_id) + +void thread_query_frame(char token); +void thread_synchronize(void); void thread_init(void); void thread_finalize(void); Modified: scope/src/views.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -98,7 +98,7 @@ void views_update(DebugState state) if (thread_state == THREAD_QUERY_FRAME) { if (!views[VIEW_THREADS].dirty) - thread_query_frame(); + thread_query_frame('4'); thread_state = THREAD_STOPPED; } @@ -119,7 +119,7 @@ void views_update(DebugState state) if (thread_state == THREAD_QUERY_FRAME) { if (view_current != VIEW_THREADS || !views[VIEW_THREADS].dirty) - thread_query_frame(); + thread_query_frame('4'); thread_state = THREAD_STOPPED; } @@ -437,7 +437,6 @@ static void on_command_insert_button_clicked(G_GNUC_UNUSED GtkButton *button, gp gtk_text_buffer_insert_at_cursor(command_text, text->str, -1); g_string_free(text, TRUE); gtk_widget_grab_focus(command_view); - } static void on_command_send_button_clicked(G_GNUC_UNUSED GtkButton *button, @@ -447,6 +446,7 @@ static void on_command_send_button_clicked(G_GNUC_UNUSED GtkButton *button, const gchar *start; char *locale; + thread_synchronize(); utils_str_replace_all(&text, "\n", " "); start = utils_skip_spaces(text); locale = gtk_toggle_button_get_active(command_locale) ? Modified: scope/src/views.h 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -34,8 +34,6 @@ VIEW_COUNT } ViewIndex; -#define DS_SORTABLE 0 - void view_dirty(ViewIndex index); void views_clear(void); void views_update(DebugState state); Modified: scope/src/watch.c 8 files changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -353,8 +353,6 @@ static void on_watch_delete(G_GNUC_UNUSED const MenuItem *menu_item) } } -#define DS_FRESHABLE DS_SENDABLE -#define DS_WATCHABLE 0 #define DS_COPYABLE (DS_BASICS | DS_EXTRA_1) #define DS_MODIFYABLE (DS_SENDABLE | DS_EXTRA_1) #define DS_INSPECTABLE (DS_NOT_BUSY | DS_EXTRA_1) @@ -363,9 +361,9 @@ static void on_watch_delete(G_GNUC_UNUSED const MenuItem *menu_item) static MenuItem watch_menu_items[] = { - { "watch_refresh", on_watch_refresh, DS_FRESHABLE, NULL, NULL }, - { "watch_unsorted", on_watch_unsorted, DS_SORTABLE, NULL, NULL }, - { "watch_add", on_watch_add, DS_WATCHABLE, NULL, NULL }, + { "watch_refresh", on_watch_refresh, DS_SENDABLE, NULL, NULL }, + { "watch_unsorted", on_watch_unsorted, 0, NULL, NULL }, + { "watch_add", on_watch_add, 0, NULL, NULL }, { "watch_copy", on_watch_copy, DS_COPYABLE, NULL, NULL }, { "watch_modify", on_watch_modify, DS_MODIFYABLE, NULL, NULL }, { "watch_inspect", on_watch_inspect, DS_INSPECTABLE, NULL, NULL }, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] fefb46: WebHelper: Fix hovered link display when the mouse leaves the view
by Colomban Wendling 24 Dec '12

24 Dec '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 03 Dec 2012 16:33:03 UTC Commit: fefb46357efb2751fb2b78e77743f0c33bf27758 https://github.com/geany/geany-plugins/commit/fefb46357efb2751fb2b78e77743f… Log Message: ----------- WebHelper: Fix hovered link display when the mouse leaves the view The web view doesn't emit an hovered link change when the mouse leaves the view area. So, handle the case ourselves. Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 71 files changed, 64 insertions(+), 7 deletions(-) =================================================================== @@ -75,6 +75,8 @@ struct _GwhBrowserPrivate GtkToolItem *item_cancel; GtkToolItem *item_reload; GtkToolItem *item_inspector; + + gchar *hovered_link; }; enum { @@ -645,6 +647,7 @@ static void inspector_set_detached (GwhBrowser *self, g_object_unref (self->priv->default_icon); } g_object_unref (self->priv->settings); + g_free (self->priv->hovered_link); G_OBJECT_CLASS (gwh_browser_parent_class)->finalize (object); } @@ -883,11 +886,8 @@ static void inspector_set_detached (GwhBrowser *self, return self->priv->inspector_window; } -static void -on_web_view_hovering_over_link (WebKitWebView *view, - gchar *title, - gchar *uri, - GwhBrowser *self) +static guint +get_statusbar_context_id (GtkStatusbar *statusbar) { static guint id = 0; @@ -896,13 +896,62 @@ static void inspector_set_detached (GwhBrowser *self, "gwh-browser-hovered-link"); } - gtk_statusbar_pop (GTK_STATUSBAR (ui_widgets.statusbar), id); + return id; +} + +static void +on_web_view_hovering_over_link (WebKitWebView *view, + gchar *title, + gchar *uri, + GwhBrowser *self) +{ + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + if (self->priv->hovered_link) { + gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); + g_free (self->priv->hovered_link); + self->priv->hovered_link = NULL; + } if (uri && *uri) { - gtk_statusbar_push (GTK_STATUSBAR (ui_widgets.statusbar), id, uri); + self->priv->hovered_link = g_strdup (uri); + gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), + self->priv->hovered_link); } } static void +on_web_view_leave_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + GwhBrowser *self) +{ + if (self->priv->hovered_link) { + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); + } +} + +static void +on_web_view_enter_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + GwhBrowser *self) +{ + if (self->priv->hovered_link) { + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), + self->priv->hovered_link); + } +} + +static void +on_web_view_realize (GtkWidget *widget, + GwhBrowser *self) +{ + gtk_widget_add_events (widget, GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK); +} + +static void gwh_browser_init (GwhBrowser *self) { GtkWidget *scrolled; @@ -947,6 +996,8 @@ static void inspector_set_detached (GwhBrowser *self, : self->priv->paned), self->priv->inspector_view); + self->priv->hovered_link = NULL; + g_signal_connect (self, "notify::orientation", G_CALLBACK (on_orientation_notify), self); @@ -978,6 +1029,12 @@ static void inspector_set_detached (GwhBrowser *self, G_CALLBACK (on_web_view_scroll_event), self); g_signal_connect (G_OBJECT (self->priv->web_view), "hovering-over-link", G_CALLBACK (on_web_view_hovering_over_link), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "leave-notify-event", + G_CALLBACK (on_web_view_leave_notify_event), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "enter-notify-event", + G_CALLBACK (on_web_view_enter_notify_event), self); + g_signal_connect_after (self->priv->web_view, "realize", + G_CALLBACK (on_web_view_realize), self); g_signal_connect (self->priv->web_view, "key-press-event", G_CALLBACK (gwh_keybindings_handle_event), self); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] df030d: WebHelper: Show the currently hovered link in the statusbar
by Colomban Wendling 24 Dec '12

24 Dec '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 02 Dec 2012 16:52:23 UTC Commit: df030d06141506d6e7063d666566244b1d353277 https://github.com/geany/geany-plugins/commit/df030d06141506d6e7063d6665662… Log Message: ----------- WebHelper: Show the currently hovered link in the statusbar Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 22 files changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,7 @@ #include "gwh-utils.h" #include "gwh-settings.h" #include "gwh-keybindings.h" +#include "gwh-plugin.h" #if ! GTK_CHECK_VERSION (2, 18, 0) @@ -883,6 +884,25 @@ static void inspector_set_detached (GwhBrowser *self, } static void +on_web_view_hovering_over_link (WebKitWebView *view, + gchar *title, + gchar *uri, + GwhBrowser *self) +{ + static guint id = 0; + + if (id == 0) { + id = gtk_statusbar_get_context_id (GTK_STATUSBAR (ui_widgets.statusbar), + "gwh-browser-hovered-link"); + } + + gtk_statusbar_pop (GTK_STATUSBAR (ui_widgets.statusbar), id); + if (uri && *uri) { + gtk_statusbar_push (GTK_STATUSBAR (ui_widgets.statusbar), id, uri); + } +} + +static void gwh_browser_init (GwhBrowser *self) { GtkWidget *scrolled; @@ -956,6 +976,8 @@ static void inspector_set_detached (GwhBrowser *self, G_CALLBACK (on_web_view_populate_popup), self); g_signal_connect (G_OBJECT (self->priv->web_view), "scroll-event", G_CALLBACK (on_web_view_scroll_event), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "hovering-over-link", + G_CALLBACK (on_web_view_hovering_over_link), self); g_signal_connect (self->priv->web_view, "key-press-event", G_CALLBACK (gwh_keybindings_handle_event), self); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 62946e: WebHelper: Don't use deprecated GTK API
by Colomban Wendling 24 Dec '12

24 Dec '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 02 Dec 2012 16:52:13 UTC Commit: 62946e0bda18ef58c9d5f031ee8e823676f13675 https://github.com/geany/geany-plugins/commit/62946e0bda18ef58c9d5f031ee8e8… Log Message: ----------- WebHelper: Don't use deprecated GTK API Modified Paths: -------------- webhelper/src/gwh-browser.c webhelper/src/gwh-plugin.c Modified: webhelper/src/gwh-browser.c 14 files changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -515,7 +515,7 @@ static void inspector_set_detached (GwhBrowser *self, #define ADD_SEPARATOR(menu) \ item = gtk_separator_menu_item_new (); \ gtk_widget_show (item); \ - gtk_menu_append (menu, item) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item) ADD_SEPARATOR (menu); @@ -524,23 +524,23 @@ static void inspector_set_detached (GwhBrowser *self, item = gtk_menu_item_new_with_mnemonic (_("_Zoom")); gtk_widget_show (item); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* zoom in */ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_IN, NULL); g_signal_connect_swapped (item, "activate", G_CALLBACK (webkit_web_view_zoom_in), view); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* zoom out */ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL); g_signal_connect_swapped (item, "activate", G_CALLBACK (webkit_web_view_zoom_out), view); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* zoom 1:1 */ ADD_SEPARATOR (submenu); item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_100, NULL); g_signal_connect (item, "activate", G_CALLBACK (on_item_zoom_100_activate), self); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* full content zoom */ ADD_SEPARATOR (submenu); item = gtk_check_menu_item_new_with_mnemonic (_("Full-_content zoom")); @@ -548,7 +548,7 @@ static void inspector_set_detached (GwhBrowser *self, webkit_web_view_get_full_content_zoom (view)); g_signal_connect (item, "activate", G_CALLBACK (on_item_full_content_zoom_activate), self); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* show zoom sumbenu */ gtk_widget_show_all (submenu); @@ -558,7 +558,7 @@ static void inspector_set_detached (GwhBrowser *self, g_signal_connect (item, "activate", G_CALLBACK (on_item_flip_orientation_activate), self); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); if (! INSPECTOR_VISIBLE (self) || INSPECTOR_DETACHED (self)) { gtk_widget_set_sensitive (item, FALSE); } Modified: webhelper/src/gwh-plugin.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -258,14 +258,14 @@ enum { item = gtk_separator_menu_item_new (); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_object_get (G_OBJECT (G_settings), "browser-auto-reload", &auto_reload, NULL); item = gtk_check_menu_item_new_with_mnemonic (_("Reload upon document saving")); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), auto_reload); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "toggled", G_CALLBACK (on_item_auto_reload_toggled), NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] df2e56: Merge pull request #74 from b4n/wip/webhelper
by Frank Lanitz 24 Dec '12

24 Dec '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 24 Dec 2012 13:04:06 UTC Commit: df2e569c3168924438c35117773aeb7c4356a307 https://github.com/geany/geany-plugins/commit/df2e569c3168924438c35117773ae… Log Message: ----------- Merge pull request #74 from b4n/wip/webhelper Don't use long-deprecated API and show hovered link in the statusbar Modified Paths: -------------- webhelper/src/gwh-browser.c webhelper/src/gwh-plugin.c Modified: webhelper/src/gwh-browser.c 93 files changed, 86 insertions(+), 7 deletions(-) =================================================================== @@ -30,6 +30,7 @@ #include "gwh-utils.h" #include "gwh-settings.h" #include "gwh-keybindings.h" +#include "gwh-plugin.h" #if ! GTK_CHECK_VERSION (2, 18, 0) @@ -74,6 +75,8 @@ struct _GwhBrowserPrivate GtkToolItem *item_cancel; GtkToolItem *item_reload; GtkToolItem *item_inspector; + + gchar *hovered_link; }; enum { @@ -515,7 +518,7 @@ static void inspector_set_detached (GwhBrowser *self, #define ADD_SEPARATOR(menu) \ item = gtk_separator_menu_item_new (); \ gtk_widget_show (item); \ - gtk_menu_append (menu, item) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item) ADD_SEPARATOR (menu); @@ -524,23 +527,23 @@ static void inspector_set_detached (GwhBrowser *self, item = gtk_menu_item_new_with_mnemonic (_("_Zoom")); gtk_widget_show (item); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* zoom in */ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_IN, NULL); g_signal_connect_swapped (item, "activate", G_CALLBACK (webkit_web_view_zoom_in), view); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* zoom out */ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL); g_signal_connect_swapped (item, "activate", G_CALLBACK (webkit_web_view_zoom_out), view); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* zoom 1:1 */ ADD_SEPARATOR (submenu); item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_100, NULL); g_signal_connect (item, "activate", G_CALLBACK (on_item_zoom_100_activate), self); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* full content zoom */ ADD_SEPARATOR (submenu); item = gtk_check_menu_item_new_with_mnemonic (_("Full-_content zoom")); @@ -548,7 +551,7 @@ static void inspector_set_detached (GwhBrowser *self, webkit_web_view_get_full_content_zoom (view)); g_signal_connect (item, "activate", G_CALLBACK (on_item_full_content_zoom_activate), self); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); /* show zoom sumbenu */ gtk_widget_show_all (submenu); @@ -558,7 +561,7 @@ static void inspector_set_detached (GwhBrowser *self, g_signal_connect (item, "activate", G_CALLBACK (on_item_flip_orientation_activate), self); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); if (! INSPECTOR_VISIBLE (self) || INSPECTOR_DETACHED (self)) { gtk_widget_set_sensitive (item, FALSE); } @@ -644,6 +647,7 @@ static void inspector_set_detached (GwhBrowser *self, g_object_unref (self->priv->default_icon); } g_object_unref (self->priv->settings); + g_free (self->priv->hovered_link); G_OBJECT_CLASS (gwh_browser_parent_class)->finalize (object); } @@ -882,6 +886,71 @@ static void inspector_set_detached (GwhBrowser *self, return self->priv->inspector_window; } +static guint +get_statusbar_context_id (GtkStatusbar *statusbar) +{ + static guint id = 0; + + if (id == 0) { + id = gtk_statusbar_get_context_id (GTK_STATUSBAR (ui_widgets.statusbar), + "gwh-browser-hovered-link"); + } + + return id; +} + +static void +on_web_view_hovering_over_link (WebKitWebView *view, + gchar *title, + gchar *uri, + GwhBrowser *self) +{ + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + if (self->priv->hovered_link) { + gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); + g_free (self->priv->hovered_link); + self->priv->hovered_link = NULL; + } + if (uri && *uri) { + self->priv->hovered_link = g_strdup (uri); + gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), + self->priv->hovered_link); + } +} + +static void +on_web_view_leave_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + GwhBrowser *self) +{ + if (self->priv->hovered_link) { + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); + } +} + +static void +on_web_view_enter_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + GwhBrowser *self) +{ + if (self->priv->hovered_link) { + GtkStatusbar *statusbar = GTK_STATUSBAR (ui_widgets.statusbar); + + gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), + self->priv->hovered_link); + } +} + +static void +on_web_view_realize (GtkWidget *widget, + GwhBrowser *self) +{ + gtk_widget_add_events (widget, GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK); +} + static void gwh_browser_init (GwhBrowser *self) { @@ -927,6 +996,8 @@ static void inspector_set_detached (GwhBrowser *self, : self->priv->paned), self->priv->inspector_view); + self->priv->hovered_link = NULL; + g_signal_connect (self, "notify::orientation", G_CALLBACK (on_orientation_notify), self); @@ -956,6 +1027,14 @@ static void inspector_set_detached (GwhBrowser *self, G_CALLBACK (on_web_view_populate_popup), self); g_signal_connect (G_OBJECT (self->priv->web_view), "scroll-event", G_CALLBACK (on_web_view_scroll_event), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "hovering-over-link", + G_CALLBACK (on_web_view_hovering_over_link), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "leave-notify-event", + G_CALLBACK (on_web_view_leave_notify_event), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "enter-notify-event", + G_CALLBACK (on_web_view_enter_notify_event), self); + g_signal_connect_after (self->priv->web_view, "realize", + G_CALLBACK (on_web_view_realize), self); g_signal_connect (self->priv->web_view, "key-press-event", G_CALLBACK (gwh_keybindings_handle_event), self); Modified: webhelper/src/gwh-plugin.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -258,14 +258,14 @@ enum { item = gtk_separator_menu_item_new (); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_object_get (G_OBJECT (G_settings), "browser-auto-reload", &auto_reload, NULL); item = gtk_check_menu_item_new_with_mnemonic (_("Reload upon document saving")); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), auto_reload); gtk_widget_show (item); - gtk_menu_append (menu, item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "toggled", G_CALLBACK (on_item_auto_reload_toggled), NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits December 2012