Plugins-Commits September 2011

plugins-commits@lists.geany.org

6 participants
30 discussions

SF.net SVN: geany-plugins:[2197] trunk/geany-plugins/po/POTFILES.in
by cesspit＠users.sourceforge.net 13 Sep '11

13 Sep '11

Revision: 2197 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2197&view=rev Author: cesspit Date: 2011-09-13 21:30:56 +0000 (Tue, 13 Sep 2011) Log Message: ----------- new source file added to POTFILES.in Modified Paths: -------------- trunk/geany-plugins/po/POTFILES.in Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2011-09-13 21:28:14 UTC (rev 2196) +++ trunk/geany-plugins/po/POTFILES.in 2011-09-13 21:30:56 UTC (rev 2197) @@ -21,6 +21,7 @@ debugger/src/plugin.c debugger/src/vtree.c debugger/src/tpage.c +debugger/src/envtree.c debugger/src/bptree.c debugger/src/breakpoint.c debugger/src/wtree.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2196] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 13 Sep '11

13 Sep '11

Revision: 2196 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2196&view=rev Author: cesspit Date: 2011-09-13 21:28:14 +0000 (Tue, 13 Sep 2011) Log Message: ----------- debugger: gdb error proper handling, removed char wrapped mode in messagex textview (to prevent lags when resizing), target page layout changed Modified Paths: -------------- trunk/geany-plugins/debugger/src/Makefile.am trunk/geany-plugins/debugger/src/dbm_gdb.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/tabs.c trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/tpage.h Added Paths: ----------- trunk/geany-plugins/debugger/src/envtree.c trunk/geany-plugins/debugger/src/envtree.h Modified: trunk/geany-plugins/debugger/src/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/Makefile.am 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/Makefile.am 2011-09-13 21:28:14 UTC (rev 2196) @@ -31,6 +31,8 @@ debug_module.h \ dpaned.c \ dpaned.h \ + envtree.c \ + envtree.h \ gui.h \ gui.c \ keys.c \ Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -344,6 +344,8 @@ } else if (g_str_has_prefix (line, "^error")) { + dbg_cbs->set_stopped(); + /* removing read callback (will pulling all output left manually) */ g_source_remove(gdb_id_out); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/debug.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -846,6 +846,7 @@ static void on_debugger_error (const gchar* message) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", message); + debug_stop(); } /* callbacks structure to pass to debugger module */ @@ -945,7 +946,6 @@ vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(tab_messages)); debugger_messages_textview = gtk_text_view_new(); - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(debugger_messages_textview), GTK_WRAP_CHAR); gtk_text_view_set_editable (GTK_TEXT_VIEW (debugger_messages_textview), FALSE); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tab_messages), debugger_messages_textview); Added: trunk/geany-plugins/debugger/src/envtree.c =================================================================== --- trunk/geany-plugins/debugger/src/envtree.c (rev 0) +++ trunk/geany-plugins/debugger/src/envtree.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -0,0 +1,485 @@ +/* + * envtree.c + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +/* + * Working with the evironment variables tree view. + */ + +#include <string.h> + +#include "geanyplugin.h" +extern GeanyFunctions *geany_functions; +extern GeanyPlugin *geany_plugin; + +#include <gdk/gdkkeysyms.h> + +#include "dconfig.h" + +/* environment variables tree view columns */ +enum +{ + NAME, + VALUE, + LAST_VISIBLE, + N_COLUMNS +}; + +static GtkListStore *store; +static GtkTreeModel *model; +static GtkWidget *tree; + +/* flag shows that the page is readonly (debug is running) */ +static gboolean page_read_only = FALSE; + +/* flag shows we entered new env variable name and now entering its value */ +static gboolean entering_new_var = FALSE; + +/* reference to the env tree view empty row */ +static GtkTreeRowReference *empty_row = NULL; + +static GtkTreePath *being_edited_value = NULL; + +/* env variable name cloumn */ +static GtkTreeViewColumn *column_name = NULL; +static GtkCellRenderer *renderer_name = NULL; + +/* env variable value cloumn */ +static GtkTreeViewColumn *column_value = NULL; +static GtkCellRenderer *renderer_value = NULL; + +/* + * adds empty row to env tree view + */ +static void add_empty_row() +{ + if (empty_row) + gtk_tree_row_reference_free(empty_row); + + GtkTreeIter empty; + gtk_list_store_append (store, &empty); + gtk_list_store_set (store, &empty, + NAME, "", + VALUE, "", + -1); + + /* remeber reference */ + GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &empty); + empty_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), path); + gtk_tree_path_free(path); +} + +/* + * delete selected rows from env variables page + */ +static void delete_selected_rows() +{ + /* path to select after deleting finishes */ + GtkTreeRowReference *reference_to_select = NULL; + + /* empty row path */ + GtkTreePath *empty_path = gtk_tree_row_reference_get_path(empty_row); + + /* get selected rows */ + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); + + /* check whether only empty row was selected */ + if (1 != gtk_tree_selection_count_selected_rows(selection) || + gtk_tree_path_compare((GtkTreePath*)rows->data, empty_path)) + { + /* get references to the selected rows and find out what to + select after deletion */ + GList *references = NULL; + GList *iter = rows; + while (iter) + { + GtkTreePath *path = (GtkTreePath*)iter->data; + if (!reference_to_select) + { + /* select upper sibling of the upper + selected row that has unselected upper sibling */ + GtkTreePath *sibling = gtk_tree_path_copy(path); + if(gtk_tree_path_prev(sibling)) + { + if (!gtk_tree_selection_path_is_selected(selection, sibling)) + reference_to_select = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(tree)), sibling); + } + else if (gtk_tree_path_next(sibling), gtk_tree_path_compare(path, sibling)) + reference_to_select = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(tree)), sibling); + } + + if (gtk_tree_path_compare(path, empty_path)) + references = g_list_append(references, gtk_tree_row_reference_new(model, path)); + + iter = iter->next; + } + + /* if all (with or without empty row) was selected - set empty row + as a path to be selected after deleting */ + if (!reference_to_select) + reference_to_select = gtk_tree_row_reference_copy (empty_row); + + iter = references; + while (iter) + { + GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; + GtkTreePath *path = gtk_tree_row_reference_get_path(reference); + + GtkTreeIter titer; + gtk_tree_model_get_iter(model, &titer, path); + gtk_list_store_remove(store, &titer); + + iter = iter->next; + } + + /* set selection */ + gtk_tree_selection_unselect_all(selection); + GtkTreePath *path = gtk_tree_row_reference_get_path(reference_to_select); + gtk_tree_selection_select_path(selection, path); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(tree), path, NULL, TRUE, 0.5, 0.5); + + /* free references list */ + g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); + g_list_free (references); + } + + /* free selection reference */ + gtk_tree_row_reference_free(reference_to_select); + + /* free rows list */ + g_list_foreach (rows, (GFunc)gtk_tree_path_free, NULL); + g_list_free (rows); +} + +/* + * env tree key pressed handler + */ +static gboolean on_envtree_keypressed(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + /* do not allow deleting while debugging */ + if(page_read_only) + return FALSE; + + /* handling only Delete button pressing + that means "delete selected rows" */ + guint keyval = ((GdkEventKey*)event)->keyval; + + if (GDK_Delete == keyval) + { + delete_selected_rows(); + dconfig_set_changed(); + } + + return GDK_Tab == keyval; +} + +/* + * env tree view value column render function + */ +static void on_render_value(GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + /* do not allow to edit value in read only mode */ + if (page_read_only) + { + g_object_set (cell, "editable", FALSE, NULL); + } + else + { + /* do not allow to edit value for empty row */ + GtkTreePath *path = gtk_tree_model_get_path(tree_model, iter); + gboolean empty = !gtk_tree_path_compare(path, gtk_tree_row_reference_get_path(empty_row)); + g_object_set (cell, "editable", entering_new_var || !empty, NULL); + gtk_tree_path_free(path); + } +} + +/* + * env tree view value changed handler + */ +static void on_value_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) +{ + GtkTreeIter iter; + GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); + + gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); + + gtk_tree_model_get_iter ( + model, + &iter, + tree_path); + + gchar *striped = g_strstrip(g_strdup(new_text)); + + if (!strlen(striped)) + { + /* if new value is empty string, if it's a new row - do nothig + otheerwise - offer to delete a variable */ + if (empty) + gtk_list_store_set(store, &iter, NAME, "", -1); + else + { + if (dialogs_show_question(_("Delete variable?"))) + { + delete_selected_rows(); + dconfig_set_changed(); + + gtk_widget_grab_focus(tree); + } + } + } + else + { + /* if old variable - change value, otherwise - add another empty row below */ + gchar* oldvalue; + gtk_tree_model_get ( + model, + &iter, + VALUE, &oldvalue, + -1); + + if (strcmp(oldvalue, striped)) + { + gtk_list_store_set(store, &iter, VALUE, striped, -1); + if (empty) + add_empty_row(); + + g_object_set (renderer_value, "editable", FALSE, NULL); + dconfig_set_changed(); + } + + g_free(oldvalue); + } + + if (empty) + entering_new_var = FALSE; + + gtk_tree_path_free(tree_path); + g_free(striped); + + gtk_tree_path_free(being_edited_value); +} + +/* + * env tree view value editing started + */ +static void on_value_editing_started(GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path, gpointer user_data) +{ + being_edited_value = gtk_tree_path_new_from_string(path); +} + +/* + * env tree view value editing cancelled (Escape pressed) + */ +static void on_value_editing_cancelled(GtkCellRenderer *renderer, gpointer user_data) +{ + /* check whether escape was pressed when editing + new variable value cell */ + if(!gtk_tree_path_compare(being_edited_value, gtk_tree_row_reference_get_path(empty_row))) + { + /* if so - clear name sell */ + GtkTreeIter iter; + gtk_tree_model_get_iter(model, &iter, being_edited_value); + + gtk_list_store_set ( + store, + &iter, + NAME, "", + -1); + + entering_new_var = FALSE; + } + + g_object_set (renderer_value, "editable", FALSE, NULL); + + gtk_tree_path_free(being_edited_value); +} + +/* + * env tree view name changed hadler + */ +static void on_name_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) +{ + GtkTreeIter iter; + GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); + + gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); + + gtk_tree_model_get_iter ( + model, + &iter, + tree_path); + + gchar* oldvalue; + gtk_tree_model_get ( + model, + &iter, + NAME, &oldvalue, + -1); + + gchar *striped = g_strstrip(g_strdup(new_text)); + + if (!strlen(striped)) + { + /* if name is empty - offer to delete variable */ + if (!empty && dialogs_show_question(_("Delete variable?"))) + { + delete_selected_rows(); + dconfig_set_changed(); + + gtk_widget_grab_focus(tree); + } + } + else if (strcmp(oldvalue, striped)) + { + gtk_list_store_set(store, &iter, NAME, striped, -1); + if (empty) + { + /* if it was a new row - move cursor to a value cell */ + entering_new_var = TRUE; + gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(tree), tree_path, column_value, renderer_value, TRUE); + } + if (!empty) + { + dconfig_set_changed(); + } + } + + gtk_tree_path_free(tree_path); + g_free(oldvalue); + g_free(striped); +} + +/* + * create env tree view and return a widget + */ +GtkWidget* envtree_init() +{ + store = gtk_list_store_new ( + N_COLUMNS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING); + model = GTK_TREE_MODEL(store); + tree = gtk_tree_view_new_with_model (model); + + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE); + g_signal_connect(G_OBJECT(tree), "key-press-event", G_CALLBACK (on_envtree_keypressed), NULL); + + renderer_name = gtk_cell_renderer_text_new (); + g_object_set (renderer_name, "editable", TRUE, NULL); + g_signal_connect (G_OBJECT (renderer_name), "edited", G_CALLBACK (on_name_changed), NULL); + column_name = gtk_tree_view_column_new_with_attributes (_("Name"), renderer_name, "text", NAME, NULL); + gtk_tree_view_column_set_resizable (column_name, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column_name); + + renderer_value = gtk_cell_renderer_text_new (); + column_value = gtk_tree_view_column_new_with_attributes (_("Value"), renderer_value, "text", VALUE, NULL); + g_signal_connect (G_OBJECT (renderer_value), "edited", G_CALLBACK (on_value_changed), NULL); + g_signal_connect (G_OBJECT (renderer_value), "editing-started", G_CALLBACK (on_value_editing_started), NULL); + g_signal_connect (G_OBJECT (renderer_value), "editing-canceled", G_CALLBACK (on_value_editing_cancelled), NULL); + gtk_tree_view_column_set_cell_data_func(column_value, renderer_value, on_render_value, NULL, NULL); + gtk_tree_view_column_set_resizable (column_value, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column_value); + + /* Last invisible column */ + GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); + GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", LAST_VISIBLE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + + /* add empty row */ + add_empty_row(); + + /* set multiple selection */ + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); + + return tree; +} + +/* + * deallocate data + */ +void envtree_destroy() +{ + gtk_tree_row_reference_free(empty_row); +} + +/* + * clear tree + */ +void envtree_clear() +{ + gtk_list_store_clear(store); + add_empty_row(); +} + +/* + * get list of environment variables + */ +GList* envpage_get_environment() +{ + GList *env = NULL; + + GtkTreeIter iter; + gtk_tree_model_get_iter_first(model, &iter); + do + { + gchar *name, *value; + gtk_tree_model_get ( + model, + &iter, + NAME, &name, + VALUE, &value, + -1); + + if (strlen(name)) + { + env = g_list_append(env, name); + env = g_list_append(env, value); + } + } + while (gtk_tree_model_iter_next(model, &iter)); + + return env; +} + +/* + * disable interacting for the time of debugging + */ +void envtree_set_readonly(gboolean readonly) +{ + g_object_set (renderer_name, "editable", !readonly, NULL); + page_read_only = readonly; +} + +/* + * add environment variable + */ +void envtree_add_environment(const gchar *name, const gchar *value) +{ + GtkTreeIter iter; + gtk_list_store_prepend(store, &iter); + gtk_list_store_set(store, &iter, NAME, name, VALUE, value, -1); +} Property changes on: trunk/geany-plugins/debugger/src/envtree.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/geany-plugins/debugger/src/envtree.h =================================================================== --- trunk/geany-plugins/debugger/src/envtree.h (rev 0) +++ trunk/geany-plugins/debugger/src/envtree.h 2011-09-13 21:28:14 UTC (rev 2196) @@ -0,0 +1,27 @@ +/* + * envtree.h + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +GtkWidget* envtree_init(); +void envtree_destroy(); +void envtree_clear(); +void envtree_set_readonly(gboolean readonly); +void envtree_add_environment(const gchar *name, const gchar *value); +GList* envpage_get_environment(); Property changes on: trunk/geany-plugins/debugger/src/envtree.h ___________________________________________________________________ Added: svn:executable + * Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -39,6 +39,7 @@ #include "dconfig.h" #include "dpaned.h" #include "tabs.h" +#include "envtree.h" /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; @@ -80,6 +81,7 @@ { gboolean state = gtk_toggle_button_get_active(button); dpaned_set_tabbed(state); + tpage_pack_widgets(state); } /* Called by Geany to initialize the plugin. @@ -107,6 +109,7 @@ /* init paned */ dpaned_init(); + tpage_pack_widgets(dpaned_get_tabbed()); GtkWidget* vbox = btnpanel_create(on_paned_mode_changed); @@ -165,6 +168,9 @@ /* clears debug paned data */ dpaned_destroy(); + /* clears anv tree data */ + envtree_destroy(); + /* release other allocated strings and objects */ gtk_widget_destroy(hbox); } Modified: trunk/geany-plugins/debugger/src/tabs.c =================================================================== --- trunk/geany-plugins/debugger/src/tabs.c 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/tabs.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -140,10 +140,10 @@ label = _("Call Stack"); break; case TID_TERMINAL: - label = _("Debug terminal"); + label = _("Debug Terminal"); break; case TID_MESSAGES: - label = _("Debugger messages"); + label = _("Debugger Messages"); break; } return label; Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-09-13 21:28:14 UTC (rev 2196) @@ -24,8 +24,8 @@ */ #include <string.h> + #include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #include <sys/stat.h> @@ -42,377 +42,242 @@ #include "dconfig.h" #include "tpage.h" #include "tabs.h" +#include "envtree.h" +#include "gui.h" /* boxes margins */ -#define SPACING 5 +#define SPACING 7 -/* environment variables tree view columns minumum width in characters */ -#define MW_NAME 15 -#define MW_VALUE 0 +/* root boxes border width */ +#define ROOT_BORDER_WIDTH 10 -/* environment variables tree view columns */ -enum -{ - NAME, - VALUE, - LAST_VISIBLE, - N_COLUMNS -}; +/* root boxes border width */ +#define BROWSE_BUTTON_WIDTH 65 -/* flag shows that the page is readonly (debug is running) */ -gboolean page_read_only = FALSE; +/* widgets */ -/* flag shows we entered new env variable name and now entering its value */ -gboolean entering_new_var = FALSE; +/* target */ +static GtkWidget *target_label = NULL; +static GtkWidget *target_name = NULL; +static GtkWidget *target_button_browse = NULL; -/* reference to the env tree view empty row */ -static GtkTreeRowReference *empty_row = NULL; +/* debugger type */ +static GtkWidget *debugger_label = NULL; +static GtkWidget *debugger_cmb = NULL; -/* target name textentry */ -static GtkWidget *targetname = NULL; +/* argments */ +static GtkWidget *args_frame = NULL; +static GtkWidget *args_textview = NULL; -/* browse target button */ -static GtkWidget *button_browse = NULL; +/* environment variables */ +static GtkWidget *env_frame = NULL; -/* env variables tree view */ -static GtkWidget *envtree = NULL; -static GtkTreeModel *model = NULL; -static GtkListStore *store = NULL; +/* widgets array for reference management when moving to another container */ +static GtkWidget **widgets[] = { + &target_label, &target_name, &target_button_browse, + &debugger_label, &debugger_cmb, + &args_frame, + &env_frame, + NULL +}; -static GtkTreePath *being_edited_value = NULL; - -/* debugger type combo box */ -static GtkWidget *cmb_debugger = NULL; - -/* debugger messages text view */ -GtkWidget *textview = NULL; - -/* env variable name cloumn */ -GtkTreeViewColumn *column_name = NULL; -GtkCellRenderer *renderer_name = NULL; - -/* env variable value cloumn */ -GtkTreeViewColumn *column_value = NULL; -GtkCellRenderer *renderer_value = NULL; - /* * tells config to update when target arguments change */ -void on_arguments_changed(GtkTextBuffer *textbuffer, gpointer user_data) +static void on_arguments_changed(GtkTextBuffer *textbuffer, gpointer user_data) { dconfig_set_changed(); } /* - * delete selected rows from env variables page + * target browse button clicked handler */ -void delete_selected_rows() +static void on_target_browse_clicked(GtkButton *button, gpointer user_data) { - /* path to select after deleting finishes */ - GtkTreeRowReference *reference_to_select = NULL; - - /* empty row path */ - GtkTreePath *empty_path = gtk_tree_row_reference_get_path(empty_row); - - /* get selected rows */ - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(envtree)); - GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); - - /* check whether only empty row was selected */ - if (1 != gtk_tree_selection_count_selected_rows(selection) || - gtk_tree_path_compare((GtkTreePath*)rows->data, empty_path)) - { - /* get references to the selected rows and find out what to - select after deletion */ - GList *references = NULL; - GList *iter = rows; - while (iter) - { - GtkTreePath *path = (GtkTreePath*)iter->data; - if (!reference_to_select) - { - /* select upper sibling of the upper - selected row that has unselected upper sibling */ - GtkTreePath *sibling = gtk_tree_path_copy(path); - if(gtk_tree_path_prev(sibling)) - { - if (!gtk_tree_selection_path_is_selected(selection, sibling)) - reference_to_select = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(envtree)), sibling); - } - else if (gtk_tree_path_next(sibling), gtk_tree_path_compare(path, sibling)) - reference_to_select = gtk_tree_row_reference_new(gtk_tree_view_get_model(GTK_TREE_VIEW(envtree)), sibling); - } - - if (gtk_tree_path_compare(path, empty_path)) - references = g_list_append(references, gtk_tree_row_reference_new(model, path)); - - iter = iter->next; - } - - /* if all (with or without empty row) was selected - set empty row - as a path to be selected after deleting */ - if (!reference_to_select) - reference_to_select = gtk_tree_row_reference_copy (empty_row); - - iter = references; - while (iter) - { - GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; - GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - - GtkTreeIter titer; - gtk_tree_model_get_iter(model, &titer, path); - gtk_list_store_remove(store, &titer); - - iter = iter->next; - } - - /* set selection */ - gtk_tree_selection_unselect_all(selection); - GtkTreePath *path = gtk_tree_row_reference_get_path(reference_to_select); - gtk_tree_selection_select_path(selection, path); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(envtree), path, NULL, TRUE, 0.5, 0.5); - - /* free references list */ - g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); - g_list_free (references); - } + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Choose target file"), + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); - /* free selection reference */ - gtk_tree_row_reference_free(reference_to_select); + gchar path[FILENAME_MAX]; - /* free rows list */ - g_list_foreach (rows, (GFunc)gtk_tree_path_free, NULL); - g_list_free (rows); -} - -/* - * env tree key pressed handler - */ -gboolean on_envtree_keypressed(GtkWidget *widget, GdkEvent *event, gpointer user_data) -{ - /* do not allow deleting while debugging */ - if(page_read_only) - return FALSE; + const gchar *prevfile = gtk_entry_get_text(GTK_ENTRY(target_name)); + gchar *prevdir = g_path_get_dirname(prevfile); + if (strcmp(".", prevdir)) + strcpy(path, prevdir); + else + strcpy(path, g_path_get_dirname(DOC_FILENAME(document_get_current()))); + g_free(prevdir); - /* handling only Delete button pressing - that means "delete selected rows" */ - guint keyval = ((GdkEventKey*)event)->keyval; + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), path); - if (GDK_Delete == keyval) + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - delete_selected_rows(); + gchar *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gtk_entry_set_text(GTK_ENTRY(target_name), filename); + g_free (filename); + dconfig_set_changed(); } - - return GDK_Tab == keyval; + gtk_widget_destroy (dialog); } /* - * adds empty row to env tree view + * packs widgets into page depending one tabbed mode state */ -static void add_empty_row() +void tpage_pack_widgets(gboolean tabbed) { - if (empty_row) - gtk_tree_row_reference_free(empty_row); + /* root box */ + GtkWidget *root = NULL, *oldroot = NULL; + GList *children = gtk_container_get_children(GTK_CONTAINER(tab_target)); + if (children) + { + oldroot = (GtkWidget*)children->data; + + /* unparent widgets */ + int i = 0; + while (widgets[i]) + { + g_object_ref(*widgets[i]); + gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(*widgets[i])), *widgets[i]); + i++; + } + + g_list_free(children); + } - GtkTreeIter empty; - gtk_list_store_append (store, &empty); - gtk_list_store_set (store, &empty, - NAME, "", - VALUE, "", - -1); + if (tabbed) + { + root = gtk_vbox_new(FALSE, SPACING); + gtk_container_set_border_width(GTK_CONTAINER(root), ROOT_BORDER_WIDTH); + + /* filename */ + GtkWidget *hbox = gtk_hbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(root), hbox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), target_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), target_name, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), target_button_browse, FALSE, FALSE, 0); + + /* lower hbox */ + hbox = gtk_hbox_new(TRUE, SPACING); + gtk_box_pack_start(GTK_BOX(root), hbox, TRUE, TRUE, 0); - /* remeber reference */ - GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &empty); - empty_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), path); - gtk_tree_path_free(path); -} + /* lower left and right vboxes */ + GtkWidget *lbox = gtk_vbox_new(FALSE, SPACING); + GtkWidget *rbox = gtk_vbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(hbox), lbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), rbox, TRUE, TRUE, 0); -/* - * env tree view value column render function - */ -void on_render_value(GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - /* do not allow to edit value in read only mode */ - if (page_read_only) - g_object_set (cell, "editable", FALSE, NULL); + /* environment */ + gtk_box_pack_start(GTK_BOX(lbox), env_frame, TRUE, TRUE, 0); + + /* arguments */ + gtk_box_pack_start(GTK_BOX(rbox), args_frame, TRUE, TRUE, 0); + /* debugger type */ + hbox = gtk_hbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(hbox), debugger_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), debugger_cmb, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(rbox), hbox, FALSE, FALSE, 0); + } else { - /* do not allow to edit value for empty row */ - GtkTreePath *path = gtk_tree_model_get_path(tree_model, iter); - gboolean empty = !gtk_tree_path_compare(path, gtk_tree_row_reference_get_path(empty_row)); - g_object_set (cell, "editable", entering_new_var || !empty, NULL); - gtk_tree_path_free(path); - } -} + root = gtk_hbox_new(TRUE, SPACING); + gtk_container_set_border_width(GTK_CONTAINER(root), ROOT_BORDER_WIDTH); -/* - * env tree view value changed hadler - */ -static void on_value_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) -{ - GtkTreeIter iter; - GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); - - gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); + GtkWidget *lbox = gtk_vbox_new(FALSE, SPACING); + GtkWidget *rbox = gtk_vbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(root), lbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(root), rbox, TRUE, TRUE, 0); - gtk_tree_model_get_iter ( - model, - &iter, - tree_path); - - gchar *striped = g_strstrip(g_strdup(new_text)); - - if (!strlen(striped)) - { - /* if new value is empty string, if it's a new row - do nothig - otheerwise - offer to delete a variable */ - if (empty) - gtk_list_store_set(store, &iter, NAME, "", -1); - else - { - if (dialogs_show_question(_("Delete variable?"))) - { - delete_selected_rows(); - dconfig_set_changed(); + /* environment */ + gtk_box_pack_start(GTK_BOX(lbox), env_frame, TRUE, TRUE, 0); - gtk_widget_grab_focus(envtree); - } - } + /* target */ + GtkWidget *hbox = gtk_hbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(hbox), target_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), target_name, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), target_button_browse, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(rbox), hbox, FALSE, FALSE, 0); + /* arguments */ + gtk_box_pack_start(GTK_BOX(rbox), args_frame, TRUE, TRUE, 0); + /* debugger type */ + hbox = gtk_hbox_new(FALSE, SPACING); + gtk_box_pack_start(GTK_BOX(hbox), debugger_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), debugger_cmb, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(rbox), hbox, FALSE, FALSE, 0); } - else - { - /* if old variable - change value, otherwise - add another empty row below */ - gchar* oldvalue; - gtk_tree_model_get ( - model, - &iter, - VALUE, &oldvalue, - -1); - if (strcmp(oldvalue, striped)) + if (oldroot) + { + int i = 0; + while (widgets[i]) { - gtk_list_store_set(store, &iter, VALUE, striped, -1); - if (empty) - add_empty_row(); - - g_object_set (renderer_value, "editable", FALSE, NULL); - dconfig_set_changed(); + g_object_unref(*widgets[i]); + i++; } - - g_free(oldvalue); + gtk_container_remove(GTK_CONTAINER(tab_target), oldroot); } - - if (empty) - entering_new_var = FALSE; - gtk_tree_path_free(tree_path); - g_free(striped); - - gtk_tree_path_free(being_edited_value); + gtk_container_add(GTK_CONTAINER(tab_target), root); + gtk_widget_show_all(tab_target); } /* - * env tree view value editing started + * create widgets */ -void on_value_editing_started(GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path, gpointer user_data) +static void tpage_create_widgets() { - being_edited_value = gtk_tree_path_new_from_string(path); -} + /* target */ + target_label = gtk_label_new(_("Target:")); + target_name = gtk_entry_new (); + gtk_entry_set_editable(GTK_ENTRY(target_name), FALSE); + target_button_browse = create_stock_button(GTK_STOCK_OPEN, _("Browse")); + gtk_widget_set_size_request(target_button_browse, BROWSE_BUTTON_WIDTH, 0); + g_signal_connect(G_OBJECT(target_button_browse), "clicked", G_CALLBACK (on_target_browse_clicked), NULL); -/* - * env tree view value editing cancelled (Escape pressed) - */ -void on_value_editing_cancelled(GtkCellRenderer *renderer, gpointer user_data) -{ - /* check whether escape was pressed when editing - new variable value cell */ - if(!gtk_tree_path_compare(being_edited_value, gtk_tree_row_reference_get_path(empty_row))) + /* debugger */ + debugger_label = gtk_label_new(_("Debugger:")); + debugger_cmb = gtk_combo_box_new_text(); + GList *modules = debug_get_modules(); + GList *iter = modules; + while (iter) { - /* if so - clear name sell */ - GtkTreeIter iter; - gtk_tree_model_get_iter(model, &iter, being_edited_value); - - gtk_list_store_set ( - store, - &iter, - NAME, "", - -1); - - entering_new_var = FALSE; + gtk_combo_box_append_text(GTK_COMBO_BOX(debugger_cmb), (gchar*)iter->data); + iter = iter->next; } + g_list_free(modules); + gtk_combo_box_set_active(GTK_COMBO_BOX(debugger_cmb), 0); - g_object_set (renderer_value, "editable", FALSE, NULL); + /* arguments */ + args_frame = gtk_frame_new(_("Command Line Arguments")); + GtkWidget *hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + args_textview = gtk_text_view_new (); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(args_textview), GTK_WRAP_CHAR); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(args_textview)); + g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK (on_arguments_changed), NULL); + gtk_container_add(GTK_CONTAINER(hbox), args_textview); + gtk_container_add(GTK_CONTAINER(args_frame), hbox); - gtk_tree_path_free(being_edited_value); + /* environment */ + env_frame = gtk_frame_new(_("Environment Variables")); + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + GtkWidget *tree = envtree_init(); + gtk_container_add(GTK_CONTAINER(hbox), tree); + gtk_container_add(GTK_CONTAINER(env_frame), hbox); } /* - * env tree view name changed hadler - */ -static void on_name_changed(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) -{ - GtkTreeIter iter; - GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); - - gboolean empty = !gtk_tree_path_compare(tree_path, gtk_tree_row_reference_get_path(empty_row)); - - gtk_tree_model_get_iter ( - model, - &iter, - tree_path); - - gchar* oldvalue; - gtk_tree_model_get ( - model, - &iter, - NAME, &oldvalue, - -1); - - gchar *striped = g_strstrip(g_strdup(new_text)); - - if (!strlen(striped)) - { - /* if name is empty - offer to delete variable */ - if (!empty && dialogs_show_question(_("Delete variable?"))) - { - delete_selected_rows(); - dconfig_set_changed(); - - gtk_widget_grab_focus(envtree); - } - } - else if (strcmp(oldvalue, striped)) - { - gtk_list_store_set(store, &iter, NAME, striped, -1); - if (empty) - { - /* if it was a new row - move cursor to a value cell */ - entering_new_var = TRUE; - gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(envtree), tree_path, column_value, renderer_value, TRUE); - } - if (!empty) - { - dconfig_set_changed(); - } - } - - gtk_tree_path_free(tree_path); - g_free(oldvalue); - g_free(striped); -} - -/* * set target */ void tpage_set_target(const gchar *newvalue) { - gtk_entry_set_text(GTK_ENTRY(targetname), newvalue); + gtk_entry_set_text(GTK_ENTRY(target_name), newvalue); } /* @@ -425,7 +290,7 @@ { module = 0; } - gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_debugger), module); + gtk_combo_box_set_active(GTK_COMBO_BOX(debugger_cmb), module); } /* @@ -433,7 +298,7 @@ */ void tpage_set_commandline(const gchar *newvalue) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(args_textview)); gtk_text_buffer_set_text(buffer, newvalue, -1); } @@ -442,9 +307,7 @@ */ void tpage_add_environment(const gchar *name, const gchar *value) { - GtkTreeIter iter; - gtk_list_store_prepend(store, &iter); - gtk_list_store_set(store, &iter, NAME, name, VALUE, value, -1); + envtree_add_environment(name, value); } /* @@ -453,63 +316,25 @@ void tpage_clear() { /* target */ - gtk_entry_set_text(GTK_ENTRY(targetname), ""); + gtk_entry_set_text(GTK_ENTRY(target_name), ""); /* reset debugger type */ - gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_debugger), 0); + gtk_combo_box_set_active(GTK_COMBO_BOX(debugger_cmb), 0); /* arguments */ - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(args_textview)); gtk_text_buffer_set_text(buffer, "", -1); /* environment variables */ - gtk_list_store_clear(store); - add_empty_row(); + envtree_clear(); } /* - * target browse button clicked handler + * get target file names */ -void on_target_browse_clicked(GtkButton *button, gpointer user_data) -{ - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Choose target file"), - NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - gchar path[FILENAME_MAX]; - - const gchar *prevfile = gtk_entry_get_text(GTK_ENTRY(targetname)); - gchar *prevdir = g_path_get_dirname(prevfile); - if (strcmp(".", prevdir)) - strcpy(path, prevdir); - else - strcpy(path, g_path_get_dirname(DOC_FILENAME(document_get_current()))); - g_free(prevdir); - - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), path); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - gchar *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - gtk_entry_set_text(GTK_ENTRY(targetname), filename); - g_free (filename); - - dconfig_set_changed(); - } - gtk_widget_destroy (dialog); -} - -/* - * get target file name - */ gchar* tpage_get_target() { - return g_strdup(gtk_entry_get_text(GTK_ENTRY(targetname))); + return g_strdup(gtk_entry_get_text(GTK_ENTRY(target_name))); } /* @@ -517,7 +342,7 @@ */ int tpage_get_debug_module_index() { - return gtk_combo_box_get_active(GTK_COMBO_BOX(cmb_debugger)); + return gtk_combo_box_get_active(GTK_COMBO_BOX(debugger_cmb)); } /* @@ -525,7 +350,7 @@ */ gchar* tpage_get_debugger() { - return gtk_combo_box_get_active_text(GTK_COMBO_BOX(cmb_debugger)); + return gtk_combo_box_get_active_text(GTK_COMBO_BOX(debugger_cmb)); } /* @@ -534,7 +359,7 @@ gchar* tpage_get_commandline() { GtkTextIter start, end; - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(args_textview)); gtk_text_buffer_get_start_iter(buffer, &start); gtk_text_buffer_get_end_iter(buffer, &end); @@ -553,30 +378,7 @@ */ GList* tpage_get_environment() { - GList *env = NULL; - - GtkTreeIter iter; - GtkTreeModel *_model = gtk_tree_view_get_model(GTK_TREE_VIEW(envtree)); - gtk_tree_model_get_iter_first(_model, &iter); - do - { - gchar *name, *value; - gtk_tree_model_get ( - _model, - &iter, - NAME, &name, - VALUE, &value, - -1); - - if (strlen(name)) - { - env = g_list_append(env, name); - env = g_list_append(env, value); - } - } - while (gtk_tree_model_iter_next(_model, &iter)); - - return env; + return envpage_get_environment(); } /* @@ -584,131 +386,8 @@ */ void tpage_init() { - tab_target = gtk_hbox_new(FALSE, 0); - - GtkWidget *lbox = gtk_vbox_new(FALSE, SPACING); - GtkWidget *mbox = gtk_vbox_new(FALSE, SPACING); - - GtkWidget *hombox = gtk_hbox_new(TRUE, 0); - - /* left box */ - gtk_container_set_border_width(GTK_CONTAINER(lbox), SPACING); - - /* Target frame */ - GtkWidget *_frame = gtk_frame_new(_("Target")); - gtk_frame_set_shadow_type(GTK_FRAME(_frame), GTK_SHADOW_NONE); - GtkWidget *vbox = gtk_vbox_new(FALSE, 0); - - /* filename hbox */ - GtkWidget *hbox = gtk_hbox_new(FALSE, SPACING); - gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); - - targetname = gtk_entry_new (); - gtk_entry_set_editable(GTK_ENTRY(targetname), FALSE); - - button_browse = gtk_button_new_with_label(_("Browse")); - g_signal_connect(G_OBJECT(button_browse), "clicked", G_CALLBACK (on_target_browse_clicked), NULL); - - gtk_box_pack_start(GTK_BOX(hbox), targetname, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hbox), button_browse, FALSE, TRUE, 0); - - /* pack in the vertical box */ - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - /* debugger type hbox */ - hbox = gtk_hbox_new(FALSE, SPACING); - gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); - GtkWidget *label = gtk_label_new(_("Debugger:")); - cmb_debugger = gtk_combo_box_new_text(); - - GList *modules = debug_get_modules(); - GList *iter = modules; - while (iter) - { - gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_debugger), (gchar*)iter->data); - iter = iter->next; - } - g_list_free(modules); - gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_debugger), 0); - - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), cmb_debugger, TRUE, TRUE, 0); - - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - gtk_container_add(GTK_CONTAINER(_frame), vbox); - - gtk_box_pack_start(GTK_BOX(lbox), _frame, FALSE, FALSE, 0); - - /* Arguments frame */ - _frame = gtk_frame_new(_("Arguments")); - hbox = gtk_vbox_new(FALSE, SPACING); - gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); - - textview = gtk_text_view_new (); - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_CHAR); - - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); - g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK (on_arguments_changed), NULL); - - gtk_box_pack_start(GTK_BOX(hbox), textview, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(_frame), hbox); - - gtk_box_pack_start(GTK_BOX(lbox), _frame, TRUE, TRUE, 0); - - - /* Environment */ - gtk_container_set_border_width(GTK_CONTAINER(mbox), SPACING); - _frame = gtk_frame_new(_("Environment variables")); - hbox = gtk_hbox_new(FALSE, SPACING); - gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); - - store = gtk_list_store_new ( - N_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); - - model = GTK_TREE_MODEL(store); - envtree = gtk_tree_view_new_with_model (model); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(envtree), TRUE); - g_object_set(envtree, "rules-hint", TRUE, NULL); - g_signal_connect(G_OBJECT(envtree), "key-press-event", G_CALLBACK (on_envtree_keypressed), NULL); - - renderer_name = gtk_cell_renderer_text_new (); - g_object_set (renderer_name, "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (renderer_name), "edited", G_CALLBACK (on_name_changed), NULL); - column_name = gtk_tree_view_column_new_with_attributes (_("Name"), renderer_name, "text", NAME, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column_name); - - renderer_value = gtk_cell_renderer_text_new (); - column_name = gtk_tree_view_column_new_with_attributes (_("Value"), renderer_name, "text", VALUE, NULL); - g_signal_connect (G_OBJECT (renderer_value), "edited", G_CALLBACK (on_value_changed), NULL); - g_signal_connect (G_OBJECT (renderer_value), "editing-started", G_CALLBACK (on_value_editing_started), NULL); - g_signal_connect (G_OBJECT (renderer_value), "editing-canceled", G_CALLBACK (on_value_editing_cancelled), NULL); - gtk_tree_view_column_set_cell_data_func(column_value, renderer_value, on_render_value, NULL, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column_value); - - /* Last invisible column */ - GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", LAST_VISIBLE, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column); - - /* add empty row */ - add_empty_row(); - - /* set multiple selection */ - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(envtree)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - - gtk_box_pack_start(GTK_BOX(hbox), envtree, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(_frame), hbox); - gtk_box_pack_start(GTK_BOX(mbox), _frame, TRUE, TRUE, 0); - - - gtk_box_pack_start(GTK_BOX(hombox), lbox, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hombox), mbox, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(tab_target), hombox, TRUE, TRUE, 0); + tab_target = gtk_vbox_new(FALSE, 0); + tpage_create_widgets(); } /* @@ -716,10 +395,9 @@ */ void tpage_set_readonly(gboolean readonly) { - gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), !readonly); - g_object_set (renderer_name, "editable", !readonly, NULL); - gtk_widget_set_sensitive (button_browse, !readonly); - gtk_widget_set_sensitive (cmb_debugger, !readonly); - - page_read_only = readonly; + gtk_text_view_set_editable (GTK_TEXT_VIEW (args_textview), !readonly); + gtk_widget_set_sensitive (target_button_browse, !readonly); + gtk_widget_set_sensitive (debugger_cmb, !readonly); + + envtree_set_readonly(readonly); } Modified: trunk/geany-plugins/debugger/src/tpage.h =================================================================== --- trunk/geany-plugins/debugger/src/tpage.h 2011-09-12 13:04:22 UTC (rev 2195) +++ trunk/geany-plugins/debugger/src/tpage.h 2011-09-13 21:28:14 UTC (rev 2196) @@ -38,3 +38,5 @@ void tpage_set_readonly(gboolean readonly); void tpage_clear(); +void tpage_pack_widgets(gboolean tabbed); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2195] trunk/geany-plugins/devhelp/ wscript_configure
by eht16＠users.sourceforge.net 12 Sep '11

