Merge 9.0

Author: jan.nijtmans

changes.md

@@ -22,8 +22,7 @@ necessarily in Tk 8.
  - [Add a ttk::toggleswitch widget to the core](https://core.tcl-lang.org/tips/doc/trunk/tip/727.md)
  - [Add a tk attribtable command to the core](https://core.tcl-lang.org/tips/doc/trunk/tip/729.md)
  - [Implement more X11 region functions on Windows and Aqua](https://core.tcl-lang.org/tk/info/50fdbc36ad)
- 
+
 # Potential incompatibilities to 9.0
  - [MS-Win: the undocumented option -xpstyle was removed from tk_chooseDirectory and tk_getOpenFile](https://core.tcl-lang.org/tk/tktview/441c52)
  - [MS-Win: The "xpnative" ttk style is gone too, in favor of "vista"](https://core.tcl-lang.org/tk/tktview/441c52)
- 

generic/ttk/ttkCache.c

@@ -21,16 +21,34 @@
  * The plumbing and control flow here is quite contorted;
  * it would be better to address this problem in the core instead.
  *
- * @@@ BUGS/TODO: Need distinct caches for each combination
- * of display, visual, and colormap.
- *
  * @@@ Colormap flashing on PseudoColor visuals is still possible,
  * but this will be a transient effect.
  */
 
 #include "tkInt.h"
 #include "ttkTheme.h"
 
+#if defined(_WIN32) || defined(MAC_OSX_TK)
+#   define NEED_EXTRA_INFO 0
+#else
+ /*
+  * Display, Screen, Visual, and Colormap need be tracked, too.
+  * Required on X11 with multiple display connections or
+  * special visuals/colormaps.
+  */
+#   define NEED_EXTRA_INFO 1
+#endif
+
+#if NEED_EXTRA_INFO
+typedef struct {
+    Tcl_Obj *objPtr;		/* The cached Tcl_Obj*. */
+    Display *display;		/* Display of (Font|Border|Color)Obj */
+    int screenNum;		/* Screen number of (Font|Border|Color)Obj */
+    Visual *visual;		/* Visual of (Font|Border|Color)Obj */
+    Colormap colormap;		/* Colormap of (Font|Border|Color)Obj */
+} Ttk_Cached;
+#endif
+
 #ifdef _WIN32
 #include "tkWinInt.h"
 #endif
@@ -79,11 +97,27 @@ static void Ttk_ClearCache(Ttk_ResourceCache cache)
      */
     entryPtr = Tcl_FirstHashEntry(&cache->fontTable, &search);
     while (entryPtr != NULL) {
+#if !NEED_EXTRA_INFO
 	Tcl_Obj *fontObj = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	if (fontObj) {
 	    Tk_FreeFontFromObj(cache->tkwin, fontObj);
 	    Tcl_DecrRefCount(fontObj);
 	}
+#else
+	Ttk_Cached *cachedPtr = Tcl_GetHashValue(entryPtr);
+	if (cachedPtr) {
+	    TkWindow fakeWin;
+	    Tcl_Obj *fontObj = cachedPtr->objPtr;
+	    fakeWin = *((TkWindow *) cache->tkwin);
+	    fakeWin.display = cachedPtr->display;
+	    fakeWin.screenNum = cachedPtr->screenNum;
+	    fakeWin.visual = cachedPtr->visual;
+	    fakeWin.atts.colormap = cachedPtr->colormap;
+	    Tk_FreeFontFromObj((Tk_Window) &fakeWin, fontObj);
+	    Tcl_DecrRefCount(fontObj);
+	    ckfree(cachedPtr);
+	}
+#endif
 	entryPtr = Tcl_NextHashEntry(&search);
     }
     Tcl_DeleteHashTable(&cache->fontTable);
@@ -94,11 +128,27 @@ static void Ttk_ClearCache(Ttk_ResourceCache cache)
      */
     entryPtr = Tcl_FirstHashEntry(&cache->colorTable, &search);
     while (entryPtr != NULL) {
+#if !NEED_EXTRA_INFO
 	Tcl_Obj *colorObj = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	if (colorObj) {
 	    Tk_FreeColorFromObj(cache->tkwin, colorObj);
 	    Tcl_DecrRefCount(colorObj);
 	}
+#else
+	Ttk_Cached *cachedPtr = Tcl_GetHashValue(entryPtr);
+	if (cachedPtr) {
+	    TkWindow fakeWin;
+	    Tcl_Obj *colorObj = cachedPtr->objPtr;
+	    fakeWin = *((TkWindow *) cache->tkwin);
+	    fakeWin.display = cachedPtr->display;
+	    fakeWin.screenNum = cachedPtr->screenNum;
+	    fakeWin.visual = cachedPtr->visual;
+	    fakeWin.atts.colormap = cachedPtr->colormap;
+	    Tk_FreeColorFromObj((Tk_Window) &fakeWin, colorObj);
+	    Tcl_DecrRefCount(colorObj);
+	    ckfree(cachedPtr);
+	}
+#endif
 	entryPtr = Tcl_NextHashEntry(&search);
     }
     Tcl_DeleteHashTable(&cache->colorTable);
@@ -109,11 +159,27 @@ static void Ttk_ClearCache(Ttk_ResourceCache cache)
      */
     entryPtr = Tcl_FirstHashEntry(&cache->borderTable, &search);
     while (entryPtr != NULL) {
+#if !NEED_EXTRA_INFO
 	Tcl_Obj *borderObj = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	if (borderObj) {
 	    Tk_Free3DBorderFromObj(cache->tkwin, borderObj);
 	    Tcl_DecrRefCount(borderObj);
 	}
+#else
+	Ttk_Cached *cachedPtr = Tcl_GetHashValue(entryPtr);
+	if (cachedPtr) {
+	    TkWindow fakeWin;
+	    Tcl_Obj *borderObj = cachedPtr->objPtr;
+	    fakeWin = *((TkWindow *) cache->tkwin);
+	    fakeWin.display = cachedPtr->display;
+	    fakeWin.screenNum = cachedPtr->screenNum;
+	    fakeWin.visual = cachedPtr->visual;
+	    fakeWin.atts.colormap = cachedPtr->colormap;
+	    Tk_Free3DBorderFromObj((Tk_Window) &fakeWin, borderObj);
+	    Tcl_DecrRefCount(borderObj);
+	    ckfree(cachedPtr);
+	}
+#endif
 	entryPtr = Tcl_NextHashEntry(&search);
     }
     Tcl_DeleteHashTable(&cache->borderTable);
@@ -186,14 +252,12 @@ static void CacheWinEventHandler(void *clientData, XEvent *eventPtr)
 /*
  * InitCacheWindow --
  *	Specify the cache window if not already set.
- *	@@@ SHOULD: use separate caches for each combination
- *	@@@ of display, visual, and colormap.
  */
 static void InitCacheWindow(Ttk_ResourceCache cache, Tk_Window tkwin)
 {
     if (cache->tkwin == NULL) {
-	cache->tkwin = tkwin;
-	Tk_CreateEventHandler(tkwin, StructureNotifyMask,
+	cache->tkwin = Tk_MainWindow(cache->interp);
+	Tk_CreateEventHandler(cache->tkwin, StructureNotifyMask,
 		CacheWinEventHandler, cache);
     }
 }
@@ -266,19 +330,47 @@ static Tcl_Obj *Ttk_Use(
     Tcl_Obj *objPtr)
 {
     int newEntry;
-    Tcl_HashEntry *entryPtr =
-	Tcl_CreateHashEntry(table,Tcl_GetString(objPtr),&newEntry);
+    Tcl_HashEntry *entryPtr;
     Tcl_Obj *cacheObj;
+#if !NEED_EXTRA_INFO
+    entryPtr = Tcl_CreateHashEntry(table, Tcl_GetString(objPtr), &newEntry);
+#else
+    Tcl_DString ds;
+    char buffer[64];
+
+    Tcl_DStringInit(&ds);
+    Tcl_DStringAppend(&ds, Tcl_GetString(objPtr), -1);
+    snprintf(buffer, 64, ",%d,%lu,%lu", ConnectionNumber(Tk_Display(tkwin)),
+	    Tk_Visual(tkwin)->visualid, (unsigned long)Tk_Colormap(tkwin));
+    Tcl_DStringAppend(&ds, buffer, -1);
+    entryPtr = Tcl_CreateHashEntry(table, Tcl_DStringValue(&ds), &newEntry);
+    Tcl_DStringFree(&ds);
+#endif
 
     if (!newEntry) {
+#if !NEED_EXTRA_INFO
 	return (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
+#else
+	Ttk_Cached *cachedPtr = Tcl_GetHashValue(entryPtr);
+	return cachedPtr ? cachedPtr->objPtr : NULL;
+#endif
     }
 
     cacheObj = Tcl_DuplicateObj(objPtr);
     Tcl_IncrRefCount(cacheObj);
 
     if (allocate(interp, tkwin, cacheObj)) {
+#if !NEED_EXTRA_INFO
 	Tcl_SetHashValue(entryPtr, cacheObj);
+#else
+	Ttk_Cached *cachedPtr = ckalloc(sizeof(*cachedPtr));
+	cachedPtr->objPtr = cacheObj;
+	cachedPtr->display = Tk_Display(tkwin);
+	cachedPtr->screenNum = Tk_ScreenNumber(tkwin);
+	cachedPtr->visual = Tk_Visual(tkwin);
+	cachedPtr->colormap = Tk_Colormap(tkwin);
+	Tcl_SetHashValue(entryPtr, cachedPtr);
+#endif
 	return cacheObj;
     } else {
 	Tcl_DecrRefCount(cacheObj);
@@ -347,11 +439,25 @@ Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 {
     const char *imageName = Tcl_GetString(objPtr);
     int newEntry;
-    Tcl_HashEntry *entryPtr =
-	Tcl_CreateHashEntry(&cache->imageTable,imageName,&newEntry);
+    Tcl_HashEntry *entryPtr;
     Tk_Image image;
 
     InitCacheWindow(cache, tkwin);
+#if !NEED_EXTRA_INFO
+    entryPtr = Tcl_CreateHashEntry(&cache->imageTable, imageName, &newEntry);
+#else
+    Tcl_DString ds;
+    char buffer[64];
+
+    Tcl_DStringInit(&ds);
+    Tcl_DStringAppend(&ds, imageName, -1);
+    snprintf(buffer, 64, ",%d,%lu,%lu", ConnectionNumber(Tk_Display(tkwin)),
+	Tk_Visual(tkwin)->visualid, (unsigned long)Tk_Colormap(tkwin));
+    Tcl_DStringAppend(&ds, buffer, -1);
+    entryPtr = Tcl_CreateHashEntry(&cache->imageTable,
+	Tcl_DStringValue(&ds), &newEntry);
+    Tcl_DStringFree(&ds);
+#endif
 
     if (!newEntry) {
 	return (Tk_Image)Tcl_GetHashValue(entryPtr);

generic/ttk/ttkElements.c

@@ -24,7 +24,7 @@
  *
  * Helper routine for drawing a few style elements:
  *
- * The following function is needed when drawing the trough element 
+ * The following function is needed when drawing the trough element
  * (which is used in scrollbars, scales, and progressbars) and the
  * arrow and thumb elements of a scrollbar.  It draws the light or dark
  * border color along the entire bottom and right edges, contrary to