ENH: move code needed to import Tk internals inside vtkTkInternals.h, and take...

ENH: move code needed to import Tk internals inside vtkTkInternals.h, and take a stab at collapsing both tk84 and tk84OSX

CMakeLists.txt

@@ -728,8 +728,10 @@ ENDIF(VTK_INCLUDE_NEED_TK)
 
 IF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_LIBRARY)
   IF(APPLE)
-    FIND_PATH(TK_INTERNAL_PATH tkMacOSXInt.h
-      ${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84OSX)
+    FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
+      ${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84)
+#    FIND_PATH(TK_INTERNAL_PATH tkMacOSXInt.h
+#      ${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84OSX)
   ELSE(APPLE)
     IF(TK_LIBRARY MATCHES tk82)
       FIND_PATH(TK_INTERNAL_PATH tkWinInt.h

Rendering/CMakeLists.txt

@@ -453,12 +453,14 @@ IF(VTK_USE_X)
   ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
 ENDIF(VTK_USE_X)
 
-CONFIGURE_FILE(
-${VTK_SOURCE_DIR}/${KIT}/tkInternals/.NoDartCoverage
-${VTK_BINARY_DIR}/${KIT}/tkInternals/.NoDartCoverage)
-
 IF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
   IF("${TK_INTERNAL_PATH}" MATCHES "${KIT}/tkInternals/tk")
     SUBDIRS(tkInternals)
   ENDIF("${TK_INTERNAL_PATH}" MATCHES "${KIT}/tkInternals/tk")
+  SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H})
+  SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H})
+  CONFIGURE_FILE(
+    ${VTK_SOURCE_DIR}/Rendering/vtkTkInternals.h.in
+    ${VTK_BINARY_DIR}/Rendering/vtkTkInternals.h)
+  INCLUDE_DIRECTORIES(${VTK_BINARY_DIR}/Rendering)
 ENDIF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)

Rendering/tkInternals/CMakeLists.txt

@@ -10,3 +10,9 @@ ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84")
 IF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84OSX")
   SUBDIRS(tk84OSX)
 ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84OSX")
+
+CONFIGURE_FILE(
+  ${VTK_SOURCE_DIR}/Rendering/tkInternals/.NoDartCoverage
+  ${VTK_BINARY_DIR}/Rendering/tkInternals/.NoDartCoverage)
+
+

Rendering/tkInternals/tk84/tkMacOSXInt.h