12 Sep '11

Revision: 2195 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2195&view=rev Author: eht16 Date: 2011-09-12 13:04:22 +0000 (Mon, 12 Sep 2011) Log Message: ----------- Stay Py3k compatible Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_configure Modified: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure 2011-09-10 18:27:49 UTC (rev 2194) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-09-12 13:04:22 UTC (rev 2195) @@ -61,4 +61,4 @@ args='--cflags --libs') # finally raise an error if we didn't find any suitable devhelp library to disable this plugin if not conf.env['HAVE_LIBDEVHELP'] == 1: - raise ConfigurationError(u'libdevhelp is necessary for the devhelp plugin') + raise ConfigurationError('libdevhelp is necessary for the devhelp plugin') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2194] trunk/geany-plugins
by cesspit＠users.sourceforge.net 10 Sep '11

10 Sep '11

Revision: 2194 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2194&view=rev Author: cesspit Date: 2011-09-10 18:27:49 +0000 (Sat, 10 Sep 2011) Log Message: ----------- debugger: two panels mode Modified Paths: -------------- trunk/geany-plugins/debugger/src/Makefile.am trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/bptree.h trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/breakpoints.h trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/btnpanel.h trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/stree.h trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/tpage.h trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/utils.h trunk/geany-plugins/debugger/src/vtree.c trunk/geany-plugins/po/POTFILES.in Added Paths: ----------- trunk/geany-plugins/debugger/src/dpaned.c trunk/geany-plugins/debugger/src/dpaned.h trunk/geany-plugins/debugger/src/tabs.c trunk/geany-plugins/debugger/src/tabs.h Modified: trunk/geany-plugins/debugger/src/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/Makefile.am 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/Makefile.am 2011-09-10 18:27:49 UTC (rev 2194) @@ -29,6 +29,8 @@ debug.h \ debug_module.c \ debug_module.h \ + dpaned.c \ + dpaned.h \ gui.h \ gui.c \ keys.c \ @@ -40,6 +42,8 @@ plugin.c \ stree.c \ stree.h \ + tabs.c \ + tabs.h \ tpage.c \ tpage.h \ utils.c \ Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -40,17 +40,12 @@ #include "bptree.h" #include "utils.h" #include "dconfig.h" +#include "tabs.h" #include "xpm/breakpoint.xpm" #include "xpm/breakpoint_disabled.xpm" #include "xpm/breakpoint_condition.xpm" -/* columns minumum width in characters */ -#define MW_CONDITION 20 -#define MW_FILE 20 - -#define ICON_PADDING 10 - /* Tree view columns */ enum { @@ -60,11 +55,11 @@ HITSCOUNT, LINE, ENABLED, + LAST_VISIBLE, N_COLUMNS }; /* tree view and store handles */ -static GtkWidget *scrolled_window = NULL; static GtkWidget *tree = NULL; static GtkTreeModel *model = NULL; static GtkTreeStore *store = NULL; @@ -655,7 +650,8 @@ G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, - G_TYPE_BOOLEAN); + G_TYPE_BOOLEAN, + G_TYPE_STRING); model = GTK_TREE_MODEL(store); tree = gtk_tree_view_new_with_model (model); @@ -671,81 +667,66 @@ /* creating columns */ GtkTreeViewColumn *column; - const gchar *header; - - int char_width = get_char_width(tree); /* icon, file */ - header = _("File"); GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); column = gtk_tree_view_column_new(); - gtk_tree_view_column_pack_end(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, "text", FILEPATH, NULL); - GtkCellRenderer *icon_renderer = gtk_cell_renderer_pixbuf_new (); g_object_set(icon_renderer, "follow-state", TRUE, NULL); gtk_tree_view_column_pack_end(column, icon_renderer, FALSE); gtk_tree_view_column_set_attributes(column, icon_renderer, "pixbuf", ICON, NULL); + gtk_tree_view_column_set_title(column, _("Location")); gtk_tree_view_column_set_cell_data_func(column, icon_renderer, on_render, NULL, NULL); - - gtk_tree_view_column_set_spacing(column, char_width); - gtk_tree_view_column_set_expand(column, TRUE); - + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* condition */ - header = _("Condition"); condition_renderer = gtk_cell_renderer_text_new (); g_object_set (condition_renderer, "editable", TRUE, NULL); g_object_set (condition_renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); g_signal_connect (G_OBJECT (condition_renderer), "edited", G_CALLBACK (on_condition_changed), NULL); - column = create_column(header, condition_renderer, TRUE, - get_header_string_width(header, MW_CONDITION, char_width), - "text", CONDITION); + column = gtk_tree_view_column_new_with_attributes (_("Condition"), condition_renderer, "text", CONDITION, NULL); gtk_tree_view_column_set_cell_data_func(column, condition_renderer, on_render, (gpointer)TRUE, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* hits count */ - header = _("Hit count"); hcount_renderer = gtk_cell_renderer_spin_new (); GtkAdjustment* adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100000.0, 1.0, 2.0, 2.0)); g_object_set (hcount_renderer, "adjustment", adj, "digits", 0, NULL); g_signal_connect (G_OBJECT (hcount_renderer), "edited", G_CALLBACK (on_hitscount_changed), NULL); - column = create_column(header, hcount_renderer, FALSE, - 0, - "text", HITSCOUNT); + column = gtk_tree_view_column_new_with_attributes (_("Hit count"), hcount_renderer, "text", HITSCOUNT, NULL); gtk_tree_view_column_set_cell_data_func(column, hcount_renderer, on_render, (gpointer)TRUE, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* line */ - header = _("Line"); renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, FALSE, - 0, - "text", LINE); + column = gtk_tree_view_column_new_with_attributes (_("Line"), renderer, "text", LINE, NULL); gtk_tree_view_column_set_visible(column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* enabled */ - header = _("Enabled"); enable_renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (G_OBJECT(enable_renderer), "toggled", G_CALLBACK(on_activeness_changed), NULL); - column = create_column(header, enable_renderer, FALSE, - 0, - "active", ENABLED); + column = gtk_tree_view_column_new_with_attributes (_("Enabled"), enable_renderer, "active", ENABLED, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolled_window); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_NONE); + /* Last invisible column */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", LAST_VISIBLE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - gtk_container_add (GTK_CONTAINER (scrolled_window), tree); + tab_breaks = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (tab_breaks); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab_breaks), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (tab_breaks), GTK_SHADOW_NONE); + gtk_container_add (GTK_CONTAINER (tab_breaks), tree); + return TRUE; } @@ -831,15 +812,6 @@ } /* - * get tree view widget - * return value - tree view widget - */ -GtkWidget* bptree_get_widget() -{ - return scrolled_window; -} - -/* * add new breakpoint to the tree view * arguments: * bp - breakpoint to add Modified: trunk/geany-plugins/debugger/src/bptree.h =================================================================== --- trunk/geany-plugins/debugger/src/bptree.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/bptree.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -21,7 +21,6 @@ gboolean bptree_init(move_to_line_cb callback); void bptree_destroy(); -GtkWidget* bptree_get_widget(); void bptree_add_breakpoint(breakpoint* bp); void bptree_update_breakpoint(breakpoint* bp); void bptree_remove_breakpoint(breakpoint* bp); Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -567,11 +567,3 @@ g_hash_table_foreach(files, hash_table_foreach_add_to_list, &breaks); return breaks; } - -/* - * Get breakpoints widget - */ -GtkWidget* breaks_get_widget() -{ - return bptree_get_widget(); -} Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -37,7 +37,6 @@ void breaks_set_condition(char* file, int line, char* condition); void breaks_move_to_line(char* file, int line_from, int line_to); break_state breaks_get_state(const char* file, int line); -GtkWidget* breaks_get_widget(); GList* breaks_get_for_document(const char* file); GList* breaks_get_all(); Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -37,6 +37,7 @@ #include "breakpoints.h" #include "watch_model.h" #include "wtree.h" +#include "dpaned.h" #include "btnpanel.h" #define CP_BUTTONS_PAD 5 @@ -118,7 +119,7 @@ /* * create and initialize buttons panel */ -GtkWidget* btnpanel_create() +GtkWidget* btnpanel_create(on_toggle cb) { GtkWidget *vbox = gtk_vbox_new(FALSE, CP_BUTTONS_PAD); gtk_container_set_border_width (GTK_CONTAINER (vbox), 7); @@ -179,6 +180,8 @@ vbutton_box = gtk_vbox_new(TRUE, CP_BUTTONS_PAD); tabbtn = create_toggle_button("tabs.gif", _("Tabs")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tabbtn), dpaned_get_tabbed()); + g_signal_connect(G_OBJECT(tabbtn), "toggled", G_CALLBACK(cb), NULL); gtk_box_pack_start(GTK_BOX(vbox), tabbtn, FALSE, FALSE, 0); optbtn = create_stock_button(GTK_STOCK_PREFERENCES, "Настройки"); Modified: trunk/geany-plugins/debugger/src/btnpanel.h =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/btnpanel.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -19,7 +19,9 @@ * MA 02110-1301, USA. */ -GtkWidget* btnpanel_create(); +typedef void (*on_toggle)(GtkToggleButton *button, gpointer user_data); + +GtkWidget* btnpanel_create(on_toggle cb); void btnpanel_on_document_close(); void btnpanel_on_document_activate(GeanyDocument *doc); Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -38,6 +38,7 @@ #include "bptree.h" #include "btnpanel.h" #include "dconfig.h" +#include "tabs.h" extern GeanyFunctions *geany_functions; @@ -358,9 +359,9 @@ if (DBS_STOPPED == debug_get_state() && debug_current_instruction_have_sources()) { debug_jump_to_current_instruction(); - gtk_widget_set_sensitive(stree_get_widget(), FALSE); + gtk_widget_set_sensitive(tab_call_stack, FALSE); stree_select_first(); - gtk_widget_set_sensitive(stree_get_widget(), TRUE); + gtk_widget_set_sensitive(tab_call_stack, TRUE); } } } Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/debug.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -60,6 +60,7 @@ #include "bptree.h" #include "btnpanel.h" #include "dconfig.h" +#include "tabs.h" /* * calltip size @@ -110,9 +111,6 @@ /* debug terminal widget */ GtkWidget *terminal = NULL; -/* pointer to the debug notebook widget */ -static GtkWidget* debug_notebook = NULL; - /* GtkTextView to put debugger messages */ static GtkWidget *debugger_messages_textview = NULL; @@ -867,12 +865,9 @@ /* * init debug related GUI (watch tree view) * arguments: - * nb - GtkNotebook to add watch page */ -void debug_init(GtkWidget* nb) +void debug_init() { - debug_notebook = nb; - /* create watch page */ wtree = wtree_init(on_watch_expanded_callback, on_watch_dragged_callback, @@ -882,47 +877,37 @@ wmodel = gtk_tree_view_get_model(GTK_TREE_VIEW(wtree)); wstore = GTK_TREE_STORE(wmodel); - GtkWidget *sview = gtk_scrolled_window_new( + tab_watch = gtk_scrolled_window_new( gtk_tree_view_get_hadjustment(GTK_TREE_VIEW(wtree)), gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(wtree)) ); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sview), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tab_watch), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(sview), wtree); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - sview, - gtk_label_new(_("Watch"))); + gtk_container_add(GTK_CONTAINER(tab_watch), wtree); /* create locals page */ ltree = ltree_init(on_watch_expanded_callback, on_watch_button_pressed_callback); - sview = gtk_scrolled_window_new( + tab_locals = gtk_scrolled_window_new( gtk_tree_view_get_hadjustment(GTK_TREE_VIEW(ltree)), gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ltree)) ); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sview), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tab_locals), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(sview), ltree); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - sview, - gtk_label_new(_("Locals"))); - + gtk_container_add(GTK_CONTAINER(tab_locals), ltree); + /* create stack trace page */ - stree_init(editor_open_position); - stree = stree_get_widget(); - sview = gtk_scrolled_window_new( + stree = stree_init(editor_open_position); + tab_call_stack = gtk_scrolled_window_new( gtk_tree_view_get_hadjustment(GTK_TREE_VIEW(stree )), gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(stree )) ); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sview), + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tab_call_stack), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(sview), stree); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - sview, - gtk_label_new(_("Call Stack"))); - + gtk_container_add(GTK_CONTAINER(tab_call_stack), stree); + /* create debug terminal page */ terminal = vte_terminal_new(); /* create PTY */ @@ -934,10 +919,10 @@ vte_terminal_set_pty(VTE_TERMINAL(terminal), pty_master); GtkWidget *scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(terminal)->adjustment)); GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); - GtkWidget *_frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type (GTK_FRAME(_frame), GTK_SHADOW_NONE); + tab_terminal = gtk_frame_new(NULL); + gtk_frame_set_shadow_type (GTK_FRAME(tab_terminal), GTK_SHADOW_NONE); GtkWidget *hbox = gtk_hbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(_frame), hbox); + gtk_container_add(GTK_CONTAINER(tab_terminal), hbox); gtk_box_pack_start(GTK_BOX(hbox), terminal, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0); /* set the default widget size first to prevent VTE expanding too much, @@ -950,26 +935,20 @@ g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); gchar *font = utils_get_setting_string(config, "VTE", "font", "Monospace 10"); vte_terminal_set_font_from_string (VTE_TERMINAL(terminal), font); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - _frame, - gtk_label_new(_("Debug terminal"))); /* debug messages page */ - sview = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sview), + tab_messages = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tab_messages), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(sview)); - vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sview)); + hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(tab_messages)); + vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(tab_messages)); debugger_messages_textview = gtk_text_view_new(); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(debugger_messages_textview), GTK_WRAP_CHAR); gtk_text_view_set_editable (GTK_TEXT_VIEW (debugger_messages_textview), FALSE); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sview), debugger_messages_textview); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - sview, - gtk_label_new(_("Debugger messages"))); - + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tab_messages), debugger_messages_textview); + /* create tex tags */ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(debugger_messages_textview)); gtk_text_buffer_create_tag(buffer, "black", "foreground", "#000000", NULL); @@ -980,8 +959,6 @@ gtk_text_buffer_create_tag(buffer, "yellow", "foreground", "#FFFF00", NULL); gtk_text_buffer_create_tag(buffer, "brown", "foreground", "#BB8915", NULL); gtk_text_buffer_create_tag(buffer, "rose", "foreground", "#BA92B7", NULL); - - gtk_widget_show_all(debug_notebook); } /* Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/debug.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -34,8 +34,8 @@ /* function type to execute on interrupt */ typedef void (*bs_callback)(breakpoint*, break_set_activity); -void debug_init(GtkWidget* nb); -enum dbs debug_get_state(); +void debug_init(); +enum dbs debug_get_state(); void debug_run(); void debug_stop(); void debug_step_over(); Added: trunk/geany-plugins/debugger/src/dpaned.c =================================================================== --- trunk/geany-plugins/debugger/src/dpaned.c (rev 0) +++ trunk/geany-plugins/debugger/src/dpaned.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -0,0 +1,456 @@ +/* + * + * dpaned.c + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +/* + * Working with debug paned. + */ + +#include <sys/stat.h> + +#include <memory.h> +#include <string.h> + +#include "geanyplugin.h" +extern GeanyFunctions *geany_functions; +extern GeanyData *geany_data; + +#include "tabs.h" +#include "breakpoint.h" +#include "breakpoints.h" +#include "debug.h" +#include "btnpanel.h" +#include "stree.h" + +#define NOTEBOOK_GROUP 438948394 +#define HPANED_BORDER_WIDTH 4 + +#define CONNECT_PAGE_SIGNALS(X) \ + swicth_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ + swicth_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ + g_signal_connect(G_OBJECT(debug_notebook_left), "page-reordered", G_CALLBACK(on_page_reordered), NULL); \ + g_signal_connect(G_OBJECT(debug_notebook_right), "page-reordered", G_CALLBACK(on_page_reordered), NULL); \ + add_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "page-added", G_CALLBACK(on_page_added), NULL); \ + add_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "page-added", G_CALLBACK(on_page_added), NULL); \ + remove_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "page-removed", G_CALLBACK(on_page_removed), NULL); \ + remove_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "page-removed", G_CALLBACK(on_page_removed), NULL); + +#define DISCONNECT_PAGE_SIGNALS(X) \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), swicth_left_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), swicth_right_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), reorder_left_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), reorder_right_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), add_left_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), add_right_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), remove_left_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), remove_right_handler_id); + +#define CONNECT_ALLOCATED_PAGE_SIGNALS(X) \ + allocate_handler_id = g_signal_connect(G_OBJECT(hpaned), "size-allocate", G_CALLBACK(on_size_allocate), NULL); + +#define DISCONNECT_ALLOCATED_PAGE_SIGNALS(X) \ + g_signal_handler_disconnect(G_OBJECT(hpaned), allocate_handler_id); \ + +/* config file path */ +static gchar *config_path = NULL; + +/* config GKeyFile */ +static GKeyFile *key_file = NULL; + +/* pane */ +static GtkWidget *hpaned = NULL; + +/* left and right notebooks */ +static GtkWidget *debug_notebook_left = NULL; +static GtkWidget *debug_notebook_right = NULL; + + +/* notebook signal handler ids */ + +static gulong allocate_handler_id; + +static gulong swicth_left_handler_id; +static gulong swicth_right_handler_id; + +static gulong reorder_left_handler_id; +static gulong reorder_right_handler_id; + +static gulong add_left_handler_id; +static gulong add_right_handler_id; + +static gulong remove_left_handler_id; +static gulong remove_right_handler_id; + +/* keeps current tabbed mode */ +static gboolean is_tabbed; + +/* + * save config to a file + */ +static void save_config() +{ + gchar *data = g_key_file_to_data(key_file, NULL, NULL); + g_file_set_contents(config_path, data, -1, NULL); + g_free(data); +} + +/* + * first allocation handler to properly set paned position + */ +void on_size_allocate(GtkWidget *widget,GdkRectangle *allocation, gpointer user_data) +{ + DISCONNECT_ALLOCATED_PAGE_SIGNALS(); + + int position = (allocation->width - 2 * HPANED_BORDER_WIDTH) * 0.5; + gtk_paned_set_position(GTK_PANED(hpaned), position); +} + +/* + * page added event handler + */ +static void on_page_added(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) +{ + gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + + const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; + const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; + + gsize length; + int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); + + int *new_tabs = g_malloc((length + 1) * sizeof(int)); + memcpy(new_tabs, tabs, length * sizeof(int)); + memmove(new_tabs + page_num + 1, new_tabs + page_num, (length - page_num) * sizeof(int)); + + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(left ? debug_notebook_left : debug_notebook_right), page_num); + tab_id id = tabs_get_tab_id(page); + new_tabs[page_num] = id; + + g_key_file_set_integer_list(key_file, group, tabs_key, new_tabs, length + 1); + + save_config(); + + g_free(tabs); + g_free(new_tabs); +} + +/* + * page reordered event handler + */ +static void on_page_reordered(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) +{ + gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + + const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; + const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; + const gchar *selected_key = is_tabbed ? (left ? "left_selected_tab_index" : "right_selected_tab_index") : "selected_tab_index"; + + gsize length; + int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); + + int prev_index; + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(left ? debug_notebook_left : debug_notebook_right), page_num); + tab_id id = tabs_get_tab_id(page); + for (prev_index = 0; prev_index < length; prev_index++) + { + if (id == tabs[prev_index]) + { + break; + } + } + + int i, min = MIN(prev_index, page_num), max = MAX(prev_index, page_num); + for (i = min; i < max; i++) + { + int tmp = tabs[i]; + tabs[i] = tabs[i + 1]; + tabs[i + 1] = tmp; + } + + g_key_file_set_integer_list(key_file, group, tabs_key, tabs, length); + g_key_file_set_integer(key_file, group, selected_key, page_num); + + save_config(); + + g_free(tabs); +} + +/* + * page removed event handler + */ +static void on_page_removed(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) +{ + gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + + const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; + const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; + + gsize length; + int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); + memmove(tabs + page_num, tabs + page_num + 1, (length - page_num - 1) * sizeof(int)); + + g_key_file_set_integer_list(key_file, group, tabs_key, tabs, length - 1); + + save_config(); + + g_free(tabs); +} + +/* + * active page changed event handler + */ +static gboolean on_change_current_page(GtkNotebook *notebook, gpointer arg1, guint arg2, gpointer user_data) +{ + gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + + const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; + const gchar *selected_key = is_tabbed ? (left ? "left_selected_tab_index" : "right_selected_tab_index") : "selected_tab_index"; + + g_key_file_set_integer(key_file, group, selected_key, arg2); + + save_config(); + + return TRUE; +} + +/* + * set default values in the GKeyFile + */ +void dpaned_set_defaults(GKeyFile *kf) +{ + g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", FALSE); + + int all_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH, TID_STACK, TID_TERMINAL, TID_MESSAGES }; + g_key_file_set_integer_list(key_file, "one_panel_mode", "tabs", all_tabs, sizeof(all_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "one_panel_mode", "selected_tab_index", 0); + + int left_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH }; + g_key_file_set_integer_list(key_file, "two_panels_mode", "left_tabs", left_tabs, sizeof(left_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "two_panels_mode", "left_selected_tab_index", 0); + int right_tabs[] = { TID_STACK, TID_TERMINAL, TID_MESSAGES }; + g_key_file_set_integer_list(key_file, "two_panels_mode", "right_tabs", right_tabs, sizeof(right_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "two_panels_mode", "right_selected_tab_index", 0); +} + +/* + * create GUI and check config + */ +void dpaned_init() +{ + /* create paned */ + hpaned = gtk_hpaned_new(); + gtk_container_set_border_width(GTK_CONTAINER(hpaned), HPANED_BORDER_WIDTH); + + /* create notebooks */ + debug_notebook_left = gtk_notebook_new (); + debug_notebook_right = gtk_notebook_new (); + + /* setup notebooks */ + gtk_notebook_set_scrollable(GTK_NOTEBOOK(debug_notebook_left), TRUE); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(debug_notebook_right), TRUE); + gtk_notebook_set_group_id(GTK_NOTEBOOK(debug_notebook_left), NOTEBOOK_GROUP); + gtk_notebook_set_group_id (GTK_NOTEBOOK(debug_notebook_right), NOTEBOOK_GROUP); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_notebook_left), GTK_POS_TOP); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_notebook_right), GTK_POS_TOP); + + /* add notebooks */ + gtk_paned_add1(GTK_PANED(hpaned), debug_notebook_left); + gtk_paned_add2(GTK_PANED(hpaned), debug_notebook_right); + + /* read config */ + gchar *config_dir = g_build_path(G_DIR_SEPARATOR_S, geany_data->app->configdir, "plugins", "debugger", NULL); + config_path = g_build_path(G_DIR_SEPARATOR_S, config_dir, "debugger.conf", NULL); + + g_mkdir_with_parents(config_dir, S_IRUSR | S_IWUSR | S_IXUSR); + + key_file = g_key_file_new(); + if (!g_key_file_load_from_file(key_file, config_path, G_KEY_FILE_NONE, NULL)) + { + dpaned_set_defaults(key_file); + gchar *data = g_key_file_to_data(key_file, NULL, NULL); + g_file_set_contents(config_path, data, -1, NULL); + g_free(data); + } + + is_tabbed = g_key_file_get_boolean(key_file, "tabbed_mode", "enabled", NULL); + if (is_tabbed) + { + gsize length; + int *tab_ids, i; + + /* left */ + tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "left_tabs", &length, NULL); + for (i = 0; i < length; i++) + { + GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); + gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook_left), + tab, + gtk_label_new(tabs_get_label(tab_ids[i]))); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + } + g_free(tab_ids); + + /* right */ + tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "right_tabs", &length, NULL); + for (i = 0; i < length; i++) + { + GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); + gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook_right), + tab, + gtk_label_new(tabs_get_label(tab_ids[i]))); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(debug_notebook_right), tab, TRUE); + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_right), tab, TRUE); + } + g_free(tab_ids); + + gtk_widget_show_all(hpaned); + + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), + g_key_file_get_integer(key_file, "two_panels_mode", "left_selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right), + g_key_file_get_integer(key_file, "two_panels_mode", "right_selected_tab_index", NULL)); + } + else + { + g_object_ref(debug_notebook_right); + gtk_container_remove(GTK_CONTAINER(hpaned), debug_notebook_right); + + gsize length; + int *tab_ids = g_key_file_get_integer_list(key_file, "one_panel_mode", "tabs", &length, NULL); + int i; + for (i = 0; i < length; i++) + { + GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); + gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook_left), + tab, + gtk_label_new(tabs_get_label(tab_ids[i]))); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + } + + gtk_widget_show_all(hpaned); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), + g_key_file_get_integer(key_file, "one_panel_mode", "selected_tab_index", NULL)); + } + + g_free(config_dir); + + CONNECT_PAGE_SIGNALS(); + CONNECT_ALLOCATED_PAGE_SIGNALS(); +} + +/* + * free local data, disconnect signals + */ +void dpaned_destroy() +{ + g_key_file_free(key_file); + g_free(config_path); + + DISCONNECT_PAGE_SIGNALS(); +} + +/* + * gets widget + */ +GtkWidget* dpaned_get_paned() +{ + return hpaned; +} + +/* + * sets tabs mode + */ +void dpaned_set_tabbed(gboolean tabbed) +{ + is_tabbed = tabbed; + + DISCONNECT_PAGE_SIGNALS(); + + if (!tabbed) + { + g_object_ref(debug_notebook_right); + gtk_container_remove(GTK_CONTAINER(hpaned), debug_notebook_right); + + gsize length; + int *tab_ids = g_key_file_get_integer_list(key_file, "one_panel_mode", "tabs", &length, NULL); + int i; + for (i = 0; i < length; i++) + { + GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); + if (-1 == gtk_notebook_page_num(GTK_NOTEBOOK(debug_notebook_left), tab)) + { + g_object_ref(tab); + gtk_container_remove(GTK_CONTAINER(debug_notebook_right), tab); + gtk_notebook_insert_page(GTK_NOTEBOOK(debug_notebook_left), tab, gtk_label_new(tabs_get_label(tab_ids[i])), i); + g_object_unref(tab); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_left), tab, TRUE); + } + } + + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), + g_key_file_get_integer(key_file, "one_panel_mode", "selected_tab_index", NULL)); + + gtk_widget_show_all(hpaned); + } + else + { + gtk_paned_add2(GTK_PANED(hpaned), debug_notebook_right); + g_object_unref(debug_notebook_right); + + gsize length; + int *tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "right_tabs", &length, NULL); + int i; + for (i = 0; i < length; i++) + { + GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); + g_object_ref(tab); + gtk_container_remove(GTK_CONTAINER(debug_notebook_left), tab); + gtk_notebook_insert_page(GTK_NOTEBOOK(debug_notebook_right), tab, gtk_label_new(tabs_get_label(tab_ids[i])), i); + g_object_unref(tab); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(debug_notebook_right), tab, TRUE); + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_right), tab, TRUE); + } + + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), + g_key_file_get_integer(key_file, "two_panels_mode", "left_selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right), + g_key_file_get_integer(key_file, "two_panels_mode", "right_selected_tab_index", NULL)); + + gtk_widget_show_all(hpaned); + } + + CONNECT_PAGE_SIGNALS(); + + g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", is_tabbed); + + save_config(); +} + +/* + * gets tabbed mode state + */ +gboolean dpaned_get_tabbed() +{ + return is_tabbed; +} Added: trunk/geany-plugins/debugger/src/dpaned.h =================================================================== --- trunk/geany-plugins/debugger/src/dpaned.h (rev 0) +++ trunk/geany-plugins/debugger/src/dpaned.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -0,0 +1,27 @@ +/* + * + * dpaned.c + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +void dpaned_init(); +void dpaned_destroy(); +GtkWidget* dpaned_get_paned(); +void dpaned_set_tabbed(gboolean paned); +gboolean dpaned_get_tabbed(); Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -37,6 +37,8 @@ #include "btnpanel.h" #include "keys.h" #include "dconfig.h" +#include "dpaned.h" +#include "tabs.h" /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; @@ -74,6 +76,12 @@ { NULL, NULL, FALSE, NULL } }; +void on_paned_mode_changed(GtkToggleButton *button, gpointer user_data) +{ + gboolean state = gtk_toggle_button_get_active(button); + dpaned_set_tabbed(state); +} + /* Called by Geany to initialize the plugin. * Note: data is the same as geany_data. */ void plugin_init(GeanyData *data) @@ -84,37 +92,27 @@ /* main box */ hbox = gtk_hbox_new(FALSE, 0); - - GtkWidget *debug_notebook = gtk_notebook_new (); - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_notebook), GTK_POS_TOP); /* add target page */ tpage_init(); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - tpage_get_widget(), - gtk_label_new(_("Target"))); - gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook), tpage_get_widget(), TRUE); /* init brekpoints */ breaks_init(editor_open_position); - gtk_notebook_append_page(GTK_NOTEBOOK(debug_notebook), - breaks_get_widget(), - gtk_label_new(_("Breakpoints"))); - gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook), breaks_get_widget(), TRUE); - + /* init markers */ markers_init(); /* init debug */ - debug_init(debug_notebook); + debug_init(); - gtk_widget_show_all(debug_notebook); + /* init paned */ + dpaned_init(); - GtkWidget* vbox = btnpanel_create(); + GtkWidget* vbox = btnpanel_create(on_paned_mode_changed); - gtk_box_pack_start(GTK_BOX(hbox), debug_notebook, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), dpaned_get_paned(), TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); - + gtk_widget_show_all(hbox); gtk_notebook_append_page( @@ -164,6 +162,9 @@ /* clears config */ dconfig_destroy(); + /* clears debug paned data */ + dpaned_destroy(); + /* release other allocated strings and objects */ gtk_widget_destroy(hbox); } Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/stree.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -36,14 +36,8 @@ #include "xpm/frame_current.xpm" -/* columns minumum width in characters */ -#define MW_ADRESS 10 -#define MW_FUNCTION 10 -#define MW_FILE 0 -#define MW_LINE 4 +#define ARROW_PADDING 7 -#define ARROW_PADDING 10 - /* Tree view columns */ enum { @@ -52,6 +46,7 @@ S_FUNCTION, S_FILEPATH, S_LINE, + S_LAST_VISIBLE, S_N_COLUMNS }; @@ -66,6 +61,8 @@ static GtkTreeModel* model = NULL; static GtkListStore* store = NULL; +static GtkCellRenderer *renderer_arrow, *renderer_address, *renderer_funtion, *renderer_file, *renderer_line, *renderer_last; + /* flag to indicate whether to handle selection change */ static gboolean handle_selection = TRUE; @@ -160,7 +157,7 @@ * arguments: * cb - callback to call on double click */ -gboolean stree_init(move_to_line_cb cb) +GtkWidget* stree_init(move_to_line_cb cb) { callback = cb; @@ -173,7 +170,9 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INT); + G_TYPE_INT, + G_TYPE_STRING); + model = GTK_TREE_MODEL(store); tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); @@ -190,51 +189,43 @@ G_CALLBACK(on_msgwin_button_press), NULL); /* creating columns */ - GtkCellRenderer *renderer; GtkTreeViewColumn *column; - const gchar *header; - - int char_width = get_char_width(tree); /* arrow */ - renderer = gtk_cell_renderer_pixbuf_new (); - column = create_column("", renderer, FALSE, - gdk_pixbuf_get_width(arrow_pixbuf) + 2 * ARROW_PADDING, - "pixbuf", S_ARROW); + renderer_arrow = gtk_cell_renderer_pixbuf_new (); + column = gtk_tree_view_column_new_with_attributes ("", renderer_arrow, "pixbuf", S_ARROW, NULL); + gtk_tree_view_column_set_min_width(column, gdk_pixbuf_get_width(arrow_pixbuf) + 2 * ARROW_PADDING); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - /* adress */ - header = _("Address"); - renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_ADRESS, char_width), - "text", S_ADRESS); + /* address */ + renderer_address = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Address"), renderer_address, "text", S_ADRESS, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* function */ - header = _("Function"); - renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_FUNCTION, char_width), - "text", S_FUNCTION); + renderer_funtion = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Function"), renderer_funtion, "text", S_FUNCTION, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* file */ - header = _("File"); - renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, TRUE, - get_header_string_width(header, MW_FILE, char_width), - "text", S_FILEPATH); + renderer_file = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("File"), renderer_file, "text", S_FILEPATH, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* line */ - header = _("Line"); - renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_LINE, char_width), - "text", S_LINE); + renderer_line = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Line"), renderer_line, "text", S_LINE, NULL); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* Last invisible column */ + renderer_last = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("", renderer_last, "text", S_LAST_VISIBLE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* create frames hash table */ frames = g_hash_table_new_full( g_str_hash, @@ -242,14 +233,6 @@ (GDestroyNotify)g_free, NULL); - return TRUE; -} - -/* - * get stack trace tree view - */ -GtkWidget* stree_get_widget() -{ return tree; } Modified: trunk/geany-plugins/debugger/src/stree.h =================================================================== --- trunk/geany-plugins/debugger/src/stree.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/stree.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -19,10 +19,9 @@ * MA 02110-1301, USA. */ -gboolean stree_init(move_to_line_cb cb); -void stree_destroy(); -GtkWidget* stree_get_widget(); -void stree_add(frame *f, gboolean first); -void stree_clear(); -void stree_select_first(); +GtkWidget* stree_init(move_to_line_cb cb); +void stree_destroy(); +void stree_add(frame *f, gboolean first); +void stree_clear(); +void stree_select_first(); Added: trunk/geany-plugins/debugger/src/tabs.c =================================================================== --- trunk/geany-plugins/debugger/src/tabs.c (rev 0) +++ trunk/geany-plugins/debugger/src/tabs.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -0,0 +1,150 @@ +/* + * + * tabs.c + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +/* + * tabs widgets + */ + +#include "geanyplugin.h" +extern GeanyFunctions *geany_functions; +extern GeanyData *geany_data; + +#include "tabs.h" + +/* tab widgets */ +GtkWidget *tab_target = NULL; +GtkWidget *tab_breaks = NULL; +GtkWidget *tab_watch = NULL; +GtkWidget *tab_locals = NULL; +GtkWidget *tab_call_stack = NULL; +GtkWidget *tab_terminal = NULL; +GtkWidget *tab_messages = NULL; + +/* + * searches ID for a given widget + * arguments: + * tab - widget to search an id for + */ +tab_id tabs_get_tab_id(GtkWidget* tab) +{ + tab_id id; + if (tab_target == tab) + { + id = TID_TARGET; + } + else if (tab_breaks == tab) + { + id = TID_BREAKS; + } + else if (tab_watch == tab) + { + id = TID_WATCH; + } + else if (tab_locals == tab) + { + id = TID_LOCALS; + } + else if (tab_call_stack == tab) + { + id = TID_STACK; + } + else if (tab_terminal == tab) + { + id = TID_TERMINAL; + } + else if (tab_messages == tab) + { + id = TID_MESSAGES; + } + + return id; +} + +/* + * searches a widget for a given ID + * arguments: + * id - ID to search a widget for + */ +GtkWidget* tabs_get_tab(tab_id id) +{ + GtkWidget *tab = NULL; + switch(id) + { + case TID_TARGET: + tab = tab_target; + break; + case TID_BREAKS: + tab = tab_breaks; + break; + case TID_WATCH: + tab = tab_watch; + break; + case TID_LOCALS: + tab = tab_locals; + break; + case TID_STACK: + tab = tab_call_stack; + break; + case TID_TERMINAL: + tab = tab_terminal; + break; + case TID_MESSAGES: + tab = tab_messages; + break; + } + return tab; +} + +/* + * searches a label for a given ID + * arguments: + * id - ID to search a label for + */ +const gchar* tabs_get_label(tab_id id) +{ + const gchar *label = NULL; + switch(id) + { + case TID_TARGET: + label = _("Target"); + break; + case TID_BREAKS: + label = _("Breakpoints"); + break; + case TID_WATCH: + label = _("Watch"); + break; + case TID_LOCALS: + label = _("Locals"); + break; + case TID_STACK: + label = _("Call Stack"); + break; + case TID_TERMINAL: + label = _("Debug terminal"); + break; + case TID_MESSAGES: + label = _("Debugger messages"); + break; + } + return label; +} Added: trunk/geany-plugins/debugger/src/tabs.h =================================================================== --- trunk/geany-plugins/debugger/src/tabs.h (rev 0) +++ trunk/geany-plugins/debugger/src/tabs.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -0,0 +1,45 @@ +/* + * + * tabs.c + * + * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +typedef enum _tab_id +{ + TID_TARGET, + TID_BREAKS, + TID_WATCH, + TID_LOCALS, + TID_STACK, + TID_TERMINAL, + TID_MESSAGES +} tab_id; + +extern GtkWidget *tab_target; +extern GtkWidget *tab_breaks; +extern GtkWidget *tab_watch; +extern GtkWidget *tab_locals; +extern GtkWidget *tab_call_stack; +extern GtkWidget *tab_terminal; +extern GtkWidget *tab_messages; + +GtkWidget* tabs_get_tab(tab_id id); +tab_id tabs_get_tab_id(GtkWidget* tab); +const gchar* tabs_get_label(tab_id id); + Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -41,6 +41,7 @@ #include "debug.h" #include "dconfig.h" #include "tpage.h" +#include "tabs.h" /* boxes margins */ #define SPACING 5 @@ -54,6 +55,7 @@ { NAME, VALUE, + LAST_VISIBLE, N_COLUMNS }; @@ -66,9 +68,6 @@ /* reference to the env tree view empty row */ static GtkTreeRowReference *empty_row = NULL; -/* page widget */ -static GtkWidget *page = NULL; - /* target name textentry */ static GtkWidget *targetname = NULL; @@ -585,7 +584,7 @@ */ void tpage_init() { - page = gtk_hbox_new(FALSE, 0); + tab_target = gtk_hbox_new(FALSE, 0); GtkWidget *lbox = gtk_vbox_new(FALSE, SPACING); GtkWidget *mbox = gtk_vbox_new(FALSE, SPACING); @@ -667,36 +666,34 @@ store = gtk_list_store_new ( N_COLUMNS, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + model = GTK_TREE_MODEL(store); envtree = gtk_tree_view_new_with_model (model); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(envtree), TRUE); g_object_set(envtree, "rules-hint", TRUE, NULL); g_signal_connect(G_OBJECT(envtree), "key-press-event", G_CALLBACK (on_envtree_keypressed), NULL); - const gchar *header; - int char_width = get_char_width(envtree); - - header = _("Name"); renderer_name = gtk_cell_renderer_text_new (); g_object_set (renderer_name, "editable", TRUE, NULL); g_signal_connect (G_OBJECT (renderer_name), "edited", G_CALLBACK (on_name_changed), NULL); - column_name = create_column(header, renderer_name, FALSE, - get_header_string_width(header, MW_NAME, char_width), - "text", NAME); + column_name = gtk_tree_view_column_new_with_attributes (_("Name"), renderer_name, "text", NAME, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column_name); - header = _("Value"); renderer_value = gtk_cell_renderer_text_new (); - column_value = create_column(header, renderer_value, TRUE, - get_header_string_width(header, MW_VALUE, char_width), - "text", VALUE); + column_name = gtk_tree_view_column_new_with_attributes (_("Value"), renderer_name, "text", VALUE, NULL); g_signal_connect (G_OBJECT (renderer_value), "edited", G_CALLBACK (on_value_changed), NULL); g_signal_connect (G_OBJECT (renderer_value), "editing-started", G_CALLBACK (on_value_editing_started), NULL); g_signal_connect (G_OBJECT (renderer_value), "editing-canceled", G_CALLBACK (on_value_editing_cancelled), NULL); gtk_tree_view_column_set_cell_data_func(column_value, renderer_value, on_render_value, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column_value); + /* Last invisible column */ + GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); + GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", LAST_VISIBLE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (envtree), column); + /* add empty row */ add_empty_row(); @@ -711,18 +708,10 @@ gtk_box_pack_start(GTK_BOX(hombox), lbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hombox), mbox, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(page), hombox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(tab_target), hombox, TRUE, TRUE, 0); } /* - * get page widget - */ -GtkWidget* tpage_get_widget() -{ - return page; -} - -/* * set the page readonly */ void tpage_set_readonly(gboolean readonly) Modified: trunk/geany-plugins/debugger/src/tpage.h =================================================================== --- trunk/geany-plugins/debugger/src/tpage.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/tpage.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -20,7 +20,6 @@ */ void tpage_init(); -GtkWidget* tpage_get_widget(); gchar* tpage_get_target(); void tpage_set_target(const gchar *newvalue); Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/utils.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -35,53 +35,7 @@ #include "geanyplugin.h" extern GeanyFunctions *geany_functions; -/* character to calculate width */ -#define CHAR_TESTED "W" - /* - * get character width in a widget - */ -int get_char_width(GtkWidget *widget) -{ - PangoLayout *playout = pango_layout_new(gtk_widget_get_pango_context(widget)); - - int width, height; - - pango_layout_set_text(playout, CHAR_TESTED, -1); - pango_layout_get_pixel_size (playout, &width, &height); - - g_object_unref(playout); - - return width; -} - -/* - * get string width if string length is bigger than minwidth or minwidth * char_width - */ -int get_header_string_width(const gchar *header, int minchars, int char_width) -{ - int header_length = strlen(header); - int width = (header_length > minchars ? header_length : minchars) * char_width; - return width; -} - -/* - * create tree view column - */ -GtkTreeViewColumn *create_column(const gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value) -{ - GtkTreeViewColumn *column = - gtk_tree_view_column_new_with_attributes (name, renderer, arg, value, NULL); - - if (expandable) - gtk_tree_view_column_set_expand(column, expandable); - else if (minwidth) - gtk_tree_view_column_set_min_width(column, minwidth); - - return column; -} - -/* * opens position in a editor */ void editor_open_position(char* file, int line) Modified: trunk/geany-plugins/debugger/src/utils.h =================================================================== --- trunk/geany-plugins/debugger/src/utils.h 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/utils.h 2011-09-10 18:27:49 UTC (rev 2194) @@ -20,7 +20,4 @@ */ void editor_open_position(char* file, int line); -int get_char_width(GtkWidget *widget); -int get_header_string_width(const gchar *header, int minchars, int char_width); -GtkTreeViewColumn* create_column(const gchar *name, GtkCellRenderer *renderer, gboolean expandable, gint minwidth, const char *arg, int value); GString* get_word_at_position(ScintillaObject *sci, int position); Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-09-10 18:27:49 UTC (rev 2194) @@ -116,17 +116,10 @@ /* create columns */ GtkCellRenderer *renderer; GtkTreeViewColumn *column; - const gchar *header; - int min_column_with = MIN_COLUMN_CHARS * get_char_width(tree); - /* Name */ - header = _("Name"); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - column = create_column(header, renderer, FALSE, - min_column_with, - "text", W_NAME); + column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer, "text", W_NAME, NULL); gtk_tree_view_column_set_resizable (column, TRUE); if (on_render_name) gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_name, NULL, NULL); @@ -138,33 +131,22 @@ gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Value */ - header = _("Value"); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - column = create_column(header, renderer, TRUE, - min_column_with, - "text", W_VALUE); + column = gtk_tree_view_column_new_with_attributes (_("Value"), renderer, "text", W_VALUE, NULL); gtk_tree_view_column_set_cell_data_func(column, renderer, render_value, NULL, NULL); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Type */ - header = _("Type"); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - column = create_column(header, renderer, FALSE, - min_column_with, - "text", W_TYPE); + column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer, "text", W_TYPE, NULL); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Last invisible column */ - header = _(""); renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, FALSE, - 0, - "text", W_LAST_VISIBLE); + column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", W_LAST_VISIBLE, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Internal (unvisible column) */ Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2011-09-04 11:16:10 UTC (rev 2193) +++ trunk/geany-plugins/po/POTFILES.in 2011-09-10 18:27:49 UTC (rev 2194) @@ -30,6 +30,7 @@ debugger/src/ltree.c debugger/src/utils.c debugger/src/stree.c +debugger/src/tabs.c debugger/src/keys.c debugger/src/markers.c debugger/src/watch_model.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2193] trunk/geany-plugins/debugger/src/bptree.c
by cesspit＠users.sourceforge.net 04 Sep '11

