[brlcad-commits] SF.net SVN: brlcad:[76600] brlcad/branches/bioh

[starseeker--- via brlcad-commits]

Revision: 76600
          http://sourceforge.net/p/brlcad/code/76600
Author:   starseeker
Date:     2020-07-30 15:08:14 +0000 (Thu, 30 Jul 2020)
Log Message:
-----------
Eliminate ged_obj as a separate structure.

Modified Paths:
--------------
    brlcad/branches/bioh/include/tclcad.h
    brlcad/branches/bioh/src/libtclcad/fb.c
    brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
    brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
    brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c
    brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
    brlcad/branches/bioh/src/libtclcad/view/arrows.c
    brlcad/branches/bioh/src/libtclcad/view/autoview.c
    brlcad/branches/bioh/src/libtclcad/view/axes.c
    brlcad/branches/bioh/src/libtclcad/view/draw.c
    brlcad/branches/bioh/src/libtclcad/view/faceplate.c
    brlcad/branches/bioh/src/libtclcad/view/labels.c
    brlcad/branches/bioh/src/libtclcad/view/lines.c
    brlcad/branches/bioh/src/libtclcad/view/refresh.c
    brlcad/branches/bioh/src/libtclcad/view/view.h

Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h       2020-07-30 14:50:19 UTC (rev 
76599)
+++ brlcad/branches/bioh/include/tclcad.h       2020-07-30 15:08:14 UTC (rev 
76600)
@@ -133,7 +133,7 @@
 DM_EXPORT extern int fbs_close(struct fbserv_obj *fbsp);
 
 struct tclcad_ged_data {
-    struct ged_obj             *gdv_gop;
+    struct ged         *gedp;
     struct bu_vls      go_more_args_callback;
 
     // These are view related, but appear to be intended as global across all
@@ -153,21 +153,15 @@
 // Data specific to an individual view rather than the geometry database
 // instance.
 struct tclcad_view_data {
-    struct ged_obj     *gdv_gop;
+    struct ged         *gedp;
     struct bu_vls      gdv_edit_motion_delta_callback;
     struct bu_vls      gdv_callback;
     struct fbserv_obj  gdv_fbs;
 };
 
-struct ged_obj {
-    struct ged         *go_gedp;
-};
-#define GED_OBJ_NULL ((struct ged_obj *)0)
-
-
 struct tclcad_obj {
     struct bu_list     l;
-    struct ged_obj     *to_gop;
+    struct ged         *to_gedp;
     Tcl_Interp         *to_interp;
 };
 
@@ -353,12 +347,12 @@
 TCLCAD_EXPORT extern struct application *to_rt_gettrees_application(struct ged 
*gedp,
                                                                    int argc,
                                                                    const char 
*argv[]);
-TCLCAD_EXPORT extern void go_refresh(struct ged_obj *gop,
+TCLCAD_EXPORT extern void go_refresh(struct ged *gedp,
                                     struct bview *gdvp);
-TCLCAD_EXPORT extern void go_refresh_draw(struct ged_obj *gop,
+TCLCAD_EXPORT extern void go_refresh_draw(struct ged *gedp,
                                          struct bview *gdvp,
                                          int restore_zbuffer);
-TCLCAD_EXPORT extern int go_view_axes(struct ged_obj *gop,
+TCLCAD_EXPORT extern int go_view_axes(struct ged *gedp,
                                      struct bview *gdvp,
                                      int argc,
                                      const char *argv[],

Modified: brlcad/branches/bioh/src/libtclcad/fb.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/fb.c     2020-07-30 14:50:19 UTC (rev 
76599)
+++ brlcad/branches/bioh/src/libtclcad/fb.c     2020-07-30 15:08:14 UTC (rev 
76600)
@@ -985,12 +985,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1047,12 +1047,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c   2020-07-30 14:50:19 UTC 
(rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c   2020-07-30 15:08:14 UTC 
(rev 76600)
@@ -57,12 +57,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -103,12 +103,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -179,7 +179,7 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
@@ -252,10 +252,10 @@
        bu_vls_printf(&bindings, "bind %s <Motion> {%s 
mouse_brep_selection_translate %s %s %%x %%y; "
                      "%s brep %s plot SCV}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      brep_name,
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      brep_name);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -289,7 +289,7 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
@@ -392,12 +392,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -506,12 +506,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -617,12 +617,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -683,12 +683,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -748,12 +748,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -814,12 +814,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -881,12 +881,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -943,7 +943,7 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
@@ -1015,7 +1015,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s 
mouse_joint_selection_translate %s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      joint_name);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -1051,7 +1051,7 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
@@ -1206,12 +1206,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1307,12 +1307,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1424,12 +1424,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", cmd, 
argv[1]);
        return GED_ERROR;
     }
@@ -1595,12 +1595,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", cmd, 
argv[1]);
        return GED_ERROR;
     }
@@ -1710,12 +1710,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1809,12 +1809,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1921,12 +1921,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2033,12 +2033,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2079,7 +2079,7 @@
     gedp->ged_gvp = gdvp;
 
     struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->u_data;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
     if (0 < bu_vls_strlen(&tvd->gdv_edit_motion_delta_callback)) {
        const char *path_string = argv[2];
        vect_t dvec;
@@ -2158,7 +2158,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2191,12 +2191,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2337,7 +2337,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2370,12 +2370,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2482,7 +2482,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2515,12 +2515,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2669,7 +2669,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2702,12 +2702,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2862,12 +2862,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2934,12 +2934,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3028,12 +3028,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3114,12 +3114,12 @@
            return GED_ERROR; \
        } \
  \
-       for (BU_LIST_FOR((_gdvp), bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) { \
+       for (BU_LIST_FOR((_gdvp), bview, 
&current_top->to_gedp->go_head_views.l)) { \
            if (BU_STR_EQUAL(bu_vls_addr(&(_gdvp)->gv_name), (_argv)[1])) \
                break; \
        } \
  \
-       if (BU_LIST_IS_HEAD(&(_gdvp)->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) { \
+       if (BU_LIST_IS_HEAD(&(_gdvp)->l, 
&current_top->to_gedp->go_head_views.l)) { \
            bu_vls_printf(gedp->ged_result_str, "View not found - %s", 
(_argv)[1]); \
            return GED_ERROR; \
        } \
@@ -3189,12 +3189,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3345,12 +3345,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3440,12 +3440,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3541,12 +3541,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3639,12 +3639,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c     2020-07-30 14:50:19 UTC 
(rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c     2020-07-30 15:08:14 UTC 
(rev 76600)
@@ -1026,7 +1026,7 @@
 
     for (ctp = to_cmds; ctp->to_name != (char *)0; ctp++) {
        if (BU_STR_EQUAL(ctp->to_name, argv[1])) {
-           struct ged *gedp = top->to_gop->go_gedp;
+           struct ged *gedp = top->to_gedp;
            ret = (*ctp->to_wrapper_func)(gedp, argc-1, (const char **)argv+1, 
ctp->to_func, ctp->to_usage, ctp->to_maxargs);
            break;
        }
@@ -1034,7 +1034,7 @@
     if (ctp->to_name == (char *)0) {
        for (ctp = ged_cmds; ctp->to_name != (char *)0; ctp++) {
            if (BU_STR_EQUAL(ctp->to_name, argv[1])) {
-               struct ged *gedp = top->to_gop->go_gedp;
+               struct ged *gedp = top->to_gedp;
                ret = (*ctp->to_wrapper_func)(gedp, argc-1, (const char 
**)argv+1, ctp->to_func, ctp->to_usage, ctp->to_maxargs);
                break;
            }
@@ -1063,7 +1063,7 @@
        return TCL_ERROR;
     }
 
-    Tcl_DStringAppend(&ds, bu_vls_addr(top->to_gop->go_gedp->ged_result_str), 
-1);
+    Tcl_DStringAppend(&ds, bu_vls_addr(top->to_gedp->ged_result_str), -1);
     Tcl_DStringResult(interp, &ds);
 
     if (ret & GED_ERROR)
@@ -1097,11 +1097,11 @@
     if (current_top == top)
        current_top = TCLCAD_OBJ_NULL;
 
-    if (top->to_gop->go_gedp) {
+    if (top->to_gedp) {
 
        // Clean up the libtclcad view data.
        struct bview *gdvp = NULL;
-       for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_gedp->go_head_views.l)) {
+       for (BU_LIST_FOR(gdvp, bview, &top->to_gedp->go_head_views.l)) {
 
            // There is a top level command created in the Tcl interp that is 
the name
            // of the dm.  Clear that command.
@@ -1126,20 +1126,20 @@
        }
 
        // Clean up the other libtclcad data
-       if (top->to_gop->go_gedp->u_data) {
-           struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)top->to_gop->go_gedp->u_data;
+       if (top->to_gedp->u_data) {
+           struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)top->to_gedp->u_data;
            bu_vls_free(&tgd->go_rt_end_callback);
            bu_vls_free(&tgd->go_more_args_callback);
            free_path_edit_params(tgd->go_edited_paths);
            bu_hash_destroy(tgd->go_edited_paths);
            BU_PUT(tgd, struct tclcad_ged_data);
-           top->to_gop->go_gedp->u_data = NULL;
+           top->to_gedp->u_data = NULL;
        }
 
        // Got the libtclcad cleanup done, have libged do its up.
-       ged_close(top->to_gop->go_gedp);
+       ged_close(top->to_gedp);
 
-       BU_PUT(top->to_gop->go_gedp, struct ged);
+       BU_PUT(top->to_gedp, struct ged);
     }
 
     bu_free((void *)top, "struct ged_obj");
@@ -1253,7 +1253,7 @@
     if (argc == 1) {
        /* get list of database objects */
        for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l))
-           Tcl_AppendResult(interp, 
bu_vls_addr(&top->to_gop->go_gedp->go_name), " ", (char *)NULL);
+           Tcl_AppendResult(interp, bu_vls_addr(&top->to_gedp->go_name), " ", 
(char *)NULL);
 
        return TCL_OK;
     }
@@ -1303,20 +1303,17 @@
     BU_ALLOC(top, struct tclcad_obj);
     top->to_interp = interp;
 
-    /* initialize ged_obj */
-    BU_ALLOC(top->to_gop, struct ged_obj);
-
     BU_ASSERT(gedp != NULL);
-    top->to_gop->go_gedp = gedp;
+    top->to_gedp = gedp;
 
-    top->to_gop->go_gedp->ged_output_handler = to_output_handler;
-    top->to_gop->go_gedp->ged_refresh_handler = to_refresh_handler;
-    top->to_gop->go_gedp->ged_create_vlist_solid_callback = 
to_create_vlist_callback_solid;
-    top->to_gop->go_gedp->ged_create_vlist_callback = to_create_vlist_callback;
-    top->to_gop->go_gedp->ged_free_vlist_callback = to_free_vlist_callback;
+    top->to_gedp->ged_output_handler = to_output_handler;
+    top->to_gedp->ged_refresh_handler = to_refresh_handler;
+    top->to_gedp->ged_create_vlist_solid_callback = 
to_create_vlist_callback_solid;
+    top->to_gedp->ged_create_vlist_callback = to_create_vlist_callback;
+    top->to_gedp->ged_free_vlist_callback = to_free_vlist_callback;
 
     BU_ASSERT(gedp->ged_gdp != NULL);
-    top->to_gop->go_gedp->ged_gdp->gd_rtCmdNotify = 
to_rt_end_callback_internal;
+    top->to_gedp->ged_gdp->gd_rtCmdNotify = to_rt_end_callback_internal;
 
     // Initialize libtclcad GED data container
     struct tclcad_ged_data *tgd;
@@ -1324,11 +1321,11 @@
     bu_vls_init(&tgd->go_rt_end_callback);
     bu_vls_init(&tgd->go_more_args_callback);
     tgd->go_edited_paths = bu_hash_create(0);
-    tgd->gdv_gop = top->to_gop;
+    tgd->gedp = top->to_gedp;
     tgd->go_refresh_on = 1;
     gedp->u_data = (void *)tgd;
 
-    bu_vls_strcpy(&top->to_gop->go_gedp->go_name, argv[1]);
+    bu_vls_strcpy(&top->to_gedp->go_name, argv[1]);
 
     /* append to list of tclcad_obj */
     BU_LIST_APPEND(&HeadTclcadObj.l, &top->l);
@@ -1350,7 +1347,7 @@
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
 
-    bu_vls_printf(gedp->ged_result_str, "%lf", 
current_top->to_gop->go_gedp->ged_wdbp->dbip->dbi_base2local);
+    bu_vls_printf(gedp->ged_result_str, "%lf", 
current_top->to_gedp->ged_wdbp->dbip->dbi_base2local);
 
     return GED_OK;
 }
@@ -1381,12 +1378,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1456,12 +1453,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1525,12 +1522,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1598,12 +1595,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1628,7 +1625,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_constrain_rot %s 
%s %%x %%y}; break",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2]);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -1667,12 +1664,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1697,7 +1694,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_constrain_trans %s 
%s %%x %%y}; break",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2]);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -1760,8 +1757,8 @@
        bu_vls_strcpy(&from_vls, cp+1);
 
        for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l)) {
-           if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_gedp->go_name), 
bu_vls_addr(&db_vls))) {
-               from_gedp = top->to_gop->go_gedp;
+           if (BU_STR_EQUAL(bu_vls_addr(&top->to_gedp->go_name), 
bu_vls_addr(&db_vls))) {
+               from_gedp = top->to_gedp;
                break;
            }
        }
