Check-in [48cced02cb]
Not logged in

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: 48cced02cb010b40e2ca9f494038cb47a2afbb95
User & Date: chw 2019-09-02 12:01:02
Context
2019-09-03
06:51
merge with trunk check-in: f02026baf6 user: chw tags: wtf-8-experiment
2019-09-02
12:01
merge with trunk check-in: 48cced02cb user: chw tags: wtf-8-experiment
11:57
add selected tcl upstream changes check-in: 9bdbb7617c user: chw tags: trunk
2019-08-30
15:58
merge with trunk check-in: 707575488b user: chw tags: wtf-8-experiment
Changes

Changes to assets/tkinspect5.1.6/lists.tcl.

140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
    member menu
    member contents {}
    member search_index 0
    method create {} {
        $self config -bd 0 -relief raised
        pack [label $self.title -anchor w] -side top -fill x
        frame $self.frame
        pack $self.frame -side top -fill x
        ttk::scrollbar $self.sb -command [list $self.list yview]
        ttk::scrollbar $self.sb2 -command [list $self.list xview] \
	    -orient horizontal
        listbox $self.list -exportselection 0 \
            -yscroll [list $self.sb set] -selectmode single \
            -xscroll [list $self.sb2 set]
        bind $self.list <1> [subst {$self click %x %y ; continue}]







|







140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
    member menu
    member contents {}
    member search_index 0
    method create {} {
        $self config -bd 0 -relief raised
        pack [label $self.title -anchor w] -side top -fill x
        frame $self.frame
        pack $self.frame -side top -fill both -expand yes
        ttk::scrollbar $self.sb -command [list $self.list yview]
        ttk::scrollbar $self.sb2 -command [list $self.list xview] \
	    -orient horizontal
        listbox $self.list -exportselection 0 \
            -yscroll [list $self.sb set] -selectmode single \
            -xscroll [list $self.sb2 set]
        bind $self.list <1> [subst {$self click %x %y ; continue}]

Changes to assets/tkinspect5.1.6/tkinspect.tcl.

182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
...
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
...
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
	pack [set f [frame $self.buttons -bd 0]] -side top -fill x
	label $f.cmd_label -text " Command: "
	pack $f.cmd_label -side left
	ttk::entry $f.command
	bind $f.command <Return> [subst -nocommands {
	    $self send_command [%W get]
	}]
	pack $f.command -side left -fill x -expand 1
	ttk::button $f.send_command -text "Send Command" \
	    -command [subst -nocommands {
		$self send_command [$f.command get]
	    }]
	pack $f.send_command -side left -padx {4 2} -pady 4
	ttk::button $f.send_value -text "Send Value" \
	    -command [list $self.value send_value]
	pack $f.send_value -side left -padx {2 4} -pady 4

        pack [panedwindow $self.pane -showhandle 0 -orient vertical] \
	    -side top -fill both
        $self.pane add [panedwindow $self.lists -showhandle 0]
	$self.pane paneconfigure $self.lists -sticky nsew -stretch always \
	    -minsize 100

	value $self.value -main $self
	$self.pane add $self.value
	$self.pane paneconfigure $self.value -sticky nsew -stretch always \
................................................................................
	foreach topic $tkinspect(help_topics) {
	    $m add command -label $topic -command [list $self help $topic] \
		-underline 0
	}

	pack [frame $self.status] -side top -fill x
	label $self.status.l -anchor w -bd 0 -relief sunken
	pack $self.status.l -side left -fill x -expand 1
	set slot(windows_info) [object_new windows_info]
	wm iconname $self $tkinspect(title)
	wm title $self "$tkinspect(title): $slot(target)"
	$self status "Ready."
    }
    method reconfig {} {
    }
................................................................................
	frame $self.top
	pack $self.top -side top -fill x
	label $self.l -text "Connect to:"
	ttk::entry $self.e
	bind $self.e <Return> [list $self connect]
	bind $self.e <Escape> [list destroy $self]
	pack $self.l -in $self.top -side left
	pack $self.e -in $self.top -fill x -expand 1
	ttk::button $self.close -text "OK" -width 8 \
	    -command [list $self connect]
	ttk::button $self.cancel -text "Cancel" -width 8 \
	    -command [list destroy $self]
	pack $self.close $self.cancel -side left
	wm title $self "Connect to Interp.."
	wm iconname $self "Connect to Interp.."







|










|







 







|







 







|







182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
...
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
...
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
	pack [set f [frame $self.buttons -bd 0]] -side top -fill x
	label $f.cmd_label -text " Command: "
	pack $f.cmd_label -side left
	ttk::entry $f.command
	bind $f.command <Return> [subst -nocommands {
	    $self send_command [%W get]
	}]
	pack $f.command -side left -fill x -expand yes
	ttk::button $f.send_command -text "Send Command" \
	    -command [subst -nocommands {
		$self send_command [$f.command get]
	    }]
	pack $f.send_command -side left -padx {4 2} -pady 4
	ttk::button $f.send_value -text "Send Value" \
	    -command [list $self.value send_value]
	pack $f.send_value -side left -padx {2 4} -pady 4

        pack [panedwindow $self.pane -showhandle 0 -orient vertical] \
	    -side top -fill both -expand yes
        $self.pane add [panedwindow $self.lists -showhandle 0]
	$self.pane paneconfigure $self.lists -sticky nsew -stretch always \
	    -minsize 100

	value $self.value -main $self
	$self.pane add $self.value
	$self.pane paneconfigure $self.value -sticky nsew -stretch always \
................................................................................
	foreach topic $tkinspect(help_topics) {
	    $m add command -label $topic -command [list $self help $topic] \
		-underline 0
	}

	pack [frame $self.status] -side top -fill x
	label $self.status.l -anchor w -bd 0 -relief sunken
	pack $self.status.l -side left -fill x -expand yes
	set slot(windows_info) [object_new windows_info]
	wm iconname $self $tkinspect(title)
	wm title $self "$tkinspect(title): $slot(target)"
	$self status "Ready."
    }
    method reconfig {} {
    }
