Revision: 76929
http://sourceforge.net/p/brlcad/code/76929
Author: starseeker
Date: 2020-08-24 22:04:25 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
rename
Modified Paths:
--------------
brlcad/trunk/src/mged/adc.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/axes.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/dozoom.c
brlcad/trunk/src/mged/edsol.c
brlcad/trunk/src/mged/fbserv.c
brlcad/trunk/src/mged/grid.c
brlcad/trunk/src/mged/menu.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/mged/rect.c
brlcad/trunk/src/mged/set.c
brlcad/trunk/src/mged/share.c
Modified: brlcad/trunk/src/mged/adc.c
===================================================================
--- brlcad/trunk/src/mged/adc.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -78,7 +78,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_adc_state == adc_state)
dmlp->dml_dirty = 1;
}
@@ -92,7 +92,7 @@
save_dmlp = curr_dm_list;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_adc_state == adc_state) {
set_curr_dm(dmlp);
set_scroll();
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/attach.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -43,6 +43,7 @@
#include "vmath.h"
#include "bu/env.h"
+#include "bu/ptbl.h"
#include "ged.h"
#include "tclcad.h"
@@ -56,7 +57,7 @@
extern struct _color_scheme default_color_scheme;
int mged_default_dlist = 0; /* This variable is available via Tcl for
controlling use of display lists */
-struct dm_list head_dm_list; /* list of active display managers */
+struct dm_list active_dm_set; /* set of active display managers */
struct dm_list *curr_dm_list = (struct dm_list *)NULL;
static fastf_t windowbounds[6] = { XMIN, XMAX, YMIN, YMAX, (int)GED_MIN,
(int)GED_MAX };
@@ -159,7 +160,7 @@
if (BU_STR_EQUAL("nu", name))
return TCL_OK; /* Ignore */
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
struct bu_vls *pathname = dm_get_pathname(p->dml_dmp);
if (pathname && bu_vls_strlen(pathname) && !BU_STR_EQUAL(name,
bu_vls_cstr(pathname)))
continue;
@@ -172,7 +173,7 @@
break;
}
- if (p == &head_dm_list) {
+ if (p == &active_dm_set) {
Tcl_AppendResult(INTERP, "release: ", name,
" not found\n", (char *)NULL);
return TCL_ERROR;
@@ -199,7 +200,7 @@
* like the last one the user had open. This depends on "nu"
* always being last in the list.
*/
- usurp_all_resources(BU_LIST_LAST(dm_list, &head_dm_list.l), curr_dm_list);
+ usurp_all_resources(BU_LIST_LAST(dm_list, &active_dm_set.l), curr_dm_list);
/* If this display is being referenced by a command window, then
* remove the reference.
@@ -218,7 +219,7 @@
if (save_dm_list != DM_LIST_NULL)
set_curr_dm(save_dm_list);
else
- set_curr_dm((struct dm_list *)head_dm_list.l.forw);
+ set_curr_dm((struct dm_list *)active_dm_set.l.forw);
return TCL_OK;
}
@@ -428,7 +429,7 @@
dm_put(tmp_dmp);
}
- BU_LIST_APPEND(&head_dm_list.l, &curr_dm_list->l);
+ BU_LIST_APPEND(&active_dm_set.l, &curr_dm_list->l);
if (!wp_name) {
return TCL_ERROR;
@@ -611,7 +612,7 @@
int
is_dm_null(void)
{
- return curr_dm_list == &head_dm_list;
+ return curr_dm_list == &active_dm_set;
}
@@ -641,7 +642,7 @@
BU_ALLOC(color_scheme, struct _color_scheme);
/* initialize using the nu display manager */
- *color_scheme = *BU_LIST_LAST(dm_list, &head_dm_list.l)->dml_color_scheme;
+ *color_scheme = *BU_LIST_LAST(dm_list, &active_dm_set.l)->dml_color_scheme;
color_scheme->cs_rc = 1;
@@ -712,7 +713,7 @@
return TCL_ERROR;
}
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
struct bu_vls *pn = dm_get_pathname(dlp->dml_dmp);
if (pn && bu_vls_strlen(pn))
Tcl_AppendElement(interpreter, bu_vls_cstr(pn));
Modified: brlcad/trunk/src/mged/axes.c
===================================================================
--- brlcad/trunk/src/mged/axes.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/axes.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -87,7 +87,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_axes_state == axes_state)
dmlp->dml_dirty = 1;
}
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/buttons.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -740,7 +740,7 @@
return TCL_OK;
}
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables->mv_transform == 'e')
dmlp->dml_mged_variables->mv_transform = 'v';
@@ -804,7 +804,7 @@
mged_color_soltab();
(void)chg_state(STATE, ST_VIEW, "Edit Reject");
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables->mv_transform == 'e')
dmlp->dml_mged_variables->mv_transform = 'v';
@@ -953,7 +953,7 @@
stateChange(from, to);
save_dm_list = curr_dm_list;
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
set_curr_dm(p);
new_mats();
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/chgview.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -444,7 +444,7 @@
save_dmlp = curr_dm_list;
save_cmd_list = curr_cmd_list;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
int non_empty = 0; /* start out empty */
set_curr_dm(dmlp);
@@ -591,7 +591,7 @@
save_dmlp = curr_dm_list;
save_cmd_list = curr_cmd_list;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
struct view_ring *vrp;
set_curr_dm(dmlp);
@@ -2833,7 +2833,7 @@
status = mged_svbase();
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
/* if sharing view while faceplate and original gui (i.e. button menu,
sliders) are on */
if (dmlp->dml_view_state == view_state &&
dmlp->dml_mged_variables->mv_faceplate &&
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -1393,13 +1393,13 @@
else
bu_vls_strcpy(&vls, argv[2]);
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
struct bu_vls *pn = dm_get_pathname(dlp->dml_dmp);
if (pn && !bu_vls_strcmp(&vls, pn))
break;
}
- if (dlp == &head_dm_list) {
+ if (dlp == &active_dm_set) {
Tcl_AppendResult(interpreter, "f_tie: unrecognized path name - ",
bu_vls_addr(&vls), "\n", (char *)NULL);
bu_vls_free(&vls);
@@ -1497,7 +1497,7 @@
}
/* change primary focus to window argv[1] */
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
struct bu_vls *pn = dm_get_pathname(p->dml_dmp);
if (pn && BU_STR_EQUAL(argv[1], bu_vls_cstr(pn))) {
set_curr_dm(p);
@@ -1833,7 +1833,7 @@
struct dm_list *dmlp;
struct display_list *gdlp;
struct display_list *next_gdlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
int non_empty = 0; /* start out empty */
set_curr_dm(dmlp);
Modified: brlcad/trunk/src/mged/color_scheme.c
===================================================================
--- brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:00:51 UTC (rev
76928)
+++ brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:04:25 UTC (rev
76929)
@@ -245,7 +245,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_color_scheme == color_scheme)
dmlp->dml_dirty = 1;
}
@@ -302,7 +302,7 @@
// where we act on all dm instances. set_curr_dm
// should probably be replaced with get_next_dm
struct bview *cbv = GEDP->ged_gvp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
if (dmlp->dml_color_scheme == color_scheme) {
dmlp->dml_dirty = 1;
set_curr_dm(dmlp);
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -254,7 +254,7 @@
save_dlp = curr_dm_list;
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
if (dlp->dml_mapped &&
dm_get_displaylist(dlp->dml_dmp) &&
dlp->dml_mged_variables->mv_dlist) {
@@ -307,7 +307,7 @@
{
struct dm_list *dlp;
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
if (dm_get_displaylist(dlp->dml_dmp) &&
dlp->dml_mged_variables->mv_dlist) {
(void)dm_make_current(DMP);
Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/edsol.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -920,7 +920,7 @@
MAT_IDN(acc_rot_sol);
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
dmlp->dml_mged_variables->mv_transform = 'e';
}
}
Modified: brlcad/trunk/src/mged/fbserv.c
===================================================================
--- brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -123,7 +123,7 @@
struct dm_list *dlp;
struct dm_list *scdlp; /* save current dm_list pointer */
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
for (i = MAX_CLIENTS-1; i >= 0; i--)
if (fd == dlp->dml_clients[i].c_fd)
goto found;
@@ -388,7 +388,7 @@
struct dm_list *dlp;
struct dm_list *scdlp; /* save current dm_list pointer */
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
if (fd == dlp->dml_netfd)
goto found;
Modified: brlcad/trunk/src/mged/grid.c
===================================================================
--- brlcad/trunk/src/mged/grid.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/grid.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -79,7 +79,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_grid_state == grid_state)
dmlp->dml_dirty = 1;
}
@@ -107,7 +107,7 @@
grid_state->res_h = res;
grid_state->res_v = res;
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
if (dlp->dml_grid_state == grid_state)
dlp->dml_grid_auto_size = 0;
}
@@ -126,7 +126,7 @@
grid_set_dirty_flag(sdp, name, base, value, data);
if (grid_auto_size)
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
if (dlp->dml_grid_state == grid_state)
dlp->dml_grid_auto_size = 0;
}
@@ -424,7 +424,7 @@
struct bu_vls save_result = BU_VLS_INIT_ZERO;
struct bu_vls cmd = BU_VLS_INIT_ZERO;
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
dlp->dml_grid_state->res_h *= sf;
dlp->dml_grid_state->res_v *= sf;
VSCALE(dlp->dml_grid_state->anchor, dlp->dml_grid_state->anchor, sf);
Modified: brlcad/trunk/src/mged/menu.c
===================================================================
--- brlcad/trunk/src/mged/menu.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/menu.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -119,7 +119,7 @@
Tcl_DStringFree(&ds_menu);
bu_vls_free(&menu_string);
- FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
if (menu_state == dlp->dml_menu_state &&
dlp->dml_mged_variables->mv_faceplate &&
dlp->dml_mged_variables->mv_orig_gui)
@@ -137,7 +137,7 @@
save_cmd_list = curr_cmd_list;
save_dm_list = curr_dm_list;
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ 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:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/mged.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -347,7 +347,7 @@
struct dm_list *save_dm_list;
save_dm_list = curr_dm_list;
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (!p->dml_owner)
continue;
@@ -1261,11 +1261,11 @@
bu_vls_strcpy(&head_cmd_list.cl_name, "mged");
curr_cmd_list = &head_cmd_list;
- memset((void *)&head_dm_list, 0, sizeof(struct dm_list));
- BU_LIST_INIT(&head_dm_list.l);
+ memset((void *)&active_dm_set, 0, sizeof(struct dm_list));
+ BU_LIST_INIT(&active_dm_set.l);
BU_ALLOC(curr_dm_list, struct dm_list);
- BU_LIST_APPEND(&head_dm_list.l, &curr_dm_list->l);
+ BU_LIST_APPEND(&active_dm_set.l, &curr_dm_list->l);
netfd = -1;
/* initialize predictor stuff */
@@ -2183,7 +2183,7 @@
edobj = save_edflag;
}
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (!p->dml_owner)
continue;
@@ -2279,7 +2279,7 @@
int64_t elapsed_time, start_time = bu_gettime();
int do_time = 0;
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (!p->dml_view_state)
continue;
if (update_views || p->dml_view_state->vs_flag)
@@ -2290,7 +2290,7 @@
* This needs to be done separately because dml_view_state may be
* shared.
*/
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
if (!p->dml_view_state)
continue;
p->dml_view_state->vs_flag = 0;
@@ -2299,7 +2299,7 @@
update_views = 0;
save_dm_list = curr_dm_list;
- FOR_ALL_DISPLAYS(p, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
/*
* if something has changed, then go update the display.
* Otherwise, we are happy with the view we have
@@ -2461,7 +2461,7 @@
(void)sprintf(place, "exit_status=%d", exitcode);
/* Release all displays */
- while (BU_LIST_WHILE(p, dm_list, &(head_dm_list.l))) {
+ while (BU_LIST_WHILE(p, dm_list, &(active_dm_set.l))) {
if (!p)
bu_bomb("dm list entry is null? aborting!\n");
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:04:25 UTC (rev 76929)
@@ -548,7 +548,7 @@
#define GET_DM_LIST(p, id) { \
struct dm_list *tp; \
\
- FOR_ALL_DISPLAYS(tp, &head_dm_list.l) { \
+ FOR_ALL_DISPLAYS(tp, &active_dm_set.l) { \
if ((id) == dm_get_id(tp->dml_dmp)) { \
(p) = tp; \
break; \
@@ -555,7 +555,7 @@
} \
} \
\
- if (BU_LIST_IS_HEAD(tp, &head_dm_list.l)) \
+ if (BU_LIST_IS_HEAD(tp, &active_dm_set.l)) \
(p) = DM_LIST_NULL; \
}
@@ -562,7 +562,7 @@
extern double frametime; /* defined in mged.c */
extern int dm_pipe[]; /* defined in mged.c */
extern int update_views; /* defined in mged.c */
-extern struct dm_list head_dm_list; /* defined in attach.c */
+extern struct dm_list active_dm_set; /* defined in attach.c */
extern struct dm_list *curr_dm_list; /* defined in attach.c */
/* defined in doevent.c */
Modified: brlcad/trunk/src/mged/rect.c
===================================================================
--- brlcad/trunk/src/mged/rect.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/rect.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -73,7 +73,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_rubber_band == rubber_band)
dmlp->dml_dirty = 1;
}
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -140,7 +140,7 @@
{
struct dm_list *dmlp;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables == mged_variables)
dmlp->dml_dirty = 1;
}
@@ -311,7 +311,7 @@
save_dmlp = curr_dm_list;
- FOR_ALL_DISPLAYS(dmlp, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables == save_dmlp->dml_mged_variables) {
set_curr_dm(dmlp);
@@ -382,7 +382,7 @@
/* create display lists */
/* for each display manager dlp1 that shares its dml_mged_variables
with save_dlp */
- FOR_ALL_DISPLAYS(dlp1, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l) {
if (dlp1->dml_mged_variables != save_dlp->dml_mged_variables) {
continue;
}
@@ -401,13 +401,13 @@
*/
/* for each display manager dlp1 that shares its dml_mged_variables
with save_dlp */
- FOR_ALL_DISPLAYS(dlp1, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l) {
if (dlp1->dml_mged_variables != save_dlp->dml_mged_variables)
continue;
if (dlp1->dml_dlist_state->dl_active) {
/* for each display manager dlp2 that is sharing display lists
with dlp1 */
- FOR_ALL_DISPLAYS(dlp2, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp2, &active_dm_set.l) {
if (dlp2->dml_dlist_state != dlp1->dml_dlist_state) {
continue;
}
@@ -418,7 +418,7 @@
}
/* these display lists are not being used, so free them */
- if (BU_LIST_IS_HEAD(dlp2, &head_dm_list.l)) {
+ if (BU_LIST_IS_HEAD(dlp2, &active_dm_set.l)) {
struct display_list *gdlp;
struct display_list *next_gdlp;
Modified: brlcad/trunk/src/mged/share.c
===================================================================
--- brlcad/trunk/src/mged/share.c 2020-08-24 22:00:51 UTC (rev 76928)
+++ brlcad/trunk/src/mged/share.c 2020-08-24 22:04:25 UTC (rev 76929)
@@ -113,11 +113,11 @@
++argv;
}
- FOR_ALL_DISPLAYS(dlp1, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l)
if (dm_get_pathname(dlp1->dml_dmp) && BU_STR_EQUAL(argv[2],
bu_vls_addr(dm_get_pathname(dlp1->dml_dmp))))
break;
- if (dlp1 == &head_dm_list) {
+ if (dlp1 == &active_dm_set) {
Tcl_AppendResult(interpreter, "share: unrecognized path name - ",
argv[2], "\n", (char *)NULL);
@@ -126,11 +126,11 @@
}
if (!uflag) {
- FOR_ALL_DISPLAYS(dlp2, &head_dm_list.l)
+ FOR_ALL_DISPLAYS(dlp2, &active_dm_set.l)
if (dm_get_pathname(dlp2->dml_dmp) && BU_STR_EQUAL(argv[3],
bu_vls_addr(dm_get_pathname(dlp2->dml_dmp))))
break;
- if (dlp2 == &head_dm_list) {
+ if (dlp2 == &active_dm_set) {
Tcl_AppendResult(interpreter, "share: unrecognized path name - ",
argv[3], "\n", (char *)NULL);
@@ -434,7 +434,7 @@
if (!dm_get_displaylist(dlp2->dml_dmp))
return;
- FOR_ALL_DISPLAYS(dlp1, &head_dm_list.l) {
+ FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l) {
if (dlp1 != dlp2 &&
dm_get_type(dlp1->dml_dmp) == dm_get_type(dlp2->dml_dmp) &&
dm_get_dname(dlp1->dml_dmp) && dm_get_dname(dlp2->dml_dmp) &&
!bu_vls_strcmp(dm_get_dname(dlp1->dml_dmp),
dm_get_dname(dlp2->dml_dmp))) {
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
