Revision: 75315
http://sourceforge.net/p/brlcad/code/75315
Author: starseeker
Date: 2020-04-09 02:20:47 +0000 (Thu, 09 Apr 2020)
Log Message:
-----------
checkpoint
Modified Paths:
--------------
brlcad/trunk/include/dm/dm_xvars.h
brlcad/trunk/include/dm.h
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libdm/dm-X.c
brlcad/trunk/src/libdm/dm-glx.h
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-osgl.cpp
Modified: brlcad/trunk/include/dm/dm_xvars.h
===================================================================
--- brlcad/trunk/include/dm/dm_xvars.h 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/include/dm/dm_xvars.h 2020-04-09 02:20:47 UTC (rev 75315)
@@ -27,24 +27,13 @@
#include "common.h"
+#include "dm.h"
+
#ifdef HAVE_X11_XLIB_H
# include <X11/Xlib.h>
# include <X11/Xutil.h>
#endif
-#ifdef HAVE_TK
-# include "tk.h"
-# define HAVE_X11_TYPES 1
-#endif
-#ifdef IF_WGL
-#include "tkWinInt.h"
-#endif
-
-#if !defined(HAVE_TK) && !defined(TK_WINDOW_TYPEDEF)
-typedef void *Tk_Window;
-# define TK_WINDOW_TYPEDEF 1
-#endif
-
#if !defined(HAVE_X11_TYPES) && !defined(HAVE_X11_XLIB_H)
typedef long Display;
typedef long Window;
@@ -61,8 +50,8 @@
struct dm_xvars {
Display *dpy;
Window win;
- Tk_Window top;
- Tk_Window xtkwin;
+ dm_win top;
+ dm_win xtkwin;
int depth;
Colormap cmap;
#ifdef IF_WGL
@@ -74,10 +63,6 @@
XVisualInfo *vip;
XFontStruct *fontstruct;
#endif
-#ifdef DM_TK
- int tkfontset;
- Tk_Font tkfontstruct;
-#endif
int devmotionnotify;
int devbuttonpress;
int devbuttonrelease;
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/include/dm.h 2020-04-09 02:20:47 UTC (rev 75315)
@@ -281,7 +281,6 @@
DM_EXPORT extern dm dm_plot;
DM_EXPORT extern dm dm_ps;
DM_EXPORT extern dm dm_rtgl;
-DM_EXPORT extern dm dm_tk;
DM_EXPORT extern dm dm_wgl;
DM_EXPORT extern dm dm_X;
DM_EXPORT extern dm dm_txt;
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-04-09 01:40:35 UTC (rev
75314)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-04-09 02:20:47 UTC (rev
75315)
@@ -9,8 +9,6 @@
${X11_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR_GL}
${OPENGL_INCLUDE_DIR_GLX}
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
${Qt5Widgets_INCLUDE_DIRS}
${OPENTHREADS_INCLUDE_DIR}
${OSG_INCLUDE_DIR}
@@ -112,9 +110,6 @@
endif(CPP_DLL_DEFINES)
endif(BRLCAD_ENABLE_OSG)
-if(BRLCAD_BUILD_LOCAL_TK AND BRLCAD_ENABLE_TK)
- add_dependencies(libdm tk)
-endif(BRLCAD_BUILD_LOCAL_TK AND BRLCAD_ENABLE_TK)
if(BRLCAD_ENABLE_OSG)
add_dependencies(libdm profont_ProFont_ttf_cp)
endif(BRLCAD_ENABLE_OSG)
Modified: brlcad/trunk/src/libdm/dm-X.c
===================================================================
--- brlcad/trunk/src/libdm/dm-X.c 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/src/libdm/dm-X.c 2020-04-09 02:20:47 UTC (rev 75315)
@@ -51,10 +51,6 @@
# undef X_NOT_POSIX
#endif
-#ifdef HAVE_TK
-# include "tk.h"
-#endif
-
#include "vmath.h"
#include "bu/endian.h"
#include "bn.h"
@@ -488,7 +484,7 @@
if (dmp->dm_top) {
#ifdef HAVE_TK
/* Make xtkwin a toplevel window */
- pubvars->xtkwin =
(Tk_Window)(*context->dm_window_create_from_path)(dmp, tkwin,
+ pubvars->xtkwin = (*context->dm_window_create_from_path)(dmp, tkwin,
bu_vls_cstr(&dmp->dm_pathName), bu_vls_cstr(&dmp->dm_dName));
pubvars->top = pubvars->xtkwin;
#endif
@@ -497,7 +493,7 @@
cp = strrchr(bu_vls_addr(&dmp->dm_pathName), (int)'.');
if (cp == bu_vls_addr(&dmp->dm_pathName)) {
- pubvars->top = (Tk_Window)tkwin;
+ pubvars->top = tkwin;
} else {
struct bu_vls top_vls = BU_VLS_INIT_ZERO;
@@ -504,7 +500,7 @@
bu_vls_strncpy(&top_vls, (const char
*)bu_vls_addr(&dmp->dm_pathName), cp - bu_vls_addr(&dmp->dm_pathName));
#ifdef HAVE_TK
- pubvars->top = (Tk_Window)(*context->dm_window_from_name)(dmp,
bu_vls_cstr(&top_vls), tkwin);
+ pubvars->top = (*context->dm_window_from_name)(dmp,
bu_vls_cstr(&top_vls), tkwin);
#endif
bu_vls_free(&top_vls);
}
@@ -511,7 +507,7 @@
#ifdef HAVE_TK
/* Make xtkwin an embedded window */
- pubvars->xtkwin =
(Tk_Window)((*context->dm_window_create_embedded)(dmp, pubvars->top, cp + 1));
+ pubvars->xtkwin = (*context->dm_window_create_embedded)(dmp,
pubvars->top, cp + 1);
#endif
}
Modified: brlcad/trunk/src/libdm/dm-glx.h
===================================================================
--- brlcad/trunk/src/libdm/dm-glx.h 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/src/libdm/dm-glx.h 2020-04-09 02:20:47 UTC (rev 75315)
@@ -28,6 +28,8 @@
#include "common.h"
+#include "dm.h"
+
/* Map +/-2048 GED space into -1.0..+1.0 :: x/2048*/
#define GED2IRIS(x) (((float)(x))*0.00048828125)
@@ -50,8 +52,8 @@
struct bu_list l;
Display *dpy;
Window win;
- Tk_Window top;
- Tk_Window xtkwin;
+ dm_win top;
+ dm_win xtkwin;
int depth;
int omx, omy;
unsigned int mb_mask;
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ogl.c 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2020-04-09 02:20:47 UTC (rev 75315)
@@ -69,8 +69,6 @@
#undef y1
#undef j1
-#include "tk.h"
-
#undef VMIN /* is used in vmath.h, too */
#include "vmath.h"
@@ -787,7 +785,7 @@
if (dmp->dm_top) {
/* Make xtkwin a toplevel window */
- pubvars->xtkwin =
(Tk_Window)(*context->dm_window_create_from_path)(dmp, tkwin,
+ pubvars->xtkwin = (*context->dm_window_create_from_path)(dmp, tkwin,
bu_vls_cstr(&dmp->dm_pathName), bu_vls_cstr(&dmp->dm_dName));
pubvars->top = pubvars->xtkwin;
} else {
@@ -795,18 +793,18 @@
cp = strrchr(bu_vls_addr(&dmp->dm_pathName), (int)'.');
if (cp == bu_vls_addr(&dmp->dm_pathName)) {
- pubvars->top = (Tk_Window)tkwin;
+ pubvars->top = tkwin;
} else {
struct bu_vls top_vls = BU_VLS_INIT_ZERO;
bu_vls_strncpy(&top_vls, (const char
*)bu_vls_addr(&dmp->dm_pathName), cp - bu_vls_addr(&dmp->dm_pathName));
- pubvars->top = (Tk_Window)(*context->dm_window_from_name)(dmp,
bu_vls_cstr(&top_vls), tkwin);
+ pubvars->top = (*context->dm_window_from_name)(dmp,
bu_vls_cstr(&top_vls), tkwin);
bu_vls_free(&top_vls);
}
/* Make xtkwin an embedded window */
- pubvars->xtkwin = (Tk_Window)(*context->dm_window_create_embedded)(dmp,
pubvars->top, cp + 1);
+ pubvars->xtkwin = (*context->dm_window_create_embedded)(dmp,
pubvars->top, cp + 1);
}
if (pubvars->xtkwin == NULL) {
Modified: brlcad/trunk/src/libdm/dm-osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-09 01:40:35 UTC (rev 75314)
+++ brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-09 02:20:47 UTC (rev 75315)
@@ -362,8 +362,8 @@
if (((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin) {
- Tk_DeleteEventHandler(((struct dm_xvars
*)dmp->dm_vars.pub_vars)->xtkwin, VisibilityChangeMask, OSGEventProc,
(ClientData)dmp);
- Tk_DestroyWindow(((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin);
+ Tk_DeleteEventHandler((Tk_Window)((struct dm_xvars
*)dmp->dm_vars.pub_vars)->xtkwin, VisibilityChangeMask, OSGEventProc,
(ClientData)dmp);
+ Tk_DestroyWindow((Tk_Window)((struct dm_xvars
*)dmp->dm_vars.pub_vars)->xtkwin);
}
bu_vls_free(&dmp->dm_pathName);
@@ -676,7 +676,7 @@
osgl_setLight(dmp, dmp->dm_light);
//Tk_CreateEventHandler(pubvars->xtkwin,
PointerMotionMask|ExposureMask|StructureNotifyMask|FocusChangeMask|VisibilityChangeMask|ButtonReleaseMask,
OSGEventProc, (ClientData)dmp);
- Tk_CreateEventHandler(pubvars->xtkwin, VisibilityChangeMask, OSGEventProc,
(ClientData)dmp);
+ Tk_CreateEventHandler((Tk_Window)pubvars->xtkwin, VisibilityChangeMask,
OSGEventProc, (ClientData)dmp);
privvars->is_init = 0;
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
