Created Python objects for the GtkBlockView widgets and fixed some bugs.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@311 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

4 files changed, 199 insertions, 1 deletions

diff --git a/plugins/pychrysa/gtkext/Makefile.am b/plugins/pychrysa/gtkext/Makefile.am
index 79cece8..967c2ed 100644
--- a/plugins/pychrysa/gtkext/Makefile.am
+++ b/plugins/pychrysa/gtkext/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libpychrysagtkext.la
 
 libpychrysagtkext_la_SOURCES =			\
+	blockview.h blockview.c				\
 	viewpanel.h viewpanel.c				\
 	module.h module.c
 
diff --git a/plugins/pychrysa/gtkext/blockview.c b/plugins/pychrysa/gtkext/blockview.c
new file mode 100644
index 0000000..70e61e6
--- /dev/null
+++ b/plugins/pychrysa/gtkext/blockview.c
@@ -0,0 +1,156 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * blockview.c - prototypes pour l'équivalent Python du fichier "gtkext/gtkblockview.c"
+ *
+ * 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
+ */
+
+
+#include "blockview.h"
+
+
+#include <pygobject.h>
+
+
+#include <gtkext/gtkblockview.h>
+
+
+#include "../quirks.h"
+
+
+
+/* Crée un nouvel objet Python de type 'ViewPanel'. */
+static PyObject *py_block_view_new(PyTypeObject *, PyObject *, PyObject *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : type = type de l'objet à instancier.                         *
+*                args = arguments fournis à l'appel.                          *
+*                kwds = arguments de type key=val fournis.                    *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'ViewPanel'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_block_view_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+#if 0
+    PyObject *result;                       /* Instance à retourner        */
+    const char *name;                       /* Désignation humaine         */
+    const char *lname;                      /* Nom version longue          */
+    PyGObject *widget;                      /* Composant visuel du panneau */
+    const char *path;                       /* Placement à l'affichage     */
+    int ret;                                /* Bilan de lecture des args.  */
+    GEditorItem *item;                      /* Version GLib du format      */
+
+    ret = PyArg_ParseTuple(args, "ssOs", &name, &lname, &widget, &path);
+    if (!ret) Py_RETURN_NONE;
+
+    item = g_block_view_new(get_internal_ref(), name, lname,
+                            GTK_WIDGET(pygobject_get(widget)), path);
+
+    result = py_block_view_from_c(G_BLOCK_VIEW(item));
+    g_object_unref(item);
+
+    return (PyObject *)result;
+#endif
+
+    /* FIXME */
+
+
+    Py_RETURN_NONE;
+
+}
+
+
+
+
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.gtkext.BlockView'.     *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_block_view(PyObject *module)
+{
+    PyObject *parent_mod;                   /* Module Python-EditorItem    */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_block_view_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_block_view_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_block_view_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.gtkext.BlockView",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide view panel",
+
+        .tp_methods     = py_block_view_methods,
+        .tp_getset      = py_block_view_getseters,
+        .tp_new         = (newfunc)py_block_view_new,
+        .tp_init        = (initproc)pychrysalide_allow_args_for_gobjects
+
+    };
+
+    parent_mod = PyImport_ImportModule("pychrysalide.gtkext");
+    if (parent_mod == NULL) return false;
+
+    py_block_view_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "ViewPanel");
+    Py_DECREF(parent_mod);
+
+    if (PyType_Ready(&py_block_view_type) < 0)
+        return false;
+
+    Py_INCREF(&py_block_view_type);
+    ret = PyModule_AddObject(module, "BlockView", (PyObject *)&py_block_view_type);
+
+    pygobject_register_class(module, "GtkBlockView", GTK_TYPE_BLOCK_VIEW, &py_block_view_type,
+                             Py_BuildValue("(O)", py_block_view_type.tp_base));
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/gtkext/blockview.h b/plugins/pychrysa/gtkext/blockview.h
new file mode 100644
index 0000000..c45b4bc
--- /dev/null
+++ b/plugins/pychrysa/gtkext/blockview.h
@@ -0,0 +1,39 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * blockview.h - prototypes pour l'équivalent Python du fichier "gtkext/gtkblockview.h"
+ *
+ * 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 _PLUGINS_PYCHRYSA_GTKEXT_MODULE_BLOCK_VIEW_H
+#define _PLUGINS_PYCHRYSA_GTKEXT_MODULE_BLOCK_VIEW_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Prend en charge l'objet 'pychrysalide.gtkext.BlockView'. */
+bool register_python_block_view(PyObject *module);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_GTKEXT_MODULE_BLOCK_VIEW_H */
diff --git a/plugins/pychrysa/gtkext/module.c b/plugins/pychrysa/gtkext/module.c
index fb17633..744f1b1 100644
--- a/plugins/pychrysa/gtkext/module.c
+++ b/plugins/pychrysa/gtkext/module.c
@@ -25,6 +25,7 @@
 #include "module.h"
 
 
+#include "blockview.h"
 #include "viewpanel.h"
 
 
@@ -57,9 +58,10 @@ bool add_gtkext_module_to_python_module(PyObject *super)
     Py_INCREF(module);
     ret = PyModule_AddObject(super, "pychrysalide.gtkext", module);
 
-    result = (ret != 0);
+    result = (ret == 0);
 
     result &= register_python_view_panel(module);
+    result &= register_python_block_view(module);
 
     return result;