Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch bug-9e31fd9449-8-6 Excluding Merge-Ins
This is equivalent to a diff from dbb582dd to 6e620cfa
2019-01-10
| ||
08:10 | Fix [9e31fd9449]: X11/X.h and Windows.h have conflicting symbols. *** POTENTIAL INCOMPATIBILITY *** on Windows only: gcc/clang/MSVC will generate new warnings in extensions when the "None" symbol is used incorrectly. Those warnings are all fixed in the core, that's what most of this commit is doing. check-in: c707c501 user: jan.nijtmans tags: core-8-6-branch | |
2019-01-08
| ||
23:01 | Implement local grabs on macOS. check-in: 1edd8b7a user: culler tags: core-8-6-branch | |
15:24 | Merge 8.6 and all changes from original [bug-9e31fd9449] branch Closed-Leaf check-in: 6e620cfa user: jan.nijtmans tags: bug-9e31fd9449-8-6 | |
08:31 | Fix [9e31fd9449]: X11/X.h and Windows.h have conflicting symbols. *** POTENTIAL INCOMPATIBILITY *** on Windows only: gcc/clang/MSVC will generate new warnings in extensions when the "None" symbol is used incorrectly. Those warnings are all fixed in the core, that's what most of this commit is doing. check-in: 418f1c05 user: jan.nijtmans tags: core-8-5-branch | |
2019-01-05
| ||
17:00 | Implement local grabs for Aqua. check-in: 58470526 user: culler tags: mac-local-grabs | |
2019-01-04
| ||
23:29 | Merge 8.6 check-in: 723d71fc user: jan.nijtmans tags: trunk | |
23:27 | Merge 8.5 check-in: dbb582dd user: jan.nijtmans tags: core-8-6-branch | |
22:41 | Fix a few minor compiler warnings, occurring in later gcc/clang versions. check-in: 8c8dd813 user: jan.nijtmans tags: core-8-5-branch | |
00:49 | Resolve bug [18a4ba19bd]. Make winfo containing behave consistently across platforms and fix a bug with embedded toplevels. check-in: 6942f5af user: culler tags: core-8-6-branch | |
2019-01-03
| ||
19:45 | Remove 3 lines of code in tkTextDisp.c which had become obsolete but were accidentally left in the file. check-in: d49951e5 user: culler tags: bug-9e31fd9449-8-6 | |
Changes to generic/tk3d.c.
︙ | ︙ | |||
232 233 234 235 236 237 238 | borderPtr->colormap = Tk_Colormap(tkwin); borderPtr->resourceRefCount = 1; borderPtr->objRefCount = 0; borderPtr->bgColorPtr = bgColorPtr; borderPtr->darkColorPtr = NULL; borderPtr->lightColorPtr = NULL; borderPtr->shadow = None; | | | | | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | borderPtr->colormap = Tk_Colormap(tkwin); borderPtr->resourceRefCount = 1; borderPtr->objRefCount = 0; borderPtr->bgColorPtr = bgColorPtr; borderPtr->darkColorPtr = NULL; borderPtr->lightColorPtr = NULL; borderPtr->shadow = None; borderPtr->bgGC = NULL; borderPtr->darkGC = NULL; borderPtr->lightGC = NULL; borderPtr->hashPtr = hashPtr; borderPtr->nextPtr = existingBorderPtr; Tcl_SetHashValue(hashPtr, borderPtr); /* * Create the information for displaying the background color, but delay * the allocation of shadows until they are actually needed for drawing. |
︙ | ︙ | |||
370 371 372 373 374 375 376 | Tk_3DBorder border, /* Border whose GC is wanted. */ int which) /* Selects one of the border's 3 GC's: * TK_3D_FLAT_GC, TK_3D_LIGHT_GC, or * TK_3D_DARK_GC. */ { TkBorder * borderPtr = (TkBorder *) border; | | | | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | Tk_3DBorder border, /* Border whose GC is wanted. */ int which) /* Selects one of the border's 3 GC's: * TK_3D_FLAT_GC, TK_3D_LIGHT_GC, or * TK_3D_DARK_GC. */ { TkBorder * borderPtr = (TkBorder *) border; if ((borderPtr->lightGC == NULL) && (which != TK_3D_FLAT_GC)) { TkpGetShadows(borderPtr, tkwin); } if (which == TK_3D_FLAT_GC) { return borderPtr->bgGC; } else if (which == TK_3D_LIGHT_GC) { return borderPtr->lightGC; } else if (which == TK_3D_DARK_GC){ return borderPtr->darkGC; } Tcl_Panic("bogus \"which\" value in Tk_3DBorderGC"); /* * The code below will never be executed, but it's needed to keep * compilers happy. */ return NULL; } /* *-------------------------------------------------------------- * * Tk_Free3DBorder -- * |
︙ | ︙ | |||
435 436 437 438 439 440 441 | } if (borderPtr->lightColorPtr != NULL) { Tk_FreeColor(borderPtr->lightColorPtr); } if (borderPtr->shadow != None) { Tk_FreeBitmap(display, borderPtr->shadow); } | | | | | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | } if (borderPtr->lightColorPtr != NULL) { Tk_FreeColor(borderPtr->lightColorPtr); } if (borderPtr->shadow != None) { Tk_FreeBitmap(display, borderPtr->shadow); } if (borderPtr->bgGC != NULL) { Tk_FreeGC(display, borderPtr->bgGC); } if (borderPtr->darkGC != NULL) { Tk_FreeGC(display, borderPtr->darkGC); } if (borderPtr->lightGC != NULL) { Tk_FreeGC(display, borderPtr->lightGC); } if (prevPtr == borderPtr) { if (borderPtr->nextPtr == NULL) { Tcl_DeleteHashEntry(borderPtr->hashPtr); } else { Tcl_SetHashValue(borderPtr->hashPtr, borderPtr->nextPtr); |
︙ | ︙ | |||
761 762 763 764 765 766 767 | XPoint perp, c, shift1, shift2; /* Used for handling parallel lines. */ register XPoint *p1Ptr, *p2Ptr; TkBorder *borderPtr = (TkBorder *) border; GC gc; int i, lightOnLeft, dx, dy, parallel, pointsSeen; Display *display = Tk_Display(tkwin); | | | 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | XPoint perp, c, shift1, shift2; /* Used for handling parallel lines. */ register XPoint *p1Ptr, *p2Ptr; TkBorder *borderPtr = (TkBorder *) border; GC gc; int i, lightOnLeft, dx, dy, parallel, pointsSeen; Display *display = Tk_Display(tkwin); if (borderPtr->lightGC == NULL) { TkpGetShadows(borderPtr, tkwin); } /* * Handle grooves and ridges with recursive calls. */ |
︙ | ︙ |
Changes to generic/tk3d.h.
︙ | ︙ | |||
50 51 52 53 54 55 56 | * yet. */ Pixmap shadow; /* Stipple pattern to use for drawing shadows * areas. Used for displays with <= 64 colors * or where colormap has filled up. */ GC bgGC; /* Used (if necessary) to draw areas in the * background color. */ GC darkGC; /* Used to draw darker parts of the border. | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | * yet. */ Pixmap shadow; /* Stipple pattern to use for drawing shadows * areas. Used for displays with <= 64 colors * or where colormap has filled up. */ GC bgGC; /* Used (if necessary) to draw areas in the * background color. */ GC darkGC; /* Used to draw darker parts of the border. * NULL means the shadow colors haven't been * allocated yet.*/ GC lightGC; /* Used to draw lighter parts of the border. * NULL means the shadow colors 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 |
︙ | ︙ |
Changes to generic/tkBind.c.
︙ | ︙ | |||
3583 3584 3585 3586 3587 3588 3589 | && (Tk_WindowId(dispPtr->warpWindow) != None))) { TkpWarpPointer(dispPtr); XForceScreenSaver(dispPtr->display, ScreenSaverReset); } if (dispPtr->warpWindow) { Tcl_Release(dispPtr->warpWindow); | | | 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 | && (Tk_WindowId(dispPtr->warpWindow) != None))) { TkpWarpPointer(dispPtr); XForceScreenSaver(dispPtr->display, ScreenSaverReset); } if (dispPtr->warpWindow) { Tcl_Release(dispPtr->warpWindow); dispPtr->warpWindow = NULL; } dispPtr->flags &= ~TK_DISPLAY_IN_WARP; } /* *------------------------------------------------------------------------- * |
︙ | ︙ |
Changes to generic/tkBusy.c.
︙ | ︙ | |||
515 516 517 518 519 520 521 | static Busy * CreateBusy( Tcl_Interp *interp, /* Interpreter to report error to */ Tk_Window tkRef) /* Window hosting the busy window */ { Busy *busyPtr; | | > | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | static Busy * CreateBusy( Tcl_Interp *interp, /* Interpreter to report error to */ Tk_Window tkRef) /* Window hosting the busy window */ { Busy *busyPtr; size_t length; int x, y; const char *fmt; char *name; Tk_Window tkBusy, tkChild, tkParent; Window parent; Tk_FakeWin *winPtr; busyPtr = ckalloc(sizeof(Busy)); |
︙ | ︙ | |||
564 565 566 567 568 569 570 | busyPtr->tkRef = tkRef; busyPtr->tkParent = tkParent; busyPtr->tkBusy = tkBusy; busyPtr->width = Tk_Width(tkRef); busyPtr->height = Tk_Height(tkRef); busyPtr->x = Tk_X(tkRef); busyPtr->y = Tk_Y(tkRef); | | | 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 | busyPtr->tkRef = tkRef; busyPtr->tkParent = tkParent; busyPtr->tkBusy = tkBusy; busyPtr->width = Tk_Width(tkRef); busyPtr->height = Tk_Height(tkRef); busyPtr->x = Tk_X(tkRef); busyPtr->y = Tk_Y(tkRef); busyPtr->cursor = NULL; Tk_SetClass(tkBusy, "Busy"); busyPtr->optionTable = Tk_CreateOptionTable(interp, busyOptionSpecs); if (Tk_InitOptions(interp, (char *) busyPtr, busyPtr->optionTable, tkBusy) != TCL_OK) { Tk_DestroyWindow(tkBusy); return NULL; } |
︙ | ︙ | |||
594 595 596 597 598 599 600 | /* * Indicate that the busy window's geometry is being managed. This will * also notify us if the busy window is ever packed. */ Tk_ManageGeometry(tkBusy, &busyMgrInfo, busyPtr); | | | 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 | /* * Indicate that the busy window's geometry is being managed. This will * also notify us if the busy window is ever packed. */ Tk_ManageGeometry(tkBusy, &busyMgrInfo, busyPtr); if (busyPtr->cursor != NULL) { Tk_DefineCursor(tkBusy, busyPtr->cursor); } /* * Track the reference window to see if it is resized or destroyed. */ |
︙ | ︙ | |||
639 640 641 642 643 644 645 | Tk_Cursor oldCursor = busyPtr->cursor; if (Tk_SetOptions(interp, (char *) busyPtr, busyPtr->optionTable, objc, objv, busyPtr->tkBusy, NULL, NULL) != TCL_OK) { return TCL_ERROR; } if (busyPtr->cursor != oldCursor) { | | | 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | Tk_Cursor oldCursor = busyPtr->cursor; if (Tk_SetOptions(interp, (char *) busyPtr, busyPtr->optionTable, objc, objv, busyPtr->tkBusy, NULL, NULL) != TCL_OK) { return TCL_ERROR; } if (busyPtr->cursor != oldCursor) { if (busyPtr->cursor == NULL) { Tk_UndefineCursor(busyPtr->tkBusy); } else { Tk_DefineCursor(busyPtr->tkBusy, busyPtr->cursor); } } return TCL_OK; |
︙ | ︙ |
Changes to generic/tkButton.c.
︙ | ︙ | |||
706 707 708 709 710 711 712 | butPtr->highlightBorder = NULL; butPtr->highlightColorPtr = NULL; butPtr->inset = 0; butPtr->tkfont = NULL; butPtr->normalFg = NULL; butPtr->activeFg = NULL; butPtr->disabledFg = NULL; | | | | | | | 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 | butPtr->highlightBorder = NULL; butPtr->highlightColorPtr = NULL; butPtr->inset = 0; butPtr->tkfont = NULL; butPtr->normalFg = NULL; butPtr->activeFg = NULL; butPtr->disabledFg = NULL; butPtr->normalTextGC = NULL; butPtr->activeTextGC = NULL; butPtr->disabledGC = NULL; butPtr->stippleGC = NULL; butPtr->gray = None; butPtr->copyGC = NULL; butPtr->widthPtr = NULL; butPtr->width = 0; butPtr->heightPtr = NULL; butPtr->height = 0; butPtr->wrapLengthPtr = NULL; butPtr->wrapLength = 0; butPtr->padXPtr = NULL; |
︙ | ︙ | |||
736 737 738 739 740 741 742 | butPtr->indicatorSpace = 0; butPtr->indicatorDiameter = 0; butPtr->defaultState = DEFAULT_DISABLED; butPtr->selVarNamePtr = NULL; butPtr->onValuePtr = NULL; butPtr->offValuePtr = NULL; butPtr->tristateValuePtr = NULL; | | | 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | butPtr->indicatorSpace = 0; butPtr->indicatorDiameter = 0; butPtr->defaultState = DEFAULT_DISABLED; butPtr->selVarNamePtr = NULL; butPtr->onValuePtr = NULL; butPtr->offValuePtr = NULL; butPtr->tristateValuePtr = NULL; butPtr->cursor = NULL; butPtr->takeFocusPtr = NULL; butPtr->commandPtr = NULL; butPtr->flags = 0; Tk_CreateEventHandler(butPtr->tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, ButtonEventProc, butPtr); |
︙ | ︙ | |||
977 978 979 980 981 982 983 | } if (butPtr->selectImage != NULL) { Tk_FreeImage(butPtr->selectImage); } if (butPtr->tristateImage != NULL) { Tk_FreeImage(butPtr->tristateImage); } | | | | | | | 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 | } if (butPtr->selectImage != NULL) { Tk_FreeImage(butPtr->selectImage); } if (butPtr->tristateImage != NULL) { Tk_FreeImage(butPtr->tristateImage); } if (butPtr->normalTextGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->normalTextGC); } if (butPtr->activeTextGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->activeTextGC); } if (butPtr->disabledGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->disabledGC); } if (butPtr->stippleGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->stippleGC); } if (butPtr->gray != None) { Tk_FreeBitmap(butPtr->display, butPtr->gray); } if (butPtr->copyGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->copyGC); } if (butPtr->textLayout != NULL) { Tk_FreeTextLayout(butPtr->textLayout); } if (butPtr->selVarNamePtr != NULL) { Tcl_UntraceVar2(butPtr->interp, Tcl_GetString(butPtr->selVarNamePtr), |
︙ | ︙ | |||
1363 1364 1365 1366 1367 1368 1369 | * used to copy stuff from an off-screen pixmap onto the screen (we know * that there's no problem with obscured areas). */ gcValues.graphics_exposures = False; mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; newGC = Tk_GetGC(butPtr->tkwin, mask, &gcValues); | | | | | 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 | * used to copy stuff from an off-screen pixmap onto the screen (we know * that there's no problem with obscured areas). */ gcValues.graphics_exposures = False; mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; newGC = Tk_GetGC(butPtr->tkwin, mask, &gcValues); if (butPtr->normalTextGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->normalTextGC); } butPtr->normalTextGC = newGC; if (butPtr->activeFg != NULL) { gcValues.foreground = butPtr->activeFg->pixel; gcValues.background = Tk_3DBorderColor(butPtr->activeBorder)->pixel; mask = GCForeground | GCBackground | GCFont; newGC = Tk_GetGC(butPtr->tkwin, mask, &gcValues); if (butPtr->activeTextGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->activeTextGC); } butPtr->activeTextGC = newGC; } gcValues.background = Tk_3DBorderColor(butPtr->normalBorder)->pixel; /* * Create the GC that can be used for stippling */ if (butPtr->stippleGC == NULL) { gcValues.foreground = gcValues.background; mask = GCForeground; if (butPtr->gray == None) { butPtr->gray = Tk_GetBitmap(NULL, butPtr->tkwin, "gray50"); } if (butPtr->gray != None) { gcValues.fill_style = FillStippled; |
︙ | ︙ | |||
1411 1412 1413 1414 1415 1416 1417 | mask = GCForeground | GCBackground | GCFont; if (butPtr->disabledFg != NULL) { gcValues.foreground = butPtr->disabledFg->pixel; } else { gcValues.foreground = gcValues.background; } newGC = Tk_GetGC(butPtr->tkwin, mask, &gcValues); | | | | 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 | mask = GCForeground | GCBackground | GCFont; if (butPtr->disabledFg != NULL) { gcValues.foreground = butPtr->disabledFg->pixel; } else { gcValues.foreground = gcValues.background; } newGC = Tk_GetGC(butPtr->tkwin, mask, &gcValues); if (butPtr->disabledGC != NULL) { Tk_FreeGC(butPtr->display, butPtr->disabledGC); } butPtr->disabledGC = newGC; if (butPtr->copyGC == NULL) { butPtr->copyGC = Tk_GetGC(butPtr->tkwin, 0, &gcValues); } TkpComputeButtonGeometry(butPtr); /* * Lastly, arrange for the button to be redisplayed. |
︙ | ︙ |
Changes to generic/tkButton.h.
︙ | ︙ | |||
231 232 233 234 235 236 237 | * mode when variable matches this value. * Used by check- buttons. */ /* * Miscellaneous information: */ | | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | * mode when variable matches this value. * Used by check- buttons. */ /* * Miscellaneous information: */ Tk_Cursor cursor; /* Value of -cursor option: if not NULL, * specifies current cursor for window. */ Tcl_Obj *takeFocusPtr; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. */ Tcl_Obj *commandPtr; /* Value of -command option: specifies script * to execute when button is invoked. If * widget is label or has no command, this is |
︙ | ︙ |
Changes to generic/tkCanvArc.c.
︙ | ︙ | |||
286 287 288 289 290 291 292 | arcPtr->fillColor = NULL; arcPtr->activeFillColor = NULL; arcPtr->disabledFillColor = NULL; arcPtr->fillStipple = None; arcPtr->activeFillStipple = None; arcPtr->disabledFillStipple = None; arcPtr->style = PIESLICE_STYLE; | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | arcPtr->fillColor = NULL; arcPtr->activeFillColor = NULL; arcPtr->disabledFillColor = NULL; arcPtr->fillStipple = None; arcPtr->activeFillStipple = None; arcPtr->disabledFillStipple = None; arcPtr->style = PIESLICE_STYLE; arcPtr->fillGC = NULL; /* * Process the arguments to fill in the item record. */ for (i = 1; i < objc; i++) { const char *arg = Tcl_GetString(objv[i]); |
︙ | ︙ | |||
474 475 476 477 478 479 480 | mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &(arcPtr->outline)); if (mask) { gcValues.cap_style = CapButt; mask |= GCCapStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { | | | | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &(arcPtr->outline)); if (mask) { gcValues.cap_style = CapButt; mask |= GCCapStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { newGC = NULL; } if (arcPtr->outline.gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), arcPtr->outline.gc); } arcPtr->outline.gc = newGC; if(state == TK_STATE_NULL) { state = Canvas(canvas)->canvas_state; } |
︙ | ︙ | |||
508 509 510 511 512 513 514 | } if (arcPtr->disabledFillStipple!=None) { stipple = arcPtr->disabledFillStipple; } } if (arcPtr->style == ARC_STYLE) { | | | | | 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 | } if (arcPtr->disabledFillStipple!=None) { stipple = arcPtr->disabledFillStipple; } } if (arcPtr->style == ARC_STYLE) { newGC = NULL; } else if (color == NULL) { newGC = NULL; } else { gcValues.foreground = color->pixel; if (arcPtr->style == CHORD_STYLE) { gcValues.arc_mode = ArcChord; } else { gcValues.arc_mode = ArcPieSlice; } mask = GCForeground|GCArcMode; if (stipple != None) { gcValues.stipple = stipple; gcValues.fill_style = FillStippled; mask |= GCStipple|GCFillStyle; } newGC = Tk_GetGC(tkwin, mask, &gcValues); } if (arcPtr->fillGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), arcPtr->fillGC); } arcPtr->fillGC = newGC; tsoffset = &arcPtr->tsoffset; flags = tsoffset->flags; if (flags & TK_OFFSET_LEFT) { |
︙ | ︙ | |||
599 600 601 602 603 604 605 | } if (arcPtr->activeFillStipple != None) { Tk_FreeBitmap(display, arcPtr->activeFillStipple); } if (arcPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, arcPtr->disabledFillStipple); } | | | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 | } if (arcPtr->activeFillStipple != None) { Tk_FreeBitmap(display, arcPtr->activeFillStipple); } if (arcPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, arcPtr->disabledFillStipple); } if (arcPtr->fillGC != NULL) { Tk_FreeGC(display, arcPtr->fillGC); } } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
730 731 732 733 734 735 736 | } /* * Lastly, expand by the width of the arc (if the arc's outline is being * drawn) and add one extra pixel just for safety. */ | | | 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 | } /* * Lastly, expand by the width of the arc (if the arc's outline is being * drawn) and add one extra pixel just for safety. */ if (arcPtr->outline.gc == NULL) { tmp = 1; } else { tmp = (int) ((width + 1.0)/2.0 + 1); } arcPtr->header.x1 -= (int) tmp; arcPtr->header.y1 -= (int) tmp; arcPtr->header.x2 += (int) tmp; |
︙ | ︙ | |||
829 830 831 832 833 834 835 | /* * Display filled arc first (if wanted), then outline. If the extent is * zero then don't invoke XFillArc or XDrawArc, since this causes some * window servers to crash and should be a no-op anyway. */ | | | 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 | /* * Display filled arc first (if wanted), then outline. If the extent is * zero then don't invoke XFillArc or XDrawArc, since this causes some * window servers to crash and should be a no-op anyway. */ if ((arcPtr->fillGC != NULL) && (extent != 0)) { if (stipple != None) { int w = 0; int h = 0; Tk_TSOffset *tsoffset = &arcPtr->tsoffset; int flags = tsoffset->flags; if (flags & (TK_OFFSET_CENTER|TK_OFFSET_MIDDLE)) { |
︙ | ︙ | |||
863 864 865 866 867 868 869 | } XFillArc(display, drawable, arcPtr->fillGC, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), start, extent); if (stipple != None) { XSetTSOrigin(display, arcPtr->fillGC, 0, 0); } } | | | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 | } XFillArc(display, drawable, arcPtr->fillGC, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), start, extent); if (stipple != None) { XSetTSOrigin(display, arcPtr->fillGC, 0, 0); } } if (arcPtr->outline.gc != NULL) { Tk_ChangeOutlineGC(canvas, itemPtr, &(arcPtr->outline)); if (extent != 0) { XDrawArc(display, drawable, arcPtr->outline.gc, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), start, extent); } |
︙ | ︙ | |||
901 902 903 904 905 906 907 | cx, cy, x1, y1); XDrawLine(display, drawable, arcPtr->outline.gc, cx, cy, x2, y2); } } else { if (arcPtr->style == CHORD_STYLE) { TkFillPolygon(canvas, arcPtr->outlinePtr, CHORD_OUTLINE_PTS, | | | | | 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 | cx, cy, x1, y1); XDrawLine(display, drawable, arcPtr->outline.gc, cx, cy, x2, y2); } } else { if (arcPtr->style == CHORD_STYLE) { TkFillPolygon(canvas, arcPtr->outlinePtr, CHORD_OUTLINE_PTS, display, drawable, arcPtr->outline.gc, NULL); } else if (arcPtr->style == PIESLICE_STYLE) { TkFillPolygon(canvas, arcPtr->outlinePtr, PIE_OUTLINE1_PTS, display, drawable, arcPtr->outline.gc, NULL); TkFillPolygon(canvas, arcPtr->outlinePtr + 2*PIE_OUTLINE1_PTS, PIE_OUTLINE2_PTS, display, drawable, arcPtr->outline.gc, NULL); } } Tk_ResetOutlineGC(canvas, itemPtr, &(arcPtr->outline)); } } |
︙ | ︙ | |||
1013 1014 1015 1016 1017 1018 1019 | pointPtr[1] - arcPtr->center2[1]); if (newDist < dist) { return newDist; } return dist; } | | | | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 | pointPtr[1] - arcPtr->center2[1]); if (newDist < dist) { return newDist; } return dist; } if ((arcPtr->fillGC != NULL) || (arcPtr->outline.gc == NULL)) { filled = 1; } else { filled = 0; } if (arcPtr->outline.gc == NULL) { width = 0.0; } if (arcPtr->style == PIESLICE_STYLE) { if (width > 1.0) { dist = TkPolygonToPoint(arcPtr->outlinePtr, PIE_OUTLINE1_PTS, pointPtr); |
︙ | ︙ | |||
1140 1141 1142 1143 1144 1145 1146 | } } else if (state == TK_STATE_DISABLED) { if (arcPtr->outline.disabledWidth>0) { width = (double) arcPtr->outline.disabledWidth; } } | | | | 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 | } } else if (state == TK_STATE_DISABLED) { if (arcPtr->outline.disabledWidth>0) { width = (double) arcPtr->outline.disabledWidth; } } if ((arcPtr->fillGC != NULL) || (arcPtr->outline.gc == NULL)) { filled = 1; } else { filled = 0; } if (arcPtr->outline.gc == NULL) { width = 0.0; } /* * Transform both the arc and the rectangle so that the arc's oval is * centered on the origin. */ |
︙ | ︙ | |||
1879 1880 1881 1882 1883 1884 1885 | interpState = Tcl_SaveInterpState(interp, TCL_OK); /* * If the arc is filled, output Postscript for the interior region of the * arc. */ | | | 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 | interpState = Tcl_SaveInterpState(interp, TCL_OK); /* * If the arc is filled, output Postscript for the interior region of the * arc. */ if (arcPtr->fillGC != NULL) { Tcl_AppendPrintfToObj(psObj, "matrix currentmatrix\n" "%.15g %.15g translate %.15g %.15g scale\n", (arcPtr->bbox[0] + arcPtr->bbox[2])/2, (y1 + y2)/2, (arcPtr->bbox[2] - arcPtr->bbox[0])/2, (y1 - y2)/2); if (arcPtr->style != CHORD_STYLE) { |
︙ | ︙ | |||
1908 1909 1910 1911 1912 1913 1914 | Tcl_ResetResult(interp); if (Tk_CanvasPsStipple(interp, canvas, fillStipple) != TCL_OK) { goto error; } Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp)); | | | | 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 | Tcl_ResetResult(interp); if (Tk_CanvasPsStipple(interp, canvas, fillStipple) != TCL_OK) { goto error; } Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp)); if (arcPtr->outline.gc != NULL) { Tcl_AppendToObj(psObj, "grestore gsave\n", -1); } } else { Tcl_AppendToObj(psObj, "fill\n", -1); } } /* * If there's an outline for the arc, draw it. */ if (arcPtr->outline.gc != NULL) { Tcl_AppendPrintfToObj(psObj, "matrix currentmatrix\n" "%.15g %.15g translate %.15g %.15g scale\n", (arcPtr->bbox[0] + arcPtr->bbox[2])/2, (y1 + y2)/2, (arcPtr->bbox[2] - arcPtr->bbox[0])/2, (y1 - y2)/2); Tcl_AppendPrintfToObj(psObj, "0 0 1 %.15g %.15g arc\nsetmatrix\n0 setlinecap\n", |
︙ | ︙ |
Changes to generic/tkCanvBmap.c.
︙ | ︙ | |||
185 186 187 188 189 190 191 | bmapPtr->disabledBitmap = None; bmapPtr->fgColor = NULL; bmapPtr->activeFgColor = NULL; bmapPtr->disabledFgColor = NULL; bmapPtr->bgColor = NULL; bmapPtr->activeBgColor = NULL; bmapPtr->disabledBgColor = NULL; | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | bmapPtr->disabledBitmap = None; bmapPtr->fgColor = NULL; bmapPtr->activeFgColor = NULL; bmapPtr->disabledFgColor = NULL; bmapPtr->bgColor = NULL; bmapPtr->activeBgColor = NULL; bmapPtr->disabledBgColor = NULL; bmapPtr->gc = NULL; /* * Process the arguments to fill in the item record. Only 1 (list) or 2 (x * y) coords are allowed. */ if (objc == 1) { |
︙ | ︙ | |||
368 369 370 371 372 373 374 | } if (bmapPtr->disabledBitmap!=None) { bitmap = bmapPtr->disabledBitmap; } } if (bitmap == None) { | | | | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 | } if (bmapPtr->disabledBitmap!=None) { bitmap = bmapPtr->disabledBitmap; } } if (bitmap == None) { newGC = NULL; } else { gcValues.foreground = fgColor->pixel; mask = GCForeground; if (bgColor != NULL) { gcValues.background = bgColor->pixel; mask |= GCBackground; } else { gcValues.clip_mask = bitmap; mask |= GCClipMask; } newGC = Tk_GetGC(tkwin, mask, &gcValues); } if (bmapPtr->gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), bmapPtr->gc); } bmapPtr->gc = newGC; ComputeBitmapBbox(canvas, bmapPtr); return TCL_OK; } |
︙ | ︙ |
Changes to generic/tkCanvImg.c.
︙ | ︙ | |||
445 446 447 448 449 450 451 | image = imgPtr->disabledImage; } } x = (int) (imgPtr->x + ((imgPtr->x >= 0) ? 0.5 : - 0.5)); y = (int) (imgPtr->y + ((imgPtr->y >= 0) ? 0.5 : - 0.5)); | | | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 | image = imgPtr->disabledImage; } } x = (int) (imgPtr->x + ((imgPtr->x >= 0) ? 0.5 : - 0.5)); y = (int) (imgPtr->y + ((imgPtr->y >= 0) ? 0.5 : - 0.5)); if ((state == TK_STATE_HIDDEN) || (image == NULL)) { imgPtr->header.x1 = imgPtr->header.x2 = x; imgPtr->header.y1 = imgPtr->header.y2 = y; return; } /* * Compute location and size of image, using anchor information. |
︙ | ︙ |
Changes to generic/tkCanvLine.c.
︙ | ︙ | |||
292 293 294 295 296 297 298 | Tk_CreateOutline(&linePtr->outline); linePtr->canvas = canvas; linePtr->numPoints = 0; linePtr->coordPtr = NULL; linePtr->capStyle = CapButt; linePtr->joinStyle = JoinRound; | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | Tk_CreateOutline(&linePtr->outline); linePtr->canvas = canvas; linePtr->numPoints = 0; linePtr->coordPtr = NULL; linePtr->capStyle = CapButt; linePtr->joinStyle = JoinRound; linePtr->arrowGC = NULL; linePtr->arrow = ARROWS_NONE; linePtr->arrowShapeA = (float)8.0; linePtr->arrowShapeB = (float)10.0; linePtr->arrowShapeC = (float)3.0; linePtr->firstArrowPtr = NULL; linePtr->lastArrowPtr = NULL; linePtr->smooth = NULL; |
︙ | ︙ | |||
517 518 519 520 521 522 523 | mask |= GCLineWidth; #else gcValues.line_width = 0; #endif arrowGC = Tk_GetGC(tkwin, mask, &gcValues); } else { | | | | | 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 | mask |= GCLineWidth; #else gcValues.line_width = 0; #endif arrowGC = Tk_GetGC(tkwin, mask, &gcValues); } else { newGC = arrowGC = NULL; } if (linePtr->outline.gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), linePtr->outline.gc); } if (linePtr->arrowGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), linePtr->arrowGC); } linePtr->outline.gc = newGC; linePtr->arrowGC = arrowGC; /* * Keep spline parameters within reasonable limits. |
︙ | ︙ | |||
607 608 609 610 611 612 613 | { LineItem *linePtr = (LineItem *) itemPtr; Tk_DeleteOutline(display, &linePtr->outline); if (linePtr->coordPtr != NULL) { ckfree(linePtr->coordPtr); } | | | 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 | { LineItem *linePtr = (LineItem *) itemPtr; Tk_DeleteOutline(display, &linePtr->outline); if (linePtr->coordPtr != NULL) { ckfree(linePtr->coordPtr); } if (linePtr->arrowGC != NULL) { Tk_FreeGC(display, linePtr->arrowGC); } if (linePtr->firstArrowPtr != NULL) { ckfree(linePtr->firstArrowPtr); } if (linePtr->lastArrowPtr != NULL) { ckfree(linePtr->lastArrowPtr); |
︙ | ︙ | |||
836 837 838 839 840 841 842 | LineItem *linePtr = (LineItem *) itemPtr; XPoint staticPoints[MAX_STATIC_POINTS*3]; XPoint *pointPtr; double linewidth; int numPoints; Tk_State state = itemPtr->state; | | | 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 | LineItem *linePtr = (LineItem *) itemPtr; XPoint staticPoints[MAX_STATIC_POINTS*3]; XPoint *pointPtr; double linewidth; int numPoints; Tk_State state = itemPtr->state; if (!linePtr->numPoints || (linePtr->outline.gc == NULL)) { return; } if (state == TK_STATE_NULL) { state = Canvas(canvas)->canvas_state; } linewidth = linePtr->outline.width; |
︙ | ︙ |
Changes to generic/tkCanvPoly.c.
︙ | ︙ | |||
269 270 271 272 273 274 275 | polyPtr->tsoffset.yoffset = 0; polyPtr->fillColor = NULL; polyPtr->activeFillColor = NULL; polyPtr->disabledFillColor = NULL; polyPtr->fillStipple = None; polyPtr->activeFillStipple = None; polyPtr->disabledFillStipple = None; | | | 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | polyPtr->tsoffset.yoffset = 0; polyPtr->fillColor = NULL; polyPtr->activeFillColor = NULL; polyPtr->disabledFillColor = NULL; polyPtr->fillStipple = None; polyPtr->activeFillStipple = None; polyPtr->disabledFillStipple = None; polyPtr->fillGC = NULL; polyPtr->smooth = NULL; polyPtr->splineSteps = 12; polyPtr->autoClosed = 0; /* * Count the number of points and then parse them into a point array. * Leading arguments are assumed to be points if they start with a digit |
︙ | ︙ | |||
474 475 476 477 478 479 480 | mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &polyPtr->outline); if (mask) { gcValues.cap_style = CapRound; gcValues.join_style = polyPtr->joinStyle; mask |= GCCapStyle|GCJoinStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { | | | | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | mask = Tk_ConfigOutlineGC(&gcValues, canvas, itemPtr, &polyPtr->outline); if (mask) { gcValues.cap_style = CapRound; gcValues.join_style = polyPtr->joinStyle; mask |= GCCapStyle|GCJoinStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { newGC = NULL; } if (polyPtr->outline.gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), polyPtr->outline.gc); } polyPtr->outline.gc = newGC; color = polyPtr->fillColor; stipple = polyPtr->fillStipple; if (Canvas(canvas)->currentItemPtr == itemPtr) { |
︙ | ︙ | |||
500 501 502 503 504 505 506 | } if (polyPtr->disabledFillStipple != None) { stipple = polyPtr->disabledFillStipple; } } if (color == NULL) { | | | | 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | } if (polyPtr->disabledFillStipple != None) { stipple = polyPtr->disabledFillStipple; } } if (color == NULL) { newGC = NULL; } else { gcValues.foreground = color->pixel; mask = GCForeground; if (stipple != None) { gcValues.stipple = stipple; gcValues.fill_style = FillStippled; mask |= GCStipple|GCFillStyle; } #ifdef MAC_OSX_TK /* * Mac OS X CG drawing needs access to the outline linewidth * even for fills (as linewidth controls antialiasing). */ gcValues.line_width = polyPtr->outline.gc != None ? polyPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif newGC = Tk_GetGC(tkwin, mask, &gcValues); } if (polyPtr->fillGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), polyPtr->fillGC); } polyPtr->fillGC = newGC; /* * Keep spline parameters within reasonable limits. */ |
︙ | ︙ | |||
586 587 588 589 590 591 592 | } if (polyPtr->activeFillStipple != None) { Tk_FreeBitmap(display, polyPtr->activeFillStipple); } if (polyPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, polyPtr->disabledFillStipple); } | | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | } if (polyPtr->activeFillStipple != None) { Tk_FreeBitmap(display, polyPtr->activeFillStipple); } if (polyPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, polyPtr->disabledFillStipple); } if (polyPtr->fillGC != NULL) { Tk_FreeGC(display, polyPtr->fillGC); } } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
690 691 692 693 694 695 696 | } else if (tsoffset->flags & TK_OFFSET_MIDDLE) { tsoffset->yoffset = (polyPtr->header.y1 + polyPtr->header.y2)/2; } else if (tsoffset->flags & TK_OFFSET_BOTTOM) { tsoffset->yoffset = polyPtr->header.y2; } } | | | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 | } else if (tsoffset->flags & TK_OFFSET_MIDDLE) { tsoffset->yoffset = (polyPtr->header.y1 + polyPtr->header.y2)/2; } else if (tsoffset->flags & TK_OFFSET_BOTTOM) { tsoffset->yoffset = polyPtr->header.y2; } } if (polyPtr->outline.gc != NULL) { tsoffset = &polyPtr->outline.tsoffset; if (tsoffset) { if (tsoffset->flags & TK_OFFSET_INDEX) { int index = tsoffset->flags & ~TK_OFFSET_INDEX; if (tsoffset->flags == INT_MAX) { index = (polyPtr->numPoints - 1) * 2; |
︙ | ︙ | |||
832 833 834 835 836 837 838 | } /* * Display polygon, then free up polygon storage if it was dynamically * allocated. */ | | | | 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 | } /* * Display polygon, then free up polygon storage if it was dynamically * allocated. */ if (gc != NULL && numPoints > 3) { XFillPolygon(display, drawable, gc, pointPtr, numPoints, Complex, CoordModeOrigin); } if (outlineGC != NULL) { XDrawLines(display, drawable, outlineGC, pointPtr, numPoints, CoordModeOrigin); } if (pointPtr != staticPoints) { ckfree(pointPtr); } } |
︙ | ︙ | |||
877 878 879 880 881 882 883 | * redisplayed (not used). */ { PolygonItem *polyPtr = (PolygonItem *) itemPtr; Tk_State state = itemPtr->state; Pixmap stipple = polyPtr->fillStipple; double linewidth = polyPtr->outline.width; | | | | 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 | * redisplayed (not used). */ { PolygonItem *polyPtr = (PolygonItem *) itemPtr; Tk_State state = itemPtr->state; Pixmap stipple = polyPtr->fillStipple; double linewidth = polyPtr->outline.width; if (((polyPtr->fillGC == NULL) && (polyPtr->outline.gc == NULL)) || (polyPtr->numPoints < 1) || (polyPtr->numPoints < 3 && polyPtr->outline.gc == NULL)) { return; } if (state == TK_STATE_NULL) { state = Canvas(canvas)->canvas_state; } if (Canvas(canvas)->currentItemPtr == itemPtr) { |
︙ | ︙ | |||
907 908 909 910 911 912 913 | } /* * If we're stippling then modify the stipple offset in the GC. Be sure to * reset the offset when done, since the GC is supposed to be read-only. */ | | | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 | } /* * If we're stippling then modify the stipple offset in the GC. Be sure to * reset the offset when done, since the GC is supposed to be read-only. */ if ((stipple != None) && (polyPtr->fillGC != NULL)) { Tk_TSOffset *tsoffset = &polyPtr->tsoffset; int w = 0, h = 0; int flags = tsoffset->flags; if (!(flags & TK_OFFSET_INDEX) && (flags & (TK_OFFSET_CENTER|TK_OFFSET_MIDDLE))) { Tk_SizeOfBitmap(display, stipple, &w, &h); |
︙ | ︙ | |||
969 970 971 972 973 974 975 | if (numPoints <= MAX_STATIC_POINTS) { pointPtr = staticPoints; } else { pointPtr = ckalloc(numPoints * sizeof(XPoint)); } numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr, polyPtr->numPoints, polyPtr->splineSteps, pointPtr, NULL); | | | | | 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 | if (numPoints <= MAX_STATIC_POINTS) { pointPtr = staticPoints; } else { pointPtr = ckalloc(numPoints * sizeof(XPoint)); } numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr, polyPtr->numPoints, polyPtr->splineSteps, pointPtr, NULL); if (polyPtr->fillGC != NULL) { XFillPolygon(display, drawable, polyPtr->fillGC, pointPtr, numPoints, Complex, CoordModeOrigin); } if (polyPtr->outline.gc != NULL) { XDrawLines(display, drawable, polyPtr->outline.gc, pointPtr, numPoints, CoordModeOrigin); } if (pointPtr != staticPoints) { ckfree(pointPtr); } } Tk_ResetOutlineGC(canvas, itemPtr, &polyPtr->outline); if ((stipple != None) && (polyPtr->fillGC != NULL)) { XSetTSOrigin(display, polyPtr->fillGC, 0, 0); } } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
1295 1296 1297 1298 1299 1300 1301 | polyPoints = polyPtr->coordPtr; } bestDist = TkPolygonToPoint(polyPoints, numPoints, pointPtr); if (bestDist <= 0.0) { goto donepoint; } | | | | 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 | polyPoints = polyPtr->coordPtr; } bestDist = TkPolygonToPoint(polyPoints, numPoints, pointPtr); if (bestDist <= 0.0) { goto donepoint; } if ((polyPtr->outline.gc != NULL) && (polyPtr->joinStyle == JoinRound)) { dist = bestDist - radius; if (dist <= 0.0) { bestDist = 0.0; goto donepoint; } else { bestDist = dist; } } if ((polyPtr->outline.gc == NULL) || (width <= 1)) { goto donepoint; } /* * The overall idea is to iterate through all of the edges of the line, * computing a polygon for each edge and testing the point against that * polygon. In addition, there are additional tests to deal with rounded |
︙ | ︙ | |||
1511 1512 1513 1514 1515 1516 1517 | */ inside = TkPolygonToArea(polyPoints, numPoints, rectPtr); if (inside == 0) { goto donearea; } | | | 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 | */ inside = TkPolygonToArea(polyPoints, numPoints, rectPtr); if (inside == 0) { goto donearea; } if (polyPtr->outline.gc == NULL) { goto donearea; } /* * Iterate through all of the edges of the line, computing a polygon for * each edge and testing the area against that polygon. In addition, there * are additional tests to deal with rounded joints and caps. |
︙ | ︙ |
Changes to generic/tkCanvText.c.
︙ | ︙ | |||
265 266 267 268 269 270 271 | textPtr->angle = 0.0; textPtr->numChars = 0; textPtr->numBytes = 0; textPtr->textLayout = NULL; textPtr->actualWidth = 0; textPtr->drawOrigin[0] = textPtr->drawOrigin[1] = 0.0; | | | | | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | textPtr->angle = 0.0; textPtr->numChars = 0; textPtr->numBytes = 0; textPtr->textLayout = NULL; textPtr->actualWidth = 0; textPtr->drawOrigin[0] = textPtr->drawOrigin[1] = 0.0; textPtr->gc = NULL; textPtr->selTextGC = NULL; textPtr->cursorOffGC = NULL; textPtr->sine = 0.0; textPtr->cosine = 1.0; /* * Process the arguments to fill in the item record. Only 1 (list) or 2 (x * y) coords are allowed. */ |
︙ | ︙ | |||
443 444 445 446 447 448 449 | color = textPtr->disabledColor; } if (textPtr->disabledStipple != None) { stipple = textPtr->disabledStipple; } } | | | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 | color = textPtr->disabledColor; } if (textPtr->disabledStipple != None) { stipple = textPtr->disabledStipple; } } newGC = newSelGC = NULL; if (textPtr->tkfont != NULL) { gcValues.font = Tk_FontId(textPtr->tkfont); mask = GCFont; if (color != NULL) { gcValues.foreground = color->pixel; mask |= GCForeground; if (stipple != None) { |
︙ | ︙ | |||
468 469 470 471 472 473 474 | mask |= GCStipple|GCFillStyle; } if (textInfoPtr->selFgColorPtr != NULL) { gcValues.foreground = textInfoPtr->selFgColorPtr->pixel; } newSelGC = Tk_GetGC(tkwin, mask|GCForeground, &gcValues); } | | | | | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | mask |= GCStipple|GCFillStyle; } if (textInfoPtr->selFgColorPtr != NULL) { gcValues.foreground = textInfoPtr->selFgColorPtr->pixel; } newSelGC = Tk_GetGC(tkwin, mask|GCForeground, &gcValues); } if (textPtr->gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), textPtr->gc); } textPtr->gc = newGC; if (textPtr->selTextGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), textPtr->selTextGC); } textPtr->selTextGC = newSelGC; selBgColorPtr = Tk_3DBorderColor(textInfoPtr->selBorder); if (Tk_3DBorderColor(textInfoPtr->insertBorder)->pixel == selBgColorPtr->pixel) { if (selBgColorPtr->pixel == BlackPixelOfScreen(Tk_Screen(tkwin))) { gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin)); } else { gcValues.foreground = BlackPixelOfScreen(Tk_Screen(tkwin)); } newGC = Tk_GetGC(tkwin, GCForeground, &gcValues); } else { newGC = NULL; } if (textPtr->cursorOffGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), textPtr->cursorOffGC); } textPtr->cursorOffGC = newGC; /* * If the text was changed, move the selection and insertion indices to * keep them inside the item. |
︙ | ︙ | |||
588 589 590 591 592 593 594 | Tk_FreeBitmap(display, textPtr->disabledStipple); } if (textPtr->text != NULL) { ckfree(textPtr->text); } Tk_FreeTextLayout(textPtr->textLayout); | | | | | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 | Tk_FreeBitmap(display, textPtr->disabledStipple); } if (textPtr->text != NULL) { ckfree(textPtr->text); } Tk_FreeTextLayout(textPtr->textLayout); if (textPtr->gc != NULL) { Tk_FreeGC(display, textPtr->gc); } if (textPtr->selTextGC != NULL) { Tk_FreeGC(display, textPtr->selTextGC); } if (textPtr->cursorOffGC != NULL) { Tk_FreeGC(display, textPtr->cursorOffGC); } } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
816 817 818 819 820 821 822 | } } else if (state == TK_STATE_DISABLED) { if (textPtr->disabledStipple != None) { stipple = textPtr->disabledStipple; } } | | | 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 | } } else if (state == TK_STATE_DISABLED) { if (textPtr->disabledStipple != None) { stipple = textPtr->disabledStipple; } } if (textPtr->gc == NULL) { return; } /* * If we're stippling, then modify the stipple offset in the GC. Be sure * to reset the offset when done, since the GC is supposed to be * read-only. |
︙ | ︙ | |||
928 929 930 931 932 933 934 | Tk_SetCaretPos(Tk_CanvasTkwin(canvas), points[0].x, points[0].y, height); if (textInfoPtr->cursorOn) { Tk_Fill3DPolygon(Tk_CanvasTkwin(canvas), drawable, textInfoPtr->insertBorder, points, 4, textInfoPtr->insertBorderWidth, TK_RELIEF_RAISED); | | | 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 | Tk_SetCaretPos(Tk_CanvasTkwin(canvas), points[0].x, points[0].y, height); if (textInfoPtr->cursorOn) { Tk_Fill3DPolygon(Tk_CanvasTkwin(canvas), drawable, textInfoPtr->insertBorder, points, 4, textInfoPtr->insertBorderWidth, TK_RELIEF_RAISED); } else if (textPtr->cursorOffGC != NULL) { /* * Redraw the background over the area of the cursor, even * though the cursor is turned off. This guarantees that the * selection won't make the cursor invisible on mono displays, * where both may be drawn in the same color. */ |
︙ | ︙ |
Changes to generic/tkCanvUtil.c.
︙ | ︙ | |||
957 958 959 960 961 962 963 | *-------------------------------------------------------------- */ void Tk_CreateOutline( Tk_Outline *outline) /* Outline structure to be filled in. */ { | | | 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 | *-------------------------------------------------------------- */ void Tk_CreateOutline( Tk_Outline *outline) /* Outline structure to be filled in. */ { outline->gc = NULL; outline->width = 1.0; outline->activeWidth = 0.0; outline->disabledWidth = 0.0; outline->offset = 0; outline->dash.number = 0; outline->activeDash.number = 0; outline->disabledDash.number = 0; |
︙ | ︙ | |||
998 999 1000 1001 1002 1003 1004 | */ void Tk_DeleteOutline( Display *display, /* Display containing window. */ Tk_Outline *outline) { | | | 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 | */ void Tk_DeleteOutline( Display *display, /* Display containing window. */ Tk_Outline *outline) { if (outline->gc != NULL) { Tk_FreeGC(display, outline->gc); } if ((unsigned) ABS(outline->dash.number) > sizeof(char *)) { ckfree(outline->dash.pattern.pt); } if ((unsigned) ABS(outline->activeDash.number) > sizeof(char *)) { ckfree(outline->activeDash.pattern.pt); |
︙ | ︙ |
Changes to generic/tkCanvas.c.
︙ | ︙ | |||
674 675 676 677 678 679 680 | canvasPtr->borderWidth = 0; canvasPtr->bgBorder = NULL; canvasPtr->relief = TK_RELIEF_FLAT; canvasPtr->highlightWidth = 0; canvasPtr->highlightBgColorPtr = NULL; canvasPtr->highlightColorPtr = NULL; canvasPtr->inset = 0; | | | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 | canvasPtr->borderWidth = 0; canvasPtr->bgBorder = NULL; canvasPtr->relief = TK_RELIEF_FLAT; canvasPtr->highlightWidth = 0; canvasPtr->highlightBgColorPtr = NULL; canvasPtr->highlightColorPtr = NULL; canvasPtr->inset = 0; canvasPtr->pixmapGC = NULL; canvasPtr->width = None; canvasPtr->height = None; canvasPtr->confine = 0; canvasPtr->textInfo.selBorder = NULL; canvasPtr->textInfo.selBorderWidth = 0; canvasPtr->textInfo.selFgColorPtr = NULL; canvasPtr->textInfo.selItemPtr = NULL; |
︙ | ︙ | |||
720 721 722 723 724 725 726 | canvasPtr->yScrollIncrement = 0; canvasPtr->scanX = 0; canvasPtr->scanXOrigin = 0; canvasPtr->scanY = 0; canvasPtr->scanYOrigin = 0; canvasPtr->hotPtr = NULL; canvasPtr->hotPrevPtr = NULL; | | | 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 | canvasPtr->yScrollIncrement = 0; canvasPtr->scanX = 0; canvasPtr->scanXOrigin = 0; canvasPtr->scanY = 0; canvasPtr->scanYOrigin = 0; canvasPtr->hotPtr = NULL; canvasPtr->hotPrevPtr = NULL; canvasPtr->cursor = NULL; canvasPtr->takeFocus = NULL; canvasPtr->pixelsPerMM = WidthOfScreen(Tk_Screen(newWin)); canvasPtr->pixelsPerMM /= WidthMMOfScreen(Tk_Screen(newWin)); canvasPtr->flags = 0; canvasPtr->nextId = 1; canvasPtr->psInfo = NULL; canvasPtr->canvas_state = TK_STATE_NORMAL; |
︙ | ︙ | |||
2185 2186 2187 2188 2189 2190 2191 | /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ Tcl_DeleteHashTable(&canvasPtr->idTable); | | | 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 | /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ Tcl_DeleteHashTable(&canvasPtr->idTable); if (canvasPtr->pixmapGC != NULL) { Tk_FreeGC(canvasPtr->display, canvasPtr->pixmapGC); } #ifndef USE_OLD_TAG_SEARCH expr = canvasPtr->bindTagExprs; while (expr) { next = expr->next; TagSearchExprDestroy(expr); |
︙ | ︙ | |||
2261 2262 2263 2264 2265 2266 2267 | canvasPtr->inset = canvasPtr->borderWidth + canvasPtr->highlightWidth; gcValues.function = GXcopy; gcValues.graphics_exposures = False; gcValues.foreground = Tk_3DBorderColor(canvasPtr->bgBorder)->pixel; newGC = Tk_GetGC(canvasPtr->tkwin, GCFunction|GCGraphicsExposures|GCForeground, &gcValues); | | | 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 | canvasPtr->inset = canvasPtr->borderWidth + canvasPtr->highlightWidth; gcValues.function = GXcopy; gcValues.graphics_exposures = False; gcValues.foreground = Tk_3DBorderColor(canvasPtr->bgBorder)->pixel; newGC = Tk_GetGC(canvasPtr->tkwin, GCFunction|GCGraphicsExposures|GCForeground, &gcValues); if (canvasPtr->pixmapGC != NULL) { Tk_FreeGC(canvasPtr->display, canvasPtr->pixmapGC); } canvasPtr->pixmapGC = newGC; /* * Reconfigure items to reflect changed state disabled/normal. */ |
︙ | ︙ |
Changes to generic/tkCanvas.h.
︙ | ︙ | |||
202 203 204 205 206 207 208 | * a hint and may not really be hotPtr's * predecessor. */ /* * Miscellaneous information: */ | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | * a hint and may not really be hotPtr's * predecessor. */ /* * Miscellaneous information: */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ char *takeFocus; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ double pixelsPerMM; /* Scale factor between MM and pixels; used * when converting coordinates. */ int flags; /* Various flags; see below for * definitions. */ |
︙ | ︙ |
Changes to generic/tkColor.c.
︙ | ︙ | |||
241 242 243 244 245 246 247 | /* * Now create a new TkColor structure and add it to colorNameTable (in * TkDisplay). */ tkColPtr->magic = COLOR_MAGIC; | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | /* * Now create a new TkColor structure and add it to colorNameTable (in * TkDisplay). */ tkColPtr->magic = COLOR_MAGIC; tkColPtr->gc = NULL; tkColPtr->screen = Tk_Screen(tkwin); tkColPtr->colormap = Tk_Colormap(tkwin); tkColPtr->visual = Tk_Visual(tkwin); tkColPtr->resourceRefCount = 1; tkColPtr->objRefCount = 0; tkColPtr->type = TK_COLOR_BY_NAME; tkColPtr->hashPtr = nameHashPtr; |
︙ | ︙ | |||
322 323 324 325 326 327 328 | /* * The name isn't currently known. Find a pixel value for this color and * add a new structure to colorValueTable (in TkDisplay). */ tkColPtr = TkpGetColorByValue(tkwin, colorPtr); tkColPtr->magic = COLOR_MAGIC; | | | 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | /* * The name isn't currently known. Find a pixel value for this color and * add a new structure to colorValueTable (in TkDisplay). */ tkColPtr = TkpGetColorByValue(tkwin, colorPtr); tkColPtr->magic = COLOR_MAGIC; tkColPtr->gc = NULL; tkColPtr->screen = Tk_Screen(tkwin); tkColPtr->colormap = valueKey.colormap; tkColPtr->visual = Tk_Visual(tkwin); tkColPtr->resourceRefCount = 1; tkColPtr->objRefCount = 0; tkColPtr->type = TK_COLOR_BY_VALUE; tkColPtr->hashPtr = valueHashPtr; |
︙ | ︙ | |||
432 433 434 435 436 437 438 | * Tk_GetColor. */ if (tkColPtr->magic != COLOR_MAGIC) { Tcl_Panic("Tk_GCForColor called with bogus color"); } | | | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | * Tk_GetColor. */ if (tkColPtr->magic != COLOR_MAGIC) { Tcl_Panic("Tk_GCForColor called with bogus color"); } if (tkColPtr->gc == NULL) { gcValues.foreground = tkColPtr->color.pixel; tkColPtr->gc = XCreateGC(DisplayOfScreen(tkColPtr->screen), drawable, GCForeground, &gcValues); } return tkColPtr->gc; } |
︙ | ︙ | |||
487 488 489 490 491 492 493 | /* * This color is no longer being actively used, so free the color * resources associated with it and remove it from the hash table. No * longer any objects referencing it. */ | | | | 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | /* * This color is no longer being actively used, so free the color * resources associated with it and remove it from the hash table. No * longer any objects referencing it. */ if (tkColPtr->gc != NULL) { XFreeGC(DisplayOfScreen(screen), tkColPtr->gc); tkColPtr->gc = NULL; } TkpFreeColor(tkColPtr); prevPtr = Tcl_GetHashValue(tkColPtr->hashPtr); if (prevPtr == tkColPtr) { if (tkColPtr->nextPtr == NULL) { Tcl_DeleteHashEntry(tkColPtr->hashPtr); |
︙ | ︙ |
Changes to generic/tkColor.h.
︙ | ︙ | |||
28 29 30 31 32 33 34 | typedef struct TkColor { XColor color; /* Information about this color. */ unsigned int magic; /* Used for quick integrity check on this * structure. Must always have the value * COLOR_MAGIC. */ GC gc; /* Simple gc with this color as foreground * color and all other fields defaulted. May | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | typedef struct TkColor { XColor color; /* Information about this color. */ unsigned int magic; /* Used for quick integrity check on this * structure. Must always have the value * COLOR_MAGIC. */ GC gc; /* Simple gc with this color as foreground * color and all other fields defaulted. May * be NULL. */ Screen *screen; /* Screen where this color is valid. Used to * delete it, and to find its display. */ Colormap colormap; /* Colormap from which this entry was * allocated. */ Visual *visual; /* Visual associated with colormap. */ int resourceRefCount; /* Number of active uses of this color (each * active use corresponds to a call to |
︙ | ︙ |
Changes to generic/tkConfig.c.
︙ | ︙ | |||
796 797 798 799 800 801 802 | } break; } case TK_OPTION_CURSOR: { Tk_Cursor newCursor; if (nullOK && ObjectIsEmpty(valuePtr)) { | | | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 | } break; } case TK_OPTION_CURSOR: { Tk_Cursor newCursor; if (nullOK && ObjectIsEmpty(valuePtr)) { newCursor = NULL; valuePtr = NULL; } else { newCursor = Tk_AllocCursorFromObj(interp, tkwin, valuePtr); if (newCursor == NULL) { return TCL_ERROR; } } if (internalPtr != NULL) { *((Tk_Cursor *) oldInternalPtr) = *((Tk_Cursor *) internalPtr); *((Tk_Cursor *) internalPtr) = newCursor; } |
︙ | ︙ | |||
858 859 860 861 862 863 864 | break; } case TK_OPTION_WINDOW: { Tk_Window newWin; if (nullOK && ObjectIsEmpty(valuePtr)) { valuePtr = NULL; | | | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 | break; } case TK_OPTION_WINDOW: { Tk_Window newWin; if (nullOK && ObjectIsEmpty(valuePtr)) { valuePtr = NULL; newWin = NULL; } else { if (TkGetWindowFromObj(interp, tkwin, valuePtr, &newWin) != TCL_OK) { return TCL_ERROR; } } if (internalPtr != NULL) { |
︙ | ︙ | |||
1662 1663 1664 1665 1666 1667 1668 | } } else if (objPtr != NULL) { Tk_Free3DBorderFromObj(tkwin, objPtr); } break; case TK_OPTION_CURSOR: if (internalFormExists) { | | | | 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 | } } else if (objPtr != NULL) { Tk_Free3DBorderFromObj(tkwin, objPtr); } break; case TK_OPTION_CURSOR: if (internalFormExists) { if (*((Tk_Cursor *) internalPtr) != NULL) { Tk_FreeCursor(Tk_Display(tkwin), *((Tk_Cursor *) internalPtr)); *((Tk_Cursor *) internalPtr) = NULL; } } else if (objPtr != NULL) { Tk_FreeCursorFromObj(tkwin, objPtr); } break; case TK_OPTION_CUSTOM: { const Tk_ObjCustomOption *custom = optionPtr->extra.custom; |
︙ | ︙ | |||
1935 1936 1937 1938 1939 1940 1941 | } case TK_OPTION_RELIEF: objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1); break; case TK_OPTION_CURSOR: { Tk_Cursor cursor = *((Tk_Cursor *) internalPtr); | | | 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 | } case TK_OPTION_RELIEF: objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1); break; case TK_OPTION_CURSOR: { Tk_Cursor cursor = *((Tk_Cursor *) internalPtr); if (cursor != NULL) { objPtr = Tcl_NewStringObj( Tk_NameOfCursor(Tk_Display(tkwin), cursor), -1); } break; } case TK_OPTION_JUSTIFY: objPtr = Tcl_NewStringObj(Tk_NameOfJustify( |
︙ | ︙ |
Changes to generic/tkCursor.c.
︙ | ︙ | |||
146 147 148 149 150 151 152 | /* * Still no luck. Call TkcGetCursor to allocate a new TkCursor object. */ cursorPtr = TkcGetCursor(interp, tkwin, Tcl_GetString(objPtr)); objPtr->internalRep.twoPtrValue.ptr1 = cursorPtr; if (cursorPtr == NULL) { | | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | /* * Still no luck. Call TkcGetCursor to allocate a new TkCursor object. */ cursorPtr = TkcGetCursor(interp, tkwin, Tcl_GetString(objPtr)); objPtr->internalRep.twoPtrValue.ptr1 = cursorPtr; if (cursorPtr == NULL) { return NULL; } cursorPtr->objRefCount++; return cursorPtr->cursor; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
186 187 188 189 190 191 192 | Tk_Window tkwin, /* Window in which cursor will be used. */ Tk_Uid string) /* Description of cursor. See manual entry for * details on legal syntax. */ { TkCursor *cursorPtr = TkcGetCursor(interp, tkwin, string); if (cursorPtr == NULL) { | | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | Tk_Window tkwin, /* Window in which cursor will be used. */ Tk_Uid string) /* Description of cursor. See manual entry for * details on legal syntax. */ { TkCursor *cursorPtr = TkcGetCursor(interp, tkwin, string); if (cursorPtr == NULL) { return NULL; } return cursorPtr->cursor; } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
384 385 386 387 388 389 390 | } Tcl_SetHashValue(dataHashPtr, cursorPtr); Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr); return cursorPtr->cursor; error: Tcl_DeleteHashEntry(dataHashPtr); | | | 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | } Tcl_SetHashValue(dataHashPtr, cursorPtr); Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr); return cursorPtr->cursor; error: Tcl_DeleteHashEntry(dataHashPtr); return NULL; } /* *-------------------------------------------------------------- * * Tk_NameOfCursor -- * |
︙ | ︙ |
Changes to generic/tkEntry.c.
︙ | ︙ | |||
520 521 522 523 524 525 526 | entryPtr->type = TK_ENTRY; tmp = ckalloc(1); tmp[0] = '\0'; entryPtr->string = tmp; entryPtr->selectFirst = -1; entryPtr->selectLast = -1; | | | | | | 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | entryPtr->type = TK_ENTRY; tmp = ckalloc(1); tmp[0] = '\0'; entryPtr->string = tmp; entryPtr->selectFirst = -1; entryPtr->selectLast = -1; entryPtr->cursor = NULL; entryPtr->exportSelection = 1; entryPtr->justify = TK_JUSTIFY_LEFT; entryPtr->relief = TK_RELIEF_FLAT; entryPtr->state = STATE_NORMAL; entryPtr->displayString = entryPtr->string; entryPtr->inset = XPAD; entryPtr->textGC = NULL; entryPtr->selTextGC = NULL; entryPtr->highlightGC = NULL; entryPtr->avgWidth = 1; entryPtr->validate = VALIDATE_NONE; /* * Keep a hold of the associated tkwin until we destroy the entry, * otherwise Tk might free it while we still need it. */ |
︙ | ︙ | |||
1029 1030 1031 1032 1033 1034 1035 | ckfree((char *)entryPtr->string); if (entryPtr->textVarName != NULL) { Tcl_UntraceVar2(entryPtr->interp, entryPtr->textVarName, NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, EntryTextVarProc, entryPtr); entryPtr->flags &= ~ENTRY_VAR_TRACED; } | | | | 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 | ckfree((char *)entryPtr->string); if (entryPtr->textVarName != NULL) { Tcl_UntraceVar2(entryPtr->interp, entryPtr->textVarName, NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, EntryTextVarProc, entryPtr); entryPtr->flags &= ~ENTRY_VAR_TRACED; } if (entryPtr->textGC != NULL) { Tk_FreeGC(entryPtr->display, entryPtr->textGC); } if (entryPtr->selTextGC != NULL) { Tk_FreeGC(entryPtr->display, entryPtr->selTextGC); } Tcl_DeleteTimerHandler(entryPtr->insertBlinkHandler); if (entryPtr->displayString != entryPtr->string) { ckfree((char *)entryPtr->displayString); } if (entryPtr->type == TK_SPINBOX) { |
︙ | ︙ | |||
1426 1427 1428 1429 1430 1431 1432 | */ static void EntryWorldChanged( ClientData instanceData) /* Information about widget. */ { XGCValues gcValues; | | | 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 | */ static void EntryWorldChanged( ClientData instanceData) /* Information about widget. */ { XGCValues gcValues; GC gc = NULL; unsigned long mask; Tk_3DBorder border; XColor *colorPtr; Entry *entryPtr = instanceData; entryPtr->avgWidth = Tk_TextWidth(entryPtr->tkfont, "0", 1); if (entryPtr->avgWidth == 0) { |
︙ | ︙ | |||
1478 1479 1480 1481 1482 1483 1484 | Tk_SetBackgroundFromBorder(entryPtr->tkwin, border); gcValues.foreground = colorPtr->pixel; gcValues.font = Tk_FontId(entryPtr->tkfont); gcValues.graphics_exposures = False; mask = GCForeground | GCFont | GCGraphicsExposures; gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues); | | | | 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 | Tk_SetBackgroundFromBorder(entryPtr->tkwin, border); gcValues.foreground = colorPtr->pixel; gcValues.font = Tk_FontId(entryPtr->tkfont); gcValues.graphics_exposures = False; mask = GCForeground | GCFont | GCGraphicsExposures; gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues); if (entryPtr->textGC != NULL) { Tk_FreeGC(entryPtr->display, entryPtr->textGC); } entryPtr->textGC = gc; if (entryPtr->selFgColorPtr != NULL) { gcValues.foreground = entryPtr->selFgColorPtr->pixel; } gcValues.font = Tk_FontId(entryPtr->tkfont); mask = GCForeground | GCFont; gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues); if (entryPtr->selTextGC != NULL) { Tk_FreeGC(entryPtr->display, entryPtr->selTextGC); } entryPtr->selTextGC = gc; /* * Recompute the window's geometry and arrange for it to be redisplayed. */ |
︙ | ︙ | |||
2453 2454 2455 2456 2457 2458 2459 | sbPtr->curElement = elem; if (elem == SEL_ENTRY) { cursor = entryPtr->cursor; } else if ((elem == SEL_BUTTONDOWN) || (elem == SEL_BUTTONUP)) { cursor = sbPtr->bCursor; } else { | | | | 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 | sbPtr->curElement = elem; if (elem == SEL_ENTRY) { cursor = entryPtr->cursor; } else if ((elem == SEL_BUTTONDOWN) || (elem == SEL_BUTTONUP)) { cursor = sbPtr->bCursor; } else { cursor = NULL; } if (cursor != NULL) { Tk_DefineCursor(entryPtr->tkwin, cursor); } else { Tk_UndefineCursor(entryPtr->tkwin); } } return; } |
︙ | ︙ | |||
3629 3630 3631 3632 3633 3634 3635 | entryPtr->type = TK_SPINBOX; tmp = ckalloc(1); tmp[0] = '\0'; entryPtr->string = tmp; entryPtr->selectFirst = -1; entryPtr->selectLast = -1; | | | | | | | 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 | entryPtr->type = TK_SPINBOX; tmp = ckalloc(1); tmp[0] = '\0'; entryPtr->string = tmp; entryPtr->selectFirst = -1; entryPtr->selectLast = -1; entryPtr->cursor = NULL; entryPtr->exportSelection = 1; entryPtr->justify = TK_JUSTIFY_LEFT; entryPtr->relief = TK_RELIEF_FLAT; entryPtr->state = STATE_NORMAL; entryPtr->displayString = entryPtr->string; entryPtr->inset = XPAD; entryPtr->textGC = NULL; entryPtr->selTextGC = NULL; entryPtr->highlightGC = NULL; entryPtr->avgWidth = 1; entryPtr->validate = VALIDATE_NONE; sbPtr->selElement = SEL_NONE; sbPtr->curElement = SEL_NONE; sbPtr->bCursor = NULL; sbPtr->repeatDelay = 400; sbPtr->repeatInterval = 100; sbPtr->fromValue = 0.0; sbPtr->toValue = 100.0; sbPtr->increment = 1.0; sbPtr->formatBuf = ckalloc(TCL_DOUBLE_SPACE); sbPtr->bdRelief = TK_RELIEF_FLAT; |
︙ | ︙ |
Changes to generic/tkEntry.h.
︙ | ︙ | |||
78 79 80 81 82 83 84 | Tk_3DBorder disabledBorder; /* Used for drawing border around whole window * in disabled state, plus used for * background. */ Tk_3DBorder readonlyBorder; /* Used for drawing border around whole window * in readonly state, plus used for * background. */ int borderWidth; /* Width of 3-D border around window. */ | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | Tk_3DBorder disabledBorder; /* Used for drawing border around whole window * in disabled state, plus used for * background. */ Tk_3DBorder readonlyBorder; /* Used for drawing border around whole window * in readonly state, plus used for * background. */ int borderWidth; /* Width of 3-D border around window. */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ int exportSelection; /* Non-zero means tie internal entry selection * to X selection. */ Tk_Font tkfont; /* Information about text font, or NULL. */ XColor *fgColorPtr; /* Text color in normal mode. */ XColor *dfgColorPtr; /* Text color in disabled mode. */ XColor *highlightBgColorPtr;/* Color for drawing traversal highlight area * when highlight is off. */ |
︙ | ︙ | |||
188 189 190 191 192 193 194 | /* * Spinbox specific configuration settings. */ Tk_3DBorder activeBorder; /* Used for drawing border around active * buttons. */ Tk_3DBorder buttonBorder; /* Used for drawing border around buttons. */ | | | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | /* * Spinbox specific configuration settings. */ Tk_3DBorder activeBorder; /* Used for drawing border around active * buttons. */ Tk_3DBorder buttonBorder; /* Used for drawing border around buttons. */ Tk_Cursor bCursor; /* cursor for buttons, or NULL. */ int bdRelief; /* 3-D effect: TK_RELIEF_RAISED, etc. */ int buRelief; /* 3-D effect: TK_RELIEF_RAISED, etc. */ char *command; /* Command to invoke for spin buttons. NULL * means no command to issue. */ /* * Spinbox specific fields for use with configuration settings above. |
︙ | ︙ |
Changes to generic/tkEvent.c.
︙ | ︙ | |||
1364 1365 1366 1367 1368 1369 1370 | */ /* * ...well, except when we use the tkwm patches, in which case we DO * handle CreateNotify events, so we gotta pass 'em through. */ | | | 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 | */ /* * ...well, except when we use the tkwm patches, in which case we DO * handle CreateNotify events, so we gotta pass 'em through. */ if ((ip.winPtr != NULL) && ((mask != SubstructureNotifyMask) || (eventPtr->type == CreateNotify))) { TkBindEventProc(winPtr, eventPtr); } } tsdPtr->pendingPtr = ip.nextPtr; |
︙ | ︙ | |||
1435 1436 1437 1438 1439 1440 1441 | winPtr->handlerList = handlerPtr->nextPtr; for (ipPtr = tsdPtr->pendingPtr; ipPtr != NULL; ipPtr = ipPtr->nextPtr) { if (ipPtr->nextHandler == handlerPtr) { ipPtr->nextHandler = NULL; } if (ipPtr->winPtr == winPtr) { | | | 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 | winPtr->handlerList = handlerPtr->nextPtr; for (ipPtr = tsdPtr->pendingPtr; ipPtr != NULL; ipPtr = ipPtr->nextPtr) { if (ipPtr->nextHandler == handlerPtr) { ipPtr->nextHandler = NULL; } if (ipPtr->winPtr == winPtr) { ipPtr->winPtr = NULL; } } ckfree(handlerPtr); } } /* |
︙ | ︙ |
Changes to generic/tkFrame.c.
︙ | ︙ | |||
658 659 660 661 662 663 664 | framePtr->interp = interp; framePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(newWin), FrameWidgetObjCmd, framePtr, FrameCmdDeletedProc); framePtr->optionTable = optionTable; framePtr->type = type; framePtr->colormap = colormap; framePtr->relief = TK_RELIEF_FLAT; | | | | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 | framePtr->interp = interp; framePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(newWin), FrameWidgetObjCmd, framePtr, FrameCmdDeletedProc); framePtr->optionTable = optionTable; framePtr->type = type; framePtr->colormap = colormap; framePtr->relief = TK_RELIEF_FLAT; framePtr->cursor = NULL; if (framePtr->type == TYPE_LABELFRAME) { Labelframe *labelframePtr = (Labelframe *) framePtr; labelframePtr->labelAnchor = LABELANCHOR_NW; labelframePtr->textGC = NULL; } /* * Store backreference to frame widget in window structure. */ Tk_SetClassProcs(newWin, &frameClass, framePtr); |
︙ | ︙ | |||
860 861 862 863 864 865 866 | void *memPtr) /* Info about frame widget. */ { register Frame *framePtr = memPtr; register Labelframe *labelframePtr = memPtr; if (framePtr->type == TYPE_LABELFRAME) { Tk_FreeTextLayout(labelframePtr->textLayout); | | | 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 | void *memPtr) /* Info about frame widget. */ { register Frame *framePtr = memPtr; register Labelframe *labelframePtr = memPtr; if (framePtr->type == TYPE_LABELFRAME) { Tk_FreeTextLayout(labelframePtr->textLayout); if (labelframePtr->textGC != NULL) { Tk_FreeGC(framePtr->display, labelframePtr->textGC); } } if (framePtr->colormap != None) { Tk_FreeColormap(framePtr->display, framePtr->colormap); } ckfree(framePtr); |
︙ | ︙ | |||
1116 1117 1118 1119 1120 1121 1122 | */ gcValues.font = Tk_FontId(labelframePtr->tkfont); gcValues.foreground = labelframePtr->textColorPtr->pixel; gcValues.graphics_exposures = False; gc = Tk_GetGC(tkwin, GCForeground | GCFont | GCGraphicsExposures, &gcValues); | | | 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 | */ gcValues.font = Tk_FontId(labelframePtr->tkfont); gcValues.foreground = labelframePtr->textColorPtr->pixel; gcValues.graphics_exposures = False; gc = Tk_GetGC(tkwin, GCForeground | GCFont | GCGraphicsExposures, &gcValues); if (labelframePtr->textGC != NULL) { Tk_FreeGC(framePtr->display, labelframePtr->textGC); } labelframePtr->textGC = gc; /* * Calculate label size. */ |
︙ | ︙ |
Changes to generic/tkImage.c.
︙ | ︙ | |||
771 772 773 774 775 776 777 | */ pmap = Tk_GetPixmap(Tk_Display(tkwin), Tk_WindowId(tkwin), width, height, Tk_Depth(tkwin)); gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin)); newGC = Tk_GetGC(tkwin, GCForeground, &gcValues); | | | 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 | */ pmap = Tk_GetPixmap(Tk_Display(tkwin), Tk_WindowId(tkwin), width, height, Tk_Depth(tkwin)); gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin)); newGC = Tk_GetGC(tkwin, GCForeground, &gcValues); if (newGC != NULL) { XFillRectangle(Tk_Display(tkwin), pmap, newGC, 0, 0, (unsigned) width, (unsigned) height); Tk_FreeGC(Tk_Display(tkwin), newGC); } Tk_RedrawImage(image, x, y, width, height, pmap, 0, 0); |
︙ | ︙ |
Changes to generic/tkImgBmap.c.
︙ | ︙ | |||
423 424 425 426 427 428 429 | } } else { gcValues.clip_mask = instancePtr->bitmap; mask |= GCClipMask; } gc = Tk_GetGC(instancePtr->tkwin, mask, &gcValues); } else { | | | | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | } } else { gcValues.clip_mask = instancePtr->bitmap; mask |= GCClipMask; } gc = Tk_GetGC(instancePtr->tkwin, mask, &gcValues); } else { gc = NULL; } if (instancePtr->gc != NULL) { Tk_FreeGC(Tk_Display(instancePtr->tkwin), instancePtr->gc); } instancePtr->gc = gc; return; error: /* * An error occurred: clear the graphics context in the instance to make * it clear that this instance cannot be displayed. Then report the error. */ if (instancePtr->gc != NULL) { Tk_FreeGC(Tk_Display(instancePtr->tkwin), instancePtr->gc); } instancePtr->gc = NULL; Tcl_AppendObjToErrorInfo(masterPtr->interp, Tcl_ObjPrintf( "\n (while configuring image \"%s\")", Tk_NameOfImage( masterPtr->tkMaster))); Tcl_BackgroundException(masterPtr->interp, TCL_ERROR); } /* |
︙ | ︙ | |||
844 845 846 847 848 849 850 | instancePtr->refCount = 1; instancePtr->masterPtr = masterPtr; instancePtr->tkwin = tkwin; instancePtr->fg = NULL; instancePtr->bg = NULL; instancePtr->bitmap = None; instancePtr->mask = None; | | | 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 | instancePtr->refCount = 1; instancePtr->masterPtr = masterPtr; instancePtr->tkwin = tkwin; instancePtr->fg = NULL; instancePtr->bg = NULL; instancePtr->bitmap = None; instancePtr->mask = None; instancePtr->gc = NULL; instancePtr->nextPtr = masterPtr->instancePtr; masterPtr->instancePtr = instancePtr; ImgBmapConfigureInstance(instancePtr); /* * If this is the first instance, must set the size of the image. */ |
︙ | ︙ | |||
898 899 900 901 902 903 904 | int masking; /* * If there's no graphics context, it means that an error occurred while * creating the image instance so it can't be displayed. */ | | | 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 | int masking; /* * If there's no graphics context, it means that an error occurred while * creating the image instance so it can't be displayed. */ if (instancePtr->gc == NULL) { return; } /* * If masking is in effect, must modify the mask origin within the * graphics context to line up with the image's origin. Then draw the * image and reset the clip origin, if there's a mask. |
︙ | ︙ | |||
969 970 971 972 973 974 975 | } if (instancePtr->bitmap != None) { Tk_FreePixmap(display, instancePtr->bitmap); } if (instancePtr->mask != None) { Tk_FreePixmap(display, instancePtr->mask); } | | | 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 | } if (instancePtr->bitmap != None) { Tk_FreePixmap(display, instancePtr->bitmap); } if (instancePtr->mask != None) { Tk_FreePixmap(display, instancePtr->mask); } if (instancePtr->gc != NULL) { Tk_FreeGC(display, instancePtr->gc); } if (instancePtr->masterPtr->instancePtr == instancePtr) { instancePtr->masterPtr->instancePtr = instancePtr->nextPtr; } else { for (prevPtr = instancePtr->masterPtr->instancePtr; prevPtr->nextPtr != instancePtr; prevPtr = prevPtr->nextPtr) { |
︙ | ︙ |
Changes to generic/tkImgPhInstance.c.
︙ | ︙ | |||
1586 1587 1588 1589 1590 1591 1592 | { PhotoInstance *instancePtr = clientData; PhotoInstance *prevPtr; if (instancePtr->pixels != None) { Tk_FreePixmap(instancePtr->display, instancePtr->pixels); } | | | 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 | { PhotoInstance *instancePtr = clientData; PhotoInstance *prevPtr; if (instancePtr->pixels != None) { Tk_FreePixmap(instancePtr->display, instancePtr->pixels); } if (instancePtr->gc != NULL) { Tk_FreeGC(instancePtr->display, instancePtr->gc); } if (instancePtr->imagePtr != NULL) { XDestroyImage(instancePtr->imagePtr); } if (instancePtr->error != NULL) { ckfree(instancePtr->error); |
︙ | ︙ |
Changes to generic/tkListbox.c.
︙ | ︙ | |||
538 539 540 541 542 543 544 | listPtr->optionTable = optionTables->listboxOptionTable; listPtr->itemAttrOptionTable = optionTables->itemAttrOptionTable; listPtr->selection = ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(listPtr->selection, TCL_ONE_WORD_KEYS); listPtr->itemAttrTable = ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(listPtr->itemAttrTable, TCL_ONE_WORD_KEYS); listPtr->relief = TK_RELIEF_RAISED; | | | | | | 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 | listPtr->optionTable = optionTables->listboxOptionTable; listPtr->itemAttrOptionTable = optionTables->itemAttrOptionTable; listPtr->selection = ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(listPtr->selection, TCL_ONE_WORD_KEYS); listPtr->itemAttrTable = ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(listPtr->itemAttrTable, TCL_ONE_WORD_KEYS); listPtr->relief = TK_RELIEF_RAISED; listPtr->textGC = NULL; listPtr->selFgColorPtr = NULL; listPtr->selTextGC = NULL; listPtr->fullLines = 1; listPtr->xScrollUnit = 1; listPtr->exportSelection = 1; listPtr->cursor = NULL; listPtr->state = STATE_NORMAL; listPtr->gray = None; listPtr->justify = TK_JUSTIFY_LEFT; /* * Keep a hold of the associated tkwin until we destroy the listbox, * otherwise Tk might free it while we still need it. |
︙ | ︙ | |||
1484 1485 1486 1487 1488 1489 1490 | ckfree(listPtr->itemAttrTable); /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ | | | | 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 | ckfree(listPtr->itemAttrTable); /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ if (listPtr->textGC != NULL) { Tk_FreeGC(listPtr->display, listPtr->textGC); } if (listPtr->selTextGC != NULL) { Tk_FreeGC(listPtr->display, listPtr->selTextGC); } if (listPtr->gray != None) { Tk_FreeBitmap(Tk_Display(listPtr->tkwin), listPtr->gray); } Tk_FreeConfigOptions((char *) listPtr, listPtr->optionTable, |
︙ | ︙ | |||
1787 1788 1789 1790 1791 1792 1793 | gcValues.stipple = listPtr->gray; mask |= GCFillStyle | GCStipple; } } gcValues.font = Tk_FontId(listPtr->tkfont); gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues); | | | | 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 | gcValues.stipple = listPtr->gray; mask |= GCFillStyle | GCStipple; } } gcValues.font = Tk_FontId(listPtr->tkfont); gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues); if (listPtr->textGC != NULL) { Tk_FreeGC(listPtr->display, listPtr->textGC); } listPtr->textGC = gc; if (listPtr->selFgColorPtr != NULL) { gcValues.foreground = listPtr->selFgColorPtr->pixel; } gcValues.font = Tk_FontId(listPtr->tkfont); mask = GCForeground | GCFont; gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues); if (listPtr->selTextGC != NULL) { Tk_FreeGC(listPtr->display, listPtr->selTextGC); } listPtr->selTextGC = gc; /* * Register the desired geometry for the window and arrange for the window * to be redisplayed. |
︙ | ︙ |
Changes to generic/tkMain.c.
︙ | ︙ | |||
41 42 43 44 45 46 47 | extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); /* * The default prompt used when the user has not overridden it. */ | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); /* * The default prompt used when the user has not overridden it. */ static const char DEFAULT_PRIMARY_PROMPT[] = "% "; /* * This file can be compiled on Windows in UNICODE mode, as well as * on all other platforms using the native encoding. This is done * by using the normal Windows functions like _tcscmp, but on * platforms which don't have <tchar.h> we have to translate that * to strcmp here. |
︙ | ︙ | |||
515 516 517 518 519 520 521 | isPtr->gotPartial ? "tcl_prompt2" : "tcl_prompt1", NULL, TCL_GLOBAL_ONLY); if (promptCmdPtr == NULL) { defaultPrompt: if (!isPtr->gotPartial) { chan = Tcl_GetStdChannel(TCL_STDOUT); if (chan != NULL) { Tcl_WriteChars(chan, DEFAULT_PRIMARY_PROMPT, | | | 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | isPtr->gotPartial ? "tcl_prompt2" : "tcl_prompt1", NULL, TCL_GLOBAL_ONLY); if (promptCmdPtr == NULL) { defaultPrompt: if (!isPtr->gotPartial) { chan = Tcl_GetStdChannel(TCL_STDOUT); if (chan != NULL) { Tcl_WriteChars(chan, DEFAULT_PRIMARY_PROMPT, sizeof(DEFAULT_PRIMARY_PROMPT) - 1); } } } else { code = Tcl_EvalObjEx(interp, promptCmdPtr, TCL_EVAL_GLOBAL); if (code != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (script that generates prompt)"); |
︙ | ︙ |
Changes to generic/tkMenu.c.
︙ | ︙ | |||
451 452 453 454 455 456 457 | menuPtr->tkwin = newWin; menuPtr->display = Tk_Display(newWin); menuPtr->interp = interp; menuPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(menuPtr->tkwin), MenuWidgetObjCmd, menuPtr, MenuCmdDeletedProc); menuPtr->active = -1; | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | menuPtr->tkwin = newWin; menuPtr->display = Tk_Display(newWin); menuPtr->interp = interp; menuPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(menuPtr->tkwin), MenuWidgetObjCmd, menuPtr, MenuCmdDeletedProc); menuPtr->active = -1; menuPtr->cursorPtr = NULL; menuPtr->masterMenuPtr = menuPtr; menuPtr->menuType = UNKNOWN_TYPE; TkMenuInitializeDrawingFields(menuPtr); Tk_SetClass(menuPtr->tkwin, "Menu"); Tk_SetClassProcs(menuPtr->tkwin, &menuClass, menuPtr); Tk_CreateEventHandler(newWin, |
︙ | ︙ |
Changes to generic/tkMenu.h.
︙ | ︙ | |||
71 72 73 74 75 76 77 | int labelLength; /* Number of non-NULL characters in label. */ int state; /* State of button for display purposes: * normal, active, or disabled. */ int underline; /* Value of -underline option: specifies index * of character to underline (<0 means don't * underline anything). */ Tcl_Obj *underlinePtr; /* Index of character to underline. */ | | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | int labelLength; /* Number of non-NULL characters in label. */ int state; /* State of button for display purposes: * normal, active, or disabled. */ int underline; /* Value of -underline option: specifies index * of character to underline (<0 means don't * underline anything). */ Tcl_Obj *underlinePtr; /* Index of character to underline. */ Tcl_Obj *bitmapPtr; /* Bitmap to display in menu entry, or NULL. * If not NULL then label is ignored. */ Tcl_Obj *imagePtr; /* Name of image to display, or NULL. If not * NULL, bitmap, text, and textVarName are * ignored. */ Tk_Image image; /* Image to display in menu entry, or NULL if * none. */ Tcl_Obj *selectImagePtr; /* Name of image to display when selected, or * NULL. */ |
︙ | ︙ | |||
171 172 173 174 175 176 177 | GC activeGC; /* GC for drawing text in entry when active. * NULL means use overall activeGC for * menu. */ GC disabledGC; /* Used to produce disabled effect for entry. * NULL means use overall disabledGC from menu * structure. See comments for disabledFg in * menu structure for more information. */ | | | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 | GC activeGC; /* GC for drawing text in entry when active. * NULL means use overall activeGC for * menu. */ GC disabledGC; /* Used to produce disabled effect for entry. * NULL means use overall disabledGC from menu * structure. See comments for disabledFg in * menu structure for more information. */ GC indicatorGC; /* For drawing indicators. NULL means use GC * from menu. */ /* * Miscellaneous fields. */ int entryFlags; /* Various flags. See below for |
︙ | ︙ | |||
336 337 338 339 340 341 342 | * off. If this is NULL, a default scheme will * be used to generate a title for tearoff. */ Tcl_Obj *tearoffCommandPtr; /* If non-NULL, points to a command to run * whenever the menu is torn-off. */ Tcl_Obj *takeFocusPtr; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ | | | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | * off. If this is NULL, a default scheme will * be used to generate a title for tearoff. */ Tcl_Obj *tearoffCommandPtr; /* If non-NULL, points to a command to run * whenever the menu is torn-off. */ Tcl_Obj *takeFocusPtr; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ Tcl_Obj *cursorPtr; /* Current cursor for window, or NULL. */ Tcl_Obj *postCommandPtr; /* Used to detect cycles in cascade hierarchy * trees when preprocessing postcommands on * some platforms. See PostMenu for more * details. */ int postCommandGeneration; /* Need to do pre-invocation post command * traversal. */ int menuFlags; /* Flags for use by X; see below for |
︙ | ︙ |
Changes to generic/tkMenuDraw.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 | *---------------------------------------------------------------------- */ void TkMenuInitializeDrawingFields( TkMenu *menuPtr) /* The menu we are initializing. */ { | | | | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | *---------------------------------------------------------------------- */ void TkMenuInitializeDrawingFields( TkMenu *menuPtr) /* The menu we are initializing. */ { menuPtr->textGC = NULL; menuPtr->gray = None; menuPtr->disabledGC = NULL; menuPtr->activeGC = NULL; menuPtr->indicatorGC = NULL; menuPtr->disabledImageGC = NULL; menuPtr->totalWidth = menuPtr->totalHeight = 0; } /* *---------------------------------------------------------------------- * * TkMenuInitializeEntryDrawingFields -- |
︙ | ︙ | |||
75 76 77 78 79 80 81 | { mePtr->width = 0; mePtr->height = 0; mePtr->x = 0; mePtr->y = 0; mePtr->indicatorSpace = 0; mePtr->labelWidth = 0; | | | | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | { mePtr->width = 0; mePtr->height = 0; mePtr->x = 0; mePtr->y = 0; mePtr->indicatorSpace = 0; mePtr->labelWidth = 0; mePtr->textGC = NULL; mePtr->activeGC = NULL; mePtr->disabledGC = NULL; mePtr->indicatorGC = NULL; } /* *---------------------------------------------------------------------- * * TkMenuFreeDrawOptions -- * |
︙ | ︙ | |||
102 103 104 105 106 107 108 | *---------------------------------------------------------------------- */ void TkMenuFreeDrawOptions( TkMenu *menuPtr) { | | | | | | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | *---------------------------------------------------------------------- */ void TkMenuFreeDrawOptions( TkMenu *menuPtr) { if (menuPtr->textGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->textGC); } if (menuPtr->disabledImageGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->disabledImageGC); } if (menuPtr->gray != None) { Tk_FreeBitmap(menuPtr->display, menuPtr->gray); } if (menuPtr->disabledGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->disabledGC); } if (menuPtr->activeGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->activeGC); } if (menuPtr->indicatorGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->indicatorGC); } } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
143 144 145 146 147 148 149 | *---------------------------------------------------------------------- */ void TkMenuEntryFreeDrawOptions( TkMenuEntry *mePtr) { | | | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | *---------------------------------------------------------------------- */ void TkMenuEntryFreeDrawOptions( TkMenuEntry *mePtr) { if (mePtr->textGC != NULL) { Tk_FreeGC(mePtr->menuPtr->display, mePtr->textGC); } if (mePtr->disabledGC != NULL) { Tk_FreeGC(mePtr->menuPtr->display, mePtr->disabledGC); } if (mePtr->activeGC != NULL) { Tk_FreeGC(mePtr->menuPtr->display, mePtr->activeGC); } if (mePtr->indicatorGC != NULL) { Tk_FreeGC(mePtr->menuPtr->display, mePtr->indicatorGC); } } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
201 202 203 204 205 206 207 | tkfont = Tk_GetFontFromObj(menuPtr->tkwin, menuPtr->fontPtr); gcValues.font = Tk_FontId(tkfont); fg = Tk_GetColorFromObj(menuPtr->tkwin, menuPtr->fgPtr); gcValues.foreground = fg->pixel; gcValues.background = Tk_3DBorderColor(border)->pixel; newGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont, &gcValues); | | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | tkfont = Tk_GetFontFromObj(menuPtr->tkwin, menuPtr->fontPtr); gcValues.font = Tk_FontId(tkfont); fg = Tk_GetColorFromObj(menuPtr->tkwin, menuPtr->fgPtr); gcValues.foreground = fg->pixel; gcValues.background = Tk_3DBorderColor(border)->pixel; newGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont, &gcValues); if (menuPtr->textGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->textGC); } menuPtr->textGC = newGC; gcValues.font = Tk_FontId(tkfont); gcValues.background = Tk_3DBorderColor(border)->pixel; if (menuPtr->disabledFgPtr != NULL) { |
︙ | ︙ | |||
229 230 231 232 233 234 235 | if (menuPtr->gray != None) { gcValues.fill_style = FillStippled; gcValues.stipple = menuPtr->gray; mask = GCForeground|GCFillStyle|GCStipple; } } newGC = Tk_GetGC(menuPtr->tkwin, mask, &gcValues); | | | | | | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | if (menuPtr->gray != None) { gcValues.fill_style = FillStippled; gcValues.stipple = menuPtr->gray; mask = GCForeground|GCFillStyle|GCStipple; } } newGC = Tk_GetGC(menuPtr->tkwin, mask, &gcValues); if (menuPtr->disabledGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->disabledGC); } menuPtr->disabledGC = newGC; gcValues.foreground = Tk_3DBorderColor(border)->pixel; if (menuPtr->gray == None) { menuPtr->gray = Tk_GetBitmap(menuPtr->interp, menuPtr->tkwin, "gray50"); } if (menuPtr->gray != None) { gcValues.fill_style = FillStippled; gcValues.stipple = menuPtr->gray; newGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCFillStyle|GCStipple, &gcValues); } if (menuPtr->disabledImageGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->disabledImageGC); } menuPtr->disabledImageGC = newGC; gcValues.font = Tk_FontId(tkfont); activeFg = Tk_GetColorFromObj(menuPtr->tkwin, menuPtr->activeFgPtr); gcValues.foreground = activeFg->pixel; activeBorder = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->activeBorderPtr); gcValues.background = Tk_3DBorderColor(activeBorder)->pixel; newGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont, &gcValues); if (menuPtr->activeGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->activeGC); } menuPtr->activeGC = newGC; indicatorFg = Tk_GetColorFromObj(menuPtr->tkwin, menuPtr->indicatorFgPtr); gcValues.foreground = indicatorFg->pixel; gcValues.background = Tk_3DBorderColor(border)->pixel; newGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont, &gcValues); if (menuPtr->indicatorGC != NULL) { Tk_FreeGC(menuPtr->display, menuPtr->indicatorGC); } menuPtr->indicatorGC = newGC; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
381 382 383 384 385 386 387 | gcValues.foreground = activeFg->pixel; gcValues.background = Tk_3DBorderColor(activeBorder)->pixel; newActiveGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont|GCGraphicsExposures, &gcValues); } else { | | | | | | | | | | 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 | gcValues.foreground = activeFg->pixel; gcValues.background = Tk_3DBorderColor(activeBorder)->pixel; newActiveGC = Tk_GetGC(menuPtr->tkwin, GCForeground|GCBackground|GCFont|GCGraphicsExposures, &gcValues); } else { newGC = NULL; newActiveGC = NULL; newDisabledGC = NULL; newIndicatorGC = NULL; } if (mePtr->textGC != NULL) { Tk_FreeGC(menuPtr->display, mePtr->textGC); } mePtr->textGC = newGC; if (mePtr->activeGC != NULL) { Tk_FreeGC(menuPtr->display, mePtr->activeGC); } mePtr->activeGC = newActiveGC; if (mePtr->disabledGC != NULL) { Tk_FreeGC(menuPtr->display, mePtr->disabledGC); } mePtr->disabledGC = newDisabledGC; if (mePtr->indicatorGC != NULL) { Tk_FreeGC(menuPtr->display, mePtr->indicatorGC); } mePtr->indicatorGC = newIndicatorGC; return TCL_OK; } /* |
︙ | ︙ |
Changes to generic/tkMenubutton.c.
︙ | ︙ | |||
275 276 277 278 279 280 281 | mbPtr->highlightBgColorPtr = NULL; mbPtr->highlightColorPtr = NULL; mbPtr->inset = 0; mbPtr->tkfont = NULL; mbPtr->normalFg = NULL; mbPtr->activeFg = NULL; mbPtr->disabledFg = NULL; | | | | | | | 275 276 277 278 279 280 281 282 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 | mbPtr->highlightBgColorPtr = NULL; mbPtr->highlightColorPtr = NULL; mbPtr->inset = 0; mbPtr->tkfont = NULL; mbPtr->normalFg = NULL; mbPtr->activeFg = NULL; mbPtr->disabledFg = NULL; mbPtr->normalTextGC = NULL; mbPtr->activeTextGC = NULL; mbPtr->gray = None; mbPtr->disabledGC = NULL; mbPtr->stippleGC = NULL; mbPtr->leftBearing = 0; mbPtr->rightBearing = 0; mbPtr->widthString = NULL; mbPtr->heightString = NULL; mbPtr->width = 0; mbPtr->width = 0; mbPtr->wrapLength = 0; mbPtr->padX = 0; mbPtr->padY = 0; mbPtr->anchor = TK_ANCHOR_CENTER; mbPtr->justify = TK_JUSTIFY_CENTER; mbPtr->textLayout = NULL; mbPtr->indicatorOn = 0; mbPtr->indicatorWidth = 0; mbPtr->indicatorHeight = 0; mbPtr->direction = DIRECTION_FLUSH; mbPtr->cursor = NULL; mbPtr->takeFocus = NULL; mbPtr->flags = 0; Tk_CreateEventHandler(mbPtr->tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, MenuButtonEventProc, mbPtr); |
︙ | ︙ | |||
439 440 441 442 443 444 445 | Tcl_UntraceVar2(mbPtr->interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, MenuButtonTextVarProc, mbPtr); } if (mbPtr->image != NULL) { Tk_FreeImage(mbPtr->image); } | | | | | | 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 | Tcl_UntraceVar2(mbPtr->interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, MenuButtonTextVarProc, mbPtr); } if (mbPtr->image != NULL) { Tk_FreeImage(mbPtr->image); } if (mbPtr->normalTextGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->normalTextGC); } if (mbPtr->activeTextGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->activeTextGC); } if (mbPtr->disabledGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->disabledGC); } if (mbPtr->stippleGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->stippleGC); } if (mbPtr->gray != None) { Tk_FreeBitmap(mbPtr->display, mbPtr->gray); } if (mbPtr->textLayout != NULL) { Tk_FreeTextLayout(mbPtr->textLayout); |
︙ | ︙ | |||
686 687 688 689 690 691 692 | * to copy stuff from an off-screen pixmap onto the screen (we know that * there's no problem with obscured areas). */ gcValues.graphics_exposures = False; mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; gc = Tk_GetGC(mbPtr->tkwin, mask, &gcValues); | | | | | 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 | * to copy stuff from an off-screen pixmap onto the screen (we know that * there's no problem with obscured areas). */ gcValues.graphics_exposures = False; mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; gc = Tk_GetGC(mbPtr->tkwin, mask, &gcValues); if (mbPtr->normalTextGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->normalTextGC); } mbPtr->normalTextGC = gc; gcValues.foreground = mbPtr->activeFg->pixel; gcValues.background = Tk_3DBorderColor(mbPtr->activeBorder)->pixel; mask = GCForeground | GCBackground | GCFont; gc = Tk_GetGC(mbPtr->tkwin, mask, &gcValues); if (mbPtr->activeTextGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->activeTextGC); } mbPtr->activeTextGC = gc; gcValues.background = Tk_3DBorderColor(mbPtr->normalBorder)->pixel; /* * Create the GC that can be used for stippling */ if (mbPtr->stippleGC == NULL) { gcValues.foreground = gcValues.background; mask = GCForeground; if (mbPtr->gray == None) { mbPtr->gray = Tk_GetBitmap(NULL, mbPtr->tkwin, "gray50"); } if (mbPtr->gray != None) { gcValues.fill_style = FillStippled; |
︙ | ︙ | |||
732 733 734 735 736 737 738 | mask = GCForeground | GCBackground | GCFont; if (mbPtr->disabledFg != NULL) { gcValues.foreground = mbPtr->disabledFg->pixel; } else { gcValues.foreground = gcValues.background; } gc = Tk_GetGC(mbPtr->tkwin, mask, &gcValues); | | | 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 | mask = GCForeground | GCBackground | GCFont; if (mbPtr->disabledFg != NULL) { gcValues.foreground = mbPtr->disabledFg->pixel; } else { gcValues.foreground = gcValues.background; } gc = Tk_GetGC(mbPtr->tkwin, mask, &gcValues); if (mbPtr->disabledGC != NULL) { Tk_FreeGC(mbPtr->display, mbPtr->disabledGC); } mbPtr->disabledGC = gc; TkpComputeMenuButtonGeometry(mbPtr); /* |
︙ | ︙ |
Changes to generic/tkMenubutton.h.
︙ | ︙ | |||
166 167 168 169 170 171 172 | * the upper left corner of the menubutton is * where the menu pops up. "above" and "below" * will attempt to pop the menu compleletly * above or below the menu respectively. * "left" and "right" will pop the menu left * or right, and the active item will be next * to the button. */ | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | * the upper left corner of the menubutton is * where the menu pops up. "above" and "below" * will attempt to pop the menu compleletly * above or below the menu respectively. * "left" and "right" will pop the menu left * or right, and the active item will be next * to the button. */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ char *takeFocus; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ int flags; /* Various flags; see below for * definitions. */ } TkMenuButton; |
︙ | ︙ |
Changes to generic/tkMessage.c.
︙ | ︙ | |||
252 253 254 255 256 257 258 | msgPtr->display = Tk_Display(tkwin); msgPtr->interp = interp; msgPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(msgPtr->tkwin), MessageWidgetObjCmd, msgPtr, MessageCmdDeletedProc); msgPtr->optionTable = optionTable; msgPtr->relief = TK_RELIEF_FLAT; | | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | msgPtr->display = Tk_Display(tkwin); msgPtr->interp = interp; msgPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(msgPtr->tkwin), MessageWidgetObjCmd, msgPtr, MessageCmdDeletedProc); msgPtr->optionTable = optionTable; msgPtr->relief = TK_RELIEF_FLAT; msgPtr->textGC = NULL; msgPtr->anchor = TK_ANCHOR_CENTER; msgPtr->aspect = 150; msgPtr->justify = TK_JUSTIFY_LEFT; msgPtr->cursor = NULL; Tk_SetClass(msgPtr->tkwin, "Message"); Tk_SetClassProcs(msgPtr->tkwin, &messageClass, msgPtr); Tk_CreateEventHandler(msgPtr->tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, MessageEventProc, msgPtr); if (Tk_InitOptions(interp, (char *)msgPtr, optionTable, tkwin) != TCL_OK) { |
︙ | ︙ | |||
394 395 396 397 398 399 400 | } /* * Free up all the stuff that requires special handling, then let * Tk_FreeConfigOptions handle all the standard option-related stuff. */ | | | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | } /* * Free up all the stuff that requires special handling, then let * Tk_FreeConfigOptions handle all the standard option-related stuff. */ if (msgPtr->textGC != NULL) { Tk_FreeGC(msgPtr->display, msgPtr->textGC); } if (msgPtr->textLayout != NULL) { Tk_FreeTextLayout(msgPtr->textLayout); } if (msgPtr->textVarName != NULL) { Tcl_UntraceVar2(msgPtr->interp, msgPtr->textVarName, NULL, |
︙ | ︙ | |||
521 522 523 524 525 526 527 | */ static void MessageWorldChanged( ClientData instanceData) /* Information about widget. */ { XGCValues gcValues; | | | | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 | */ static void MessageWorldChanged( ClientData instanceData) /* Information about widget. */ { XGCValues gcValues; GC gc = NULL; Tk_FontMetrics fm; Message *msgPtr = instanceData; if (msgPtr->border != NULL) { Tk_SetBackgroundFromBorder(msgPtr->tkwin, msgPtr->border); } gcValues.font = Tk_FontId(msgPtr->tkfont); gcValues.foreground = msgPtr->fgColorPtr->pixel; gc = Tk_GetGC(msgPtr->tkwin, GCForeground | GCFont, &gcValues); if (msgPtr->textGC != NULL) { Tk_FreeGC(msgPtr->display, msgPtr->textGC); } msgPtr->textGC = gc; Tk_GetFontMetrics(msgPtr->tkfont, &fm); if (msgPtr->padX < 0) { msgPtr->padX = fm.ascent / 2; |
︙ | ︙ |
Changes to generic/tkOldConfig.c.
︙ | ︙ | |||
473 474 475 476 477 478 479 | } break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: { Tk_Cursor newCursor, oldCursor; if (nullValue) { | | | | | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 | } break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: { Tk_Cursor newCursor, oldCursor; if (nullValue) { newCursor = NULL; } else { uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value); newCursor = Tk_GetCursor(interp, tkwin, uid); if (newCursor == NULL) { return TCL_ERROR; } } oldCursor = *((Tk_Cursor *) ptr); if (oldCursor != NULL) { Tk_FreeCursor(Tk_Display(tkwin), oldCursor); } *((Tk_Cursor *) ptr) = newCursor; if (specPtr->type == TK_CONFIG_ACTIVE_CURSOR) { Tk_DefineCursor(tkwin, newCursor); } break; |
︙ | ︙ | |||
833 834 835 836 837 838 839 | case TK_CONFIG_RELIEF: result = Tk_NameOfRelief(*((int *) ptr)); break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: { Tk_Cursor cursor = *((Tk_Cursor *) ptr); | | | 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 | case TK_CONFIG_RELIEF: result = Tk_NameOfRelief(*((int *) ptr)); break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: { Tk_Cursor cursor = *((Tk_Cursor *) ptr); if (cursor != NULL) { result = Tk_NameOfCursor(Tk_Display(tkwin), cursor); } break; } case TK_CONFIG_JUSTIFY: result = Tk_NameOfJustify(*((Tk_Justify *) ptr)); break; |
︙ | ︙ | |||
1018 1019 1020 1021 1022 1023 1024 | if (*((Tk_3DBorder *) ptr) != NULL) { Tk_Free3DBorder(*((Tk_3DBorder *) ptr)); *((Tk_3DBorder *) ptr) = NULL; } break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: | | | | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | if (*((Tk_3DBorder *) ptr) != NULL) { Tk_Free3DBorder(*((Tk_3DBorder *) ptr)); *((Tk_3DBorder *) ptr) = NULL; } break; case TK_CONFIG_CURSOR: case TK_CONFIG_ACTIVE_CURSOR: if (*((Tk_Cursor *) ptr) != NULL) { Tk_FreeCursor(display, *((Tk_Cursor *) ptr)); *((Tk_Cursor *) ptr) = NULL; } } } } /* *-------------------------------------------------------------- |
︙ | ︙ |
Changes to generic/tkPanedWindow.c.
︙ | ︙ | |||
444 445 446 447 448 449 450 | pwPtr->interp = interp; pwPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(pwPtr->tkwin), PanedWindowWidgetObjCmd, pwPtr, PanedWindowCmdDeletedProc); pwPtr->optionTable = pwOpts->pwOptions; pwPtr->slaveOpts = pwOpts->slaveOpts; pwPtr->relief = TK_RELIEF_RAISED; | | | | | 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | pwPtr->interp = interp; pwPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(pwPtr->tkwin), PanedWindowWidgetObjCmd, pwPtr, PanedWindowCmdDeletedProc); pwPtr->optionTable = pwOpts->pwOptions; pwPtr->slaveOpts = pwOpts->slaveOpts; pwPtr->relief = TK_RELIEF_RAISED; pwPtr->gc = NULL; pwPtr->cursor = NULL; pwPtr->sashCursor = NULL; /* * Keep a hold of the associated tkwin until we destroy the widget, * otherwise Tk might free it while we still need it. */ Tcl_Preserve(pwPtr->tkwin); |
︙ | ︙ | |||
858 859 860 861 862 863 864 | * If either -after or -before was given, find the numerical index that * corresponds to the given window. If both -after and -before are given, * the option precedence is: -after, then -before. */ index = -1; haveLoc = 0; | | | | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 | * If either -after or -before was given, find the numerical index that * corresponds to the given window. If both -after and -before are given, * the option precedence is: -after, then -before. */ index = -1; haveLoc = 0; if (options.after != NULL) { tkwin = options.after; haveLoc = 1; for (i = 0; i < pwPtr->numSlaves; i++) { if (options.after == pwPtr->slaves[i]->tkwin) { index = i + 1; break; } } } else if (options.before != NULL) { tkwin = options.before; haveLoc = 1; for (i = 0; i < pwPtr->numSlaves; i++) { if (options.before == pwPtr->slaves[i]->tkwin) { index = i; break; } |
︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 | /* * Allocated a graphics context for drawing the paned window widget * elements (background, sashes, etc.) and set the window background. */ gcValues.background = Tk_3DBorderColor(pwPtr->background)->pixel; newGC = Tk_GetGC(pwPtr->tkwin, GCBackground, &gcValues); | | | 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 | /* * Allocated a graphics context for drawing the paned window widget * elements (background, sashes, etc.) and set the window background. */ gcValues.background = Tk_3DBorderColor(pwPtr->background)->pixel; newGC = Tk_GetGC(pwPtr->tkwin, GCBackground, &gcValues); if (pwPtr->gc != NULL) { Tk_FreeGC(pwPtr->display, pwPtr->gc); } pwPtr->gc = newGC; Tk_SetWindowBackground(pwPtr->tkwin, gcValues.background); /* * Issue geometry size requests to Tk. |
︙ | ︙ | |||
2040 2041 2042 2043 2044 2045 2046 | /* * Clean out any -after or -before references to this slave */ for (i = 0; i < masterPtr->numSlaves; i++) { if (masterPtr->slaves[i]->before == slavePtr->tkwin) { | | | | 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 | /* * Clean out any -after or -before references to this slave */ for (i = 0; i < masterPtr->numSlaves; i++) { if (masterPtr->slaves[i]->before == slavePtr->tkwin) { masterPtr->slaves[i]->before = NULL; } if (masterPtr->slaves[i]->after == slavePtr->tkwin) { masterPtr->slaves[i]->after = NULL; } } masterPtr->flags |= REQUESTED_RELAYOUT; if (!(masterPtr->flags & REDRAW_PENDING)) { masterPtr->flags |= REDRAW_PENDING; Tcl_DoWhenIdle(DisplayPanedWindow, masterPtr); |
︙ | ︙ |
Changes to generic/tkPlace.c.
︙ | ︙ | |||
391 392 393 394 395 396 397 | * No preexisting slave structure for that window, so make a new one and * populate it with some default values. */ slavePtr = ckalloc(sizeof(Slave)); memset(slavePtr, 0, sizeof(Slave)); slavePtr->tkwin = tkwin; | | | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 | * No preexisting slave structure for that window, so make a new one and * populate it with some default values. */ slavePtr = ckalloc(sizeof(Slave)); memset(slavePtr, 0, sizeof(Slave)); slavePtr->tkwin = tkwin; slavePtr->inTkwin = NULL; slavePtr->anchor = TK_ANCHOR_NW; slavePtr->borderMode = BM_INSIDE; slavePtr->optionTable = table; Tcl_SetHashValue(hPtr, slavePtr); Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc, slavePtr); return slavePtr; |
︙ | ︙ |
Changes to generic/tkRectOval.c.
︙ | ︙ | |||
254 255 256 257 258 259 260 | rectOvalPtr->tsoffset.yoffset = 0; rectOvalPtr->fillColor = NULL; rectOvalPtr->activeFillColor = NULL; rectOvalPtr->disabledFillColor = NULL; rectOvalPtr->fillStipple = None; rectOvalPtr->activeFillStipple = None; rectOvalPtr->disabledFillStipple = None; | | | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | rectOvalPtr->tsoffset.yoffset = 0; rectOvalPtr->fillColor = NULL; rectOvalPtr->activeFillColor = NULL; rectOvalPtr->disabledFillColor = NULL; rectOvalPtr->fillStipple = None; rectOvalPtr->activeFillStipple = None; rectOvalPtr->disabledFillStipple = None; rectOvalPtr->fillGC = NULL; /* * Process the arguments to fill in the item record. */ for (i = 1; i < objc; i++) { const char *arg = Tcl_GetString(objv[i]); |
︙ | ︙ | |||
462 463 464 465 466 467 468 | if (mask && \ rectOvalPtr->outline.width != 0 && \ rectOvalPtr->outline.color != NULL) { gcValues.cap_style = CapProjecting; mask |= GCCapStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { | | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 | if (mask && \ rectOvalPtr->outline.width != 0 && \ rectOvalPtr->outline.color != NULL) { gcValues.cap_style = CapProjecting; mask |= GCCapStyle; newGC = Tk_GetGC(tkwin, mask, &gcValues); } else { newGC = NULL; } if (rectOvalPtr->outline.gc != NULL) { Tk_FreeGC(Tk_Display(tkwin), rectOvalPtr->outline.gc); } rectOvalPtr->outline.gc = newGC; if (state == TK_STATE_NULL) { state = Canvas(canvas)->canvas_state; } |
︙ | ︙ | |||
496 497 498 499 500 501 502 | } if (rectOvalPtr->disabledFillStipple!=None) { stipple = rectOvalPtr->disabledFillStipple; } } if (color == NULL) { | | | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | } if (rectOvalPtr->disabledFillStipple!=None) { stipple = rectOvalPtr->disabledFillStipple; } } if (color == NULL) { newGC = NULL; } else { gcValues.foreground = color->pixel; if (stipple != None) { gcValues.stipple = stipple; gcValues.fill_style = FillStippled; mask = GCForeground|GCStipple|GCFillStyle; } else { |
︙ | ︙ | |||
518 519 520 521 522 523 524 | gcValues.line_width = rectOvalPtr->outline.gc != None ? rectOvalPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif newGC = Tk_GetGC(tkwin, mask, &gcValues); } | | | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 | gcValues.line_width = rectOvalPtr->outline.gc != None ? rectOvalPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif newGC = Tk_GetGC(tkwin, mask, &gcValues); } if (rectOvalPtr->fillGC != NULL) { Tk_FreeGC(Tk_Display(tkwin), rectOvalPtr->fillGC); } rectOvalPtr->fillGC = newGC; tsoffset = &rectOvalPtr->tsoffset; flags = tsoffset->flags; if (flags & TK_OFFSET_LEFT) { |
︙ | ︙ | |||
591 592 593 594 595 596 597 | } if (rectOvalPtr->activeFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->activeFillStipple); } if (rectOvalPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->disabledFillStipple); } | | | 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 | } if (rectOvalPtr->activeFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->activeFillStipple); } if (rectOvalPtr->disabledFillStipple != None) { Tk_FreeBitmap(display, rectOvalPtr->disabledFillStipple); } if (rectOvalPtr->fillGC != NULL) { Tk_FreeGC(display, rectOvalPtr->fillGC); } } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
660 661 662 663 664 665 666 | if (rectOvalPtr->bbox[0] > rectOvalPtr->bbox[2]) { double tmpX = rectOvalPtr->bbox[2]; rectOvalPtr->bbox[2] = rectOvalPtr->bbox[0]; rectOvalPtr->bbox[0] = tmpX; } | | | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 | if (rectOvalPtr->bbox[0] > rectOvalPtr->bbox[2]) { double tmpX = rectOvalPtr->bbox[2]; rectOvalPtr->bbox[2] = rectOvalPtr->bbox[0]; rectOvalPtr->bbox[0] = tmpX; } if (rectOvalPtr->outline.gc == NULL) { /* * The Win32 switch was added for 8.3 to solve a problem with ovals * leaving traces on bottom and right of 1 pixel. This may not be the * correct place to solve it, but it works. */ #ifdef _WIN32 |
︙ | ︙ | |||
874 875 876 877 878 879 880 | } } else if (state == TK_STATE_DISABLED) { if (rectOvalPtr->disabledFillStipple != None) { fillStipple = rectOvalPtr->disabledFillStipple; } } | | | 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 | } } else if (state == TK_STATE_DISABLED) { if (rectOvalPtr->disabledFillStipple != None) { fillStipple = rectOvalPtr->disabledFillStipple; } } if (rectOvalPtr->fillGC != NULL) { if (fillStipple != None) { Tk_TSOffset *tsoffset; int w = 0, h = 0; tsoffset = &rectOvalPtr->tsoffset; if (tsoffset) { int flags = tsoffset->flags; |
︙ | ︙ | |||
918 919 920 921 922 923 924 | 0, 360*64); } if (fillStipple != None) { XSetTSOrigin(display, rectOvalPtr->fillGC, 0, 0); } } | | | 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 | 0, 360*64); } if (fillStipple != None) { XSetTSOrigin(display, rectOvalPtr->fillGC, 0, 0); } } if (rectOvalPtr->outline.gc != NULL) { Tk_ChangeOutlineGC(canvas, itemPtr, &(rectOvalPtr->outline)); if (rectOvalPtr->header.typePtr == &tkRectangleType) { XDrawRectangle(display, drawable, rectOvalPtr->outline.gc, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1)); } else { XDrawArc(display, drawable, rectOvalPtr->outline.gc, x1, y1, (unsigned) (x2-x1), (unsigned) (y2-y1), 0, 360*64); |
︙ | ︙ | |||
989 990 991 992 993 994 995 | * there is one. */ x1 = rectPtr->bbox[0]; y1 = rectPtr->bbox[1]; x2 = rectPtr->bbox[2]; y2 = rectPtr->bbox[3]; | | | | 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 | * there is one. */ x1 = rectPtr->bbox[0]; y1 = rectPtr->bbox[1]; x2 = rectPtr->bbox[2]; y2 = rectPtr->bbox[3]; if (rectPtr->outline.gc != NULL) { inc = width/2.0; x1 -= inc; y1 -= inc; x2 += inc; y2 += inc; } /* * If the point is inside the rectangle, handle specially: distance is 0 * if rectangle is filled, otherwise compute distance to nearest edge of * rectangle and subtract width of edge. */ if ((pointPtr[0] >= x1) && (pointPtr[0] < x2) && (pointPtr[1] >= y1) && (pointPtr[1] < y2)) { if ((rectPtr->fillGC != NULL) || (rectPtr->outline.gc == NULL)) { return 0.0; } xDiff = pointPtr[0] - x1; tmp = x2 - pointPtr[0]; if (tmp < xDiff) { xDiff = tmp; } |
︙ | ︙ | |||
1101 1102 1103 1104 1105 1106 1107 | } else if (state == TK_STATE_DISABLED) { if (ovalPtr->outline.disabledWidth>0) { width = (double) ovalPtr->outline.disabledWidth; } } | | | | 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 | } else if (state == TK_STATE_DISABLED) { if (ovalPtr->outline.disabledWidth>0) { width = (double) ovalPtr->outline.disabledWidth; } } filled = ovalPtr->fillGC != NULL; if (ovalPtr->outline.gc == NULL) { width = 0.0; filled = 1; } return TkOvalToPoint(ovalPtr->bbox, width, filled, pointPtr); } /* |
︙ | ︙ | |||
1157 1158 1159 1160 1161 1162 1163 | } else if (state == TK_STATE_DISABLED) { if (rectPtr->outline.disabledWidth > 0) { width = rectPtr->outline.disabledWidth; } } halfWidth = width/2.0; | | | | 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 | } else if (state == TK_STATE_DISABLED) { if (rectPtr->outline.disabledWidth > 0) { width = rectPtr->outline.disabledWidth; } } halfWidth = width/2.0; if (rectPtr->outline.gc == NULL) { halfWidth = 0.0; } if ((areaPtr[2] <= (rectPtr->bbox[0] - halfWidth)) || (areaPtr[0] >= (rectPtr->bbox[2] + halfWidth)) || (areaPtr[3] <= (rectPtr->bbox[1] - halfWidth)) || (areaPtr[1] >= (rectPtr->bbox[3] + halfWidth))) { return -1; } if ((rectPtr->fillGC == NULL) && (rectPtr->outline.gc != NULL) && (areaPtr[0] >= (rectPtr->bbox[0] + halfWidth)) && (areaPtr[1] >= (rectPtr->bbox[1] + halfWidth)) && (areaPtr[2] <= (rectPtr->bbox[2] - halfWidth)) && (areaPtr[3] <= (rectPtr->bbox[3] - halfWidth))) { return -1; } if ((areaPtr[0] <= (rectPtr->bbox[0] - halfWidth)) |
︙ | ︙ | |||
1235 1236 1237 1238 1239 1240 1241 | } /* * Expand the oval to include the width of the outline, if any. */ halfWidth = width/2.0; | | | | | 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 | } /* * Expand the oval to include the width of the outline, if any. */ halfWidth = width/2.0; if (ovalPtr->outline.gc == NULL) { halfWidth = 0.0; } oval[0] = ovalPtr->bbox[0] - halfWidth; oval[1] = ovalPtr->bbox[1] - halfWidth; oval[2] = ovalPtr->bbox[2] + halfWidth; oval[3] = ovalPtr->bbox[3] + halfWidth; result = TkOvalToArea(oval, areaPtr); /* * If the rectangle appears to overlap the oval and the oval isn't filled, * do one more check to see if perhaps all four of the rectangle's corners * are totally inside the oval's unfilled center, in which case we should * return "outside". */ if ((result == 0) && (ovalPtr->outline.gc != NULL) && (ovalPtr->fillGC == NULL)) { double centerX, centerY, height; double xDelta1, yDelta1, xDelta2, yDelta2; centerX = (ovalPtr->bbox[0] + ovalPtr->bbox[2])/2.0; centerY = (ovalPtr->bbox[1] + ovalPtr->bbox[3])/2.0; width = (ovalPtr->bbox[2] - ovalPtr->bbox[0])/2.0 - halfWidth; height = (ovalPtr->bbox[3] - ovalPtr->bbox[1])/2.0 - halfWidth; |
︙ | ︙ |
Changes to generic/tkScale.c.
︙ | ︙ | |||
266 267 268 269 270 271 272 | scalePtr->labelLength = 0; scalePtr->state = STATE_NORMAL; scalePtr->borderWidth = 0; scalePtr->bgBorder = NULL; scalePtr->activeBorder = NULL; scalePtr->sliderRelief = TK_RELIEF_RAISED; scalePtr->troughColorPtr = NULL; | | | | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | scalePtr->labelLength = 0; scalePtr->state = STATE_NORMAL; scalePtr->borderWidth = 0; scalePtr->bgBorder = NULL; scalePtr->activeBorder = NULL; scalePtr->sliderRelief = TK_RELIEF_RAISED; scalePtr->troughColorPtr = NULL; scalePtr->troughGC = NULL; scalePtr->copyGC = NULL; scalePtr->tkfont = NULL; scalePtr->textColorPtr = NULL; scalePtr->textGC = NULL; scalePtr->relief = TK_RELIEF_FLAT; scalePtr->highlightWidth = 0; scalePtr->highlightBorder = NULL; scalePtr->highlightColorPtr = NULL; scalePtr->inset = 0; scalePtr->sliderLength = 0; scalePtr->showValue = 0; scalePtr->horizLabelY = 0; scalePtr->horizValueY = 0; scalePtr->horizTroughY = 0; scalePtr->horizTickY = 0; scalePtr->vertTickRightX = 0; scalePtr->vertValueRightX = 0; scalePtr->vertTroughX = 0; scalePtr->vertLabelX = 0; scalePtr->fontHeight = 0; scalePtr->cursor = NULL; scalePtr->takeFocusPtr = NULL; scalePtr->flags = NEVER_SET; Tk_SetClassProcs(scalePtr->tkwin, &scaleClass, scalePtr); Tk_CreateEventHandler(scalePtr->tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, ScaleEventProc, scalePtr); |
︙ | ︙ | |||
514 515 516 517 518 519 520 | */ if (scalePtr->varNamePtr != NULL) { Tcl_UntraceVar2(scalePtr->interp, Tcl_GetString(scalePtr->varNamePtr), NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, ScaleVarProc, scalePtr); } | | | | | 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | */ if (scalePtr->varNamePtr != NULL) { Tcl_UntraceVar2(scalePtr->interp, Tcl_GetString(scalePtr->varNamePtr), NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, ScaleVarProc, scalePtr); } if (scalePtr->troughGC != NULL) { Tk_FreeGC(scalePtr->display, scalePtr->troughGC); } if (scalePtr->copyGC != NULL) { Tk_FreeGC(scalePtr->display, scalePtr->copyGC); } if (scalePtr->textGC != NULL) { Tk_FreeGC(scalePtr->display, scalePtr->textGC); } Tk_FreeConfigOptions((char *) scalePtr, scalePtr->optionTable, scalePtr->tkwin); scalePtr->tkwin = NULL; TkpDestroyScale(scalePtr); } |
︙ | ︙ | |||
725 726 727 728 729 730 731 | { XGCValues gcValues; GC gc; TkScale *scalePtr = instanceData; gcValues.foreground = scalePtr->troughColorPtr->pixel; gc = Tk_GetGC(scalePtr->tkwin, GCForeground, &gcValues); | | | | | 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 | { XGCValues gcValues; GC gc; TkScale *scalePtr = instanceData; gcValues.foreground = scalePtr->troughColorPtr->pixel; gc = Tk_GetGC(scalePtr->tkwin, GCForeground, &gcValues); if (scalePtr->troughGC != NULL) { Tk_FreeGC(scalePtr->display, scalePtr->troughGC); } scalePtr->troughGC = gc; gcValues.font = Tk_FontId(scalePtr->tkfont); gcValues.foreground = scalePtr->textColorPtr->pixel; gc = Tk_GetGC(scalePtr->tkwin, GCForeground | GCFont, &gcValues); if (scalePtr->textGC != NULL) { Tk_FreeGC(scalePtr->display, scalePtr->textGC); } scalePtr->textGC = gc; if (scalePtr->copyGC == NULL) { gcValues.graphics_exposures = False; scalePtr->copyGC = Tk_GetGC(scalePtr->tkwin, GCGraphicsExposures, &gcValues); } scalePtr->inset = scalePtr->highlightWidth + scalePtr->borderWidth; /* |
︙ | ︙ |
Changes to generic/tkScale.h.
︙ | ︙ | |||
147 148 149 150 151 152 153 | int vertLabelX; /* X-location of origin of label. */ /* * Miscellaneous information: */ int fontHeight; /* Height of scale font. */ | | | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | int vertLabelX; /* X-location of origin of label. */ /* * Miscellaneous information: */ int fontHeight; /* Height of scale font. */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ Tcl_Obj *takeFocusPtr; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. May be NULL. */ int flags; /* Various flags; see below for * definitions. */ } TkScale; |
︙ | ︙ |
Changes to generic/tkScrollbar.c.
︙ | ︙ | |||
181 182 183 184 185 186 187 | scrollPtr->activeRelief = TK_RELIEF_RAISED; scrollPtr->totalUnits = 0; scrollPtr->windowUnits = 0; scrollPtr->firstUnit = 0; scrollPtr->lastUnit = 0; scrollPtr->firstFraction = 0.0; scrollPtr->lastFraction = 0.0; | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | scrollPtr->activeRelief = TK_RELIEF_RAISED; scrollPtr->totalUnits = 0; scrollPtr->windowUnits = 0; scrollPtr->firstUnit = 0; scrollPtr->lastUnit = 0; scrollPtr->firstFraction = 0.0; scrollPtr->lastFraction = 0.0; scrollPtr->cursor = NULL; scrollPtr->takeFocus = NULL; scrollPtr->flags = 0; if (ConfigureScrollbar(interp, scrollPtr, objc-2, objv+2, 0) != TCL_OK) { Tk_DestroyWindow(scrollPtr->tkwin); return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/tkScrollbar.h.
︙ | ︙ | |||
115 116 117 118 119 120 121 | * specified as a fraction between 0 and * 1.0. */ /* * Miscellaneous information: */ | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | * specified as a fraction between 0 and * 1.0. */ /* * Miscellaneous information: */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ char *takeFocus; /* Value of -takefocus option; not used in the * C code, but used by keyboard traversal * scripts. Malloc'ed, but may be NULL. */ int flags; /* Various flags; see below for * definitions. */ } TkScrollbar; |
︙ | ︙ |
Changes to generic/tkSquare.c.
︙ | ︙ | |||
165 166 167 168 169 170 171 | squarePtr->tkwin = tkwin; squarePtr->display = Tk_Display(tkwin); squarePtr->interp = interp; squarePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(squarePtr->tkwin), SquareWidgetObjCmd, squarePtr, SquareDeletedProc); | | | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | squarePtr->tkwin = tkwin; squarePtr->display = Tk_Display(tkwin); squarePtr->interp = interp; squarePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(squarePtr->tkwin), SquareWidgetObjCmd, squarePtr, SquareDeletedProc); squarePtr->gc = NULL; squarePtr->optionTable = optionTable; if (Tk_InitOptions(interp, (char *) squarePtr, optionTable, tkwin) != TCL_OK) { Tk_DestroyWindow(squarePtr->tkwin); ckfree(squarePtr); return TCL_ERROR; |
︙ | ︙ |
Changes to generic/tkText.c.
︙ | ︙ | |||
582 583 584 585 586 587 588 | } else { textPtr->start = NULL; textPtr->end = NULL; } textPtr->state = TK_TEXT_STATE_NORMAL; textPtr->relief = TK_RELIEF_FLAT; | | | 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | } else { textPtr->start = NULL; textPtr->end = NULL; } textPtr->state = TK_TEXT_STATE_NORMAL; textPtr->relief = TK_RELIEF_FLAT; textPtr->cursor = NULL; textPtr->charWidth = 1; textPtr->charHeight = 10; textPtr->wrapMode = TEXT_WRAPMODE_CHAR; textPtr->prevWidth = Tk_Width(newWin); textPtr->prevHeight = Tk_Height(newWin); /* |
︙ | ︙ | |||
2273 2274 2275 2276 2277 2278 2279 | textPtr->selTagPtr->fgColor = textPtr->selFgColorPtr; } else { textPtr->selTagPtr->selFgColor = textPtr->selFgColorPtr; } textPtr->selTagPtr->affectsDisplay = 0; textPtr->selTagPtr->affectsDisplayGeometry = 0; if ((textPtr->selTagPtr->elideString != NULL) | | | 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 | textPtr->selTagPtr->fgColor = textPtr->selFgColorPtr; } else { textPtr->selTagPtr->selFgColor = textPtr->selFgColorPtr; } textPtr->selTagPtr->affectsDisplay = 0; textPtr->selTagPtr->affectsDisplayGeometry = 0; if ((textPtr->selTagPtr->elideString != NULL) || (textPtr->selTagPtr->tkfont != NULL) || (textPtr->selTagPtr->justifyString != NULL) || (textPtr->selTagPtr->lMargin1String != NULL) || (textPtr->selTagPtr->lMargin2String != NULL) || (textPtr->selTagPtr->offsetString != NULL) || (textPtr->selTagPtr->rMarginString != NULL) || (textPtr->selTagPtr->spacing1String != NULL) || (textPtr->selTagPtr->spacing2String != NULL) |
︙ | ︙ |
Changes to generic/tkText.h.
︙ | ︙ | |||
663 664 665 666 667 668 669 | int highlightWidth; /* Width in pixels of highlight to draw around * widget when it has the focus. <= 0 means * don't draw a highlight. */ XColor *highlightBgColorPtr; /* Color for drawing traversal highlight area * when highlight is off. */ XColor *highlightColorPtr; /* Color for drawing traversal highlight. */ | | | 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 | int highlightWidth; /* Width in pixels of highlight to draw around * widget when it has the focus. <= 0 means * don't draw a highlight. */ XColor *highlightBgColorPtr; /* Color for drawing traversal highlight area * when highlight is off. */ XColor *highlightColorPtr; /* Color for drawing traversal highlight. */ Tk_Cursor cursor; /* Current cursor for window, or NULL. */ XColor *fgColor; /* Default foreground color for text. */ Tk_Font tkfont; /* Default font for displaying text. */ int charWidth; /* Width of average character in default * font. */ int charHeight; /* Height of average character in default * font, including line spacing. */ int spacing1; /* Default extra spacing above first display |
︙ | ︙ |
Changes to generic/tkTextDisp.c.
︙ | ︙ | |||
662 663 664 665 666 667 668 | { register TextDInfo *dInfoPtr; XGCValues gcValues; dInfoPtr = ckalloc(sizeof(TextDInfo)); Tcl_InitHashTable(&dInfoPtr->styleTable, sizeof(StyleValues)/sizeof(int)); dInfoPtr->dLinePtr = NULL; | | | 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 | { register TextDInfo *dInfoPtr; XGCValues gcValues; dInfoPtr = ckalloc(sizeof(TextDInfo)); Tcl_InitHashTable(&dInfoPtr->styleTable, sizeof(StyleValues)/sizeof(int)); dInfoPtr->dLinePtr = NULL; dInfoPtr->copyGC = NULL; gcValues.graphics_exposures = True; dInfoPtr->scrollGC = Tk_GetGC(textPtr->tkwin, GCGraphicsExposures, &gcValues); dInfoPtr->topOfEof = 0; dInfoPtr->newXPixelOffset = 0; dInfoPtr->curXPixelOffset = 0; dInfoPtr->maxLength = 0; |
︙ | ︙ | |||
726 727 728 729 730 731 732 | * that the hash table is still intact to free up the style-related * information from the lines. Once the lines are all free then styleTable * will be empty. */ FreeDLines(textPtr, dInfoPtr->dLinePtr, NULL, DLINE_UNLINK); Tcl_DeleteHashTable(&dInfoPtr->styleTable); | | | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 | * that the hash table is still intact to free up the style-related * information from the lines. Once the lines are all free then styleTable * will be empty. */ FreeDLines(textPtr, dInfoPtr->dLinePtr, NULL, DLINE_UNLINK); Tcl_DeleteHashTable(&dInfoPtr->styleTable); if (dInfoPtr->copyGC != NULL) { Tk_FreeGC(textPtr->display, dInfoPtr->copyGC); } Tk_FreeGC(textPtr->display, dInfoPtr->scrollGC); if (dInfoPtr->flags & REDRAW_PENDING) { Tcl_CancelIdleCall(DisplayText, textPtr); } if (dInfoPtr->lineUpdateTimer != NULL) { |
︙ | ︙ | |||
858 859 860 861 862 863 864 | border = textPtr->inactiveSelBorder; } if ((tagPtr->selBorder != NULL) && (isSelected)) { border = tagPtr->selBorder; } | | | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 | border = textPtr->inactiveSelBorder; } if ((tagPtr->selBorder != NULL) && (isSelected)) { border = tagPtr->selBorder; } if ((tagPtr->selFgColor != NULL) && isSelected) { fgColor = tagPtr->selFgColor; } if ((border != NULL) && (tagPtr->priority > borderPrio)) { styleValues.border = border; borderPrio = tagPtr->priority; } |
︙ | ︙ | |||
885 886 887 888 889 890 891 | reliefPrio = tagPtr->priority; } if ((tagPtr->bgStipple != None) && (tagPtr->priority > bgStipplePrio)) { styleValues.bgStipple = tagPtr->bgStipple; bgStipplePrio = tagPtr->priority; } | | | | 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 | reliefPrio = tagPtr->priority; } if ((tagPtr->bgStipple != None) && (tagPtr->priority > bgStipplePrio)) { styleValues.bgStipple = tagPtr->bgStipple; bgStipplePrio = tagPtr->priority; } if ((fgColor != NULL) && (tagPtr->priority > fgPrio)) { styleValues.fgColor = fgColor; fgPrio = tagPtr->priority; } if ((tagPtr->tkfont != NULL) && (tagPtr->priority > fontPrio)) { styleValues.tkfont = tagPtr->tkfont; fontPrio = tagPtr->priority; } if ((tagPtr->fgStipple != None) && (tagPtr->priority > fgStipplePrio)) { styleValues.fgStipple = tagPtr->fgStipple; fgStipplePrio = tagPtr->priority; |
︙ | ︙ | |||
927 928 929 930 931 932 933 | styleValues.offset = tagPtr->offset; offsetPrio = tagPtr->priority; } if ((tagPtr->overstrikeString != NULL) && (tagPtr->priority > overstrikePrio)) { styleValues.overstrike = tagPtr->overstrike; overstrikePrio = tagPtr->priority; | | | | 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 | styleValues.offset = tagPtr->offset; offsetPrio = tagPtr->priority; } if ((tagPtr->overstrikeString != NULL) && (tagPtr->priority > overstrikePrio)) { styleValues.overstrike = tagPtr->overstrike; overstrikePrio = tagPtr->priority; if (tagPtr->overstrikeColor != NULL) { styleValues.overstrikeColor = tagPtr->overstrikeColor; } else if (fgColor != NULL) { styleValues.overstrikeColor = fgColor; } } if ((tagPtr->rMarginString != NULL) && (tagPtr->priority > rMarginPrio)) { styleValues.rMargin = tagPtr->rMargin; rMarginPrio = tagPtr->priority; |
︙ | ︙ | |||
972 973 974 975 976 977 978 | styleValues.tabStyle = tagPtr->tabStyle; tabStylePrio = tagPtr->priority; } if ((tagPtr->underlineString != NULL) && (tagPtr->priority > underlinePrio)) { styleValues.underline = tagPtr->underline; underlinePrio = tagPtr->priority; | | | | 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 | styleValues.tabStyle = tagPtr->tabStyle; tabStylePrio = tagPtr->priority; } if ((tagPtr->underlineString != NULL) && (tagPtr->priority > underlinePrio)) { styleValues.underline = tagPtr->underline; underlinePrio = tagPtr->priority; if (tagPtr->underlineColor != NULL) { styleValues.underlineColor = tagPtr->underlineColor; } else if (fgColor != NULL) { styleValues.underlineColor = fgColor; } } if ((tagPtr->elideString != NULL) && (tagPtr->priority > elidePrio)) { styleValues.elide = tagPtr->elide; elidePrio = tagPtr->priority; |
︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 | if (styleValues.bgStipple != None) { gcValues.stipple = styleValues.bgStipple; gcValues.fill_style = FillStippled; mask |= GCStipple|GCFillStyle; } stylePtr->bgGC = Tk_GetGC(textPtr->tkwin, mask, &gcValues); } else { | | | 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 | if (styleValues.bgStipple != None) { gcValues.stipple = styleValues.bgStipple; gcValues.fill_style = FillStippled; mask |= GCStipple|GCFillStyle; } stylePtr->bgGC = Tk_GetGC(textPtr->tkwin, mask, &gcValues); } else { stylePtr->bgGC = NULL; } mask = GCFont; gcValues.font = Tk_FontId(styleValues.tkfont); mask |= GCForeground; gcValues.foreground = styleValues.fgColor->pixel; if (styleValues.fgStipple != None) { gcValues.stipple = styleValues.fgStipple; |
︙ | ︙ | |||
1072 1073 1074 1075 1076 1077 1078 | FreeStyle( TkText *textPtr, /* Information about overall widget. */ register TextStyle *stylePtr) /* Information about style to free. */ { stylePtr->refCount--; if (stylePtr->refCount == 0) { | | | | | | 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 | FreeStyle( TkText *textPtr, /* Information about overall widget. */ register TextStyle *stylePtr) /* Information about style to free. */ { stylePtr->refCount--; if (stylePtr->refCount == 0) { if (stylePtr->bgGC != NULL) { Tk_FreeGC(textPtr->display, stylePtr->bgGC); } if (stylePtr->fgGC != NULL) { Tk_FreeGC(textPtr->display, stylePtr->fgGC); } if (stylePtr->ulGC != NULL) { Tk_FreeGC(textPtr->display, stylePtr->ulGC); } if (stylePtr->ovGC != NULL) { Tk_FreeGC(textPtr->display, stylePtr->ovGC); } Tcl_DeleteHashEntry(stylePtr->hPtr); ckfree(stylePtr); } } |
︙ | ︙ | |||
2686 2687 2688 2689 2690 2691 2692 | continue; } sValuePtr = chunkPtr->stylePtr->sValuePtr; rightX = chunkPtr->x + chunkPtr->width; if ((chunkPtr->nextPtr == NULL) && (rightX < maxX)) { rightX = maxX; } | | | 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 | continue; } sValuePtr = chunkPtr->stylePtr->sValuePtr; rightX = chunkPtr->x + chunkPtr->width; if ((chunkPtr->nextPtr == NULL) && (rightX < maxX)) { rightX = maxX; } if (chunkPtr->stylePtr->bgGC != NULL) { /* * Not visible - bail out now. */ if (rightX + xOffset <= 0) { leftX = rightX; continue; |
︙ | ︙ | |||
4579 4580 4581 4582 4583 4584 4585 | TkTextPrintIndex(textPtr, &dlPtr->index, string); LOG("tk_textEmbWinDisplay", string); } TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, dlPtr->spaceAbove, dlPtr->height-dlPtr->spaceAbove-dlPtr->spaceBelow, dlPtr->baseline - dlPtr->spaceAbove, NULL, | | | 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 | TkTextPrintIndex(textPtr, &dlPtr->index, string); LOG("tk_textEmbWinDisplay", string); } TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, dlPtr->spaceAbove, dlPtr->height-dlPtr->spaceAbove-dlPtr->spaceBelow, dlPtr->baseline - dlPtr->spaceAbove, NULL, None, dlPtr->y + dlPtr->spaceAbove); } } } #ifndef TK_NO_DOUBLE_BUFFERING Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap); #endif /* TK_NO_DOUBLE_BUFFERING */ } |
︙ | ︙ | |||
5215 5216 5217 5218 5219 5220 5221 | /* * (Re-)create the graphics context for drawing the traversal highlight. */ gcValues.graphics_exposures = False; newGC = Tk_GetGC(textPtr->tkwin, GCGraphicsExposures, &gcValues); | | | 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 | /* * (Re-)create the graphics context for drawing the traversal highlight. */ gcValues.graphics_exposures = False; newGC = Tk_GetGC(textPtr->tkwin, GCGraphicsExposures, &gcValues); if (dInfoPtr->copyGC != NULL) { Tk_FreeGC(textPtr->display, dInfoPtr->copyGC); } dInfoPtr->copyGC = newGC; /* * Throw away all the current layout information. */ |
︙ | ︙ | |||
8023 8024 8025 8026 8027 8028 8029 | } /* * Draw the text, underline, and overstrike for this chunk. */ if (!sValuePtr->elide && (numBytes > offsetBytes) | | | 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 | } /* * Draw the text, underline, and overstrike for this chunk. */ if (!sValuePtr->elide && (numBytes > offsetBytes) && (stylePtr->fgGC != NULL)) { #if TK_DRAW_IN_CONTEXT int start = ciPtr->baseOffset + offsetBytes; int len = ciPtr->numBytes - offsetBytes; int xDisplacement = x - chunkPtr->x; if ((len > 0) && (string[start + len - 1] == '\t')) { len--; |
︙ | ︙ |
Changes to generic/tkTextTag.c.
︙ | ︙ | |||
512 513 514 515 516 517 518 | textPtr->selFgColorPtr = tagPtr->selFgColor; } } tagPtr->affectsDisplay = 0; tagPtr->affectsDisplayGeometry = 0; if ((tagPtr->elideString != NULL) | | | 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | textPtr->selFgColorPtr = tagPtr->selFgColor; } } tagPtr->affectsDisplay = 0; tagPtr->affectsDisplayGeometry = 0; if ((tagPtr->elideString != NULL) || (tagPtr->tkfont != NULL) || (tagPtr->justifyString != NULL) || (tagPtr->lMargin1String != NULL) || (tagPtr->lMargin2String != NULL) || (tagPtr->offsetString != NULL) || (tagPtr->rMarginString != NULL) || (tagPtr->spacing1String != NULL) || (tagPtr->spacing2String != NULL) |
︙ | ︙ |
Changes to generic/tkWindow.c.
︙ | ︙ | |||
2084 2085 2086 2087 2088 2089 2090 | } } void Tk_UndefineCursor( Tk_Window tkwin) /* Window to manipulate. */ { | | | 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 | } } void Tk_UndefineCursor( Tk_Window tkwin) /* Window to manipulate. */ { Tk_DefineCursor(tkwin, NULL); } void Tk_SetWindowColormap( Tk_Window tkwin, /* Window to manipulate. */ Colormap colormap) /* Colormap to use for window. */ { |
︙ | ︙ |
Changes to generic/ttk/ttkClassicTheme.c.
1 2 3 4 5 6 7 | /* * Copyright (c) 2004, Joe English * * "classic" theme; implements the classic Motif-like Tk look. * */ | | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | /* * Copyright (c) 2004, Joe English * * "classic" theme; implements the classic Motif-like Tk look. * */ #include "tkInt.h" #include "ttkTheme.h" #define DEFAULT_BORDERWIDTH "2" #define DEFAULT_ARROW_SIZE "15" /*---------------------------------------------------------------------- * +++ Highlight element implementation. |
︙ | ︙ |
Changes to generic/ttk/ttkDefaultTheme.c.
1 2 3 4 5 6 | /* * Copyright (c) 2003, Joe English * * Tk alternate theme, intended to match the MSUE and Gtk's (old) default theme */ | | < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | /* * Copyright (c) 2003, Joe English * * Tk alternate theme, intended to match the MSUE and Gtk's (old) default theme */ #include "tkInt.h" #include "ttkTheme.h" #if defined(_WIN32) static const int WIN32_XDRAWLINE_HACK = 1; #else static const int WIN32_XDRAWLINE_HACK = 0; #endif |
︙ | ︙ |
Changes to generic/ttk/ttkEntry.c.
1 2 3 4 5 6 7 8 9 10 | /* * DERIVED FROM: tk/generic/tkEntry.c r1.35. * * Copyright (c) 1990-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. * Copyright (c) 2000 Ajuba Solutions. * Copyright (c) 2002 ActiveState Corporation. * Copyright (c) 2004 Joe English */ | | < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | /* * DERIVED FROM: tk/generic/tkEntry.c r1.35. * * Copyright (c) 1990-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. * Copyright (c) 2000 Ajuba Solutions. * Copyright (c) 2002 ActiveState Corporation. * Copyright (c) 2004 Joe English */ #include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" /* * Extra bits for core.flags: */ #define GOT_SELECTION (WIDGET_USER_FLAG<<1) |
︙ | ︙ | |||
329 330 331 332 333 334 335 | * Selection handler for entry widgets. */ static int EntryFetchSelection( ClientData clientData, int offset, char *buffer, int maxBytes) { Entry *entryPtr = (Entry *) clientData; | | | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | * Selection handler for entry widgets. */ static int EntryFetchSelection( ClientData clientData, int offset, char *buffer, int maxBytes) { Entry *entryPtr = (Entry *) clientData; int byteCount; const char *string; const char *selStart, *selEnd; if (entryPtr->entry.selectFirst < 0 || (!entryPtr->entry.exportSelection) || Tcl_IsSafe(entryPtr->core.interp)) { return -1; } string = entryPtr->entry.displayString; selStart = Tcl_UtfAtIndex(string, entryPtr->entry.selectFirst); selEnd = Tcl_UtfAtIndex(selStart, entryPtr->entry.selectLast - entryPtr->entry.selectFirst); byteCount = selEnd - selStart - offset; if (byteCount > maxBytes) { /* @@@POSSIBLE BUG: Can transfer partial UTF-8 sequences. Is this OK? */ byteCount = maxBytes; } if (byteCount <= 0) { return 0; } memcpy(buffer, selStart + offset, byteCount); |
︙ | ︙ | |||
1151 1152 1153 1154 1155 1156 1157 | gcValues.line_width = 1; mask |= GCLineWidth; gcValues.font = Tk_FontId(font); mask |= GCFont; if (colorObj != 0 && (colorPtr=Tk_GetColorFromObj(tkwin,colorObj)) != 0) { gcValues.foreground = colorPtr->pixel; mask |= GCForeground; } gc = Tk_GetGC(entryPtr->core.tkwin, mask, &gcValues); | | | 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 | gcValues.line_width = 1; mask |= GCLineWidth; gcValues.font = Tk_FontId(font); mask |= GCFont; if (colorObj != 0 && (colorPtr=Tk_GetColorFromObj(tkwin,colorObj)) != 0) { gcValues.foreground = colorPtr->pixel; mask |= GCForeground; } gc = Tk_GetGC(entryPtr->core.tkwin, mask, &gcValues); if (clip != NULL) { TkSetRegion(Tk_Display(entryPtr->core.tkwin), gc, clip); } return gc; } /* EntryDisplay -- * Redraws the contents of an entry window. |
︙ | ︙ | |||
1261 1262 1263 1264 1265 1266 1267 | cursorX -= cursorWidth/2; if (cursorX < field.x) { cursorX = field.x; } else if (cursorX + cursorWidth > field.x + field.width) { cursorX = field.x + field.width - cursorWidth; } | | | 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 | cursorX -= cursorWidth/2; if (cursorX < field.x) { cursorX = field.x; } else if (cursorX + cursorWidth > field.x + field.width) { cursorX = field.x + field.width - cursorWidth; } gc = EntryGetGC(entryPtr, es.insertColorObj, NULL); XFillRectangle(Tk_Display(tkwin), d, gc, cursorX, cursorY, cursorWidth, cursorHeight); Tk_FreeGC(Tk_Display(tkwin), gc); } /* Draw the text: */ |
︙ | ︙ | |||
1293 1294 1295 1296 1297 1298 1299 | Tk_FreeGC(Tk_Display(tkwin), gc); } /* Drop the region. Note that we have to manually remove the reference to * it from the Xft guts (if they're being used). */ #ifdef HAVE_XFT | | | 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 | Tk_FreeGC(Tk_Display(tkwin), gc); } /* Drop the region. Note that we have to manually remove the reference to * it from the Xft guts (if they're being used). */ #ifdef HAVE_XFT TkUnixSetXftClipRegion(NULL); #endif TkDestroyRegion(clipRegion); } /*------------------------------------------------------------------------ * +++ Widget commands. */ |
︙ | ︙ |
Changes to generic/ttk/ttkLabel.c.
1 2 3 4 5 6 7 8 | /* * text, image, and label elements. * * The label element combines text and image elements, * with layout determined by the "-compound" option. * */ | | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | /* * text, image, and label elements. * * The label element combines text and image elements, * with layout determined by the "-compound" option. * */ #include "tkInt.h" #include "ttkTheme.h" /*---------------------------------------------------------------------- * +++ Text element. * * This element displays a textual label in the foreground color. * |
︙ | ︙ | |||
179 180 181 182 183 184 185 | } Tk_UnderlineTextLayout(Tk_Display(tkwin), d, gc1, text->textLayout, b.x, b.y, underline); } if (clipRegion != NULL) { #ifdef HAVE_XFT | | | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | } Tk_UnderlineTextLayout(Tk_Display(tkwin), d, gc1, text->textLayout, b.x, b.y, underline); } if (clipRegion != NULL) { #ifdef HAVE_XFT TkUnixSetXftClipRegion(NULL); #endif XSetClipMask(Tk_Display(tkwin), gc1, None); XSetClipMask(Tk_Display(tkwin), gc2, None); TkDestroyRegion(clipRegion); } Tk_FreeGC(Tk_Display(tkwin), gc1); Tk_FreeGC(Tk_Display(tkwin), gc2); |
︙ | ︙ |
Changes to generic/ttk/ttkLayout.c.
1 2 3 4 5 6 7 8 9 | /* * ttkLayout.c -- * * Generic layout processing. * * Copyright (c) 2003 Joe English. Freely redistributable. */ #include <string.h> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /* * ttkLayout.c -- * * Generic layout processing. * * Copyright (c) 2003 Joe English. Freely redistributable. */ #include <string.h> #include "tkInt.h" #include "ttkThemeInt.h" #define MAX(a,b) (a > b ? a : b) #define MIN(a,b) (a < b ? a : b) /*------------------------------------------------------------------------ * +++ Ttk_Box and Ttk_Padding utilities: |
︙ | ︙ |
Changes to generic/ttk/ttkScroll.c.
︙ | ︙ | |||
30 31 32 33 34 35 36 | * If the widget value changes, it should call TtkScrolled() (step 4). * (This usually happens automatically when the widget is redisplayed). * * If the scrollee's -[xy]scrollcommand changes, it should call * TtkScrollbarUpdateRequired, which will invoke step (5) (@@@ Fix this) */ | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | * If the widget value changes, it should call TtkScrolled() (step 4). * (This usually happens automatically when the widget is redisplayed). * * If the scrollee's -[xy]scrollcommand changes, it should call * TtkScrollbarUpdateRequired, which will invoke step (5) (@@@ Fix this) */ #include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" /* Private data: */ #define SCROLL_UPDATE_PENDING (0x1) #define SCROLL_UPDATE_REQUIRED (0x2) |
︙ | ︙ |
Changes to generic/ttk/ttkState.c.
︙ | ︙ | |||
127 128 129 130 131 132 133 | static void StateSpecUpdateString(Tcl_Obj *objPtr) { unsigned int onbits = (objPtr->internalRep.longValue & 0xFFFF0000) >> 16; unsigned int offbits = objPtr->internalRep.longValue & 0x0000FFFF; unsigned int mask = onbits | offbits; Tcl_DString result; int i; | | | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | static void StateSpecUpdateString(Tcl_Obj *objPtr) { unsigned int onbits = (objPtr->internalRep.longValue & 0xFFFF0000) >> 16; unsigned int offbits = objPtr->internalRep.longValue & 0x0000FFFF; unsigned int mask = onbits | offbits; Tcl_DString result; int i; int len; Tcl_DStringInit(&result); for (i=0; stateNames[i] != NULL; ++i) { if (mask & (1<<i)) { if (offbits & (1<<i)) Tcl_DStringAppend(&result, "!", 1); Tcl_DStringAppend(&result, stateNames[i], -1); Tcl_DStringAppend(&result, " ", 1); } } len = Tcl_DStringLength(&result); if (len) { /* 'len' includes extra trailing ' ' */ objPtr->bytes = ckalloc(len); objPtr->length = len-1; strncpy(objPtr->bytes, Tcl_DStringValue(&result), len-1); objPtr->bytes[len-1] = '\0'; } else { /* empty string */ objPtr->length = 0; objPtr->bytes = ckalloc(1); *objPtr->bytes = '\0'; } Tcl_DStringFree(&result); } Tcl_Obj *Ttk_NewStateSpecObj(unsigned int onbits, unsigned int offbits) |
︙ | ︙ |
Changes to generic/ttk/ttkTheme.c.
1 2 3 4 5 6 7 8 9 10 11 12 | /* * ttkTheme.c -- * * This file implements the widget styles and themes support. * * Copyright (c) 2002 Frederic Bonnet * Copyright (c) 2003 Joe English * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ | < < | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * ttkTheme.c -- * * This file implements the widget styles and themes support. * * Copyright (c) 2002 Frederic Bonnet * Copyright (c) 2003 Joe English * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" #include "ttkThemeInt.h" #define PKG_ASSOC_KEY "Ttk" #ifdef MAC_OSX_TK extern void TkMacOSXFlushWindows(void); #define UPDATE_WINDOWS() TkMacOSXFlushWindows() |
︙ | ︙ |
Changes to generic/ttk/ttkTreeview.c.
1 2 3 4 5 6 7 8 | /* * Copyright (c) 2004, Joe English * * ttk::treeview widget implementation. */ #include <string.h> #include <stdio.h> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | /* * Copyright (c) 2004, Joe English * * ttk::treeview widget implementation. */ #include <string.h> #include <stdio.h> #include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" #define DEF_TREE_ROWS "10" #define DEF_COLWIDTH "200" #define DEF_MINWIDTH "20" |
︙ | ︙ |
Changes to generic/ttk/ttkWidget.c.
1 2 3 4 5 6 7 | /* * Copyright (c) 2003, Joe English * * Core widget utilities. */ #include <string.h> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | /* * Copyright (c) 2003, Joe English * * Core widget utilities. */ #include <string.h> #include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" #ifdef MAC_OSX_TK #define TK_NO_DOUBLE_BUFFERING 1 #endif |
︙ | ︙ |
Changes to macosx/tkMacOSXDefault.h.
︙ | ︙ | |||
33 34 35 36 37 38 39 | #define BLACK "Black" #define WHITE "White" #define NORMAL_BG "systemWindowBody" #define ACTIVE_BG "systemButtonFacePressed" #define ACTIVE_FG "systemPushButtonPressedText" #define SELECT_BG "systemHighlight" | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #define BLACK "Black" #define WHITE "White" #define NORMAL_BG "systemWindowBody" #define ACTIVE_BG "systemButtonFacePressed" #define ACTIVE_FG "systemPushButtonPressedText" #define SELECT_BG "systemHighlight" #define SELECT_FG NULL #define INACTIVE_SELECT_BG "systemHighlightSecondary" #define TROUGH "#c3c3c3" #define INDICATOR "#b03060" #define DISABLED "#a3a3a3" /* * Defaults for labels, buttons, checkbuttons, and radiobuttons: |
︙ | ︙ | |||
278 279 280 281 282 283 284 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG NULL #define DEF_MENU_ENTRY_ACTIVE_FG NULL #define DEF_MENU_ENTRY_ACCELERATOR NULL #define DEF_MENU_ENTRY_BG NULL | | | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG NULL #define DEF_MENU_ENTRY_ACTIVE_FG NULL #define DEF_MENU_ENTRY_ACCELERATOR NULL #define DEF_MENU_ENTRY_BG NULL #define DEF_MENU_ENTRY_BITMAP NULL #define DEF_MENU_ENTRY_COLUMN_BREAK "0" #define DEF_MENU_ENTRY_COMMAND NULL #define DEF_MENU_ENTRY_COMPOUND "none" #define DEF_MENU_ENTRY_FG NULL #define DEF_MENU_ENTRY_FONT NULL #define DEF_MENU_ENTRY_HIDE_MARGIN "0" #define DEF_MENU_ENTRY_IMAGE NULL |
︙ | ︙ |
Changes to macosx/tkMacOSXEmbed.c.
︙ | ︙ | |||
490 491 492 493 494 495 496 | for (containerPtr = firstContainerPtr; containerPtr != NULL; containerPtr = containerPtr->nextPtr) { if (containerPtr->embeddedPtr == winPtr) { return (MacDrawable *) containerPtr->parent; } } Tcl_Panic("TkMacOSXContainerId couldn't find window"); | | | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 | for (containerPtr = firstContainerPtr; containerPtr != NULL; containerPtr = containerPtr->nextPtr) { if (containerPtr->embeddedPtr == winPtr) { return (MacDrawable *) containerPtr->parent; } } Tcl_Panic("TkMacOSXContainerId couldn't find window"); return NULL; } /* *---------------------------------------------------------------------- * * TkMacOSXGetHostToplevel -- * |
︙ | ︙ | |||
526 527 528 529 530 531 532 | } contWinPtr = TkpGetOtherWindow(topWinPtr); /* * TODO: Here we should handle out of process embedding. */ | | | | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 | } contWinPtr = TkpGetOtherWindow(topWinPtr); /* * TODO: Here we should handle out of process embedding. */ if (!contWinPtr) { return NULL; } return TkMacOSXGetHostToplevel(contWinPtr); } /* *---------------------------------------------------------------------- * |
︙ | ︙ |
Changes to macosx/tkMacOSXMenu.c.
︙ | ︙ | |||
1477 1478 1479 1480 1481 1482 1483 | #define observe(n, s) \ [nc addObserver:NSApp selector:@selector(s) name:(n) object:nil] observe(NSMenuDidBeginTrackingNotification, menuBeginTracking:); observe(NSMenuDidEndTrackingNotification, menuEndTracking:); #undef observe [NSMenuItem setUsesUserKeyEquivalents:NO]; | | | | 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 | #define observe(n, s) \ [nc addObserver:NSApp selector:@selector(s) name:(n) object:nil] observe(NSMenuDidBeginTrackingNotification, menuBeginTracking:); observe(NSMenuDidEndTrackingNotification, menuEndTracking:); #undef observe [NSMenuItem setUsesUserKeyEquivalents:NO]; tkColPtr = TkpGetColor(NULL, DEF_MENU_BG_COLOR); defaultBg = tkColPtr->color.pixel; ckfree(tkColPtr); tkColPtr = TkpGetColor(NULL, DEF_MENU_FG); defaultFg = tkColPtr->color.pixel; ckfree(tkColPtr); ChkErr(GetThemeMetric, kThemeMetricMenuMarkColumnWidth, &menuMarkColumnWidth); ChkErr(GetThemeMetric, kThemeMetricMenuTextLeadingEdgeMargin, &menuTextLeadingEdgeMargin); |
︙ | ︙ |
Changes to macosx/tkMacOSXScrlbr.c.
︙ | ︙ | |||
115 116 117 118 119 120 121 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar)); | | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar)); scrollPtr->troughGC = NULL; scrollPtr->copyGC = NULL; scrollPtr->info = defaultInfo; scrollPtr->buttonDown = false; Tk_CreateEventHandler(tkwin, ExposureMask | StructureNotifyMask | FocusChangeMask | |
︙ | ︙ |
Changes to unix/tkUnix3d.c.
︙ | ︙ | |||
44 45 46 47 48 49 50 | */ TkBorder * TkpGetBorder(void) { UnixBorder *borderPtr = ckalloc(sizeof(UnixBorder)); | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | */ TkBorder * TkpGetBorder(void) { UnixBorder *borderPtr = ckalloc(sizeof(UnixBorder)); borderPtr->solidGC = NULL; return (TkBorder *) borderPtr; } /* *---------------------------------------------------------------------- * * TkpFreeBorder -- |
︙ | ︙ | |||
72 73 74 75 76 77 78 | void TkpFreeBorder( TkBorder *borderPtr) { UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; Display *display = DisplayOfScreen(borderPtr->screen); | | | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | void TkpFreeBorder( TkBorder *borderPtr) { UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; Display *display = DisplayOfScreen(borderPtr->screen); if (unixBorderPtr->solidGC != NULL) { Tk_FreeGC(display, unixBorderPtr->solidGC); } } /* *-------------------------------------------------------------- * * Tk_3DVerticalBevel -- |
︙ | ︙ | |||
120 121 122 123 124 125 126 | * TK_RELIEF_RAISED means interior of object * should appear higher than exterior. */ { TkBorder *borderPtr = (TkBorder *) border; GC left, right; Display *display = Tk_Display(tkwin); | | | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | * TK_RELIEF_RAISED means interior of object * should appear higher than exterior. */ { TkBorder *borderPtr = (TkBorder *) border; GC left, right; Display *display = Tk_Display(tkwin); if ((borderPtr->lightGC == NULL) && (relief != TK_RELIEF_FLAT)) { TkpGetShadows(borderPtr, tkwin); } if (relief == TK_RELIEF_RAISED) { XFillRectangle(display, drawable, (leftBevel) ? borderPtr->lightGC : borderPtr->darkGC, x, y, (unsigned) width, (unsigned) height); |
︙ | ︙ | |||
155 156 157 158 159 160 161 | right = borderPtr->lightGC; goto ridgeGroove; } else if (relief == TK_RELIEF_FLAT) { XFillRectangle(display, drawable, borderPtr->bgGC, x, y, (unsigned) width, (unsigned) height); } else if (relief == TK_RELIEF_SOLID) { UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; | | | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | right = borderPtr->lightGC; goto ridgeGroove; } else if (relief == TK_RELIEF_FLAT) { XFillRectangle(display, drawable, borderPtr->bgGC, x, y, (unsigned) width, (unsigned) height); } else if (relief == TK_RELIEF_SOLID) { UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; if (unixBorderPtr->solidGC == NULL) { XGCValues gcValues; gcValues.foreground = BlackPixelOfScreen(borderPtr->screen); unixBorderPtr->solidGC = Tk_GetGC(tkwin, GCForeground, &gcValues); } XFillRectangle(display, drawable, unixBorderPtr->solidGC, x, y, (unsigned) width, (unsigned) height); |
︙ | ︙ | |||
212 213 214 215 216 217 218 | * TK_RELIEF_RAISED means interior of object * should appear higher than exterior. */ { TkBorder *borderPtr = (TkBorder *) border; Display *display = Tk_Display(tkwin); int bottom, halfway, x1, x2, x1Delta, x2Delta; UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; | | | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | * TK_RELIEF_RAISED means interior of object * should appear higher than exterior. */ { TkBorder *borderPtr = (TkBorder *) border; Display *display = Tk_Display(tkwin); int bottom, halfway, x1, x2, x1Delta, x2Delta; UnixBorder *unixBorderPtr = (UnixBorder *) borderPtr; GC topGC = NULL, bottomGC = NULL; /* Initializations needed only to prevent * compiler warnings. */ if ((borderPtr->lightGC == NULL) && (relief != TK_RELIEF_FLAT) && (relief != TK_RELIEF_SOLID)) { TkpGetShadows(borderPtr, tkwin); } /* * Compute a GC for the top half of the bevel and a GC for the bottom half * (they're the same in many cases). |
︙ | ︙ | |||
242 243 244 245 246 247 248 | topGC = bottomGC = (topBevel? borderPtr->lightGC : borderPtr->darkGC); break; case TK_RELIEF_RIDGE: topGC = borderPtr->lightGC; bottomGC = borderPtr->darkGC; break; case TK_RELIEF_SOLID: | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | topGC = bottomGC = (topBevel? borderPtr->lightGC : borderPtr->darkGC); break; case TK_RELIEF_RIDGE: topGC = borderPtr->lightGC; bottomGC = borderPtr->darkGC; break; case TK_RELIEF_SOLID: if (unixBorderPtr->solidGC == NULL) { XGCValues gcValues; gcValues.foreground = BlackPixelOfScreen(borderPtr->screen); unixBorderPtr->solidGC = Tk_GetGC(tkwin, GCForeground, &gcValues); } XFillRectangle(display, drawable, unixBorderPtr->solidGC, x, y, (unsigned) width, (unsigned) height); |
︙ | ︙ | |||
340 341 342 343 344 345 346 | * drawing. */ { XColor lightColor, darkColor; int stressed, tmp1, tmp2; int r, g, b; XGCValues gcValues; | | | 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | * drawing. */ { XColor lightColor, darkColor; int stressed, tmp1, tmp2; int r, g, b; XGCValues gcValues; if (borderPtr->lightGC != NULL) { return; } stressed = TkpCmapStressed(tkwin, borderPtr->colormap); /* * First, handle the case of a color display with lots of colors. The * shadow colors get computed using whichever formula results in the |
︙ | ︙ |
Changes to unix/tkUnixDefault.h.
︙ | ︙ | |||
240 241 242 243 244 245 246 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL) #define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL) #define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL) #define DEF_MENU_ENTRY_BG ((char *) NULL) | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL) #define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL) #define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL) #define DEF_MENU_ENTRY_BG ((char *) NULL) #define DEF_MENU_ENTRY_BITMAP NULL #define DEF_MENU_ENTRY_COLUMN_BREAK "0" #define DEF_MENU_ENTRY_COMMAND ((char *) NULL) #define DEF_MENU_ENTRY_COMPOUND "none" #define DEF_MENU_ENTRY_FG ((char *) NULL) #define DEF_MENU_ENTRY_FONT ((char *) NULL) #define DEF_MENU_ENTRY_HIDE_MARGIN "0" #define DEF_MENU_ENTRY_IMAGE ((char *) NULL) |
︙ | ︙ |
Changes to unix/tkUnixMenubu.c.
︙ | ︙ | |||
88 89 90 91 92 93 94 | gc = mbPtr->activeTextGC; border = mbPtr->activeBorder; } else { gc = mbPtr->normalTextGC; border = mbPtr->normalBorder; } | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | gc = mbPtr->activeTextGC; border = mbPtr->activeBorder; } else { gc = mbPtr->normalTextGC; border = mbPtr->normalBorder; } if (mbPtr->image != NULL) { Tk_SizeOfImage(mbPtr->image, &width, &height); haveImage = 1; } else if (mbPtr->bitmap != None) { Tk_SizeOfBitmap(mbPtr->display, mbPtr->bitmap, &width, &height); haveImage = 1; } imageWidth = width; |
︙ | ︙ | |||
354 355 356 357 358 359 360 | width = 0; height = 0; txtWidth = 0; txtHeight = 0; avgWidth = 0; | | | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | width = 0; height = 0; txtWidth = 0; txtHeight = 0; avgWidth = 0; if (mbPtr->image != NULL) { Tk_SizeOfImage(mbPtr->image, &width, &height); haveImage = 1; } else if (mbPtr->bitmap != None) { Tk_SizeOfBitmap(mbPtr->display, mbPtr->bitmap, &width, &height); haveImage = 1; } |
︙ | ︙ |
Changes to unix/tkUnixRFont.c.
︙ | ︙ | |||
933 934 935 936 937 938 939 | } if (nspec) { XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec); } doUnderlineStrikeout: if (tsdPtr->clipRegion != None) { | | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 | } if (nspec) { XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec); } doUnderlineStrikeout: if (tsdPtr->clipRegion != None) { XftDrawSetClip(fontPtr->ftDraw, NULL); } if (fontPtr->font.fa.underline != 0) { XFillRectangle(display, drawable, gc, xStart, y + fontPtr->font.underlinePos, (unsigned) (x - xStart), (unsigned) fontPtr->font.underlineHeight); } if (fontPtr->font.fa.overstrike != 0) { |
︙ | ︙ | |||
1179 1180 1181 1182 1183 1184 1185 | if (nspec) { XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec); } #endif /* XFT_HAS_FIXED_ROTATED_PLACEMENT */ doUnderlineStrikeout: if (tsdPtr->clipRegion != None) { | | | 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | if (nspec) { XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec); } #endif /* XFT_HAS_FIXED_ROTATED_PLACEMENT */ doUnderlineStrikeout: if (tsdPtr->clipRegion != None) { XftDrawSetClip(fontPtr->ftDraw, NULL); } if (fontPtr->font.fa.underline || fontPtr->font.fa.overstrike) { XPoint points[5]; double width = (x - xStart) * cosA + (yStart - y) * sinA; double barHeight = fontPtr->font.underlineHeight; double dy = fontPtr->font.underlinePos; |
︙ | ︙ |
Changes to unix/tkUnixScrlbr.c.
︙ | ︙ | |||
61 62 63 64 65 66 67 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { UnixScrollbar *scrollPtr = ckalloc(sizeof(UnixScrollbar)); | | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { UnixScrollbar *scrollPtr = ckalloc(sizeof(UnixScrollbar)); scrollPtr->troughGC = NULL; scrollPtr->copyGC = NULL; Tk_CreateEventHandler(tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, TkScrollbarEventProc, scrollPtr); return (TkScrollbar *) scrollPtr; } |
︙ | ︙ | |||
362 363 364 365 366 367 368 | void TkpDestroyScrollbar( TkScrollbar *scrollPtr) { UnixScrollbar *unixScrollPtr = (UnixScrollbar *)scrollPtr; | | | | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | void TkpDestroyScrollbar( TkScrollbar *scrollPtr) { UnixScrollbar *unixScrollPtr = (UnixScrollbar *)scrollPtr; if (unixScrollPtr->troughGC != NULL) { Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC); } if (unixScrollPtr->copyGC != NULL) { Tk_FreeGC(scrollPtr->display, unixScrollPtr->copyGC); } } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
402 403 404 405 406 407 408 | GC new; UnixScrollbar *unixScrollPtr = (UnixScrollbar *) scrollPtr; Tk_SetBackgroundFromBorder(scrollPtr->tkwin, scrollPtr->bgBorder); gcValues.foreground = scrollPtr->troughColorPtr->pixel; new = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues); | | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | GC new; UnixScrollbar *unixScrollPtr = (UnixScrollbar *) scrollPtr; Tk_SetBackgroundFromBorder(scrollPtr->tkwin, scrollPtr->bgBorder); gcValues.foreground = scrollPtr->troughColorPtr->pixel; new = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues); if (unixScrollPtr->troughGC != NULL) { Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC); } unixScrollPtr->troughGC = new; if (unixScrollPtr->copyGC == NULL) { gcValues.graphics_exposures = False; unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin, GCGraphicsExposures, &gcValues); } } /* |
︙ | ︙ |
Changes to win/tkWin3d.c.
︙ | ︙ | |||
123 124 125 126 127 128 129 | TkBorder *borderPtr = (TkBorder *) border; int left, right; Display *display = Tk_Display(tkwin); TkWinDCState state; HDC dc = TkWinGetDrawableDC(display, drawable, &state); int half; | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | TkBorder *borderPtr = (TkBorder *) border; int left, right; Display *display = Tk_Display(tkwin); TkWinDCState state; HDC dc = TkWinGetDrawableDC(display, drawable, &state); int half; if ((borderPtr->lightGC == NULL) && (relief != TK_RELIEF_FLAT)) { TkpGetShadows(borderPtr, tkwin); } switch (relief) { case TK_RELIEF_RAISED: left = (leftBevel) ? borderPtr->lightGC->foreground |
︙ | ︙ | |||
218 219 220 221 222 223 224 | TkBorder *borderPtr = (TkBorder *) border; Display *display = Tk_Display(tkwin); int bottom, halfway, x1, x2, x1Delta, x2Delta; TkWinDCState state; HDC dc = TkWinGetDrawableDC(display, drawable, &state); int topColor, bottomColor; | | | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | TkBorder *borderPtr = (TkBorder *) border; Display *display = Tk_Display(tkwin); int bottom, halfway, x1, x2, x1Delta, x2Delta; TkWinDCState state; HDC dc = TkWinGetDrawableDC(display, drawable, &state); int topColor, bottomColor; if ((borderPtr->lightGC == NULL) && (relief != TK_RELIEF_FLAT)) { TkpGetShadows(borderPtr, tkwin); } /* * Compute a GC for the top half of the bevel and a GC for the bottom half * (they're the same in many cases). */ |
︙ | ︙ | |||
335 336 337 338 339 340 341 | * drawing. */ { XColor lightColor, darkColor; int tmp1, tmp2; int r, g, b; XGCValues gcValues; | | | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | * drawing. */ { XColor lightColor, darkColor; int tmp1, tmp2; int r, g, b; XGCValues gcValues; if (borderPtr->lightGC != NULL) { return; } /* * Handle the special case of the default system colors. */ |
︙ | ︙ | |||
536 537 538 539 540 541 542 | Tk_Window tkwin, Tk_3DBorder border, int which) /* One of TK_3D_FLAT_GC, TK_3D_LIGHT_GC, * TK_3D_DARK_GC, TK_3D_LIGHT2, TK_3D_DARK2 */ { WinBorder *borderPtr = (WinBorder *) border; | | | 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | Tk_Window tkwin, Tk_3DBorder border, int which) /* One of TK_3D_FLAT_GC, TK_3D_LIGHT_GC, * TK_3D_DARK_GC, TK_3D_LIGHT2, TK_3D_DARK2 */ { WinBorder *borderPtr = (WinBorder *) border; if (borderPtr->info.lightGC == NULL) { TkpGetShadows(&borderPtr->info, tkwin); } switch (which) { case TK_3D_FLAT_GC: return borderPtr->info.bgColorPtr->pixel; case TK_3D_LIGHT_GC: if (borderPtr->info.lightColorPtr == NULL) { |
︙ | ︙ |
Changes to win/tkWinButton.c.
︙ | ︙ | |||
430 431 432 433 434 435 436 | Tk_Fill3DRectangle(tkwin, pixmap, border, 0, 0, Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); /* * Display image or bitmap or text for button. */ | | | 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | Tk_Fill3DRectangle(tkwin, pixmap, border, 0, 0, Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); /* * Display image or bitmap or text for button. */ if (butPtr->image != NULL) { Tk_SizeOfImage(butPtr->image, &width, &height); haveImage = 1; } else if (butPtr->bitmap != None) { Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height); haveImage = 1; } imageWidth = width; |
︙ | ︙ |
Changes to win/tkWinDefault.h.
︙ | ︙ | |||
243 244 245 246 247 248 249 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL) #define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL) #define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL) #define DEF_MENU_ENTRY_BG ((char *) NULL) | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | * Defaults for individual entries of menus: */ #define DEF_MENU_ENTRY_ACTIVE_BG ((char *) NULL) #define DEF_MENU_ENTRY_ACTIVE_FG ((char *) NULL) #define DEF_MENU_ENTRY_ACCELERATOR ((char *) NULL) #define DEF_MENU_ENTRY_BG ((char *) NULL) #define DEF_MENU_ENTRY_BITMAP NULL #define DEF_MENU_ENTRY_COLUMN_BREAK "0" #define DEF_MENU_ENTRY_COMMAND ((char *) NULL) #define DEF_MENU_ENTRY_COMPOUND "none" #define DEF_MENU_ENTRY_FG ((char *) NULL) #define DEF_MENU_ENTRY_FONT ((char *) NULL) #define DEF_MENU_ENTRY_HIDE_MARGIN "0" #define DEF_MENU_ENTRY_IMAGE ((char *) NULL) |
︙ | ︙ |
Changes to win/tkWinDialog.c.
︙ | ︙ | |||
3347 3348 3349 3350 3351 3352 3353 | Tcl_SetErrorCode(interp, "TK", "FONTDIALOG", "READONLY", NULL); return TCL_ERROR; } case FontchooserParent: { Tk_Window parent = Tk_NameToWindow(interp, Tcl_GetString(objv[i+1]), tkwin); | | | 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 | Tcl_SetErrorCode(interp, "TK", "FONTDIALOG", "READONLY", NULL); return TCL_ERROR; } case FontchooserParent: { Tk_Window parent = Tk_NameToWindow(interp, Tcl_GetString(objv[i+1]), tkwin); if (parent == NULL) { return TCL_ERROR; } if (hdPtr->parentObj) { Tcl_DecrRefCount(hdPtr->parentObj); } hdPtr->parentObj = objv[i+1]; if (Tcl_IsShared(hdPtr->parentObj)) { |
︙ | ︙ | |||
3442 3443 3444 3445 3446 3447 3448 | hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL); parent = tkwin; if (hdPtr->parentObj) { parent = Tk_NameToWindow(interp, Tcl_GetString(hdPtr->parentObj), tkwin); | | | 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 | hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL); parent = tkwin; if (hdPtr->parentObj) { parent = Tk_NameToWindow(interp, Tcl_GetString(hdPtr->parentObj), tkwin); if (parent == NULL) { return TCL_ERROR; } } Tk_MakeWindowExist(parent); ZeroMemory(&cf, sizeof(CHOOSEFONT)); |
︙ | ︙ |
Changes to win/tkWinFont.c.
︙ | ︙ | |||
984 985 986 987 988 989 990 | } else { p = source; curX = 0; } } *lengthPtr = curX; | | | 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | } else { p = source; curX = 0; } } *lengthPtr = curX; return (int)(p - source); } /* *--------------------------------------------------------------------------- * * TkpMeasureCharsInContext -- * |
︙ | ︙ |
Changes to win/tkWinMenu.c.
︙ | ︙ | |||
2360 2361 2362 2363 2364 2365 2366 | } if (mePtr->state == ENTRY_DISABLED) { if (menuPtr->disabledFgPtr == NULL) { XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y, (unsigned) width, (unsigned) height); } else if ((mePtr->image != NULL) | | | 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 | } if (mePtr->state == ENTRY_DISABLED) { if (menuPtr->disabledFgPtr == NULL) { XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y, (unsigned) width, (unsigned) height); } else if ((mePtr->image != NULL) && (menuPtr->disabledImageGC != NULL)) { XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC, leftEdge + imageXOffset, (int) (y + (mePtr->height - imageHeight)/2 + imageYOffset), (unsigned) imageWidth, (unsigned) imageHeight); } } } |
︙ | ︙ |
Changes to win/tkWinPort.h.
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | #define REDO_KEYSYM_LOOKUP /* * See ticket [916c1095438eae56]: GetVersionExW triggers warnings */ #if defined(_MSC_VER) # pragma warning(disable:4996) #endif /* * The following macro checks to see whether there is buffered * input data available for a stdio FILE. */ | > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | #define REDO_KEYSYM_LOOKUP /* * See ticket [916c1095438eae56]: GetVersionExW triggers warnings */ #if defined(_MSC_VER) # pragma warning(disable:4267) # pragma warning(disable:4244) # pragma warning(disable:4311) # pragma warning(disable:4312) # pragma warning(disable:4996) #endif /* * The following macro checks to see whether there is buffered * input data available for a stdio FILE. */ |
︙ | ︙ |
Changes to win/tkWinWm.c.
︙ | ︙ | |||
2621 2622 2623 2624 2625 2626 2627 | wmPtr2 = wmPtr2->nextPtr) { if (wmPtr2->masterPtr == winPtr) { wmPtr->numTransients--; Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr, VisibilityChangeMask|StructureNotifyMask, WmWaitVisibilityOrMapProc, wmPtr2->winPtr); wmPtr2->masterPtr = NULL; | | | 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 | wmPtr2 = wmPtr2->nextPtr) { if (wmPtr2->masterPtr == winPtr) { wmPtr->numTransients--; Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr, VisibilityChangeMask|StructureNotifyMask, WmWaitVisibilityOrMapProc, wmPtr2->winPtr); wmPtr2->masterPtr = NULL; if ((wmPtr2->wrapper != NULL) && !(wmPtr2->flags & (WM_NEVER_MAPPED))) { UpdateWrapper(wmPtr2->winPtr); } } } if (wmPtr->numTransients != 0) Tcl_Panic("numTransients should be 0"); |
︙ | ︙ | |||
8619 8620 8621 8622 8623 8624 8625 | if (winPtr->flags & TK_EMBEDDED) { int state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1) - 1; SendMessage(wmPtr->wrapper, TK_SETMENU, 0, 0); SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); winPtr->flags &= ~TK_EMBEDDED; winPtr->privatePtr = NULL; | | | 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 | if (winPtr->flags & TK_EMBEDDED) { int state = SendMessage(wmPtr->wrapper, TK_STATE, -1, -1) - 1; SendMessage(wmPtr->wrapper, TK_SETMENU, 0, 0); SendMessage(wmPtr->wrapper, TK_DETACHWINDOW, 0, 0); winPtr->flags &= ~TK_EMBEDDED; winPtr->privatePtr = NULL; wmPtr->wrapper = NULL; if (state >= 0 && state <= 3) { wmPtr->hints.initial_state = state; } } if (winPtr->flags & TK_TOP_LEVEL) { TkpWinToplevelOverrideRedirect(winPtr, 1); } |
︙ | ︙ |
Changes to win/tkWinX.c.
︙ | ︙ | |||
581 582 583 584 585 586 587 | /* * Set up the root window. */ twdPtr = ckalloc(sizeof(TkWinDrawable)); if (twdPtr == NULL) { | | | 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | /* * Set up the root window. */ twdPtr = ckalloc(sizeof(TkWinDrawable)); if (twdPtr == NULL) { return NULL; } twdPtr->type = TWD_WINDOW; twdPtr->window.winPtr = NULL; twdPtr->window.handle = NULL; screen->root = (Window)twdPtr; /* |
︙ | ︙ |
Changes to xlib/X11/X.h.
︙ | ︙ | |||
69 70 71 72 73 74 75 | * defined as a short, which wouldn't be big * enough. */ /***************************************************************** * RESERVED RESOURCE AND CONSTANT DEFINITIONS *****************************************************************/ | > | > | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | * defined as a short, which wouldn't be big * enough. */ /***************************************************************** * RESERVED RESOURCE AND CONSTANT DEFINITIONS *****************************************************************/ #ifndef _WIN32 # define None 0L /* See bug [9e31fd9449] and below */ #endif #define ParentRelative 1L /* background pixmap in CreateWindow and ChangeWindowAttributes */ #define CopyFromParent 0L /* border pixmap in CreateWindow and ChangeWindowAttributes special VisualID and special window |
︙ | ︙ | |||
175 176 177 178 179 180 181 | /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer, state in various key-, mouse-, and button-related events. */ #define ShiftMask (1<<0) #define LockMask (1<<1) | > | > > > > > > | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer, state in various key-, mouse-, and button-related events. */ #define ShiftMask (1<<0) #define LockMask (1<<1) #ifndef _WIN32 # define ControlMask (1<<2) /* See bug [9e31fd9449] and below */ #endif #define Mod1Mask (1<<3) #define Mod2Mask (1<<4) #define Mod3Mask (1<<5) #define Mod4Mask (1<<6) #define Mod5Mask (1<<7) /* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */ #ifdef _WIN32 enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) }; #endif /* modifier names. Used to build a SetModifierMapping request or to read a GetModifierMapping request. These correspond to the masks defined above. */ #define ShiftMapIndex 0 #define LockMapIndex 1 #define ControlMapIndex 2 |
︙ | ︙ |
Changes to xlib/xgc.c.
︙ | ︙ | |||
46 47 48 49 50 51 52 | * *---------------------------------------------------------------------- */ static TkpClipMask *AllocClipMask(GC gc) { TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask; | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | * *---------------------------------------------------------------------- */ static TkpClipMask *AllocClipMask(GC gc) { TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask; if (clip_mask == NULL) { clip_mask = ckalloc(sizeof(TkpClipMask)); gc->clip_mask = (Pixmap) clip_mask; #ifdef MAC_OSX_TK } else if (clip_mask->type == TKP_CLIP_REGION) { TkpReleaseRegion(clip_mask->value.region); #endif } |
︙ | ︙ | |||
121 122 123 124 125 126 127 | * initialization. */ #define MAX_DASH_LIST_SIZE 10 gp = ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize); if (!gp) { | | | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | * initialization. */ #define MAX_DASH_LIST_SIZE 10 gp = ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize); if (!gp) { return NULL; } #define InitField(name,maskbit,default) \ (gp->name = (mask & (maskbit)) ? values->name : (default)) InitField(function, GCFunction, GXcopy); InitField(plane_mask, GCPlaneMask, (unsigned long)(~0)); |
︙ | ︙ | |||
264 265 266 267 268 269 270 | *---------------------------------------------------------------------- */ int XFreeGC( Display *d, GC gc) { | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | *---------------------------------------------------------------------- */ int XFreeGC( Display *d, GC gc) { if (gc != NULL) { FreeClipMask(gc); TkpFreeGCCache(gc); ckfree(gc); } return Success; } |
︙ | ︙ | |||
460 461 462 463 464 465 466 | void TkSetRegion( Display *display, GC gc, TkRegion r) { | | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | void TkSetRegion( Display *display, GC gc, TkRegion r) { if (r == NULL) { Tcl_Panic("must not pass NULL to TkSetRegion for compatibility with X11; use XSetClipMask instead"); } else { TkpClipMask *clip_mask = AllocClipMask(gc); clip_mask->type = TKP_CLIP_REGION; clip_mask->value.region = r; #ifdef MAC_OSX_TK TkpRetainRegion(r); |
︙ | ︙ |
Changes to xlib/xutil.c.
1 2 3 4 5 6 7 8 9 10 11 | /* * xutil.c -- * * This function contains generic X emulation routines. * * Copyright (c) 1995-1996 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ | < | < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * xutil.c -- * * This function contains generic X emulation routines. * * Copyright (c) 1995-1996 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" /* *---------------------------------------------------------------------- * * XInternAtom -- * * This procedure simulates the XInternAtom function by calling Tk_Uid to |
︙ | ︙ |