................................................................................
	frame $self.top
	pack $self.top -side top -fill x
	label $self.l -text "Connect to:"
	ttk::entry $self.e
	bind $self.e <Return> [list $self connect]
	bind $self.e <Escape> [list destroy $self]
	pack $self.l -in $self.top -side left
	pack $self.e -in $self.top -fill x -expand yes
	ttk::button $self.close -text "OK" -width 8 \
	    -command [list $self connect]
	ttk::button $self.cancel -text "Cancel" -width 8 \
	    -command [list destroy $self]
	pack $self.close $self.cancel -side left
	wm title $self "Connect to Interp.."
	wm iconname $self "Connect to Interp.."

Changes to jni/sdl2tk/macosx/tkMacOSXMenu.c.

804
805
806
807
808
809
810
811


812

813
814
815
816
817














818
819
820
821
822
823
824
825
    TkMenu *menuPtr,		/* The menu we are posting */
    int x, int y,		/* The screen coordinates where the top left
				 * corner of the menu, or of the specified
				 * entry, will be located. */
    int index)
{
    int result;
    Tk_Window root = Tk_MainWindow(interp);




    if (root == NULL) {
	return TCL_ERROR;
    }
    Drawable d = Tk_WindowId(root);
    NSView *rootview = TkMacOSXGetRootControl(d);














    NSWindow *win = [rootview window];
    NSView *view = [win contentView];
    NSMenu *menu = (NSMenu *) menuPtr->platformData;
    NSInteger itemIndex = index;
    NSInteger numItems = [menu numberOfItems];
    NSMenuItem *item = nil;
    NSPoint location = NSMakePoint(x, tkMacOSXZeroScreenHeight - y);








|
>
>

>
|
|
|
<
<
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|







804
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
    TkMenu *menuPtr,		/* The menu we are posting */
    int x, int y,		/* The screen coordinates where the top left
				 * corner of the menu, or of the specified
				 * entry, will be located. */
    int index)
{
    int result;
    Tk_Window realWin = menuPtr->tkwin;
    TkWindow *realWinPtr;
    NSView *realWinView;

    while (1) {
	if (realWin == NULL) {
	    return TCL_ERROR;
	}


	/*
	 * Fix for bug 07cfc9f03e: use the view for the parent real (non-menu)
	 * toplevel window, rather than always using the root window.
	 * This allows menus to appear on a separate monitor than the root
	 * window, and to use the appearance of their parent real window
	 * rather than the appearance of the root window.
	 */
	realWinPtr = (TkWindow*) realWin;
	realWinView = TkMacOSXDrawableView(realWinPtr->privatePtr);
	if (realWinView != nil) {
	    break;
	}
	realWin = Tk_Parent(realWin);
    }
    NSWindow *win = [realWinView window];
    NSView *view = [win contentView];
    NSMenu *menu = (NSMenu *) menuPtr->platformData;
    NSInteger itemIndex = index;
    NSInteger numItems = [menu numberOfItems];
    NSMenuItem *item = nil;
    NSPoint location = NSMakePoint(x, tkMacOSXZeroScreenHeight - y);

Changes to jni/sdl2tk/tests/frame.test.

624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
    deleteWindows
} -result {350 black 90}
# Be sure that the -class, -colormap, and -visual options are processed
# before configuring the widget.
test frame-3.5 {TkCreateFrame procedure} -setup {
    deleteWindows
} -body {
    option add *NewFrame.background #123456
    frame .f -class NewFrame
    lindex [.f configure -background] 4
} -cleanup {
    deleteWindows
    option clear
} -result {#123456}
test frame-3.6 {TkCreateFrame procedure} -setup {
    deleteWindows
} -body {
    option add *NewFrame.background #123456
    frame .f -class NewFrame
    lindex [.f configure -background] 4
} -cleanup {
    deleteWindows
    option clear
} -result {#123456}







<
<
<
<
<
<
<
<
<
<







624
625
626
627
628
629
630










631
632
633
634
635
636
637
    deleteWindows
} -result {350 black 90}
# Be sure that the -class, -colormap, and -visual options are processed
# before configuring the widget.
test frame-3.5 {TkCreateFrame procedure} -setup {
    deleteWindows
} -body {










    option add *NewFrame.background #123456
    frame .f -class NewFrame
    lindex [.f configure -background] 4
} -cleanup {
    deleteWindows
    option clear
} -result {#123456}

Changes to jni/tcl/generic/tclEvent.c.

1465
1466
1467
1468
1469
1470
1471

1472
1473
1474
1475
1476
1477
1478
1479
    const char *name1,		/* Name of variable. */
    const char *name2,		/* Second part of variable name. */
    int flags)			/* Information about what happened. */
{
    int *donePtr = clientData;

    *donePtr = 1;

    Tcl_UntraceVar(interp, name1, TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
	    VwaitVarProc, clientData);
    return NULL;
}
 
/*
 *----------------------------------------------------------------------
 *







>
|







1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
    const char *name1,		/* Name of variable. */
    const char *name2,		/* Second part of variable name. */
    int flags)			/* Information about what happened. */
{
    int *donePtr = clientData;

    *donePtr = 1;
    Tcl_UntraceVar2(interp, name1, name2,
	    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
	    VwaitVarProc, clientData);
    return NULL;
}
 
