Revision: 75445
http://sourceforge.net/p/brlcad/code/75445
Author: starseeker
Date: 2020-04-17 20:25:50 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
MGED has one more use of dm_xvars - prepare to wrap it
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-17 20:18:14 UTC (rev
75444)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-17 20:25:50 UTC (rev
75445)
@@ -297,6 +297,9 @@
DM_EXPORT extern void dm_flush(struct dm *dmp);
DM_EXPORT extern void dm_sync(struct dm *dmp);
+// Return 1 if same, 0 if different and -1 if no dmp available
+DM_EXPORT extern int dm_event_type_cmp(struct dm *dmp, int etype);
+
/* TODO - dm_vp is supposed to go away, but until we figure it out
* expose it here to allow dm hiding */
DM_EXPORT extern fastf_t *dm_get_vp(struct dm *dmp);
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -2072,6 +2072,7 @@
X_write_image,
X_flush,
X_sync,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -2929,6 +2929,7 @@
ogl_write_image,
NULL,
NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-17
20:18:14 UTC (rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-17
20:25:50 UTC (rev 75445)
@@ -99,6 +99,7 @@
int (*dm_write_image)(struct bu_vls *msgs, FILE *fp, struct dm *dmp);
void (*dm_flush)(struct dm *dmp);
void (*dm_sync)(struct dm *dmp);
+ int (*dm_event_type_cmp)(struct dm *dmp, int etype);
unsigned long dm_id; /**< @brief window id */
int dm_displaylist; /**< @brief !0 means device has
displaylist */
int dm_stereo; /**< @brief stereo flag */
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-17
20:18:14 UTC (rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-17
20:25:50 UTC (rev 75445)
@@ -329,6 +329,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-17
20:18:14 UTC (rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-17
20:25:50 UTC (rev 75445)
@@ -2563,6 +2563,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-17
20:18:14 UTC (rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-17
20:25:50 UTC (rev 75445)
@@ -574,6 +574,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-17
20:18:14 UTC (rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-17
20:25:50 UTC (rev 75445)
@@ -544,6 +544,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -1070,6 +1070,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -934,6 +934,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -385,6 +385,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-17 20:18:14 UTC
(rev 75444)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-17 20:25:50 UTC
(rev 75445)
@@ -2211,6 +2211,7 @@
NULL,
NULL,
NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
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
