Revision: 75444
http://sourceforge.net/p/brlcad/code/75444
Author: starseeker
Date: 2020-04-17 20:18:14 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
Remove the last dm_xvars.h uses from non-backend libdm code
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/dm_obj.c
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:00:04 UTC
(rev 75443)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 20:18:14 UTC
(rev 75444)
@@ -2012,6 +2012,20 @@
return 0;
}
+void
+X_flush(struct dm *dmp)
+{
+ struct dm_Xvars *pub_vars = (struct dm_Xvars *)dmp->i->dm_vars.pub_vars;
+ XFlush(pub_vars->dpy);
+}
+
+void
+X_sync(struct dm *dmp)
+{
+ struct dm_Xvars *pub_vars = (struct dm_Xvars *)dmp->i->dm_vars.pub_vars;
+ XSync(pub_vars->dpy, 0);
+}
+
/* Display Manager package interface */
struct dm_impl dm_X_impl = {
X_close,
@@ -2056,8 +2070,8 @@
X_geometry_request,
X_internal_var,
X_write_image,
- NULL,
- NULL,
+ X_flush,
+ X_sync,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm_obj.c 2020-04-17 20:00:04 UTC
(rev 75443)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm_obj.c 2020-04-17 20:18:14 UTC
(rev 75444)
@@ -45,7 +45,6 @@
#include "rt/solid.h"
#include "dm.h"
#include "./include/private.h"
-#include "./include/dm_xvars.h"
#ifdef DM_X
# include <X11/Xutil.h>
@@ -2259,20 +2258,16 @@
*
*/
HIDDEN int
-#ifdef DM_X
dmo_flush_tcl(void *clientData, int UNUSED(argc), const char **UNUSED(argv))
-#else
-dmo_flush_tcl(void *UNUSED(clientData), int UNUSED(argc), const char
**UNUSED(argv))
-#endif
{
-#ifdef DM_X
struct dm_obj *dmop = (struct dm_obj *)clientData;
if (!dmop)
return BRLCAD_ERROR;
- XFlush(((struct dm_xvars *)dmop->dmo_dmp->i->dm_vars.pub_vars)->dpy);
-#endif
+ if (!dmop->dmo_dmp->i->dm_flush) {
+ dmop->dmo_dmp->i->dm_flush(dmop->dmo_dmp);
+ }
return BRLCAD_OK;
}
@@ -2286,20 +2281,16 @@
*
*/
HIDDEN int
-#ifdef DM_X
dmo_sync_tcl(void *clientData, int UNUSED(argc), const char **UNUSED(argv))
-#else
-dmo_sync_tcl(void *UNUSED(clientData), int UNUSED(argc), const char
**UNUSED(argv))
-#endif
{
-#ifdef DM_X
struct dm_obj *dmop = (struct dm_obj *)clientData;
if (!dmop)
return BRLCAD_ERROR;
- XSync(((struct dm_xvars *)dmop->dmo_dmp->i->dm_vars.pub_vars)->dpy, 0);
-#endif
+ if (!dmop->dmo_dmp->i->dm_sync) {
+ dmop->dmo_dmp->i->dm_sync(dmop->dmo_dmp);
+ }
return BRLCAD_OK;
}
@@ -2355,14 +2346,13 @@
}
}
-#if defined(DM_X) || defined(DM_OGL) || defined(DM_OGL) || defined(DM_WGL)
- Tk_GeometryRequest(((struct dm_xvars
*)dmop->dmo_dmp->i->dm_vars.pub_vars)->xtkwin,
- width, height);
- return BRLCAD_OK;
-#else
- bu_log("Sorry, support for 'size' command is unavailable.\n");
- return BRLCAD_ERROR;
-#endif
+ if (dmop->dmo_dmp->i->dm_geometry_request) {
+ dmop->dmo_dmp->i->dm_geometry_request(dmop->dmo_dmp, width, height);
+ return BRLCAD_OK;
+ } else {
+ bu_log("Sorry, support for 'size' command is unavailable.\n");
+ return BRLCAD_ERROR;
+ }
}
bu_vls_printf(&vls, "helplib_alias dm_size %s", argv[1]);
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
