Add grits_object_destroy functions and fix memory leaks

[grits] / src / objects / grits-object.c

diff --git a/src/objects/grits-object.c b/src/objects/grits-object.c
index fc8cddf2789135b52110e415bd1fe209c3d2df40..55f39754d498cf7d4f93c0ca8116d06d376effdb 100644 (file)
--- a/src/objects/grits-object.c
+++ b/src/objects/grits-object.c
@@ -33,6 +33,7 @@
 
 #include "gtkgl.h"
 #include "grits-object.h"
+#include "grits-marshal.h"
 
 /* Constants */
 enum {
@@ -110,7 +111,7 @@ void grits_object_pickdraw(GritsObject *object, GritsOpenGL *opengl, gboolean pi
        }
 
        /* Save state, draw, restore state */
-       g_mutex_lock(opengl->sphere_lock);
+       g_mutex_lock(&opengl->sphere_lock);
        if (!(object->skip & GRITS_SKIP_STATE)) {
                glPushAttrib(GL_ALL_ATTRIB_BITS);
                glMatrixMode(GL_PROJECTION); glPushMatrix();
@@ -133,7 +134,7 @@ void grits_object_pickdraw(GritsObject *object, GritsOpenGL *opengl, gboolean pi
                glMatrixMode(GL_PROJECTION); glPopMatrix();
                glMatrixMode(GL_MODELVIEW);  glPopMatrix();
        }
-       g_mutex_unlock(opengl->sphere_lock);
+       g_mutex_unlock(&opengl->sphere_lock);
 }
 
 /**
@@ -162,7 +163,20 @@ void grits_object_hide(GritsObject *object, gboolean hidden)
 void grits_object_queue_draw(GritsObject *object)
 {
        if (object->viewer)
-               gtk_widget_queue_draw(GTK_WIDGET(object->viewer));
+               grits_viewer_queue_draw(object->viewer);
+}
+
+void grits_object_set_cursor(GritsObject *object, GdkCursorType cursor)
+{
+       // Used by grits OpenGL
+       object->cursor = gdk_cursor_new(cursor);
+}
+
+void grits_object_destroy(GritsObject *object)
+{
+       if (object->viewer)
+               grits_viewer_remove(object->viewer, object);
+       g_object_unref(object);
 }
 
 /* Event handling */
@@ -171,20 +185,22 @@ void grits_object_pick(GritsObject *object, GritsOpenGL *opengl)
        grits_object_pickdraw(object, opengl, TRUE);
 }
 
-void grits_object_set_pointer(GritsObject *object, gboolean selected)
+gboolean grits_object_set_pointer(GritsObject *object, GdkEvent *event, gboolean selected)
 {
+       gboolean rval = FALSE;
        if (selected) {
                if (!object->state.selected)
-                       g_signal_emit(object, signals[SIG_ENTER], 0);
+                       g_signal_emit(object, signals[SIG_ENTER], 0, event, &rval);
                object->state.selected = TRUE;
        } else {
                if (object->state.selected)
-                       g_signal_emit(object, signals[SIG_LEAVE], 0);
+                       g_signal_emit(object, signals[SIG_LEAVE], 0, event, &rval);
                object->state.selected = FALSE;
        }
+       return rval;
 }
 
-void grits_object_event(GritsObject *object, GdkEvent *event)
+gboolean grits_object_event(GritsObject *object, GdkEvent *event)
 {
        const int map[GDK_EVENT_LAST] = {
                [GDK_BUTTON_PRESS  ] SIG_BUTTON_PRESS,
@@ -196,21 +212,30 @@ void grits_object_event(GritsObject *object, GdkEvent *event)
                [GDK_MOTION_NOTIFY ] SIG_MOTION,
        };
        if (!object->state.selected)
-               return;
+               return FALSE;
        guint sig = map[event->type];
+       gboolean rval = FALSE;
 
        /* Handle button click */
        if (sig == SIG_BUTTON_PRESS)
-               object->state.clicking = TRUE;
+               object->state.clicking  = GRITS_CLICK_THRESHOLD;
+       if (sig == SIG_MOTION && object->state.clicking)
+               object->state.clicking -= 1;
        if (sig == SIG_BUTTON_RELEASE && object->state.clicking)
-               g_signal_emit(object, signals[SIG_CLICKED], 0, event);
-       if (sig == SIG_BUTTON_RELEASE || sig == SIG_MOTION)
-               object->state.clicking = FALSE;
+               g_signal_emit(object, signals[SIG_CLICKED], 0, event, &rval);
+       if (sig == SIG_BUTTON_RELEASE)
+               object->state.clicking  = 0;
 
        /* Emit this signal */
-       if (!g_signal_has_handler_pending(object, signals[sig], 0, FALSE))
-               return;
-       g_signal_emit(object, signals[sig], 0, event);
+       if (rval == FALSE) {
+               if (!g_signal_has_handler_pending(object, signals[sig], 0, FALSE))
+                       return FALSE;
+               g_signal_emit(object, signals[sig], 0, event, &rval);
+       }
+
+       if (rval == TRUE)
+               g_debug("GritsObject: breaking chained event");
+       return rval;
 }
 
 /* GObject stuff */
@@ -239,9 +264,10 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__VOID,
-                       G_TYPE_NONE,
-                       0);
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
+                       1,
+                       G_TYPE_POINTER);
 
        /**
         * GritsViewer::leave:
@@ -257,9 +283,10 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__VOID,
-                       G_TYPE_NONE,
-                       0);
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
+                       1,
+                       G_TYPE_POINTER);
 
        /**
         * GritsViewer::clicked:
@@ -274,9 +301,10 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__VOID,
-                       G_TYPE_NONE,
-                       0);
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
+                       1,
+                       G_TYPE_POINTER);
 
        /**
         * GritsViewer::button-press:
@@ -293,8 +321,8 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__POINTER,
-                       G_TYPE_NONE,
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
                        1,
                        G_TYPE_POINTER);
 
@@ -313,8 +341,8 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__POINTER,
-                       G_TYPE_NONE,
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
                        1,
                        G_TYPE_POINTER);
 
@@ -332,8 +360,8 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__POINTER,
-                       G_TYPE_NONE,
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
                        1,
                        G_TYPE_POINTER);
 
@@ -351,8 +379,8 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__POINTER,
-                       G_TYPE_NONE,
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
                        1,
                        G_TYPE_POINTER);
 
@@ -370,8 +398,8 @@ static void grits_object_class_init(GritsObjectClass *klass)
                        0,
                        NULL,
                        NULL,
-                       g_cclosure_marshal_VOID__POINTER,
-                       G_TYPE_NONE,
+                       grits_cclosure_marshal_BOOLEAN__POINTER,
+                       G_TYPE_BOOLEAN,
                        1,
                        G_TYPE_POINTER);
 }