diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | src/analysis/project.c | 3 | ||||
| -rw-r--r-- | src/glibext/signal.c | 98 | ||||
| -rw-r--r-- | src/glibext/signal.h | 2 | ||||
| -rw-r--r-- | src/gui/panels/bookmarks.c | 5 | ||||
| -rw-r--r-- | src/gui/panels/history.c | 19 |
6 files changed, 91 insertions, 51 deletions
@@ -1,3 +1,18 @@ +15-08-03 Cyrille Bagard <nocbos@gmail.com> + + * src/analysis/project.c: + Update code. + + * src/glibext/signal.c: + * src/glibext/signal.h: + Allow to emit signals to GTK main thread for GUI updates in a generic way. + + * src/gui/panels/bookmarks.c: + Update code. + + * src/gui/panels/history.c: + Update code. Sort collected items properly. + 15-07-31 Cyrille Bagard <nocbos@gmail.com> * src/arch/arm/v7/helpers.h: diff --git a/src/analysis/project.c b/src/analysis/project.c index 7f86b11..5bb028f 100644 --- a/src/analysis/project.c +++ b/src/analysis/project.c @@ -211,7 +211,8 @@ GStudyProject *g_study_project_open(GObject *ref, const char *filename) if (binary != NULL) { g_signal_connect_to_main(binary, "disassembly-done", - G_CALLBACK(g_study_project_add_loaded_binary), result); + G_CALLBACK(g_study_project_add_loaded_binary), result, + g_cclosure_marshal_VOID__VOID); g_loaded_binary_analyse(binary); } diff --git a/src/glibext/signal.c b/src/glibext/signal.c index c7c8fe3..dd4f00b 100644 --- a/src/glibext/signal.c +++ b/src/glibext/signal.c @@ -24,8 +24,11 @@ #include "signal.h" +#include <assert.h> #include <malloc.h> #include <stdarg.h> +#include <stdbool.h> +#include <gobject/gvaluecollector.h> @@ -36,24 +39,26 @@ typedef void (* GSignalCallback) (gpointer, ...); /* Informations concernant une diffusion de signal */ typedef struct _gsignal_wrapper_info { - GConnectFlags flags; /* Ordre des arguments */ - - GSignalCallback callback; /* Fonction finale de récept° */ gpointer instance; /* Instance GLib initiatrice */ - gpointer data; /* Donnée utilisateur associée */ + GClosure *closure; /* Glue pour les appels */ + + GType return_type; /* Type de la valeur retournée */ guint n_params; /* Nombre de paramètres */ - unsigned long params[0]; /* Paramètres récupérés */ + const GType *param_types; /* Type des paramètres associés*/ + + GValue return_value; /* Valeur de retour */ + GValue instance_and_params[0]; /* Instance & paramètres */ } gsignal_wrapper_info; -/* Réceptionne un signal et redirige son exécution. */ -static void carry_signal_to_main_thread(gsignal_wrapper_info *, ...); - /* Transmet un signal dans le contexte principal. */ static gboolean to_main_wrapper(gsignal_wrapper_info *); +/* Réceptionne un signal et redirige son exécution. */ +static void carry_signal_to_main_thread(gsignal_wrapper_info *, ...); + /****************************************************************************** @@ -70,27 +75,9 @@ static gboolean to_main_wrapper(gsignal_wrapper_info *); static gboolean to_main_wrapper(gsignal_wrapper_info *info) { - gpointer data1; /* Premier argument à envoyer */ - gpointer data2; /* Dernier argument à envoyer */ - - if (info->flags & G_CONNECT_SWAPPED) - { - data1 = info->data; - data2 = info->instance; - } - else - { - data1 = info->instance; - data2 = info->data; - } - - switch (info->n_params - 1) - { - case 0: - info->callback(data1, data2); - break; - - } + g_closure_invoke(info->closure, NULL/*&info->return_value*/, + info->n_params + 1, info->instance_and_params, + NULL); return G_SOURCE_REMOVE; @@ -112,17 +99,51 @@ static gboolean to_main_wrapper(gsignal_wrapper_info *info) static void carry_signal_to_main_thread(gsignal_wrapper_info *info, ...) { + GValue *param_values; /* Paramètres d'appel */ va_list ap; /* Liste d'arguments sur pile */ guint i; /* Boucle de parcours */ + bool static_scope; /* Portée des arguments */ + gchar *error; /* Eventuelle erreur inattendue*/ + + //g_value_init(&info->return_value, info->return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE); + + if (G_IS_VALUE(info->instance_and_params)) + g_value_unset(info->instance_and_params); + + g_value_init(info->instance_and_params, G_TYPE_FROM_INSTANCE(info->instance)); + g_value_set_instance(info->instance_and_params, info->instance); + + param_values = info->instance_and_params + 1; va_start(ap, info); + error = NULL; + for (i = 0; i < info->n_params; i++) - info->params[i] = va_arg(ap, unsigned long); + { + if (G_IS_VALUE(param_values + i)) + g_value_unset(param_values + i); + + static_scope = info->param_types[i] & G_SIGNAL_TYPE_STATIC_SCOPE; + + G_VALUE_COLLECT_INIT(param_values + i, + info->param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE, + ap, static_scope ? G_VALUE_NOCOPY_CONTENTS : 0, + &error); + + if (error != NULL) + { + fprintf(stderr, "%s: %s", G_STRLOC, error); + g_free(error); + break; + } + + } va_end(ap); - g_idle_add_full(G_PRIORITY_HIGH_IDLE, (GSourceFunc)to_main_wrapper, info, free); + if (error == NULL) + g_idle_add_full(G_PRIORITY_HIGH_IDLE, (GSourceFunc)to_main_wrapper, info, NULL); } @@ -142,7 +163,7 @@ static void carry_signal_to_main_thread(gsignal_wrapper_info *info, ...) * * ******************************************************************************/ -gulong g_signal_connect_to_main(gpointer instance, const gchar *signal, GCallback handler, gpointer data) +gulong g_signal_connect_to_main(gpointer instance, const gchar *signal, GCallback handler, gpointer data, GClosureMarshal marshal) { guint signal_id; /* Identifiant du signal visé */ GSignalQuery query; /* Information sur le signal */ @@ -156,15 +177,18 @@ gulong g_signal_connect_to_main(gpointer instance, const gchar *signal, GCallbac /* Allocation adaptée */ - info = (gsignal_wrapper_info *)malloc(sizeof(gsignal_wrapper_info) + sizeof(unsigned long) * ++query.n_params); - - info->flags = 0; + info = (gsignal_wrapper_info *)calloc(1, sizeof(gsignal_wrapper_info) + sizeof(GValue) * (query.n_params + 1)); - info->callback = (GSignalCallback)handler; info->instance = instance; - info->data = data; + info->closure = g_cclosure_new(handler, data, NULL); + g_closure_set_marshal(info->closure, marshal); + + info->return_type = query.return_type; info->n_params = query.n_params; + info->param_types = query.param_types; + + assert(query.return_type == G_TYPE_NONE); return g_signal_connect_swapped(instance, signal, G_CALLBACK(carry_signal_to_main_thread), info); diff --git a/src/glibext/signal.h b/src/glibext/signal.h index c2a442d..e29210c 100644 --- a/src/glibext/signal.h +++ b/src/glibext/signal.h @@ -31,7 +31,7 @@ /* Reproduit le comportement de la fonction g_signal_connect(). */ -gulong g_signal_connect_to_main(gpointer, const gchar *, GCallback, gpointer); +gulong g_signal_connect_to_main(gpointer, const gchar *, GCallback, gpointer, GClosureMarshal); diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c index b3af70c..5b0649c 100644 --- a/src/gui/panels/bookmarks.c +++ b/src/gui/panels/bookmarks.c @@ -41,6 +41,8 @@ #include "../../common/cpp.h" #include "../../common/extstr.h" #include "../../core/params.h" +#include "../../glibext/chrysamarshal.h" +#include "../../glibext/signal.h" #include "../../gtkext/easygtk.h" #include "../../gtkext/support.h" @@ -503,7 +505,8 @@ static void reload_bookmarks_into_treeview(GBookmarksPanel *panel, GLoadedBinary g_object_ref(G_OBJECT(binary)); collec = g_loaded_binary_find_collection(binary, DBF_BOOKMARKS); - g_signal_connect(collec, "content-changed", G_CALLBACK(on_collection_content_changed), panel); + g_signal_connect_to_main(collec, "content-changed", G_CALLBACK(on_collection_content_changed), panel, + g_cclosure_user_marshal_VOID__ENUM_OBJECT); } diff --git a/src/gui/panels/history.c b/src/gui/panels/history.c index 25ee39f..1e86880 100644 --- a/src/gui/panels/history.c +++ b/src/gui/panels/history.c @@ -33,6 +33,8 @@ #include "panel-int.h" #include "../../analysis/db/collection.h" +#include "../../glibext/chrysamarshal.h" +#include "../../glibext/signal.h" #include "../../gtkext/easygtk.h" @@ -205,7 +207,6 @@ static void g_history_panel_init(GHistoryPanel *panel) column = gtk_tree_view_column_new_with_attributes("", renderer, "surface", HTC_PICTURE, NULL); - gtk_tree_view_column_set_sort_column_id(column, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); renderer = gtk_cell_renderer_text_new(); @@ -213,9 +214,11 @@ static void g_history_panel_init(GHistoryPanel *panel) "foreground", HTC_FOREGROUND, "text", HTC_LABEL, NULL); - gtk_tree_view_column_set_sort_column_id(column, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(panel->store), + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); + /* Eléments de contrôle inférieurs */ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8); @@ -400,7 +403,8 @@ static void change_history_panel_current_binary(GHistoryPanel *panel, GLoadedBin } - g_signal_connect(collec, "content-changed", G_CALLBACK(on_history_changed), panel); + g_signal_connect_to_main(collec, "content-changed", G_CALLBACK(on_history_changed), panel, + g_cclosure_user_marshal_VOID__ENUM_OBJECT); } @@ -446,9 +450,6 @@ static void on_history_changed(GDbCollection *collec, DBAction action, GDbItem * gtk_tree_store_set(panel->store, &iter, HTC_FOREGROUND, g_db_item_is_active(item) ? NULL : "grey", -1); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(panel->store), - GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, - GTK_SORT_ASCENDING); break; } @@ -457,14 +458,10 @@ static void on_history_changed(GDbCollection *collec, DBAction action, GDbItem * } while (gtk_tree_model_iter_next(model, &iter)); - break; - } - - } @@ -492,7 +489,7 @@ static gint sort_history_lines(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter gtk_tree_model_get(model, a, HTC_ITEM, &item_a, -1); gtk_tree_model_get(model, b, HTC_ITEM, &item_b, -1); - result = g_db_item_compare_with_timestamp(item_a, item_b); + result = g_db_item_cmp(item_a, item_b, true); g_object_unref(G_OBJECT(item_a)); g_object_unref(G_OBJECT(item_b)); |