/*
 *----------------------------------------------------------------------
 *

Changes to jni/tcl/tests/compile.test.

482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
	    append code "\}$e"
	}
	#puts [format "%% %.40s ... %d bytes" $code [string length $code]]
	return $code
    }}
} -body {
    # Test different compilation variants (instructions evalStk, invokeStk, etc),
    # with 2000 nested scripts (bodies). If you get SO/SF exceptions on some low-stack
    # boxes or systems, please don't decrease it (either provide a constraint)
    $i eval {foreach cmd {eval "if 1" try catch} {
	set c [gencode 2000 $cmd]
	if 1 $c
    }}
    $i eval {set result}
} -result {1 1 1 1} -cleanup {
    interp delete $i
}








|


|







482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
	    append code "\}$e"
	}
	#puts [format "%% %.40s ... %d bytes" $code [string length $code]]
	return $code
    }}
} -body {
    # Test different compilation variants (instructions evalStk, invokeStk, etc),
    # with 2000 (1000 in debug) nested scripts (bodies). If you get SO/SF exceptions on some low-stack
    # boxes or systems, please don't decrease it (either provide a constraint)
    $i eval {foreach cmd {eval "if 1" try catch} {
	set c [gencode [expr {![info exists ::tcl_platform(debug)] ? 2000 : 1000}] $cmd]
	if 1 $c
    }}
    $i eval {set result}
} -result {1 1 1 1} -cleanup {
    interp delete $i
}