Changeset 5445

Timestamp:

08/14/09 17:53:21 (4 years ago)

Author:

werner

Message:

• when selecting an item in the canvas, we now check that the underlying object is still connected. This prevents surprises when making extensive changes during instantiation failure.

File:

• trunk/eda/fped/inst.c (modified) (4 diffs)

trunk/eda/fped/inst.c

@@ -41 +41 @@
 static unsigned long active_set = 0;
 
+static struct inst_ops vec_ops;
+static struct inst_ops frame_ops;
+
 
 #define IS_ACTIVE       ((active_set & 1))
@@ -88 +91 @@
 
 
+/* ----- check connectedness ----------------------------------------------- */
+
+
+/*
+ * After an instantiation failure, the instances can get out of sync with the
+ * object tree, and attempts to select an item on the canvas can cause accesses
+ * to objects that aren't there anymore. So we need to check if we can still
+ * reach the corresponding object.
+ *
+ * Note: even this isn't bullet-proof. Theoretically, we may get a new object
+ * in the old place. However, this probably doesn't do any serious damage.
+ */
+
+
+static int inst_connected(const struct inst *inst)
+{
+        const struct frame *frame;
+        const struct vec *vec;
+        const struct obj *obj;
+
+        for (frame = frames; frame; frame = frame->next) {
+                if (inst->ops == &vec_ops) {
+                        for (vec = frame->vecs; vec; vec = vec->next)
+                                if (vec == inst->vec)
+                                        return 1;
+                } else {
+                        for (obj = frame->objs; obj; obj = obj->next)
+                                if (obj == inst->obj)
+                                        return 1;
+                }
+        }
+        return 0;
+}
+
+
 /* ----- selection --------------------------------------------------------- */
-
-
-static struct inst_ops vec_ops;
-static struct inst_ops frame_ops;
 
 
@@ -140 +174 @@
                 for (inst = insts[prio]; inst; inst = inst->next) {
                         if (!inst->active || !inst->ops->distance)
+                                continue;
+                        if (!inst_connected(inst))
                                 continue;
                         dist = inst->ops->distance(inst, pos, draw_ctx.scale);
@@ -158 +194 @@
         for (inst = insts[ip_vec]; inst; inst = inst->next) {
                 if (!inst->active)
+                        continue;
+                if (!inst_connected(inst))
                         continue;
                 dist = gui_dist_vec_fallback(inst, pos, draw_ctx.scale);