Make picking 64-bit compatible

Use an array and index into that instead of passing pointers to
glPushName since 64-bit pointers do not fit in the name stack.

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 277c11e47ac9092e17bf9a8de0d80529329fc310..b51e767cc8bfe1c6a6dd59b18d3bc1d7e616519a 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -142,6 +142,18 @@ static void _foreach_object(GritsOpenGL *opengl, GFunc func, gpointer user_data)
        g_tree_foreach(opengl->objects, _foreach_object_cb, pointers);
 }
 
+static void _add_object(GritsObject *object, GPtrArray *array)
+{
+       g_ptr_array_add(array, object);
+}
+
+static GPtrArray *_objects_to_array(GritsOpenGL *opengl)
+{
+       GPtrArray *array = g_ptr_array_new();
+       _foreach_object(opengl, (GFunc)_add_object, array);
+       return array;
+}
+
 /*************
  * Callbacks *
  *************/
@@ -255,7 +267,14 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
 
        /* Run picking */
        g_mutex_lock(opengl->objects_lock);
-       _foreach_object(opengl, (GFunc)grits_object_pick_begin, opengl);
+       GPtrArray *objects = _objects_to_array(opengl);
+       for (guint i = 0; i < objects->len; i++) {
+               glPushName(i);
+               GritsObject *object = objects->pdata[i];
+               object->state.picked = FALSE;
+               grits_object_pick(object, opengl);
+               glPopName();
+       }
        int hits = glRenderMode(GL_RENDER);
        g_debug("GritsOpenGL: on_motion_notify - hits=%d ev=%.0lf,%.0lf",
                        hits, gl_x, gl_y);
@@ -265,10 +284,15 @@ static gboolean on_motion_notify(GritsOpenGL *opengl, GdkEventMotion *event, gpo
                //g_debug("\t\tz1:    %f", (float)buffer[i][1]/0x7fffffff);
                //g_debug("\t\tz2:    %f", (float)buffer[i][2]/0x7fffffff);
                //g_debug("\t\tname:  %p", (gpointer)buffer[i][3]);
-               GritsObject *object = GRITS_OBJECT(buffer[i][3]);
-               grits_object_pick_pointer(object, gl_x, gl_y);
+               guint        index  = buffer[i][3];
+               GritsObject *object = objects->pdata[index];
+               object->state.picked = TRUE;
+       }
+       for (guint i = 0; i < objects->len; i++) {
+               GritsObject *object = objects->pdata[i];
+               grits_object_set_pointer(object, object->state.picked);
        }
-       _foreach_object(opengl, (GFunc)grits_object_pick_end, NULL);
+       g_ptr_array_free(objects, TRUE);
        g_mutex_unlock(opengl->objects_lock);
 
        /* Cleanup */

diff --git a/src/objects/grits-object.c b/src/objects/grits-object.c
index d3f200c6fe1a994335496716fa9b33d3050de0ce..a3b60ec97abcfbff17299104c6c399409f0cd74c 100644 (file)
--- a/src/objects/grits-object.c
+++ b/src/objects/grits-object.c
@@ -51,6 +51,7 @@ static guint signals[NUM_SIGNALS];
 void grits_object_pickdraw(GritsObject *object, GritsOpenGL *opengl, gboolean pick)
 {
        GritsObjectClass *klass = GRITS_OBJECT_GET_CLASS(object);
+
        if (!klass->draw) {
                g_warning("GritsObject: draw - Unimplemented");
                return;
@@ -60,6 +61,14 @@ void grits_object_pickdraw(GritsObject *object, GritsOpenGL *opengl, gboolean pi
        if (object->hidden)
                return;
 
+       /* Skip object with no signals when picking */
+       for (int i = 0; pick; i++) {
+               if (g_signal_has_handler_pending(object, signals[i], 0, FALSE))
+                       break;
+               if (i == NUM_SIGNALS)
+                       return;
+       }
+
        /* Support GritsTester */
        if (!GRITS_IS_OPENGL(opengl)) {
                g_debug("GritsObject: draw - drawing raw object");
@@ -157,30 +166,14 @@ void grits_object_queue_draw(GritsObject *object)
 }
 
 /* Event handling */
-void grits_object_pick_begin(GritsObject *object, GritsOpenGL *opengl)
-{
-       object->state.picked = FALSE;
-
-       /* Check for connected signals */
-       for (int i = 0; i < NUM_SIGNALS; i++) {
-               if (g_signal_has_handler_pending(object, signals[i], 0, FALSE)) {
-                       /* Someone is watching, render the object _once_ */
-                       glPushName((guint)object);
-                       grits_object_pickdraw(object, opengl, TRUE);
-                       glPopName();
-                       return;
-               }
-       }
-}
-
-void grits_object_pick_pointer(GritsObject *object, double x, double y)
+void grits_object_pick(GritsObject *object, GritsOpenGL *opengl)
 {
-       object->state.picked = TRUE;
+       grits_object_pickdraw(object, opengl, TRUE);
 }
 
-void grits_object_pick_end(GritsObject *object)
+void grits_object_set_pointer(GritsObject *object, gboolean selected)
 {
-       if (object->state.picked) {
+       if (selected) {
                if (!object->state.selected)
                        g_signal_emit(object, signals[SIG_ENTER], 0);
                object->state.selected = TRUE;

diff --git a/src/objects/grits-object.h b/src/objects/grits-object.h
index 440a1dfffe5c37e7100c37c31f721dfb73e2ce5f..d7b8b03b460f64128e5ce5f80bc902f2b1266024 100644 (file)
--- a/src/objects/grits-object.h
+++ b/src/objects/grits-object.h
@@ -76,9 +76,8 @@ void grits_object_draw(GritsObject *object, GritsOpenGL *opengl);
 void grits_object_hide(GritsObject *object, gboolean hidden);
 
 /* Interal, used by grits_opengl */
-void grits_object_pick_begin(GritsObject *object, GritsOpenGL *opengl);
-void grits_object_pick_pointer(GritsObject *object, double x, double y);
-void grits_object_pick_end(GritsObject *object);
+void grits_object_pick(GritsObject *object, GritsOpenGL *opengl);
+void grits_object_set_pointer(GritsObject *object, gboolean selected);
 void grits_object_event(GritsObject *object, GdkEvent *event);
 
 /**