Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge with trunk |
|---|---|
| Timelines: | family | ancestors | descendants | both | wtf-8-experiment |
| Files: | files | file ages | folders |
| SHA1: |
13d045d6bbb36fe4109c73ec3af3413b |
| User & Date: | chw 2019-06-01 19:50:25 |
Context
|
2019-06-07
| ||
| 04:37 | merge with trunk check-in: 5a8008f56a user: chw tags: wtf-8-experiment | |
|
2019-06-01
| ||
| 19:50 | merge with trunk check-in: 13d045d6bb user: chw tags: wtf-8-experiment | |
| 19:49 | add tk upstream changes check-in: 24f34e2fc4 user: chw tags: trunk | |
|
2019-05-31
| ||
| 17:24 | merge with trunk check-in: 9e57d32c2f user: chw tags: wtf-8-experiment | |
Changes
Changes to jni/sdl2tk/macosx/ttkMacOSXTheme.c.
71 72 73 74 75 76 77 78 79 80 81 82 83 84 .... 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 .... 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 .... 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 .... 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 |
};
static CGFloat darkDisabledButtonFace[4] = {
86.0 / 255, 87.0 / 255, 89.0 / 255, 1.0
};
static CGFloat darkInactiveSelectedTab[4] = {
159.0 / 255, 160.0 / 255, 161.0 / 255, 1.0
};
static CGFloat darkTabSeparator[4] = {0.0, 0.0, 0.0, 0.25};
static CGFloat darkTrack[4] = {1.0, 1.0, 1.0, 0.25};
static CGFloat darkFrameTop[4] = {1.0, 1.0, 1.0, 0.0625};
static CGFloat darkFrameBottom[4] = {1.0, 1.0, 1.0, 0.125};
static CGFloat darkFrameAccent[4] = {0.0, 0.0, 0.0, 0.0625};
static CGFloat darkTopGradient[8] = {
1.0, 1.0, 1.0, 0.3,
................................................................................
components: fill
count:4];
CGContextSetFillColorWithColor(context, CGCOLOR(fillColor));
CGContextFillRect(context, bounds);
}
/*----------------------------------------------------------------------
* +++ DrawDarkFrame --
*
* This is a standalone drawing procedure which draws various
* types of borders in Dark Mode.
*/
................................................................................
NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
NSColor *stroke;
CGContextSetStrokeColorSpace(context, deviceRGB.CGColorSpace);
CGFloat x = bounds.origin.x, y = bounds.origin.y;
CGFloat w = bounds.size.width, h = bounds.size.height;
CGPoint topPart[4] = {
{x, y + h - 1}, {x, y}, {x + w, y}, {x + w, y + h - 1}
};
CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
CGPoint accent[2] = {{x, y + 1}, {x + w, y + 1}};
switch (kind) {
case kHIThemeFrameTextFieldSquare:
CGContextSaveGState(context);
CGContextSetShouldAntialias(context, false);
................................................................................
void *clientData,
void *elementRecord,
Tk_Window tkwin,
int *minWidth,
int *minHeight,
Ttk_Padding *paddingPtr)
{
*paddingPtr = Ttk_UniformPadding(5);
}
static void EntryElementDraw(
void *clientData,
void *elementRecord,
Tk_Window tkwin,
Drawable d,
................................................................................
static const char *defaultBG = ENTRY_DEFAULT_BACKGROUND;
if (TkMacOSXInDarkMode(tkwin)) {
BEGIN_DRAWING(d)
NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
CGFloat fill[4];
GetBackgroundColor(dc.context, tkwin, 1, fill);
background = [NSColor colorWithColorSpace: deviceRGB
components: fill
count: 4];
CGContextSetFillColorWithColor(dc.context, CGCOLOR(background));
CGContextFillRect(dc.context, bounds);
DrawDarkFrame(bounds, dc.context, kHIThemeFrameTextFieldSquare);
END_DRAWING
} else {
const HIThemeFrameDrawInfo info = {
.version = 0,
.kind = kHIThemeFrameTextFieldSquare,
.state = Ttk_StateTableLookup(ThemeStateTable, state),
.isFocused = state & TTK_STATE_FOCUS,
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > | > |
71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 .... 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 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 .... 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 .... 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 .... 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 |
};
static CGFloat darkDisabledButtonFace[4] = {
86.0 / 255, 87.0 / 255, 89.0 / 255, 1.0
};
static CGFloat darkInactiveSelectedTab[4] = {
159.0 / 255, 160.0 / 255, 161.0 / 255, 1.0
};
static CGFloat darkFocusRing[4] = {
38.0 / 255, 113.0 / 255, 159.0 / 255, 1.0
};
static CGFloat darkFocusRingTop[4] = {
50.0 / 255, 124.0 / 255, 171.0 / 255, 1.0
};
static CGFloat darkFocusRingBottom[4] = {
57.0 / 255, 130.0 / 255, 176.0 / 255, 1.0
};
static CGFloat darkTabSeparator[4] = {0.0, 0.0, 0.0, 0.25};
static CGFloat darkTrack[4] = {1.0, 1.0, 1.0, 0.25};
static CGFloat darkFrameTop[4] = {1.0, 1.0, 1.0, 0.0625};
static CGFloat darkFrameBottom[4] = {1.0, 1.0, 1.0, 0.125};
static CGFloat darkFrameAccent[4] = {0.0, 0.0, 0.0, 0.0625};
static CGFloat darkTopGradient[8] = {
1.0, 1.0, 1.0, 0.3,
................................................................................
components: fill
count:4];
CGContextSetFillColorWithColor(context, CGCOLOR(fillColor));
CGContextFillRect(context, bounds);
}
/*----------------------------------------------------------------------
* +++ DrawDarkFocusRing --
*
* This is a standalone drawing procedure which draws a focus ring around
* an Entry widget in Dark Mode.
*/
static void DrawDarkFocusRing(
CGRect bounds,
CGContextRef context)
{
NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
NSColor *strokeColor;
NSColor *fillColor = [NSColor colorWithColorSpace:deviceRGB
components:darkFocusRing
count:4];
CGFloat x = bounds.origin.x, y = bounds.origin.y;
CGFloat w = bounds.size.width, h = bounds.size.height;
CGPoint topPart[4] = {
{x, y + h}, {x, y + 1}, {x + w - 1, y + 1}, {x + w - 1, y + h}
};
CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
CGRect outerRect = CGRectInset(bounds, -3, -3);
CGContextSaveGState(context);
CGContextSetShouldAntialias(context, false);
CGContextBeginPath(context);
strokeColor = [NSColor colorWithColorSpace: deviceRGB
components: darkFocusRingTop
count: 4];
CGContextSetStrokeColorWithColor(context, CGCOLOR(strokeColor));
CGContextAddLines(context, topPart, 4);
CGContextStrokePath(context);
strokeColor = [NSColor colorWithColorSpace: deviceRGB
components: darkFocusRingBottom
count: 4];
CGContextSetStrokeColorWithColor(context, CGCOLOR(strokeColor));
CGContextAddLines(context, bottom, 2);
CGContextStrokePath(context);
CGContextSetShouldAntialias(context, true);
CGContextSetFillColorWithColor(context, CGCOLOR(fillColor));
CGPathRef path = CGPathCreateWithRoundedRect(outerRect, 4, 4, NULL);
CGContextBeginPath(context);
CGContextAddPath(context, path);
CGContextAddRect(context, bounds);
CGContextEOFillPath(context);
CGContextRestoreGState(context);
}
/*----------------------------------------------------------------------
* +++ DrawDarkFrame --
*
* This is a standalone drawing procedure which draws various
* types of borders in Dark Mode.
*/
................................................................................
NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
NSColor *stroke;
CGContextSetStrokeColorSpace(context, deviceRGB.CGColorSpace);
CGFloat x = bounds.origin.x, y = bounds.origin.y;
CGFloat w = bounds.size.width, h = bounds.size.height;
CGPoint topPart[4] = {
{x, y + h - 1}, {x, y + 1}, {x + w, y + 1}, {x + w, y + h - 1}
};
CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
CGPoint accent[2] = {{x, y + 1}, {x + w, y + 1}};
switch (kind) {
case kHIThemeFrameTextFieldSquare:
CGContextSaveGState(context);
CGContextSetShouldAntialias(context, false);
................................................................................
void *clientData,
void *elementRecord,
Tk_Window tkwin,
int *minWidth,
int *minHeight,
Ttk_Padding *paddingPtr)
{
*paddingPtr = Ttk_MakePadding(7, 5, 7, 6);
}
static void EntryElementDraw(
void *clientData,
void *elementRecord,
Tk_Window tkwin,
Drawable d,
................................................................................
static const char *defaultBG = ENTRY_DEFAULT_BACKGROUND;
if (TkMacOSXInDarkMode(tkwin)) {
BEGIN_DRAWING(d)
NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
CGFloat fill[4];
GetBackgroundColor(dc.context, tkwin, 1, fill);
/*
* Lighten the background to provide contrast.
*/
for (int i = 0; i < 3; i++) {
fill[i] += 9.0 / 255.0;
}
background = [NSColor colorWithColorSpace: deviceRGB
components: fill
count: 4];
CGContextSetFillColorWithColor(dc.context, CGCOLOR(background));
CGContextFillRect(dc.context, bounds);
if (state & TTK_STATE_FOCUS) {
DrawDarkFocusRing(bounds, dc.context);
} else {
DrawDarkFrame(bounds, dc.context, kHIThemeFrameTextFieldSquare);
}
END_DRAWING
} else {
const HIThemeFrameDrawInfo info = {
.version = 0,
.kind = kHIThemeFrameTextFieldSquare,
.state = Ttk_StateTableLookup(ThemeStateTable, state),
.isFocused = state & TTK_STATE_FOCUS,
|
Changes to jni/tcl/tools/genStubs.tcl.
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
...
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
|
set pad 28
}
append line $next
set sep ", "
}
append line ", ...)"
if {[lindex $args end] eq "{const char *} format"} {
append line " TCL_FORMAT_PRINTF(" [expr [llength $args] - 1] ", " [llength $args] ")"
}
}
default {
set sep "("
foreach arg $args {
append line $sep
set next {}
................................................................................
append text " "
}
append text [lindex $arg 1] [lindex $arg 2]
set sep ", "
}
append text ", ...)"
if {[lindex $args end] eq "{const char *} format"} {
append text " TCL_FORMAT_PRINTF(" [expr [llength $args] - 1] ", " [llength $args] ")"
}
}
default {
set sep "("
foreach arg $args {
append text $sep [lindex $arg 0]
if {[string index $text end] ne "*"} {
|
|
|
|
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
...
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
|
set pad 28
}
append line $next
set sep ", "
}
append line ", ...)"
if {[lindex $args end] eq "{const char *} format"} {
append line " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
}
}
default {
set sep "("
foreach arg $args {
append line $sep
set next {}
................................................................................
append text " "
}
append text [lindex $arg 1] [lindex $arg 2]
set sep ", "
}
append text ", ...)"
if {[lindex $args end] eq "{const char *} format"} {
append text " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
}
}
default {
set sep "("
foreach arg $args {
append text $sep [lindex $arg 0]
if {[string index $text end] ne "*"} {
|
Changes to jni/tcl/tools/man2help2.tcl.
823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 |
} elseif {$length == 1} {
set indent 5
}
if {$text == {\(bu}} {
set text "\u00b7"
}
set tab [expr $indent * 0.1]i
newPara $tab -$tab
set state(sb) 80
setTabs $tab
formattedText $text
tab
}
|
| |
823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 |
} elseif {$length == 1} {
set indent 5
}
if {$text == {\(bu}} {
set text "\u00b7"
}
set tab [expr {$indent * 0.1}]i
newPara $tab -$tab
set state(sb) 80
setTabs $tab
formattedText $text
tab
}
|
Changes to jni/tcl/tools/man2html2.tcl.
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 ... 467 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 ... 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 |
# string - Text to output in the paragraph.
proc text string {
global file textState inDT charCnt inTable
set pos [string first "\t" $string]
if {$pos >= 0} {
text [string range $string 0 [expr $pos-1]]
tab
text [string range $string [expr $pos+1] end]
return
}
if {$inTable} {
if {$inTable == 1} {
puts -nonewline $file <TR>
set inTable 2
}
................................................................................
# puts "formattedText: $text"
while {$text ne ""} {
set index [string first \\ $text]
if {$index < 0} {
text $text
return
}
text [string range $text 0 [expr $index-1]]
set c [string index $text [expr $index+1]]
switch -- $c {
f {
font [string index $text [expr $index+2]]
set text [string range $text [expr $index+3] end]
}
e {
text \\
set text [string range $text [expr $index+2] end]
}
- {
dash
set text [string range $text [expr $index+2] end]
}
| {
set text [string range $text [expr $index+2] end]
}
default {
puts stderr "Unknown sequence: \\$c"
set text [string range $text [expr $index+2] end]
}
}
}
}
##############################################################################
# dash --
................................................................................
# Arguments:
# None.
proc tab {} {
global inPRE charCnt tabString file
# ? charCnt
if {$inPRE == 1} {
set pos [expr $charCnt % [string length $tabString] ]
set spaces [string first "1" [string range $tabString $pos end] ]
text [format "%*s" [incr spaces] " "]
} else {
# puts "tab: found tab outside of <PRE> block"
}
}
|
| | | | | | | | | | | |
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 ... 467 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 ... 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 |
# string - Text to output in the paragraph.
proc text string {
global file textState inDT charCnt inTable
set pos [string first "\t" $string]
if {$pos >= 0} {
text [string range $string 0 [expr {$pos-1}]]
tab
text [string range $string [expr {$pos+1}] end]
return
}
if {$inTable} {
if {$inTable == 1} {
puts -nonewline $file <TR>
set inTable 2
}
................................................................................
# puts "formattedText: $text"
while {$text ne ""} {
set index [string first \\ $text]
if {$index < 0} {
text $text
return
}
text [string range $text 0 [expr {$index-1}]]
set c [string index $text [expr {$index+1}]]
switch -- $c {
f {
font [string index $text [expr {$index+2}]]
set text [string range $text [expr {$index+3}] end]
}
e {
text \\
set text [string range $text [expr {$index+2}] end]
}
- {
dash
set text [string range $text [expr {$index+2}] end]
}
| {
set text [string range $text [expr {$index+2}] end]
}
default {
puts stderr "Unknown sequence: \\$c"
set text [string range $text [expr {$index+2}] end]
}
}
}
}
##############################################################################
# dash --
................................................................................
# Arguments:
# None.
proc tab {} {
global inPRE charCnt tabString file
# ? charCnt
if {$inPRE == 1} {
set pos [expr {$charCnt % [string length $tabString]}]
set spaces [string first "1" [string range $tabString $pos end] ]
text [format "%*s" [incr spaces] " "]
} else {
# puts "tab: found tab outside of <PRE> block"
}
}
|
Changes to jni/tcl/tools/regexpTestLib.tcl.
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
...
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
set fileId [open $inFileName r]
set i 0
while {[gets $fileId line] >= 0} {
set len [string length $line]
if {($len > 0) && ([string index $line [expr $len - 1]] == "\\")} {
if {[info exists lineArray(c$i)] == 0} {
set lineArray(c$i) 1
} else {
incr lineArray(c$i)
}
set line [string range $line 0 [expr $len - 2]]
append lineArray($i) $line
continue
}
if {[info exists lineArray(c$i)] == 0} {
set lineArray(c$i) 1
} else {
incr lineArray(c$i)
................................................................................
}
set str [lindex $currentLine 2]
}
set flags [removeFlags $flags]
# find the test result
set numVars [expr $len - 3]
set vars {}
set vals {}
set result 0
set v 0
if {[regsub {\*} "$flags" "" newFlags] == 1} {
# an error is expected
|
|
|
|
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
...
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
set fileId [open $inFileName r]
set i 0
while {[gets $fileId line] >= 0} {
set len [string length $line]
if {($len > 0) && ([string index $line [expr {$len - 1}]] == "\\")} {
if {[info exists lineArray(c$i)] == 0} {
set lineArray(c$i) 1
} else {
incr lineArray(c$i)
}
set line [string range $line 0 [expr {$len - 2}]]
append lineArray($i) $line
continue
}
if {[info exists lineArray(c$i)] == 0} {
set lineArray(c$i) 1
} else {
incr lineArray(c$i)
................................................................................
}
set str [lindex $currentLine 2]
}
set flags [removeFlags $flags]
# find the test result
set numVars [expr {$len - 3}]
set vars {}
set vals {}
set result 0
set v 0
if {[regsub {\*} "$flags" "" newFlags] == 1} {
# an error is expected
|
Changes to jni/tcl/tools/str2c.
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
} else {
puts "/*
* Multi parts read only string generated by str2c
*/
static const char * const data\[\]= {"
set n 1
for {set i 0} {$i<$lg} {incr i $MAX} {
set part [string range $r $i [expr $i+$MAX-1]]
set len [string length $part];
puts "\t/* Start of part $n ($len characters) */"
puts "\t\"[translate $part]\","
puts "\t/* End of part $n */\n"
incr n
}
puts "\tNULL\t/* End of data marker */\n};"
|
| |
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
} else {
puts "/*
* Multi parts read only string generated by str2c
*/
static const char * const data\[\]= {"
set n 1
for {set i 0} {$i<$lg} {incr i $MAX} {
set part [string range $r $i [expr {$i+$MAX-1}]]
set len [string length $part];
puts "\t/* Start of part $n ($len characters) */"
puts "\t\"[translate $part]\","
puts "\t/* End of part $n */\n"
incr n
}
puts "\tNULL\t/* End of data marker */\n};"
|