+/*
+ * tkMacOSXInt.h --
+ *
+ *  Declarations of Macintosh specific shared variables and procedures.
+ *
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
+ * Copyright 2001, Apple Computer, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) Id
+ */
+
+#ifndef _TKMACINT
+#define _TKMACINT
+
+#ifndef _TKINT
+#include "tkInt.h"
+#endif
+
+/*
+ * Include platform specific public interfaces.
+ */
+
+#ifndef _TKMAC
+#include "tkMacOSX.h"
+#endif
+
+#ifndef _TKPORT
+#include "tkPort.h"
+#endif
+
+#include <Carbon/Carbon.h>
+
+struct TkWindowPrivate {
+    TkWindow *winPtr;       /* Ptr to tk window or NULL if Pixmap */
+    CGrafPtr  grafPtr;
+    ControlRef rootControl;
+    int xOff;             /* X offset from toplevel window */
+    int yOff;             /* Y offset from toplevel window */
+    RgnHandle clipRgn;    /* Visable region of window */
+    RgnHandle aboveClipRgn;  /* Visable region of window & it's children */
+    int referenceCount;    /* Don't delete toplevel until children are
+         * gone. */
+    struct TkWindowPrivate *toplevel;  /* Pointer to the toplevel
+           * datastruct. */
+    int flags;      /* Various state see defines below. */
+};
+typedef struct TkWindowPrivate MacDrawable;
+
+/*
+ * This list is used to keep track of toplevel windows that have a Mac
+ * window attached. This is useful for several things, not the least
+ * of which is maintaining floating windows.
+ */
+
+typedef struct TkMacOSXWindowList {
+    struct TkMacOSXWindowList *nextPtr;  /* The next window in the list. */
+    TkWindow *winPtr;      /* This window */
+} TkMacOSXWindowList;
+
+/*
+ * Defines use for the flags field of the MacDrawable data structure.
+ */
+ 
+#define TK_SCROLLBAR_GROW  1
+#define TK_CLIP_INVALID    2
+#define TK_HOST_EXISTS    4
+#define TK_DRAWN_UNDER_MENU  8
+
+/*
+ * I am reserving TK_EMBEDDED = 0x100 in the MacDrawable flags
+ * This is defined in tk.h. We need to duplicate the TK_EMBEDDED flag in the
+ * TkWindow structure for the window,  but in the MacWin.  This way we can still tell
+ * what the correct port is after the TKWindow  structure has been freed.  This 
+ * actually happens when you bind destroy of a toplevel to Destroy of a child.
+ */
+
+/*
+ * This structure is for handling Netscape-type in process
+ * embedding where Tk does not control the top-level.  It contains
+ * various functions that are needed by Mac specific routines, like
+ * TkMacOSXGetDrawablePort.  The definitions of the function types
+ * are in tclMac.h.
+ */
+
+typedef struct {
+  Tk_MacOSXEmbedRegisterWinProc *registerWinProc;
+  Tk_MacOSXEmbedGetGrafPortProc *getPortProc;
+  Tk_MacOSXEmbedMakeContainerExistProc *containerExistProc;
+  Tk_MacOSXEmbedGetClipProc *getClipProc;
+  Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc;
+} TkMacOSXEmbedHandler;
+
+extern TkMacOSXEmbedHandler *gMacEmbedHandler;
+
+/*
+ * Defines used for TkMacOSXInvalidateWindow
+ */
+ 
+#define TK_WINDOW_ONLY 0
+#define TK_PARENT_WINDOW 1
+
+/*
+ * Accessor for the privatePtr flags field for the TK_HOST_EXISTS field
+ */
+ 
+#define TkMacOSXHostToplevelExists(tkwin) \
+    (((TkWindow *) (tkwin))->privatePtr->toplevel->flags & TK_HOST_EXISTS)
+
+/*
+ * Defines use for the flags argument to TkGenWMConfigureEvent.
+ */
+ 
+#define TK_LOCATION_CHANGED  1
+#define TK_SIZE_CHANGED    2
+#define TK_BOTH_CHANGED    3
+
+/*
+ * Variables shared among various Mac Tk modules but are not
+ * exported to the outside world.
+ */
+ 
+/*
+ * Globals shared among Macintosh Tk
+ */
+ 
+extern MenuHandle tkAppleMenu;    /* Handle to the Apple Menu */
+extern MenuHandle tkFileMenu;    /* Handles to menus */
+extern MenuHandle tkEditMenu;    /* Handles to menus */
+extern RgnHandle tkMenuCascadeRgn;  /* A region to clip with. */
+extern int tkUseMenuCascadeRgn;    /* If this is 1, clipping code
+           * should intersect tkMenuCascadeRgn
+           * before drawing occurs.
+           * tkMenuCascadeRgn will only
+           * be valid when the value of this
+           * variable is 1. */
+extern int tkPictureIsOpen;             /* If this is 1, we are drawing to a picture
+                                         * The clipping should then be done relative
+                                         * to the bounds of the picture rather than the window
+                                         * As of OS X.0.4, something is seriously wrong:
+                                         * The clipping bounds only seem to work if the
+                                         * top,left values are 0,0
+                                         * The destination rectangle for CopyBits
+                                         * should also have top,left values of 0,0
+                                         */
+extern TkMacOSXWindowList *tkMacOSXWindowListPtr;
+          /* The list of toplevels */
+
+extern Tcl_Encoding TkMacOSXCarbonEncoding;
+
+extern int TkMacOSXUseAntialiasedText(Tcl_Interp *interp, int enable);
+
+#include "tkIntPlatDecls.h"
+
+#endif /* _TKMACINT */

Rendering/tkInternals/tk84/tkMacOSXPort.h