04 Sep '11

Revision: 2193 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2193&view=rev Author: cesspit Date: 2011-09-04 11:16:10 +0000 (Sun, 04 Sep 2011) Log Message: ----------- debugger: breakpoints tree fixes Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-09-03 20:21:10 UTC (rev 2192) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-09-04 11:16:10 UTC (rev 2193) @@ -105,6 +105,47 @@ } /* + * gets tree row reference for an unsected row at the same depth + */ +GtkTreeRowReference* get_unselected_sibling(GtkTreePath *path) +{ + GtkTreeRowReference *sibling = NULL; + + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + + /* move down find first unselected sibling */ + GtkTreeIter titer; + gtk_tree_model_get_iter(model, &titer, path); + while (gtk_tree_model_iter_next(model, &titer)) + { + if (!gtk_tree_selection_iter_is_selected(selection, &titer)) + { + GtkTreePath *sibling_path = gtk_tree_model_get_path(model, &titer); + sibling = gtk_tree_row_reference_new(model, sibling_path); + gtk_tree_path_free(sibling_path); + break; + } + } + + if (!sibling) + { + /* move up find first unselected sibling */ + GtkTreePath *sibling_path = gtk_tree_path_copy(path); + while (gtk_tree_path_prev(sibling_path)) + { + if (!gtk_tree_selection_path_is_selected(selection, sibling_path)) + { + sibling = gtk_tree_row_reference_new(model, sibling_path); + break; + } + } + gtk_tree_path_free(sibling_path); + } + + return sibling; +} + +/* * checks file ENABLED column if all childs are enabled and unchecks otherwise */ static void update_file_node(GtkTreeIter *file_iter) @@ -404,18 +445,35 @@ guint keyval = ((GdkEventKey*)event)->keyval; /* get selected rows */ - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); + rows = g_list_sort(rows, (GCompareFunc)gtk_tree_path_compare); if (keyval == GDK_Delete && rows && g_list_length(rows)) { /* "delete selected rows" */ - /* path to select after deleteing finishes */ - //GtkTreeRowReference *reference_to_select = NULL; - /* get references to rows to keep references actual when altering model */ GList *references = NULL; + + /* get new selection */ + GtkTreeRowReference *new_selection = NULL; + GtkTreePath *first_path = (GtkTreePath*)rows->data; + if (gtk_tree_path_get_depth(first_path) > 1) + { + new_selection = get_unselected_sibling(first_path); + } + if (!new_selection) + { + GtkTreePath *file_path = gtk_tree_path_copy(first_path); + if (gtk_tree_path_get_depth(file_path) > 1) + { + gtk_tree_path_up(file_path); + } + new_selection = get_unselected_sibling(file_path); + gtk_tree_path_free(file_path); + } + GList *iter = rows; while (iter) { @@ -424,7 +482,7 @@ iter = iter->next; } - /* remove break rows leaving file rowa for the next step */ + /* remove break rows leaving file rows for the next step */ dconfig_set_modifyable(FALSE); iter = references; while (iter) @@ -440,18 +498,10 @@ gtk_tree_model_iter_parent(model, &piter, &titer); gchar *filename = NULL; - gtk_tree_model_get ( - model, - &piter, - FILEPATH, &filename, - -1); + gtk_tree_model_get(model, &piter, FILEPATH, &filename, -1); gint line; - gtk_tree_model_get ( - model, - &titer, - LINE, &line, - -1); + gtk_tree_model_get(model, &titer, LINE, &line, -1); breaks_remove(filename, line); @@ -466,10 +516,55 @@ iter = references; while (iter) { - //GtkTreePath *path = (GtkTreePath*)iter->data; - if (FALSE)//1 == gtk_tree_path_get_depth(path)) + GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; + if (gtk_tree_row_reference_valid(reference)) { + GtkTreePath *path = gtk_tree_row_reference_get_path(reference); + if (1 == gtk_tree_path_get_depth(path)) + { + GtkTreeIter child, parent; + gtk_tree_model_get_iter(model, &parent, path); + + gchar *filename = NULL; + gtk_tree_model_get(model, &parent, FILEPATH, &filename, -1); + + GList *child_references = NULL; + if(gtk_tree_model_iter_children(model, &child, &parent)) + { + /* collect all child nodes references */ + do + { + GtkTreePath *child_path = gtk_tree_model_get_path(model, &child); + child_references = g_list_append(child_references, gtk_tree_row_reference_new(model, child_path)); + gtk_tree_path_free(child_path); + } + while(gtk_tree_model_iter_next(model, &child)); + } + + /* traverse through refernces, removing breakpoints */ + GList *citer = child_references; + while(citer) + { + GtkTreePath *child_path = gtk_tree_row_reference_get_path((GtkTreeRowReference*)citer->data); + GtkTreeIter child_iter; + gtk_tree_model_get_iter(model, &child_iter, child_path); + + gint line; + gtk_tree_model_get(model, &child_iter, LINE, &line, -1); + + breaks_remove(filename, line); + + citer = citer->next; + } + + /* free children references list */ + g_list_foreach (child_references, (GFunc)gtk_tree_row_reference_free, NULL); + g_list_free (child_references); + + g_free(filename); + } } + iter = iter->next; } @@ -480,28 +575,18 @@ dconfig_set_modifyable(TRUE); dconfig_set_changed(TRUE); - /* get path to select */ - /*GtkTreePath *path = NULL; - if (reference_to_select) - path = gtk_tree_row_reference_get_path(reference_to_select); - else + if (new_selection) { - GtkTreeIter tree_iter; - gtk_tree_model_get_iter_first(model, &tree_iter); - path = gtk_tree_model_get_path(model, &tree_iter); - }*/ - - /* set selection if any */ - /*if (path) - { + /* get path to select */ + GtkTreePath *path = NULL; + path = gtk_tree_row_reference_get_path(new_selection); + gtk_tree_selection_select_path(selection, path); gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(widget), path, NULL, TRUE, 0.5, 0.5); - gtk_tree_path_free(path); - }*/ + gtk_tree_path_free(path); - /* free references list */ - g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); - g_list_free (references); + gtk_tree_row_reference_free(new_selection); + } } /* free rows list */ @@ -593,6 +678,7 @@ /* icon, file */ header = _("File"); GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); column = gtk_tree_view_column_new(); gtk_tree_view_column_pack_end(column, renderer, TRUE); @@ -612,8 +698,9 @@ /* condition */ header = _("Condition"); condition_renderer = gtk_cell_renderer_text_new (); - g_object_set (condition_renderer, "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (condition_renderer), "edited", G_CALLBACK (on_condition_changed), NULL); + g_object_set (condition_renderer, "editable", TRUE, NULL); + g_object_set (condition_renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_signal_connect (G_OBJECT (condition_renderer), "edited", G_CALLBACK (on_condition_changed), NULL); column = create_column(header, condition_renderer, TRUE, get_header_string_width(header, MW_CONDITION, char_width), "text", CONDITION); @@ -683,8 +770,12 @@ */ void bptree_set_enabled(breakpoint *bp) { - gtk_tree_store_set(store, &(bp->iter), ENABLED, bp->enabled, -1); - bptree_update_break_icon(bp); + gtk_tree_store_set(store, &(bp->iter), ENABLED, bp->enabled, -1); + bptree_update_break_icon(bp); + + GtkTreeIter parent; + gtk_tree_model_iter_parent(model, &parent, &(bp->iter)); + update_file_node(&parent); } /* @@ -762,6 +853,7 @@ gtk_tree_store_prepend (store, &file_iter, NULL); gtk_tree_store_set (store, &file_iter, FILEPATH, bp->file, + ENABLED, TRUE, -1); GtkTreePath *file_path = gtk_tree_model_get_path(model, &file_iter); @@ -839,8 +931,13 @@ if (!gtk_tree_model_iter_n_children(model, &file)) { + g_hash_table_remove(files, (gpointer)bp->file); gtk_tree_store_remove(store, &file); } + else + { + update_file_node(&file); + } } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2192] trunk/geany-plugins/debugger/src/bptree.c
by cesspit＠users.sourceforge.net 03 Sep '11

03 Sep '11

Revision: 2192 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2192&view=rev Author: cesspit Date: 2011-09-03 20:21:10 +0000 (Sat, 03 Sep 2011) Log Message: ----------- debugger: warnings Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-09-03 20:16:45 UTC (rev 2191) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-09-03 20:21:10 UTC (rev 2192) @@ -412,7 +412,7 @@ /* "delete selected rows" */ /* path to select after deleteing finishes */ - GtkTreeRowReference *reference_to_select = NULL; + //GtkTreeRowReference *reference_to_select = NULL; /* get references to rows to keep references actual when altering model */ GList *references = NULL; @@ -466,7 +466,7 @@ iter = references; while (iter) { - GtkTreePath *path = (GtkTreePath*)iter->data; + //GtkTreePath *path = (GtkTreePath*)iter->data; if (FALSE)//1 == gtk_tree_path_get_depth(path)) { } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2191] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 03 Sep '11

03 Sep '11

Revision: 2191 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2191&view=rev Author: cesspit Date: 2011-09-03 20:16:45 +0000 (Sat, 03 Sep 2011) Log Message: ----------- debugger: breaks tree layout change Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/bptree.h trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/dconfig.h trunk/geany-plugins/debugger/src/stree.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-09-03 20:16:45 UTC (rev 2191) @@ -39,22 +39,27 @@ #include "breakpoints.h" #include "bptree.h" #include "utils.h" +#include "dconfig.h" +#include "xpm/breakpoint.xpm" +#include "xpm/breakpoint_disabled.xpm" +#include "xpm/breakpoint_condition.xpm" + /* columns minumum width in characters */ -#define MW_ENABLED 3 -#define MW_HITSCOUNT 3 #define MW_CONDITION 20 -#define MW_FILE 0 -#define MW_LINE 4 +#define MW_FILE 20 +#define ICON_PADDING 10 + /* Tree view columns */ enum { - ENABLED, + ICON, + FILEPATH, + CONDITION, HITSCOUNT, - CONDITION, - FILEPATH, LINE, + ENABLED, N_COLUMNS }; @@ -62,7 +67,7 @@ static GtkWidget *scrolled_window = NULL; static GtkWidget *tree = NULL; static GtkTreeModel *model = NULL; -static GtkListStore *store = NULL; +static GtkTreeStore *store = NULL; /* column cell renderes */ static GtkCellRenderer *enable_renderer; @@ -72,18 +77,110 @@ /* tells to checkbox click handler whether page is in readonly mode (debug running) */ static gboolean readonly = FALSE; +/* hash table to keep file nodes in the tree */ +static GHashTable *files; + +/* pixbufers */ +GdkPixbuf *file_pixbuf = NULL; +GdkPixbuf *break_pixbuf = NULL; +GdkPixbuf *break_disabled_pixbuf = NULL; +GdkPixbuf *break_condition_pixbuf = NULL; + /* callback handler */ move_to_line_cb on_break_clicked = NULL; /* + * traversed comparing functions + */ +static gboolean compare_path_references(gpointer key, gpointer value, gpointer user_data) +{ + GtkTreeRowReference *being_clicked = (GtkTreeRowReference*)user_data; + GtkTreeRowReference *compared = (GtkTreeRowReference*)value; + + return !gtk_tree_path_compare ( + gtk_tree_row_reference_get_path(being_clicked), + gtk_tree_row_reference_get_path(compared) + ); + +} + +/* + * checks file ENABLED column if all childs are enabled and unchecks otherwise + */ +static void update_file_node(GtkTreeIter *file_iter) +{ + GtkTreeIter child; + gboolean check = TRUE; + if(gtk_tree_model_iter_children(model, &child, file_iter)) + { + do + { + gboolean enabled; + gtk_tree_model_get ( + model, + &child, + ENABLED, &enabled, + -1); + + if (!enabled) + { + check = FALSE; + break; + } + } + while(gtk_tree_model_iter_next(model, &child)); + } + + gtk_tree_store_set(store, file_iter, ENABLED, check, -1); +} + +/* + * GtkTreeView cell renderer functions that do not render and make ineditable file rows + */ +void on_render(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, + GtkTreeIter *iter, gpointer data) +{ + GtkTreePath *path = gtk_tree_model_get_path(model, iter); + if (data) + { + if (gtk_tree_path_get_depth(path) == 1) + { + g_object_set(cell, "text", "", NULL); + g_object_set(cell, "editable", FALSE, NULL); + } + else + { + g_object_set(cell, "editable", TRUE, NULL); + } + } + else + { + if (gtk_tree_path_get_depth(path) == 1) + { + g_object_set(cell, "visible", FALSE, NULL); + } + else + { + g_object_set(cell, "visible", TRUE, NULL); + } + } + gtk_tree_path_free(path); +} + +/* * GtkTreeView event handlers */ /* * double click */ -void on_row_double_click(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) +static void on_row_double_click(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) { + if (1 == gtk_tree_path_get_depth(path)) + { + return; + } + GtkTreeIter iter; gtk_tree_model_get_iter ( model, @@ -92,10 +189,19 @@ gchar *file; int line; + + GtkTreeIter parent_iter; + gtk_tree_model_iter_parent(model, &parent_iter, &iter); + gtk_tree_model_get ( model, + &parent_iter, + FILEPATH, &file, + -1); + + gtk_tree_model_get ( + model, &iter, - FILEPATH, &file, LINE, &line, -1); @@ -118,14 +224,22 @@ &iter, tree_path); - gchar *file; + GtkTreeIter parent_iter; + gtk_tree_model_iter_parent(model, &parent_iter, &iter); + + gchar *file; + gtk_tree_model_get ( + model, + &parent_iter, + FILEPATH, &file, + -1); + int line; gchar* oldcondition; gtk_tree_model_get ( model, &iter, CONDITION, &oldcondition, - FILEPATH, &file, LINE, &line, -1); @@ -154,14 +268,22 @@ &iter, tree_path); - gchar *file; + GtkTreeIter parent_iter; + gtk_tree_model_iter_parent(model, &parent_iter, &iter); + + gchar *file; + gtk_tree_model_get ( + model, + &parent_iter, + FILEPATH, &file, + -1); + int line; gint oldcount; gtk_tree_model_get ( model, &iter, HITSCOUNT, &oldcount, - FILEPATH, &file, LINE, &line, -1); @@ -183,25 +305,95 @@ GtkTreeIter iter; GtkTreePath *tree_path = gtk_tree_path_new_from_string (path); - + gtk_tree_model_get_iter ( - model, - &iter, - tree_path); - - gchar *file; - int line; - gtk_tree_model_get ( model, &iter, - FILEPATH, &file, - LINE, &line, - -1); - - breaks_switch(file, line); - + tree_path); + + gboolean current_state = gtk_cell_renderer_toggle_get_active(cell_renderer); + + /* check if this is a file row */ + GtkTreeRowReference *path_reference = gtk_tree_row_reference_new(model, tree_path); + if(g_hash_table_find(files, compare_path_references, (gpointer)path_reference)) + { + GtkTreeIter child; + gtk_tree_model_iter_children(model, &child, &iter); + + gchar *file; + gtk_tree_model_get ( + model, + &iter, + FILEPATH, &file, + -1); + + dconfig_set_modifyable(FALSE); + do + { + gboolean enabled; + gtk_tree_model_get ( + model, + &child, + ENABLED, &enabled, + -1); + + if (!current_state ^ enabled) + { + int line; + gtk_tree_model_get ( + model, + &child, + LINE, &line, + -1); + breaks_switch(file, line); + } + } + while(gtk_tree_model_iter_next(model, &child)); + + gtk_tree_store_set(store, &iter, ENABLED, !current_state, -1); + + g_free(file); + + dconfig_set_modifyable(TRUE); + dconfig_set_changed(); + } + else + { + GtkTreeIter parent_iter; + gtk_tree_model_iter_parent(model, &parent_iter, &iter); + + gchar *file; + int line; + gboolean parent_enabed; + + gtk_tree_model_get ( + model, + &parent_iter, + FILEPATH, &file, + ENABLED, &parent_enabed, + -1); + + gtk_tree_model_get ( + model, + &iter, + LINE, &line, + -1); + + breaks_switch(file, line); + + if (current_state && parent_enabed) + { + gtk_tree_store_set(store, &parent_iter, ENABLED, FALSE, -1); + } + else if (!current_state && !parent_enabed) + { + update_file_node(&parent_iter); + } + + g_free(file); + } + gtk_tree_path_free(tree_path); - g_free(file); } /* @@ -211,17 +403,17 @@ { guint keyval = ((GdkEventKey*)event)->keyval; - if (keyval == GDK_Delete) + /* get selected rows */ + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); + + if (keyval == GDK_Delete && rows && g_list_length(rows)) { /* "delete selected rows" */ /* path to select after deleteing finishes */ GtkTreeRowReference *reference_to_select = NULL; - /* get selected rows */ - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - GList *rows = gtk_tree_selection_get_selected_rows(selection, &model); - /* get references to rows to keep references actual when altering model */ GList *references = NULL; GList *iter = rows; @@ -229,22 +421,11 @@ { GtkTreePath *path = (GtkTreePath*)iter->data; references = g_list_append(references, gtk_tree_row_reference_new(model, path)); - - /* - * set reference to select after deletion - upper sibling of the - * first row to delete that has upper sibling - */ - if (!reference_to_select && gtk_tree_path_prev(path)) - reference_to_select = gtk_tree_row_reference_new(model, path); - iter = iter->next; } - - /* free rows list */ - g_list_foreach (rows, (GFunc)gtk_tree_path_free, NULL); - g_list_free (rows); - - /* iterate through references removing them */ + + /* remove break rows leaving file rowa for the next step */ + dconfig_set_modifyable(FALSE); iter = references; while (iter) { @@ -252,18 +433,23 @@ if (gtk_tree_row_reference_valid(reference)) { GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - if (1 == gtk_tree_path_get_depth(path)) + if (gtk_tree_path_get_depth(path) > 1) { - GtkTreeIter titer; + GtkTreeIter titer, piter; gtk_tree_model_get_iter(model, &titer, path); + gtk_tree_model_iter_parent(model, &piter, &titer); gchar *filename = NULL; + gtk_tree_model_get ( + model, + &piter, + FILEPATH, &filename, + -1); + gint line; - gtk_tree_model_get ( model, &titer, - FILEPATH, &filename, LINE, &line, -1); @@ -275,9 +461,27 @@ iter = iter->next; } + + /* remove file rows and children if exist */ + iter = references; + while (iter) + { + GtkTreePath *path = (GtkTreePath*)iter->data; + if (FALSE)//1 == gtk_tree_path_get_depth(path)) + { + } + iter = iter->next; + } + /* free rows list */ + g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); + g_list_free (references); + + dconfig_set_modifyable(TRUE); + dconfig_set_changed(TRUE); + /* get path to select */ - GtkTreePath *path = NULL; + /*GtkTreePath *path = NULL; if (reference_to_select) path = gtk_tree_row_reference_get_path(reference_to_select); else @@ -285,26 +489,53 @@ GtkTreeIter tree_iter; gtk_tree_model_get_iter_first(model, &tree_iter); path = gtk_tree_model_get_path(model, &tree_iter); - } + }*/ /* set selection if any */ - if (path) + /*if (path) { gtk_tree_selection_select_path(selection, path); gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(widget), path, NULL, TRUE, 0.5, 0.5); gtk_tree_path_free(path); - } + }*/ /* free references list */ g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); g_list_free (references); } + /* free rows list */ + g_list_foreach (rows, (GFunc)gtk_tree_path_free, NULL); + g_list_free (rows); return FALSE; } /* + * update existing breakpoint icon + * arguments: + * bp - breakpoint to update + */ +void bptree_update_break_icon(breakpoint* bp) +{ + GdkPixbuf *pixbuf; + if (!bp->enabled) + { + pixbuf = break_disabled_pixbuf; + } + else if (bp->hitscount || strlen(bp->condition)) + { + pixbuf = break_condition_pixbuf; + } + else + { + pixbuf = break_pixbuf; + } + + gtk_tree_store_set (store, &bp->iter, ICON, pixbuf, -1); +} + +/* * Interface functions */ @@ -318,14 +549,28 @@ /* save double click callback */ on_break_clicked = cb; + /* crete hash table for file nodes */ + files = g_hash_table_new_full( + g_str_hash, + g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)gtk_tree_row_reference_free + ); + + file_pixbuf = gdk_pixbuf_new_from_xpm_data(breakpoint_xpm); + break_pixbuf = gdk_pixbuf_new_from_xpm_data(breakpoint_xpm); + break_disabled_pixbuf = gdk_pixbuf_new_from_xpm_data(breakpoint_disabled_xpm); + break_condition_pixbuf = gdk_pixbuf_new_from_xpm_data(breakpoint_condition_xpm); + /* create tree view */ - store = gtk_list_store_new ( + store = gtk_tree_store_new ( N_COLUMNS, - G_TYPE_BOOLEAN, - G_TYPE_INT, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INT); + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_BOOLEAN); model = GTK_TREE_MODEL(store); tree = gtk_tree_view_new_with_model (model); @@ -334,8 +579,6 @@ /* multiple selection */ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - /* interlaced rows colors */ - g_object_set(tree, "rules-hint", TRUE, NULL); /* connect signals */ g_signal_connect(G_OBJECT(tree), "key-press-event", G_CALLBACK (on_key_pressed), NULL); @@ -347,51 +590,68 @@ int char_width = get_char_width(tree); - /* enabled */ - header = _("Enabled"); - enable_renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect (G_OBJECT(enable_renderer), "toggled", G_CALLBACK(on_activeness_changed), NULL); - column = create_column(header, enable_renderer, FALSE, - get_header_string_width(header, MW_ENABLED, char_width), - "active", ENABLED); + /* icon, file */ + header = _("File"); + GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new(); + + gtk_tree_view_column_pack_end(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, "text", FILEPATH, NULL); + + GtkCellRenderer *icon_renderer = gtk_cell_renderer_pixbuf_new (); + g_object_set(icon_renderer, "follow-state", TRUE, NULL); + gtk_tree_view_column_pack_end(column, icon_renderer, FALSE); + gtk_tree_view_column_set_attributes(column, icon_renderer, "pixbuf", ICON, NULL); + gtk_tree_view_column_set_cell_data_func(column, icon_renderer, on_render, NULL, NULL); + + gtk_tree_view_column_set_spacing(column, char_width); + gtk_tree_view_column_set_expand(column, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + + /* condition */ + header = _("Condition"); + condition_renderer = gtk_cell_renderer_text_new (); + g_object_set (condition_renderer, "editable", TRUE, NULL); + g_signal_connect (G_OBJECT (condition_renderer), "edited", G_CALLBACK (on_condition_changed), NULL); + column = create_column(header, condition_renderer, TRUE, + get_header_string_width(header, MW_CONDITION, char_width), + "text", CONDITION); + gtk_tree_view_column_set_cell_data_func(column, condition_renderer, on_render, (gpointer)TRUE, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* hits count */ header = _("Hit count"); hcount_renderer = gtk_cell_renderer_spin_new (); GtkAdjustment* adj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 100000.0, 1.0, 2.0, 2.0)); g_object_set (hcount_renderer, - "editable", TRUE, "adjustment", adj, "digits", 0, NULL); g_signal_connect (G_OBJECT (hcount_renderer), "edited", G_CALLBACK (on_hitscount_changed), NULL); column = create_column(header, hcount_renderer, FALSE, - get_header_string_width(header, MW_HITSCOUNT, char_width), + 0, "text", HITSCOUNT); + gtk_tree_view_column_set_cell_data_func(column, hcount_renderer, on_render, (gpointer)TRUE, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - /* condition */ - header = _("Condition"); - condition_renderer = gtk_cell_renderer_text_new (); - g_object_set (condition_renderer, "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (condition_renderer), "edited", G_CALLBACK (on_condition_changed), NULL); - column = create_column(header, condition_renderer, FALSE, - get_header_string_width(header, MW_CONDITION, char_width), - "text", CONDITION); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - /* file */ - header = _("File"); - GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - column = create_column(header, renderer, TRUE, - get_header_string_width(header, MW_FILE, char_width), - "text", FILEPATH); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* line */ header = _("Line"); renderer = gtk_cell_renderer_text_new (); column = create_column(header, renderer, FALSE, - get_header_string_width(header, MW_LINE, char_width), + 0, "text", LINE); + gtk_tree_view_column_set_visible(column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* enabled */ + header = _("Enabled"); + enable_renderer = gtk_cell_renderer_toggle_new (); + g_signal_connect (G_OBJECT(enable_renderer), "toggled", G_CALLBACK(on_activeness_changed), NULL); + column = create_column(header, enable_renderer, FALSE, + 0, + "active", ENABLED); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolled_window); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -403,36 +663,50 @@ } /* + * destroy breaks tree and associated data + * arguments: + */ +void bptree_destroy() +{ + g_hash_table_destroy(files); + + g_object_unref(file_pixbuf); + g_object_unref(break_pixbuf); + g_object_unref(break_disabled_pixbuf); + g_object_unref(break_condition_pixbuf); +} + +/* * enable/disable break * arguments: - * iter - tree view iterator - * enabled - value + * bp - breakpoint */ -void bptree_set_enabled(GtkTreeIter iter, gboolean enabled) +void bptree_set_enabled(breakpoint *bp) { - gtk_list_store_set(store, &iter, ENABLED, enabled, -1); + gtk_tree_store_set(store, &(bp->iter), ENABLED, bp->enabled, -1); + bptree_update_break_icon(bp); } /* * set breaks hits count * arguments: - * iter - tree view iterator - * hitscount - value + * bp - breakpoint */ -void bptree_set_hitscount(GtkTreeIter iter, int hitscount) +void bptree_set_hitscount(breakpoint *bp) { - gtk_list_store_set(store, &iter, HITSCOUNT, hitscount, -1); + gtk_tree_store_set(store, &(bp->iter), HITSCOUNT, bp->hitscount, -1); + bptree_update_break_icon(bp); } /* * set breaks condition * arguments: - * iter - tree view iterator - * condition - value + * bp - breakpoint */ -void bptree_set_condition(GtkTreeIter iter, gchar* condition) +void bptree_set_condition(breakpoint* bp) { - gtk_list_store_set(store, &iter, CONDITION, condition, -1); + gtk_tree_store_set(store, &(bp->iter), CONDITION, bp->condition, -1); + bptree_update_break_icon(bp); } /* @@ -441,12 +715,12 @@ * iter - tree view iterator * return value - breaks condition */ -gchar* bptree_get_condition(GtkTreeIter iter) +gchar* bptree_get_condition(breakpoint *bp) { gchar *condition; gtk_tree_model_get ( model, - &iter, + &(bp->iter), CONDITION, &condition, -1); @@ -481,16 +755,52 @@ */ void bptree_add_breakpoint(breakpoint* bp) { + GtkTreeIter file_iter; + GtkTreeRowReference *file_reference = (GtkTreeRowReference*)g_hash_table_lookup(files, bp->file); + if (!file_reference) + { + gtk_tree_store_prepend (store, &file_iter, NULL); + gtk_tree_store_set (store, &file_iter, + FILEPATH, bp->file, + -1); + + GtkTreePath *file_path = gtk_tree_model_get_path(model, &file_iter); + file_reference = gtk_tree_row_reference_new(model, file_path); + gtk_tree_path_free(file_path); + + g_hash_table_insert(files, (gpointer)g_strdup(bp->file),(gpointer)file_reference); + } + else + { + gtk_tree_model_get_iter(model, &file_iter, gtk_tree_row_reference_get_path(file_reference)); + } + + /* lookup where to insert new row */ + GtkTreeIter child, *sibling = NULL; + if(gtk_tree_model_iter_children(model, &child, &file_iter)) + { + do + { + int line; + gtk_tree_model_get ( + model, + &child, + LINE, &line, + -1); + if (line > bp->line) + { + sibling = &child; + break; + } + } + while(gtk_tree_model_iter_next(model, &child)); + } + GtkTreeIter iter; - gtk_list_store_prepend (store, &iter); - gtk_list_store_set (store, &iter, - ENABLED, bp->enabled, - HITSCOUNT, bp->hitscount, - CONDITION, bp->condition, - FILEPATH, bp->file, - LINE, bp->line, - -1); + gtk_tree_store_insert_before(store, &iter, &file_iter, sibling); bp->iter = iter; + + bptree_update_breakpoint(bp); } /* @@ -500,15 +810,19 @@ */ void bptree_update_breakpoint(breakpoint* bp) { - char file_and_line[FILENAME_MAX + 10]; - sprintf(file_and_line, "%s:%i", bp->file, bp->line); - gtk_list_store_set (store, &bp->iter, + gchar *location = g_strdup_printf(_("line %i"), bp->line); + + gtk_tree_store_set (store, &bp->iter, ENABLED, bp->enabled, HITSCOUNT, bp->hitscount, CONDITION, bp->condition, - FILEPATH, bp->file, + FILEPATH, location, LINE, bp->line, -1); + + bptree_update_break_icon(bp); + + g_free(location); } /* @@ -518,5 +832,30 @@ */ void bptree_remove_breakpoint(breakpoint* bp) { - gtk_list_store_remove(store, &(bp->iter)); + GtkTreeIter file; + gtk_tree_model_iter_parent(model, &file, &(bp->iter)); + + gtk_tree_store_remove(store, &(bp->iter)); + + if (!gtk_tree_model_iter_n_children(model, &file)) + { + gtk_tree_store_remove(store, &file); + } } + +/* + * updates all file ENABLED checkboxes base on theit children states + * arguments: + */ +void bptree_update_file_nodes() +{ + GtkTreeIter file; + if(gtk_tree_model_iter_children(model, &file, NULL)) + { + do + { + update_file_node(&file); + } + while(gtk_tree_model_iter_next(model, &file)); + } +} Modified: trunk/geany-plugins/debugger/src/bptree.h =================================================================== --- trunk/geany-plugins/debugger/src/bptree.h 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/bptree.h 2011-09-03 20:16:45 UTC (rev 2191) @@ -20,12 +20,14 @@ */ gboolean bptree_init(move_to_line_cb callback); +void bptree_destroy(); GtkWidget* bptree_get_widget(); void bptree_add_breakpoint(breakpoint* bp); void bptree_update_breakpoint(breakpoint* bp); void bptree_remove_breakpoint(breakpoint* bp); -void bptree_set_condition(GtkTreeIter iter, gchar* condition); -void bptree_set_hitscount(GtkTreeIter iter, int hitscount); -void bptree_set_enabled(GtkTreeIter iter, gboolean enabled); -gchar* bptree_get_condition(GtkTreeIter iter); +void bptree_set_condition(breakpoint* bp); +void bptree_set_hitscount(breakpoint* bp); +void bptree_set_enabled(breakpoint* bp); +gchar* bptree_get_condition(breakpoint* bp); void bptree_set_readonly(gboolean readonly); +void bptree_update_file_nodes(); Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-03 20:16:45 UTC (rev 2191) @@ -191,7 +191,7 @@ { if (success) { - bptree_set_hitscount(bp->iter, bp->hitscount); + bptree_set_hitscount(bp); markers_remove_breakpoint(bp); markers_add_breakpoint(bp); /* mark config for saving */ @@ -212,7 +212,7 @@ if (success) { /* set condition in breaks tree */ - bptree_set_condition(bp->iter, bp->condition); + bptree_set_condition(bp); markers_remove_breakpoint(bp); markers_add_breakpoint(bp); /* mark config for saving */ @@ -221,7 +221,7 @@ else { /* revert to old condition (taken from tree) */ - gchar* oldcondition = bptree_get_condition(bp->iter); + gchar* oldcondition = bptree_get_condition(bp); strcpy(bp->condition, oldcondition); g_free(oldcondition); /* show error message */ @@ -242,7 +242,7 @@ markers_add_breakpoint(bp); /* set checkbox in breaks tree */ - bptree_set_enabled(bp->iter, bp->enabled); + bptree_set_enabled(bp); /* mark config for saving */ dconfig_set_changed(); @@ -316,6 +316,9 @@ /* free storage */ g_hash_table_destroy(files); + + /* destroy breaks tree data */ + bptree_destroy(); } /* Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-09-03 20:16:45 UTC (rev 2191) @@ -38,6 +38,7 @@ #include "wtree.h" #include "breakpoints.h" #include "tpage.h" +#include "bptree.h" #define CONFIG_NAME ".debugger" @@ -57,7 +58,7 @@ static GCond *cond; static GThread *saving_thread; static gboolean config_changed = FALSE; -static gboolean loading_or_cleaning = FALSE; +static gboolean modifyable = FALSE; /* the folder, config has been loaded from */ static gchar *current_folder = NULL; @@ -109,11 +110,19 @@ } /* + * set "modifyable" flag that shows that a background thread have to save config + */ +void dconfig_set_modifyable(gboolean newstate) +{ + modifyable = newstate; +} + +/* * set "changed" flag to save it on "saving_thread" thread */ void dconfig_set_changed() { - if (!loading_or_cleaning) + if (!modifyable) { g_mutex_lock(change_config_mutex); config_changed = TRUE; @@ -167,7 +176,7 @@ */ gboolean dconfig_load(gchar *folder) { - loading_or_cleaning = TRUE; + modifyable = TRUE; g_mutex_lock(change_config_mutex); tpage_clear(); @@ -186,7 +195,7 @@ { config_changed = FALSE; - loading_or_cleaning = FALSE; + modifyable = FALSE; g_mutex_unlock(change_config_mutex); return FALSE; @@ -265,10 +274,12 @@ } } } + + bptree_update_file_nodes(); config_changed = FALSE; - loading_or_cleaning = FALSE; + modifyable = FALSE; g_mutex_unlock(change_config_mutex); return TRUE; Modified: trunk/geany-plugins/debugger/src/dconfig.h =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.h 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/dconfig.h 2011-09-03 20:16:45 UTC (rev 2191) @@ -26,5 +26,6 @@ gboolean dconfig_load(gchar *folder); void dconfig_set_changed(); +void dconfig_set_modifyable(gboolean newstate); Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-09-01 17:57:49 UTC (rev 2190) +++ trunk/geany-plugins/debugger/src/stree.c 2011-09-03 20:16:45 UTC (rev 2191) @@ -36,10 +36,6 @@ #include "xpm/frame_current.xpm" -#include "geanyplugin.h" -extern GeanyFunctions *geany_functions; -extern GeanyPlugin *geany_plugin; - /* columns minumum width in characters */ #define MW_ADRESS 10 #define MW_FUNCTION 10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2190] trunk/geany-plugins/geanypg
by alvesh88＠users.sourceforge.net 01 Sep '11

01 Sep '11

Revision: 2190 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2190&view=rev Author: alvesh88 Date: 2011-09-01 17:57:49 +0000 (Thu, 01 Sep 2011) Log Message: ----------- Adding documentation for GeanyPG Added Paths: ----------- trunk/geany-plugins/geanypg/doc/ trunk/geany-plugins/geanypg/doc/geanypg.html Added: trunk/geany-plugins/geanypg/doc/geanypg.html =================================================================== --- trunk/geany-plugins/geanypg/doc/geanypg.html (rev 0) +++ trunk/geany-plugins/geanypg/doc/geanypg.html 2011-09-01 17:57:49 UTC (rev 2190) @@ -0,0 +1,97 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<html> +<head> +<title>GnuPG plugin for Geany - Introduction</title> +</head> +<body style="margin: 32px 25% 24px 5%"> +<hr><h2>GnuPG encryption plugin for the Geany IDE</h2><hr> +<p> +This is a plugin for the <a href="http://www.geany.org/">Geany</a> IDE + to provide <a href="http://gnupg.org/">GnuPG</a> encryption. +</p><p> +<h4>Installation</h4> +This plugin is distributed with geany-plugins, to install check the +documentation of the geany-plugins release.<br> +Like all plugins GeanyPG can be activated via the Tools > Plugin +Manager dialog. +</p><p> +<h4>Using GeanyPG</h4> +Once the plugin has been activated a new sub-menu named `GeanyPG' will appear in the Tools menu.<br> +This sub-menu contains the following options: +<ul> + <li>Encrypt</li> + <li>Sign</li> + <li>Decrypt / Verify</li> + <li>Verify detached signature</li> +</ul> +</p><p> +<h5>Encryption</h5> +To encrypt a file, simply choose Encrypt from the menu. A dialog will +open allowing you to select any recipients. At the bottom of the dialog +you also have to option to choose a key to sign the text with (Default +is None). +</p><p> +When you press Ok, a few things can happen. If you haven't selected any +recipients a new dialog will open asking you if you want to use a +symmetric cipher. If you choose yes you will be asked for a passphrase +that will be used to encrypt the text.</p><p> +What happens when you have selected one or more recipients, or entered +a passphrase for a symmetric cipher, depends on whether any text was +selected. If you have selected text, <b>only</b> the selected text will +be encrypted, otherwise the whole file will be encrypted.<br> +Of course, if you have chosen to sign the text as well, you will first +be asked for the passphrase of the selected private key. +</p><p> +<h5>Signing without encrypting</h5> +To sign some text without also encrypting it, choose Sign from the menu. +You will be asked which private key you want to use and to enter the +passphrase for that key.<br> +Like when encrypting the text, if you have selected anything, only the +selected text will be signed. Otherwise the whole file will be signed. +</p><p> +<h5>Decrypting and Verifying</h5> +To decrypt a file or verify an inline signature just select the GPG +code and choose Decrypt / Verify from the menu. When decrypting you +will of course be asked to enter a passphrase. +</p><p> +<h5>Verifying detached signatures</h5> +To verify a detached signature choose the last option from the menu. A +dialog will open where you can select a .sig or .asc file with a +detached signature. +</p><p> +<h4>Development</h4> +You can checkout the current source code from the Subversion repository +at Sourceforge.net.<br><br> +Get the code from:<br> +<tt>svn checkout +http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/geanypg +</tt><br><br> +If you want to create a patch, please respect the license of GeanyPG as +well as intellectual property of third parties. Patches that should be +included to the default distribution must be licensed under the same +conditions as GeanyPG by the copyright owner (GPL2+). + +</p><p> +<h4>Known issues</h4> +At the moment, the use of pinentry is only supported on unix-like +systems. On Windows gpg-agent has to be used. +</p><p> +For more recent information all reported issues will be tracked at +<a href="http://sourceforge.net/tracker/?group_id=222729"> +http://sourceforge.net/tracker/?group_id=222729</a> +</p><p> +<h4>License</h4> +GeanyPG and all its parts is distributed 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. A copy of this license can be found in the file COPYING +included with the source code of this program. If not, you will be +able to get a copy by contacting the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +</p><p> +<h4>Bugs, questions</h4> +If you found any bugs or want to provide a patch, please contact Hans +Alves (alves(dot)h88(at)gmail(dot)com). +</p> +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2189] trunk/geany-plugins
by alvesh88＠users.sourceforge.net 01 Sep '11

01 Sep '11

Revision: 2189 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2189&view=rev Author: alvesh88 Date: 2011-09-01 16:40:01 +0000 (Thu, 01 Sep 2011) Log Message: ----------- Applied patch by sardenmff7 to fix bug 3344648 Modified Paths: -------------- trunk/geany-plugins/build/geanypg.m4 trunk/geany-plugins/geanypg/src/Makefile.am Modified: trunk/geany-plugins/build/geanypg.m4 =================================================================== --- trunk/geany-plugins/build/geanypg.m4 2011-09-01 13:00:17 UTC (rev 2188) +++ trunk/geany-plugins/build/geanypg.m4 2011-09-01 16:40:01 UTC (rev 2189) @@ -2,11 +2,13 @@ [ GP_ARG_DISABLE([geanypg], [auto]) if test "$enable_geanypg" = "auto"; then - AM_PATH_GPGME(, enable_geanypg=yes, enable_geanypg=no) - else - AM_PATH_GPGME(,, - [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and - GPGME_LIBS if it is installed.])]) + enable_geanypg=no + m4_ifdef([AM_PATH_GPGME], [AM_PATH_GPGME(, enable_geanypg=yes)]) + elif test "$enable_geanypg" = "yes"; then + m4_ifdef([AM_PATH_GPGME], + [AM_PATH_GPGME(,, [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and GPGME_LIBS if it is installed.])])], + [AC_MSG_ERROR([Could not find GPGME. Please install it])]) + fi AM_CONDITIONAL(ENABLE_GEANYPG, test "$enable_geanypg" = "yes") Modified: trunk/geany-plugins/geanypg/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanypg/src/Makefile.am 2011-09-01 13:00:17 UTC (rev 2188) +++ trunk/geany-plugins/geanypg/src/Makefile.am 2011-09-01 16:40:01 UTC (rev 2189) @@ -22,7 +22,7 @@ $(COMMON_LIBS) \ $(GPGME_LIBS) -geanypg_la__CFLAGS = \ +geanypg_la_CFLAGS = \ $(AM_CFLAGS) \ $(GPGME_CFLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2188] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 01 Sep '11

01 Sep '11

Revision: 2188 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2188&view=rev Author: cesspit Date: 2011-09-01 13:00:17 +0000 (Thu, 01 Sep 2011) Log Message: ----------- debugger: icon on a stack trace page, gui fixes, temporary disabled calltips as they seem to cause segfauts Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.h trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/stree.h trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/vtree.c Modified: trunk/geany-plugins/debugger/src/bptree.h =================================================================== --- trunk/geany-plugins/debugger/src/bptree.h 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/bptree.h 2011-09-01 13:00:17 UTC (rev 2188) @@ -20,12 +20,12 @@ */ gboolean bptree_init(move_to_line_cb callback); -GtkWidget* bptree_get_widget(); +GtkWidget* bptree_get_widget(); void bptree_add_breakpoint(breakpoint* bp); void bptree_update_breakpoint(breakpoint* bp); void bptree_remove_breakpoint(breakpoint* bp); void bptree_set_condition(GtkTreeIter iter, gchar* condition); void bptree_set_hitscount(GtkTreeIter iter, int hitscount); void bptree_set_enabled(GtkTreeIter iter, gboolean enabled); -gchar* bptree_get_condition(GtkTreeIter iter); +gchar* bptree_get_condition(GtkTreeIter iter); void bptree_set_readonly(gboolean readonly); Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-09-01 13:00:17 UTC (rev 2188) @@ -231,7 +231,7 @@ if (word->len) { - gchar *calltip = debug_get_calltip_for_expression(word->str); + gchar *calltip = NULL;//debug_get_calltip_for_expression(word->str); if (calltip) { scintilla_send_message (editor->sci, SCI_CALLTIPSHOW, nt->position, (long)calltip); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/debug.c 2011-09-01 13:00:17 UTC (rev 2188) @@ -662,7 +662,7 @@ while (iter) { frame *f = (frame*)iter->data; - stree_add(f); + stree_add(f, iter == stack); iter = g_list_next(iter); } stree_select_first(); @@ -1000,6 +1000,8 @@ g_list_free(stack); stack = NULL; } + + stree_destroy(); } /* Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/stree.c 2011-09-01 13:00:17 UTC (rev 2188) @@ -34,6 +34,8 @@ #include "breakpoint.h" #include "debug_module.h" +#include "xpm/frame_current.xpm" + #include "geanyplugin.h" extern GeanyFunctions *geany_functions; extern GeanyPlugin *geany_plugin; @@ -44,9 +46,12 @@ #define MW_FILE 0 #define MW_LINE 4 +#define ARROW_PADDING 10 + /* Tree view columns */ enum { + S_ARROW, S_ADRESS, S_FUNCTION, S_FILEPATH, @@ -68,6 +73,9 @@ /* flag to indicate whether to handle selection change */ static gboolean handle_selection = TRUE; +/* pixbuf with the frame arrow */ +GdkPixbuf *arrow_pixbuf = NULL; + /* * Handles same tree row click to open frame position */ @@ -159,10 +167,13 @@ gboolean stree_init(move_to_line_cb cb) { callback = cb; + + arrow_pixbuf = gdk_pixbuf_new_from_xpm_data(frame_current_xpm); /* create tree view */ store = gtk_list_store_new ( S_N_COLUMNS, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, @@ -189,6 +200,13 @@ int char_width = get_char_width(tree); + /* arrow */ + renderer = gtk_cell_renderer_pixbuf_new (); + column = create_column("", renderer, FALSE, + gdk_pixbuf_get_width(arrow_pixbuf) + 2 * ARROW_PADDING, + "pixbuf", S_ARROW); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); + /* adress */ header = _("Address"); renderer = gtk_cell_renderer_text_new (); @@ -242,7 +260,7 @@ /* * add frame to the tree view */ -void stree_add(frame *f) +void stree_add(frame *f, gboolean first) { GtkTreeIter iter; gtk_list_store_append (store, &iter); @@ -252,6 +270,13 @@ S_FILEPATH, f->file, S_LINE, f->line, -1); + + if (first) + { + gtk_list_store_set (store, &iter, + S_ARROW, arrow_pixbuf, + -1); + } /* remember if we have source for this frame */ if (f->have_source && !GPOINTER_TO_INT(g_hash_table_lookup(frames, (gpointer)f->file))) @@ -284,3 +309,11 @@ gtk_tree_path_free(path); } + +/* + * called on plugin exit to free arrow pixbuffer + */ +void stree_destroy() +{ + g_object_unref(arrow_pixbuf); +} Modified: trunk/geany-plugins/debugger/src/stree.h =================================================================== --- trunk/geany-plugins/debugger/src/stree.h 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/stree.h 2011-09-01 13:00:17 UTC (rev 2188) @@ -20,8 +20,9 @@ */ gboolean stree_init(move_to_line_cb cb); +void stree_destroy(); GtkWidget* stree_get_widget(); -void stree_add(frame *f); +void stree_add(frame *f, gboolean first); void stree_clear(); void stree_select_first(); Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-09-01 13:00:17 UTC (rev 2188) @@ -105,14 +105,6 @@ } /* - * tells config to update when target changes - */ -void on_target_changed (GtkEditable *editable, gpointer user_data) -{ - dconfig_set_changed(); -} - -/* * delete selected rows from env variables page */ void delete_selected_rows() @@ -507,6 +499,8 @@ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); gtk_entry_set_text(GTK_ENTRY(targetname), filename); g_free (filename); + + dconfig_set_changed(); } gtk_widget_destroy (dialog); } @@ -603,6 +597,7 @@ /* Target frame */ GtkWidget *_frame = gtk_frame_new(_("Target")); + gtk_frame_set_shadow_type(GTK_FRAME(_frame), GTK_SHADOW_NONE); GtkWidget *vbox = gtk_vbox_new(FALSE, 0); /* filename hbox */ @@ -610,7 +605,7 @@ gtk_container_set_border_width(GTK_CONTAINER(hbox), SPACING); targetname = gtk_entry_new (); - g_signal_connect(G_OBJECT(targetname), "changed", G_CALLBACK (on_target_changed), NULL); + gtk_entry_set_editable(GTK_ENTRY(targetname), FALSE); button_browse = gtk_button_new_with_label(_("Browse")); g_signal_connect(G_OBJECT(button_browse), "clicked", G_CALLBACK (on_target_browse_clicked), NULL); @@ -732,7 +727,6 @@ */ void tpage_set_readonly(gboolean readonly) { - gtk_editable_set_editable (GTK_EDITABLE (targetname), !readonly); gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), !readonly); g_object_set (renderer_name, "editable", !readonly, NULL); gtk_widget_set_sensitive (button_browse, !readonly); Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-08-31 22:24:52 UTC (rev 2187) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-09-01 13:00:17 UTC (rev 2188) @@ -34,7 +34,7 @@ #include "utils.h" /* columns minumum width in characters */ -#define MIN_COLUMN_CHARS 15 +#define MIN_COLUMN_CHARS 20 /* * key pressed event This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2011