Revision: 75306
http://sourceforge.net/p/brlcad/code/75306
Author: starseeker
Date: 2020-04-08 19:45:50 +0000 (Wed, 08 Apr 2020)
Log Message:
-----------
X dm calls Tk_Screen - set up to wrap it
Modified Paths:
--------------
brlcad/trunk/include/dm.h
brlcad/trunk/src/libtclcad/dm_tcl.c
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2020-04-08 18:56:15 UTC (rev 75305)
+++ brlcad/trunk/include/dm.h 2020-04-08 19:45:50 UTC (rev 75306)
@@ -232,6 +232,7 @@
typedef long unsigned int dm_cmap;
typedef long unsigned int dm_winid;
typedef void * dm_visual_info;
+typedef void * dm_screen;
typedef unsigned long dm_pixmap;
struct dm_context {
/* Tk_MainWindow */
@@ -266,6 +267,8 @@
void (*dm_free_pixmap)(dm *, dm_dpy, dm_pixmap);
/* Tk_SetWindowBackground */
void (*dm_window_set_bg)(dm *, dm_win, unsigned long);
+ /* Tk_Screen */
+ dm_screen (*dm_get_screen)(dm *, dm_win);
};
__BEGIN_DECLS
Modified: brlcad/trunk/src/libtclcad/dm_tcl.c
===================================================================
--- brlcad/trunk/src/libtclcad/dm_tcl.c 2020-04-08 18:56:15 UTC (rev 75305)
+++ brlcad/trunk/src/libtclcad/dm_tcl.c 2020-04-08 19:45:50 UTC (rev 75306)
@@ -2773,7 +2773,14 @@
Tk_SetWindowBackground((Tk_Window)win, bg);
}
+/* TK_Screen */
+static dm_screen
+tk_get_screen(dm *UNUSED(dmp), dm_win win)
+{
+ return (dm_screen)Tk_Screen((Tk_Window)win);
+}
+
struct dm_context dm_tk_context = {
/* Tk_MainWindow -> dm_window_main */
&tk_window_main,
@@ -2821,7 +2828,10 @@
&tk_free_pixmap,
/* dm_window_set_bg -> Tk_SetWindowBackground */
- &tk_window_set_bg
+ &tk_window_set_bg,
+
+ /* dm_screen -> Tk_Screen */
+ &tk_get_screen
};
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