+/*
+ * tkMacOSXPort.h --
+ *
+ *  This file is included by all of the Tk C files.  It contains
+ *  information that may be configuration-dependent, such as
+ *  #includes for system include files and a few other things.
+ *
+ * Copyright (c) 1994-1996 Sun Microsystems, Inc.
+ * Copyright 2001, Apple Computer, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) Id
+ */
+
+#ifndef _TKMACPORT
+#define _TKMACPORT
+
+/*
+ * Macro to use instead of "void" for arguments that must have
+ * type "void *" in ANSI C;  maps them to type "char *" in
+ * non-ANSI systems.  This macro may be used in some of the include
+ * files below, which is why it is defined here.
+ */
+
+#ifndef VOID
+#   ifdef __STDC__
+#       define VOID void
+#   else
+#       define VOID char
+#   endif
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+#include <fcntl.h>
+#ifdef HAVE_LIMITS_H
+#   include <limits.h>
+#else
+#   include "../compat/limits.h"
+#endif
+#include <math.h>
+#include <pwd.h>
+#ifdef NO_STDLIB_H
+#   include "../compat/stdlib.h"
+#else
+#   include <stdlib.h>
+#endif
+#include <string.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif
+#include <sys/stat.h>
+#ifndef _TCL
+#   include <tcl.h>
+#endif
+#if TIME_WITH_SYS_TIME
+#   include <sys/time.h>
+#   include <time.h>
+#else
+#   if HAVE_SYS_TIME_H
+#       include <sys/time.h>
+#   else
+#       include <time.h>
+#   endif
+#endif
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>
+#else
+#   include "../compat/unistd.h"
+#endif
+#include <X11/Xlib.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+#include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
+#include <X11/Xutil.h>
+#include "tkIntXlibDecls.h"
+
+/*
+ * The following macro defines the type of the mask arguments to
+ * select:
+ */
+
+#ifndef NO_FD_SET
+#   define SELECT_MASK fd_set
+#else
+#   ifndef _AIX
+  typedef long fd_mask;
+#   endif
+#   if defined(_IBMR2)
+#  define SELECT_MASK void
+#   else
+#  define SELECT_MASK int
+#   endif
+#endif
+
+/*
+ * The following macro defines the number of fd_masks in an fd_set:
+ */
+
+#ifndef FD_SETSIZE
+#   ifdef OPEN_MAX
+#  define FD_SETSIZE OPEN_MAX
+#   else
+#  define FD_SETSIZE 256
+#   endif
+#endif
+#if !defined(howmany)
+#   define howmany(x, y) (((x)+((y)-1))/(y))
+#endif
+#ifndef NFDBITS
+#   define NFDBITS NBBY*sizeof(fd_mask)
+#endif
+#define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
+
+/*
+ * Not all systems declare the errno variable in errno.h. so this
+ * file does it explicitly.
+ */
+
+extern int errno;
+
+/*
+ * Define "NBBY" (number of bits per byte) if it's not already defined.
+ */
+
+#ifndef NBBY
+#   define NBBY 8
+#endif
+
+/*
+ * Declarations for various library procedures that may not be declared
+ * in any other header file.
+ */
+
+#ifndef panic  /* In a stubs-aware setting, this could confuse the #define */
+extern void     panic  _ANSI_ARGS_(TCL_VARARGS(char *, string));
+#endif
+#ifndef strcasecmp
+extern int    strcasecmp _ANSI_ARGS_((CONST char *s1,
+          CONST char *s2));
+#endif
+#ifndef strncasecmp          
+extern int    strncasecmp _ANSI_ARGS_((CONST char *s1,
+          CONST char *s2, size_t n));
+#endif
+/*
+ * Defines for X functions that are used by Tk but are treated as
+ * no-op functions on the Macintosh.
+ */
+
+#define XFlush(display)
+#define XFree(data) {if ((data) != NULL) ckfree((char *) (data));}
+#define XGrabServer(display)
+#define XNoOp(display) {display->request++;}
+#define XUngrabServer(display)
+#define XSynchronize(display, bool) {display->request++;}
+#define XSync(display, bool) {display->request++;}
+#define XVisualIDFromVisual(visual) (visual->visualid)
+
+/*
+ * The following functions are not used on the Mac, so we stub them out.
+ */
+
+#define TkFreeWindowId(dispPtr,w)
+#define TkInitXId(dispPtr)
+#define TkpButtonSetDefaults(specPtr) {}
+#define TkpCmapStressed(tkwin,colormap) (0)
+#define TkpFreeColor(tkColPtr)
+#define TkSetPixmapColormap(p,c) {}
+#define TkpSync(display)
+
+/*
+ * The following macro returns the pixel value that corresponds to the
+ * RGB values in the given XColor structure.
+ */
+
+#define PIXEL_MAGIC ((unsigned char) 0x69)
+#define TkpGetPixel(p) ((((((PIXEL_MAGIC << 8) \
+  | (((p)->red >> 8) & 0xff)) << 8) \
+  | (((p)->green >> 8) & 0xff)) << 8) \
+  | (((p)->blue >> 8) & 0xff))
+
+/*
+ * This macro stores a representation of the window handle in a string.
+ * This should perhaps use the real size of an XID.
+ */
+
+#define TkpPrintWindowId(buf,w) \
+  sprintf((buf), "0x%x", (unsigned int) (w))
+      
+/*
+ * TkpScanWindowId is just an alias for Tcl_GetInt on Unix.
+ */
+
+#define TkpScanWindowId(i,s,wp) \
+  Tcl_GetInt((i),(s),(int *) (wp))
+
+/*
+ * Magic pixel values for dynamic (or active) colors.
+ */
+
+#define HIGHLIGHT_PIXEL      31
+#define HIGHLIGHT_TEXT_PIXEL    33
+#define CONTROL_TEXT_PIXEL    35
+#define CONTROL_BODY_PIXEL    37
+#define CONTROL_FRAME_PIXEL    39
+#define WINDOW_BODY_PIXEL    41
+#define MENU_ACTIVE_PIXEL    43
+#define MENU_ACTIVE_TEXT_PIXEL    45
+#define MENU_BACKGROUND_PIXEL    47
+#define MENU_DISABLED_PIXEL    49
+#define MENU_TEXT_PIXEL      51
+#define APPEARANCE_PIXEL    52
+
+#endif /* _TKMACPORT */

