* Apply 3 changes based on revisions developed by the fedora linux team. + 03-fedora-patch-2.diff --> + 04-fedora-tk8.5.6.patch.diff + 05-tk8.5-zoomstack.diff * Those patches are required to solve segmentation faults that are observed when blt is used with tcltk 8.5. We have a substantial amount of experience using this patched version of blt in the Swarm Simulation System (www.swarm.org) and have observed no ill-effects. Author: Paul E. Johnson (Debian Packaging) --- blt-2.4z.orig/src/bltTreeViewEdit.c +++ blt-2.4z/src/bltTreeViewEdit.c @@ -1177,9 +1177,15 @@ DisplayTextbox(clientData) rightPos = count; if ((rightPos < tbPtr->selFirst) || (leftPos > tbPtr->selLast)) { /* No part of the text fragment is selected. */ +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(tbPtr->display, drawable, tbPtr->gc, + tbPtr->font, fragPtr->text, fragPtr->count, + x + fragPtr->x, y + fragPtr->y, 0.); +#else Tk_DrawChars(tbPtr->display, drawable, tbPtr->gc, tbPtr->font, fragPtr->text, fragPtr->count, x + fragPtr->x, y + fragPtr->y); +#endif continue; } @@ -1221,9 +1227,15 @@ DisplayTextbox(clientData) width, fontMetrics.linespace, tbPtr->selBorderWidth, tbPtr->selRelief); } +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(Tk_Display(tbPtr->tkwin), drawable, tbPtr->gc, + tbPtr->font, fragPtr->text, fragPtr->count, + fragPtr->x + x, fragPtr->y + y, 0.); +#else Tk_DrawChars(Tk_Display(tbPtr->tkwin), drawable, tbPtr->gc, tbPtr->font, fragPtr->text, fragPtr->count, fragPtr->x + x, fragPtr->y + y); +#endif } if ((tbPtr->flags & TEXTBOX_FOCUS) && (tbPtr->cursorOn)) { int left, top, right, bottom; --- blt-2.4z.orig/src/bltGrPs.c +++ blt-2.4z/src/bltGrPs.c @@ -418,7 +418,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs, (char *)psPtr, argv[3], flags); } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)psPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -1124,7 +1124,7 @@ OutputOp(graphPtr, interp, argc, argv) fileName = argv[3]; /* First argument is the file name. */ argv++, argc--; } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)psPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltGrPen.c +++ blt-2.4z/src/bltGrPen.c @@ -215,7 +215,7 @@ PenToString(clientData, tkwin, widgRec, Tcl_FreeProc **freeProcPtr; /* Not used. */ { Pen *penPtr = *(Pen **)(widgRec + offset); - + if ( ! penPtr ) return NULL; return penPtr->name; } @@ -510,7 +510,7 @@ ConfigureOp(interp, graphPtr, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, penPtr->configSpecs, (char *)penPtr, options[0], flags); } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, penPtr->configSpecs, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, penPtr->configSpecs, nOpts, options, (char *)penPtr, flags) != TCL_OK) { break; } --- blt-2.4z.orig/src/bltGrHairs.c +++ blt-2.4z/src/bltGrHairs.c @@ -390,7 +390,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs, (char *)chPtr, argv[3], 0); } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)chPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltGraph.c +++ blt-2.4z/src/bltGraph.c @@ -926,7 +926,7 @@ CreateGraph(interp, argc, argv, classUid if (InitPens(graphPtr) != TCL_OK) { goto error; } - if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc - 2, argv + 2, + if (Blt_ConfigureWidget(interp, tkwin, configSpecs, argc - 2, argv + 2, (char *)graphPtr, 0) != TCL_OK) { goto error; } @@ -1074,7 +1074,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs, (char *)graphPtr, argv[2], flags); } else { - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 2, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 2, argv + 2, (char *)graphPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltTreeView.c +++ blt-2.4z/src/bltTreeView.c @@ -4023,7 +4023,7 @@ DrawVerticals( { int height, level; int x, y; - int x1, y1, x2, y2; + int x1, y1i, x2, y2; while (entryPtr != tvPtr->rootPtr) { entryPtr = Blt_TreeViewParentEntry(entryPtr); @@ -4043,24 +4043,24 @@ DrawVerticals( tvPtr->button.height); y += (height - tvPtr->button.height) / 2; x1 = x2 = x + ICONWIDTH(level) + ICONWIDTH(level + 1) / 2; - y1 = y + tvPtr->button.height / 2; - y2 = y1 + entryPtr->vertLineLength; + y1i = y + tvPtr->button.height / 2; + y2 = y1i + entryPtr->vertLineLength; if ((entryPtr == tvPtr->rootPtr) && (tvPtr->flags & TV_HIDE_ROOT)) { - y1 += entryPtr->height; + y1i += entryPtr->height; } /* * Clip the line's Y-coordinates at the viewport borders. */ - if (y1 < 0) { - y1 = (y1 & 0x1); /* Make sure the dotted line starts on + if (y1i < 0) { + y1i = (y1i & 0x1); /* Make sure the dotted line starts on * the same even/odd pixel. */ } if (y2 > Tk_Height(tvPtr->tkwin)) { y2 = Tk_Height(tvPtr->tkwin); } - if ((y1 < Tk_Height(tvPtr->tkwin)) && (y2 > 0)) { + if ((y1i < Tk_Height(tvPtr->tkwin)) && (y2 > 0)) { XDrawLine(tvPtr->display, drawable, tvPtr->lineGC, - x1, y1, x2, y2); + x1, y1i, x2, y2); } } } @@ -4072,14 +4072,14 @@ Blt_TreeViewDrawRule( TreeViewColumn *columnPtr, Drawable drawable) /* Pixmap or window to draw into. */ { - int x, y1, y2; + int x, y1i, y2; x = SCREENX(tvPtr, columnPtr->worldX) + columnPtr->width + tvPtr->ruleMark - tvPtr->ruleAnchor - 1; - y1 = tvPtr->titleHeight + tvPtr->inset; + y1i = tvPtr->titleHeight + tvPtr->inset; y2 = Tk_Height(tvPtr->tkwin) - tvPtr->inset; - XDrawLine(tvPtr->display, drawable, columnPtr->ruleGC, x, y1, x, y2); + XDrawLine(tvPtr->display, drawable, columnPtr->ruleGC, x, y1i, x, y2); tvPtr->flags = TOGGLE(tvPtr->flags, TV_RULE_ACTIVE); } @@ -4527,7 +4527,7 @@ DrawTreeEntry( int level; int width, height; int x, y; - int x1, y1, x2, y2; + int x1, y1i, x2, y2; entryPtr->flags &= ~ENTRY_REDRAW; @@ -4545,7 +4545,7 @@ DrawTreeEntry( buttonY = y + entryPtr->buttonY; x1 = x + (width / 2); - y1 = y2 = buttonY + (buttonPtr->height / 2); + y1i = y2 = buttonY + (buttonPtr->height / 2); x2 = x1 + (ICONWIDTH(level) + ICONWIDTH(level + 1)) / 2; if ((Blt_TreeNodeParent(entryPtr->node) != NULL) && @@ -4554,17 +4554,17 @@ DrawTreeEntry( * For every node except root, draw a horizontal line from * the vertical bar to the middle of the icon. */ - XDrawLine(tvPtr->display, drawable, tvPtr->lineGC, x1, y1, x2, y2); + XDrawLine(tvPtr->display, drawable, tvPtr->lineGC, x1, y1i, x2, y2); } if (((entryPtr->flags & ENTRY_CLOSED) == 0) && (tvPtr->lineWidth > 0)) { /* * Entry is open, draw vertical line. */ - y2 = y1 + entryPtr->vertLineLength; + y2 = y1i + entryPtr->vertLineLength; if (y2 > Tk_Height(tvPtr->tkwin)) { y2 = Tk_Height(tvPtr->tkwin); /* Clip line at window border. */ } - XDrawLine(tvPtr->display, drawable, tvPtr->lineGC, x2, y1, x2, y2); + XDrawLine(tvPtr->display, drawable, tvPtr->lineGC, x2, y1i, x2, y2); } if ((entryPtr->flags & ENTRY_HAS_BUTTON) && (entryPtr != tvPtr->rootPtr)) { /* --- blt-2.4z.orig/src/bltInt.h +++ blt-2.4z/src/bltInt.h @@ -724,6 +724,10 @@ extern void Blt_DrawArrow _ANSI_ARGS_((D extern Tk_OptionParseProc Blt_StringToEnum; extern Tk_OptionPrintProc Blt_EnumToString; +extern int Blt_ConfigureWidget _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, char **argv, + char *widgRec, int flags)); + extern int Blt_ConfigModified _ANSI_ARGS_(TCL_VARARGS(Tk_ConfigSpec *, specs)); extern void Blt_DStringAppendElements _ANSI_ARGS_(TCL_VARARGS(Tcl_DString *, args)); --- blt-2.4z.orig/src/bltUnixDnd.c +++ blt-2.4z/src/bltUnixDnd.c @@ -1834,7 +1834,7 @@ ConfigureToken(interp, dndPtr, argc, arg unsigned long gcMask; Tk_MakeWindowExist(tokenPtr->tkwin); - if (Tk_ConfigureWidget(interp, tokenPtr->tkwin, tokenConfigSpecs, argc, + if (Blt_ConfigureWidget(interp, tokenPtr->tkwin, tokenConfigSpecs, argc, argv, (char *)tokenPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -3777,7 +3777,7 @@ ConfigureOp(clientData, interp, argc, ar return Tk_ConfigureInfo(interp, dndPtr->tkwin, configSpecs, (char *)dndPtr, argv[3], flags); } - if (Tk_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)dndPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -4440,7 +4440,7 @@ RegisterOp(clientData, interp, argc, arg dndPtr->hashPtr = hPtr; dndPtr->dataPtr = dataPtr; Blt_SetHashValue(hPtr, dndPtr); - if (Tk_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)dndPtr, 0) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltCanvEps.c +++ blt-2.4z/src/bltCanvEps.c @@ -1054,7 +1054,7 @@ ConfigureEps(interp, canvas, itemPtr, ar int width, height; tkwin = Tk_CanvasTkwin(canvas); - if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc, + if (Blt_ConfigureWidget(interp, tkwin, configSpecs, argc, argv, (char *)epsPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -1686,10 +1686,10 @@ static Tk_ItemType epsItemType = { "eps", /* name */ sizeof(EpsItem), /* itemSize */ - CreateEps, /* createProc */ + (Tk_ItemCreateProc *)CreateEps, /* createProc */ configSpecs, /* configSpecs */ - ConfigureEps, /* configureProc */ - EpsCoords, /* coordProc */ + (Tk_ItemConfigureProc *)ConfigureEps, /* configureProc */ + (Tk_ItemCoordProc *)EpsCoords, /* coordProc */ DeleteEps, /* deleteProc */ DisplayEps, /* displayProc */ 0, /* alwaysRedraw */ @@ -1713,6 +1713,6 @@ Blt_InitEpsCanvasItem(interp) { Tk_CreateItemType(&epsItemType); /* Initialize custom canvas option routines. */ - tagsOption.parseProc = Tk_CanvasTagsParseProc; - tagsOption.printProc = Tk_CanvasTagsPrintProc; + tagsOption.parseProc = (Tk_OptionParseProc *)Tk_CanvasTagsParseProc; + tagsOption.printProc = (Tk_OptionPrintProc *)Tk_CanvasTagsPrintProc; } --- blt-2.4z.orig/src/bltScrollbar.c +++ blt-2.4z/src/bltScrollbar.c @@ -814,7 +814,7 @@ ConfigureScrollbar(interp, scrollPtr, ar XGCValues gcValues; GC new; - if (Tk_ConfigureWidget(interp, scrollPtr->tkwin, configSpecs, + if (Blt_ConfigureWidget(interp, scrollPtr->tkwin, configSpecs, argc, argv, (char *)scrollPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltTreeViewStyle.c +++ blt-2.4z/src/bltTreeViewStyle.c @@ -846,6 +846,11 @@ DrawTextBox(tvPtr, drawable, entryPtr, v *---------------------------------------------------------------------- */ /*ARGSUSED*/ + +int +Blt_TreeViewTextbox(TreeView *tvPtr, + TreeViewEntry *entryPtr, + TreeViewColumn *columnPtr); static int EditTextBox(tvPtr, entryPtr, valuePtr, stylePtr) TreeView *tvPtr; --- blt-2.4z.orig/src/bltDragdrop.c +++ blt-2.4z/src/bltDragdrop.c @@ -1065,7 +1065,7 @@ ConfigureToken(interp, srcPtr, argc, arg Token *tokenPtr; tokenPtr = &(srcPtr->token); - if (Tk_ConfigureWidget(interp, srcPtr->tkwin, tokenConfigSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, srcPtr->tkwin, tokenConfigSpecs, argc, argv, (char *)tokenPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } @@ -1293,7 +1293,7 @@ ConfigureSource(interp, srcPtr, argc, ar /* * Handle the bulk of the options... */ - if (Tk_ConfigureWidget(interp, srcPtr->tkwin, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, srcPtr->tkwin, configSpecs, argc, argv, (char *)srcPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltAlloc.c +++ blt-2.4z/src/bltAlloc.c @@ -40,14 +40,23 @@ Blt_ReallocProc *Blt_ReallocProcPtr = (B * Tcl_Alloc/Tcl_Free routines because they don't automatically cause * a panic when not enough memory is available. There are cases (such * as allocating a very large vector) where it's recoverable. + * + * Using private is dangerous. + * Tcl changes mem functions for debug which will conflict then with BLT + * stick to public API */ -EXTERN Blt_MallocProc TclpAlloc; -EXTERN Blt_FreeProc TclpFree; -EXTERN Blt_ReallocProc TclpRealloc; +//EXTERN Blt_MallocProc TclpAlloc; +//EXTERN Blt_FreeProc TclpFree; +//EXTERN Blt_ReallocProc TclpRealloc; + +//Blt_MallocProc *Blt_MallocProcPtr = TclpAlloc; +//Blt_FreeProc *Blt_FreeProcPtr = TclpFree; +//Blt_ReallocProc *Blt_ReallocProcPtr = TclpRealloc; + +Blt_MallocProc *Blt_MallocProcPtr = (Blt_MallocProc *)Tcl_Alloc; +Blt_FreeProc *Blt_FreeProcPtr = (Blt_FreeProc *)Tcl_Free; +Blt_ReallocProc *Blt_ReallocProcPtr = (Blt_ReallocProc *)Tcl_Realloc; -Blt_MallocProc *Blt_MallocProcPtr = TclpAlloc; -Blt_FreeProc *Blt_FreeProcPtr = TclpFree; -Blt_ReallocProc *Blt_ReallocProcPtr = TclpRealloc; #else Blt_MallocProc *Blt_MallocProcPtr = malloc; --- blt-2.4z.orig/src/bltGrLegd.c +++ blt-2.4z/src/bltGrLegd.c @@ -1406,7 +1406,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs, (char *)legendPtr, argv[3], flags); } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)legendPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltHierbox.c +++ blt-2.4z/src/bltHierbox.c @@ -3321,7 +3321,7 @@ ConfigureEntry(hboxPtr, entryPtr, argc, XColor *colorPtr; hierBox = hboxPtr; - if (Tk_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, entryConfigSpecs, + if (Blt_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, entryConfigSpecs, argc, argv, (char *)entryPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -3935,7 +3935,7 @@ ConfigureHierbox(interp, hboxPtr, argc, Tk_Uid nameId; Pixmap bitmap; hierBox = hboxPtr; - if (Tk_ConfigureWidget(interp, hboxPtr->tkwin, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, hboxPtr->tkwin, configSpecs, argc, argv, (char *)hboxPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -4443,7 +4443,7 @@ DrawVerticals(hboxPtr, treePtr, drawable Drawable drawable; /* Pixmap or window to draw into. */ { Entry *entryPtr; /* Entry to be drawn. */ - int x1, y1, x2, y2; + int x1, y1i, x2, y2; int height; int x, y; @@ -4463,22 +4463,22 @@ DrawVerticals(hboxPtr, treePtr, drawable y += (height - hboxPtr->button.height) / 2; x1 = x2 = x + LEVELWIDTH(treePtr->level) + LEVELWIDTH(treePtr->level + 1) / 2; - y1 = y + hboxPtr->button.height / 2; - y2 = y1 + entryPtr->lineHeight; + y1i = y + hboxPtr->button.height / 2; + y2 = y1i + entryPtr->lineHeight; if ((treePtr == hboxPtr->rootPtr) && (hboxPtr->hideRoot)) { - y1 += entryPtr->height; + y1i += entryPtr->height; } /* * Clip the line's Y-coordinates at the window border. */ - if (y1 < 0) { - y1 = 0; + if (y1i < 0) { + y1i = 0; } if (y2 > Tk_Height(hboxPtr->tkwin)) { y2 = Tk_Height(hboxPtr->tkwin); } - if ((y1 < Tk_Height(hboxPtr->tkwin)) && (y2 > 0)) { - XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1, + if ((y1i < Tk_Height(hboxPtr->tkwin)) && (y2 > 0)) { + XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1i, x2, y2); } } @@ -4787,17 +4787,17 @@ DrawLabel(hboxPtr, treePtr, x, y, drawab x, y); } if ((isFocused) && (hboxPtr->focusEdit) && (editPtr->cursorOn)) { - int x1, y1, x2, y2; + int x1, y1i, x2, y2; GetCursorLocation(hboxPtr, treePtr); x1 = x + editPtr->x; x2 = x1 + 3; - y1 = y + editPtr->y - 1; - y2 = y1 + editPtr->height - 1; + y1i = y + editPtr->y - 1; + y2 = y1i + editPtr->height - 1; XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC, - x1, y1, x1, y2); + x1, y1i, x1, y2); XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC, - x1 - 2, y1, x2, y1); + x1 - 2, y1i, x2, y1i); XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC, x1 - 2, y2, x2, y2); } @@ -4858,7 +4858,7 @@ DrawEntry(hboxPtr, treePtr, drawable) int width, height; int entryHeight; int buttonY; - int x1, y1, x2, y2; + int x1, y1i, x2, y2; Entry *entryPtr; entryPtr = treePtr->entryPtr; @@ -4874,7 +4874,7 @@ DrawEntry(hboxPtr, treePtr, drawable) buttonY = y + entryPtr->buttonY; x1 = x + (width / 2); - y1 = y2 = buttonY + (buttonPtr->height / 2); + y1i = y2 = buttonY + (buttonPtr->height / 2); x2 = x1 + (LEVELWIDTH(treePtr->level) + LEVELWIDTH(treePtr->level + 1)) / 2; if ((treePtr->parentPtr != NULL) && (hboxPtr->lineWidth > 0)) { @@ -4882,17 +4882,17 @@ DrawEntry(hboxPtr, treePtr, drawable) * For every node except root, draw a horizontal line from * the vertical bar to the middle of the icon. */ - XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1, x2, y2); + XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1i, x2, y2); } if ((entryPtr->flags & ENTRY_OPEN) && (hboxPtr->lineWidth > 0)) { /* * Entry is open, draw vertical line. */ - y2 = y1 + entryPtr->lineHeight; + y2 = y1i + entryPtr->lineHeight; if (y2 > Tk_Height(hboxPtr->tkwin)) { y2 = Tk_Height(hboxPtr->tkwin); /* Clip line at window border. */ } - XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x2, y1, x2, y2); + XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x2, y1i, x2, y2); } if ((entryPtr->flags & ENTRY_BUTTON) && (treePtr->parentPtr != NULL)) { /* @@ -5505,7 +5505,7 @@ ButtonConfigureOp(hboxPtr, interp, argc, return Tk_ConfigureInfo(interp, hboxPtr->tkwin, buttonConfigSpecs, (char *)hboxPtr, argv[0], 0); } - if (Tk_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, buttonConfigSpecs, + if (Blt_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, buttonConfigSpecs, argc, argv, (char *)hboxPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltNsUtil.c +++ blt-2.4z/src/bltNsUtil.c @@ -286,7 +286,7 @@ typedef struct { * this "real" command. */ } Command; - +/* struct VarTrace; struct ArraySearch; @@ -340,20 +340,31 @@ Blt_GetArrayVariableTable(interp, varNam } return varPtr->value.tablePtr; } +*/ +/* + * Yes ever dangerous not to use public API. Private Var has changed + * rewrite using namespace which -variable command + */ Tcl_Namespace * Blt_GetVariableNamespace(interp, name) Tcl_Interp *interp; CONST char *name; { - Var *varPtr; + Tcl_Namespace *nsPtr ; + const char *qualName, *nsName ; + static char nswhich[] = "namespace which -variable " ; + + if ( name == NULL ) { return NULL ; } + if ( Tcl_VarEval(interp, nswhich, name, (char*)NULL) != TCL_OK ) + { return NULL ; } + if ( (qualName = Tcl_GetStringResult(interp)) == NULL || + strlen(qualName) < 1 ) { return NULL ; } - varPtr = (Var *)Tcl_FindNamespaceVar(interp, (char *)name, - (Tcl_Namespace *)NULL, 0); - if (varPtr == NULL) { - return NULL; - } - return varPtr->nsPtr; + if ( Blt_ParseQualifiedName(interp, qualName, &nsPtr, &nsName) != TCL_OK ) + { return NULL ; } + + return nsPtr; } /*ARGSUSED*/ --- blt-2.4z.orig/src/bltBusy.c +++ blt-2.4z/src/bltBusy.c @@ -418,7 +418,7 @@ ConfigureBusy(interp, busyPtr, argc, arg Tk_Cursor oldCursor; oldCursor = busyPtr->cursor; - if (Tk_ConfigureWidget(interp, busyPtr->tkRef, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, busyPtr->tkRef, configSpecs, argc, argv, (char *)busyPtr, 0) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltConfig.c +++ blt-2.4z/src/bltConfig.c @@ -1206,6 +1206,65 @@ TCL_VARARGS_DEF(Tk_ConfigSpec *, arg1) } /* + * Tk_ConfigureWidget nolonger sets the TK_CONFIG_OPTION_SPECIFIED bit. + * Rather than convert all the BLT widgets to Tk_SetOptions, + * Blt_ConfigureWidget will serve as a wrapper for Tk_ConfigureWidget. + */ +int +Blt_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) + Tcl_Interp *interp; + Tk_Window tkwin; /* Window to associate with component */ + Tk_ConfigSpec *specs; + int argc; + char **argv; + char *widgRec; + int flags; +{ + int i, nspec; + char *value; + char **valuesIn; + Tk_ConfigSpec *specPtr; + + /* before configure get all the config values */ + nspec = 0 ; + for (specPtr = specs; specPtr->type != TK_CONFIG_END; specPtr++) nspec++; + valuesIn = (char**) Tcl_Alloc(nspec*sizeof(char*)); + + for (i=0, specPtr = specs; specPtr->type != TK_CONFIG_END; specPtr++, i++) { + if (Tk_ConfigureValue(interp, tkwin, specs, widgRec, + specPtr->argvName, 0) != TCL_OK) { + return TCL_ERROR; + } + value = Tcl_GetStringResult(interp); + valuesIn[i] = (char*) Tcl_Alloc((strlen(value)+1)*sizeof(char)); + strcpy(valuesIn[i], value); + } + /* configure */ + if (Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) != + TCL_OK ) { return TCL_ERROR; } + /* + read back the new values and compare with inputs + set the TK_CONFIG_OPTION_SPECIFIED if value changed + clear that bit if the value didnt change + */ + for (i=0, specPtr = specs; specPtr->type != TK_CONFIG_END; specPtr++, i++) { + if (Tk_ConfigureValue(interp, tkwin, specs, widgRec, + specPtr->argvName, 0) != TCL_OK) { + return TCL_ERROR; + } + value = Tcl_GetStringResult(interp); + if ( strcmp(value, valuesIn[i]) ) { + specPtr->specFlags |= TK_CONFIG_OPTION_SPECIFIED; + } else { + specPtr->specFlags &= ~TK_CONFIG_OPTION_SPECIFIED; + } + Tcl_Free((char*)valuesIn[i]); + } + Tcl_Free((char*)valuesIn); + return TCL_OK; +} + +/* *---------------------------------------------------------------------- * * Blt_ConfigureWidgetComponent -- @@ -1275,7 +1334,7 @@ Blt_ConfigureWidgetComponent(interp, par Blt_Free(tempName); Tk_SetClass(tkwin, className); - result = Tk_ConfigureWidget(interp, tkwin, specsPtr, argc, argv, widgRec, + result = Blt_ConfigureWidget(interp, tkwin, specsPtr, argc, argv, widgRec, flags); if (isTemporary) { Tk_DestroyWindow(tkwin); --- blt-2.4z.orig/src/bltTed.c +++ blt-2.4z/src/bltTed.c @@ -826,7 +826,7 @@ ConfigureTed(tedPtr, argc, argv, flags) GC newGC; unsigned long gcMask; - if (Tk_ConfigureWidget(tedPtr->interp, tedPtr->tkwin, configSpecs, + if (Blt_ConfigureWidget(tedPtr->interp, tedPtr->tkwin, configSpecs, argc, argv, (char *)tedPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltGrAxis.c +++ blt-2.4z/src/bltGrAxis.c @@ -1268,39 +1268,39 @@ FixAxisRange(axisPtr) * ---------------------------------------------------------------------- */ static double -NiceNum(x, round) +NiceNum(x, iround) double x; - int round; /* If non-zero, round. Otherwise take ceiling + int iround; /* If non-zero, round. Otherwise take ceiling * of value. */ { double expt; /* Exponent of x */ double frac; /* Fractional part of x */ - double nice; /* Nice, rounded fraction */ + double dnice; /* Nice, rounded fraction */ expt = floor(log10(x)); frac = x / EXP10(expt); /* between 1 and 10 */ - if (round) { + if (iround) { if (frac < 1.5) { - nice = 1.0; + dnice = 1.0; } else if (frac < 3.0) { - nice = 2.0; + dnice = 2.0; } else if (frac < 7.0) { - nice = 5.0; + dnice = 5.0; } else { - nice = 10.0; + dnice = 10.0; } } else { if (frac <= 1.0) { - nice = 1.0; + dnice = 1.0; } else if (frac <= 2.0) { - nice = 2.0; + dnice = 2.0; } else if (frac <= 5.0) { - nice = 5.0; + dnice = 5.0; } else { - nice = 10.0; + dnice = 10.0; } } - return nice * EXP10(expt); + return dnice * EXP10(expt); } static Ticks * @@ -3425,7 +3425,7 @@ ConfigureOp(graphPtr, axisPtr, argc, arg return Tk_ConfigureInfo(graphPtr->interp, graphPtr->tkwin, configSpecs, (char *)axisPtr, argv[0], flags); } - if (Tk_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs, + if (Blt_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs, argc, argv, (char *)axisPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltHtext.c +++ blt-2.4z/src/bltHtext.c @@ -40,6 +40,13 @@ * of the virtual text. */ +/* + * the htext widget is broken in tk8.5.6 as + * Tk_ConfigureWidget no longer supports + * queries of changed options. Need to migrate to Tk_SetOptions + * instead hack a wrapper Blt_ConfigureWidget + */ + #include "bltInt.h" #ifndef NO_HTEXT @@ -338,7 +345,7 @@ static Tk_ConfigSpec configSpecs[] = TK_CONFIG_DONT_SET_DEFAULT, &heightOption}, {TK_CONFIG_CUSTOM, "-linespacing", "lineSpacing", "LineSpacing", DEF_HTEXT_LINE_SPACING, Tk_Offset(HText, leader), - TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption}, + TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption}, {TK_CONFIG_CUSTOM, "-maxheight", "maxHeight", "MaxHeight", DEF_HTEXT_MAX_HEIGHT, Tk_Offset(HText, maxHeight), TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption}, @@ -2824,9 +2831,15 @@ DrawSegment(htPtr, draw, linePtr, x, y, Tk_GetFontMetrics(htPtr->font, &fontMetrics); if ((segPtr->textEnd < htPtr->selFirst) || (segPtr->textStart > htPtr->selLast)) { /* No selected text */ +#ifdef TK_DRAWCHARS_ANLGE + Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, + htPtr->charArr + segPtr->textStart, textLength - 1, + x, y + linePtr->baseline, 0.); +#else Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, htPtr->charArr + segPtr->textStart, textLength - 1, x, y + linePtr->baseline); +#endif return; } /* @@ -2855,9 +2868,15 @@ DrawSegment(htPtr, draw, linePtr, x, y, Tk_MeasureChars(htPtr->font, htPtr->charArr + segPtr->textStart, nChars, 10000, DEF_TEXT_FLAGS, &lastX); lastX += x; +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, + htPtr->charArr + segPtr->textStart, nChars, x, + y + linePtr->baseline, 0.); +#else Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, htPtr->charArr + segPtr->textStart, nChars, x, y + linePtr->baseline); +#endif curPos = selStart; } if (selLength > 0) { /* The selection itself */ @@ -2873,16 +2892,28 @@ DrawSegment(htPtr, draw, linePtr, x, y, lastX, y + linePtr->baseline - fontMetrics.ascent, width, fontMetrics.linespace, htPtr->selBorderWidth, TK_RELIEF_RAISED); +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(htPtr->display, draw, htPtr->selectGC, + htPtr->font, htPtr->charArr + selStart, selLength, + lastX, y + linePtr->baseline, 0.); +#else Tk_DrawChars(htPtr->display, draw, htPtr->selectGC, htPtr->font, htPtr->charArr + selStart, selLength, lastX, y + linePtr->baseline); +#endif lastX = nextX; curPos = selStart + selLength; } nChars = segPtr->textEnd - curPos; if (nChars > 0) { /* Text following the selection */ +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, + htPtr->charArr + curPos, nChars - 1, + lastX, y + linePtr->baseline, 0.); +#else Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font, htPtr->charArr + curPos, nChars - 1, lastX, y + linePtr->baseline); +#endif } } @@ -3038,17 +3069,21 @@ DrawPage(htPtr, deltaY) XFillRectangle(display, pixmap, htPtr->fillGC, 0, 0, width, height); } - - if (deltaY >= 0) { + /* handle null lineArr */ + if (htPtr->arraySize > 0 && htPtr->nLines > 0) { + if (deltaY >= 0) { y += htPtr->lineArr[htPtr->first].offset; lineNum = htPtr->first; lastY = 0; - } else { + } else { y += htPtr->lineArr[htPtr->last].offset; lineNum = htPtr->last; lastY = height; + } + forceCopy = 0; + } else { + htPtr->last = htPtr->first - 1; } - forceCopy = 0; /* Draw each line */ for (i = htPtr->first; i <= htPtr->last; i++) { @@ -3347,7 +3382,8 @@ DisplayText(clientData) * The page is always draw at full width and the viewport will clip * the text. */ - if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)) { + if ((htPtr->first != oldFirst) || (htPtr->last != oldLast) + || htPtr->flags & TEXT_DIRTY ) { int offset; int i; int first, last; @@ -3364,23 +3400,26 @@ DisplayText(clientData) first = oldFirst, last = oldLast; } - for (i = first; i <= last; i++) { + + if (htPtr->arraySize > 0 && htPtr->nLines > 0) { + for (i = first; i <= last; i++) { offset = htPtr->lineArr[i].offset; for (linkPtr = Blt_ChainFirstLink(htPtr->lineArr[i].chainPtr); - linkPtr != NULL; linkPtr = Blt_ChainNextLink(linkPtr)) { - winPtr = Blt_ChainGetValue(linkPtr); - if (winPtr->tkwin != NULL) { - MoveEmbeddedWidget(winPtr, offset); - winPtr->flags &= ~WIDGET_VISIBLE; - } + linkPtr != NULL; linkPtr = Blt_ChainNextLink(linkPtr)) { + winPtr = Blt_ChainGetValue(linkPtr); + if (winPtr->tkwin != NULL) { + MoveEmbeddedWidget(winPtr, offset); + winPtr->flags &= ~WIDGET_VISIBLE; + } } + } } - } - DrawPage(htPtr, deltaY); - SendBogusEvent(tkwin); + DrawPage(htPtr, deltaY); + SendBogusEvent(tkwin); - /* Reset flags */ - htPtr->flags &= ~TEXT_DIRTY; + /* Reset flags */ + htPtr->flags &= ~TEXT_DIRTY; + } } /* Selection Procedures */ @@ -3900,7 +3939,7 @@ AppendOp(htPtr, interp, argc, argv) if (winPtr == NULL) { return TCL_ERROR; } - if (Tk_ConfigureWidget(interp, htPtr->tkwin, widgetConfigSpecs, + if (Blt_ConfigureWidget(interp, htPtr->tkwin, widgetConfigSpecs, argc - 3, argv + 3, (char *)winPtr, 0) != TCL_OK) { return TCL_ERROR; } @@ -4070,8 +4109,13 @@ ConfigureOp(htPtr, interp, argc, argv) return Tk_ConfigureInfo(interp, htPtr->tkwin, specsPtr, itemPtr, argv[2], 0); } - if (Tk_ConfigureWidget(interp, htPtr->tkwin, specsPtr, argc - 2, - argv + 2, itemPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { + if (Blt_ConfigureWidget(interp, htPtr->tkwin, specsPtr, argc - 2, + argv + 2, itemPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { + + /* + * in 8.5 cant tell if in option was modified + * supposed to convert to Tk_SetOptions + */ return TCL_ERROR; } if (itemPtr == (char *)htPtr) { @@ -4468,7 +4512,7 @@ TextCmd(clientData, interp, argc, argv) #ifdef ITCL_NAMESPACES Itk_SetWidgetCommand(htPtr->tkwin, htPtr->cmdToken); #endif - if ((Tk_ConfigureWidget(interp, htPtr->tkwin, configSpecs, argc - 2, + if ((Blt_ConfigureWidget(interp, htPtr->tkwin, configSpecs, argc - 2, argv + 2, (char *)htPtr, 0) != TCL_OK) || (ConfigureText(interp, htPtr) != TCL_OK)) { Tk_DestroyWindow(htPtr->tkwin); --- blt-2.4z.orig/src/bltWinDraw.c +++ blt-2.4z/src/bltWinDraw.c @@ -1647,8 +1647,13 @@ Blt_EmulateXDrawString( if (drawable == None) { return; } +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(display, drawable, gc, (Tk_Font)gc->font, string, length, + x, y, 0.); +#else Tk_DrawChars(display, drawable, gc, (Tk_Font)gc->font, string, length, x, y); +#endif } static void --- blt-2.4z.orig/src/bltGrMarker.c +++ blt-2.4z/src/bltGrMarker.c @@ -4306,7 +4306,7 @@ ConfigureOp(graphPtr, interp, argc, argv /* Save the old marker. */ oldName = markerPtr->name; under = markerPtr->drawUnder; - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, markerPtr->classPtr->configSpecs, nOpts, options, (char *)markerPtr, flags) != TCL_OK) { return TCL_ERROR; --- blt-2.4z.orig/src/bltBitmap.c +++ blt-2.4z/src/bltBitmap.c @@ -917,7 +917,7 @@ ComposeOp(clientData, interp, argc, argv info.padLeft = info.padRight = 0; info.padTop = info.padBottom = 0; info.font = (Tk_Font)NULL; /* Initialized by Tk_ConfigureWidget */ - if (Tk_ConfigureWidget(interp, tkwin, composeConfigSpecs, + if (Blt_ConfigureWidget(interp, tkwin, composeConfigSpecs, argc - 4, argv + 4, (char *)&info, 0) != TCL_OK) { return TCL_ERROR; } @@ -1027,7 +1027,7 @@ DefineOp(clientData, interp, argc, argv) /* Initialize info and then process flags */ info.rotate = 0.0; /* No rotation by default */ info.scale = 1.0; /* No scaling by default */ - if (Tk_ConfigureWidget(interp, dataPtr->tkwin, defineConfigSpecs, + if (Blt_ConfigureWidget(interp, dataPtr->tkwin, defineConfigSpecs, argc - 4, argv + 4, (char *)&info, 0) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltText.c +++ blt-2.4z/src/bltText.c @@ -35,28 +35,196 @@ static Blt_HashTable bitmapGCTable; static int initialized; static void -DrawTextLayout(display, drawable, gc, font, x, y, textPtr) +Blt_AverageImage(im, w, h, d) + XImage *im; + unsigned int w, h, d; +{ + /* the image will end up with 1 or 0 in the first plane, rest zero */ + int i, j, k; + unsigned int d2; + unsigned long pixel, pixelave; + + d2 = (3*d)/4; + for (i=0 ; i>= 1; + pixelave += pixel & 1; + } + pixelave = (pixelave + d2)/d; + XPutPixel(im, i, j, pixelave); + } + } + return; +} + +static void +Blt_DrawCharsBitmap(display, bitmap, w, width, height, gc, font, x, y, textPtr) + Display *display; + Drawable bitmap; + Window w; + unsigned int width, height; + GC gc; + Tk_Font font; + register int x, y; + TextLayout *textPtr; +{ + register TextFragment *fragPtr; + register int i, j; + + XImage *bitmapimage, *pixmapimage; + GC gcsave, gcp; + Window winr; + int xr, yr; + unsigned int wr, hr, br, dr; + Pixmap pixmap; + unsigned long whitepixel; + XGCValues gcvalues ; + unsigned long valuemask, pixel ; + + /* save the GC */ + gcsave = XCreateGC(display, bitmap, 0, NULL); + XCopyGC(display, gc, 0, gcsave); + /* create a pixmap to draw chars to */ + XGetGeometry(display, w, &winr, &xr, &yr, &wr, &hr, &br, &dr); + pixmap = Tk_GetPixmap(display, winr, width, height, dr); + /* get a GC for the pixmap, black(0) background, white(1) chars */ + valuemask = (GCForeground|GCBackground) ; + gcvalues.foreground = gcvalues.background = 0 ; + gcp = XCreateGC(display, pixmap, valuemask, &gcvalues); + XSetForeground(display, gcp, 0) ; + XFillRectangle(display, pixmap, gcp, 0, 0, width, height); + whitepixel = XWhitePixel(display, 0); + XSetForeground(display, gcp, whitepixel) ; + /* draw white chars to the pixmap */ + fragPtr = textPtr->fragArr; + for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { +#ifdef TK_DRAWCHARS_ANGLE + Tk_DrawChars(display, pixmap, gcp, font, fragPtr->text, + fragPtr->count, x + fragPtr->x, y + fragPtr->y, 0); +#else + Tk_DrawChars(display, pixmap, gcp, font, fragPtr->text, + fragPtr->count, x + fragPtr->x, y + fragPtr->y); +#endif + } + XFlush(display); + /* get the pixmap image */ + pixmapimage = XGetImage(display, pixmap, 0, 0, width, height, + AllPlanes, XYPixmap); + /* average the image to get the char in a single bit plane */ + Blt_AverageImage(pixmapimage, width, height, dr); + /* get an image for the bitmap */ + bitmapimage = XGetImage(display, bitmap, 0, 0, width, height, + 1, XYPixmap); + /* copy the first bit plane from the averaged pixmap to the bitmap */ + for (i=0 ; ifragArr; for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { + Tk_DrawChars(display, drawable, gc, font, fragPtr->text, + fragPtr->count, x + fragPtr->x, y + fragPtr->y, angle); + } +#else + fragPtr = textPtr->fragArr; + for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { + XDrawString(display, drawable, gc, x + fragPtr->x, y + fragPtr->y, + fragPtr->text, fragPtr->count); + } +#endif /*HAVE_UTF*/ +} + +#else /* no angled drawing in Tk_DrawChars */ +static void +DrawTextLayout(display, drawable, gc, font, x, y, textPtr) + Display *display; + Drawable drawable; + GC gc; + Tk_Font font; + register int x, y; /* Origin of text */ + TextLayout *textPtr; +{ + register TextFragment *fragPtr; + register int i; + #if HAVE_UTF + /* + * Tk_DrawChars no longer works on bitmaps for antialiased fonts + * Fix this by checking for a bitmap and calling code that + * DrawChars to bitmap + */ + Window w; + int xd, yd; + unsigned int wd, hd, bd, dd; + XGetGeometry(display, drawable, &w, &xd, &yd, &wd, &hd, &bd, &dd); + if ( dd == 1 ) { + Blt_DrawCharsBitmap(display, drawable, w, wd, hd, gc, font, + x, y, textPtr); + return; + } + fragPtr = textPtr->fragArr; + for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { Tk_DrawChars(display, drawable, gc, font, fragPtr->text, fragPtr->count, x + fragPtr->x, y + fragPtr->y); + } #else + fragPtr = textPtr->fragArr; + for (i = 0; i < textPtr->nFrags; i++, fragPtr++) { XDrawString(display, drawable, gc, x + fragPtr->x, y + fragPtr->y, fragPtr->text, fragPtr->count); -#endif /*HAVE_UTF*/ } +#endif /*HAVE_UTF*/ } +#endif /* TK_DRAWCHARS_ANGLE */ /* * ----------------------------------------------------------------- @@ -657,6 +825,89 @@ Blt_SetPrintTextStyle(tsPtr, font, fgCol * * ----------------------------------------------------------------- */ + +#ifdef TK_DRAWCHARS_ANGLE +void +Blt_DrawTextLayout(tkwin, drawable, textPtr, tsPtr, x, y) + Tk_Window tkwin; + Drawable drawable; + TextLayout *textPtr; + TextStyle *tsPtr; /* Text attribute information */ + int x, y; /* Window coordinates to draw text */ +{ + int width, height; + double theta; + Display *display; + Pixmap bitmap; + int active; + + if (!textPtr) + return; + + display = Tk_Display(tkwin); + theta = FMOD(tsPtr->theta, (double)360.0); + if (theta < 0.0) { + theta += 360.0; + } + +#ifdef WIN32 + if ( theta > 0. ) { + if (Blt_DrawRotatedText(display, drawable, x, y, theta, tsPtr, textPtr)) { + return; + } + } +#endif + + active = tsPtr->state & STATE_ACTIVE; + + width = textPtr->width, height = textPtr->height; + Blt_TranslateAnchor(x, y, width, height, tsPtr->anchor, &x, &y); + if (tsPtr->state & (STATE_DISABLED | STATE_EMPHASIS)) { + TkBorder *borderPtr = (TkBorder *) tsPtr->border; + XColor *color1, *color2; + + color1 = borderPtr->lightColor, color2 = borderPtr->darkColor; + if (tsPtr->state & STATE_EMPHASIS) { + XColor *hold; + + hold = color1, color1 = color2, color2 = hold; + } + if (color1 != NULL) { + XSetForeground(display, tsPtr->gc, color1->pixel); + } + DrawTextLayout(display, drawable, tsPtr->gc, tsPtr->font, x + 1, + y + 1, textPtr, theta); + if (color2 != NULL) { + XSetForeground(display, tsPtr->gc, color2->pixel); + } + DrawTextLayout(display, drawable, tsPtr->gc, tsPtr->font, x, y, + textPtr, theta); + + /* Reset the foreground color back to its original setting, + * so not to invalidate the GC cache. */ + XSetForeground(display, tsPtr->gc, tsPtr->color->pixel); + + return; /* Done */ + } + if ((tsPtr->shadow.offset > 0) && (tsPtr->shadow.color != NULL)) { + XSetForeground(display, tsPtr->gc, tsPtr->shadow.color->pixel); + DrawTextLayout(display, drawable, tsPtr->gc, tsPtr->font, + x + tsPtr->shadow.offset, y + tsPtr->shadow.offset, + textPtr, theta); + XSetForeground(display, tsPtr->gc, tsPtr->color->pixel); + } + if (active) { + XSetForeground(display, tsPtr->gc, tsPtr->activeColor->pixel); + } + DrawTextLayout(display, drawable, tsPtr->gc, tsPtr->font, x, y, + textPtr, theta); + if (active) { + XSetForeground(display, tsPtr->gc, tsPtr->color->pixel); + } + return; /* Done */ +} + +#else /* NO TK_DRAWCHARS_ANGLE */ void Blt_DrawTextLayout(tkwin, drawable, textPtr, tsPtr, x, y) Tk_Window tkwin; @@ -798,6 +1049,7 @@ Blt_DrawTextLayout(tkwin, drawable, text XSetClipMask(display, tsPtr->gc, None); Tk_FreePixmap(display, bitmap); } +#endif /* TK_DRAWCHARS_ANGLE */ void Blt_DrawText2(tkwin, drawable, string, tsPtr, x, y, areaPtr) --- blt-2.4z.orig/src/bltTabnotebook.c +++ blt-2.4z/src/bltTabnotebook.c @@ -2766,7 +2766,7 @@ ConfigureNotebook(interp, nbPtr, argc, a GC newGC; lastNotebookInstance = nbPtr; - if (Tk_ConfigureWidget(interp, nbPtr->tkwin, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, nbPtr->tkwin, configSpecs, argc, argv, (char *)nbPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -3691,7 +3691,7 @@ TabConfigureOp(nbPtr, interp, argc, argv } Tcl_Preserve(tabPtr); lastNotebookInstance = nbPtr; - result = Tk_ConfigureWidget(interp, nbPtr->tkwin, tabConfigSpecs, + result = Blt_ConfigureWidget(interp, nbPtr->tkwin, tabConfigSpecs, nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY); if (result == TCL_OK) { result = ConfigureTab(nbPtr, tabPtr); --- blt-2.4z.orig/src/bltContainer.c +++ blt-2.4z/src/bltContainer.c @@ -1169,7 +1169,7 @@ ConfigureContainer(interp, cntrPtr, argc GC newGC; int width, height; - if (Tk_ConfigureWidget(interp, cntrPtr->tkwin, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, cntrPtr->tkwin, configSpecs, argc, argv, (char *)cntrPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltSpline.c +++ blt-2.4z/src/bltSpline.c @@ -228,14 +228,14 @@ QuadCases(p, q, m1, m2, param, which) int which; { if ((which == 3) || (which == 4)) { /* Parameters used in both 3 and 4 */ - double mbar1, mbar2, mbar3, c1, d1, h1, j1, k1; + double mbar1, mbar2, mbar3, c1, d1, h1, j1d, k1; c1 = p->x + (q->y - p->y) / m1; d1 = q->x + (p->y - q->y) / m2; h1 = c1 * 2.0 - p->x; - j1 = d1 * 2.0 - q->x; + j1d = d1 * 2.0 - q->x; mbar1 = (q->y - p->y) / (h1 - p->x); - mbar2 = (p->y - q->y) / (j1 - q->x); + mbar2 = (p->y - q->y) / (j1d - q->x); if (which == 4) { /* Case 4. */ Y1 = (p->x + c1) / 2.0; --- blt-2.4z.orig/src/bltTabset.c +++ blt-2.4z/src/bltTabset.c @@ -2812,7 +2812,7 @@ ConfigureTabset(interp, setPtr, argc, ar GC newGC; tabSet = setPtr; - if (Tk_ConfigureWidget(interp, setPtr->tkwin, configSpecs, argc, argv, + if (Blt_ConfigureWidget(interp, setPtr->tkwin, configSpecs, argc, argv, (char *)setPtr, flags) != TCL_OK) { return TCL_ERROR; } @@ -3818,7 +3818,7 @@ TabConfigureOp(setPtr, interp, argc, arg } tabSet = setPtr; Tcl_Preserve(tabPtr); - result = Tk_ConfigureWidget(interp, setPtr->tkwin, tabConfigSpecs, + result = Blt_ConfigureWidget(interp, setPtr->tkwin, tabConfigSpecs, nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY); if (result == TCL_OK) { result = ConfigureTab(setPtr, tabPtr); --- blt-2.4z.orig/src/bltGrGrid.c +++ blt-2.4z/src/bltGrGrid.c @@ -365,7 +365,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs, (char *)gridPtr, argv[3], flags); } - if (Tk_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs, + if (Blt_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs, argc - 3, argv + 3, (char *)gridPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/tkButton.c +++ blt-2.4z/src/tkButton.c @@ -1104,7 +1104,7 @@ ConfigureButton(interp, butPtr, argc, ar TCL_GLOBAL_ONLY | TCL_TRACE_WRITES | TCL_TRACE_UNSETS, ButtonVarProc, (ClientData)butPtr); } - if (Tk_ConfigureWidget(interp, butPtr->tkwin, configSpecs, + if (Blt_ConfigureWidget(interp, butPtr->tkwin, configSpecs, argc, argv, (char *)butPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltGrElem.c +++ blt-2.4z/src/bltGrElem.c @@ -1696,7 +1696,7 @@ ClosestOp(graphPtr, interp, argc, argv) search.x = x; search.y = y; - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, closestSpecs, i - 6, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, closestSpecs, i - 6, argv + 6, (char *)&search, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; /* Error occurred processing an option. */ } @@ -1850,7 +1850,7 @@ ConfigureOp(graphPtr, interp, argc, argv return Tk_ConfigureInfo(interp, graphPtr->tkwin, elemPtr->specsPtr, (char *)elemPtr, options[0], flags); } - if (Tk_ConfigureWidget(interp, graphPtr->tkwin, elemPtr->specsPtr, + if (Blt_ConfigureWidget(interp, graphPtr->tkwin, elemPtr->specsPtr, numOpts, options, (char *)elemPtr, flags) != TCL_OK) { return TCL_ERROR; } --- blt-2.4z.orig/src/bltTable.c +++ blt-2.4z/src/bltTable.c @@ -1201,7 +1201,7 @@ ConfigureEntry(tablePtr, interp, entryPt oldRowSpan = entryPtr->row.span; oldColSpan = entryPtr->column.span; - if (Tk_ConfigureWidget(interp, entryPtr->tkwin, entryConfigSpecs, + if (Blt_ConfigureWidget(interp, entryPtr->tkwin, entryConfigSpecs, argc, argv, (char *)entryPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } @@ -1553,7 +1553,7 @@ ConfigureRowColumn(tablePtr, infoPtr, pa return Tk_ConfigureInfo(tablePtr->interp, tablePtr->tkwin, infoPtr->configSpecs, (char *)rcPtr, argv[0], 0); } else { - if (Tk_ConfigureWidget(tablePtr->interp, tablePtr->tkwin, + if (Blt_ConfigureWidget(tablePtr->interp, tablePtr->tkwin, infoPtr->configSpecs, argc, argv, (char *)rcPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; @@ -1578,7 +1578,7 @@ ConfigureRowColumn(tablePtr, infoPtr, pa } rcPtr = GetRowColumn(infoPtr, n); assert(rcPtr); - if (Tk_ConfigureWidget(tablePtr->interp, tablePtr->tkwin, + if (Blt_ConfigureWidget(tablePtr->interp, tablePtr->tkwin, infoPtr->configSpecs, argc, argv, (char *)rcPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; @@ -1861,7 +1861,7 @@ ConfigureTable(tablePtr, interp, argc, a return Tk_ConfigureInfo(interp, tablePtr->tkwin, tableConfigSpecs, (char *)tablePtr, argv[0], 0); } - if (Tk_ConfigureWidget(interp, tablePtr->tkwin, tableConfigSpecs, + if (Blt_ConfigureWidget(interp, tablePtr->tkwin, tableConfigSpecs, argc, argv, (char *)tablePtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) { return TCL_ERROR; } @@ -2198,7 +2198,7 @@ ManageEntry(interp, tablePtr, tkwin, row } } if (argc > 0) { - result = Tk_ConfigureWidget(tablePtr->interp, entryPtr->tkwin, + result = Blt_ConfigureWidget(tablePtr->interp, entryPtr->tkwin, entryConfigSpecs, argc, argv, (char *)entryPtr, TK_CONFIG_ARGV_ONLY); }