* Merged 8.1 branch into the main trunk

1 files changed, 24 insertions, 9 deletions

diff --git a/generic/tk3d.h b/generic/tk3d.h
index 1ec63d0..03ce97e 100644
--- a/generic/tk3d.h
+++ b/generic/tk3d.h
@@ -4,12 +4,12 @@
  *	Declarations of types and functions shared by the 3d border
  *	module.
  *
- * Copyright (c) 1996 by Sun Microsystems, Inc.
+ * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk3d.h,v 1.4 1998/09/14 18:23:03 stanton Exp $
+ * RCS: @(#) $Id: tk3d.h,v 1.5 1999/04/16 01:51:10 stanton Exp $
  */
 
 #ifndef _TK3D
@@ -23,13 +23,13 @@
 #endif
 
 /*
- * One of the following data structures is allocated for
- * each 3-D border currently in use.  Structures of this
- * type are indexed by borderTable, so that a single
- * structure can be shared for several uses.
+ * One of the following data structures is allocated for each 3-D border
+ * currently in use.  Structures of this type are indexed by
+ * borderTable, so that a single structure can be shared for several
+ * uses.
  */
 
-typedef struct {
+typedef struct TkBorder {
     Screen *screen;		/* Screen on which the border will be used. */
     Visual *visual;		/* Visual for all windows and pixmaps using
 				 * the border. */
@@ -37,8 +37,18 @@ typedef struct {
 				 * the border will be used. */
     Colormap colormap;		/* Colormap out of which pixels are
 				 * allocated. */
-    int refCount;		/* Number of different users of
-				 * this border.  */
+    int resourceRefCount;	/* Number of active uses of this color (each
+				 * active use corresponds to a call to
+				 * Tk_Alloc3DBorderFromObj or Tk_Get3DBorder).
+				 * If this count is 0, then this structure
+				 * is no longer valid and it isn't present
+				 * in borderTable: it is being kept around
+				 * only because there are objects referring
+				 * to it.  The structure is freed when
+				 * resourceRefCount and objRefCount are
+				 * both 0. */
+    int objRefCount;		/* The number of Tcl objects that reference
+				 * this structure. */
     XColor *bgColorPtr;		/* Background color (intensity
 				 * between lightColorPtr and
 				 * darkColorPtr). */
@@ -63,6 +73,11 @@ typedef struct {
 				 * haven't been allocated yet. */
     Tcl_HashEntry *hashPtr;	/* Entry in borderTable (needed in
 				 * order to delete structure). */
+    struct TkBorder *nextPtr;	/* Points to the next TkBorder structure with
+				 * the same color name.  Borders with the
+				 * same name but different screens or
+				 * colormaps are chained together off a
+				 * single entry in borderTable. */
 } TkBorder;