Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From cf3bb95034ff1cdb To 1ad1323e10e0c6a0
2025-03-01
| ||
09:55 | merge trunk check-in: fa3abf01 user: fvogel tags: revised_text, tip-466 | |
2025-02-23
| ||
00:53 | Previous commit was almost right, just the wrong file ... check-in: 1ad1323e user: jan.nijtmans tags: revised_text, tip-466 | |
2025-02-22
| ||
17:38 | Move TkObjIsEmpty() implemention from tkConfig.c to tkText.c, so it can be re-used by rtext. Add support for TIP#698 (again, so it can be used by revised_text as well) check-in: 68fa9a67 user: jan.nijtmans tags: revised_text, tip-466 | |
2025-02-21
| ||
16:45 | Merge 9.0 check-in: 91066fc0 user: jan.nijtmans tags: revised_text, tip-466 | |
2025-02-20
| ||
11:17 | Merge 9.0 check-in: cf3bb950 user: jan.nijtmans tags: revised_text, tip-466 | |
09:58 | No longer build Tk 9.0 against Tcl 8.7 check-in: dc60bb76 user: jan.nijtmans tags: trunk, main | |
2025-02-19
| ||
11:08 | Merge 9.0 check-in: 5a15fb28 user: jan.nijtmans tags: revised_text, tip-466 | |
Changes to .github/workflows/mac-build.yml.
︙ | ︙ | |||
9 10 11 12 13 14 15 | - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: xcode: | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: xcode: runs-on: macos-15 defaults: run: shell: bash working-directory: tk/macosx steps: - name: Checkout Tk uses: actions/checkout@v4 |
︙ | ︙ | |||
53 54 55 56 57 58 59 | if [ $nmatches -lt 4 ] then echo "::error::Failure during Test" exit 1 fi timeout-minutes: 30 clang: | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | if [ $nmatches -lt 4 ] then echo "::error::Failure during Test" exit 1 fi timeout-minutes: 30 clang: runs-on: macos-15 strategy: matrix: symbols: - 'no' - 'mem' options: - '--enable-aqua' |
︙ | ︙ |
Changes to README.md.
1 2 3 4 5 6 7 8 9 10 11 12 | # README: Tk This is the **Tk 9.0.2** source distribution. You can get any source release of Tk from [our distribution site](https://sourceforge.net/projects/tcl/files/Tcl/). 9.0 (production release, daily build) [](https://github.com/tcltk/tk/actions/workflows/linux-build.yml?query=branch%3Amain) [](https://github.com/tcltk/tk/actions/workflows/win-build.yml?query=branch%3Amain) [](https://github.com/tcltk/tk/actions/workflows/mac-build.yml?query=branch%3Amain) <br> | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | # README: Tk This is the **Tk 9.0.2** source distribution. You can get any source release of Tk from [our distribution site](https://sourceforge.net/projects/tcl/files/Tcl/). 9.0 (production release, daily build) [](https://github.com/tcltk/tk/actions/workflows/linux-build.yml?query=branch%3Amain) [](https://github.com/tcltk/tk/actions/workflows/win-build.yml?query=branch%3Amain) [](https://github.com/tcltk/tk/actions/workflows/mac-build.yml?query=branch%3Amain) <br> 8.6 (legacy release, daily build) [](https://github.com/tcltk/tk/actions/workflows/linux-build.yml?query=branch%3Acore-8-6-branch) [](https://github.com/tcltk/tk/actions/workflows/win-build.yml?query=branch%3Acore-8-6-branch) [](https://github.com/tcltk/tk/actions/workflows/mac-build.yml?query=branch%3Acore-8-6-branch) ## <a id="intro">1.</a> Introduction This directory contains the sources and documentation for Tk, a cross-platform GUI toolkit implemented with the Tcl scripting language. For details on features, incompatibilities, and potential problems with |
︙ | ︙ |
Changes to generic/tkConfig.c.
︙ | ︙ | |||
137 138 139 140 141 142 143 | static Tcl_Obj * GetConfigList(void *recordPtr, Option *optionPtr, Tk_Window tkwin); static Tcl_Obj * GetObjectForOption(void *recordPtr, Option *optionPtr, Tk_Window tkwin); static Option * GetOption(const char *name, OptionTable *tablePtr); static Option * GetOptionFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, OptionTable *tablePtr); | < | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | static Tcl_Obj * GetConfigList(void *recordPtr, Option *optionPtr, Tk_Window tkwin); static Tcl_Obj * GetObjectForOption(void *recordPtr, Option *optionPtr, Tk_Window tkwin); static Option * GetOption(const char *name, OptionTable *tablePtr); static Option * GetOptionFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, OptionTable *tablePtr); static void FreeOptionInternalRep(Tcl_Obj *objPtr); static void DupOptionInternalRep(Tcl_Obj *, Tcl_Obj *); /* * The structure below defines an object type that is used to cache the result * of looking up an option name. If an object has this type, then its * internalPtr1 field points to the OptionTable in which it was looked up, and |
︙ | ︙ | |||
626 627 628 629 630 631 632 | oldInternalPtr = (char *)&internal.internalForm; } nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)); switch (optionPtr->specPtr->type) { case TK_OPTION_BOOLEAN: { int newBool; | | | 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 | oldInternalPtr = (char *)&internal.internalForm; } nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)); switch (optionPtr->specPtr->type) { case TK_OPTION_BOOLEAN: { int newBool; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newBool = -1; } else if (Tcl_GetBooleanFromObj(nullOK ? NULL : interp, valuePtr, &newBool) != TCL_OK) { if (nullOK && interp) { Tcl_AppendResult(interp, "expected boolean value or \"\" but got \"", Tcl_GetString(valuePtr), "\"", NULL); } |
︙ | ︙ | |||
658 659 660 661 662 663 664 | } break; } case TK_OPTION_INT: { int newInt; if ((optionPtr->specPtr->flags & TYPE_MASK) == 0) { | | | | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 | } break; } case TK_OPTION_INT: { int newInt; if ((optionPtr->specPtr->flags & TYPE_MASK) == 0) { if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newInt = INT_MIN; } else if (Tcl_GetIntFromObj(nullOK ? NULL : interp, valuePtr, &newInt) != TCL_OK) { invalidIntValue: if (nullOK && interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "expected integer or \"\" but got \"%.50s\"", Tcl_GetString(valuePtr))); Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", (char *)NULL); } return TCL_ERROR; } if (internalPtr != NULL) { *((int *)oldInternalPtr) = *((int *)internalPtr); *((int *)internalPtr) = newInt; } } else if ((optionPtr->specPtr->flags & TYPE_MASK) == TYPE_MASK) { Tcl_WideInt newWideInt; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newWideInt = (sizeof(long) > sizeof(int)) ? LONG_MIN : LLONG_MIN; } else if (Tcl_GetWideIntFromObj(nullOK ? NULL : interp, valuePtr, &newWideInt) != TCL_OK) { goto invalidIntValue; } if (internalPtr != NULL) { if (sizeof(long) > sizeof(int)) { |
︙ | ︙ | |||
720 721 722 723 724 725 726 | *((int *)internalPtr) = (int)newIndex; } break; } case TK_OPTION_DOUBLE: { double newDbl; | | | 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | *((int *)internalPtr) = (int)newIndex; } break; } case TK_OPTION_DOUBLE: { double newDbl; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; #if defined(NAN) newDbl = NAN; #else newDbl = 0.0; #endif } else { |
︙ | ︙ | |||
752 753 754 755 756 757 758 | break; } case TK_OPTION_STRING: { char *newStr; const char *value; Tcl_Size length; | | | | 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 | break; } case TK_OPTION_STRING: { char *newStr; const char *value; Tcl_Size length; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; } if (internalPtr != NULL) { if (valuePtr != NULL) { value = Tcl_GetStringFromObj(valuePtr, &length); newStr = (char *)ckalloc(length + 1); strcpy(newStr, value); } else { newStr = NULL; } *((char **)oldInternalPtr) = *((char **)internalPtr); *((char **)internalPtr) = newStr; } break; } case TK_OPTION_STRING_TABLE: { int newValue; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newValue = -1; } else { if (Tcl_GetIndexFromObjStruct(interp, valuePtr, optionPtr->specPtr->clientData, sizeof(char *), optionPtr->specPtr->optionName+1, (nullOK ? TCL_NULL_OK : 0), &newValue) != TCL_OK) { return TCL_ERROR; |
︙ | ︙ | |||
806 807 808 809 810 811 812 | } } break; } case TK_OPTION_COLOR: { XColor *newPtr; | | | | | | | | 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 | } } break; } case TK_OPTION_COLOR: { XColor *newPtr; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newPtr = NULL; } else { newPtr = Tk_AllocColorFromObj(interp, tkwin, valuePtr); if (newPtr == NULL) { return TCL_ERROR; } } if (internalPtr != NULL) { *((XColor **)oldInternalPtr) = *((XColor **)internalPtr); *((XColor **)internalPtr) = newPtr; } break; } case TK_OPTION_FONT: { Tk_Font newFont; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newFont = NULL; } else { newFont = Tk_AllocFontFromObj(interp, tkwin, valuePtr); if (newFont == NULL) { return TCL_ERROR; } } if (internalPtr != NULL) { *((Tk_Font *)oldInternalPtr) = *((Tk_Font *)internalPtr); *((Tk_Font *)internalPtr) = newFont; } break; } case TK_OPTION_STYLE: { Tk_Style newStyle; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newStyle = NULL; } else { newStyle = Tk_AllocStyleFromObj(interp, valuePtr); if (newStyle == NULL) { return TCL_ERROR; } } if (internalPtr != NULL) { *((Tk_Style *)oldInternalPtr) = *((Tk_Style *)internalPtr); *((Tk_Style *)internalPtr) = newStyle; } break; } case TK_OPTION_BITMAP: { Pixmap newBitmap; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newBitmap = None; } else { newBitmap = Tk_AllocBitmapFromObj(interp, tkwin, valuePtr); if (newBitmap == None) { return TCL_ERROR; } } if (internalPtr != NULL) { *((Pixmap *)oldInternalPtr) = *((Pixmap *)internalPtr); *((Pixmap *)internalPtr) = newBitmap; } break; } case TK_OPTION_BORDER: { Tk_3DBorder newBorder; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newBorder = NULL; } else { newBorder = Tk_Alloc3DBorderFromObj(interp, tkwin, valuePtr); if (newBorder == NULL) { return TCL_ERROR; } } if (internalPtr != NULL) { *((Tk_3DBorder *)oldInternalPtr) = *((Tk_3DBorder *)internalPtr); *((Tk_3DBorder *)internalPtr) = newBorder; } break; } case TK_OPTION_RELIEF: { int newRelief; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newRelief = TK_RELIEF_NULL; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkReliefStrings, "relief", (nullOK ? TCL_NULL_OK : 0), &newRelief) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { |
︙ | ︙ | |||
928 929 930 931 932 933 934 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_CURSOR: { Tk_Cursor newCursor; | | | | 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_CURSOR: { Tk_Cursor newCursor; if (nullOK && TkObjIsEmpty(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; } Tk_DefineCursor(tkwin, newCursor); break; } case TK_OPTION_JUSTIFY: { int newJustify; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newJustify = -1; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkJustifyStrings, "justification", (nullOK ? TCL_NULL_OK : 0), &newJustify) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { |
︙ | ︙ | |||
979 980 981 982 983 984 985 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_ANCHOR: { int newAnchor; | | | 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_ANCHOR: { int newAnchor; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newAnchor = -1; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkAnchorStrings, "anchor", (nullOK ? TCL_NULL_OK : 0), &newAnchor) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { |
︙ | ︙ | |||
1011 1012 1013 1014 1015 1016 1017 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_PIXELS: { int newPixels; | | | | 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 | Tcl_InvalidateStringRep(valuePtr); } break; } case TK_OPTION_PIXELS: { int newPixels; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newPixels = INT_MIN; } else if (Tk_GetPixelsFromObj(nullOK ? NULL : interp, tkwin, valuePtr, &newPixels) != TCL_OK) { if (nullOK) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "expected screen distance or \"\" but got \"%.50s\"", Tcl_GetString(valuePtr))); Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", (char *)NULL); } return TCL_ERROR; } if (internalPtr != NULL) { *((int *)oldInternalPtr) = *((int *)internalPtr); *((int *)internalPtr) = newPixels; } break; } case TK_OPTION_WINDOW: { Tk_Window newWin; if (nullOK && TkObjIsEmpty(valuePtr)) { valuePtr = NULL; newWin = NULL; } else if (TkGetWindowFromObj(interp, tkwin, valuePtr, &newWin) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { |
︙ | ︙ | |||
1085 1086 1087 1088 1089 1090 1091 | *slotPtrPtr = valuePtr; if (valuePtr != NULL) { Tcl_IncrRefCount(valuePtr); } } return TCL_OK; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 | *slotPtrPtr = valuePtr; if (valuePtr != NULL) { Tcl_IncrRefCount(valuePtr); } } return TCL_OK; } /* *---------------------------------------------------------------------- * * GetOption -- * * This function searches through a chained option table to find the |
︙ | ︙ |
Changes to generic/tkInt.h.
︙ | ︙ | |||
1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 | Tcl_Size objc, Tcl_Obj *const *objv, int flags); MODULE_SCOPE void TkDrawDottedRect(Display *disp, Drawable d, GC gc, int x, int y, int width, int height); MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp, const char *nsname, const char *name, void *clientData, const TkEnsemble *map); MODULE_SCOPE double TkScalingLevel(Tk_Window tkwin); MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp, void *clientData); MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp, void *clientData); MODULE_SCOPE void TkInitEmbeddedConfigurationInformation( Tcl_Interp *interp); MODULE_SCOPE void TkDoWarpWrtWin(TkDisplay *dispPtr); | > | 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 | Tcl_Size objc, Tcl_Obj *const *objv, int flags); MODULE_SCOPE void TkDrawDottedRect(Display *disp, Drawable d, GC gc, int x, int y, int width, int height); MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp, const char *nsname, const char *name, void *clientData, const TkEnsemble *map); MODULE_SCOPE double TkScalingLevel(Tk_Window tkwin); MODULE_SCOPE int TkObjIsEmpty(Tcl_Obj *objPtr); MODULE_SCOPE int TkInitTkCmd(Tcl_Interp *interp, void *clientData); MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp, void *clientData); MODULE_SCOPE void TkInitEmbeddedConfigurationInformation( Tcl_Interp *interp); MODULE_SCOPE void TkDoWarpWrtWin(TkDisplay *dispPtr); |
︙ | ︙ |
Changes to generic/tkPanedWindow.c.
︙ | ︙ | |||
223 224 225 226 227 228 229 | char *recordPtr, Tcl_Size internalOffset); static void RestoreSticky(void *clientData, Tk_Window tkwin, char *internalPtr, char *oldInternalPtr); static void AdjustForSticky(int sticky, int cavityWidth, int cavityHeight, int *xPtr, int *yPtr, int *paneWidthPtr, int *paneHeightPtr); static void MoveSash(PanedWindow *pwPtr, int sash, int diff); | < | 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | char *recordPtr, Tcl_Size internalOffset); static void RestoreSticky(void *clientData, Tk_Window tkwin, char *internalPtr, char *oldInternalPtr); static void AdjustForSticky(int sticky, int cavityWidth, int cavityHeight, int *xPtr, int *yPtr, int *paneWidthPtr, int *paneHeightPtr); static void MoveSash(PanedWindow *pwPtr, int sash, int diff); static void * ComputeSlotAddress(void *recordPtr, Tcl_Size offset); static int PanedWindowIdentifyCoords(PanedWindow *pwPtr, Tcl_Interp *interp, int x, int y); /* * Sashes are between panes only, so there is one less sash than panes */ |
︙ | ︙ | |||
2498 2499 2500 2501 2502 2503 2504 | int sticky = 0; char c; void *internalPtr; const char *string; internalPtr = ComputeSlotAddress(recordPtr, internalOffset); | | | 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 | int sticky = 0; char c; void *internalPtr; const char *string; internalPtr = ComputeSlotAddress(recordPtr, internalOffset); if (flags & TK_OPTION_NULL_OK && TkObjIsEmpty(*value)) { *value = NULL; } else { /* * Convert the sticky specifier into an integer value. */ string = Tcl_GetString(*value); |
︙ | ︙ | |||
3022 3023 3024 3025 3026 3027 3028 | Tk_MaintainGeometry(pwPtr->proxywin, pwPtr->tkwin, x, y, sashWidth, sashHeight); break; } return TCL_OK; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 | Tk_MaintainGeometry(pwPtr->proxywin, pwPtr->tkwin, x, y, sashWidth, sashHeight); break; } return TCL_OK; } /* *---------------------------------------------------------------------- * * ComputeInternalPointer -- * * Given a pointer to the start of a record and the offset of a slot |
︙ | ︙ |
Changes to generic/tkText.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 | */ #include "tkInt.h" #include "tkText.h" #include "tkTextUndo.h" #include "tkTextTagSet.h" #include "tkBitField.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "tkInt.h" #include "tkText.h" #include "tkTextUndo.h" #include "tkTextTagSet.h" #include "tkBitField.h" #include "tkFont.h" #include <stdlib.h> #include <assert.h> #include "default.h" /* needed for strncasecmp */ #if defined(_WIN32) && !defined(__GNUC__) # define strncasecmp _strnicmp |
︙ | ︙ | |||
8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 | && TkBTreeEpoch(textPtr->sharedTextPtr->tree) == oldStateEpoch; } } /* *---------------------------------------------------------------------- * * TkTextInspectOptions -- * * Build information from option table for "inspect". * * Results: * None. * | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 | && TkBTreeEpoch(textPtr->sharedTextPtr->tree) == oldStateEpoch; } } /* *---------------------------------------------------------------------- * * TkObjIsEmpty -- * * This function tests whether the string value of an object is empty. * * Results: * The return value is 1 if the string value of objPtr has length zero, * and 0 otherwise. * * Side effects: * None. * *---------------------------------------------------------------------- */ #if defined(USE_TCL_STUBS) # undef Tcl_IsEmpty # define Tcl_IsEmpty \ ((int (*)(Tcl_Obj *))(void *)((&(tclStubsPtr->tcl_PkgProvideEx))[690])) #endif int TkObjIsEmpty( Tcl_Obj *objPtr) /* Object to test. May be NULL. */ { if (objPtr == NULL) { return 1; } if (objPtr->bytes == NULL) { #if defined(USE_TCL_STUBS) if (Tcl_IsEmpty) { return Tcl_IsEmpty(objPtr); } #endif Tcl_GetString(objPtr); } return (objPtr->length == 0); } /* *---------------------------------------------------------------------- * * TkTextInspectOptions -- * * Build information from option table for "inspect". * * Results: * None. * |
︙ | ︙ | |||
8147 8148 8149 8150 8151 8152 8153 | if (argc >= 5) { /* only if this option has a non-default value */ Tcl_Obj *valObj = argv[4]; Tcl_Obj *myValObj; Tcl_Obj *nameObj; int myFlags = flags; | | | 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 | if (argc >= 5) { /* only if this option has a non-default value */ Tcl_Obj *valObj = argv[4]; Tcl_Obj *myValObj; Tcl_Obj *nameObj; int myFlags = flags; if (TkObjIsEmpty(valObj)) { continue; } if (!(myFlags & INSPECT_INCLUDE_DATABASE_CONFIG) || myFlags & (INSPECT_INCLUDE_SYSTEM_CONFIG|INSPECT_INCLUDE_DEFAULT_CONFIG)) { const char *name = Tcl_GetString(argv[1]); const char *cls = Tcl_GetString(argv[2]); |
︙ | ︙ | |||
11320 11321 11322 11323 11324 11325 11326 | * May store the TkTextSegment* value into the internal representation * pointer. May change the pointer to the Tcl_Obj to NULL to indicate * that the specified string was empty and that is acceptable. * *---------------------------------------------------------------------- */ | < < < < < < < | 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 | * May store the TkTextSegment* value into the internal representation * pointer. May change the pointer to the Tcl_Obj to NULL to indicate * that the specified string was empty and that is acceptable. * *---------------------------------------------------------------------- */ static int SetTextStartEnd( TCL_UNUSED(void *), TCL_UNUSED(Tcl_Interp *), /* Current interp; may be used for errors. */ TCL_UNUSED(Tk_Window), /* Window for which option is being set. */ Tcl_Obj **value, /* Pointer to the pointer to the value object. * We use a pointer to the pointer because we |
︙ | ︙ | |||
11348 11349 11350 11351 11352 11353 11354 | Tcl_Obj **objPtr = (Tcl_Obj **) (recordPtr + internalOffset); Tcl_Obj **oldObjPtr = (Tcl_Obj **) oldInternalPtr; const TkText *textPtr = (const TkText *) recordPtr; assert(!*objPtr); *oldObjPtr = NULL; | | | 11380 11381 11382 11383 11384 11385 11386 11387 11388 11389 11390 11391 11392 11393 11394 | Tcl_Obj **objPtr = (Tcl_Obj **) (recordPtr + internalOffset); Tcl_Obj **oldObjPtr = (Tcl_Obj **) oldInternalPtr; const TkText *textPtr = (const TkText *) recordPtr; assert(!*objPtr); *oldObjPtr = NULL; if ((flags & TK_OPTION_NULL_OK) && TkObjIsEmpty(*value)) { *value = NULL; *objPtr = Tcl_NewStringObj((objPtr == &textPtr->newStartIndex) ? "begin" : "end", TCL_INDEX_NONE); } else { *objPtr = *value; } Tcl_IncrRefCount(*objPtr); return TCL_OK; |
︙ | ︙ | |||
11499 11500 11501 11502 11503 11504 11505 | if (internalOffset != TCL_INDEX_NONE) { internalPtr = (char *)recordPtr + internalOffset; } else { internalPtr = NULL; } | | | 11531 11532 11533 11534 11535 11536 11537 11538 11539 11540 11541 11542 11543 11544 11545 | if (internalOffset != TCL_INDEX_NONE) { internalPtr = (char *)recordPtr + internalOffset; } else { internalPtr = NULL; } if ((flags & TK_OPTION_NULL_OK) && TkObjIsEmpty(*value)) { *value = NULL; } else { int line; if (Tcl_GetIntFromObj(interp, *value, &line) != TCL_OK) { return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/tkText.h.
︙ | ︙ | |||
1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 | #define INSPECT_INCLUDE_SYSTEM_COLORS (1 << 5) /* * Declarations for procedures that are used by the text-related files but * shouldn't be used anywhere else in Tk (or by Tk clients): */ inline TkSharedText * TkBTreeGetShared(TkTextBTree tree); inline int TkBTreeGetNumberOfDisplayLines(const TkTextPixelInfo *pixelInfo); MODULE_SCOPE void TkBTreeAdjustPixelHeight(const TkText *textPtr, TkTextLine *linePtr, int newPixelHeight, unsigned mergedLogicalLines, unsigned oldNumDispLines); MODULE_SCOPE void TkBTreeUpdatePixelHeights(const TkText *textPtr, TkTextLine *linePtr, int numLines, unsigned epoch); | > | 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 | #define INSPECT_INCLUDE_SYSTEM_COLORS (1 << 5) /* * Declarations for procedures that are used by the text-related files but * shouldn't be used anywhere else in Tk (or by Tk clients): */ MODULE_SCOPE int TkObjIsEmpty(Tcl_Obj *objPtr); inline TkSharedText * TkBTreeGetShared(TkTextBTree tree); inline int TkBTreeGetNumberOfDisplayLines(const TkTextPixelInfo *pixelInfo); MODULE_SCOPE void TkBTreeAdjustPixelHeight(const TkText *textPtr, TkTextLine *linePtr, int newPixelHeight, unsigned mergedLogicalLines, unsigned oldNumDispLines); MODULE_SCOPE void TkBTreeUpdatePixelHeights(const TkText *textPtr, TkTextLine *linePtr, int numLines, unsigned epoch); |
︙ | ︙ |
Changes to generic/tkTextTag.c.
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | * the Text widget. These values are used as indices into the string table below. */ static const char *const justifyStrings[] = { "left", "right", "center", "full", NULL }; static const Tk_OptionSpec tagOptionSpecs[] = { {TK_OPTION_BORDER, "-background", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, attrs.border), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BITMAP, "-bgstipple", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-borderwidth", NULL, NULL, | > > > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | * the Text widget. These values are used as indices into the string table below. */ static const char *const justifyStrings[] = { "left", "right", "center", "full", NULL }; #ifndef TK_OPTION_NEG_OK # define TK_OPTION_NEG_OK (1 << 6) #endif /* TK_OPTION_NEG_OK */ static const Tk_OptionSpec tagOptionSpecs[] = { {TK_OPTION_BORDER, "-background", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, attrs.border), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BITMAP, "-bgstipple", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-borderwidth", NULL, NULL, |
︙ | ︙ | |||
82 83 84 85 86 87 88 | {TK_OPTION_PIXELS, "-lmargin1", NULL, NULL, NULL, offsetof(TkTextTag, lMargin1Obj), offsetof(TkTextTag, lMargin1), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-lmargin2", NULL, NULL, NULL, offsetof(TkTextTag, lMargin2Obj), offsetof(TkTextTag, lMargin2), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BORDER, "-lmargincolor", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, lMarginColor), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-offset", NULL, NULL, | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | {TK_OPTION_PIXELS, "-lmargin1", NULL, NULL, NULL, offsetof(TkTextTag, lMargin1Obj), offsetof(TkTextTag, lMargin1), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-lmargin2", NULL, NULL, NULL, offsetof(TkTextTag, lMargin2Obj), offsetof(TkTextTag, lMargin2), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BORDER, "-lmargincolor", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, lMarginColor), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-offset", NULL, NULL, NULL, offsetof(TkTextTag, offsetObj), offsetof(TkTextTag, offset), TK_OPTION_NULL_OK|TK_OPTION_NEG_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-overstrike", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, overstrike), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_COLOR, "-overstrikecolor", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextTag, overstrikeColor), TK_OPTION_NULL_OK, 0, 0}, #if SUPPORT_DEPRECATED_TAG_OPTIONS {TK_OPTION_SYNONYM, "-overstrikefg", NULL, NULL, NULL, 0, TCL_INDEX_NONE, TK_OPTION_NULL_OK, "-overstrikecolor", TK_TEXT_DEPRECATED_OVERSTRIKE_FG}, |
︙ | ︙ |
Changes to generic/tkTextWind.c.
︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | typedef enum { ALIGN_BASELINE, ALIGN_BOTTOM, ALIGN_CENTER, ALIGN_TOP } alignMode; /* * Information used for parsing window configuration options: */ static const Tk_OptionSpec optionSpecs[] = { {TK_OPTION_STRING_TABLE, "-align", NULL, NULL, "center", TCL_INDEX_NONE, offsetof(TkTextEmbWindow, align), 0, alignStrings, 0}, {TK_OPTION_STRING, "-create", NULL, NULL, NULL, offsetof(TkTextEmbWindow, createObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-owner", NULL, NULL, "1", TCL_INDEX_NONE, offsetof(TkTextEmbWindow, isOwner), 0, 0, 0}, {TK_OPTION_PIXELS, "-padx", NULL, NULL, | > > > > > | | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | typedef enum { ALIGN_BASELINE, ALIGN_BOTTOM, ALIGN_CENTER, ALIGN_TOP } alignMode; /* * Information used for parsing window configuration options: */ #ifndef TK_OPTION_NEG_OK # define TK_OPTION_NEG_OK (1 << 6) #endif /* TK_OPTION_NEG_OK */ static const Tk_OptionSpec optionSpecs[] = { {TK_OPTION_STRING_TABLE, "-align", NULL, NULL, "center", TCL_INDEX_NONE, offsetof(TkTextEmbWindow, align), 0, alignStrings, 0}, {TK_OPTION_STRING, "-create", NULL, NULL, NULL, offsetof(TkTextEmbWindow, createObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-owner", NULL, NULL, "1", TCL_INDEX_NONE, offsetof(TkTextEmbWindow, isOwner), 0, 0, 0}, {TK_OPTION_PIXELS, "-padx", NULL, NULL, "0", offsetof(TkTextEmbWindow, padXObj), offsetof(TkTextEmbWindow, padX), TK_OPTION_NEG_OK, 0, 0}, {TK_OPTION_PIXELS, "-pady", NULL, NULL, "0", offsetof(TkTextEmbWindow, padYObj), offsetof(TkTextEmbWindow, padY), TK_OPTION_NEG_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-stretch", NULL, NULL, "0", TCL_INDEX_NONE, offsetof(TkTextEmbWindow, stretch), 0, 0, 0}, {TK_OPTION_STRING, "-tags", NULL, NULL, NULL, TCL_INDEX_NONE, TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_WINDOW, "-window", NULL, NULL, NULL, TCL_INDEX_NONE, offsetof(TkTextEmbWindow, tkwin), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0} |
︙ | ︙ |
Changes to tests/config.test.
︙ | ︙ | |||
1113 1114 1115 1116 1117 1118 1119 | testobjconfig internal .foo -custom "this is a test" .foo cget -custom } -cleanup { killTables } -result {THIS IS A TEST} | | | | | 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 | testobjconfig internal .foo -custom "this is a test" .foo cget -custom } -cleanup { killTables } -result {THIS IS A TEST} test config-5.1 {TkObjIsEmpty - object is already string} -constraints { testobjconfig } -body { testobjconfig alltypes .foo -color [format ""] .foo cget -color } -cleanup { killTables } -result {} test config-5.2 {TkObjIsEmpty - object is already string} -constraints { testobjconfig } -body { testobjconfig alltypes .foo -color [format " "] } -cleanup { killTables } -returnCodes error -result {unknown color name " "} test config-5.3 {TkObjIsEmpty - must convert back to string} -constraints { testobjconfig } -body { testobjconfig alltypes .foo -color [list] .foo cget -color } -cleanup { killTables } -result {} |
︙ | ︙ |
Changes to tests/focus.test.
︙ | ︙ | |||
42 43 44 45 46 47 48 | # is needed to wait long enough for pending actions to get through # the X server and possibly also the window manager. proc focusClear {} { dobg {after 200; focus -force .; update} after 400 if {[tk windowingsystem] eq "aqua"} { | | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | # is needed to wait long enough for pending actions to get through # the X server and possibly also the window manager. proc focusClear {} { dobg {after 200; focus -force .; update} after 400 if {[tk windowingsystem] eq "aqua"} { # In Aqua we need to explicitly wait until focus is cleared. while {[focus] != ""} { after 100 {set y 1} tkwait variable y } } update } # Button used in some tests in the whole test file button .b -text .b -relief raised -bd 2 pack .b |
︙ | ︙ |