Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | add tk upstream changes |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
789cb8b5d887bd85498213dc20a05a04 |
User & Date: | chw 2019-05-21 04:54:43.452 |
Context
2019-05-22
| ||
05:11 | add tcl upstream changes check-in: 15d7251b6f user: chw tags: trunk | |
2019-05-21
| ||
05:03 | merge with trunk check-in: 71e9d472c8 user: chw tags: wtf-8-experiment | |
04:54 | add tk upstream changes check-in: 789cb8b5d8 user: chw tags: trunk | |
04:49 | improve "wm attributes ... -topmost" from [c287e160cb] check-in: e7c3ae3334 user: chw tags: trunk | |
Changes
Changes to jni/sdl2tk/generic/tkTest.c.
︙ | ︙ | |||
1563 1564 1565 1566 1567 1568 1569 | * level graphics calls below which are supposed to draw a rectangle will * not draw anything to the screen because the idle task will not be * processed inside of the drawRect method and hence will not be able to * obtain a valid graphics context. Instead, the window will be marked as * needing display, and will be redrawn during a future asynchronous call * to drawRect. This will generate an other call to this display proc, * and the recorded data will show extra calls, causing the test to fail. | | | < | > > | 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 | * level graphics calls below which are supposed to draw a rectangle will * not draw anything to the screen because the idle task will not be * processed inside of the drawRect method and hence will not be able to * obtain a valid graphics context. Instead, the window will be marked as * needing display, and will be redrawn during a future asynchronous call * to drawRect. This will generate an other call to this display proc, * and the recorded data will show extra calls, causing the test to fail. * To avoid this, we only log the call when the call occurs outside of the * drawRect method. We expect this to happen the first time the display * proc is called and the second time, when the actual drawing occurs nothing * will be logged. (In fact, this second call may be after the test has * finished.) */ sprintf(buffer, "%s display %d %d %d %d", instPtr->masterPtr->imageName, imageX, imageY, width, height); if (!APP_IS_DRAWING) { Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL, buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT); |
︙ | ︙ |
Changes to jni/sdl2tk/macosx/tkMacOSXSubwindows.c.
︙ | ︙ | |||
205 206 207 208 209 210 211 | /* * For non-toplevel windows, rebuild the parent's clipping region * and redisplay the window. */ TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr); | > > | | | | < | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | /* * For non-toplevel windows, rebuild the parent's clipping region * and redisplay the window. */ TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr); } if ([NSApp isDrawing]) { [[win contentView] setNeedsRedisplay:YES]; } else { [[win contentView] setNeedsDisplay:YES]; } /* * Generate VisibilityNotify events for window and all mapped children. */ event.xany.send_event = False; |
︙ | ︙ | |||
282 283 284 285 286 287 288 289 290 291 292 293 294 | XUnmapWindow( Display *display, /* Display. */ Window window) /* Window. */ { MacDrawable *macWin = (MacDrawable *) window; TkWindow *winPtr = macWin->winPtr; TkWindow *parentPtr = winPtr->parentPtr; XEvent event; display->request++; if (Tk_IsTopLevel(winPtr)) { if (!Tk_IsEmbedded(winPtr) && winPtr->wmInfoPtr->hints.initial_state!=IconicState) { | > < < | > > > > > > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 | XUnmapWindow( Display *display, /* Display. */ Window window) /* Window. */ { MacDrawable *macWin = (MacDrawable *) window; TkWindow *winPtr = macWin->winPtr; TkWindow *parentPtr = winPtr->parentPtr; NSWindow *win = TkMacOSXDrawableWindow(window); XEvent event; display->request++; if (Tk_IsTopLevel(winPtr)) { if (!Tk_IsEmbedded(winPtr) && winPtr->wmInfoPtr->hints.initial_state!=IconicState) { [win orderOut:nil]; } TkMacOSXInvalClipRgns((Tk_Window) winPtr); /* * We only need to send the UnmapNotify event for toplevel windows. */ event.xany.serial = LastKnownRequestProcessed(display); event.xany.send_event = False; event.xany.display = display; event.xunmap.type = UnmapNotify; event.xunmap.window = window; event.xunmap.event = window; event.xunmap.from_configure = false; Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL); } else { /* * Rebuild the visRgn clip region for the parent so it will be allowed * to draw in the space from which this subwindow was removed and then * redraw the window. */ if (parentPtr && parentPtr->privatePtr->visRgn) { TkMacOSXInvalidateViewRegion( TkMacOSXDrawableView(parentPtr->privatePtr), parentPtr->privatePtr->visRgn); } TkMacOSXInvalClipRgns((Tk_Window) parentPtr); TkMacOSXUpdateClipRgn(parentPtr); } winPtr->flags &= ~TK_MAPPED; if ([NSApp isDrawing]) { [[win contentView] setNeedsRedisplay:YES]; } else { [[win contentView] setNeedsDisplay:YES]; } } /* *---------------------------------------------------------------------- * * XResizeWindow -- * |
︙ | ︙ |