Rendering/tkInternals/tk84/tkPort.h

@@ -29,9 +29,9 @@
 #   if defined(MAC_TCL)
 #  include "tkMacPort.h"
 #   elif defined(MAC_OSX_TK)
-#  include "../macosx/tkMacOSXPort.h"
+#  include "tkMacOSXPort.h"
 #   else
-#  include "../unix/tkUnixPort.h"
+#  include "tkUnixPort.h"
 #   endif
 #endif
 

Rendering/vtkTkImageViewerWidget.cxx

@@ -16,24 +16,13 @@
 
 #include "vtkTkImageViewerWidget.h"
 #include "vtkRenderWindowInteractor.h"
-
-// This widget requires access to structures that are normally 
-// not visible to Tcl/Tk applications. For this reason you must
-// have access to tkInt.h
-// #include "tkInt.h"
-#ifdef _WIN32
-extern "C"
-{
-#include "tkWinInt.h" 
-}
-#endif
+#include "vtkTkInternals.h"
 
 #ifdef _MSC_VER
  #pragma warning ( disable : 4273 )
 #else
  #ifdef VTK_USE_CARBON
   #include "vtkCarbonRenderWindow.h"
-  #include "tkMacOSXInt.h"
  #else
   #ifdef VTK_USE_COCOA
    #include "vtkCocoaRenderWindow.h"

Rendering/vtkTkInternals.h.in

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkTkInternals.h.in
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+#ifndef __vtkTkInternals_h
+#define __vtkTkInternals_h
+
+#cmakedefine HAVE_LIMITS_H
+#cmakedefine HAVE_UNISTD_H
+
+// This widget requires access to structures that are normally 
+// not visible to Tcl/Tk applications. For this reason you must
+// have access to tkInt.h
+// #include "tkInt.h"
+#ifdef _WIN32
+extern "C"
+{
+#include "tkWinInt.h" 
+}
+#endif
+
+#ifdef VTK_USE_CARBON
+#include "tkMacOSXInt.h"
+#endif
+
+#endif /* __vtkTkInternals_h */
+ 

Rendering/vtkTkRenderWidget.cxx

@@ -18,24 +18,13 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkImageData.h"
 #include "vtkTclUtil.h"
-
-// This widget requires access to structures that are normally 
-// not visible to Tcl/Tk applications. For this reason you must
-// have access to tkInt.h
-// #include "tkInt.h"
-#ifdef _WIN32
-extern "C"
-{
-#include "tkWinInt.h" 
-}
-#endif
+#include "vtkTkInternals.h"
 
 #ifdef _WIN32
 #include "vtkWin32OpenGLRenderWindow.h"
 #else
 #ifdef VTK_USE_CARBON
 #include "vtkCarbonRenderWindow.h"
-#include "tkMacOSXInt.h"
 #else
 #include "vtkXOpenGLRenderWindow.h"
 #endif

Rendering/vtkXRenderWindowTclInteractor.cxx

@@ -12,23 +12,23 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/X.h>
-#include <X11/keysym.h>
-#include "vtkXRenderWindowTclInteractor.h"
-#include "vtkXOpenGLRenderWindow.h"
 #include "vtkActor.h"
-#include <X11/Shell.h>
-#include <math.h>
-#include "tk.h"
 #include "vtkActorCollection.h"
-#include "vtkPoints.h"
-#include "vtkOldStyleCallbackCommand.h"
 #include "vtkObjectFactory.h"
+#include "vtkOldStyleCallbackCommand.h"
+#include "vtkPoints.h"
+#include "vtkXOpenGLRenderWindow.h"
+#include "vtkXRenderWindowTclInteractor.h"
+#include <X11/Shell.h>
+#include <X11/X.h>
+#include <X11/keysym.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vtkTk.h>
 
-vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "1.45");
+vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "1.46");
 vtkStandardNewMacro(vtkXRenderWindowTclInteractor);
 
 // steal the first three elements of the TkMainInfo stuct