@@ -1785,8 +1782,8 @@
        bu_vls_strcpy(&to_vls, cp+1);
 
        for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l)) {
-           if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_gedp->go_name), 
bu_vls_addr(&db_vls))) {
-               to_gedp = top->to_gop->go_gedp;
+           if (BU_STR_EQUAL(bu_vls_addr(&top->to_gedp->go_name), 
bu_vls_addr(&db_vls))) {
+               to_gedp = top->to_gedp;
                break;
            }
        }
@@ -1858,7 +1855,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1893,12 +1890,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2267,7 +2264,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2299,12 +2296,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2365,7 +2362,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2397,12 +2394,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2462,7 +2459,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -2494,12 +2491,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2896,12 +2893,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -2932,7 +2929,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Configure> {%s configure %s; break}; 
",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Enter> {focus %s; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
@@ -2939,45 +2936,45 @@
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
        bu_vls_printf(&bindings, "bind %s <Expose> {%s handle_expose %s %%c; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "catch {wm protocol %s WM_DELETE_WINDOW {%s 
delete_view %s; break}}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Mouse Bindings */
        bu_vls_printf(&bindings, "bind %s <2> {%s vslew %s %%x %%y; focus %s; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
        bu_vls_printf(&bindings, "bind %s <1> {%s zoom %s 0.5; focus %s; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
        bu_vls_printf(&bindings, "bind %s <3> {%s zoom %s 2.0; focus %s;  
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
 #ifdef DM_X
        bu_vls_printf(&bindings, "bind %s <4> {%s zoom %s 1.1; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <5> {%s zoom %s 0.9; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 #endif
 #ifdef DM_WGL
        bu_vls_printf(&bindings, "bind %s <MouseWheel> {if {%%D < 0} {%s zoom 
%s 0.9} else {%s zoom %s 1.1}; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 #endif
 
@@ -2984,203 +2981,203 @@
        /* Idle Mode */
        bu_vls_printf(&bindings, "bind %s <ButtonRelease> {%s idle_mode %s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Control_L> {%s idle_mode 
%s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Control_R> {%s idle_mode 
%s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Shift_L> {%s idle_mode 
%s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Shift_R> {%s idle_mode 
%s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Alt_L> {%s idle_mode %s; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <KeyRelease-Alt_R> {%s idle_mode %s; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Rotate Mode */
        bu_vls_printf(&bindings, "bind %s <Control-ButtonRelease-1> {%s 
idle_mode %s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-1> {%s 
rotate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-2> {%s 
rotate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-3> {%s 
rotate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Translate Mode */
        bu_vls_printf(&bindings, "bind %s <Shift-ButtonRelease-1> {%s idle_mode 
%s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-1> {%s 
translate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-2> {%s 
translate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-3> {%s 
translate_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Scale Mode */
        bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonRelease-1> {%s 
idle_mode %s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-1> {%s 
scale_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-2> {%s 
scale_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-3> {%s 
scale_mode %s %%x %%y}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Constrained Rotate Mode */
        bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonRelease-1> {%s 
idle_mode %s}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-1> {%s 
constrain_rmode %s x %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-2> {%s 
constrain_rmode %s y %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-3> {%s 
constrain_rmode %s z %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Constrained Translate Mode */
        bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonRelease-1> {%s 
idle_mode %s; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-1> {%s 
constrain_tmode %s x %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-2> {%s 
constrain_tmode %s y %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-3> {%s 
constrain_tmode %s z %%x %%y; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
        /* Key Bindings */
        bu_vls_printf(&bindings, "bind %s 3 {%s aet %s 35 25; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s 4 {%s aet %s 45 45; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s f {%s aet %s 0 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s F {%s aet %s 0 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s R {%s aet %s 180 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s r {%s aet %s 270 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s l {%s aet %s 90 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s L {%s aet %s 90 0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s t {%s aet %s 270 90; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s T {%s aet %s 270 90; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s b {%s aet %s 270 -90; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s B {%s aet %s 270 -90; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s + {%s zoom %s 2.0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s = {%s zoom %s 2.0; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s _ {%s zoom %s 0.5; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s - {%s zoom %s 0.5; break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Key-Left> {%s rot %s -v 0 1 0; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Key-Right> {%s rot %s -v 0 -1 0; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Key-Up> {%s rot %s -v 1 0 0; break}; 
",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        bu_vls_printf(&bindings, "bind %s <Key-Down> {%s rot %s -v -1 0 0; 
break}; ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
 
 
@@ -3198,7 +3195,7 @@
            const char *UNUSED(usage),
            int UNUSED(maxargs))
 {
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
     int on;
 
     /* initialize result */
@@ -3252,12 +3249,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3415,12 +3412,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3455,12 +3452,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3527,12 +3524,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3651,7 +3648,7 @@
     struct bview *gdvp;
     int mode, need_refresh = 0;
     struct redraw_edited_path_data data;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
@@ -3667,12 +3664,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3772,12 +3769,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3823,7 +3820,7 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l))
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l))
        bu_vls_printf(gedp->ged_result_str, "%s ", bu_vls_addr(&gdvp->gv_name));
 
     return GED_OK;
@@ -3842,7 +3839,7 @@
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
 
-    bu_vls_printf(gedp->ged_result_str, "%lf", 
current_top->to_gop->go_gedp->ged_wdbp->dbip->dbi_local2base);
+    bu_vls_printf(gedp->ged_result_str, "%lf", 
current_top->to_gedp->ged_wdbp->dbip->dbi_local2base);
 
     return GED_OK;
 }
@@ -3858,7 +3855,7 @@
 {
     struct bview *gdvp;
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        gedp->ged_gvp = gdvp;
        (*func)(gedp, argc, (const char **)argv);
     }
@@ -3936,12 +3933,12 @@
        return GED_HELP;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -3973,7 +3970,7 @@
                      int UNUSED(maxargs))
 {
     register int i;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
@@ -4032,12 +4029,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4055,7 +4052,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_move_arb_edge %s 
%s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -4095,12 +4092,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4118,7 +4115,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_move_arb_face %s 
%s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -4214,12 +4211,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", argv[0], 
argv[1]);
        return GED_ERROR;
     }
@@ -4237,7 +4234,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_bot_move_pnt -r %s 
%s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -4278,12 +4275,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", argv[0], 
argv[1]);
        return GED_ERROR;
     }
@@ -4301,7 +4298,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_bot_move_pnts %s 
%%x %%y %s ",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[4]);
     }
@@ -4344,12 +4341,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4367,7 +4364,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_metaball_move_pnt 
%s %s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -4407,12 +4404,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4430,7 +4427,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_pipe_move_pnt %s 
%s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -4580,12 +4577,12 @@
     BU_GET(tvd, struct tclcad_view_data);
     bu_vls_init(&tvd->gdv_edit_motion_delta_callback);
     bu_vls_init(&tvd->gdv_callback);
-    tvd->gdv_gop = current_top->to_gop;
+    tvd->gedp = current_top->to_gedp;
     new_gdvp->u_data = (void *)tvd;
 
     bu_vls_printf(&new_gdvp->gv_name, "%s", argv[name_index]);
     ged_view_init(new_gdvp);
-    BU_LIST_INSERT(&current_top->to_gop->go_gedp->go_head_views.l, 
&new_gdvp->l);
+    BU_LIST_INSERT(&current_top->to_gedp->go_head_views.l, &new_gdvp->l);
 
     new_gdvp->gv_point_scale = 1.0;
     new_gdvp->gv_curve_scale = 1.0;
@@ -4607,7 +4604,7 @@
     if (dm_get_pathname((struct dm *)new_gdvp->dmp)) {
        bu_vls_printf(&event_vls, "event generate %s <Configure>; %s autoview 
%s",
                      bu_vls_addr(dm_get_pathname((struct dm *)new_gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&new_gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&event_vls));
     }
@@ -4654,12 +4651,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4677,7 +4674,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_orotate %s %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2]);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -4716,12 +4713,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4739,7 +4736,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_oscale %s %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2]);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -4779,12 +4776,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4802,7 +4799,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_otranslate %s %s 
%%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2]);
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -4836,12 +4833,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4891,12 +4888,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -4981,12 +4978,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5087,12 +5084,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5136,7 +5133,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rect %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -5176,12 +5173,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5199,7 +5196,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rotate_arb_face %s 
%s %s %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3],
@@ -5240,12 +5237,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5263,7 +5260,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rot %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -5302,7 +5299,7 @@
                   int UNUSED(maxargs))
 {
     register int i;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
@@ -5407,12 +5404,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5430,7 +5427,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_protate %s %s %s 
%%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -5470,12 +5467,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5493,7 +5490,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_pscale %s %s %s 
%%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -5533,12 +5530,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5556,7 +5553,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_ptranslate %s %s 
%s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name),
                      argv[2],
                      argv[3]);
@@ -5596,12 +5593,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5619,7 +5616,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_data_scale %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -5657,12 +5654,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5680,7 +5677,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_scale %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -5719,12 +5716,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5774,12 +5771,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5824,12 +5821,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -5880,12 +5877,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6011,12 +6008,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6034,7 +6031,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_trans %s %%x %%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -6069,12 +6066,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6122,12 +6119,12 @@
        return GED_HELP;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6175,12 +6172,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6245,12 +6242,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6296,12 +6293,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6374,12 +6371,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6458,12 +6455,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6518,12 +6515,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -6559,9 +6556,9 @@
 {
     struct bview *gdvp;
     register int first = 1;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (tgd->go_dlist_on && to_is_viewable(gdvp)) {
 
            (void)dm_make_current((struct dm *)gdvp->dmp);
@@ -6607,9 +6604,9 @@
 to_free_vlist_callback(unsigned int dlist, int range)
 {
     struct bview *gdvp;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (tgd->go_dlist_on && to_is_viewable(gdvp)) {
            (void)dm_make_current((struct dm *)gdvp->dmp);
            (void)dm_free_dlists((struct dm *)gdvp->dmp, dlist, range);
@@ -6620,7 +6617,7 @@
 HIDDEN void
 to_rt_end_callback_internal(int aborted)
 {
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
     if (0 < bu_vls_strlen(&tgd->go_rt_end_callback)) {
        struct bu_vls callback_cmd = BU_VLS_INIT_ZERO;
 

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c     2020-07-30 
14:50:19 UTC (rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c     2020-07-30 
15:08:14 UTC (rev 76600)
@@ -67,7 +67,7 @@
     if (!rflag && ret == GED_OK && strlen(bu_vls_addr(gedp->ged_result_str)) 
== 0)
        aflag = 1;
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (to_is_viewable(gdvp)) {
            gedp->ged_gvp->gv_x_samples = dm_get_width((struct dm *)gdvp->dmp);
            gedp->ged_gvp->gv_y_samples = dm_get_height((struct dm *)gdvp->dmp);
@@ -107,7 +107,7 @@
     char **av;
     struct bu_vls callback_cmd = BU_VLS_INIT_ZERO;
     struct bu_vls temp = BU_VLS_INIT_ZERO;
-    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
 
     ac = argc;
     total_ac = ac + 1;
@@ -270,12 +270,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -394,12 +394,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c        2020-07-30 
14:50:19 UTC (rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c        2020-07-30 
15:08:14 UTC (rev 76600)
@@ -1023,7 +1023,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1060,12 +1060,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1106,7 +1106,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1140,12 +1140,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1157,7 +1157,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_circ %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -1319,7 +1319,7 @@
        if (doBind && dm_get_pathname((struct dm *)gdvp->dmp)) {
            bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_cont %s 
%%x %%y}",
                          bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                         bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                         bu_vls_addr(&current_top->to_gedp->go_name),
                          bu_vls_addr(&gdvp->gv_name));
            Tcl_Eval(interp, bu_vls_addr(&bindings));
        }
@@ -1381,7 +1381,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1414,12 +1414,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1453,7 +1453,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1486,12 +1486,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1543,7 +1543,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1577,12 +1577,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1594,7 +1594,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_ell %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }
@@ -1703,7 +1703,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -1737,12 +1737,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }
@@ -1754,7 +1754,7 @@
     if (dm_get_pathname((struct dm *)gdvp->dmp)) {
        bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_rect %s %%x 
%%y}",
                      bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
-                     bu_vls_addr(&current_top->to_gop->go_gedp->go_name),
+                     bu_vls_addr(&current_top->to_gedp->go_name),
                      bu_vls_addr(&gdvp->gv_name));
        Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
     }

Modified: brlcad/branches/bioh/src/libtclcad/view/arrows.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/arrows.c    2020-07-30 14:50:19 UTC 
(rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/view/arrows.c    2020-07-30 15:08:14 UTC 
(rev 76600)
@@ -59,7 +59,7 @@
 
     /* Don't allow go_refresh() to be called */
     if (current_top != NULL) {
-       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
+       struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gedp->u_data;
        tgd->go_refresh_on = 0;
     }
 
@@ -96,12 +96,12 @@
        return GED_ERROR;
     }
 
-    for (BU_LIST_FOR(gdvp, bview, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    for (BU_LIST_FOR(gdvp, bview, &current_top->to_gedp->go_head_views.l)) {
        if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
            break;
     }
 
-    if (BU_LIST_IS_HEAD(&gdvp->l, 
&current_top->to_gop->go_gedp->go_head_views.l)) {
+    if (BU_LIST_IS_HEAD(&gdvp->l, &current_top->to_gedp->go_head_views.l)) {
        bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/branches/bioh/src/libtclcad/view/autoview.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/autoview.c  2020-07-30 14:50:19 UTC 
(rev 76599)
+++ brlcad/branches/bioh/src/libtclcad/view/autoview.c  2020-07-30 15:08:14 UTC 
(rev 76600)
@@ -40,15 +40,15 @@
     const char *av[3];
 
     struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->u_data;
-    tvd->gdv_gop->go_gedp->ged_gvp = gdvp;
+    tvd->gedp->ged_gvp = gdvp;
     av[0] = "autoview";
     av[1] = scale;
     av[2] = NULL;
 
     if (scale)
-       ret = ged_autoview(tvd->gdv_gop->go_gedp, 2, (const char **)av);
+       ret = ged_autoview(tvd->gedp, 2, (const char **)av);
     else
-       ret = ged_autoview(tvd->gdv_gop->go_gedp, 1, (const char **)av);
+       ret = ged_autoview(tvd->gedp, 1, (const char **)av);
 
     if (ret == GED_OK) {
        if (0 < bu_vls_strlen(&tvd->gdv_callback)) {
@@ -77,12 +77,12 @@
        return GED_ERROR;
     }
 

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits