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: |
c274bfeaf1fa793a09f3023871c0bd1a |
User & Date: | chw 2019-07-16 05:01:49.045 |
Context
2019-07-16
| ||
20:37 | merge with trunk check-in: 9fcf12f0bd user: chw tags: wtf-8-experiment | |
05:01 | merge with trunk check-in: c274bfeaf1 user: chw tags: wtf-8-experiment | |
04:57 | in undroid/vanillawish build scripts set macosx min version to 10.10 check-in: 476b7c5f60 user: chw tags: trunk | |
2019-07-13
| ||
20:56 | merge with trunk check-in: f7fcb93321 user: chw tags: wtf-8-experiment | |
Changes
Changes to jni/sdl2tk/library/demos/twind.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | # twind.tcl -- # # This demonstration script creates a text widget with a bunch of # embedded windows. if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." } package require Tk set w .twind catch {destroy $w} toplevel $w wm title $w "Text Demonstration - Embedded Windows and Other Features" wm iconname $w "Embedded Windows" positionWindow $w | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | # twind.tcl -- # # This demonstration script creates a text widget with a bunch of # embedded windows. if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." } package require Tk # Make an Aqua button's fill color match its parent's background proc blend {bt} { if {[tk windowingsystem] eq "aqua"} { $bt configure -highlightbackground [[winfo parent $bt] cget -background] } return $bt } set w .twind catch {destroy $w} toplevel $w wm title $w "Text Demonstration - Embedded Windows and Other Features" wm iconname $w "Embedded Windows" positionWindow $w |
︙ | ︙ | |||
49 50 51 52 53 54 55 | $t insert end "scrolling in all directions is provided.\n\n" $t insert end "A text widget can contain other widgets embedded " $t insert end "it. These are called \"embedded windows\", " $t insert end "and they can consist of arbitrary widgets. " $t insert end "For example, here are two embedded button " $t insert end "widgets. You can click on the first button to " | | | | > > | > | > | > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | $t insert end "scrolling in all directions is provided.\n\n" $t insert end "A text widget can contain other widgets embedded " $t insert end "it. These are called \"embedded windows\", " $t insert end "and they can consist of arbitrary widgets. " $t insert end "For example, here are two embedded button " $t insert end "widgets. You can click on the first button to " $t window create end -window [blend $t.on] $t insert end " horizontal scrolling, which also turns off " $t insert end "word wrapping. Or, you can click on the second " $t insert end "button to\n" $t window create end -window [blend $t.off] $t insert end " horizontal scrolling and turn back on word wrapping.\n\n" $t insert end "Or, here is another example. If you " $t window create end -create { button %W.click -text "Click Here" -command "textWindPlot %W" \ -cursor top_left_arrow blend %W.click } $t insert end " a canvas displaying an x-y plot will appear right here." $t mark set plot insert $t mark gravity plot left $t insert end " You can drag the data points around with the mouse, " $t insert end "or you can click here to " $t window create end -create { button %W.delete -text "Delete" -command "textWindDel %W" \ -cursor top_left_arrow blend %W.delete } $t insert end " the plot again.\n\n" $t insert end "You can also create multiple text widgets each of which " $t insert end "display the same underlying text. Click this button to " $t window create end \ -create {button %W.peer -text "Make A Peer" -command "textMakePeer %W" \ -cursor top_left_arrow blend %W.peer} -padx 3 $t insert end " widget. Notice how peer widgets can have different " $t insert end "font settings, and by default contain all the images " $t insert end "of the 'parent', but that the embedded windows, " $t insert end "such as buttons may not appear in the peer. To ensure " $t insert end "that embedded windows appear in all peers you can set the " $t insert end "'-create' option to a script or a string containing %W. " $t insert end "(The plot above and the 'Make A Peer' button are " $t insert end "designed to show up in all peers.) A good use of " $t insert end "peers is for " $t window create end \ -create {button %W.split -text "Split Windows" -command "textSplitWindow %W" \ -cursor top_left_arrow blend %W.split} -padx 3 $t insert end " \n\n" $t insert end "Users of previous versions of Tk will also be interested " $t insert end "to note that now cursor movement is now by visual line by " $t insert end "default, and that all scrolling of this widget is by pixel.\n\n" $t insert end "You may also find it useful to put embedded windows in " |
︙ | ︙ | |||
124 125 126 127 128 129 130 | $t window create end -window $t.toggle -padx 3 -pady 2 set i 1 foreach color {AntiqueWhite3 Bisque1 Bisque2 Bisque3 Bisque4 SlateBlue3 RoyalBlue1 SteelBlue2 DeepSkyBlue3 LightBlue1 DarkSlateGray1 Aquamarine2 DarkSeaGreen2 SeaGreen1 Yellow1 IndianRed1 IndianRed2 Tan1 Tan4} { button $t.color$i -text $color -cursor top_left_arrow -command \ | | | | | | | | | | | 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 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | $t window create end -window $t.toggle -padx 3 -pady 2 set i 1 foreach color {AntiqueWhite3 Bisque1 Bisque2 Bisque3 Bisque4 SlateBlue3 RoyalBlue1 SteelBlue2 DeepSkyBlue3 LightBlue1 DarkSlateGray1 Aquamarine2 DarkSeaGreen2 SeaGreen1 Yellow1 IndianRed1 IndianRed2 Tan1 Tan4} { button $t.color$i -text $color -cursor top_left_arrow -command \ "changeBg $t $color" $t window create end -window [blend $t.color$i] -padx 3 -pady 2 incr i } $t tag add buttons [blend $t.default] end button $t.bigB -text "Big borders" -command "textWindBigB $t" \ -cursor top_left_arrow button $t.smallB -text "Small borders" -command "textWindSmallB $t" \ -cursor top_left_arrow button $t.bigH -text "Big highlight" -command "textWindBigH $t" \ -cursor top_left_arrow button $t.smallH -text "Small highlight" -command "textWindSmallH $t" \ -cursor top_left_arrow button $t.bigP -text "Big pad" -command "textWindBigP $t" \ -cursor top_left_arrow button $t.smallP -text "Small pad" -command "textWindSmallP $t" \ -cursor top_left_arrow set text_normal(border) [$t cget -borderwidth] set text_normal(highlight) [$t cget -highlightthickness] set text_normal(pad) [$t cget -padx] $t insert end "\nYou can also change the usual border width and " $t insert end "highlightthickness and padding.\n" $t window create end -window [blend $t.bigB] $t window create end -window [blend $t.smallB] $t window create end -window [blend $t.bigH] $t window create end -window [blend $t.smallH] $t window create end -window [blend $t.bigP] $t window create end -window [blend $t.smallP] $t insert end "\n\nFinally, images fit comfortably in text widgets too:" $t image create end -image \ [image create photo -file [file join $tk_demoDirectory images ouster.png]] proc textWindBigB w { |
︙ | ︙ | |||
184 185 186 187 188 189 190 | proc textWindSmallH w { $w configure -highlightthickness $::text_normal(highlight) } proc textWindSmallP w { $w configure -padx $::text_normal(pad) -pady $::text_normal(pad) } | < | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | proc textWindSmallH w { $w configure -highlightthickness $::text_normal(highlight) } proc textWindSmallP w { $w configure -padx $::text_normal(pad) -pady $::text_normal(pad) } proc textWindOn w { catch {destroy $w.scroll2} set t $w.f.text ttk::scrollbar $w.scroll2 -orient horizontal -command "$t xview" pack $w.scroll2 -after $w.buttons -side bottom -fill x $t configure -xscrollcommand "$w.scroll2 set" -wrap none |
︙ | ︙ | |||
285 286 287 288 289 290 291 292 293 | $t delete $t.c while {[string first [$t get plot] " \t\n"] >= 0} { $t delete plot } $t insert plot " " } } proc embDefBg t { | > > > > > > > > > > > | > | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | $t delete $t.c while {[string first [$t get plot] " \t\n"] >= 0} { $t delete plot } $t insert plot " " } } proc changeBg {t c} { $t configure -background $c if {[tk windowingsystem] eq "aqua"} { foreach b [$t window names] { if {[winfo class $b] eq "Button"} { $b configure -highlightbackground $c } } } } proc embDefBg t { set bg [lindex [$t configure -background] 3] changeBg $t $bg } proc textMakePeer {parent} { set n 1 while {[winfo exists .peer$n]} { incr n } set w [toplevel .peer$n] wm title $w "Text Peer #$n" |
︙ | ︙ |
Changes to jni/sdl2tk/macosx/tkMacOSXDefault.h.
︙ | ︙ | |||
31 32 33 34 35 36 37 | * TROUGH - Background color for troughs in scales and scrollbars. * INDICATOR - Color for indicator when button is selected. * DISABLED - Foreground color when widget is disabled. */ #define BLACK "Black" #define WHITE "White" | | > | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | * TROUGH - Background color for troughs in scales and scrollbars. * INDICATOR - Color for indicator when button is selected. * DISABLED - Foreground color when widget is disabled. */ #define BLACK "Black" #define WHITE "White" #define NORMAL_BG "systemWindowBackgroundColor" #define TEXT_BG "systemTextBackgroundColor" #define NORMAL_FG "systemTextColor" #define ACTIVE_BG "systemWindowBackgroundColor" #define ACTIVE_FG "systemTextColor" #define SELECT_BG "systemSelectedTextBackgroundColor" #define SELECT_FG "systemSelectedTextColor" #define INACTIVE_SELECT_BG "systemSelectedTextBackgroundColor" #define TROUGH "#c3c3c3" #define INDICATOR "#b03060" #define DISABLED "#a3a3a3" |
︙ | ︙ | |||
167 168 169 170 171 172 173 | */ #define MAC_OSX_FOCUS_WIDTH 3 #define MAC_OSX_ENTRY_BORDER 2 #define MAC_OSX_ENTRY_RELIEF TK_RELIEF_SUNKEN #define MAC_OSX_ENTRY_SELECT_RELIEF TK_RELIEF_FLAT | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | */ #define MAC_OSX_FOCUS_WIDTH 3 #define MAC_OSX_ENTRY_BORDER 2 #define MAC_OSX_ENTRY_RELIEF TK_RELIEF_SUNKEN #define MAC_OSX_ENTRY_SELECT_RELIEF TK_RELIEF_FLAT #define DEF_ENTRY_BG_COLOR TEXT_BG #define DEF_ENTRY_BG_MONO WHITE #define DEF_ENTRY_BORDER_WIDTH "2" #define DEF_ENTRY_CURSOR "xterm" #define DEF_ENTRY_DISABLED_BG_COLOR NORMAL_BG #define DEF_ENTRY_DISABLED_BG_MONO WHITE #define DEF_ENTRY_DISABLED_FG DISABLED #define DEF_ENTRY_EXPORT_SELECTION "1" |
︙ | ︙ | |||
244 245 246 247 248 249 250 | #define DEF_LABELFRAME_LABELANCHOR "nw" /* * Defaults for listboxes: */ #define DEF_LISTBOX_ACTIVE_STYLE "dotbox" | | | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | #define DEF_LABELFRAME_LABELANCHOR "nw" /* * Defaults for listboxes: */ #define DEF_LISTBOX_ACTIVE_STYLE "dotbox" #define DEF_LISTBOX_BG_COLOR TEXT_BG #define DEF_LISTBOX_BG_MONO WHITE #define DEF_LISTBOX_BORDER_WIDTH "1" #define DEF_LISTBOX_CURSOR "" #define DEF_LISTBOX_DISABLED_FG DISABLED #define DEF_LISTBOX_EXPORT_SELECTION "1" #define DEF_LISTBOX_FONT "TkTextFont" #define DEF_LISTBOX_FG NORMAL_FG |
︙ | ︙ | |||
497 498 499 500 501 502 503 | #define DEF_SCROLLBAR_WIDTH "15" /* * Defaults for texts: */ #define DEF_TEXT_AUTO_SEPARATORS "1" | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | #define DEF_SCROLLBAR_WIDTH "15" /* * Defaults for texts: */ #define DEF_TEXT_AUTO_SEPARATORS "1" #define DEF_TEXT_BG_COLOR TEXT_BG #define DEF_TEXT_BG_MONO WHITE #define DEF_TEXT_BLOCK_CURSOR "0" #define DEF_TEXT_BORDER_WIDTH "0" #define DEF_TEXT_CURSOR "xterm" #define DEF_TEXT_FG NORMAL_FG #define DEF_TEXT_EXPORT_SELECTION "1" #define DEF_TEXT_FONT "TkFixedFont" |
︙ | ︙ |
Changes to undroid/build-undroidwish-macosx.sh.
︙ | ︙ | |||
74 75 76 77 78 79 80 | echo "undroidwish - AndroWish sans the borg, a project just for pun." echo # the toolchain STRIP="strip -S -x" AR=ar RANLIB=ranlib | | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | echo "undroidwish - AndroWish sans the borg, a project just for pun." echo # the toolchain STRIP="strip -S -x" AR=ar RANLIB=ranlib CC="cc -DTCL_UTF_MAX=3 -mmacosx-version-min=10.10" CXX="c++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=3 -mmacosx-version-min=10.10" NM=nm # RPATH for binaries ADD_RPATH="/Applications/VLC.app/Contents/MacOS/lib" export STRIP AR RANLIB CC CXX RC NM ADD_RPATH SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload" SUBDIRS="${SUBDIRS} tls libwebsockets" |
︙ | ︙ |
Changes to undroid/build-vanilla-macosx.sh.
︙ | ︙ | |||
75 76 77 78 79 80 81 | echo "vanilla{tclsh,wish} - Build script for standard Tcl/Tk" echo # the toolchain STRIP="strip -S -x" AR=ar RANLIB=ranlib | | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | echo "vanilla{tclsh,wish} - Build script for standard Tcl/Tk" echo # the toolchain STRIP="strip -S -x" AR=ar RANLIB=ranlib CC="cc -DTCL_UTF_MAX=3 -mmacosx-version-min=10.10" CXX="c++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=3 -mmacosx-version-min=10.10" NM=nm # RPATH for binaries ADD_RPATH="/Applications/VLC.app/Contents/MacOS/lib" export STRIP AR RANLIB CC CXX RC NM ADD_RPATH SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk jpeg-turbo" |
︙ | ︙ |