Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Disable Tk_ClipDrawableToRect. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mistake | crashes |
| Files: | files | file ages | folders |
| SHA3-256: |
09dab16817a3b9b957e0ccff59f30f11 |
| User & Date: | culler 2024-06-16 16:49:08 |
Context
|
2024-06-16
| ||
| 17:19 | Fix unused variable warnings. Closed-Leaf check-in: e10a6d52 user: culler tags: mistake, crashes | |
| 16:49 | Disable Tk_ClipDrawableToRect. check-in: 09dab168 user: culler tags: mistake, crashes | |
|
2024-06-15
| ||
| 12:36 | Merge main check-in: cb59e6b2 user: culler tags: cgimage_with_crossing | |
Changes
Changes to generic/tkCanvas.c.
| ︙ | ︙ | |||
3114 3115 3116 3117 3118 3119 3120 3121 | (screenX2 + 30 - canvasPtr->drawableXOrigin), (screenY2 + 30 - canvasPtr->drawableYOrigin), Tk_Depth(tkwin)); #else canvasPtr->drawableXOrigin = canvasPtr->xOrigin; canvasPtr->drawableYOrigin = canvasPtr->yOrigin; pixmap = Tk_WindowId(tkwin); Tk_ClipDrawableToRect(Tk_Display(tkwin), pixmap, | > > > > | | > | 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 | (screenX2 + 30 - canvasPtr->drawableXOrigin), (screenY2 + 30 - canvasPtr->drawableYOrigin), Tk_Depth(tkwin)); #else canvasPtr->drawableXOrigin = canvasPtr->xOrigin; canvasPtr->drawableYOrigin = canvasPtr->yOrigin; pixmap = Tk_WindowId(tkwin); /* This was only used by macOS and is not needed when drawRect is not * being used. * Tk_ClipDrawableToRect(Tk_Display(tkwin), pixmap, screenX1 - canvasPtr->xOrigin, screenY1 - canvasPtr->yOrigin, width, height); */ #endif /* TK_NO_DOUBLE_BUFFERING */ /* * Clear the area to be redrawn. */ XFillRectangle(Tk_Display(tkwin), pixmap, canvasPtr->pixmapGC, |
| ︙ | ︙ |
Changes to generic/tkTextDisp.c.
| ︙ | ︙ | |||
2462 2463 2464 2465 2466 2467 2468 2469 |
y_off = dInfoPtr->y - dlPtr->y;
height -= y_off;
} else {
y_off = 0;
}
#ifdef TK_NO_DOUBLE_BUFFERING
Tk_ClipDrawableToRect(display, pixmap, dInfoPtr->x, y + y_off,
| > > > > | > > | 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 |
y_off = dInfoPtr->y - dlPtr->y;
height -= y_off;
} else {
y_off = 0;
}
#ifdef TK_NO_DOUBLE_BUFFERING
/* This was only used by macOS and is not needed when drawRect is not
* being used.
*
Tk_ClipDrawableToRect(display, pixmap, dInfoPtr->x, y + y_off,
dInfoPtr->maxX - dInfoPtr->x, height);
*/
#endif /* TK_NO_DOUBLE_BUFFERING */
/*
* First, clear the area of the line to the background color for the text
* widget.
*/
|
| ︙ | ︙ |
Changes to macosx/tkMacOSXDraw.c.
| ︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 |
//#if 0 // disable clipping (almost works, but windows can open up blank)
dc.clipRgn = TkMacOSXGetClipRgn(d);
ClipToGC(d, gc, &dc.clipRgn);
if (dc.clipRgn && HIShapeIsEmpty(dc.clipRgn)) {
canDraw = false;
goto end;
}
| | | 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 |
//#if 0 // disable clipping (almost works, but windows can open up blank)
dc.clipRgn = TkMacOSXGetClipRgn(d);
ClipToGC(d, gc, &dc.clipRgn);
if (dc.clipRgn && HIShapeIsEmpty(dc.clipRgn)) {
canDraw = false;
goto end;
}
//#endif // disable clipping
/*
* If the drawable already has a CGContext, use it. Otherwise, we must be
* drawing to a window and we use the current context of its ContentView.
*/
dc.context = TkMacOSXGetCGContextForDrawable(d);
if (!dc.context) {
|
| ︙ | ︙ | |||
1370 1371 1372 1373 1374 1375 1376 |
macDraw->winPtr ? Tk_PathName(macDraw->winPtr) : "None",
NSStringFromRect(r).UTF8String);
#endif
CGContextClipToRect(dc.context, r);
}
}
| | | 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 |
macDraw->winPtr ? Tk_PathName(macDraw->winPtr) : "None",
NSStringFromRect(r).UTF8String);
#endif
CGContextClipToRect(dc.context, r);
}
}
//#endif // disable clipping
if (gc) {
static const CGLineCap cgCap[] = {
[CapNotLast] = kCGLineCapButt,
[CapButt] = kCGLineCapButt,
[CapRound] = kCGLineCapRound,
[CapProjecting] = kCGLineCapSquare,
|
| ︙ | ︙ | |||
1557 1558 1559 1560 1561 1562 1563 | * None. * * Side effects: * Subsequent drawing into d is offset and clipped as specified. * *---------------------------------------------------------------------- */ | | > > > | 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 |
* None.
*
* Side effects:
* Subsequent drawing into d is offset and clipped as specified.
*
*----------------------------------------------------------------------
*/
// This is a stub which was called by TkCanvas.c and TkTextDisp.c when
// drawRect was being used, but is no longer needed. Since it is a stub,
// we leave the function in place, but make it a no-op.
void
Tk_ClipDrawableToRect(
TCL_UNUSED(Display *),
Drawable d,
int x, int y,
int width, int height)
{
#if 0
MacDrawable *macDraw = (MacDrawable *)d;
if (macDraw->drawRgn) {
CFRelease(macDraw->drawRgn);
macDraw->drawRgn = NULL;
}
if (width >= 0 && height >= 0) {
|
| ︙ | ︙ | |||
1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 |
macDraw->drawRgn = HIShapeCreateIntersection(macDraw->visRgn,
drawRgn);
CFRelease(drawRgn);
} else {
macDraw->drawRgn = drawRgn;
}
}
}
/*
*----------------------------------------------------------------------
*
* ClipToGC --
*
| > | 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 |
macDraw->drawRgn = HIShapeCreateIntersection(macDraw->visRgn,
drawRgn);
CFRelease(drawRgn);
} else {
macDraw->drawRgn = drawRgn;
}
}
#endif
}
/*
*----------------------------------------------------------------------
*
* ClipToGC --
*
|
| ︙ | ︙ |