Revision: 76968
http://sourceforge.net/p/brlcad/code/76968
Author: starseeker
Date: 2020-08-26 16:43:49 +0000 (Wed, 26 Aug 2020)
Log Message:
-----------
Merge from trunk: r76963 through r76967
Modified Paths:
--------------
brlcad/branches/RELEASE/TODO
brlcad/branches/RELEASE/src/libdm/tests/tcl_img.cpp
brlcad/branches/RELEASE/src/mged/adc.c
brlcad/branches/RELEASE/src/mged/axes.c
brlcad/branches/RELEASE/src/mged/chgview.c
brlcad/branches/RELEASE/src/mged/color_scheme.c
brlcad/branches/RELEASE/src/mged/dozoom.c
brlcad/branches/RELEASE/src/mged/grid.c
brlcad/branches/RELEASE/src/mged/menu.c
brlcad/branches/RELEASE/src/mged/mged.c
brlcad/branches/RELEASE/src/mged/rect.c
brlcad/branches/RELEASE/src/mged/set.c
brlcad/branches/RELEASE/src/mged/share.c
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-26 15:55:14 UTC (rev 76967)
+++ brlcad/branches/RELEASE 2020-08-26 16:43:49 UTC (rev 76968)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76954,76963-76967
\ No newline at end of property
Modified: brlcad/branches/RELEASE/TODO
===================================================================
--- brlcad/branches/RELEASE/TODO 2020-08-26 15:55:14 UTC (rev 76967)
+++ brlcad/branches/RELEASE/TODO 2020-08-26 16:43:49 UTC (rev 76968)
@@ -18,7 +18,11 @@
THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
-------------------------------------------------
+* The embedded framebuffer for the X display manager is not working
+ with Tcl/Tk 8.6 - it brings down mged with an Xerror when it tries
+ to XFlush after X24_blit.
+
THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
-------------------------------------------------------
Modified: brlcad/branches/RELEASE/src/libdm/tests/tcl_img.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libdm/tests/tcl_img.cpp 2020-08-26 15:55:14 UTC
(rev 76967)
+++ brlcad/branches/RELEASE/src/libdm/tests/tcl_img.cpp 2020-08-26 16:43:49 UTC
(rev 76968)
@@ -395,6 +395,8 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
+ std::cout << "DM update: " << r << "," << g << "," << b << "\n";
+
// Update done - let the parent structure know. We don't clear the
// render_needed flag here, since the parent window may have changed
// between the start and the end of this render and if it has we need
@@ -493,6 +495,8 @@
Tcl_MutexUnlock(&threadMutex);
Tcl_MutexUnlock(&fblock);
+ std::cout << "FB update: " << r << "," << g << "," << b << "\n";
+
// Generate an event for the manager thread to let it know we're done, if
the
// display manager isn't already about to generate such an event
Tcl_MutexLock(&threadMutex);
Modified: brlcad/branches/RELEASE/src/mged/adc.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/adc.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/adc.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -79,8 +79,10 @@
for (size_t i = 0; i < BU_PTBL_LEN(&active_dm_set); i++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
i);
- if (m_dmp->dm_adc_state == adc_state)
+ if (m_dmp->dm_adc_state == adc_state) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
Modified: brlcad/branches/RELEASE/src/mged/axes.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/axes.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/axes.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -87,8 +87,10 @@
{
for (size_t i = 0; i < BU_PTBL_LEN(&active_dm_set); i++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
i);
- if (m_dmp->dm_axes_state == axes_state)
+ if (m_dmp->dm_axes_state == axes_state) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
Modified: brlcad/branches/RELEASE/src/mged/chgview.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/chgview.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/chgview.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -2809,6 +2809,7 @@
if (mged_variables->mv_faceplate && mged_variables->mv_orig_gui) {
mged_curr_dm->dm_dirty = 1;
+ dm_set_dirty(DMP, 1);
}
return TCL_OK;
@@ -2843,6 +2844,7 @@
m_dmp->dm_mged_variables->mv_faceplate &&
m_dmp->dm_mged_variables->mv_orig_gui) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
}
}
Modified: brlcad/branches/RELEASE/src/mged/color_scheme.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/color_scheme.c 2020-08-26 15:55:14 UTC
(rev 76967)
+++ brlcad/branches/RELEASE/src/mged/color_scheme.c 2020-08-26 16:43:49 UTC
(rev 76968)
@@ -245,8 +245,10 @@
{
for (size_t di = 0; di < BU_PTBL_LEN(&active_dm_set); di++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
di);
- if (m_dmp->dm_color_scheme == color_scheme)
+ if (m_dmp->dm_color_scheme == color_scheme) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
@@ -305,6 +307,7 @@
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
di);
if (m_dmp->dm_color_scheme == color_scheme) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
set_curr_dm(m_dmp);
Tcl_Eval(INTERP, bu_vls_addr(&vls));
}
Modified: brlcad/branches/RELEASE/src/mged/dozoom.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/dozoom.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/dozoom.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -277,6 +277,7 @@
}
dlp->dm_dirty = 1;
+ dm_set_dirty(DMP, 1);
}
set_curr_dm(save_dlp);
Modified: brlcad/branches/RELEASE/src/mged/grid.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/grid.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/grid.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -80,8 +80,10 @@
for (size_t di = 0; di < BU_PTBL_LEN(&active_dm_set); di++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
di);
- if (m_dmp->dm_grid_state == grid_state)
+ if (m_dmp->dm_grid_state == grid_state) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
Modified: brlcad/branches/RELEASE/src/mged/menu.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/menu.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/menu.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -121,8 +121,10 @@
struct mged_dm *dlp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set, di);
if (menu_state == dlp->dm_menu_state &&
dlp->dm_mged_variables->mv_faceplate &&
- dlp->dm_mged_variables->mv_orig_gui)
+ dlp->dm_mged_variables->mv_orig_gui) {
dlp->dm_dirty = 1;
+ dm_set_dirty(dlp->dm_dmp, 1);
+ }
}
}
Modified: brlcad/branches/RELEASE/src/mged/mged.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/mged.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/mged.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -2790,6 +2790,10 @@
/* initialize a separate wdbp for libged to manage */
ged_wdbp = wdb_dbopen(DBIP, RT_WDB_TYPE_DB_DISK);
+ if (GEDP) {
+ ged_free(GEDP);
+ BU_ALLOC(GEDP, struct ged);
+ }
GED_INIT(GEDP, ged_wdbp);
GEDP->ged_output_handler = mged_output_handler;
GEDP->ged_refresh_handler = mged_refresh_handler;
Modified: brlcad/branches/RELEASE/src/mged/rect.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/rect.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/rect.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -73,8 +73,10 @@
{
for (size_t di = 0; di < BU_PTBL_LEN(&active_dm_set); di++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
di);
- if (m_dmp->dm_rubber_band == rubber_band)
+ if (m_dmp->dm_rubber_band == rubber_band) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
Modified: brlcad/branches/RELEASE/src/mged/set.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/set.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/set.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -140,8 +140,10 @@
{
for (size_t di = 0; di < BU_PTBL_LEN(&active_dm_set); di++) {
struct mged_dm *m_dmp = (struct mged_dm *)BU_PTBL_GET(&active_dm_set,
di);
- if (m_dmp->dm_mged_variables == mged_variables)
+ if (m_dmp->dm_mged_variables == mged_variables) {
m_dmp->dm_dirty = 1;
+ dm_set_dirty(m_dmp->dm_dmp, 1);
+ }
}
}
@@ -396,6 +398,7 @@
createDLists(GEDP->ged_gdp->gd_headDisplay);
dlp1->dm_dlist_state->dl_active = 1;
dlp1->dm_dirty = 1;
+ dm_set_dirty(dlp1->dm_dmp, 1);
}
}
} else {
Modified: brlcad/branches/RELEASE/src/mged/share.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/share.c 2020-08-26 15:55:14 UTC (rev
76967)
+++ brlcad/branches/RELEASE/src/mged/share.c 2020-08-26 16:43:49 UTC (rev
76968)
@@ -198,8 +198,11 @@
}
dlp1->dm_dirty = 1;
+ dm_set_dirty(dlp1->dm_dmp, 1);
} else {
dlp1->dm_dirty = dlp2->dm_dirty = 1;
+ dm_set_dirty(dlp1->dm_dmp, 1);
+ dm_set_dirty(dlp2->dm_dmp, 1);
}
}
}
@@ -255,8 +258,10 @@
return TCL_ERROR;
}
- if (!uflag)
+ if (!uflag) {
dlp2->dm_dirty = 1; /* need to redraw this guy */
+ dm_set_dirty(dlp2->dm_dmp, 1);
+ }
bu_vls_free(&vls);
return TCL_OK;
@@ -448,6 +453,8 @@
SHARE_RESOURCE(0, _dlist_state, dm_dlist_state, dl_rc, dlp1,
dlp2, vls, "share: dlist_state");
dlp1->dm_dirty = dlp2->dm_dirty = 1;
+ dm_set_dirty(dlp1->dm_dmp, 1);
+ dm_set_dirty(dlp2->dm_dmp, 1);
bu_vls_free(&vls);
}
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
