From 388f74a56d1c9f5cae06c1e475092d08e6f5d8a7 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 10 Sep 2008 18:29:19 +0200 Subject: [PATCH] Add a SugarGrid object to replace the numpy implementation. Part of the fix for #8394 --- src/sugar/Makefile.am | 3 +- src/sugar/_sugarext.defs | 46 ++++++++++++++ src/sugar/_sugarext.override | 1 + src/sugar/_sugarextmodule.c | 10 +-- src/sugar/sugar-grid.c | 120 +++++++++++++++++++++++++++++++++++ src/sugar/sugar-grid.h | 63 ++++++++++++++++++ 6 files changed, 238 insertions(+), 5 deletions(-) create mode 100644 src/sugar/sugar-grid.c create mode 100644 src/sugar/sugar-grid.h diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am index 5cc58d1f..06500f7c 100644 --- a/src/sugar/Makefile.am +++ b/src/sugar/Makefile.am @@ -46,6 +46,8 @@ _sugarext_la_SOURCES = \ sexy-icon-entry.c \ sugar-address-entry.c \ sugar-address-entry.h \ + sugar-grid.c \ + sugar-grid.h \ sugar-key-grabber.c \ sugar-key-grabber.h \ sugar-menu.h \ @@ -63,7 +65,6 @@ _sugarext.c: _sugarext.defs _sugarext.override .defs.c: (cd $(srcdir)\ && $(PYGTK_CODEGEN) \ - --register $(PYGTK_DEFSDIR)/gdk-types.defs \ --register $(PYGTK_DEFSDIR)/gdk-types.defs \ --register $(PYGTK_DEFSDIR)/gtk-types.defs \ --override $*.override \ diff --git a/src/sugar/_sugarext.defs b/src/sugar/_sugarext.defs index 72ff7af4..bd9f0524 100644 --- a/src/sugar/_sugarext.defs +++ b/src/sugar/_sugarext.defs @@ -22,6 +22,13 @@ (gtype-id "SUGAR_TYPE_MENU") ) +(define-object Grid + (in-module "Sugar") + (parent "GObject") + (c-name "SugarGrid") + (gtype-id "SUGAR_TYPE_GRID") +) + (define-object Preview (in-module "Sugar") (parent "GObject") @@ -95,6 +102,45 @@ (return-type "none") ) +;; From sugar-grid.h + +(define-method setup + (of-object "SugarGrid") + (c-name "sugar_grid_setup") + (return-type "none") + (parameters + '("gint" "width") + '("gint" "height") + ) +) + +(define-method add_weight + (of-object "SugarGrid") + (c-name "sugar_grid_add_weight") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + +(define-method remove_weight + (of-object "SugarGrid") + (c-name "sugar_grid_remove_weight") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + +(define-method compute_weight + (of-object "SugarGrid") + (c-name "sugar_grid_compute_weight") + (return-type "guint") + (parameters + '("GdkRectangle*" "rect") + ) +) + ;; From sugar-key-grabber.h (define-function sugar_key_grabber_get_type diff --git a/src/sugar/_sugarext.override b/src/sugar/_sugarext.override index a68564a3..cd5b2119 100644 --- a/src/sugar/_sugarext.override +++ b/src/sugar/_sugarext.override @@ -5,6 +5,7 @@ headers #include "pygobject.h" #include "sugar-address-entry.h" +#include "sugar-grid.h" #include "sugar-key-grabber.h" #include "sugar-menu.h" #include "sugar-preview.h" diff --git a/src/sugar/_sugarextmodule.c b/src/sugar/_sugarextmodule.c index 6f6af6da..1bb8545f 100644 --- a/src/sugar/_sugarextmodule.c +++ b/src/sugar/_sugarextmodule.c @@ -23,6 +23,7 @@ /* include this first, before NO_IMPORT_PYGOBJECT is defined */ #include +#include extern PyMethodDef py_sugarext_functions[]; @@ -34,12 +35,13 @@ init_sugarext(void) { PyObject *m, *d; - init_pygobject (); + init_pygobject(); + init_pygtk(); - m = Py_InitModule ("_sugarext", py_sugarext_functions); - d = PyModule_GetDict (m); + m = Py_InitModule("_sugarext", py_sugarext_functions); + d = PyModule_GetDict(m); - py_sugarext_register_classes (d); + py_sugarext_register_classes(d); py_sugarext_add_constants(m, "SEXY_"); if (PyErr_Occurred ()) { diff --git a/src/sugar/sugar-grid.c b/src/sugar/sugar-grid.c new file mode 100644 index 00000000..563d08ac --- /dev/null +++ b/src/sugar/sugar-grid.c @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2008, Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "sugar-grid.h" + +static void sugar_grid_class_init (SugarGridClass *grid_class); +static void sugar_grid_init (SugarGrid *grid); + + +G_DEFINE_TYPE(SugarGrid, sugar_grid, G_TYPE_OBJECT) + +void +sugar_grid_setup(SugarGrid *grid, gint width, gint height) +{ + g_free(grid->weights); + + grid->weights = g_new0(guchar, width * height); + grid->width = width; + grid->height = height; +} + +static gboolean +check_bounds(SugarGrid *grid, GdkRectangle *rect) +{ + return (grid->weights != NULL && + grid->width >= rect->x + rect->width && + grid->height >= rect->y + rect->height); +} + +void +sugar_grid_add_weight(SugarGrid *grid, GdkRectangle *rect) +{ + int i, k; + + if (!check_bounds(grid, rect)) { + g_warning("Trying to add weight outside the grid bounds."); + return; + } + + for (k = rect->y; k < rect->y + rect->height; k++) { + for (i = rect->x; i < rect->x + rect->width; i++) { + grid->weights[i + k * rect->width] += 1; + } + } +} + +void +sugar_grid_remove_weight(SugarGrid *grid, GdkRectangle *rect) +{ + int i, k; + + if (!check_bounds(grid, rect)) { + g_warning("Trying to remove weight outside the grid bounds."); + return; + } + + for (k = rect->y; k < rect->y + rect->height; k++) { + for (i = rect->x; i < rect->x + rect->width; i++) { + grid->weights[i + k * rect->width] -= 1; + } + } +} + +guint +sugar_grid_compute_weight(SugarGrid *grid, GdkRectangle *rect) +{ + int i, k, sum = 0; + + if (!check_bounds(grid, rect)) { + g_warning("Trying to compute weight outside the grid bounds."); + return 0; + } + + for (k = rect->y; k < rect->y + rect->height; k++) { + for (i = rect->x; i < rect->x + rect->width; i++) { + sum += grid->weights[i + k * rect->width]; + } + } + + return sum; +} + +static void +sugar_grid_finalize(GObject *object) +{ + SugarGrid *grid = SUGAR_GRID(object); + + g_free(grid->weights); +} + +static void +sugar_grid_class_init(SugarGridClass *grid_class) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS(grid_class); + gobject_class->finalize = sugar_grid_finalize; +} + +static void +sugar_grid_init(SugarGrid *grid) +{ + grid->weights = NULL; +} diff --git a/src/sugar/sugar-grid.h b/src/sugar/sugar-grid.h new file mode 100644 index 00000000..d493a60b --- /dev/null +++ b/src/sugar/sugar-grid.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2008, Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SUGAR_GRID_H__ +#define __SUGAR_GRID_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _SugarGrid SugarGrid; +typedef struct _SugarGridClass SugarGridClass; + +#define SUGAR_TYPE_GRID (sugar_grid_get_type()) +#define SUGAR_GRID(object) (G_TYPE_CHECK_INSTANCE_CAST((object), SUGAR_TYPE_GRID, SugarGrid)) +#define SUGAR_GRID_CLASS(klass) (G_TYPE_CHACK_CLASS_CAST((klass), SUGAR_TYPE_GRID, SugarGridClass)) +#define SUGAR_IS_GRID(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), SUGAR_TYPE_GRID)) +#define SUGAR_IS_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SUGAR_TYPE_GRID)) +#define SUGAR_GRID_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_GRID, SugarGridClass)) + +struct _SugarGrid { + GObject base_instance; + + gint width; + gint height; + guchar *weights; +}; + +struct _SugarGridClass { + GObjectClass base_class; +}; + +GType sugar_grid_get_type (void); +void sugar_grid_setup (SugarGrid *grid, + gint width, + gint height); +void sugar_grid_add_weight (SugarGrid *grid, + GdkRectangle *rect); +void sugar_grid_remove_weight (SugarGrid *grid, + GdkRectangle *rect); +guint sugar_grid_compute_weight (SugarGrid *grid, + GdkRectangle *rect); + +G_END_DECLS + +#endif /* __SUGAR_GRID_H__ */