Revision: 76931
http://sourceforge.net/p/brlcad/code/76931
Author: starseeker
Date: 2020-08-24 22:15:43 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
curr_dm_list -> mged_curr_dm
Modified Paths:
--------------
brlcad/trunk/src/mged/adc.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/buttons.c
brlcad/trunk/src/mged/chgview.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/color_scheme.c
brlcad/trunk/src/mged/doevent.c
brlcad/trunk/src/mged/dozoom.c
brlcad/trunk/src/mged/edsol.c
brlcad/trunk/src/mged/fbserv.c
brlcad/trunk/src/mged/menu.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/mged/overlay.c
brlcad/trunk/src/mged/predictor.c
brlcad/trunk/src/mged/set.c
brlcad/trunk/src/mged/share.c
brlcad/trunk/src/mged/titles.c
brlcad/trunk/src/mged/usepen.c
Modified: brlcad/trunk/src/mged/adc.c
===================================================================
--- brlcad/trunk/src/mged/adc.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -90,7 +90,7 @@
struct mged_dm *dmlp;
struct mged_dm *save_dmlp;
- save_dmlp = curr_dm_list;
+ save_dmlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_adc_state == adc_state) {
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/attach.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -58,13 +58,13 @@
int mged_default_dlist = 0; /* This variable is available via Tcl for
controlling use of display lists */
struct mged_dm active_dm_set; /* set of active display managers */
-struct mged_dm *curr_dm_list = (struct mged_dm *)NULL;
+struct mged_dm *mged_curr_dm = (struct mged_dm *)NULL;
static fastf_t windowbounds[6] = { XMIN, XMAX, YMIN, YMAX, (int)GED_MIN,
(int)GED_MAX };
/* If we changed the active dm, need to update GEDP as well.. */
void set_curr_dm(struct mged_dm *nl)
{
- curr_dm_list = nl;
+ mged_curr_dm = nl;
if (nl != DM_LIST_NULL) {
GEDP->ged_gvp = nl->dml_view_state->vs_gvp;
GEDP->ged_gvp->gv_grid = *nl->dml_grid_state; /* struct copy */
@@ -166,8 +166,8 @@
continue;
/* found it */
- if (p != curr_dm_list) {
- save_dm_list = curr_dm_list;
+ if (p != mged_curr_dm) {
+ save_dm_list = mged_curr_dm;
set_curr_dm(p);
}
break;
@@ -200,21 +200,21 @@
* like the last one the user had open. This depends on "nu"
* always being last in the list.
*/
- usurp_all_resources(BU_LIST_LAST(mged_dm, &active_dm_set.l), curr_dm_list);
+ usurp_all_resources(BU_LIST_LAST(mged_dm, &active_dm_set.l), mged_curr_dm);
/* If this display is being referenced by a command window, then
* remove the reference.
*/
- if (curr_dm_list->dml_tie != NULL)
- curr_dm_list->dml_tie->cl_tie = (struct mged_dm *)NULL;
+ if (mged_curr_dm->dml_tie != NULL)
+ mged_curr_dm->dml_tie->cl_tie = (struct mged_dm *)NULL;
if (need_close)
dm_close(DMP);
- RT_FREE_VLIST(&curr_dm_list->dml_p_vlist);
- BU_LIST_DEQUEUE(&curr_dm_list->l);
- mged_slider_free_vls(curr_dm_list);
- bu_free((void *)curr_dm_list, "release: curr_dm_list");
+ RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
+ BU_LIST_DEQUEUE(&mged_curr_dm->l);
+ mged_slider_free_vls(mged_curr_dm);
+ bu_free((void *)mged_curr_dm, "release: mged_curr_dm");
if (save_dm_list != DM_LIST_NULL)
set_curr_dm(save_dm_list);
@@ -388,11 +388,11 @@
return TCL_ERROR;
}
- o_dm_list = curr_dm_list;
- BU_ALLOC(curr_dm_list, struct mged_dm);
+ o_dm_list = mged_curr_dm;
+ BU_ALLOC(mged_curr_dm, struct mged_dm);
/* initialize predictor stuff */
- BU_LIST_INIT(&curr_dm_list->dml_p_vlist);
+ BU_LIST_INIT(&mged_curr_dm->dml_p_vlist);
predictor_init();
/* Only need to do this once */
@@ -411,7 +411,7 @@
struct bu_vls *dname = dm_get_dname(tmp_dmp);
if (dname && bu_vls_strlen(dname)) {
if (gui_setup(bu_vls_cstr(dname)) == TCL_ERROR) {
- bu_free((void *)curr_dm_list, "f_attach: dm_list");
+ bu_free((void *)mged_curr_dm, "f_attach: dm_list");
set_curr_dm(o_dm_list);
bu_vls_free(&tmp_vls);
dm_put(tmp_dmp);
@@ -418,7 +418,7 @@
return TCL_ERROR;
}
} else if (gui_setup((char *)NULL) == TCL_ERROR) {
- bu_free((void *)curr_dm_list, "f_attach: dm_list");
+ bu_free((void *)mged_curr_dm, "f_attach: dm_list");
set_curr_dm(o_dm_list);
bu_vls_free(&tmp_vls);
dm_put(tmp_dmp);
@@ -429,7 +429,7 @@
dm_put(tmp_dmp);
}
- BU_LIST_APPEND(&active_dm_set.l, &curr_dm_list->l);
+ BU_LIST_APPEND(&active_dm_set.l, &mged_curr_dm->l);
if (!wp_name) {
return TCL_ERROR;
@@ -449,7 +449,7 @@
cs_set_bg(sdp, name, base, value, NULL);
}
- mged_link_vars(curr_dm_list);
+ mged_link_vars(mged_curr_dm);
Tcl_ResetResult(INTERP);
const char *dm_name = dm_get_dm_name(DMP);
@@ -458,7 +458,7 @@
Tcl_AppendResult(INTERP, "ATTACHING ", dm_name, " (", dm_lname, ")\n",
(char *)NULL);
}
- share_dlist(curr_dm_list);
+ share_dlist(mged_curr_dm);
if (dm_get_displaylist(DMP) && mged_variables->mv_dlist &&
!dlist_state->dl_active) {
createDLists(GEDP->ged_gdp->gd_headDisplay);
@@ -469,8 +469,8 @@
(void)dm_set_win_bounds(DMP, windowbounds);
mged_fb_open();
- GEDP->ged_gvp = curr_dm_list->dml_view_state->vs_gvp;
- GEDP->ged_gvp->gv_grid = *curr_dm_list->dml_grid_state; /* struct copy */
+ GEDP->ged_gvp = mged_curr_dm->dml_view_state->vs_gvp;
+ GEDP->ged_gvp->gv_grid = *mged_curr_dm->dml_grid_state; /* struct copy */
return TCL_OK;
@@ -612,7 +612,7 @@
int
is_dm_null(void)
{
- return curr_dm_list == &active_dm_set;
+ return mged_curr_dm == &active_dm_set;
}
@@ -670,7 +670,7 @@
view_state->vs_gvp->gv_point_scale = 1.0;
view_state->vs_gvp->gv_curve_scale = 1.0;
view_state->vs_rc = 1;
- view_ring_init(curr_dm_list->dml_view_state, (struct _view_state *)NULL);
+ view_ring_init(mged_curr_dm->dml_view_state, (struct _view_state *)NULL);
DMP_dirty = 1;
mapped = 1;
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/buttons.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -952,7 +952,7 @@
stateChange(from, to);
- save_dm_list = curr_dm_list;
+ save_dm_list = mged_curr_dm;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
set_curr_dm(p);
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/chgview.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -442,7 +442,7 @@
/* update and resize the views */
- save_dmlp = curr_dm_list;
+ save_dmlp = mged_curr_dm;
save_cmd_list = curr_cmd_list;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
int non_empty = 0; /* start out empty */
@@ -449,8 +449,8 @@
set_curr_dm(dmlp);
- if (curr_dm_list->dml_tie) {
- curr_cmd_list = curr_dm_list->dml_tie;
+ if (mged_curr_dm->dml_tie) {
+ curr_cmd_list = mged_curr_dm->dml_tie;
} else {
curr_cmd_list = &head_cmd_list;
}
@@ -589,7 +589,7 @@
return TCL_OK;
}
- save_dmlp = curr_dm_list;
+ save_dmlp = mged_curr_dm;
save_cmd_list = curr_cmd_list;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
struct view_ring *vrp;
@@ -596,8 +596,8 @@
set_curr_dm(dmlp);
- if (curr_dm_list->dml_tie) {
- curr_cmd_list = curr_dm_list->dml_tie;
+ if (mged_curr_dm->dml_tie) {
+ curr_cmd_list = mged_curr_dm->dml_tie;
} else {
curr_cmd_list = &head_cmd_list;
}
@@ -1465,13 +1465,13 @@
case 'm':
edit_rate_model_rotate[X] += f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[X] += f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1478,7 +1478,7 @@
default:
edit_rate_view_rotate[X] += f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1499,13 +1499,13 @@
case 'm':
edit_rate_model_rotate[X] = f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[X] = f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1512,7 +1512,7 @@
default:
edit_rate_view_rotate[X] = f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1537,13 +1537,13 @@
case 'm':
edit_rate_model_rotate[Y] += f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[Y] += f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1550,7 +1550,7 @@
default:
edit_rate_view_rotate[Y] += f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1570,13 +1570,13 @@
case 'm':
edit_rate_model_rotate[Y] = f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[Y] = f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1583,7 +1583,7 @@
default:
edit_rate_view_rotate[Y] = f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1607,13 +1607,13 @@
case 'm':
edit_rate_model_rotate[Z] += f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[Z] += f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1620,7 +1620,7 @@
default:
edit_rate_view_rotate[Z] += f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1640,13 +1640,13 @@
case 'm':
edit_rate_model_rotate[Z] = f;
edit_rate_model_origin = origin;
- edit_rate_mr_dm_list = curr_dm_list;
+ edit_rate_mr_dm_list = mged_curr_dm;
break;
case 'o':
edit_rate_object_rotate[Z] = f;
edit_rate_object_origin = origin;
- edit_rate_or_dm_list = curr_dm_list;
+ edit_rate_or_dm_list = mged_curr_dm;
break;
case 'v':
@@ -1653,7 +1653,7 @@
default:
edit_rate_view_rotate[Z] = f;
edit_rate_view_origin = origin;
- edit_rate_vr_dm_list = curr_dm_list;
+ edit_rate_vr_dm_list = mged_curr_dm;
break;
}
@@ -1677,13 +1677,13 @@
case 'm':
case 'o':
edit_rate_model_tran[X] += f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[X] += f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -1701,13 +1701,13 @@
case 'm':
case 'o':
edit_rate_model_tran[X] = f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[X] = f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -1729,13 +1729,13 @@
case 'm':
case 'o':
edit_rate_model_tran[Y] += f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[Y] += f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -1753,13 +1753,13 @@
case 'm':
case 'o':
edit_rate_model_tran[Y] = f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[Y] = f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -1781,13 +1781,13 @@
case 'm':
case 'o':
edit_rate_model_tran[Z] += f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[Z] += f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -1805,13 +1805,13 @@
case 'm':
case 'o':
edit_rate_model_tran[Z] = f;
- edit_rate_mt_dm_list = curr_dm_list;
+ edit_rate_mt_dm_list = mged_curr_dm;
break;
case 'v':
default:
edit_rate_view_tran[Z] = f;
- edit_rate_vt_dm_list = curr_dm_list;
+ edit_rate_vt_dm_list = mged_curr_dm;
break;
}
@@ -2804,7 +2804,7 @@
view_state->vs_absolute_scale = 0.0;
if (mged_variables->mv_faceplate && mged_variables->mv_orig_gui) {
- curr_dm_list->dml_dirty = 1;
+ mged_curr_dm->dml_dirty = 1;
}
return TCL_OK;
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -680,7 +680,7 @@
if (!GEDP->ged_gvp)
GEDP->ged_gvp = view_state->vs_gvp;
- GEDP->ged_dmp = (void *)curr_dm_list->dml_dmp;
+ GEDP->ged_dmp = (void *)mged_curr_dm->dml_dmp;
ret = (*ctp->ged_func)(GEDP, argc, (const char **)argv);
Tcl_AppendResult(interpreter, bu_vls_addr(GEDP->ged_result_str), NULL);
@@ -1443,7 +1443,7 @@
if (GEDP == GED_NULL)
return TCL_OK;
- dml = curr_dm_list;
+ dml = mged_curr_dm;
GEDP->ged_gvp = view_state->vs_gvp;
status = mged_attach("postscript", argc, argv);
if (status == TCL_ERROR)
@@ -1502,8 +1502,8 @@
if (pn && BU_STR_EQUAL(argv[1], bu_vls_cstr(pn))) {
set_curr_dm(p);
- if (curr_dm_list->dml_tie)
- curr_cmd_list = curr_dm_list->dml_tie;
+ if (mged_curr_dm->dml_tie)
+ curr_cmd_list = mged_curr_dm->dml_tie;
else
curr_cmd_list = &head_cmd_list;
@@ -1828,7 +1828,7 @@
return TCL_ERROR;
/* update and resize the views */
- struct mged_dm *save_dmlp = curr_dm_list;
+ struct mged_dm *save_dmlp = mged_curr_dm;
struct cmd_list *save_cmd_list = curr_cmd_list;
struct mged_dm *dmlp;
struct display_list *gdlp;
@@ -1838,8 +1838,8 @@
set_curr_dm(dmlp);
- if (curr_dm_list->dml_tie) {
- curr_cmd_list = curr_dm_list->dml_tie;
+ if (mged_curr_dm->dml_tie) {
+ curr_cmd_list = mged_curr_dm->dml_tie;
} else {
curr_cmd_list = &head_cmd_list;
}
Modified: brlcad/trunk/src/mged/color_scheme.c
===================================================================
--- brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:11:09 UTC (rev
76930)
+++ brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:15:43 UTC (rev
76931)
@@ -287,7 +287,7 @@
void *UNUSED(data))
{
struct mged_dm *dmlp;
- struct mged_dm *save_curr_dmlp = curr_dm_list;
+ struct mged_dm *save_curr_dmlp = mged_curr_dm;
struct bu_vls vls = BU_VLS_INIT_ZERO;
bu_vls_printf(&vls, "dm bg %d %d %d",
Modified: brlcad/trunk/src/mged/doevent.c
===================================================================
--- brlcad/trunk/src/mged/doevent.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/doevent.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -124,11 +124,11 @@
if (eventPtr->type == DestroyNotify || (unsigned
long)eventPtr->xany.window == 0)
return TCL_OK;
- save_dm_list = curr_dm_list;
- GET_DM_LIST(curr_dm_list, (unsigned long)eventPtr->xany.window);
+ save_dm_list = mged_curr_dm;
+ GET_DM_LIST(mged_curr_dm, (unsigned long)eventPtr->xany.window);
/* it's an event for a window that I'm not handling */
- if (curr_dm_list == DM_LIST_NULL) {
+ if (mged_curr_dm == DM_LIST_NULL) {
set_curr_dm(save_dm_list);
return TCL_OK;
}
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -59,11 +59,11 @@
/*
* The vectorThreshold stuff in libdm may turn the
- * Tcl-crank causing curr_dm_list to change.
+ * Tcl-crank causing mged_curr_dm to change.
*/
- struct mged_dm *save_dm_list = curr_dm_list;
+ struct mged_dm *save_dm_list = mged_curr_dm;
- curr_dm_list->dml_ndrawn = 0;
+ mged_curr_dm->dml_ndrawn = 0;
inv_viewsize = view_state->vs_gvp->gv_isize;
/*
@@ -148,10 +148,10 @@
r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 0,
geometry_default_color, 1,
mged_variables->mv_dlist);
- /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
curr_dm_list to change. */
- if (curr_dm_list != save_dm_list) set_curr_dm(save_dm_list);
+ /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
mged_curr_dm to change. */
+ if (mged_curr_dm != save_dm_list) set_curr_dm(save_dm_list);
- curr_dm_list->dml_ndrawn += ndrawn;
+ mged_curr_dm->dml_ndrawn += ndrawn;
/* disable write to depth buffer */
dm_set_depth_mask(DMP, 0);
@@ -173,10 +173,10 @@
}
- /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
curr_dm_list to change. */
- if (curr_dm_list != save_dm_list) set_curr_dm(save_dm_list);
+ /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
mged_curr_dm to change. */
+ if (mged_curr_dm != save_dm_list) set_curr_dm(save_dm_list);
- curr_dm_list->dml_ndrawn += ndrawn;
+ mged_curr_dm->dml_ndrawn += ndrawn;
/* draw predictor vlist */
@@ -185,7 +185,7 @@
color_scheme->cs_predictor[0],
color_scheme->cs_predictor[1],
color_scheme->cs_predictor[2], 1, 1.0);
- dm_draw_vlist(DMP, (struct bn_vlist *)&curr_dm_list->dml_p_vlist);
+ dm_draw_vlist(DMP, (struct bn_vlist *)&mged_curr_dm->dml_p_vlist);
}
/*
@@ -213,10 +213,10 @@
r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 1,
geometry_default_color, 0, mged_variables->mv_dlist);
- curr_dm_list->dml_ndrawn += ndrawn;
+ mged_curr_dm->dml_ndrawn += ndrawn;
- /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
curr_dm_list to change. */
- if (curr_dm_list != save_dm_list) set_curr_dm(save_dm_list);
+ /* The vectorThreshold stuff in libdm may turn the Tcl-crank causing
mged_curr_dm to change. */
+ if (mged_curr_dm != save_dm_list) set_curr_dm(save_dm_list);
}
/*
@@ -252,7 +252,7 @@
struct mged_dm *dlp;
struct mged_dm *save_dlp;
- save_dlp = curr_dm_list;
+ save_dlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
if (dlp->dml_mapped &&
Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/edsol.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -2808,7 +2808,7 @@
}
bu_vls_printf(&str, ") [%d]: ", arb_vertices[type][loc]);
- const struct bu_vls *dnvp = dm_get_dname(curr_dm_list->dml_dmp);
+ const struct bu_vls *dnvp = dm_get_dname(mged_curr_dm->dml_dmp);
bu_vls_printf(&cmd, "cad_input_dialog .get_vertex %s {Need vertex for
solid rotate}\
{%s} vertex_num %d 0 {{ summary \"Enter a vertex number to rotate about.\"}}
OK",
Modified: brlcad/trunk/src/mged/fbserv.c
===================================================================
--- brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -133,7 +133,7 @@
found:
/* save */
- scdlp = curr_dm_list;
+ scdlp = mged_curr_dm;
set_curr_dm(dlp);
for (i = MAX_CLIENTS-1; i >= 0; i--) {
@@ -218,7 +218,7 @@
return;
/* save */
- scdlp = curr_dm_list;
+ scdlp = mged_curr_dm;
set_curr_dm(dlp);
@@ -287,7 +287,7 @@
*/
if (dm_interp(DMP) != NULL) {
- netchan = Tcl_OpenTcpServer((Tcl_Interp *)dm_interp(DMP), port,
hostname, fbserv_new_client_handler, (ClientData)curr_dm_list);
+ netchan = Tcl_OpenTcpServer((Tcl_Interp *)dm_interp(DMP), port,
hostname, fbserv_new_client_handler, (ClientData)mged_curr_dm);
}
if (netchan == NULL)
@@ -396,7 +396,7 @@
found:
/* save */
- scdlp = curr_dm_list;
+ scdlp = mged_curr_dm;
set_curr_dm(dlp);
fbserv_new_client(pkg_getclient(fd, pkg_switch, communications_error, 0));
Modified: brlcad/trunk/src/mged/menu.c
===================================================================
--- brlcad/trunk/src/mged/menu.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/menu.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -136,7 +136,7 @@
struct mged_dm *save_dm_list;
save_cmd_list = curr_cmd_list;
- save_dm_list = curr_dm_list;
+ save_dm_list = mged_curr_dm;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (p->dml_tie)
curr_cmd_list = p->dml_tie;
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/mged.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -346,7 +346,7 @@
struct mged_dm *p;
struct mged_dm *save_dm_list;
- save_dm_list = curr_dm_list;
+ save_dm_list = mged_curr_dm;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (!p->dml_owner)
continue;
@@ -1264,12 +1264,12 @@
memset((void *)&active_dm_set, 0, sizeof(struct mged_dm));
BU_LIST_INIT(&active_dm_set.l);
- BU_ALLOC(curr_dm_list, struct mged_dm);
- BU_LIST_APPEND(&active_dm_set.l, &curr_dm_list->l);
+ BU_ALLOC(mged_curr_dm, struct mged_dm);
+ BU_LIST_APPEND(&active_dm_set.l, &mged_curr_dm->l);
netfd = -1;
/* initialize predictor stuff */
- BU_LIST_INIT(&curr_dm_list->dml_p_vlist);
+ BU_LIST_INIT(&mged_curr_dm->dml_p_vlist);
predictor_init();
DMP = dm_get();
@@ -1279,7 +1279,7 @@
bu_vls_strcpy(dpvp, "nu");
}
- struct bu_vls *tnvp = dm_get_tkname(curr_dm_list->dml_dmp);
+ struct bu_vls *tnvp = dm_get_tkname(mged_curr_dm->dml_dmp);
if (tnvp) {
bu_vls_init(tnvp); /* this may leak */
bu_vls_strcpy(tnvp, "nu");
@@ -1312,7 +1312,7 @@
BU_ALLOC(view_state, struct _view_state);
view_state->vs_rc = 1;
- view_ring_init(curr_dm_list->dml_view_state, (struct _view_state *)NULL);
+ view_ring_init(mged_curr_dm->dml_view_state, (struct _view_state *)NULL);
MAT_IDN(view_state->vs_ModelDelta);
am_mode = AMM_IDLE;
@@ -1344,7 +1344,7 @@
mmenu_init();
btn_head_menu(0, 0, 0);
- mged_link_vars(curr_dm_list);
+ mged_link_vars(mged_curr_dm);
bu_vls_printf(&input_str, "set version \"%s\"", brlcad_ident("Geometry
Editor (MGED)"));
(void)Tcl_Eval(INTERP, bu_vls_addr(&input_str));
@@ -1989,7 +1989,7 @@
/*********************************
* Handle rate-based processing *
*********************************/
- save_dm_list = curr_dm_list;
+ save_dm_list = mged_curr_dm;
if (edit_rateflag_model_rotate) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
char save_coords;
@@ -2298,7 +2298,7 @@
update_views = 0;
- save_dm_list = curr_dm_list;
+ save_dm_list = mged_curr_dm;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
/*
* if something has changed, then go update the display.
@@ -2471,7 +2471,7 @@
dm_close(p->dml_dmp);
RT_FREE_VLIST(&p->dml_p_vlist);
mged_slider_free_vls(p);
- bu_free(p, "release: curr_dm_list");
+ bu_free(p, "release: mged_curr_dm");
}
set_curr_dm(DM_LIST_NULL);
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:15:43 UTC (rev 76931)
@@ -442,49 +442,49 @@
extern void set_curr_dm(struct mged_dm *nl);
#define DM_LIST_NULL ((struct mged_dm *)NULL)
-#define DMP curr_dm_list->dml_dmp
-#define DMP_dirty curr_dm_list->dml_dirty
-#define fbp curr_dm_list->dml_fbp
-#define netfd curr_dm_list->dml_netfd
+#define DMP mged_curr_dm->dml_dmp
+#define DMP_dirty mged_curr_dm->dml_dirty
+#define fbp mged_curr_dm->dml_fbp
+#define netfd mged_curr_dm->dml_netfd
#if defined(_WIN32) && !defined(__CYGWIN__)
-#define netchan curr_dm_list->dml_netchan
+#define netchan mged_curr_dm->dml_netchan
#endif
-#define clients curr_dm_list->dml_clients
-#define mapped curr_dm_list->dml_mapped
-#define owner curr_dm_list->dml_owner
-#define am_mode curr_dm_list->dml_am_mode
-#define perspective_angle curr_dm_list->dml_perspective_angle
-#define zclip_ptr curr_dm_list->dml_zclip_ptr
+#define clients mged_curr_dm->dml_clients
+#define mapped mged_curr_dm->dml_mapped
+#define owner mged_curr_dm->dml_owner
+#define am_mode mged_curr_dm->dml_am_mode
+#define perspective_angle mged_curr_dm->dml_perspective_angle
+#define zclip_ptr mged_curr_dm->dml_zclip_ptr
-#define view_state curr_dm_list->dml_view_state
-#define adc_state curr_dm_list->dml_adc_state
-#define menu_state curr_dm_list->dml_menu_state
-#define rubber_band curr_dm_list->dml_rubber_band
-#define mged_variables curr_dm_list->dml_mged_variables
-#define color_scheme curr_dm_list->dml_color_scheme
-#define grid_state curr_dm_list->dml_grid_state
-#define axes_state curr_dm_list->dml_axes_state
-#define dlist_state curr_dm_list->dml_dlist_state
+#define view_state mged_curr_dm->dml_view_state
+#define adc_state mged_curr_dm->dml_adc_state
+#define menu_state mged_curr_dm->dml_menu_state
+#define rubber_band mged_curr_dm->dml_rubber_band
+#define mged_variables mged_curr_dm->dml_mged_variables
+#define color_scheme mged_curr_dm->dml_color_scheme
+#define grid_state mged_curr_dm->dml_grid_state
+#define axes_state mged_curr_dm->dml_axes_state
+#define dlist_state mged_curr_dm->dml_dlist_state
-#define cmd_hook curr_dm_list->dml_cmd_hook
-#define viewpoint_hook curr_dm_list->dml_viewpoint_hook
-#define eventHandler curr_dm_list->dml_eventHandler
+#define cmd_hook mged_curr_dm->dml_cmd_hook
+#define viewpoint_hook mged_curr_dm->dml_viewpoint_hook
+#define eventHandler mged_curr_dm->dml_eventHandler
-#define adc_auto curr_dm_list->dml_adc_auto
-#define grid_auto_size curr_dm_list->dml_grid_auto_size
+#define adc_auto mged_curr_dm->dml_adc_auto
+#define grid_auto_size mged_curr_dm->dml_grid_auto_size
/* Names of macros must be different than actual struct element */
-#define dml_mouse_dx curr_dm_list->_dml_mouse_dx
-#define dml_mouse_dy curr_dm_list->_dml_mouse_dy
-#define dml_omx curr_dm_list->_dml_omx
-#define dml_omy curr_dm_list->_dml_omy
-#define dml_knobs curr_dm_list->_dml_knobs
-#define dml_work_pt curr_dm_list->_dml_work_pt
+#define dml_mouse_dx mged_curr_dm->_dml_mouse_dx
+#define dml_mouse_dy mged_curr_dm->_dml_mouse_dy
+#define dml_omx mged_curr_dm->_dml_omx
+#define dml_omy mged_curr_dm->_dml_omy
+#define dml_knobs mged_curr_dm->_dml_knobs
+#define dml_work_pt mged_curr_dm->_dml_work_pt
-#define scroll_top curr_dm_list->dml_scroll_top
-#define scroll_active curr_dm_list->dml_scroll_active
-#define scroll_y curr_dm_list->dml_scroll_y
-#define scroll_array curr_dm_list->dml_scroll_array
+#define scroll_top mged_curr_dm->dml_scroll_top
+#define scroll_active mged_curr_dm->dml_scroll_active
+#define scroll_y mged_curr_dm->dml_scroll_y
+#define scroll_array mged_curr_dm->dml_scroll_array
#define VIEWSIZE (view_state->vs_gvp->gv_size) /* Width of viewing
cube */
#define VIEWFACTOR (1/view_state->vs_gvp->gv_scale)
@@ -563,7 +563,7 @@
extern int dm_pipe[]; /* defined in mged.c */
extern int update_views; /* defined in mged.c */
extern struct mged_dm active_dm_set; /* defined in attach.c */
-extern struct mged_dm *curr_dm_list; /* defined in attach.c */
+extern struct mged_dm *mged_curr_dm; /* defined in attach.c */
/* defined in doevent.c */
#ifdef HAVE_X11_TYPES
Modified: brlcad/trunk/src/mged/overlay.c
===================================================================
--- brlcad/trunk/src/mged/overlay.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/overlay.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -45,7 +45,7 @@
Tcl_DStringInit(&ds);
- GEDP->ged_dmp = (void *)curr_dm_list->dml_dmp;
+ GEDP->ged_dmp = (void *)mged_curr_dm->dml_dmp;
ret = ged_overlay(GEDP, argc, argv);
Tcl_DStringAppend(&ds, bu_vls_addr(GEDP->ged_result_str), -1);
Tcl_DStringResult(interp, &ds);
Modified: brlcad/trunk/src/mged/predictor.c
===================================================================
--- brlcad/trunk/src/mged/predictor.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/predictor.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -121,7 +121,7 @@
int i;
for (i = 0; i < NUM_TRAILS; ++i)
- init_trail(&curr_dm_list->dml_trails[i]);
+ init_trail(&mged_curr_dm->dml_trails[i]);
}
@@ -128,7 +128,7 @@
void
predictor_kill(void)
{
- RT_FREE_VLIST(&curr_dm_list->dml_p_vlist);
+ RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
predictor_init();
}
@@ -181,7 +181,7 @@
return;
}
- RT_FREE_VLIST(&curr_dm_list->dml_p_vlist);
+ RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
/* Advance into the future */
nframes = (int)(mged_variables->mv_predictor_advance / frametime);
@@ -204,8 +204,8 @@
/* Centering dot */
VSETALL(delta_v, 0.0);
TF_VL(m, delta_v);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, m, BN_VLIST_LINE_MOVE);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, m, BN_VLIST_LINE_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, m, BN_VLIST_LINE_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, m, BN_VLIST_LINE_DRAW);
/* The exterior rectangle */
VSET(delta_v, -TF_X, -TF_Y, 0.0);
@@ -251,53 +251,53 @@
VCROSS(norm, right, up);
VUNITIZE(norm);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, norm, BN_VLIST_POLY_START);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mA, BN_VLIST_POLY_MOVE);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mB, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mF, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mE, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mA, BN_VLIST_POLY_END);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mA, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mB, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mF, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mE, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mA, BN_VLIST_POLY_END);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, norm, BN_VLIST_POLY_START);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mE, BN_VLIST_POLY_MOVE);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mI, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mL, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mH, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mE, BN_VLIST_POLY_END);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mE, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mI, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mL, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mH, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mE, BN_VLIST_POLY_END);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, norm, BN_VLIST_POLY_START);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mH, BN_VLIST_POLY_MOVE);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mG, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mC, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mD, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mH, BN_VLIST_POLY_END);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mH, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mG, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mC, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mD, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mH, BN_VLIST_POLY_END);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, norm, BN_VLIST_POLY_START);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mJ, BN_VLIST_POLY_MOVE);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mF, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mG, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mK, BN_VLIST_POLY_DRAW);
- RT_ADD_VLIST(&curr_dm_list->dml_p_vlist, mJ, BN_VLIST_POLY_END);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mJ, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mF, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mG, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mK, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dml_p_vlist, mJ, BN_VLIST_POLY_END);
- push_trail(&curr_dm_list->dml_trails[0], mA);
- push_trail(&curr_dm_list->dml_trails[1], mB);
- push_trail(&curr_dm_list->dml_trails[2], mC);
- push_trail(&curr_dm_list->dml_trails[3], mD);
+ push_trail(&mged_curr_dm->dml_trails[0], mA);
+ push_trail(&mged_curr_dm->dml_trails[1], mB);
+ push_trail(&mged_curr_dm->dml_trails[2], mC);
+ push_trail(&mged_curr_dm->dml_trails[3], mD);
- push_trail(&curr_dm_list->dml_trails[4], mE);
- push_trail(&curr_dm_list->dml_trails[5], mF);
- push_trail(&curr_dm_list->dml_trails[6], mG);
- push_trail(&curr_dm_list->dml_trails[7], mH);
+ push_trail(&mged_curr_dm->dml_trails[4], mE);
+ push_trail(&mged_curr_dm->dml_trails[5], mF);
+ push_trail(&mged_curr_dm->dml_trails[6], mG);
+ push_trail(&mged_curr_dm->dml_trails[7], mH);
/* Draw the trails */
- poly_trail(&trail, &curr_dm_list->dml_trails[0],
&curr_dm_list->dml_trails[4]);
- BU_LIST_APPEND_LIST(&curr_dm_list->dml_p_vlist, &trail);
- poly_trail(&trail, &curr_dm_list->dml_trails[1],
&curr_dm_list->dml_trails[5]);
- BU_LIST_APPEND_LIST(&curr_dm_list->dml_p_vlist, &trail);
- poly_trail(&trail, &curr_dm_list->dml_trails[6],
&curr_dm_list->dml_trails[2]);
- BU_LIST_APPEND_LIST(&curr_dm_list->dml_p_vlist, &trail);
- poly_trail(&trail, &curr_dm_list->dml_trails[7],
&curr_dm_list->dml_trails[3]);
- BU_LIST_APPEND_LIST(&curr_dm_list->dml_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dml_trails[0],
&mged_curr_dm->dml_trails[4]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dml_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dml_trails[1],
&mged_curr_dm->dml_trails[5]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dml_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dml_trails[6],
&mged_curr_dm->dml_trails[2]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dml_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dml_trails[7],
&mged_curr_dm->dml_trails[3]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dml_p_vlist, &trail);
/* Done */
MAT_IDN(view_state->vs_ModelDelta);
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -309,7 +309,7 @@
struct mged_dm *dmlp;
struct mged_dm *save_dmlp;
- save_dmlp = curr_dm_list;
+ save_dmlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables == save_dmlp->dml_mged_variables) {
@@ -376,7 +376,7 @@
struct mged_dm *save_dlp;
/* save current display manager */
- save_dlp = curr_dm_list;
+ save_dlp = mged_curr_dm;
if (mged_variables->mv_dlist) {
/* create display lists */
Modified: brlcad/trunk/src/mged/share.c
===================================================================
--- brlcad/trunk/src/mged/share.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/share.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -182,7 +182,7 @@
if (dlp1->dml_mged_variables->mv_dlist) {
struct mged_dm *save_dlp;
- save_dlp = curr_dm_list;
+ save_dlp = mged_curr_dm;
set_curr_dm(dlp1);
createDLists(GEDP->ged_gdp->gd_headDisplay);
@@ -387,7 +387,7 @@
/* it doesn't make sense to save display list info */
if (!--dlp2->dml_dlist_state->dl_rc)
- bu_free((void *)curr_dm_list->dml_dlist_state, "usurp_all_resources:
_dlist_state");
+ bu_free((void *)mged_curr_dm->dml_dlist_state, "usurp_all_resources:
_dlist_state");
}
Modified: brlcad/trunk/src/mged/titles.c
===================================================================
--- brlcad/trunk/src/mged/titles.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/titles.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -301,7 +301,7 @@
}
bu_vls_trunc(&vls, 0);
bu_vls_printf(&vls, "cent=(%s %s %s)", cent_x, cent_y, cent_z);
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_center_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_center_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
tmp_val = view_state->vs_gvp->gv_size*base2local;
@@ -310,7 +310,7 @@
} else {
sprintf(size, "sz=%.3g", tmp_val);
}
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_size_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_size_name),
size, TCL_GLOBAL_ONLY);
bu_vls_trunc(&vls, 0);
@@ -320,7 +320,7 @@
bu_vls_trunc(&vls, 0);
bu_vls_printf(&vls, "az=%3.2f el=%3.2f tw=%3.2f",
V3ARGS(view_state->vs_gvp->gv_aet));
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_aet_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_aet_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
sprintf(ang_x, "%.2f", view_state->vs_rate_rotate[X]);
@@ -329,7 +329,7 @@
bu_vls_trunc(&vls, 0);
bu_vls_printf(&vls, "ang=(%s %s %s)", ang_x, ang_y, ang_z);
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_ang_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_ang_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
dm_set_line_attr(DMP, mged_variables->mv_linewidth, 0);
@@ -542,11 +542,11 @@
dm_draw_string_2d(DMP, bu_vls_addr(&vls),
GED2PM1(TITLE_XBASE), GED2PM1(TITLE_YBASE +
TEXT1_DY), 1, 0);
}
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_adc_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_adc_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
ss_line_not_drawn = 0;
} else {
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_adc_name), "",
TCL_GLOBAL_ONLY);
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_adc_name), "",
TCL_GLOBAL_ONLY);
}
if (STATE == ST_S_EDIT || STATE == ST_O_EDIT) {
@@ -614,7 +614,7 @@
dm_draw_string_2d(DMP, bu_vls_addr(&vls),
GED2PM1(TITLE_XBASE), GED2PM1(TITLE_YBASE +
TEXT1_DY), 1, 0);
}
- Tcl_SetVar(INTERP, bu_vls_addr(&curr_dm_list->dml_fps_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_fps_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
bu_vls_free(&vls);
Modified: brlcad/trunk/src/mged/usepen.c
===================================================================
--- brlcad/trunk/src/mged/usepen.c 2020-08-24 22:11:09 UTC (rev 76930)
+++ brlcad/trunk/src/mged/usepen.c 2020-08-24 22:15:43 UTC (rev 76931)
@@ -55,11 +55,11 @@
struct solid *sp;
/*
- * Divide the mouse into 'curr_dm_list->dml_ndrawn' VERTICAL
+ * Divide the mouse into 'mged_curr_dm->dml_ndrawn' VERTICAL
* zones, and use the zone number as a sequential position among
* solids which are drawn.
*/
- count = ((fastf_t)y + GED_MAX) * curr_dm_list->dml_ndrawn / GED_RANGE;
+ count = ((fastf_t)y + GED_MAX) * mged_curr_dm->dml_ndrawn / GED_RANGE;
gdlp = BU_LIST_NEXT(display_list, GEDP->ged_gdp->gd_headDisplay);
while (BU_LIST_NOT_HEAD(gdlp, GEDP->ged_gdp->gd_headDisplay)) {
@@ -104,7 +104,7 @@
return TCL_ERROR;
}
- if (!(curr_dm_list->dml_ndrawn)) {
+ if (!(mged_curr_dm->dml_ndrawn)) {
return TCL_OK;
} else if (STATE != ST_S_PICK && STATE != ST_O_PICK && STATE !=
ST_O_PATH) {
return TCL_OK;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
