diff options
31 files changed, 1463 insertions, 124 deletions
@@ -1,3 +1,73 @@ +12-01-11 Cyrille Bagard <nocbos@gmail.com> + + * configure.ac: + Add the new Makefile from the 'src/gui/panels' directory to AC_CONFIG_FILES. + + * plugins/pyoida/py_log.c: + * src/analysis/binary.c: + * src/analysis/disass/disassembler.c: + Update included headers. + + * src/arch/processor.c: + Disable debug code. + + * src/debug/jdwp/debugger.c: + * src/debug/jdwp/tcp.c: + Update included headers. + + * src/editor.c: + Update code. + + * src/format/dex/class.c: + * src/format/dex/method.c: + Disable debug code. + + * src/format/elf/elf.c: + * src/format/elf/symbols.c: + * src/format/format.c: + Update included headers. + + * src/gtkext/gtkbufferview.c: + Fix the code when getting reparented. + + * src/gtkext/gtkdockstation.c: + * src/gtkext/gtkdockstation.h: + New entries: build new proper dock station for widgets. + + * src/gtkext/Makefile.am: + Add gtkdockstation.[ch] and gtkbufferview-int.h to libgtkext_la_SOURCES. + + * src/gui/Makefile.am: + Add panels/libguipanels.la to libgui_la_LIBADD. + + * src/gui/menus/debug.c: + * src/gui/panels/log.c: + * src/gui/panels/log.h: + * src/gui/panels/Makefile.am: + * src/gui/panels/panel.c: + * src/gui/panels/panel.h: + * src/gui/panels/panel-int.h: + * src/gui/panels/symbols.c: + * src/gui/panels/symbols.h: + New entries: define new panel definitions for the editor GUI. + + * src/panels/log.c: + * src/panels/log.h: + Deleted entries. + + * src/panels/Makefile.am: + Remove the log.[ch] and symbols.[ch] files from libpanels_la_SOURCES. + + * src/panels/panel.c: + Disable the symbols panel. + + * src/panels/symbols.c: + * src/panels/symbols.h: + Deleted entries. + + * src/project.c: + Update code. + 12-01-02 Cyrille Bagard <nocbos@gmail.com> * src/dialogs/about.c: diff --git a/configure.ac b/configure.ac index 6830450..7828d7a 100644 --- a/configure.ac +++ b/configure.ac @@ -283,6 +283,7 @@ AC_CONFIG_FILES([Makefile src/gtkext/Makefile src/gui/Makefile src/gui/menus/Makefile + src/gui/panels/Makefile src/gui/tb/Makefile src/panels/Makefile src/plugins/Makefile diff --git a/plugins/pyoida/py_log.c b/plugins/pyoida/py_log.c index ea43e5c..fde7ae5 100644 --- a/plugins/pyoida/py_log.c +++ b/plugins/pyoida/py_log.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * py_log.c - intermédiaire du panneau de messages pour Python * - * Copyright (C) 2009 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -27,7 +27,7 @@ #include <structmember.h> -#include "../../src/panels/log.h" +#include "../../src/gui/panels/log.h" typedef struct { diff --git a/src/analysis/binary.c b/src/analysis/binary.c index b1d41f2..2e1ecc2 100644 --- a/src/analysis/binary.c +++ b/src/analysis/binary.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * binary.c - traitement des flots de code binaire * - * Copyright (C) 2008-2011 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -47,7 +47,7 @@ #include "../common/extstr.h" #include "../debug/break.h" #include "../format/format.h" -#include "../panels/log.h" +#include "../gui/panels/log.h" #include "../plugins/pglist.h" diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c index 7a1c219..241233d 100644 --- a/src/analysis/disass/disassembler.c +++ b/src/analysis/disass/disassembler.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * disassembler.c - encadrement des phases de désassemblage * - * Copyright (C) 2010-2011 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -38,9 +38,7 @@ #include "../../decomp/lang/asm.h" #include "../../format/format.h" #include "../../glibext/delayed-int.h" -#ifdef DEBUG -# include "../../panels/log.h" -#endif +#include "../../gui/panels/log.h" diff --git a/src/arch/processor.c b/src/arch/processor.c index 0e9ad1f..41b9a66 100644 --- a/src/arch/processor.c +++ b/src/arch/processor.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * processor.c - gestion générique des architectures * - * Copyright (C) 2008-2011 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -227,7 +227,7 @@ GArchInstruction *g_arch_processor_decode_instruction(const GArchProcessor *proc if (result == NULL || result == SKIPPED_INSTR) { - printf("BAD CODE :: 0x%02hhx @0x%08lx\n", data[*pos], addr); + //printf("BAD CODE :: 0x%02hhx @0x%08lx\n", data[*pos], addr); skipped = (result == SKIPPED_INSTR); diff --git a/src/debug/jdwp/debugger.c b/src/debug/jdwp/debugger.c index 6441f90..ada09bb 100644 --- a/src/debug/jdwp/debugger.c +++ b/src/debug/jdwp/debugger.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * debugger.c - débogage d'une cible en Java. * - * Copyright (C) 2010-2011 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -31,7 +31,7 @@ #include "tcp.h" #include "../debugger-int.h" #include "../stream.h" -#include "../../panels/log.h" +#include "../../gui/panels/log.h" diff --git a/src/debug/jdwp/tcp.c b/src/debug/jdwp/tcp.c index d389f51..554d5b6 100644 --- a/src/debug/jdwp/tcp.c +++ b/src/debug/jdwp/tcp.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * tcp.c - gestion des connexions TCP aux serveurs JDWP. * - * Copyright (C) 2010-2011 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -40,7 +40,7 @@ #include "sets/list.h" #include "../stream-int.h" #include "../../common/net.h" -#include "../../panels/log.h" +#include "../../gui/panels/log.h" diff --git a/src/editor.c b/src/editor.c index 8cb8d06..fb0ccc7 100644 --- a/src/editor.c +++ b/src/editor.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * editor.c - fenêtre principale de l'interface graphique * - * Copyright (C) 2008-2011 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -57,6 +57,7 @@ #include "dialogs/export.h" #include "dialogs/plugins.h" #include "gui/menus/menubar.h" +#include "gui/panels/panel.h" #include "gui/tb/source.h" #include "panels/panel.h" @@ -474,11 +475,26 @@ GtkWidget *create_editor(void) toolbar = build_editor_toolbar(G_OBJECT(result)); gtk_box_pack_start(GTK_BOX(vbox1), toolbar, FALSE, FALSE, 0); + do + { + GtkWidget *support; + + support = init_panels2(); + gtk_box_pack_start(GTK_BOX(vbox1), support, TRUE, TRUE, 0); + + load_main_panels(); + + + } while(0); + + + +#if 1 vpaned1 = gtk_vpaned_new (); gtk_widget_show (vpaned1); - gtk_box_pack_start (GTK_BOX (vbox1), vpaned1, TRUE, TRUE, 0); + //gtk_box_pack_start (GTK_BOX (vbox1), vpaned1, TRUE, TRUE, 0); gtk_paned_set_position (GTK_PANED (vpaned1), 400); hpaned1 = gtk_hpaned_new (); @@ -535,8 +551,8 @@ GtkWidget *create_editor(void) gtk_paned_pack2(GTK_PANED(vpaned1), dpanel, FALSE, FALSE); - ditem = g_dock_item_new(_("Messages"), get_panel(PNT_LOG)); - gtk_dock_panel_add_item(dpanel, ditem); + //ditem = g_dock_item_new(_("Messages"), get_panel(PNT_LOG)); + //gtk_dock_panel_add_item(dpanel, ditem); ditem = g_dock_item_new(_("Strings"), get_panel(PNT_STRINGS)); gtk_dock_panel_add_item(dpanel, ditem); @@ -580,6 +596,8 @@ GtkWidget *create_editor(void) */ +#endif + statusbar = gtk_extended_status_bar_new(); g_object_set_data(ref, "statusbar", statusbar); diff --git a/src/format/dex/class.c b/src/format/dex/class.c index 710b023..168d45d 100644 --- a/src/format/dex/class.c +++ b/src/format/dex/class.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * class.c - manipulation des classes du format DEX * - * Copyright (C) 2010 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -153,8 +153,8 @@ static GDexClass *g_dex_class_new(const GDexFormat *format, off_t offset) - printf(" Classe :: d meth count == 0x%lld\n", data.direct_methods_size); - printf(" Classe :: v meth count == 0x%lld\n", data.virtual_methods_size); + //printf(" Classe :: d meth count == 0x%lld\n", data.direct_methods_size); + //printf(" Classe :: v meth count == 0x%lld\n", data.virtual_methods_size); @@ -228,9 +228,11 @@ static void g_dex_class_register_method(const GDexClass *class, GBinFormat *form routine = g_dex_method_get_routine(class->direct_methods[i]); g_binary_format_add_routine(format, routine); + /* printf("routine @ 0x%08llx :: '%s'\n", g_binary_routine_get_address(routine), g_binary_routine_get_name(routine)); + */ } @@ -239,9 +241,11 @@ static void g_dex_class_register_method(const GDexClass *class, GBinFormat *form routine = g_dex_method_get_routine(class->virtual_methods[i]); g_binary_format_add_routine(format, routine); + /* printf("routine @ 0x%08llx :: '%s'\n", g_binary_routine_get_address(routine), g_binary_routine_get_name(routine)); + */ } @@ -355,7 +359,7 @@ GBufferLine *line, GLangOutput *output) //g_buffer_line_insert_text(line, BLC_ASSEMBLY, "{", 3, RTT_SIGNS); - printf("Output :: %s\n", _g_openida_type_to_string(type, true)); + //printf("Output :: %s\n", _g_openida_type_to_string(type, true)); diff --git a/src/format/dex/method.c b/src/format/dex/method.c index b9023d8..95f121a 100644 --- a/src/format/dex/method.c +++ b/src/format/dex/method.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * method.c - manipulation des methodes du format DEX * - * Copyright (C) 2010 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -151,13 +151,13 @@ GDexMethod *g_dex_method_new(const GDexFormat *format, const encoded_method *see //printf(" code size :: %d\n", item.insns_size); - printf(" method idx :: %lld\n", *last); + //printf(" method idx :: %lld\n", *last); result->offset = seed->code_off + 4 * sizeof(uint16_t) + 2 *sizeof(uint32_t);/* TODO : faire plus propre ! */ - printf(" method off :: 0x%08x\n", result->offset); + //printf(" method off :: 0x%08x\n", result->offset); g_binary_routine_set_address(routine, result->offset); diff --git a/src/format/elf/elf.c b/src/format/elf/elf.c index c3d2e42..158a6b6 100644 --- a/src/format/elf/elf.c +++ b/src/format/elf/elf.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * elf.c - support du format ELF * - * Copyright (C) 2009-2010 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -34,7 +34,7 @@ #include "section.h" #include "strings.h" #include "symbols.h" -#include "../../panels/log.h" +#include "../../gui/panels/log.h" diff --git a/src/format/elf/symbols.c b/src/format/elf/symbols.c index a243a6c..df1b613 100644 --- a/src/format/elf/symbols.c +++ b/src/format/elf/symbols.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * symbols.c - gestion des symboles d'un ELF * - * Copyright (C) 2008-2010 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -32,7 +32,7 @@ #include "helper_x86.h" #include "section.h" #include "../mangling/demangler.h" -#include "../../panels/log.h" +#include "../../gui/panels/log.h" diff --git a/src/format/format.c b/src/format/format.c index a44f676..e3f5a93 100644 --- a/src/format/format.c +++ b/src/format/format.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * format.c - support des différents formats binaires * - * Copyright (C) 2009-2011 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -34,7 +34,7 @@ #include "java/java.h" #include "pe/pe.h" #include "../decomp/expr/block.h" -#include "../panels/log.h" +#include "../gui/panels/log.h" #include "../plugins/pglist.h" diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am index 47d4e41..bcaa730 100644 --- a/src/gtkext/Makefile.am +++ b/src/gtkext/Makefile.am @@ -13,6 +13,7 @@ libgtkext_la_SOURCES = \ gtkbufferview.h gtkbufferview.c \ gtkdockitem.h gtkdockitem.c \ gtkdockpanel.h gtkdockpanel.c \ + gtkdockstation.h gtkdockstation.c \ gtkdropwindow.h gtkdropwindow.c \ gtkgraphview.h gtkgraphview.c \ gtklinkrenderer.h gtklinkrenderer.c \ diff --git a/src/gtkext/gtkbufferview.c b/src/gtkext/gtkbufferview.c index bad88fc..796a001 100644 --- a/src/gtkext/gtkbufferview.c +++ b/src/gtkext/gtkbufferview.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * gtkbufferview.c - affichage de tampons de lignes * - * Copyright (C) 2010 Cyrille Bagard + * Copyright (C) 2010-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -175,16 +175,8 @@ static void gtk_buffer_view_compute_real_coord(GtkBufferView *view, gint *x, gin static void gtk_buffer_view_size_request(GtkWidget *widget, GtkRequisition *requisition) { if (GTK_BUFFER_VIEW(widget)->buffer_view != NULL) - { - - g_buffer_view_get_size(GTK_BUFFER_VIEW(widget)->buffer_view, - &requisition->width, &requisition->height); - - printf(" === size req :: (%d ; %d)\n", - requisition->width, requisition->height); - - } - else printf(" === size req :: ??\n"); + g_buffer_view_get_size(GTK_BUFFER_VIEW(widget)->buffer_view, + &requisition->width, &requisition->height); } @@ -394,7 +386,7 @@ void gtk_buffer_view_attach_buffer(GtkBufferView *view, GCodeBuffer *buffer) width += -view->left_text + 1; height += 1; - gtk_widget_set_size_request(GTK_WIDGET(view), width, height); + //gtk_widget_set_size_request(GTK_WIDGET(view), width, height); gtk_widget_queue_draw(GTK_WIDGET(view)); diff --git a/src/gtkext/gtkdockstation.c b/src/gtkext/gtkdockstation.c new file mode 100644 index 0000000..afea11d --- /dev/null +++ b/src/gtkext/gtkdockstation.c @@ -0,0 +1,285 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * gtkdockstation.c - manipulation et l'affichage de composants rassemblés + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 Foobar. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include "gtkdockstation.h" + + +#include <malloc.h> +#include <string.h> + + +#include "easygtk.h" + + + +/* Procède à l'initialisation de l'afficheur concentré. */ +static void gtk_dock_station_class_init(GtkDockStationClass *); + +/* Procède à l'initialisation du support d'affichage concentré. */ +static void gtk_dock_station_init(GtkDockStation *); + +/* Met à jour le titre du support de panneaux concentrés. */ +static gboolean gtk_dock_station_switch_panel(GtkNotebook *, GtkNotebookPage *, guint, gpointer); + + + +/* Détermine le type du composant d'affichage concentré. */ +G_DEFINE_TYPE(GtkDockStation, gtk_dock_station, GTK_TYPE_VBOX) + + +/****************************************************************************** +* * +* Paramètres : class = classe GTK à initialiser. * +* * +* Description : Procède à l'initialisation de l'afficheur concentré. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void gtk_dock_station_class_init(GtkDockStationClass *class) +{ + +} + + +/****************************************************************************** +* * +* Paramètres : station = composant GTK à initialiser. * +* * +* Description : Procède à l'initialisation du support d'affichage concentré. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void gtk_dock_station_init(GtkDockStation *station) +{ + GtkWidget *eventbox; /* Réceptacle actif */ + GtkWidget *hbox; /* Division supérieure */ + GtkWidget *button; /* Bouton de contrôle */ + GtkWidget *image; /* Image associée */ + + eventbox = gtk_event_box_new(); + gtk_widget_show(eventbox); + gtk_box_pack_start(GTK_BOX(station), eventbox, FALSE, TRUE, 0); + + hbox = gtk_hbox_new(FALSE, 0); + gtk_widget_show(hbox); + gtk_container_add(GTK_CONTAINER(eventbox), hbox); + + station->title = GTK_LABEL(gtk_label_new(("<b>titre</b>"))); + gtk_widget_show(GTK_WIDGET(station->title)); + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(station->title), TRUE, TRUE, 0); + gtk_label_set_use_markup(GTK_LABEL(station->title), TRUE); + gtk_misc_set_alignment(GTK_MISC(station->title), 0, 0.5); + + button = gtk_button_new(); + gtk_widget_show(button); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); + + image = gtk_image_new_from_stock("gtk-media-play", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_widget_set_size_request(image, 10, 10); + + button = gtk_button_new(); + gtk_widget_show(button); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); + + image = gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_widget_set_size_request(image, 10, 10); + + station->notebook = GTK_NOTEBOOK(gtk_notebook_new()); + gtk_widget_show(GTK_WIDGET(station->notebook)); + gtk_box_pack_start(GTK_BOX(station), GTK_WIDGET(station->notebook), TRUE, TRUE, 0); + gtk_notebook_set_show_border(station->notebook, FALSE); + gtk_notebook_set_tab_pos(station->notebook, GTK_POS_BOTTOM); + gtk_notebook_set_scrollable(station->notebook, TRUE); + + g_signal_connect(station->notebook, "switch-page", + G_CALLBACK(gtk_dock_station_switch_panel), station); + +} + + +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Crée un nouveau composant pour support d'affichage concentré.* +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +GtkWidget *gtk_dock_station_new(void) +{ + return g_object_new(GTK_TYPE_DOCK_STATION, NULL); + +} + + +/****************************************************************************** +* * +* Paramètres : notebook = support à l'origine de la mise à jour. * +* page = onglet mis en avant. * +* index = indice de l'onglet actuellement actif. * +* data = adresse du conteneur supérieur. * +* * +* Description : Met à jour le titre du support de panneaux concentrés. * +* * +* Retour : TRUE ? * +* * +* Remarques : - * +* * +******************************************************************************/ + +static gboolean gtk_dock_station_switch_panel(GtkNotebook *notebook, GtkNotebookPage *page, guint index, gpointer data) +{ + GtkWidget *widget; /* Panneau concerné */ + char *caption; /* Texte à redonner */ + + widget = gtk_notebook_get_nth_page(notebook, index); + caption = g_object_get_data(G_OBJECT(widget), "title"); + + gtk_dock_panel_update_title(GTK_DOCK_STATION(data), widget, caption); + + //g_signal_emit_by_name(GTK_DOCK_PANEL(data), "switch-item", ditem); + + return TRUE; + +} + + +/****************************************************************************** +* * +* Paramètres : station = plateforme GTK à compléter. * +* widget = nouvel élément à intégrer. * +* caption = intitulé court à afficher sur les onglets. * +* * +* Description : Ajoute un paquet d'informations à l'affichage centralisé. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void gtk_dock_panel_add_widget(GtkDockStation *station, GtkWidget *widget, const char *caption) +{ + GtkWidget *label; /* Etiquette d'onglet */ + + label = qck_create_label(NULL, NULL, caption); + + g_signal_handlers_disconnect_by_func(station->notebook, + G_CALLBACK(gtk_dock_station_switch_panel), station); + + gtk_notebook_insert_page(station->notebook, widget, label, -1); + + g_signal_connect(station->notebook, "switch-page", + G_CALLBACK(gtk_dock_station_switch_panel), station); + + gtk_notebook_set_show_tabs(station->notebook, gtk_notebook_get_n_pages(station->notebook) > 1); + + gtk_dock_panel_update_title(station, widget, caption); + +} + + + +/****************************************************************************** +* * +* Paramètres : station = plateforme GTK à compléter. * +* widget = nouvel élément à intégrer. * +* caption = intitulé court à afficher sur les onglets. * +* * +* Description : Met à jour, si besoin est, le titre de l'affichage concentré.* +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void gtk_dock_panel_update_title(GtkDockStation *station, GtkWidget *widget, const char *caption) +{ + char *str; /* Valeur finale reconstituée */ + gint index; /* Indice de l'onglet actif */ + + /* Sauvegarde pour une prochaine fois */ + + str = g_object_get_data(G_OBJECT(widget), "title"); + if (str != NULL) free(str); + + g_object_set_data(G_OBJECT(widget), "title", strdup(caption)); + + /* Mise à jour de l'affichage */ + + index = gtk_notebook_get_current_page(station->notebook); + + if (index == gtk_notebook_page_num(station->notebook, widget)) + { + str = calloc(strlen("<b>") + strlen(caption) + strlen("</b>") + 1, sizeof(char)); + + strcpy(str, "<b>"); + strcat(str, caption); + strcat(str, "</b>"); + + gtk_label_set_markup(station->title, str); + + free(str); + + } + +} + + +/****************************************************************************** +* * +* Paramètres : station = plateforme GTK à consulter. * +* index = indice de l'onglet visé. * +* * +* Description : Renvoie un composant intégré dans l'affichage centralisé. * +* * +* Retour : Composant associé à l'indice donné. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GtkWidget *gtk_dock_panel_get_widget(GtkDockStation *station, gint index) +{ + return gtk_notebook_get_nth_page(station->notebook, index); + +} diff --git a/src/gtkext/gtkdockstation.h b/src/gtkext/gtkdockstation.h new file mode 100644 index 0000000..c92f43d --- /dev/null +++ b/src/gtkext/gtkdockstation.h @@ -0,0 +1,94 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * gtkdockstation.h - prototypes pour la manipulation et l'affichage de composants rassemblés + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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 Foobar. If not, see <http://www.gnu.org/licenses/>. + */ + + +#ifndef _GTKEXT_GTKDOCKSTATION_H +#define _GTKEXT_GTKDOCKSTATION_H + + +#include <gtk/gtk.h> + + +G_BEGIN_DECLS + + +#define GTK_TYPE_DOCK_STATION (gtk_dock_station_get_type()) +#define GTK_DOCK_STATION(obj) GTK_CHECK_CAST(obj, gtk_dock_station_get_type (), GtkDockStation) +#define GTK_DOCK_STATION_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, gtk_dock_station_get_type(), GtkDockStationClass) +#define GTK_IS_DOCK_STATION(obj) GTK_CHECK_TYPE(obj, gtk_dock_station_get_type()) + + +/* Station de réception pour concentration d'éléments (instance) */ +typedef struct _GtkDockStation GtkDockStation; + +/* Station de réception pour concentration d'éléments (classe) */ +typedef struct _GtkDockStationClass GtkDockStationClass; + + +/* Station de réception pour concentration d'éléments (instance) */ +struct _GtkDockStation +{ + GtkVBox vbox; /* Présence obligatoire en 1er */ + + GtkLabel *title; /* Title du support principal */ + GtkNotebook *notebook; /* Support à onglets */ + +}; + +/* Station de réception pour concentration d'éléments (classe) */ +struct _GtkDockStationClass +{ + GtkVBoxClass parent_class; /* Présence obligatoire en 1er */ + +}; + + +/* Détermine le type du composant d'affichage concentré. */ +GtkType gtk_dock_station_get_type(void); + +/* Crée un nouveau composant pour support d'affichage concentré. */ +GtkWidget *gtk_dock_station_new(void); + +/* Ajoute un paquet d'informations à l'affichage centralisé. */ +void gtk_dock_panel_add_widget(GtkDockStation *, GtkWidget *, const char *); + +/* Met à jour, si besoin est, le titre de l'affichage concentré. */ +void gtk_dock_panel_update_title(GtkDockStation *, GtkWidget *, const char *); + +/* Renvoie un composant intégré dans l'affichage centralisé. */ +GtkWidget *gtk_dock_panel_get_widget(GtkDockStation *, gint); + + + +/* Ajoute un nouveau composant à l'ensemble. */ +//void gtk_dock_station_add_item(GtkDockStation *, GDockItem *); + +/* Supprime un composant à l'ensemble. */ +//void gtk_dock_station_remove_item(GtkDockStation *, GDockItem *); + + + +G_END_DECLS + + + +#endif /* _GTKEXT_GTKDOCKSTATION_H */ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 06f1a4e..24ba5e5 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -7,6 +7,7 @@ libgui_la_SOURCES = \ libgui_la_LIBADD = \ menus/libguimenus.la \ + panels/libguipanels.la \ tb/libguitb.la \ ../dialogs/libdialogs.la @@ -19,4 +20,4 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = menus tb +SUBDIRS = menus panels tb diff --git a/src/gui/menus/debug.c b/src/gui/menus/debug.c index 366d789..0d9b41d 100644 --- a/src/gui/menus/debug.c +++ b/src/gui/menus/debug.c @@ -33,7 +33,7 @@ #include "../../project.h" #include "../../gtkext/easygtk.h" -#include "../../panels/log.h" +#include "../../gui/panels/log.h" diff --git a/src/gui/panels/Makefile.am b/src/gui/panels/Makefile.am new file mode 100644 index 0000000..0d43844 --- /dev/null +++ b/src/gui/panels/Makefile.am @@ -0,0 +1,18 @@ + +noinst_LTLIBRARIES = libguipanels.la + +libguipanels_la_SOURCES = \ + log.h log.c \ + panel.h panel.c \ + symbols.h symbols.c + +libguipanels_la_LDFLAGS = + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) + +SUBDIRS = diff --git a/src/panels/log.c b/src/gui/panels/log.c index fdbda1d..2ab6d0c 100644 --- a/src/panels/log.c +++ b/src/gui/panels/log.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * log.c - panneau d'affichage des messages système * - * Copyright (C) 2009-2011 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -30,9 +30,6 @@ #include <stdio.h> -#include "panel.h" - - /* Colonnes de la liste des messages */ typedef enum _LogColumn @@ -45,7 +42,10 @@ typedef enum _LogColumn } LogColumn; -#define _(str) str + +/* Construit le panneau d'affichage des messages système. */ +static GtkWidget *build_log_panel(void); + /****************************************************************************** @@ -60,7 +60,33 @@ typedef enum _LogColumn * * ******************************************************************************/ -GtkWidget *build_log_panel(void) +GPanelItem *create_log_panel(void) +{ + GEditorItem *result; /* Elément réactif à renvoyer */ + GtkWidget *panel; /* Composant GTK visuel */ + + panel = build_log_panel(); + + result = g_panel_item_new(PANEL_LOG_ID, _("Misc information"), panel, "S"); + + return G_PANEL_ITEM(result); + +} + + +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Construit le panneau d'affichage des messages système. * +* * +* Retour : Adresse du panneau mis en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static GtkWidget *build_log_panel(void) { GtkWidget *result; /* Panneau à retourner */ GtkTreeStore *store; /* Modèle de gestion */ @@ -122,13 +148,16 @@ GtkWidget *build_log_panel(void) void log_simple_message(LogMessageType type, const char *msg) { + GPanelItem *item; /* Intermédiaire mis en place */ GtkWidget *panel; /* Panneau à traiter */ GtkTreeStore *store; /* Modèle de gestion */ GtkTreeIter iter; /* Point d'insertion */ GtkTreeView *treeview; /* Affichage de la liste */ GtkTreePath *path; /* Chemin d'accès à la ligne */ - panel = get_panel(PNT_LOG); + item = g_panel_item_get(PANEL_LOG_ID); + panel = g_editor_item_get_widget(G_EDITOR_ITEM(item)); + store = g_object_get_data(G_OBJECT(panel), "store"); gtk_tree_store_append(store, &iter, NULL); diff --git a/src/panels/log.h b/src/gui/panels/log.h index 1d46edd..c8fe790 100644 --- a/src/panels/log.h +++ b/src/gui/panels/log.h @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * log.h - prototypes pour le panneau d'affichage des messages système * - * Copyright (C) 2009-2011 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -22,13 +22,19 @@ */ -#ifndef _PANEL_LOG_H -#define _PANEL_LOG_H +#ifndef _GUI_PANELS_LOG_H +#define _GUI_PANELS_LOG_H -#include <gtk/gtk.h> +#include <i18n.h> +#include "panel.h" + + + +#define PANEL_LOG_ID _("Messages") + /* Type de messages disponibles */ typedef enum _LogMessageType @@ -45,7 +51,7 @@ typedef enum _LogMessageType /* Construit le panneau d'affichage des messages système. */ -GtkWidget *build_log_panel(void); +GPanelItem *create_log_panel(void); /* Affiche un message dans le journal des messages système. */ void log_simple_message(LogMessageType, const char *); @@ -55,4 +61,4 @@ void log_variadic_message(LogMessageType, const char *, ...); -#endif /* _PANEL_LOG_H */ +#endif /* _GUI_PANELS_LOG_H */ diff --git a/src/gui/panels/panel-int.h b/src/gui/panels/panel-int.h new file mode 100644 index 0000000..186092d --- /dev/null +++ b/src/gui/panels/panel-int.h @@ -0,0 +1,73 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * panel-int.h - prototypes pour les définitions internes liées aux panneaux d'affichage + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _GUI_PANELS_PANEL_INT_H +#define _GUI_PANELS_PANEL_INT_H + + +#include "panel.h" + + +#include <gtk/gtkwidget.h> + + +#include "../editem-int.h" +#include "../../common/dllist.h" + + + +/* Elément réactif pour panneaux de l'éditeur (instance) */ +struct _GPanelItem +{ + GEditorItem parent; /* A laisser en premier */ + + DL_LIST_ITEM(link); /* Maillon de liste chaînée */ + + const char *lname; /* Description longue */ + + const char *path; /* Chemin vers la place idéale */ + +}; + + +/* Elément réactif pour panneaux de l'éditeur (classe) */ +struct _GPanelItemClass +{ + GEditorItemClass parent; /* A laisser en premier */ + + GtkBin *first; /* Elément racine */ + +}; + + +#define panels_list_add_tail(new, head) dl_list_add_tail(new, head, GPanelItem, link) +#define panels_list_for_each(pos, head) dl_list_for_each(pos, head, GPanelItem, link) + + +/* Initialise dynamique les propriétés de l'instance. */ +void g_panel_item_init_ext(GPanelItem *, const char *, const char *, GtkWidget *, const char *); + + + +#endif /* _GUI_PANELS_PANEL_INT_H */ diff --git a/src/gui/panels/panel.c b/src/gui/panels/panel.c new file mode 100644 index 0000000..8cc79ce --- /dev/null +++ b/src/gui/panels/panel.c @@ -0,0 +1,658 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * panel.c - prototypes pour la gestion des éléments réactifs spécifiques aux panneaux + * + * Copyright (C) 2009-2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "panel.h" + + +#include <ctype.h> +#include <string.h> + + +#include "log.h" +#include "panel-int.h" +#include "symbols.h" +#include "../../gtkext/easygtk.h" +#include "../../gtkext/gtkdockstation.h" + + + +/* Support de fond pour les composants */ +static GtkWidget *_support; + +/* Liste des panneaux en place */ +static GPanelItem *_panels_list = NULL; + + +/* Initialise la classe des éléments réactifs de l'éditeur. */ +static void g_panel_item_class_init(GPanelItemClass *); + +/* Initialise une instance d'élément réactif pour l'éditeur. */ +static void g_panel_item_init(GPanelItem *); + +/* Renvoie un élément du chemin d'insertion du panneau. */ +static char g_panel_item_get_path_at(GPanelItem *, size_t); + +/* Détermine le support faisant office d'étendue donnée. */ +static GtkWidget *get_panel_given_part(GtkWidget *, size_t, char); + +/* Fournit le premier morceau de chemin rencontré. */ +static char get_first_path_found(GtkWidget *, size_t); + +/* Introduit une nouvelle division sur le support indiqué. */ +static void create_panel_division(GtkWidget *, GtkWidget *, const char *, GtkWidget *, const char *, char); + +/* Place un panneau dans l'ensemble affiché. */ +static void _g_panel_item_dock(GtkWidget *, GEditorItem *, const char *, size_t); + + + +/* Indique le type défini pour un élément destiné à un panneau. */ +G_DEFINE_TYPE(GPanelItem, g_panel_item, G_TYPE_EDITOR_ITEM); + + +/****************************************************************************** +* * +* Paramètres : klass = classe à initialiser. * +* * +* Description : Initialise la classe des éléments réactifs de l'éditeur. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void g_panel_item_class_init(GPanelItemClass *klass) +{ + +} + + +/****************************************************************************** +* * +* Paramètres : item = instance à initialiser. * +* * +* Description : Initialise une instance d'élément réactif pour l'éditeur. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void g_panel_item_init(GPanelItem *item) +{ + DL_LIST_ITEM_INIT(&item->link); + +} + + +/****************************************************************************** +* * +* Paramètres : item = composant à présenter à l'affichage. * +* ref = espace de référencement global. * +* name = nom associé à l'élément. * +* lname = description longue du panneau. * +* widget = composant à présenter à l'affichage. * +* path = chemin vers la place idéale pour le futur panneau. * +* * +* Description : Initialise dynamique les propriétés de l'instance. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void g_panel_item_init_ext(GPanelItem *item, const char *name, const char *lname, GtkWidget *widget, const char *path) +{ + GEditorItem *parent; /* Autre version de l'élément */ + + parent = G_EDITOR_ITEM(item); + + parent->name = name; + item->lname = lname; + + g_object_ref(widget); + parent->widget = widget; + g_object_set_data(G_OBJECT(widget), "pitem", item); + + item->path = path; + + panels_list_add_tail(item, &_panels_list); + +} + + +/****************************************************************************** +* * +* Paramètres : ref = espace de référencement global. * +* name = nom associé à l'élément. * +* lname = description longue du panneau. * +* widget = composant à présenter à l'affichage. * +* path = chemin vers la place idéale pour le futur panneau. * +* * +* Description : Crée un élément de panneau réactif. * +* * +* Retour : Adresse de la structure mise en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GEditorItem *g_panel_item_new(const char *name, const char *lname, GtkWidget *widget, const char *path) +{ + GPanelItem *result; /* Structure à retourner */ + + result = g_object_new(G_TYPE_PANEL_ITEM, NULL); + + g_panel_item_init_ext(result, name, lname, widget, path); + + return G_EDITOR_ITEM(result); + +} + + + +/****************************************************************************** +* * +* Paramètres : item = composant d'affichage à consulter. * +* pos = position de la tête de lecture dans le chemin. * +* * +* Description : Renvoie un élément du chemin d'insertion du panneau. * +* * +* Retour : Lettre caractéristique ou '\0'. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static char g_panel_item_get_path_at(GPanelItem *item, size_t pos) +{ + if (pos >= strlen(item->path)) + return '\0'; + else + return item->path[pos]; + +} + + +/****************************************************************************** +* * +* Paramètres : name = désignation courte servant de clef. * +* * +* Description : Recherche un panneau à partir de son nom court. * +* * +* Retour : Panneau trouvé ou NULL si aucun. * +* * +* Remarques : Le parcours peut se faire aussi depuis la classe parente, * +* mais il est plus rapide par ici. * +* * +******************************************************************************/ + +GPanelItem *g_panel_item_get(const char *name) +{ + GPanelItem *iter; /* Boucle de parcours */ + + panels_list_for_each(iter, _panels_list) + { + if (strcmp(G_EDITOR_ITEM(iter)->name, name) == 0) + return iter; + + } + + return NULL; + +} + + +/****************************************************************************** +* * +* Paramètres : item = composant à présenter à l'affichage. * +* * +* Description : Place un panneau dans l'ensemble affiché. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void g_panel_item_dock(GPanelItem *item) +{ + GPanelItemClass *class; /* Encadrement global */ + GtkWidget *station; /* Premier support concentré */ + GEditorItem *editem; /* Autre vision des choses */ + + class = G_PANEL_ITEM_GET_CLASS(item); + + /* Tout est à faire... */ + if (class->first == NULL) + { + /** + * Note : on crée ici un support qui ne sera jamais déplacé, + * laissant ainsi la variable 'class->first' pour les départs + * de parcours toujours valide sans effort. + */ + class->first = GTK_BIN(qck_create_padded_alignment(0, 0, 0, 0)); + + gtk_widget_show(GTK_WIDGET(class->first)); + gtk_container_add(GTK_CONTAINER(_support), GTK_WIDGET(class->first)); + + station = gtk_dock_station_new(); + + gtk_widget_show(station); + gtk_container_add(GTK_CONTAINER(class->first), station); + + editem = G_EDITOR_ITEM(item); + gtk_dock_panel_add_widget(GTK_DOCK_STATION(station), + editem->widget, editem->name); + + } + else _g_panel_item_dock(gtk_bin_get_child(class->first), G_EDITOR_ITEM(item), item->path, 0); + +} + + +/****************************************************************************** +* * +* Paramètres : base = support sujet à analyse. * +* pos = position de la tête de lecture dans le chemin. * +* target = indentifiant de positionnement recherché. * +* * +* Description : Détermine le support faisant office d'étendue donnée. * +* * +* Retour : Composant en place retrouvé ou NULL si aucune correspondance.* +* * +* Remarques : - * +* * +******************************************************************************/ + +static GtkWidget *get_panel_given_part(GtkWidget *base, size_t pos, char target) +{ + GtkWidget *result; /* Trouvaille à retourner */ + GtkWidget *widget; /* Autre composant présent */ + GPanelItem *item; /* Autre version de l'instance */ + char path; /* Partie de chemin en place */ + + if (GTK_IS_DOCK_STATION(base)) + { + widget = gtk_dock_panel_get_widget(GTK_DOCK_STATION(base), 0); + item = G_PANEL_ITEM(g_object_get_data(G_OBJECT(widget), "pitem")); + + path = g_panel_item_get_path_at(item, pos); + + result = (path == target ? base : NULL); + + } + else + { + widget = gtk_paned_get_child1(GTK_PANED(base)); + result = get_panel_given_part(widget, pos, target); + + if (result == NULL) + { + widget = gtk_paned_get_child2(GTK_PANED(base)); + result = get_panel_given_part(widget, pos, target); + } + + } + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : base = support sujet à analyse. * +* pos = position de la tête de lecture dans le chemin. * +* * +* Description : Fournit le premier morceau de chemin rencontré. * +* * +* Retour : Premier élément de chemin rencontré. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static char get_first_path_found(GtkWidget *base, size_t pos) +{ + char result; /* Trouvaille à retourner */ + GtkWidget *widget; /* Autre composant présent */ + GPanelItem *item; /* Autre version de l'instance */ + + if (GTK_IS_DOCK_STATION(base)) + { + widget = gtk_dock_panel_get_widget(GTK_DOCK_STATION(base), 0); + item = G_PANEL_ITEM(g_object_get_data(G_OBJECT(widget), "pitem")); + + result = g_panel_item_get_path_at(item, pos); + + } + else + { + /** + * A un certain niveau, si deux éléments sont groupés, + * c'est qu'ils ont une base commune ! On ne parcourt donc + * que le premier d'entre eux. + */ + widget = gtk_paned_get_child1(GTK_PANED(base)); + result = get_first_path_found(widget, pos); + + } + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : parent = support où placer la nouvelle division. * +* child1 = composant GTK à placer en position 1. * +* name1 = éventuelle désignation en cas d'isolement. * +* child2 = composant GTK à placer en position 2. * +* name2 = éventuelle désignation en cas d'isolement. * +* orientation = sens de la division. * +* * +* Description : Introduit une nouvelle division sur le support indiqué. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void create_panel_division(GtkWidget *parent, GtkWidget *child1, const char *name1, GtkWidget *child2, const char *name2, char orientation) +{ + unsigned int index; /* Indice de la réinsertion */ + bool resize; /* Redimensionnement à garder */ + GtkWidget *station; /* Nouvelle concentration */ + GtkWidget *paned; /* Nouveau support */ + + orientation = toupper(orientation); + + /* Détermination de la localisation d'origine */ + + if (GTK_IS_PANED(parent)) + { + if (gtk_paned_get_child1(GTK_PANED(parent)) == child1 + || gtk_paned_get_child1(GTK_PANED(parent)) == child2) + { + index = 1; + resize = GTK_PANED(parent)->child1_resize; + } + else + { + index = 2; + resize = GTK_PANED(parent)->child2_resize; + } + } + else + { + index = -1; + resize = false; /* Pour gcc (Debian 4.4.5-8) 4.4.5 */ + } + + gtk_widget_ref(name1 == NULL ? child1 : child2); + + gtk_container_remove(GTK_CONTAINER(parent), child2); + + /* Enrobages éventuels */ + + if (!GTK_IS_DOCK_STATION(child1)) + { + station = gtk_dock_station_new(); + gtk_widget_show(station); + gtk_dock_panel_add_widget(GTK_DOCK_STATION(station), child1, name1); + + child1 = station; + + } + + if (!GTK_IS_DOCK_STATION(child2)) + { + station = gtk_dock_station_new(); + gtk_widget_show(station); + gtk_dock_panel_add_widget(GTK_DOCK_STATION(station), child2, name2); + + child2 = station; + + } + + /* Insertion complète */ + + if (orientation == 'N' || orientation == 'S') + paned = gtk_vpaned_new(); + else + paned = gtk_hpaned_new(); + + gtk_widget_show(paned); + + switch (index) + { + case 1: + gtk_paned_pack1(GTK_PANED(parent), paned, resize, FALSE); + break; + case 2: + gtk_paned_pack2(GTK_PANED(parent), paned, resize, FALSE); + break; + default: + gtk_container_add(GTK_CONTAINER(parent), paned); + break; + } + + switch (orientation) + { + case 'N': + break; + case 'E': + gtk_paned_pack1(GTK_PANED(paned), child1, TRUE, FALSE); + gtk_paned_pack2(GTK_PANED(paned), child2, FALSE, FALSE); + gtk_paned_set_position(GTK_PANED(paned), 450); + break; + case 'S': + gtk_paned_pack1(GTK_PANED(paned), child1, TRUE, FALSE); + gtk_paned_pack2(GTK_PANED(paned), child2, FALSE, FALSE); + gtk_paned_set_position(GTK_PANED(paned), 350); + break; + case 'W': + break; + } + +} + + +/****************************************************************************** +* * +* Paramètres : base = départ courant de la déscente. * +* item = composant à présenter à l'affichage. * +* path = chemin à consulter pour le placement idéal. * +* pos = position de la tête de lecture dans le chemin. * +* * +* Description : Place un panneau dans l'ensemble affiché. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void _g_panel_item_dock(GtkWidget *base, GEditorItem *item, const char *path, size_t pos) +{ + GtkWidget *part; /* Support principal détecté */ + GtkWidget *widget; /* Autre composant présent */ + GPanelItem *other; /* Autre version de l'instance */ + char path_i; /* Partie de chemin à insérer */ + char path_o; /* Partie de chemin en place */ + GtkWidget *parent; /* Support supérieur */ + char sel_path; /* Chemin à appliquer */ + + + //printf(" ============== PATH :: '%c' =======================\n", path[pos]); + + part = get_panel_given_part(base, pos, path[pos]); + + + //printf("-- trouve :: %p ( station ?= %d) ( base ?= %d)\n", part, GTK_IS_DOCK_STATION(part), GTK_IS_DOCK_STATION(base)); + + + if (GTK_IS_DOCK_STATION(part)) + { + + + path_i = g_panel_item_get_path_at(G_PANEL_ITEM(item), pos); + + widget = gtk_dock_panel_get_widget(GTK_DOCK_STATION(part), 0); + other = G_PANEL_ITEM(g_object_get_data(G_OBJECT(widget), "pitem")); + + path_o = g_panel_item_get_path_at(other, pos); + + //printf(" -- path -- '%c' vs '%c'\n", path_i, path_o); + + + if (path_i == path_o) + gtk_dock_panel_add_widget(GTK_DOCK_STATION(part), item->widget, item->name); + + else + { + /* On fait primer le chemin d'importance */ + if (path_i == 'M' || (isupper(path_o) && !isupper(path_i))) + sel_path = path_o; + else + sel_path = path_i; + + parent = gtk_widget_get_parent(base); + create_panel_division(parent, item->widget, item->name, base, NULL, sel_path); + } + + } + + else if (GTK_IS_PANED(part)) + { + + + + printf("Paf Paned !\n"); + exit(0); + + + } + + /* Si on n'a rien trouvé, alors on redivise */ + else /*if (part == NULL)*/ + { + if (!GTK_IS_DOCK_STATION(base)) + { + path_i = get_first_path_found(gtk_paned_get_child1(GTK_PANED(base)), pos); + path_o = get_first_path_found(gtk_paned_get_child2(GTK_PANED(base)), pos); + + if (path_i == 'M' || (isupper(path_o) && islower(path_i))) + base = gtk_paned_get_child1(GTK_PANED(base)); + else + base = gtk_paned_get_child2(GTK_PANED(base)); + + } + + path_i = g_panel_item_get_path_at(G_PANEL_ITEM(item), pos); + + widget = gtk_dock_panel_get_widget(GTK_DOCK_STATION(base), 0); + other = G_PANEL_ITEM(g_object_get_data(G_OBJECT(widget), "pitem")); + + path_o = g_panel_item_get_path_at(other, pos); + + /* On fait primer le chemin d'importance */ + if (path_i == 'M' || (islower(path_i) && isupper(path_o))) + sel_path = path_o; + else + sel_path = path_i; + + //printf(" ++>> DIR :: '%c' vs '%c' => '%c'\n", path[pos], path_o, sel_path); + + parent = gtk_widget_get_parent(base); + create_panel_division(parent, item->widget, item->name, base, NULL, sel_path); + + } + + + +} + + + +/* ---------------------------------------------------------------------------------- */ +/* PLACEMENTS DES DIFFERENTS PANNEAUX */ +/* ---------------------------------------------------------------------------------- */ + + +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Prépare le terrain pour l'affichage central. * +* * +* Retour : Composant de support sur lequel tout va se placer. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GtkWidget *init_panels2(void) +{ + GtkWidget *result; /* Support à retourner */ + + result = qck_create_padded_alignment(0, 0, 0, 0); + gtk_widget_show(result); + + _support = result; + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Charge les principaux panneaux de l'éditeur. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void load_main_panels(void) +{ + GPanelItem *item; /* Panneau de base à charger */ + + item = create_log_panel(); + g_panel_item_dock(item); + + item = create_symbols_panel(); + g_panel_item_dock(item); + +} diff --git a/src/gui/panels/panel.h b/src/gui/panels/panel.h new file mode 100644 index 0000000..afdce93 --- /dev/null +++ b/src/gui/panels/panel.h @@ -0,0 +1,73 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * panel.h - prototypes pour la gestion des éléments réactifs spécifiques aux panneaux + * + * Copyright (C) 2009-2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA 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 3 of the License, or + * (at your option) any later version. + * + * OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _GUI_PANELS_PANEL_H +#define _GUI_PANELS_PANEL_H + + +#include "../editem.h" + + + +#define G_TYPE_PANEL_ITEM g_panel_item_get_type() +#define G_PANEL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), g_panel_item_get_type(), GPanelItem)) +#define G_IS_PANEL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_panel_item_get_type())) +#define G_PANEL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_PANEL_ITEM, GPanelItemClass)) +#define G_IS_PANEL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_PANEL_ITEM)) +#define G_PANEL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_PANEL_ITEM, GPanelItemClass)) + + +/* Elément réactif pour panneaux de l'éditeur (instance) */ +typedef struct _GPanelItem GPanelItem; + +/* Elément réactif pour panneaux de l'éditeur (classe) */ +typedef struct _GPanelItemClass GPanelItemClass; + + +/* Indique le type défini pour un élément destiné à un panneau. */ +GType g_panel_item_get_type(void); + +/* Crée un élément de panneau réactif. */ +GEditorItem *g_panel_item_new(const char *, const char *, GtkWidget *, const char *); + +/* Recherche un panneau à partir de son nom court. */ +GPanelItem *g_panel_item_get(const char *); + +/* Place un panneau dans l'ensemble affiché. */ +void g_panel_item_dock(GPanelItem *); + + + +/* ----------------------- PLACEMENTS DES DIFFERENTS PANNEAUX ----------------------- */ + + +/* Prépare le terrain pour l'affichage central. */ +GtkWidget *init_panels2(void); + +/* Charge les principaux panneaux de l'éditeur. */ +void load_main_panels(void); + + + +#endif /* _GUI_PANELS_PANEL_H */ diff --git a/src/panels/symbols.c b/src/gui/panels/symbols.c index d54e05e..bac2152 100644 --- a/src/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * symbols.c - panneau d'affichage des symboles * - * Copyright (C) 2008-2010 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -29,13 +29,9 @@ #include "panel-int.h" -#include "../format/format.h" -#include "../gtkext/easygtk.h" -#include "../gtkext/support.h" - - - -#define _(str) str +#include "../../format/format.h" +#include "../../gtkext/easygtk.h" +#include "../../gtkext/support.h" @@ -45,12 +41,12 @@ /* Panneau d'aperçu de graphiques (instance) */ struct _GSymbolsPanel { - GEditorPanel parent; /* A laisser en premier */ + GPanelItem parent; /* A laisser en premier */ GtkTreeView *treeview; /* Composant d'affichage */ GtkTreeStore *store; /* Modèle de gestion */ - GtkViewPanel *view; /* Affichage à faire défiler */ + GOpenidaBinary *binary; /* Binaire à prendre en compte */ }; @@ -58,7 +54,7 @@ struct _GSymbolsPanel /* Panneau d'aperçu de graphiques (classe) */ struct _GSymbolsPanelClass { - GEditorPanelClass parent; /* A laisser en premier */ + GPanelItemClass parent; /* A laisser en premier */ }; @@ -88,7 +84,7 @@ static void g_symbols_panel_init(GSymbolsPanel *); static void on_symbols_selection_change(GtkTreeSelection *, GSymbolsPanel *); /* Réagit à un changement d'affichage principal de contenu. */ -static void reload_symbols_for_new_view(GSymbolsPanel *, GtkViewPanel *, bool); +void change_symbols_panel_current_binary(GSymbolsPanel *, GOpenidaBinary *); @@ -129,7 +125,7 @@ static void modify_types_in_symbols_tree_view(GtkToggleToolButton *, GObject *); /* Indique le type définit pour un panneau d'aperçu de graphiques. */ -G_DEFINE_TYPE(GSymbolsPanel, g_symbols_panel, G_TYPE_EDITOR_PANEL); +G_DEFINE_TYPE(GSymbolsPanel, g_symbols_panel, G_TYPE_PANEL_ITEM); /****************************************************************************** @@ -164,7 +160,7 @@ static void g_symbols_panel_class_init(GSymbolsPanelClass *klass) static void g_symbols_panel_init(GSymbolsPanel *panel) { - GEditorPanel *base; /* Version basique d'instance */ + GEditorItem *base; /* Version basique d'instance */ GObject *ref; /* Espace de référencement */ GtkTooltips *tooltips; /* Affichage des bulles d'aide */ GtkWidget *toolbar; /* Barre d'outils */ @@ -176,10 +172,7 @@ static void g_symbols_panel_init(GSymbolsPanel *panel) GtkTreeViewColumn *column; /* Colonne de la liste */ GtkTreeSelection *select; /* Sélection dans la liste */ - base = G_EDITOR_PANEL(panel); - - base->name = _("Symbols"); - base->reload_view = (reload_for_new_view_fc)reload_symbols_for_new_view; + base = G_EDITOR_ITEM(panel); base->widget = gtk_vbox_new(FALSE, 0); gtk_widget_show(base->widget); @@ -292,7 +285,7 @@ static void g_symbols_panel_init(GSymbolsPanel *panel) * * * Paramètres : - * * * -* Description : Crée un panneau d'aperçu de graphiques. * +* Description : Crée un panneau d'affichage des symboles. * * * * Retour : Adresse de la structure mise en place. * * * @@ -300,13 +293,43 @@ static void g_symbols_panel_init(GSymbolsPanel *panel) * * ******************************************************************************/ -GEditorPanel *g_symbols_panel_new(void) +GEditorItem *g_symbols_panel_new(void) { - GEditorPanel *result; /* Structure à retourner */ + GEditorItem *result; /* Structure à retourner */ result = g_object_new(G_TYPE_SYMBOLS_PANEL, NULL); - return G_EDITOR_PANEL(result); + g_panel_item_init_ext(G_PANEL_ITEM(result), PANEL_SYMBOL_ID, _("Binary symbols"), + G_EDITOR_ITEM(result)->widget, "e"); + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Construit et intègre un panneau d'affichage des symboles. * +* * +* Retour : Adresse du panneau mis en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GPanelItem *create_symbols_panel(void) +{ + GEditorItem *result; /* Elément réactif à renvoyer */ + + result = g_symbols_panel_new(); + + /* Enregistre correctement le tout */ + result->update_binary = (update_item_binary_fc)change_symbols_panel_current_binary; + register_editor_item(result); + + return G_PANEL_ITEM(result); } @@ -347,9 +370,8 @@ static void on_symbols_selection_change(GtkTreeSelection *selection, GSymbolsPan /****************************************************************************** * * -* Paramètres : panel = panneau à mettre à jour. * -* view = nouvelle visualisation de désassemblage. * -* same = changement de binaire ou de vue ? * +* Paramètres : panel = panneau à mettre à jour. * +* binary = nouvelle instance de binaire analysé. * * * * Description : Réagit à un changement d'affichage principal de contenu. * * * @@ -359,21 +381,19 @@ static void on_symbols_selection_change(GtkTreeSelection *selection, GSymbolsPan * * ******************************************************************************/ -static void reload_symbols_for_new_view(GSymbolsPanel *panel, GtkViewPanel *view, bool same) +void change_symbols_panel_current_binary(GSymbolsPanel *panel, GOpenidaBinary *binary) { GtkToggleToolButton *button; /* Mode de représentation */ - if (panel->view != NULL) - g_object_unref(G_OBJECT(panel->view)); - - panel->view = view; - g_object_ref(G_OBJECT(view)); + if (panel->binary != NULL) + g_object_unref(G_OBJECT(panel->binary)); - if (same) return; + panel->binary = binary; + g_object_ref(G_OBJECT(binary)); gtk_tree_store_clear(panel->store); - button = g_object_get_data(G_OBJECT(G_EDITOR_PANEL(panel)->widget), "list"); + button = g_object_get_data(G_OBJECT(G_EDITOR_ITEM(panel)->widget), "list"); if (gtk_toggle_tool_button_get_active(button)) reload_symbols_for_new_list_view(panel); @@ -403,7 +423,6 @@ static void reload_symbols_for_new_view(GSymbolsPanel *panel, GtkViewPanel *view static void reload_symbols_for_new_list_view(GSymbolsPanel *panel) { - GOpenidaBinary *binary; /* Binaire en cours d'édition */ GExeFormat *format; /* Format associé au binaire */ GBinRoutine **routines; /* Liste des routines trouvées */ size_t routines_count; /* Nombre de ces routines */ @@ -413,11 +432,10 @@ static void reload_symbols_for_new_list_view(GSymbolsPanel *panel) char tmp[VMPA_MAX_SIZE]; /* Version humainement lisible */ GtkTreeIter iter; /* Point d'insertion */ - binary = gtk_view_panel_get_binary(panel->view); - format = g_openida_binary_get_format(binary); + format = g_openida_binary_get_format(panel->binary); routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count); - qsort(routines, routines_count, sizeof(GBinRoutine *), g_binary_routine_rcompare); + qsort(routines, routines_count, sizeof(GBinRoutine *), (__compar_fn_t)g_binary_routine_rcompare); if (routines != NULL) { @@ -554,7 +572,6 @@ static bool find_parent_for_routine(GtkTreeStore *store, const GBinRoutine *rout static void reload_symbols_for_new_tree_view(GSymbolsPanel *panel) { - GOpenidaBinary *binary; /* Binaire en cours d'édition */ GExeFormat *format; /* Format associé au binaire */ GBinRoutine **routines; /* Liste des routines trouvées */ size_t routines_count; /* Nombre de ces routines */ @@ -568,11 +585,10 @@ static void reload_symbols_for_new_tree_view(GSymbolsPanel *panel) GtkTreeIter iter; /* Point d'insertion */ GdkPixbuf *pixbuf; /* Icone pour l'élément inséré */ - binary = gtk_view_panel_get_binary(panel->view); - format = g_openida_binary_get_format(binary); + format = g_openida_binary_get_format(panel->binary); routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count); - qsort(routines, routines_count, sizeof(GBinRoutine *), g_binary_routine_rcompare); + qsort(routines, routines_count, sizeof(GBinRoutine *), (__compar_fn_t)g_binary_routine_rcompare); if (routines != NULL) { @@ -580,7 +596,7 @@ static void reload_symbols_for_new_tree_view(GSymbolsPanel *panel) options = 0; - button = g_object_get_data(G_OBJECT(G_EDITOR_PANEL(panel)->widget), "namespace"); + button = g_object_get_data(G_OBJECT(G_EDITOR_ITEM(panel)->widget), "namespace"); if (gtk_toggle_tool_button_get_active(button)) options |= RSO_LONG_TYPE; @@ -713,6 +729,6 @@ static void modify_types_in_symbols_tree_view(GtkToggleToolButton *button, GObje panel = (GSymbolsPanel *)g_object_get_data(ref, "panel"); - reload_symbols_for_new_view(panel, panel->view, false); + change_symbols_panel_current_binary(panel, panel->binary); } diff --git a/src/panels/symbols.h b/src/gui/panels/symbols.h index d9f8b38..72801d8 100644 --- a/src/panels/symbols.h +++ b/src/gui/panels/symbols.h @@ -1,8 +1,8 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * pan_symbols.h - prototypes pour le panneau d'affichage des symboles + * symbols.h - prototypes pour le panneau d'affichage des symboles * - * Copyright (C) 2008-2010 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -22,17 +22,20 @@ */ -#ifndef _PAN_SYMBOLS_H -#define _PAN_SYMBOLS_H +#ifndef _GUI_PANELS_SYMBOLS_H +#define _GUI_PANELS_SYMBOLS_H -#include <glib-object.h> +#include <i18n.h> #include "panel.h" +#define PANEL_SYMBOL_ID _("Symboles") + + #define G_TYPE_SYMBOLS_PANEL g_symbols_panel_get_type() #define G_SYMBOLS_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), g_symbols_panel_get_type(), GSymbolsPanel)) #define G_IS_SYMBOLS_PANEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_symbols_panel_get_type())) @@ -52,8 +55,11 @@ typedef struct _GSymbolsPanelClass GSymbolsPanelClass; GType g_symbols_panel_get_type(void); /* Crée un panneau d'affichage des symboles. */ -GEditorPanel *g_symbols_panel_new(void); +GEditorItem *g_symbols_panel_new(void); + +/* Construit et intègre un panneau d'affichage des symboles. */ +GPanelItem *create_symbols_panel(void); -#endif /* _PAN_SYMBOLS_H */ +#endif /* _GUI_PANELS_SYMBOLS_H */ diff --git a/src/panels/Makefile.am b/src/panels/Makefile.am index 0db863a..4d24b93 100755 --- a/src/panels/Makefile.am +++ b/src/panels/Makefile.am @@ -4,12 +4,10 @@ noinst_LTLIBRARIES = libpanels.la libpanels_la_SOURCES = \ breaks.h breaks.c \ glimpse.h glimpse.c \ - log.h log.c \ panel-int.h \ panel.h panel.c \ registers.h registers.c \ - strings.h strings.c \ - symbols.h symbols.c + strings.h strings.c libpanels_la_LDFLAGS = diff --git a/src/panels/panel.c b/src/panels/panel.c index 53fab8f..5922fe5 100644 --- a/src/panels/panel.c +++ b/src/panels/panel.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * panels.h - gestion des différents panneaux * - * Copyright (C) 2009-2010 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -28,7 +28,6 @@ #include "breaks.h" #include "glimpse.h" #include "panel-int.h" -#include "symbols.h" #include "../gtkext/gtkdockpanel.h" @@ -147,8 +146,8 @@ void init_internal_panels(void) panel = g_breaks_panel_new(); panels_list_add_tail(panel, &panels_list); - panel = g_symbols_panel_new(); - panels_list_add_tail(panel, &panels_list); + //panel = g_symbols_panel_new(); + //panels_list_add_tail(panel, &panels_list); panel = g_glimpse_panel_new(); panels_list_add_tail(panel, &panels_list); @@ -234,7 +233,6 @@ void notify_panels_of_view_change(GtkViewPanel *panel, bool same) -#include "log.h" #include "registers.h" #include "strings.h" @@ -258,7 +256,7 @@ static GtkWidget *panel_list[PNT_COUNT]; void init_panels(GObject *ref) { - panel_list[PNT_LOG] = build_log_panel(); + //panel_list[PNT_LOG] = build_log_panel(); panel_list[PNT_REGISTERS] = build_registers_panel(); panel_list[PNT_STRINGS] = build_strings_panel(ref); diff --git a/src/project.c b/src/project.c index 85368c6..652721b 100644 --- a/src/project.c +++ b/src/project.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * project.c - gestion d'un groupe de fichiers binaires * - * Copyright (C) 2008-2011 Cyrille Bagard + * Copyright (C) 2008-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -36,6 +36,7 @@ #include "gtkext/gtkgraphview.h" #include "gtkext/gtksourceview.h" #include "gtkext/gtkviewpanel.h" +#include "gui/panels/panel.h" #include "panels/panel.h" @@ -500,9 +501,9 @@ void detach_binary_to_openida_project(openida_project *project, GOpenidaBinary * size_t i; /* Boucle de parcours */ dpanel = GTK_DOCK_PANEL(g_object_get_data(project->ref, "binpanel")); - ditem = gtk_dock_panel_get_item_from_binary(project, binary); + //ditem = gtk_dock_panel_get_item_from_binary(project, binary); FIXME !! - gtk_dock_panel_remove_item(dpanel, ditem); + //gtk_dock_panel_remove_item(dpanel, ditem); for (i = 0; i < project->binaries_count; i++) if (project->binaries[i]->binary == binary) break; @@ -840,7 +841,7 @@ void display_new_binary_of_openida_project(GOpenidaBinary *binary, openida_proje GtkDockPanel *dpanel; /* Support de panneaux */ GtkWidget *view; /* Affichage du code binaire */ char *title; /* Titre associé au binaire */ - GDockItem *ditem; /* Panneau avec ses infos. */ + GEditorItem *item; /* Panneau avec ses infos. */ index = attach_binary_to_openida_project(project, binary); @@ -852,9 +853,8 @@ void display_new_binary_of_openida_project(GOpenidaBinary *binary, openida_proje gdk_threads_enter(); - ditem = g_dock_item_new(strrchr(title, '/') + 1, view); - g_dock_item_set_desc(ditem, title); - gtk_dock_panel_add_item(dpanel, ditem); + item = g_panel_item_new(strrchr(title, G_DIR_SEPARATOR) + 1, title, view, "M"); + g_panel_item_dock(G_PANEL_ITEM(item)); gdk_flush (); gdk_threads_leave(); |