Revision: 76930
http://sourceforge.net/p/brlcad/code/76930
Author: starseeker
Date: 2020-08-24 22:11:09 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
Rename dm_list container to better reflect what it is - an mged superset of
struct dm
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/doevent.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.h
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/mged/rect.c
brlcad/trunk/src/mged/sedit.h
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:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -76,7 +76,7 @@
void
adc_set_dirty_flag(void)
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_adc_state == adc_state)
@@ -87,8 +87,8 @@
void
adc_set_scroll(void)
{
- struct dm_list *dmlp;
- struct dm_list *save_dmlp;
+ struct mged_dm *dmlp;
+ struct mged_dm *save_dmlp;
save_dmlp = curr_dm_list;
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/attach.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -52,17 +52,17 @@
#include "./sedit.h"
#include "./mged_dm.h"
-extern void share_dlist(struct dm_list *dlp2); /* defined in share.c */
+extern void share_dlist(struct mged_dm *dlp2); /* defined in share.c */
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 active_dm_set; /* set of active display managers */
-struct dm_list *curr_dm_list = (struct dm_list *)NULL;
+struct mged_dm active_dm_set; /* set of active display managers */
+struct mged_dm *curr_dm_list = (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 dm_list *nl)
+void set_curr_dm(struct mged_dm *nl)
{
curr_dm_list = nl;
if (nl != DM_LIST_NULL) {
@@ -76,7 +76,7 @@
}
int
-mged_dm_init(struct dm_list *o_dm_list,
+mged_dm_init(struct mged_dm *o_dm_list,
const char *dm_type,
int argc,
const char *argv[])
@@ -123,7 +123,7 @@
void
-mged_slider_init_vls(struct dm_list *p)
+mged_slider_init_vls(struct mged_dm *p)
{
bu_vls_init(&p->dml_fps_name);
bu_vls_init(&p->dml_aet_name);
@@ -135,7 +135,7 @@
void
-mged_slider_free_vls(struct dm_list *p)
+mged_slider_free_vls(struct mged_dm *p)
{
if (BU_VLS_IS_INITIALIZED(&p->dml_fps_name)) {
bu_vls_free(&p->dml_fps_name);
@@ -151,11 +151,11 @@
int
release(char *name, int need_close)
{
- struct dm_list *save_dm_list = DM_LIST_NULL;
+ struct mged_dm *save_dm_list = DM_LIST_NULL;
struct bu_vls *cpathname = dm_get_pathname(DMP);
if (name != NULL) {
- struct dm_list *p;
+ struct mged_dm *p;
if (BU_STR_EQUAL("nu", name))
return TCL_OK; /* Ignore */
@@ -200,13 +200,13 @@
* 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, &active_dm_set.l), curr_dm_list);
+ usurp_all_resources(BU_LIST_LAST(mged_dm, &active_dm_set.l), curr_dm_list);
/* 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 dm_list *)NULL;
+ curr_dm_list->dml_tie->cl_tie = (struct mged_dm *)NULL;
if (need_close)
dm_close(DMP);
@@ -219,7 +219,7 @@
if (save_dm_list != DM_LIST_NULL)
set_curr_dm(save_dm_list);
else
- set_curr_dm((struct dm_list *)active_dm_set.l.forw);
+ set_curr_dm((struct mged_dm *)active_dm_set.l.forw);
return TCL_OK;
}
@@ -382,7 +382,7 @@
{
int opt_argc;
char **opt_argv;
- struct dm_list *o_dm_list;
+ struct mged_dm *o_dm_list;
if (!wp_name) {
return TCL_ERROR;
@@ -389,7 +389,7 @@
}
o_dm_list = curr_dm_list;
- BU_ALLOC(curr_dm_list, struct dm_list);
+ BU_ALLOC(curr_dm_list, struct mged_dm);
/* initialize predictor stuff */
BU_LIST_INIT(&curr_dm_list->dml_p_vlist);
@@ -617,7 +617,7 @@
void
-dm_var_init(struct dm_list *initial_dm_list)
+dm_var_init(struct mged_dm *initial_dm_list)
{
BU_ALLOC(adc_state, struct _adc_state);
*adc_state = *initial_dm_list->dml_adc_state; /* struct copy
*/
@@ -642,7 +642,7 @@
BU_ALLOC(color_scheme, struct _color_scheme);
/* initialize using the nu display manager */
- *color_scheme = *BU_LIST_LAST(dm_list, &active_dm_set.l)->dml_color_scheme;
+ *color_scheme = *BU_LIST_LAST(mged_dm, &active_dm_set.l)->dml_color_scheme;
color_scheme->cs_rc = 1;
@@ -683,7 +683,7 @@
void
-mged_link_vars(struct dm_list *p)
+mged_link_vars(struct mged_dm *p)
{
mged_slider_init_vls(p);
struct bu_vls *pn = dm_get_pathname(p->dml_dmp);
@@ -701,7 +701,7 @@
int
f_get_dm_list(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int
argc, const char *argv[])
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
if (argc != 1 || !argv) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
Modified: brlcad/trunk/src/mged/axes.c
===================================================================
--- brlcad/trunk/src/mged/axes.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/axes.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -85,7 +85,7 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_axes_state == axes_state)
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/buttons.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -704,7 +704,7 @@
int
be_accept()
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
if (STATE == ST_S_EDIT) {
/* Accept a solid edit */
@@ -758,7 +758,7 @@
int
be_reject()
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
update_views = 1;
@@ -939,8 +939,8 @@
int
chg_state(int from, int to, char *str)
{
- struct dm_list *p;
- struct dm_list *save_dm_list;
+ struct mged_dm *p;
+ struct mged_dm *save_dm_list;
struct bu_vls vls = BU_VLS_INIT_ZERO;
if (STATE != from) {
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/chgview.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -101,11 +101,11 @@
char edit_rate_object_origin;
char edit_rate_view_origin;
char edit_rate_coords;
-struct dm_list *edit_rate_mr_dm_list;
-struct dm_list *edit_rate_or_dm_list;
-struct dm_list *edit_rate_vr_dm_list;
-struct dm_list *edit_rate_mt_dm_list;
-struct dm_list *edit_rate_vt_dm_list;
+struct mged_dm *edit_rate_mr_dm_list;
+struct mged_dm *edit_rate_or_dm_list;
+struct mged_dm *edit_rate_vr_dm_list;
+struct mged_dm *edit_rate_mt_dm_list;
+struct mged_dm *edit_rate_vt_dm_list;
double mged_abs_tol;
double mged_rel_tol = 0.01; /* 1%, by default */
@@ -246,8 +246,8 @@
{
struct display_list *gdlp;
struct display_list *next_gdlp;
- struct dm_list *dmlp;
- struct dm_list *save_dmlp;
+ struct mged_dm *dmlp;
+ struct mged_dm *save_dmlp;
struct cmd_list *save_cmd_list;
int ret;
int initial_blank_screen = 1;
@@ -570,8 +570,8 @@
int
cmd_autoview(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc,
const char *argv[])
{
- struct dm_list *dmlp;
- struct dm_list *save_dmlp;
+ struct mged_dm *dmlp;
+ struct mged_dm *save_dmlp;
struct cmd_list *save_cmd_list;
if (argc > 2) {
@@ -2815,7 +2815,7 @@
f_svbase(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const
char *argv[])
{
int status;
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
if (argc < 1 || 1 < argc) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
@@ -3012,7 +3012,7 @@
void
-view_ring_destroy(struct dm_list *dlp)
+view_ring_destroy(struct mged_dm *dlp)
{
struct view_ring *vrp;
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -1298,7 +1298,7 @@
{
int uflag = 0; /* untie flag */
struct cmd_list *clp;
- struct dm_list *dlp;
+ struct mged_dm *dlp;
struct bu_vls vls = BU_VLS_INIT_ZERO;
if (argc < 1 || 3 < argc) {
@@ -1368,7 +1368,7 @@
if (clp->cl_tie)
clp->cl_tie->dml_tie = (struct cmd_list *)NULL;
- clp->cl_tie = (struct dm_list *)NULL;
+ clp->cl_tie = (struct mged_dm *)NULL;
bu_vls_free(&vls);
return TCL_OK;
@@ -1414,7 +1414,7 @@
/* already tied */
if (dlp->dml_tie)
- dlp->dml_tie->cl_tie = (struct dm_list *)NULL;
+ dlp->dml_tie->cl_tie = (struct mged_dm *)NULL;
dlp->dml_tie = clp;
@@ -1428,7 +1428,7 @@
{
int status;
const char *av[2];
- struct dm_list *dml;
+ struct mged_dm *dml;
struct _view_state *vsp;
if (argc < 2) {
@@ -1476,7 +1476,7 @@
int
f_winset(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc,
const char *argv[])
{
- struct dm_list *p;
+ struct mged_dm *p;
if (argc < 1 || 2 < argc) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
@@ -1828,9 +1828,9 @@
return TCL_ERROR;
/* update and resize the views */
- struct dm_list *save_dmlp = curr_dm_list;
+ struct mged_dm *save_dmlp = curr_dm_list;
struct cmd_list *save_cmd_list = curr_cmd_list;
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
struct display_list *gdlp;
struct display_list *next_gdlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
Modified: brlcad/trunk/src/mged/color_scheme.c
===================================================================
--- brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:04:25 UTC (rev
76929)
+++ brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:11:09 UTC (rev
76930)
@@ -243,7 +243,7 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_color_scheme == color_scheme)
@@ -286,8 +286,8 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
- struct dm_list *save_curr_dmlp = curr_dm_list;
+ struct mged_dm *dmlp;
+ struct mged_dm *save_curr_dmlp = curr_dm_list;
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:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/doevent.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -118,7 +118,7 @@
int
doEvent(ClientData clientData, XEvent *eventPtr)
{
- struct dm_list *save_dm_list;
+ struct mged_dm *save_dm_list;
int status;
if (eventPtr->type == DestroyNotify || (unsigned
long)eventPtr->xany.window == 0)
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -61,7 +61,7 @@
* The vectorThreshold stuff in libdm may turn the
* Tcl-crank causing curr_dm_list to change.
*/
- struct dm_list *save_dm_list = curr_dm_list;
+ struct mged_dm *save_dm_list = curr_dm_list;
curr_dm_list->dml_ndrawn = 0;
inv_viewsize = view_state->vs_gvp->gv_isize;
@@ -249,8 +249,8 @@
void
createDListSolid(struct solid *sp)
{
- struct dm_list *dlp;
- struct dm_list *save_dlp;
+ struct mged_dm *dlp;
+ struct mged_dm *save_dlp;
save_dlp = curr_dm_list;
@@ -305,7 +305,7 @@
void
freeDListsAll(unsigned int dlist, int range)
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
if (dm_get_displaylist(dlp->dml_dmp) &&
Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/edsol.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -750,7 +750,7 @@
set e_axes_pos and curr_e_axes_pos */
{
int i;
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
const short earb8[12][18] = earb8_edit_array;
const short earb7[12][18] = earb7_edit_array;
const short earb6[10][18] = earb6_edit_array;
Modified: brlcad/trunk/src/mged/fbserv.c
===================================================================
--- brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -120,8 +120,8 @@
int i;
int fd = (int)((long)clientData & 0xFFFF); /* fd's will be small */
int npp; /* number of processed packages */
- struct dm_list *dlp;
- struct dm_list *scdlp; /* save current dm_list pointer */
+ struct mged_dm *dlp;
+ struct mged_dm *scdlp; /* save current dm_list pointer */
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
for (i = MAX_CLIENTS-1; i >= 0; i--)
@@ -210,8 +210,8 @@
char *host,
int port)
{
- struct dm_list *dlp = (struct dm_list *)clientData;
- struct dm_list *scdlp; /* save current dm_list pointer */
+ struct mged_dm *dlp = (struct mged_dm *)clientData;
+ struct mged_dm *scdlp; /* save current dm_list pointer */
uintptr_t fd;
if (dlp == NULL)
@@ -385,8 +385,8 @@
{
uintptr_t datafd = (uintptr_t)clientData;
int fd = (int)((int32_t)datafd & 0xFFFF); /* fd's will be small */
- struct dm_list *dlp;
- struct dm_list *scdlp; /* save current dm_list pointer */
+ struct mged_dm *dlp;
+ struct mged_dm *scdlp; /* save current dm_list pointer */
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
if (fd == dlp->dml_netfd)
Modified: brlcad/trunk/src/mged/grid.c
===================================================================
--- brlcad/trunk/src/mged/grid.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/grid.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -77,7 +77,7 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_grid_state == grid_state)
@@ -92,7 +92,7 @@
const char *value,
void *data)
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
if (DBIP == DBI_NULL) {
grid_state->draw = 0;
@@ -121,7 +121,7 @@
const char *value,
void *data)
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
grid_set_dirty_flag(sdp, name, base, value, data);
@@ -420,7 +420,7 @@
void
update_grids(fastf_t sf)
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
struct bu_vls save_result = BU_VLS_INIT_ZERO;
struct bu_vls cmd = BU_VLS_INIT_ZERO;
Modified: brlcad/trunk/src/mged/menu.c
===================================================================
--- brlcad/trunk/src/mged/menu.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/menu.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -103,7 +103,7 @@
void
mmenu_set(int index, struct menu_item *value)
{
- struct dm_list *dlp;
+ struct mged_dm *dlp;
Tcl_DString ds_menu;
struct bu_vls menu_string = BU_VLS_INIT_ZERO;
@@ -131,9 +131,9 @@
void
mmenu_set_all(int index, struct menu_item *value)
{
- struct dm_list *p;
+ struct mged_dm *p;
struct cmd_list *save_cmd_list;
- struct dm_list *save_dm_list;
+ struct mged_dm *save_dm_list;
save_cmd_list = curr_cmd_list;
save_dm_list = curr_dm_list;
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/mged.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -343,8 +343,8 @@
void
new_edit_mats(void)
{
- struct dm_list *p;
- struct dm_list *save_dm_list;
+ struct mged_dm *p;
+ struct mged_dm *save_dm_list;
save_dm_list = curr_dm_list;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
@@ -1261,10 +1261,10 @@
bu_vls_strcpy(&head_cmd_list.cl_name, "mged");
curr_cmd_list = &head_cmd_list;
- memset((void *)&active_dm_set, 0, sizeof(struct dm_list));
+ memset((void *)&active_dm_set, 0, sizeof(struct mged_dm));
BU_LIST_INIT(&active_dm_set.l);
- BU_ALLOC(curr_dm_list, struct dm_list);
+ BU_ALLOC(curr_dm_list, struct mged_dm);
BU_LIST_APPEND(&active_dm_set.l, &curr_dm_list->l);
netfd = -1;
@@ -1954,8 +1954,8 @@
int
event_check(int non_blocking)
{
- struct dm_list *p;
- struct dm_list *save_dm_list;
+ struct mged_dm *p;
+ struct mged_dm *save_dm_list;
int save_edflag;
int handled = 0;
@@ -2271,8 +2271,8 @@
void
refresh(void)
{
- struct dm_list *p;
- struct dm_list *save_dm_list;
+ struct mged_dm *p;
+ struct mged_dm *save_dm_list;
struct bu_vls overlay_vls = BU_VLS_INIT_ZERO;
struct bu_vls tmp_vls = BU_VLS_INIT_ZERO;
int do_overlay = 1;
@@ -2454,7 +2454,7 @@
mged_finish(int exitcode)
{
char place[64];
- struct dm_list *p;
+ struct mged_dm *p;
struct cmd_list *c;
int ret;
@@ -2461,7 +2461,7 @@
(void)sprintf(place, "exit_status=%d", exitcode);
/* Release all displays */
- while (BU_LIST_WHILE(p, dm_list, &(active_dm_set.l))) {
+ while (BU_LIST_WHILE(p, mged_dm, &(active_dm_set.l))) {
if (!p)
bu_bomb("dm list entry is null? aborting!\n");
Modified: brlcad/trunk/src/mged/mged.h
===================================================================
--- brlcad/trunk/src/mged/mged.h 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/mged.h 2020-08-24 22:11:09 UTC (rev 76930)
@@ -415,7 +415,7 @@
/* internal variables related to the command window(s) */
struct cmd_list {
struct bu_list l;
- struct dm_list *cl_tie; /* the drawing window that we're tied to */
+ struct mged_dm *cl_tie; /* the drawing window that we're tied to */
struct mged_hist *cl_cur_hist;
struct bu_vls cl_more_default;
struct bu_vls cl_name;
@@ -448,8 +448,8 @@
/* attach.c */
int is_dm_null(void);
int mged_attach(const char *wp_name, int argc, const char *argv[]);
-void mged_link_vars(struct dm_list *p);
-void mged_slider_free_vls(struct dm_list *p);
+void mged_link_vars(struct mged_dm *p);
+void mged_slider_free_vls(struct mged_dm *p);
int gui_setup(const char *dstr);
int gui_output(void *clientData, void *str);
@@ -475,7 +475,7 @@
void solid_list_callback(void);
extern void view_ring_init(struct _view_state *vsp1, struct _view_state
*vsp2); /* defined in chgview.c */
-extern void view_ring_destroy(struct dm_list *dlp);
+extern void view_ring_destroy(struct mged_dm *dlp);
/* cmd.c */
int cmdline(struct bu_vls *vp, int record);
@@ -609,7 +609,7 @@
void init_sedit(void);
/* share.c */
-void usurp_all_resources(struct dm_list *dlp1, struct dm_list *dlp2);
+void usurp_all_resources(struct mged_dm *dlp1, struct mged_dm *dlp2);
/* inside.c */
int torin(struct rt_db_internal *ip, fastf_t thick[6]);
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:11:09 UTC (rev 76930)
@@ -377,8 +377,8 @@
};
-struct dm_list {
- struct bu_list l;
+struct mged_dm {
+ struct bu_list l;
struct dm *dml_dmp;
struct fb *dml_fbp;
int dml_netfd; /* socket used
to listen for connections */
@@ -439,9 +439,9 @@
/* If we're changing the active DM, use this function so
* libged also gets the word. */
-extern void set_curr_dm(struct dm_list *nl);
+extern void set_curr_dm(struct mged_dm *nl);
-#define DM_LIST_NULL ((struct dm_list *)NULL)
+#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
@@ -543,10 +543,10 @@
#define BV_MAXFUNC 64 /* largest code used */
#define FOR_ALL_DISPLAYS(p, hp) \
- for (BU_LIST_FOR(p, dm_list, hp))
+ for (BU_LIST_FOR(p, mged_dm, hp))
#define GET_DM_LIST(p, id) { \
- struct dm_list *tp; \
+ struct mged_dm *tp; \
\
FOR_ALL_DISPLAYS(tp, &active_dm_set.l) { \
if ((id) == dm_get_id(tp->dml_dmp)) { \
@@ -562,8 +562,8 @@
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 active_dm_set; /* defined in attach.c */
-extern struct dm_list *curr_dm_list; /* defined in attach.c */
+extern struct mged_dm active_dm_set; /* defined in attach.c */
+extern struct mged_dm *curr_dm_list; /* defined in attach.c */
/* defined in doevent.c */
#ifdef HAVE_X11_TYPES
@@ -573,7 +573,7 @@
#endif
/* defined in attach.c */
-extern void dm_var_init(struct dm_list *initial_dm_list);
+extern void dm_var_init(struct mged_dm *initial_dm_list);
/* defined in dm-generic.c */
extern int common_dm(int argc, const char *argv[]);
Modified: brlcad/trunk/src/mged/rect.c
===================================================================
--- brlcad/trunk/src/mged/rect.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/rect.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -71,7 +71,7 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_rubber_band == rubber_band)
Modified: brlcad/trunk/src/mged/sedit.h
===================================================================
--- brlcad/trunk/src/mged/sedit.h 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/sedit.h 2020-08-24 22:11:09 UTC (rev 76930)
@@ -244,11 +244,11 @@
extern char edit_rate_object_origin;
extern char edit_rate_view_origin;
extern char edit_rate_coords;
-extern struct dm_list *edit_rate_mr_dm_list;
-extern struct dm_list *edit_rate_or_dm_list;
-extern struct dm_list *edit_rate_vr_dm_list;
-extern struct dm_list *edit_rate_mt_dm_list;
-extern struct dm_list *edit_rate_vt_dm_list;
+extern struct mged_dm *edit_rate_mr_dm_list;
+extern struct mged_dm *edit_rate_or_dm_list;
+extern struct mged_dm *edit_rate_vr_dm_list;
+extern struct mged_dm *edit_rate_mt_dm_list;
+extern struct mged_dm *edit_rate_vt_dm_list;
extern fastf_t es_scale; /* scale factor */
extern fastf_t es_para[3]; /* keyboard input parameter changes */
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -138,7 +138,7 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
+ struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
if (dmlp->dml_mged_variables == mged_variables)
@@ -306,8 +306,8 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dmlp;
- struct dm_list *save_dmlp;
+ struct mged_dm *dmlp;
+ struct mged_dm *save_dmlp;
save_dmlp = curr_dm_list;
@@ -371,9 +371,9 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct dm_list *dlp1;
- struct dm_list *dlp2;
- struct dm_list *save_dlp;
+ struct mged_dm *dlp1;
+ struct mged_dm *dlp2;
+ struct mged_dm *save_dlp;
/* save current display manager */
save_dlp = curr_dm_list;
Modified: brlcad/trunk/src/mged/share.c
===================================================================
--- brlcad/trunk/src/mged/share.c 2020-08-24 22:04:25 UTC (rev 76929)
+++ brlcad/trunk/src/mged/share.c 2020-08-24 22:11:09 UTC (rev 76930)
@@ -75,7 +75,7 @@
extern struct bu_structparse rubber_band_vparse[];
extern struct bu_structparse mged_vparse[];
-void free_all_resources(struct dm_list *dlp);
+void free_all_resources(struct mged_dm *dlp);
/*
* SYNOPSIS
@@ -95,8 +95,8 @@
f_share(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc,
const char *argv[])
{
int uflag = 0; /* unshare flag */
- struct dm_list *dlp1 = (struct dm_list *)NULL;
- struct dm_list *dlp2 = (struct dm_list *)NULL;
+ struct mged_dm *dlp1 = (struct mged_dm *)NULL;
+ struct mged_dm *dlp2 = (struct mged_dm *)NULL;
struct bu_vls vls = BU_VLS_INIT_ZERO;
if (argc != 4) {
@@ -171,7 +171,7 @@
struct dm *dmp2 = (struct dm *)NULL;
dmp1 = dlp1->dml_dmp;
- if (dlp2 != (struct dm_list *)NULL)
+ if (dlp2 != (struct mged_dm *)NULL)
dmp2 = dlp2->dml_dmp;
if (dm_share_dlist(dmp1, dmp2) == TCL_OK) {
@@ -180,7 +180,7 @@
dlp1->dml_dlist_state->dl_active =
dlp1->dml_mged_variables->mv_dlist;
if (dlp1->dml_mged_variables->mv_dlist) {
- struct dm_list *save_dlp;
+ struct mged_dm *save_dlp;
save_dlp = curr_dm_list;
@@ -363,7 +363,7 @@
* probably on its way out (i.e. being destroyed).
*/
void
-usurp_all_resources(struct dm_list *dlp1, struct dm_list *dlp2)
+usurp_all_resources(struct mged_dm *dlp1, struct mged_dm *dlp2)
{
free_all_resources(dlp1);
dlp1->dml_view_state = dlp2->dml_view_state;
@@ -396,7 +396,7 @@
* - free all resources that are not being used
*/
void
-free_all_resources(struct dm_list *dlp)
+free_all_resources(struct mged_dm *dlp)
{
if (!--dlp->dml_view_state->vs_rc) {
view_ring_destroy(dlp);
@@ -427,9 +427,9 @@
void
-share_dlist(struct dm_list *dlp2)
+share_dlist(struct mged_dm *dlp2)
{
- struct dm_list *dlp1;
+ struct mged_dm *dlp1;
if (!dm_get_displaylist(dlp2->dml_dmp))
return;
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
