Revision: 76932
http://sourceforge.net/p/brlcad/code/76932
Author: starseeker
Date: 2020-08-24 22:21:14 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
dml_->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/dm-generic.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_dm.h
brlcad/trunk/src/mged/overlay.c
brlcad/trunk/src/mged/predictor.c
brlcad/trunk/src/mged/rect.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:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -79,8 +79,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_adc_state == adc_state)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_adc_state == adc_state)
+ dmlp->dm_dirty = 1;
}
@@ -93,7 +93,7 @@
save_dmlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_adc_state == adc_state) {
+ if (dmlp->dm_adc_state == adc_state) {
set_curr_dm(dmlp);
set_scroll();
DMP_dirty = 1;
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/attach.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -52,22 +52,24 @@
#include "./sedit.h"
#include "./mged_dm.h"
-extern void share_dlist(struct mged_dm *dlp2); /* defined in share.c */
+/* Geometry display instances used by MGED */
+struct mged_dm active_dm_set; /* set of active display managers */
+struct mged_dm *mged_curr_dm = NULL;
+
extern struct _color_scheme default_color_scheme;
+extern void share_dlist(struct mged_dm *dlp2); /* defined in share.c */
+int mged_default_dlist = 0; /* This variable is available via Tcl for
controlling use of display lists */
-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 *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)
+void set_curr_dm(struct mged_dm *nc)
{
- 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 */
+ mged_curr_dm = nc;
+ if (nc != DM_LIST_NULL) {
+ GEDP->ged_gvp = nc->dm_view_state->vs_gvp;
+ GEDP->ged_gvp->gv_grid = *nc->dm_grid_state; /* struct copy */
} else {
if (GEDP) {
GEDP->ged_gvp = NULL;
@@ -125,12 +127,12 @@
void
mged_slider_init_vls(struct mged_dm *p)
{
- bu_vls_init(&p->dml_fps_name);
- bu_vls_init(&p->dml_aet_name);
- bu_vls_init(&p->dml_ang_name);
- bu_vls_init(&p->dml_center_name);
- bu_vls_init(&p->dml_size_name);
- bu_vls_init(&p->dml_adc_name);
+ bu_vls_init(&p->dm_fps_name);
+ bu_vls_init(&p->dm_aet_name);
+ bu_vls_init(&p->dm_ang_name);
+ bu_vls_init(&p->dm_center_name);
+ bu_vls_init(&p->dm_size_name);
+ bu_vls_init(&p->dm_adc_name);
}
@@ -137,13 +139,13 @@
void
mged_slider_free_vls(struct mged_dm *p)
{
- if (BU_VLS_IS_INITIALIZED(&p->dml_fps_name)) {
- bu_vls_free(&p->dml_fps_name);
- bu_vls_free(&p->dml_aet_name);
- bu_vls_free(&p->dml_ang_name);
- bu_vls_free(&p->dml_center_name);
- bu_vls_free(&p->dml_size_name);
- bu_vls_free(&p->dml_adc_name);
+ if (BU_VLS_IS_INITIALIZED(&p->dm_fps_name)) {
+ bu_vls_free(&p->dm_fps_name);
+ bu_vls_free(&p->dm_aet_name);
+ bu_vls_free(&p->dm_ang_name);
+ bu_vls_free(&p->dm_center_name);
+ bu_vls_free(&p->dm_size_name);
+ bu_vls_free(&p->dm_adc_name);
}
}
@@ -161,7 +163,7 @@
return TCL_OK; /* Ignore */
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- struct bu_vls *pathname = dm_get_pathname(p->dml_dmp);
+ struct bu_vls *pathname = dm_get_pathname(p->dm_dmp);
if (pathname && bu_vls_strlen(pathname) && !BU_STR_EQUAL(name,
bu_vls_cstr(pathname)))
continue;
@@ -205,13 +207,13 @@
/* If this display is being referenced by a command window, then
* remove the reference.
*/
- if (mged_curr_dm->dml_tie != NULL)
- mged_curr_dm->dml_tie->cl_tie = (struct mged_dm *)NULL;
+ if (mged_curr_dm->dm_tie != NULL)
+ mged_curr_dm->dm_tie->cl_tie = (struct mged_dm *)NULL;
if (need_close)
dm_close(DMP);
- RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
+ RT_FREE_VLIST(&mged_curr_dm->dm_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");
@@ -392,7 +394,7 @@
BU_ALLOC(mged_curr_dm, struct mged_dm);
/* initialize predictor stuff */
- BU_LIST_INIT(&mged_curr_dm->dml_p_vlist);
+ BU_LIST_INIT(&mged_curr_dm->dm_p_vlist);
predictor_init();
/* Only need to do this once */
@@ -469,8 +471,8 @@
(void)dm_set_win_bounds(DMP, windowbounds);
mged_fb_open();
- GEDP->ged_gvp = mged_curr_dm->dml_view_state->vs_gvp;
- GEDP->ged_gvp->gv_grid = *mged_curr_dm->dml_grid_state; /* struct copy */
+ GEDP->ged_gvp = mged_curr_dm->dm_view_state->vs_gvp;
+ GEDP->ged_gvp->gv_grid = *mged_curr_dm->dm_grid_state; /* struct copy */
return TCL_OK;
@@ -620,19 +622,19 @@
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
*/
+ *adc_state = *initial_dm_list->dm_adc_state; /* struct copy
*/
adc_state->adc_rc = 1;
BU_ALLOC(menu_state, struct _menu_state);
- *menu_state = *initial_dm_list->dml_menu_state; /* struct copy
*/
+ *menu_state = *initial_dm_list->dm_menu_state; /* struct copy
*/
menu_state->ms_rc = 1;
BU_ALLOC(rubber_band, struct _rubber_band);
- *rubber_band = *initial_dm_list->dml_rubber_band; /* struct copy
*/
+ *rubber_band = *initial_dm_list->dm_rubber_band; /* struct copy
*/
rubber_band->rb_rc = 1;
BU_ALLOC(mged_variables, struct _mged_variables);
- *mged_variables = *initial_dm_list->dml_mged_variables; /* struct copy
*/
+ *mged_variables = *initial_dm_list->dm_mged_variables; /* struct copy
*/
mged_variables->mv_rc = 1;
mged_variables->mv_dlist = mged_default_dlist;
mged_variables->mv_listen = 0;
@@ -642,16 +644,16 @@
BU_ALLOC(color_scheme, struct _color_scheme);
/* initialize using the nu display manager */
- *color_scheme = *BU_LIST_LAST(mged_dm, &active_dm_set.l)->dml_color_scheme;
+ *color_scheme = *BU_LIST_LAST(mged_dm, &active_dm_set.l)->dm_color_scheme;
color_scheme->cs_rc = 1;
BU_ALLOC(grid_state, struct bview_grid_state);
- *grid_state = *initial_dm_list->dml_grid_state; /* struct copy
*/
+ *grid_state = *initial_dm_list->dm_grid_state; /* struct copy
*/
grid_state->rc = 1;
BU_ALLOC(axes_state, struct _axes_state);
- *axes_state = *initial_dm_list->dml_axes_state; /* struct copy
*/
+ *axes_state = *initial_dm_list->dm_axes_state; /* struct copy
*/
axes_state->ax_rc = 1;
BU_ALLOC(dlist_state, struct _dlist_state);
@@ -658,12 +660,12 @@
dlist_state->dl_rc = 1;
BU_ALLOC(view_state, struct _view_state);
- *view_state = *initial_dm_list->dml_view_state; /*
struct copy */
+ *view_state = *initial_dm_list->dm_view_state; /*
struct copy */
BU_ALLOC(view_state->vs_gvp, struct bview);
BU_GET(view_state->vs_gvp->callbacks, struct bu_ptbl);
bu_ptbl_init(view_state->vs_gvp->callbacks, 8, "bview callbacks");
- *view_state->vs_gvp = *initial_dm_list->dml_view_state->vs_gvp; /*
struct copy */
+ *view_state->vs_gvp = *initial_dm_list->dm_view_state->vs_gvp; /*
struct copy */
view_state->vs_gvp->gv_clientData = (void *)view_state;
view_state->vs_gvp->gv_adaptive_plot = 0;
view_state->vs_gvp->gv_redraw_on_zoom = 0;
@@ -670,7 +672,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(mged_curr_dm->dml_view_state, (struct _view_state *)NULL);
+ view_ring_init(mged_curr_dm->dm_view_state, (struct _view_state *)NULL);
DMP_dirty = 1;
mapped = 1;
@@ -686,14 +688,14 @@
mged_link_vars(struct mged_dm *p)
{
mged_slider_init_vls(p);
- struct bu_vls *pn = dm_get_pathname(p->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(p->dm_dmp);
if (pn) {
- bu_vls_printf(&p->dml_fps_name, "%s(%s,fps)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
- bu_vls_printf(&p->dml_aet_name, "%s(%s,aet)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
- bu_vls_printf(&p->dml_ang_name, "%s(%s,ang)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
- bu_vls_printf(&p->dml_center_name, "%s(%s,center)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
- bu_vls_printf(&p->dml_size_name, "%s(%s,size)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
- bu_vls_printf(&p->dml_adc_name, "%s(%s,adc)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_fps_name, "%s(%s,fps)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_aet_name, "%s(%s,aet)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_ang_name, "%s(%s,ang)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_center_name, "%s(%s,center)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_size_name, "%s(%s,size)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
+ bu_vls_printf(&p->dm_adc_name, "%s(%s,adc)", MGED_DISPLAY_VAR,
bu_vls_cstr(pn));
}
}
@@ -714,7 +716,7 @@
}
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
- struct bu_vls *pn = dm_get_pathname(dlp->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(dlp->dm_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:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/axes.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -88,8 +88,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_axes_state == axes_state)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_axes_state == axes_state)
+ dmlp->dm_dirty = 1;
}
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/buttons.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -741,8 +741,8 @@
}
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_mged_variables->mv_transform == 'e')
- dmlp->dml_mged_variables->mv_transform = 'v';
+ if (dmlp->dm_mged_variables->mv_transform == 'e')
+ dmlp->dm_mged_variables->mv_transform = 'v';
{
struct bu_vls vls = BU_VLS_INIT_ZERO;
@@ -805,8 +805,8 @@
(void)chg_state(STATE, ST_VIEW, "Edit Reject");
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_mged_variables->mv_transform == 'e')
- dmlp->dml_mged_variables->mv_transform = 'v';
+ if (dmlp->dm_mged_variables->mv_transform == 'e')
+ dmlp->dm_mged_variables->mv_transform = 'v';
{
struct bu_vls vls = BU_VLS_INIT_ZERO;
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/chgview.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -449,8 +449,8 @@
set_curr_dm(dmlp);
- if (mged_curr_dm->dml_tie) {
- curr_cmd_list = mged_curr_dm->dml_tie;
+ if (mged_curr_dm->dm_tie) {
+ curr_cmd_list = mged_curr_dm->dm_tie;
} else {
curr_cmd_list = &head_cmd_list;
}
@@ -596,8 +596,8 @@
set_curr_dm(dmlp);
- if (mged_curr_dm->dml_tie) {
- curr_cmd_list = mged_curr_dm->dml_tie;
+ if (mged_curr_dm->dm_tie) {
+ curr_cmd_list = mged_curr_dm->dm_tie;
} else {
curr_cmd_list = &head_cmd_list;
}
@@ -2804,7 +2804,7 @@
view_state->vs_absolute_scale = 0.0;
if (mged_variables->mv_faceplate && mged_variables->mv_orig_gui) {
- mged_curr_dm->dml_dirty = 1;
+ mged_curr_dm->dm_dirty = 1;
}
return TCL_OK;
@@ -2835,10 +2835,10 @@
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 &&
- dmlp->dml_mged_variables->mv_orig_gui) {
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_view_state == view_state &&
+ dmlp->dm_mged_variables->mv_faceplate &&
+ dmlp->dm_mged_variables->mv_orig_gui) {
+ dmlp->dm_dirty = 1;
}
}
@@ -3016,8 +3016,8 @@
{
struct view_ring *vrp;
- while (BU_LIST_NON_EMPTY(&dlp->dml_view_state->vs_headView.l)) {
- vrp = BU_LIST_FIRST(view_ring, &dlp->dml_view_state->vs_headView.l);
+ while (BU_LIST_NON_EMPTY(&dlp->dm_view_state->vs_headView.l)) {
+ vrp = BU_LIST_FIRST(view_ring, &dlp->dm_view_state->vs_headView.l);
BU_LIST_DEQUEUE(&vrp->l);
bu_free((void *)vrp, "view_ring_destroy: vrp");
}
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -680,7 +680,7 @@
if (!GEDP->ged_gvp)
GEDP->ged_gvp = view_state->vs_gvp;
- GEDP->ged_dmp = (void *)mged_curr_dm->dml_dmp;
+ GEDP->ged_dmp = (void *)mged_curr_dm->dm_dmp;
ret = (*ctp->ged_func)(GEDP, argc, (const char **)argv);
Tcl_AppendResult(interpreter, bu_vls_addr(GEDP->ged_result_str), NULL);
@@ -860,7 +860,7 @@
BU_LIST_DEQUEUE(&clp->l);
if (clp->cl_tie != NULL)
- clp->cl_tie->dml_tie = CMD_LIST_NULL;
+ clp->cl_tie->dm_tie = CMD_LIST_NULL;
bu_vls_free(&clp->cl_more_default);
bu_vls_free(&clp->cl_name);
bu_free((void *)clp, "cmd_close: clp");
@@ -1312,7 +1312,7 @@
for (BU_LIST_FOR (clp, cmd_list, &head_cmd_list.l)) {
bu_vls_trunc(&vls, 0);
if (clp->cl_tie) {
- struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dm_dmp);
if (pn && bu_vls_strlen(pn)) {
bu_vls_printf(&vls, "%s %s", bu_vls_cstr(&clp->cl_name),
bu_vls_cstr(pn));
Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
@@ -1325,7 +1325,7 @@
bu_vls_trunc(&vls, 0);
if (clp->cl_tie) {
- struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dm_dmp);
if (pn && bu_vls_strlen(pn)) {
bu_vls_printf(&vls, "%s %s", bu_vls_cstr(&clp->cl_name),
bu_vls_cstr(pn));
Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
@@ -1366,7 +1366,7 @@
if (uflag) {
if (clp->cl_tie)
- clp->cl_tie->dml_tie = (struct cmd_list *)NULL;
+ clp->cl_tie->dm_tie = (struct cmd_list *)NULL;
clp->cl_tie = (struct mged_dm *)NULL;
@@ -1377,7 +1377,7 @@
/* print out the display manager that we're tied to */
if (argc == 2) {
if (clp->cl_tie) {
- struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dm_dmp);
if (pn && bu_vls_strlen(pn)) {
Tcl_AppendElement(interpreter, bu_vls_cstr(pn));
}
@@ -1394,7 +1394,7 @@
bu_vls_strcpy(&vls, argv[2]);
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
- struct bu_vls *pn = dm_get_pathname(dlp->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(dlp->dm_dmp);
if (pn && !bu_vls_strcmp(&vls, pn))
break;
}
@@ -1408,15 +1408,15 @@
/* already tied */
if (clp->cl_tie)
- clp->cl_tie->dml_tie = (struct cmd_list *)NULL;
+ clp->cl_tie->dm_tie = (struct cmd_list *)NULL;
clp->cl_tie = dlp;
/* already tied */
- if (dlp->dml_tie)
- dlp->dml_tie->cl_tie = (struct mged_dm *)NULL;
+ if (dlp->dm_tie)
+ dlp->dm_tie->cl_tie = (struct mged_dm *)NULL;
- dlp->dml_tie = clp;
+ dlp->dm_tie = clp;
bu_vls_free(&vls);
return TCL_OK;
@@ -1452,12 +1452,12 @@
vsp = view_state; /* save state info pointer */
bu_free((void *)menu_state, "f_postscript: menu_state");
- menu_state = dml->dml_menu_state;
+ menu_state = dml->dm_menu_state;
- scroll_top = dml->dml_scroll_top;
- scroll_active = dml->dml_scroll_active;
- scroll_y = dml->dml_scroll_y;
- memmove((void *)scroll_array, (void *)dml->dml_scroll_array, sizeof(struct
scroll_item *) * 6);
+ scroll_top = dml->dm_scroll_top;
+ scroll_active = dml->dm_scroll_active;
+ scroll_y = dml->dm_scroll_y;
+ memmove((void *)scroll_array, (void *)dml->dm_scroll_array, sizeof(struct
scroll_item *) * 6);
DMP_dirty = 1;
refresh();
@@ -1498,12 +1498,12 @@
/* change primary focus to window argv[1] */
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- struct bu_vls *pn = dm_get_pathname(p->dml_dmp);
+ struct bu_vls *pn = dm_get_pathname(p->dm_dmp);
if (pn && BU_STR_EQUAL(argv[1], bu_vls_cstr(pn))) {
set_curr_dm(p);
- if (mged_curr_dm->dml_tie)
- curr_cmd_list = mged_curr_dm->dml_tie;
+ if (mged_curr_dm->dm_tie)
+ curr_cmd_list = mged_curr_dm->dm_tie;
else
curr_cmd_list = &head_cmd_list;
@@ -1838,8 +1838,8 @@
set_curr_dm(dmlp);
- if (mged_curr_dm->dml_tie) {
- curr_cmd_list = mged_curr_dm->dml_tie;
+ if (mged_curr_dm->dm_tie) {
+ curr_cmd_list = mged_curr_dm->dm_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:15:43 UTC (rev
76931)
+++ brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:21:14 UTC (rev
76932)
@@ -246,8 +246,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_color_scheme == color_scheme)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_color_scheme == color_scheme)
+ dmlp->dm_dirty = 1;
}
@@ -303,8 +303,8 @@
// should probably be replaced with get_next_dm
struct bview *cbv = GEDP->ged_gvp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
- if (dmlp->dml_color_scheme == color_scheme) {
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_color_scheme == color_scheme) {
+ dmlp->dm_dirty = 1;
set_curr_dm(dmlp);
Tcl_Eval(INTERP, bu_vls_addr(&vls));
}
Modified: brlcad/trunk/src/mged/dm-generic.c
===================================================================
--- brlcad/trunk/src/mged/dm-generic.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/dm-generic.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -259,8 +259,8 @@
return TCL_ERROR;
}
- dml_omx = atoi(argv[2]);
- dml_omy = atoi(argv[3]);
+ dm_omx = atoi(argv[2]);
+ dm_omy = atoi(argv[3]);
switch (*argv[1]) {
case 'r':
@@ -325,13 +325,13 @@
return TCL_ERROR;
}
- dml_omx = atoi(argv[2]);
- dml_omy = atoi(argv[3]);
+ dm_omx = atoi(argv[2]);
+ dm_omy = atoi(argv[3]);
switch (*argv[1]) {
case '1':
- fx = dm_Xx2Normal(DMP, dml_omx) * GED_MAX - adc_state->adc_dv_x;
- fy = dm_Xy2Normal(DMP, dml_omy, 1) * GED_MAX -
adc_state->adc_dv_y;
+ fx = dm_Xx2Normal(DMP, dm_omx) * GED_MAX - adc_state->adc_dv_x;
+ fy = dm_Xy2Normal(DMP, dm_omy, 1) * GED_MAX -
adc_state->adc_dv_y;
bu_vls_printf(&vls, "adc a1 %lf\n", RAD2DEG*atan2(fy, fx));
Tcl_Eval(INTERP, bu_vls_addr(&vls));
@@ -340,8 +340,8 @@
am_mode = AMM_ADC_ANG1;
break;
case '2':
- fx = dm_Xx2Normal(DMP, dml_omx) * GED_MAX - adc_state->adc_dv_x;
- fy = dm_Xy2Normal(DMP, dml_omy, 1) * GED_MAX -
adc_state->adc_dv_y;
+ fx = dm_Xx2Normal(DMP, dm_omx) * GED_MAX - adc_state->adc_dv_x;
+ fy = dm_Xy2Normal(DMP, dm_omy, 1) * GED_MAX -
adc_state->adc_dv_y;
bu_vls_printf(&vls, "adc a2 %lf\n", RAD2DEG*atan2(fy, fx));
Tcl_Eval(INTERP, bu_vls_addr(&vls));
@@ -354,7 +354,7 @@
point_t model_pt;
point_t view_pt;
- VSET(view_pt, dm_Xx2Normal(DMP, dml_omx), dm_Xy2Normal(DMP,
dml_omy, 1), 0.0);
+ VSET(view_pt, dm_Xx2Normal(DMP, dm_omx), dm_Xy2Normal(DMP,
dm_omy, 1), 0.0);
if (grid_state->snap)
snap_to_grid(&view_pt[X], &view_pt[Y]);
@@ -371,9 +371,9 @@
break;
case 'd':
- fx = (dm_Xx2Normal(DMP, dml_omx) * GED_MAX -
+ fx = (dm_Xx2Normal(DMP, dm_omx) * GED_MAX -
adc_state->adc_dv_x) * view_state->vs_gvp->gv_scale *
base2local * INV_GED;
- fy = (dm_Xy2Normal(DMP, dml_omy, 1) * GED_MAX -
+ fy = (dm_Xy2Normal(DMP, dm_omy, 1) * GED_MAX -
adc_state->adc_dv_y) * view_state->vs_gvp->gv_scale *
base2local * INV_GED;
td = sqrt(fx * fx + fy * fy);
@@ -401,8 +401,8 @@
return TCL_ERROR;
}
- dml_omx = atoi(argv[3]);
- dml_omy = atoi(argv[4]);
+ dm_omx = atoi(argv[3]);
+ dm_omy = atoi(argv[4]);
switch (*argv[1]) {
case 'a':
Modified: brlcad/trunk/src/mged/doevent.c
===================================================================
--- brlcad/trunk/src/mged/doevent.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/doevent.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -213,7 +213,7 @@
int i;
for (i = 0; i < 8; ++i)
- dml_knobs[i] = 0;
+ dm_knobs[i] = 0;
}
#endif
@@ -246,8 +246,8 @@
height = dm_get_height(DMP);
mx = xmotion->x;
my = xmotion->y;
- dx = mx - dml_omx;
- dy = my - dml_omy;
+ dx = mx - dm_omx;
+ dy = my - dm_omy;
switch (am_mode) {
case AMM_IDLE:
@@ -363,11 +363,11 @@
point_t vcenter, diff;
/* accumulate distance mouse moved since starting to
translate */
- dml_mouse_dx += dx;
- dml_mouse_dy += dy;
+ dm_mouse_dx += dx;
+ dm_mouse_dy += dy;
- view_pt[X] = dml_mouse_dx / (fastf_t)width * 2.0;
- view_pt[Y] = -dml_mouse_dy / (fastf_t)height /
dm_get_aspect(DMP) * 2.0;
+ view_pt[X] = dm_mouse_dx / (fastf_t)width * 2.0;
+ view_pt[Y] = -dm_mouse_dy / (fastf_t)height /
dm_get_aspect(DMP) * 2.0;
view_pt[Z] = 0.0;
round_to_grid(&view_pt[X], &view_pt[Y]);
@@ -375,7 +375,7 @@
MAT_DELTAS_GET_NEG(vcenter,
view_state->vs_gvp->gv_center);
VSUB2(diff, model_pt, vcenter);
VSCALE(diff, diff, base2local);
- VADD2(model_pt, dml_work_pt, diff);
+ VADD2(model_pt, dm_work_pt, diff);
if (STATE == ST_S_EDIT)
bu_vls_printf(&cmd, "p %lf %lf %lf", model_pt[X],
model_pt[Y], model_pt[Z]);
else
@@ -389,11 +389,11 @@
else {
if (grid_state->snap) {
/* accumulate distance mouse moved since starting
to translate */
- dml_mouse_dx += dx;
- dml_mouse_dy += dy;
+ dm_mouse_dx += dx;
+ dm_mouse_dy += dy;
- snap_view_to_grid(dml_mouse_dx / (fastf_t)width *
2.0,
- -dml_mouse_dy / (fastf_t)height /
dm_get_aspect(DMP) * 2.0);
+ snap_view_to_grid(dm_mouse_dx / (fastf_t)width *
2.0,
+ -dm_mouse_dy / (fastf_t)height /
dm_get_aspect(DMP) * 2.0);
mged_variables->mv_coords = save_coords;
goto handled;
@@ -744,8 +744,8 @@
handled:
bu_vls_free(&cmd);
- dml_omx = mx;
- dml_omy = my;
+ dm_omx = mx;
+ dm_omy = my;
}
#endif /* HAVE_X11_XLIB_H */
@@ -771,16 +771,16 @@
switch (DIAL0 + dmep->first_axis) {
case DIAL0:
if (adc_state->adc_draw) {
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!adc_state->adc_dv_a1)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit(adc_state->adc_dv_a1) + dmep->axis_data[0] -
knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob ang1 %f\n",
45.0 - 45.0*((double)setting) * INV_GED);
} else {
@@ -787,30 +787,30 @@
if (mged_variables->mv_rateknobs) {
f = view_state->vs_rate_model_rotate[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob -m z %f\n", setting / 512.0);
} else {
f = view_state->vs_absolute_model_rotate[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(2.847 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- f = dm_limit(dml_knobs[dmep->first_axis]) / 512.0;
+ f = dm_limit(dm_knobs[dmep->first_axis]) / 512.0;
bu_vls_printf(&cmd, "knob -m az %f\n", dm_wrap(f) * 180.0);
}
}
@@ -822,15 +822,15 @@
else
f = view_state->vs_rate_scale;
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] = dm_unlimit((int)(512.5 * f)) +
+ dm_knobs[dmep->first_axis] = dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob S %f\n", setting / 512.0);
} else {
if (EDIT_SCALE && mged_variables->mv_transform == 'e')
@@ -838,31 +838,31 @@
else
f = view_state->vs_absolute_scale;
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob aS %f\n", setting / 512.0);
}
break;
case DIAL2:
if (adc_state->adc_draw) {
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!adc_state->adc_dv_a2)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit(adc_state->adc_dv_a2) + dmep->axis_data[0] -
knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob ang2 %f\n",
45.0 - 45.0*((double)setting) * INV_GED);
} else {
@@ -895,16 +895,16 @@
else
f = view_state->vs_rate_rotate[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob z %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -935,16 +935,16 @@
else
f = view_state->vs_absolute_rotate[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(2.847 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- f = dm_limit(dml_knobs[dmep->first_axis]) / 512.0;
+ f = dm_limit(dm_knobs[dmep->first_axis]) / 512.0;
bu_vls_printf(&cmd, "knob az %f\n", dm_wrap(f) * 180.0);
}
}
@@ -951,16 +951,16 @@
break;
case DIAL3:
if (adc_state->adc_draw) {
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!adc_state->adc_dv_dist)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit(adc_state->adc_dv_dist) + dmep->axis_data[0]
- knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob distadc %d\n", setting);
} else {
if (mged_variables->mv_rateknobs) {
@@ -990,16 +990,16 @@
else
f = view_state->vs_rate_tran[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob Z %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -1028,17 +1028,17 @@
else
f = view_state->vs_absolute_tran[Z];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!f)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob aZ %f\n", setting / 512.0 *
view_state->vs_gvp->gv_scale * base2local);
}
}
@@ -1045,16 +1045,16 @@
break;
case DIAL4:
if (adc_state->adc_draw) {
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!adc_state->adc_dv_y)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit(adc_state->adc_dv_y) + dmep->axis_data[0] -
knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob yadc %d\n", setting);
} else {
if (mged_variables->mv_rateknobs) {
@@ -1086,16 +1086,16 @@
else
f = view_state->vs_rate_rotate[Y];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob y %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -1126,17 +1126,17 @@
else
f = view_state->vs_absolute_rotate[Y];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!f)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(2.847 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- f = dm_limit(dml_knobs[dmep->first_axis]) / 512.0;
+ f = dm_limit(dm_knobs[dmep->first_axis]) / 512.0;
bu_vls_printf(&cmd, "knob ay %f\n", dm_wrap(f) * 180.0);
}
}
@@ -1169,16 +1169,16 @@
else
f = view_state->vs_rate_tran[Y];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob Y %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -1207,32 +1207,32 @@
else
f = view_state->vs_absolute_tran[Y];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] -
knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob aY %f\n", setting / 512.0 *
view_state->vs_gvp->gv_scale * base2local);
}
break;
case DIAL6:
if (adc_state->adc_draw) {
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE &&
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE &&
!adc_state->adc_dv_x)
- dml_knobs[dmep->first_axis] +=
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit(adc_state->adc_dv_x) + dmep->axis_data[0] -
knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob xadc %d\n", setting);
} else {
if (mged_variables->mv_rateknobs) {
@@ -1264,16 +1264,16 @@
else
f = view_state->vs_rate_rotate[X];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob x %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -1304,16 +1304,16 @@
else
f = view_state->vs_absolute_rotate[X];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(2.847 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- f = dm_limit(dml_knobs[dmep->first_axis]) / 512.0;
+ f = dm_limit(dm_knobs[dmep->first_axis]) / 512.0;
bu_vls_printf(&cmd, "knob ax %f\n", dm_wrap(f) * 180.0);
}
}
@@ -1346,16 +1346,16 @@
else
f = view_state->vs_rate_tran[X];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob X %f\n", setting / 512.0);
} else {
if ((STATE == ST_S_EDIT || STATE == ST_O_EDIT)
@@ -1384,16 +1384,16 @@
else
f = view_state->vs_absolute_tran[X];
- if (-NOISE <= dml_knobs[dmep->first_axis] &&
- dml_knobs[dmep->first_axis] <= NOISE && !f)
- dml_knobs[dmep->first_axis] +=
+ if (-NOISE <= dm_knobs[dmep->first_axis] &&
+ dm_knobs[dmep->first_axis] <= NOISE && !f)
+ dm_knobs[dmep->first_axis] +=
dmep->axis_data[0] - knob_values[dmep->first_axis];
else
- dml_knobs[dmep->first_axis] =
+ dm_knobs[dmep->first_axis] =
dm_unlimit((int)(512.5 * f)) +
dmep->axis_data[0] - knob_values[dmep->first_axis];
- setting = dm_limit(dml_knobs[dmep->first_axis]);
+ setting = dm_limit(dm_knobs[dmep->first_axis]);
bu_vls_printf(&cmd, "knob aX %f\n", setting / 512.0 *
view_state->vs_gvp->gv_scale * base2local);
}
break;
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/dozoom.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -63,7 +63,7 @@
*/
struct mged_dm *save_dm_list = mged_curr_dm;
- mged_curr_dm->dml_ndrawn = 0;
+ mged_curr_dm->dm_ndrawn = 0;
inv_viewsize = view_state->vs_gvp->gv_isize;
/*
@@ -151,7 +151,7 @@
/* 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);
- mged_curr_dm->dml_ndrawn += ndrawn;
+ mged_curr_dm->dm_ndrawn += ndrawn;
/* disable write to depth buffer */
dm_set_depth_mask(DMP, 0);
@@ -176,7 +176,7 @@
/* 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);
- mged_curr_dm->dml_ndrawn += ndrawn;
+ mged_curr_dm->dm_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 *)&mged_curr_dm->dml_p_vlist);
+ dm_draw_vlist(DMP, (struct bn_vlist *)&mged_curr_dm->dm_p_vlist);
}
/*
@@ -213,7 +213,7 @@
r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 1,
geometry_default_color, 0, mged_variables->mv_dlist);
- mged_curr_dm->dml_ndrawn += ndrawn;
+ mged_curr_dm->dm_ndrawn += ndrawn;
/* 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);
@@ -255,9 +255,9 @@
save_dlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
- if (dlp->dml_mapped &&
- dm_get_displaylist(dlp->dml_dmp) &&
- dlp->dml_mged_variables->mv_dlist) {
+ if (dlp->dm_mapped &&
+ dm_get_displaylist(dlp->dm_dmp) &&
+ dlp->dm_mged_variables->mv_dlist) {
if (sp->s_dlist == 0)
sp->s_dlist = dm_gen_dlists(DMP, 1);
@@ -274,7 +274,7 @@
(void)dm_end_dlist(DMP);
}
- dlp->dml_dirty = 1;
+ dlp->dm_dirty = 1;
}
set_curr_dm(save_dlp);
@@ -308,13 +308,13 @@
struct mged_dm *dlp;
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
- if (dm_get_displaylist(dlp->dml_dmp) &&
- dlp->dml_mged_variables->mv_dlist) {
+ if (dm_get_displaylist(dlp->dm_dmp) &&
+ dlp->dm_mged_variables->mv_dlist) {
(void)dm_make_current(DMP);
- (void)dm_free_dlists(dlp->dml_dmp, dlist, range);
+ (void)dm_free_dlists(dlp->dm_dmp, dlist, range);
}
- dlp->dml_dirty = 1;
+ dlp->dm_dirty = 1;
}
}
Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/edsol.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -921,7 +921,7 @@
MAT_IDN(acc_rot_sol);
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- dmlp->dml_mged_variables->mv_transform = 'e';
+ dmlp->dm_mged_variables->mv_transform = 'e';
}
}
@@ -2808,7 +2808,7 @@
}
bu_vls_printf(&str, ") [%d]: ", arb_vertices[type][loc]);
- const struct bu_vls *dnvp = dm_get_dname(mged_curr_dm->dml_dmp);
+ const struct bu_vls *dnvp = dm_get_dname(mged_curr_dm->dm_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:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -125,7 +125,7 @@
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l) {
for (i = MAX_CLIENTS-1; i >= 0; i--)
- if (fd == dlp->dml_clients[i].c_fd)
+ if (fd == dlp->dm_clients[i].c_fd)
goto found;
}
@@ -389,7 +389,7 @@
struct mged_dm *scdlp; /* save current dm_list pointer */
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
- if (fd == dlp->dml_netfd)
+ if (fd == dlp->dm_netfd)
goto found;
return;
Modified: brlcad/trunk/src/mged/grid.c
===================================================================
--- brlcad/trunk/src/mged/grid.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/grid.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -80,8 +80,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_grid_state == grid_state)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_grid_state == grid_state)
+ dmlp->dm_dirty = 1;
}
@@ -108,8 +108,8 @@
grid_state->res_h = res;
grid_state->res_v = res;
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
- if (dlp->dml_grid_state == grid_state)
- dlp->dml_grid_auto_size = 0;
+ if (dlp->dm_grid_state == grid_state)
+ dlp->dm_grid_auto_size = 0;
}
}
@@ -127,8 +127,8 @@
if (grid_auto_size)
FOR_ALL_DISPLAYS(dlp, &active_dm_set.l)
- if (dlp->dml_grid_state == grid_state)
- dlp->dml_grid_auto_size = 0;
+ if (dlp->dm_grid_state == grid_state)
+ dlp->dm_grid_auto_size = 0;
}
@@ -315,8 +315,8 @@
bu_vls_free(&cmd);
/* save model_pt in local units */
- VMOVE(dml_work_pt, model_pt);
- dml_mouse_dx = dml_mouse_dy = 0;
+ VMOVE(dm_work_pt, model_pt);
+ dm_mouse_dx = dm_mouse_dy = 0;
}
@@ -339,8 +339,8 @@
VSCALE(model_pt, model_pt, base2local);
/* save new center in local units */
- VMOVE(dml_work_pt, model_pt);
- dml_mouse_dx = dml_mouse_dy = 0;
+ VMOVE(dm_work_pt, model_pt);
+ dm_mouse_dx = dm_mouse_dy = 0;
}
@@ -409,7 +409,7 @@
MAT_DELTAS_GET_NEG(vcenter, view_state->vs_gvp->gv_center);
VSUB2(diff, model_pt, vcenter);
VSCALE(diff, diff, base2local);
- VSUB2(model_pt, dml_work_pt, diff);
+ VSUB2(model_pt, dm_work_pt, diff);
VSCALE(model_pt, model_pt, local2base);
MAT_DELTAS_VEC_NEG(view_state->vs_gvp->gv_center, model_pt);
@@ -425,9 +425,9 @@
struct bu_vls cmd = BU_VLS_INIT_ZERO;
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);
+ dlp->dm_grid_state->res_h *= sf;
+ dlp->dm_grid_state->res_v *= sf;
+ VSCALE(dlp->dm_grid_state->anchor, dlp->dm_grid_state->anchor, sf);
}
bu_vls_strcpy(&save_result, Tcl_GetStringResult(INTERP));
Modified: brlcad/trunk/src/mged/menu.c
===================================================================
--- brlcad/trunk/src/mged/menu.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/menu.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -120,10 +120,10 @@
bu_vls_free(&menu_string);
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)
- dlp->dml_dirty = 1;
+ if (menu_state == dlp->dm_menu_state &&
+ dlp->dm_mged_variables->mv_faceplate &&
+ dlp->dm_mged_variables->mv_orig_gui)
+ dlp->dm_dirty = 1;
}
}
@@ -138,8 +138,8 @@
save_cmd_list = curr_cmd_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;
+ if (p->dm_tie)
+ curr_cmd_list = p->dm_tie;
set_curr_dm(p);
mmenu_set(index, value);
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/mged.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -348,7 +348,7 @@
save_dm_list = mged_curr_dm;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- if (!p->dml_owner)
+ if (!p->dm_owner)
continue;
set_curr_dm(p);
@@ -1269,7 +1269,7 @@
netfd = -1;
/* initialize predictor stuff */
- BU_LIST_INIT(&mged_curr_dm->dml_p_vlist);
+ BU_LIST_INIT(&mged_curr_dm->dm_p_vlist);
predictor_init();
DMP = dm_get();
@@ -1279,7 +1279,7 @@
bu_vls_strcpy(dpvp, "nu");
}
- struct bu_vls *tnvp = dm_get_tkname(mged_curr_dm->dml_dmp);
+ struct bu_vls *tnvp = dm_get_tkname(mged_curr_dm->dm_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(mged_curr_dm->dml_view_state, (struct _view_state *)NULL);
+ view_ring_init(mged_curr_dm->dm_view_state, (struct _view_state *)NULL);
MAT_IDN(view_state->vs_ModelDelta);
am_mode = AMM_IDLE;
@@ -2184,7 +2184,7 @@
}
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- if (!p->dml_owner)
+ if (!p->dm_owner)
continue;
set_curr_dm(p);
@@ -2280,20 +2280,20 @@
int do_time = 0;
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- if (!p->dml_view_state)
+ if (!p->dm_view_state)
continue;
- if (update_views || p->dml_view_state->vs_flag)
- p->dml_dirty = 1;
+ if (update_views || p->dm_view_state->vs_flag)
+ p->dm_dirty = 1;
}
/*
- * This needs to be done separately because dml_view_state may be
+ * This needs to be done separately because dm_view_state may be
* shared.
*/
FOR_ALL_DISPLAYS(p, &active_dm_set.l) {
- if (!p->dml_view_state)
+ if (!p->dm_view_state)
continue;
- p->dml_view_state->vs_flag = 0;
+ p->dm_view_state->vs_flag = 0;
}
update_views = 0;
@@ -2467,9 +2467,9 @@
BU_LIST_DEQUEUE(&(p->l));
- if (p && p->dml_dmp) {
- dm_close(p->dml_dmp);
- RT_FREE_VLIST(&p->dml_p_vlist);
+ if (p && p->dm_dmp) {
+ dm_close(p->dm_dmp);
+ RT_FREE_VLIST(&p->dm_p_vlist);
mged_slider_free_vls(p);
bu_free(p, "release: mged_curr_dm");
}
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:21:14 UTC (rev 76932)
@@ -379,62 +379,62 @@
struct mged_dm {
struct bu_list l;
- struct dm *dml_dmp;
- struct fb *dml_fbp;
- int dml_netfd; /* socket used
to listen for connections */
+ struct dm *dm_dmp;
+ struct fb *dm_fbp;
+ int dm_netfd; /* socket used
to listen for connections */
#if defined(_WIN32) && !defined(__CYGWIN__)
- Tcl_Channel dml_netchan;
+ Tcl_Channel dm_netchan;
#endif
- struct client dml_clients[MAX_CLIENTS];
- int dml_dirty; /* true if
received an expose or configuration event */
- int dml_mapped;
- int dml_owner; /* true if
owner of the view info */
- int dml_am_mode; /* alternate
mouse mode */
- int dml_ndrawn;
- int dml_perspective_angle;
- int *dml_zclip_ptr;
- struct bu_list dml_p_vlist; /* predictor vlist */
- struct trail dml_trails[NUM_TRAILS];
- struct cmd_list *dml_tie;
+ struct client dm_clients[MAX_CLIENTS];
+ int dm_dirty; /* true if
received an expose or configuration event */
+ int dm_mapped;
+ int dm_owner; /* true if
owner of the view info */
+ int dm_am_mode; /* alternate
mouse mode */
+ int dm_ndrawn;
+ int dm_perspective_angle;
+ int *dm_zclip_ptr;
+ struct bu_list dm_p_vlist; /* predictor vlist */
+ struct trail dm_trails[NUM_TRAILS];
+ struct cmd_list *dm_tie;
- int dml_adc_auto;
- int dml_grid_auto_size;
- int _dml_mouse_dx;
- int _dml_mouse_dy;
- int _dml_omx;
- int _dml_omy;
- int _dml_knobs[8];
- point_t _dml_work_pt;
+ int dm_adc_auto;
+ int dm_grid_auto_size;
+ int _dm_mouse_dx;
+ int _dm_mouse_dy;
+ int _dm_omx;
+ int _dm_omy;
+ int _dm_knobs[8];
+ point_t _dm_work_pt;
/* Tcl variable names for display info */
- struct bu_vls dml_fps_name;
- struct bu_vls dml_aet_name;
- struct bu_vls dml_ang_name;
- struct bu_vls dml_center_name;
- struct bu_vls dml_size_name;
- struct bu_vls dml_adc_name;
+ struct bu_vls dm_fps_name;
+ struct bu_vls dm_aet_name;
+ struct bu_vls dm_ang_name;
+ struct bu_vls dm_center_name;
+ struct bu_vls dm_size_name;
+ struct bu_vls dm_adc_name;
/* Slider stuff */
- int dml_scroll_top;
- int dml_scroll_active;
- int dml_scroll_y;
- struct scroll_item *dml_scroll_array[6];
+ int dm_scroll_top;
+ int dm_scroll_active;
+ int dm_scroll_y;
+ struct scroll_item *dm_scroll_array[6];
/* Shareable Resources */
- struct _view_state *dml_view_state;
- struct _adc_state *dml_adc_state;
- struct _menu_state *dml_menu_state;
- struct _rubber_band *dml_rubber_band;
- struct _mged_variables *dml_mged_variables;
- struct _color_scheme *dml_color_scheme;
- struct bview_grid_state *dml_grid_state;
- struct _axes_state *dml_axes_state;
- struct _dlist_state *dml_dlist_state;
+ struct _view_state *dm_view_state;
+ struct _adc_state *dm_adc_state;
+ struct _menu_state *dm_menu_state;
+ struct _rubber_band *dm_rubber_band;
+ struct _mged_variables *dm_mged_variables;
+ struct _color_scheme *dm_color_scheme;
+ struct bview_grid_state *dm_grid_state;
+ struct _axes_state *dm_axes_state;
+ struct _dlist_state *dm_dlist_state;
/* Hooks */
- int (*dml_cmd_hook)();
- void (*dml_viewpoint_hook)();
- int (*dml_eventHandler)();
+ int (*dm_cmd_hook)();
+ void (*dm_viewpoint_hook)();
+ int (*dm_eventHandler)();
};
/* If we're changing the active DM, use this function so
@@ -442,49 +442,49 @@
extern void set_curr_dm(struct mged_dm *nl);
#define DM_LIST_NULL ((struct mged_dm *)NULL)
-#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
+#define DMP mged_curr_dm->dm_dmp
+#define DMP_dirty mged_curr_dm->dm_dirty
+#define fbp mged_curr_dm->dm_fbp
+#define netfd mged_curr_dm->dm_netfd
#if defined(_WIN32) && !defined(__CYGWIN__)
-#define netchan mged_curr_dm->dml_netchan
+#define netchan mged_curr_dm->dm_netchan
#endif
-#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 clients mged_curr_dm->dm_clients
+#define mapped mged_curr_dm->dm_mapped
+#define owner mged_curr_dm->dm_owner
+#define am_mode mged_curr_dm->dm_am_mode
+#define perspective_angle mged_curr_dm->dm_perspective_angle
+#define zclip_ptr mged_curr_dm->dm_zclip_ptr
-#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 view_state mged_curr_dm->dm_view_state
+#define adc_state mged_curr_dm->dm_adc_state
+#define menu_state mged_curr_dm->dm_menu_state
+#define rubber_band mged_curr_dm->dm_rubber_band
+#define mged_variables mged_curr_dm->dm_mged_variables
+#define color_scheme mged_curr_dm->dm_color_scheme
+#define grid_state mged_curr_dm->dm_grid_state
+#define axes_state mged_curr_dm->dm_axes_state
+#define dlist_state mged_curr_dm->dm_dlist_state
-#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 cmd_hook mged_curr_dm->dm_cmd_hook
+#define viewpoint_hook mged_curr_dm->dm_viewpoint_hook
+#define eventHandler mged_curr_dm->dm_eventHandler
-#define adc_auto mged_curr_dm->dml_adc_auto
-#define grid_auto_size mged_curr_dm->dml_grid_auto_size
+#define adc_auto mged_curr_dm->dm_adc_auto
+#define grid_auto_size mged_curr_dm->dm_grid_auto_size
/* Names of macros must be different than actual struct element */
-#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 dm_mouse_dx mged_curr_dm->_dm_mouse_dx
+#define dm_mouse_dy mged_curr_dm->_dm_mouse_dy
+#define dm_omx mged_curr_dm->_dm_omx
+#define dm_omy mged_curr_dm->_dm_omy
+#define dm_knobs mged_curr_dm->_dm_knobs
+#define dm_work_pt mged_curr_dm->_dm_work_pt
-#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 scroll_top mged_curr_dm->dm_scroll_top
+#define scroll_active mged_curr_dm->dm_scroll_active
+#define scroll_y mged_curr_dm->dm_scroll_y
+#define scroll_array mged_curr_dm->dm_scroll_array
#define VIEWSIZE (view_state->vs_gvp->gv_size) /* Width of viewing
cube */
#define VIEWFACTOR (1/view_state->vs_gvp->gv_scale)
@@ -549,7 +549,7 @@
struct mged_dm *tp; \
\
FOR_ALL_DISPLAYS(tp, &active_dm_set.l) { \
- if ((id) == dm_get_id(tp->dml_dmp)) { \
+ if ((id) == dm_get_id(tp->dm_dmp)) { \
(p) = tp; \
break; \
} \
Modified: brlcad/trunk/src/mged/overlay.c
===================================================================
--- brlcad/trunk/src/mged/overlay.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/overlay.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -45,7 +45,7 @@
Tcl_DStringInit(&ds);
- GEDP->ged_dmp = (void *)mged_curr_dm->dml_dmp;
+ GEDP->ged_dmp = (void *)mged_curr_dm->dm_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:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/predictor.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -121,7 +121,7 @@
int i;
for (i = 0; i < NUM_TRAILS; ++i)
- init_trail(&mged_curr_dm->dml_trails[i]);
+ init_trail(&mged_curr_dm->dm_trails[i]);
}
@@ -128,7 +128,7 @@
void
predictor_kill(void)
{
- RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
+ RT_FREE_VLIST(&mged_curr_dm->dm_p_vlist);
predictor_init();
}
@@ -181,7 +181,7 @@
return;
}
- RT_FREE_VLIST(&mged_curr_dm->dml_p_vlist);
+ RT_FREE_VLIST(&mged_curr_dm->dm_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(&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);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, m, BN_VLIST_LINE_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dm_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(&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(&mged_curr_dm->dm_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mA, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mB, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mF, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mE, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_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, 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(&mged_curr_dm->dm_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mE, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mI, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mL, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mH, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_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, 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(&mged_curr_dm->dm_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mH, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mG, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mC, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mD, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_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, 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);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, norm, BN_VLIST_POLY_START);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mJ, BN_VLIST_POLY_MOVE);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mF, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mG, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mK, BN_VLIST_POLY_DRAW);
+ RT_ADD_VLIST(&mged_curr_dm->dm_p_vlist, mJ, BN_VLIST_POLY_END);
- 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(&mged_curr_dm->dm_trails[0], mA);
+ push_trail(&mged_curr_dm->dm_trails[1], mB);
+ push_trail(&mged_curr_dm->dm_trails[2], mC);
+ push_trail(&mged_curr_dm->dm_trails[3], mD);
- 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);
+ push_trail(&mged_curr_dm->dm_trails[4], mE);
+ push_trail(&mged_curr_dm->dm_trails[5], mF);
+ push_trail(&mged_curr_dm->dm_trails[6], mG);
+ push_trail(&mged_curr_dm->dm_trails[7], mH);
/* Draw the trails */
- 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);
+ poly_trail(&trail, &mged_curr_dm->dm_trails[0],
&mged_curr_dm->dm_trails[4]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dm_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dm_trails[1],
&mged_curr_dm->dm_trails[5]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dm_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dm_trails[6],
&mged_curr_dm->dm_trails[2]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dm_p_vlist, &trail);
+ poly_trail(&trail, &mged_curr_dm->dm_trails[7],
&mged_curr_dm->dm_trails[3]);
+ BU_LIST_APPEND_LIST(&mged_curr_dm->dm_p_vlist, &trail);
/* Done */
MAT_IDN(view_state->vs_ModelDelta);
Modified: brlcad/trunk/src/mged/rect.c
===================================================================
--- brlcad/trunk/src/mged/rect.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/rect.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -74,8 +74,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_rubber_band == rubber_band)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_rubber_band == rubber_band)
+ dmlp->dm_dirty = 1;
}
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -141,8 +141,8 @@
struct mged_dm *dmlp;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_mged_variables == mged_variables)
- dmlp->dml_dirty = 1;
+ if (dmlp->dm_mged_variables == mged_variables)
+ dmlp->dm_dirty = 1;
}
@@ -312,7 +312,7 @@
save_dmlp = mged_curr_dm;
FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dml_mged_variables == save_dmlp->dml_mged_variables) {
+ if (dmlp->dm_mged_variables == save_dmlp->dm_mged_variables) {
set_curr_dm(dmlp);
if (mged_variables->mv_faceplate && mged_variables->mv_orig_gui) {
@@ -381,18 +381,18 @@
if (mged_variables->mv_dlist) {
/* create display lists */
- /* for each display manager dlp1 that shares its dml_mged_variables
with save_dlp */
+ /* for each display manager dlp1 that shares its dm_mged_variables with
save_dlp */
FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l) {
- if (dlp1->dml_mged_variables != save_dlp->dml_mged_variables) {
+ if (dlp1->dm_mged_variables != save_dlp->dm_mged_variables) {
continue;
}
- if (dm_get_displaylist(dlp1->dml_dmp) &&
- dlp1->dml_dlist_state->dl_active == 0) {
+ if (dm_get_displaylist(dlp1->dm_dmp) &&
+ dlp1->dm_dlist_state->dl_active == 0) {
set_curr_dm(dlp1);
createDLists(GEDP->ged_gdp->gd_headDisplay);
- dlp1->dml_dlist_state->dl_active = 1;
- dlp1->dml_dirty = 1;
+ dlp1->dm_dlist_state->dl_active = 1;
+ dlp1->dm_dirty = 1;
}
}
} else {
@@ -400,20 +400,20 @@
* Free display lists if not being used by another display manager
*/
- /* for each display manager dlp1 that shares its dml_mged_variables
with save_dlp */
+ /* for each display manager dlp1 that shares its dm_mged_variables with
save_dlp */
FOR_ALL_DISPLAYS(dlp1, &active_dm_set.l) {
- if (dlp1->dml_mged_variables != save_dlp->dml_mged_variables)
+ if (dlp1->dm_mged_variables != save_dlp->dm_mged_variables)
continue;
- if (dlp1->dml_dlist_state->dl_active) {
+ if (dlp1->dm_dlist_state->dl_active) {
/* for each display manager dlp2 that is sharing display lists
with dlp1 */
FOR_ALL_DISPLAYS(dlp2, &active_dm_set.l) {
- if (dlp2->dml_dlist_state != dlp1->dml_dlist_state) {
+ if (dlp2->dm_dlist_state != dlp1->dm_dlist_state) {
continue;
}
/* found a dlp2 that is actively using dlp1's display lists
*/
- if (dlp2->dml_mged_variables->mv_dlist)
+ if (dlp2->dm_mged_variables->mv_dlist)
break;
}
@@ -422,14 +422,14 @@
struct display_list *gdlp;
struct display_list *next_gdlp;
- dlp1->dml_dlist_state->dl_active = 0;
+ dlp1->dm_dlist_state->dl_active = 0;
gdlp = BU_LIST_NEXT(display_list,
GEDP->ged_gdp->gd_headDisplay);
while (BU_LIST_NOT_HEAD(gdlp,
GEDP->ged_gdp->gd_headDisplay)) {
next_gdlp = BU_LIST_PNEXT(display_list, gdlp);
- (void)dm_make_current(dlp1->dml_dmp);
- (void)dm_free_dlists(dlp1->dml_dmp,
+ (void)dm_make_current(dlp1->dm_dmp);
+ (void)dm_free_dlists(dlp1->dm_dmp,
BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist,
BU_LIST_LAST(solid,
&gdlp->dl_headSolid)->s_dlist -
BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist + 1);
Modified: brlcad/trunk/src/mged/share.c
===================================================================
--- brlcad/trunk/src/mged/share.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/share.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -114,7 +114,7 @@
}
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))))
+ if (dm_get_pathname(dlp1->dm_dmp) && BU_STR_EQUAL(argv[2],
bu_vls_addr(dm_get_pathname(dlp1->dm_dmp))))
break;
if (dlp1 == &active_dm_set) {
@@ -127,7 +127,7 @@
if (!uflag) {
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))))
+ if (dm_get_pathname(dlp2->dm_dmp) && BU_STR_EQUAL(argv[3],
bu_vls_addr(dm_get_pathname(dlp2->dm_dmp))))
break;
if (dlp2 == &active_dm_set) {
@@ -149,9 +149,9 @@
case 'a':
case 'A':
if (argv[1][1] == 'd' || argv[1][1] == 'D')
- SHARE_RESOURCE(uflag, _adc_state, dml_adc_state, adc_rc, dlp1,
dlp2, vls, "share: adc_state");
+ SHARE_RESOURCE(uflag, _adc_state, dm_adc_state, adc_rc, dlp1,
dlp2, vls, "share: adc_state");
else if (argv[1][1] == 'x' || argv[1][1] == 'X')
- SHARE_RESOURCE(uflag, _axes_state, dml_axes_state, ax_rc, dlp1,
dlp2, vls, "share: axes_state");
+ SHARE_RESOURCE(uflag, _axes_state, dm_axes_state, ax_rc, dlp1,
dlp2, vls, "share: axes_state");
else {
bu_vls_printf(&vls, "share: resource type '%s' unknown\n",
argv[1]);
Tcl_AppendResult(interpreter, bu_vls_addr(&vls), (char *)NULL);
@@ -162,7 +162,7 @@
break;
case 'c':
case 'C':
- SHARE_RESOURCE(uflag, _color_scheme, dml_color_scheme, cs_rc, dlp1,
dlp2, vls, "share: color_scheme");
+ SHARE_RESOURCE(uflag, _color_scheme, dm_color_scheme, cs_rc, dlp1,
dlp2, vls, "share: color_scheme");
break;
case 'd':
case 'D':
@@ -170,16 +170,16 @@
struct dm *dmp1;
struct dm *dmp2 = (struct dm *)NULL;
- dmp1 = dlp1->dml_dmp;
+ dmp1 = dlp1->dm_dmp;
if (dlp2 != (struct mged_dm *)NULL)
- dmp2 = dlp2->dml_dmp;
+ dmp2 = dlp2->dm_dmp;
if (dm_share_dlist(dmp1, dmp2) == TCL_OK) {
- SHARE_RESOURCE(uflag, _dlist_state, dml_dlist_state, dl_rc,
dlp1, dlp2, vls, "share: dlist_state");
+ SHARE_RESOURCE(uflag, _dlist_state, dm_dlist_state, dl_rc,
dlp1, dlp2, vls, "share: dlist_state");
if (uflag) {
- dlp1->dml_dlist_state->dl_active =
dlp1->dml_mged_variables->mv_dlist;
+ dlp1->dm_dlist_state->dl_active =
dlp1->dm_mged_variables->mv_dlist;
- if (dlp1->dml_mged_variables->mv_dlist) {
+ if (dlp1->dm_mged_variables->mv_dlist) {
struct mged_dm *save_dlp;
save_dlp = mged_curr_dm;
@@ -191,9 +191,9 @@
set_curr_dm(save_dlp);
}
- dlp1->dml_dirty = 1;
+ dlp1->dm_dirty = 1;
} else {
- dlp1->dml_dirty = dlp2->dml_dirty = 1;
+ dlp1->dm_dirty = dlp2->dm_dirty = 1;
}
}
}
@@ -200,37 +200,37 @@
break;
case 'g':
case 'G':
- SHARE_RESOURCE(uflag, bview_grid_state, dml_grid_state, rc, dlp1,
dlp2, vls, "share: grid_state");
+ SHARE_RESOURCE(uflag, bview_grid_state, dm_grid_state, rc, dlp1,
dlp2, vls, "share: grid_state");
break;
case 'm':
case 'M':
- SHARE_RESOURCE(uflag, _menu_state, dml_menu_state, ms_rc, dlp1,
dlp2, vls, "share: menu_state");
+ SHARE_RESOURCE(uflag, _menu_state, dm_menu_state, ms_rc, dlp1,
dlp2, vls, "share: menu_state");
break;
case 'r':
case 'R':
- SHARE_RESOURCE(uflag, _rubber_band, dml_rubber_band, rb_rc, dlp1,
dlp2, vls, "share: rubber_band");
+ SHARE_RESOURCE(uflag, _rubber_band, dm_rubber_band, rb_rc, dlp1,
dlp2, vls, "share: rubber_band");
break;
case 'v':
case 'V':
if ((argv[1][1] == 'a' || argv[1][1] == 'A') &&
(argv[1][2] == 'r' || argv[1][2] == 'R'))
- SHARE_RESOURCE(uflag, _mged_variables, dml_mged_variables,
mv_rc, dlp1, dlp2, vls, "share: mged_variables");
+ SHARE_RESOURCE(uflag, _mged_variables, dm_mged_variables,
mv_rc, dlp1, dlp2, vls, "share: mged_variables");
else if (argv[1][1] == 'i' || argv[1][1] == 'I') {
if (!uflag) {
/* free dlp2's view_state resources if currently not
sharing */
- if (dlp2->dml_view_state->vs_rc == 1)
+ if (dlp2->dm_view_state->vs_rc == 1)
view_ring_destroy(dlp2);
}
- SHARE_RESOURCE(uflag, _view_state, dml_view_state, vs_rc, dlp1,
dlp2, vls, "share: view_state");
+ SHARE_RESOURCE(uflag, _view_state, dm_view_state, vs_rc, dlp1,
dlp2, vls, "share: view_state");
if (uflag) {
struct _view_state *ovsp;
- ovsp = dlp1->dml_view_state;
+ ovsp = dlp1->dm_view_state;
/* initialize dlp1's view_state */
- if (ovsp != dlp1->dml_view_state)
- view_ring_init(dlp1->dml_view_state, ovsp);
+ if (ovsp != dlp1->dm_view_state)
+ view_ring_init(dlp1->dm_view_state, ovsp);
}
} else {
bu_vls_printf(&vls, "share: resource type '%s' unknown\n",
argv[1]);
@@ -250,7 +250,7 @@
}
if (!uflag)
- dlp2->dml_dirty = 1; /* need to redraw this guy */
+ dlp2->dm_dirty = 1; /* need to redraw this guy */
bu_vls_free(&vls);
return TCL_OK;
@@ -366,28 +366,28 @@
usurp_all_resources(struct mged_dm *dlp1, struct mged_dm *dlp2)
{
free_all_resources(dlp1);
- dlp1->dml_view_state = dlp2->dml_view_state;
- dlp1->dml_adc_state = dlp2->dml_adc_state;
- dlp1->dml_menu_state = dlp2->dml_menu_state;
- dlp1->dml_rubber_band = dlp2->dml_rubber_band;
- dlp1->dml_mged_variables = dlp2->dml_mged_variables;
- dlp1->dml_color_scheme = dlp2->dml_color_scheme;
- dlp1->dml_grid_state = dlp2->dml_grid_state;
- dlp1->dml_axes_state = dlp2->dml_axes_state;
+ dlp1->dm_view_state = dlp2->dm_view_state;
+ dlp1->dm_adc_state = dlp2->dm_adc_state;
+ dlp1->dm_menu_state = dlp2->dm_menu_state;
+ dlp1->dm_rubber_band = dlp2->dm_rubber_band;
+ dlp1->dm_mged_variables = dlp2->dm_mged_variables;
+ dlp1->dm_color_scheme = dlp2->dm_color_scheme;
+ dlp1->dm_grid_state = dlp2->dm_grid_state;
+ dlp1->dm_axes_state = dlp2->dm_axes_state;
/* sanity */
- dlp2->dml_view_state = (struct _view_state *)NULL;
- dlp2->dml_adc_state = (struct _adc_state *)NULL;
- dlp2->dml_menu_state = (struct _menu_state *)NULL;
- dlp2->dml_rubber_band = (struct _rubber_band *)NULL;
- dlp2->dml_mged_variables = (struct _mged_variables *)NULL;
- dlp2->dml_color_scheme = (struct _color_scheme *)NULL;
- dlp2->dml_grid_state = (struct bview_grid_state *)NULL;
- dlp2->dml_axes_state = (struct _axes_state *)NULL;
+ dlp2->dm_view_state = (struct _view_state *)NULL;
+ dlp2->dm_adc_state = (struct _adc_state *)NULL;
+ dlp2->dm_menu_state = (struct _menu_state *)NULL;
+ dlp2->dm_rubber_band = (struct _rubber_band *)NULL;
+ dlp2->dm_mged_variables = (struct _mged_variables *)NULL;
+ dlp2->dm_color_scheme = (struct _color_scheme *)NULL;
+ dlp2->dm_grid_state = (struct bview_grid_state *)NULL;
+ dlp2->dm_axes_state = (struct _axes_state *)NULL;
/* it doesn't make sense to save display list info */
- if (!--dlp2->dml_dlist_state->dl_rc)
- bu_free((void *)mged_curr_dm->dml_dlist_state, "usurp_all_resources:
_dlist_state");
+ if (!--dlp2->dm_dlist_state->dl_rc)
+ bu_free((void *)mged_curr_dm->dm_dlist_state, "usurp_all_resources:
_dlist_state");
}
@@ -398,31 +398,31 @@
void
free_all_resources(struct mged_dm *dlp)
{
- if (!--dlp->dml_view_state->vs_rc) {
+ if (!--dlp->dm_view_state->vs_rc) {
view_ring_destroy(dlp);
- bu_free((void *)dlp->dml_view_state, "free_all_resources: view_state");
+ bu_free((void *)dlp->dm_view_state, "free_all_resources: view_state");
}
- if (!--dlp->dml_adc_state->adc_rc)
- bu_free((void *)dlp->dml_adc_state, "free_all_resources: adc_state");
+ if (!--dlp->dm_adc_state->adc_rc)
+ bu_free((void *)dlp->dm_adc_state, "free_all_resources: adc_state");
- if (!--dlp->dml_menu_state->ms_rc)
- bu_free((void *)dlp->dml_menu_state, "free_all_resources: menu_state");
+ if (!--dlp->dm_menu_state->ms_rc)
+ bu_free((void *)dlp->dm_menu_state, "free_all_resources: menu_state");
- if (!--dlp->dml_rubber_band->rb_rc)
- bu_free((void *)dlp->dml_rubber_band, "free_all_resources:
rubber_band");
+ if (!--dlp->dm_rubber_band->rb_rc)
+ bu_free((void *)dlp->dm_rubber_band, "free_all_resources: rubber_band");
- if (!--dlp->dml_mged_variables->mv_rc)
- bu_free((void *)dlp->dml_mged_variables, "free_all_resources:
mged_variables");
+ if (!--dlp->dm_mged_variables->mv_rc)
+ bu_free((void *)dlp->dm_mged_variables, "free_all_resources:
mged_variables");
- if (!--dlp->dml_color_scheme->cs_rc)
- bu_free((void *)dlp->dml_color_scheme, "free_all_resources:
color_scheme");
+ if (!--dlp->dm_color_scheme->cs_rc)
+ bu_free((void *)dlp->dm_color_scheme, "free_all_resources:
color_scheme");
- if (!--dlp->dml_grid_state->rc)
- bu_free((void *)dlp->dml_grid_state, "free_all_resources: grid_state");
+ if (!--dlp->dm_grid_state->rc)
+ bu_free((void *)dlp->dm_grid_state, "free_all_resources: grid_state");
- if (!--dlp->dml_axes_state->ax_rc)
- bu_free((void *)dlp->dml_axes_state, "free_all_resources: axes_state");
+ if (!--dlp->dm_axes_state->ax_rc)
+ bu_free((void *)dlp->dm_axes_state, "free_all_resources: axes_state");
}
@@ -431,18 +431,18 @@
{
struct mged_dm *dlp1;
- if (!dm_get_displaylist(dlp2->dml_dmp))
+ if (!dm_get_displaylist(dlp2->dm_dmp))
return;
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))) {
- if (dm_share_dlist(dlp1->dml_dmp, dlp2->dml_dmp) == TCL_OK) {
+ dm_get_type(dlp1->dm_dmp) == dm_get_type(dlp2->dm_dmp) &&
dm_get_dname(dlp1->dm_dmp) && dm_get_dname(dlp2->dm_dmp) &&
+ !bu_vls_strcmp(dm_get_dname(dlp1->dm_dmp),
dm_get_dname(dlp2->dm_dmp))) {
+ if (dm_share_dlist(dlp1->dm_dmp, dlp2->dm_dmp) == TCL_OK) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
- SHARE_RESOURCE(0, _dlist_state, dml_dlist_state, dl_rc, dlp1,
dlp2, vls, "share: dlist_state");
- dlp1->dml_dirty = dlp2->dml_dirty = 1;
+ SHARE_RESOURCE(0, _dlist_state, dm_dlist_state, dl_rc, dlp1,
dlp2, vls, "share: dlist_state");
+ dlp1->dm_dirty = dlp2->dm_dirty = 1;
bu_vls_free(&vls);
}
Modified: brlcad/trunk/src/mged/titles.c
===================================================================
--- brlcad/trunk/src/mged/titles.c 2020-08-24 22:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/titles.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -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(&mged_curr_dm->dml_center_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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(&mged_curr_dm->dml_size_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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(&mged_curr_dm->dml_aet_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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(&mged_curr_dm->dml_ang_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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(&mged_curr_dm->dml_adc_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_adc_name),
bu_vls_addr(&vls), TCL_GLOBAL_ONLY);
ss_line_not_drawn = 0;
} else {
- Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dml_adc_name), "",
TCL_GLOBAL_ONLY);
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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(&mged_curr_dm->dml_fps_name),
+ Tcl_SetVar(INTERP, bu_vls_addr(&mged_curr_dm->dm_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:15:43 UTC (rev 76931)
+++ brlcad/trunk/src/mged/usepen.c 2020-08-24 22:21:14 UTC (rev 76932)
@@ -55,11 +55,11 @@
struct solid *sp;
/*
- * Divide the mouse into 'mged_curr_dm->dml_ndrawn' VERTICAL
+ * Divide the mouse into 'mged_curr_dm->dm_ndrawn' VERTICAL
* zones, and use the zone number as a sequential position among
* solids which are drawn.
*/
- count = ((fastf_t)y + GED_MAX) * mged_curr_dm->dml_ndrawn / GED_RANGE;
+ count = ((fastf_t)y + GED_MAX) * mged_curr_dm->dm_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 (!(mged_curr_dm->dml_ndrawn)) {
+ if (!(mged_curr_dm->dm_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
