Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch bug-8162e9b7a9 Excluding Merge-Ins
This is equivalent to a diff from bb6d8521 to a5ac9aad
2024-05-29
| ||
18:45 | Fix [8162e9b7a9]: Fonts are always scaled with UI when creating new instances. Many thanks to Csaba Nemethi! check-in: 087440d5 user: fvogel tags: core-8-6-branch | |
2024-05-28
| ||
21:22 | Request font with pixel size 13 instead of 11, so that font-44.1 passes without Xft under xvfb too. Closed-Leaf check-in: a5ac9aad user: fvogel tags: bug-8162e9b7a9 | |
19:30 | #ifdef DEBUG_FONTSEL --> #if DEBUG_FONTSEL in tkUnixRFont.c check-in: ba812a42 user: fvogel tags: bug-8162e9b7a9 | |
2024-05-19
| ||
02:41 | Attempt to fix [22349fc78a] for macOS. Currently only event-9.16 fails unless there is a timeout waiting for an enter or leave event. check-in: 2734be85 user: culler tags: bug-22349fc78a-v2 | |
2024-05-16
| ||
11:43 | Code formatting, TCL_UNUSED() usage, all backported from 8.7. This makes it easier to backport other parts check-in: 3b607bb8 user: jan.nijtmans tags: core-8-6-branch | |
2024-05-15
| ||
22:00 | Add test font-44.3 demonstrating bug [8162e9b7a9]. check-in: 86036921 user: fvogel tags: bug-8162e9b7a9 | |
11:28 | Experiment: is [84cd707d] the cause of [8162e9b7a9]? I don't see anything wrong with this commit. Closed-Leaf check-in: a2234d91 user: jan.nijtmans tags: backout-84cd707d | |
2024-05-13
| ||
19:14 | Merge 8.6, which means some more Tk_GetPixelsFromObj() improvements check-in: fe606133 user: jan.nijtmans tags: core-8-branch | |
18:32 | Fix [bb52855781]: ttk treeview tests not robust against display scaling check-in: bb6d8521 user: jan.nijtmans tags: core-8-6-branch | |
12:55 | Better way to set the borderwidth of two style elements of the "classic" theme to 2. check-in: 3d3923a2 user: csaba tags: core-8-6-branch | |
08:16 | Backout [de6e3772e2] Closed-Leaf check-in: 308c692b user: jan.nijtmans tags: bug-bb52855781 | |
Changes to .github/workflows/linux-build.yml.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | + | name: Linux on: push: branches: - "main" - "core-8-branch" - "core-8-6-branch" - "bug-8162e9b7a9" tags: - "core-**" permissions: contents: read defaults: run: shell: bash |
︙ |
Changes to .github/workflows/mac-build.yml.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | + | name: macOS on: push: branches: - "main" - "core-8-branch" - "core-8-6-branch" - "bug-8162e9b7a9" tags: - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: |
︙ |
Changes to .github/workflows/win-build.yml.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | + | name: Windows on: push: branches: - "main" - "core-8-branch" - "core-8-6-branch" - "bug-8162e9b7a9" tags: - "core-**" permissions: contents: read env: ERROR_ON_FAILURES: 1 jobs: |
︙ |
Changes to tests/font.test.
︙ | |||
2343 2344 2345 2346 2347 2348 2349 | 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 | - + - + - + - + + + + + + + + | font actual -xyz--*-*-*-*-*-*-*-*-*-*-*-* font actual -xyz-*-*-*-*-*-*-*-*-*-*-*-*-* font actual -xyz-?-*-*-*-*-*-*-*-*-*-*-*-* lindex [font actual -xyz-times-*-*-*-*-*-*-*-*-*-*-*-*] 1 } -result [font actual {times 0} -family] |
︙ |
Changes to unix/tkUnixRFont.c.
︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | + + + + + + + + + + | #include "tkUnixInt.h" #include "tkFont.h" #include <X11/Xft/Xft.h> #define MAX_CACHED_COLORS 16 /* * Debugging support... */ #define DEBUG_FONTSEL 0 #define DEBUG(arguments) \ if (DEBUG_FONTSEL) { \ printf arguments; fflush(stdout); \ } typedef struct { XftFont *ftFont; XftFont *ft0Font; FcPattern *source; FcCharSet *charset; double angle; } UnixFtFace; |
︙ | |||
180 181 182 183 184 185 186 | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | + - + - - - - - - - + + + + + + - - + + - - - + + - + + + + | GetTkFontAttributes( Tk_Window tkwin, XftFont *ftFont, TkFontAttributes *faPtr) { const char *family = "Unknown"; const char *const *familyPtr = &family; double ptSize, dblPxSize, size; |
︙ | |||
454 455 456 457 458 459 460 | 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 | - - + + - | TkFont * TkpGetNativeFont( Tk_Window tkwin, /* For display where font will be used. */ const char *name) /* Platform-specific font name. */ { UnixFtFont *fontPtr; FcPattern *pattern; |
︙ | |||
492 493 494 495 496 497 498 | 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 | - - - - + + + - + | const TkFontAttributes *faPtr) /* Set of attributes to match. */ { XftPattern *pattern; int weight, slant; UnixFtFont *fontPtr; |
︙ | |||
719 720 721 722 723 724 725 | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 | - + | UnixFtFont *fontPtr = (UnixFtFont *) tkfont; XftFont *ftFont; FcChar32 c; XGlyphInfo extents; int clen, curX, newX, curByte, newByte, sawNonSpace; int termByte = 0, termX = 0, errorFlag = 0; Tk_ErrorHandler handler; |
︙ | |||
755 756 757 758 759 760 761 | 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 | - + | termX = curX; sawNonSpace = 0; } } else { sawNonSpace = 1; } |
︙ | |||
798 799 800 801 802 803 804 | 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 | - + - + | } curX = newX; curByte = newByte; } measureCharsEnd: Tk_DeleteErrorHandler(handler); |
︙ | |||
936 937 938 939 940 941 942 | 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | - - + - | int clen, nspec, xStart = x; XftGlyphFontSpec specs[NUM_SPEC]; XGlyphInfo metrics; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (fontPtr->ftDraw == 0) { |
︙ | |||
1077 1078 1079 1080 1081 1082 1083 | 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 | - - + - | int clen, nglyph; FT_UInt glyphs[NUM_SPEC]; XGlyphInfo metrics; XftFont *currentFtFont; int originX, originY; if (fontPtr->ftDraw == 0) { |
︙ | |||
1195 1196 1197 1198 1199 1200 1201 | 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 | - - + - | #else /* !XFT_HAS_FIXED_ROTATED_PLACEMENT */ int clen, nspec; XftGlyphFontSpec specs[NUM_SPEC]; XGlyphInfo metrics; double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0); if (fontPtr->ftDraw == 0) { |
︙ |