summaryrefslogtreecommitdiff
path: root/plugins/pychrysa/gtkext
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/pychrysa/gtkext')
-rw-r--r--plugins/pychrysa/gtkext/Makefile.am1
-rw-r--r--plugins/pychrysa/gtkext/blockdisplay.c15
-rw-r--r--plugins/pychrysa/gtkext/bufferdisplay.c15
-rw-r--r--plugins/pychrysa/gtkext/displaypanel.c35
-rw-r--r--plugins/pychrysa/gtkext/dockable.c102
-rw-r--r--plugins/pychrysa/gtkext/dockable.h42
-rw-r--r--plugins/pychrysa/gtkext/module.c2
7 files changed, 201 insertions, 11 deletions
diff --git a/plugins/pychrysa/gtkext/Makefile.am b/plugins/pychrysa/gtkext/Makefile.am
index fee2032..4a36e63 100644
--- a/plugins/pychrysa/gtkext/Makefile.am
+++ b/plugins/pychrysa/gtkext/Makefile.am
@@ -5,6 +5,7 @@ libpychrysagtkext_la_SOURCES = \
blockdisplay.h blockdisplay.c \
bufferdisplay.h bufferdisplay.c \
displaypanel.h displaypanel.c \
+ dockable.h dockable.c \
module.h module.c
diff --git a/plugins/pychrysa/gtkext/blockdisplay.c b/plugins/pychrysa/gtkext/blockdisplay.c
index 06f14d8..a329daf 100644
--- a/plugins/pychrysa/gtkext/blockdisplay.c
+++ b/plugins/pychrysa/gtkext/blockdisplay.c
@@ -25,6 +25,7 @@
#include "blockdisplay.h"
+#include <string.h>
#include <pygobject.h>
@@ -65,7 +66,7 @@ PyTypeObject *get_python_block_display_type(void)
.tp_name = "pychrysalide.gtkext.BlockDisplay",
.tp_basicsize = sizeof(PyGObject),
- .tp_flags = Py_TPFLAGS_DEFAULT,
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE,
.tp_doc = "PyChrysalide block display.",
@@ -74,7 +75,17 @@ PyTypeObject *get_python_block_display_type(void)
};
- return &py_block_display_type;
+ static PyTypeObject *result = NULL;
+
+ if (result == NULL)
+ {
+ result = calloc(1, sizeof(PyTypeObject));
+
+ memcpy(result, &py_block_display_type, sizeof(PyTypeObject));
+
+ }
+
+ return result;
}
diff --git a/plugins/pychrysa/gtkext/bufferdisplay.c b/plugins/pychrysa/gtkext/bufferdisplay.c
index 7cc82ff..a6e5327 100644
--- a/plugins/pychrysa/gtkext/bufferdisplay.c
+++ b/plugins/pychrysa/gtkext/bufferdisplay.c
@@ -25,6 +25,7 @@
#include "bufferdisplay.h"
+#include <string.h>
#include <pygobject.h>
@@ -65,7 +66,7 @@ PyTypeObject *get_python_buffer_display_type(void)
.tp_name = "pychrysalide.gtkext.BufferDisplay",
.tp_basicsize = sizeof(PyGObject),
- .tp_flags = Py_TPFLAGS_DEFAULT,
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE,
.tp_doc = "PyChrysalide buffer display.",
@@ -74,7 +75,17 @@ PyTypeObject *get_python_buffer_display_type(void)
};
- return &py_buffer_display_type;
+ static PyTypeObject *result = NULL;
+
+ if (result == NULL)
+ {
+ result = calloc(1, sizeof(PyTypeObject));
+
+ memcpy(result, &py_buffer_display_type, sizeof(PyTypeObject));
+
+ }
+
+ return result;
}
diff --git a/plugins/pychrysa/gtkext/displaypanel.c b/plugins/pychrysa/gtkext/displaypanel.c
index d085f4f..e857475 100644
--- a/plugins/pychrysa/gtkext/displaypanel.c
+++ b/plugins/pychrysa/gtkext/displaypanel.c
@@ -25,6 +25,7 @@
#include "displaypanel.h"
+#include <string.h>
#include <pygobject.h>
@@ -196,7 +197,7 @@ PyTypeObject *get_python_display_panel_type(void)
.tp_name = "pychrysalide.gtkext.DisplayPanel",
.tp_basicsize = sizeof(PyGObject),
- .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE,
.tp_doc = "PyChrysalide view panel.",
@@ -207,7 +208,17 @@ PyTypeObject *get_python_display_panel_type(void)
};
- return &py_display_panel_type;
+ static PyTypeObject *result = NULL;
+
+ if (result == NULL)
+ {
+ result = calloc(1, sizeof(PyTypeObject));
+
+ memcpy(result, &py_display_panel_type, sizeof(PyTypeObject));
+
+ }
+
+ return result;
}
@@ -226,27 +237,37 @@ PyTypeObject *get_python_display_panel_type(void)
bool register_python_display_panel(PyObject *module)
{
+ bool result; /* Bilan à retourner */
PyTypeObject *py_display_panel_type; /* Type Python 'DisplayPanel' */
PyObject *parent_mod; /* Module Python Fixed */
PyObject *fixed; /* Module "GtkFixed" */
PyObject *dict; /* Dictionnaire du module */
+ result = false;
+
py_display_panel_type = get_python_display_panel_type();
parent_mod = PyImport_ImportModule("gi.repository.Gtk");
if (parent_mod == NULL) return false;
fixed = PyObject_GetAttrString(parent_mod, "Fixed");
+
Py_DECREF(parent_mod);
dict = PyModule_GetDict(module);
- if (!register_class_for_pygobject(dict, GTK_TYPE_DISPLAY_PANEL, py_display_panel_type, (PyTypeObject *)fixed))
- return false;
+ result = register_class_for_pygobject(dict, GTK_TYPE_DISPLAY_PANEL,
+ py_display_panel_type, (PyTypeObject *)fixed);
+
+ Py_DECREF(fixed);
- if (!py_display_panel_define_constants(py_display_panel_type))
- return false;
+ if (!result)
+ goto rpdp_exit;
- return true;
+ result = py_display_panel_define_constants(py_display_panel_type);
+
+ rpdp_exit:
+
+ return result;
}
diff --git a/plugins/pychrysa/gtkext/dockable.c b/plugins/pychrysa/gtkext/dockable.c
new file mode 100644
index 0000000..9c66159
--- /dev/null
+++ b/plugins/pychrysa/gtkext/dockable.c
@@ -0,0 +1,102 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * dockable.c - équivalent Python du fichier "gtkext/gtkdockable.c"
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * Chrysalide 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.
+ *
+ * Chrysalide 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 "dockable.h"
+
+
+#include <pygobject.h>
+
+
+#include <gtkext/gtkdockable.h>
+
+
+
+/******************************************************************************
+* *
+* Paramètres : - *
+* *
+* Description : Fournit un accès à une définition de type à diffuser. *
+* *
+* Retour : Définition d'objet pour Python. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+PyTypeObject *get_python_gtk_dockable_type(void)
+{
+ static PyMethodDef py_gtk_dockable_methods[] = {
+ { NULL }
+ };
+
+ static PyGetSetDef py_gtk_dockable_getseters[] = {
+ { NULL }
+ };
+
+ static PyTypeObject py_gtk_dockable_type = {
+
+ PyVarObject_HEAD_INIT(NULL, 0)
+
+ .tp_name = "pychrysalide.gtkext.GtkDockable",
+ //.tp_basicsize = sizeof(PyGObject),
+
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+ .tp_doc = "PyChrysalide interface for Gtk dockable widgets",
+
+ .tp_methods = py_gtk_dockable_methods,
+ .tp_getset = py_gtk_dockable_getseters,
+
+ };
+
+ return &py_gtk_dockable_type;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : module = module dont la définition est à compléter. *
+* *
+* Description : Prend en charge l'objet 'pychrysalide.gtkext.GtkDockable'. *
+* *
+* Retour : Bilan de l'opération. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool register_python_gtk_dockable(PyObject *module)
+{
+ PyTypeObject *py_gtk_dockable_type; /* Type Python 'LineGenerator' */
+ PyObject *dict; /* Dictionnaire du module */
+
+ py_gtk_dockable_type = get_python_gtk_dockable_type();
+
+ dict = PyModule_GetDict(module);
+ pyg_register_interface(dict, "LineGenerator", GTK_TYPE_DOCKABLE, py_gtk_dockable_type);
+
+ return true;
+
+}
diff --git a/plugins/pychrysa/gtkext/dockable.h b/plugins/pychrysa/gtkext/dockable.h
new file mode 100644
index 0000000..1709966
--- /dev/null
+++ b/plugins/pychrysa/gtkext/dockable.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * dockable.h - prototypes pour l'équivalent Python du fichier "gtkext/gtkdockable.h"
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * Chrysalide 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.
+ *
+ * Chrysalide 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_DOCKABLE_H
+#define _PLUGINS_PYCHRYSA_GTKEXT_DOCKABLE_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_gtk_dockable_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.gtkext.GtkDockable'. */
+bool register_python_gtk_dockable(PyObject *);
+
+
+
+#endif /* _PLUGINS_PYCHRYSA_GTKEXT_DOCKABLE_H */
diff --git a/plugins/pychrysa/gtkext/module.c b/plugins/pychrysa/gtkext/module.c
index 00720bb..8b2cc5e 100644
--- a/plugins/pychrysa/gtkext/module.c
+++ b/plugins/pychrysa/gtkext/module.c
@@ -31,6 +31,7 @@
#include "blockdisplay.h"
#include "bufferdisplay.h"
#include "displaypanel.h"
+#include "dockable.h"
@@ -83,6 +84,7 @@ bool add_gtkext_module_to_python_module(PyObject *super)
result &= register_python_display_panel(module);
result &= register_python_buffer_display(module);
result &= register_python_block_display(module);
+ result &= register_python_gtk_dockable(module);
agmtpm_exit: