From 6b1e4d50360b4bea599ade86d9b7bd21cc9fa45d Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 9 Sep 2019 11:36:58 +0000 Subject: end-of-line spacing --- doc/tk_mac.n | 4 +- generic/tkBind.c | 2 +- macosx/tkMacOSXHLEvents.c | 2 +- tests/bind.test | 314 +++++++++++++++++++++++----------------------- 4 files changed, 161 insertions(+), 161 deletions(-) diff --git a/doc/tk_mac.n b/doc/tk_mac.n index 73b2b6d..a4206a9 100644 --- a/doc/tk_mac.n +++ b/doc/tk_mac.n @@ -48,7 +48,7 @@ the command is absent, no action will be taken. .TP \fB::tk::mac::DoScriptFile\fR . -The default Apple Event handler for AEDoScriptHandler. This command +The default Apple Event handler for AEDoScriptHandler. This command executes a Tcl file when an AppleScript sends a .QW "do script" command to Wish with a file path as a parameter. @@ -131,7 +131,7 @@ If a proc of this name is defined it is the default Apple Event handler for kAEPrintDocuments, .QW pdoc , the Apple Event sent when your application is asked to print a -document. It takes a single absolute file path as an argument. +document. It takes a single absolute file path as an argument. .TP \fB::tk::mac::Quit\fR . diff --git a/generic/tkBind.c b/generic/tkBind.c index 8d04987..ba078b0 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2096,7 +2096,7 @@ IsBetterMatch( if (!sndMatchPtr) { return 0; } if (!fstMatchPtr) { return 1; } - + diff = CountSpecialized(fstMatchPtr, sndMatchPtr); if (diff > 0) { return 1; } if (diff < 0) { return 0; } diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index f223f92..9c8c515 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -328,7 +328,7 @@ static char* scriptTextProc = "::tk::mac::DoScriptText"; } } } - + - (void)handleURLEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent { diff --git a/tests/bind.test b/tests/bind.test index 6a5fcf8..6321335 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -77,10 +77,10 @@ test bind-1.7 {bind command} -body { } -result {test script more text} test bind-1.8 {bind command} -body { - bind .t {test script} + bind .t {test script} } -returnCodes error -result {bad event type or keysym "gorp"} test bind-1.9 {bind command} -body { - catch {bind .t {test script}} + catch {bind .t {test script}} bind .t } -result {} test bind-1.10 {bind command} -body { @@ -141,10 +141,10 @@ test bind-2.8 {bindtags command} -body { test bind-2.9 {bindtags command} -body { frame .t.f bindtags .t.f {a b c} - bindtags .t.f "\{" + bindtags .t.f "\{" } -cleanup { destroy .t.f -} -returnCodes error -result {unmatched open brace in list} +} -returnCodes error -result {unmatched open brace in list} test bind-2.10 {bindtags command} -body { frame .t.f bindtags .t.f {a b c} @@ -156,10 +156,10 @@ test bind-2.10 {bindtags command} -body { test bind-2.11 {bindtags command} -body { frame .t.f bindtags .t.f {a b c} - bindtags .t.f "a .gorp b" + bindtags .t.f "a .gorp b" } -cleanup { destroy .t.f -} -returnCodes ok +} -returnCodes ok test bind-2.12 {bindtags command} -body { frame .t.f bindtags .t.f {a b c} @@ -199,7 +199,7 @@ test bind-4.1 {TkBindEventProc procedure} -setup { bind {a b} {lappend x "%W enter {a b}"} bind .t {lappend x "%W enter .t"} bind .t.f {lappend x "%W enter .t.f"} - + event generate .t.f return $x } -cleanup { @@ -219,9 +219,9 @@ test bind-4.2 {TkBindEventProc procedure} -setup { bind {a b} {lappend x "%W enter {a b}"} bind .t {lappend x "%W enter .t"} bind .t.f {lappend x "%W enter .t.f"} - + bindtags .t.f {.t.f {a b} xyz} - event generate .t.f + event generate .t.f return $x } -cleanup { destroy .t.f @@ -235,7 +235,7 @@ test bind-4.3 {TkBindEventProc procedure} -body { bind xyz {lappend x "%W enter xyz"} bind {a b} {lappend x "%W enter {a b}"} bind .t {lappend x "%W enter .t"} - + event generate .t return $x } -cleanup { @@ -255,7 +255,7 @@ test bind-4.4 {TkBindEventProc procedure} -setup { bind xyz {lappend x "%W enter xyz"} bind {a b} {lappend x "%W enter {a b}"} bind .t {lappend x "%W enter .t"} - + bindtags .t.f {.t.f .t.f2 .t.f3} bind .t.f {lappend x "%W enter .t.f"} bind .t.f3 {lappend x "%W enter .t.f3"} @@ -279,7 +279,7 @@ test bind-4.5 {TkBindEventProc procedure} -setup { bind {a b} {lappend x "%W enter {a b}"} bind .t {lappend x "%W enter .t"} bindtags .t.f {a b c d e f g h i j k l m n o p q r s t u v w x y z} - + event generate .t.f } -cleanup { destroy .t.f @@ -383,7 +383,7 @@ test bind-10.2 {Tk_GetBinding procedure} -body { } -result {Test} test bind-11.1 {Tk_GetAllBindings procedure} -body { - frame .t.f + frame .t.f foreach i "! a \\\{ ~ <> " { bind .t.f $i Test } @@ -392,7 +392,7 @@ test bind-11.1 {Tk_GetAllBindings procedure} -body { destroy .t.f } -result {! <> a \{ ~} test bind-11.2 {Tk_GetAllBindings procedure} -body { - frame .t.f + frame .t.f foreach i " <1>" { bind .t.f $i Test } @@ -401,7 +401,7 @@ test bind-11.2 {Tk_GetAllBindings procedure} -body { destroy .t.f } -result { } test bind-11.3 {Tk_GetAllBindings procedure} -body { - frame .t.f + frame .t.f foreach i " abcd ab" { bind .t.f $i Test } @@ -435,7 +435,7 @@ test bind-13.1 {Tk_BindEvent procedure} -setup { bind Test : {lappend x "%W %K Test :"} bind all _ {lappend x "%W %K all _"} bind .t.f : {lappend x "%W %K .t.f :"} - + event generate .t.f event generate .t.f event generate .t.f @@ -458,7 +458,7 @@ test bind-13.2 {Tk_BindEvent procedure} -setup { bind Test {lappend x "%W %K Test press any"; break} bind all {continue; lappend x "%W %K all press any"} bind .t.f : {lappend x "%W %K .t.f pressed colon"} - + event generate .t.f return $x } -cleanup { @@ -514,11 +514,11 @@ test bind-13.5 {Tk_BindEvent procedure} -body { frame .t.g -gorp foo } -cleanup { bind all {} -} -returnCodes error -result {unknown option "-gorp"} +} -returnCodes error -result {unknown option "-gorp"} test bind-13.6 {Tk_BindEvent procedure} -body { bind all {lappend x "%W destroyed"} set x {} - catch {frame .t.g -gorp foo} + catch {frame .t.g -gorp foo} return $x } -cleanup { bind all {} @@ -599,10 +599,10 @@ test bind-13.11 {Tk_BindEvent procedure: collapse Motions} -setup { set x {} } -body { bind .t.f "lappend x Motion%#(%x,%y)" - event generate .t.f -serial 100 -x 100 -y 200 -when tail + event generate .t.f -serial 100 -x 100 -y 200 -when tail update event generate .t.f -serial 101 -x 200 -y 300 -when tail - event generate .t.f -serial 102 -x 300 -y 400 -when tail + event generate .t.f -serial 102 -x 300 -y 400 -when tail update return $x } -cleanup { @@ -616,10 +616,10 @@ test bind-13.12 {Tk_BindEvent procedure: collapse repeating modifiers} -setup { } -body { bind .t.f "lappend x %K%#" bind .t.f "lappend x %K%#" - event generate .t.f -serial 100 -when tail - event generate .t.f -serial 101 -when tail - event generate .t.f -serial 102 -when tail - event generate .t.f -serial 103 -when tail + event generate .t.f -serial 100 -when tail + event generate .t.f -serial 101 -when tail + event generate .t.f -serial 102 -when tail + event generate .t.f -serial 103 -when tail update } -cleanup { destroy .t.f @@ -855,7 +855,7 @@ test bind-13.27 {Tk_BindEvent procedure: no detail virtual pattern list} -setup set x {} } -body { bind .t.f {set x Button-2} - event generate .t.f + event generate .t.f return $x } -cleanup { destroy .t.f @@ -1019,7 +1019,7 @@ test bind-13.43 {Tk_BindEvent procedure: break in script} -setup { } -result {b1} test bind-13.45 {Tk_BindEvent procedure: error in script} -setup { proc bgerror msg { - global x + global x lappend x $msg } frame .t.f -class Test -width 150 -height 100 @@ -1208,7 +1208,7 @@ test bind-15.11 {MatchPatterns procedure, modifier checks} -setup { } -cleanup { destroy .t.f } -result {0} -test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints { +test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints { nonPortable } -setup { frame .t.f -class Test -width 150 -height 100 @@ -1249,7 +1249,7 @@ test bind-15.14 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 31 -y 39 @@ -1266,7 +1266,7 @@ test bind-15.15 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 29 -y 41 @@ -1283,7 +1283,7 @@ test bind-15.16 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 40 -y 40 @@ -1300,7 +1300,7 @@ test bind-15.17 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 20 -y 40 @@ -1317,7 +1317,7 @@ test bind-15.18 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 30 -y 30 @@ -1334,7 +1334,7 @@ test bind-15.19 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -x 30 -y 40 event generate .t.f -x 30 -y 50 @@ -1351,7 +1351,7 @@ test bind-15.20 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -time 300 event generate .t.f -time 700 @@ -1368,7 +1368,7 @@ test bind-15.21 {MatchPatterns procedure, checking "nearby"} -setup { } -body { bind .t.f {set x 1} set x 0 - event generate .t.f + event generate .t.f event generate .t.f event generate .t.f -time 300 event generate .t.f -time 900 @@ -2024,7 +2024,7 @@ test bind-16.34 {ExpandPercents procedure} -setup { destroy .t.f } -result {781 632} test bind-16.35 {ExpandPercents procedure} -constraints { - nonPortable + nonPortable } -setup { frame .t.f -class Test -width 150 -height 100 pack .t.f @@ -2249,7 +2249,7 @@ test bind-17.6 {event command: add with error} -body { event add <> abc <1> } -cleanup { event delete <> -} -returnCodes error -result {bad event type or keysym "xyz"} +} -returnCodes error -result {bad event type or keysym "xyz"} test bind-17.7 {event command: add with error} -body { event delete <> catch {event add <> abc <1>} @@ -2343,7 +2343,7 @@ test bind-18.1 {CreateVirtualEvent procedure: GetVirtualEventUid} -body { test bind-18.2 {CreateVirtualEvent procedure: FindSequence} -body { event add <> } -returnCodes error -result {bad event type or keysym "Ctrl"} -test bind-18.3 {CreateVirtualEvent procedure: new physical} -body { +test bind-18.3 {CreateVirtualEvent procedure: new physical} -body { event delete <> event add <> event info <> @@ -2352,7 +2352,7 @@ test bind-18.3 {CreateVirtualEvent procedure: new physical} -body { } -result {} test bind-18.4 {CreateVirtualEvent procedure: duplicate physical} -body { event delete <> - event add <> + event add <> event add <> event info <> } -cleanup { @@ -2423,13 +2423,13 @@ test bind-19.7 {DeleteVirtualEvent procedure: owns 1, delete all} -body { foreach p [event info] {event delete $p} event add <> event delete <> - event info + event info } -result {} test bind-19.8 {DeleteVirtualEvent procedure: owns 1, delete 1} -body { foreach p [event info] {event delete $p} event add <> event delete <> - event info + event info } -result {} test bind-19.9 {DeleteVirtualEvent procedure: owns many, delete all} -body { foreach p [event info] {event delete $p} @@ -2481,7 +2481,7 @@ test bind-19.12 {DeleteVirtualEvent procedure: owned by 1, first in chain} -setu event generate .t.f event generate .t.f event generate .t.f - event delete <> + event delete <> event generate .t.f event generate .t.f event generate .t.f @@ -2548,7 +2548,7 @@ test bind-19.14 {DeleteVirtualEvent procedure: owned by 1, last in chain} -setup event generate .t.f event generate .t.f event generate .t.f - event delete <> + event delete <> event generate .t.f event generate .t.f event generate .t.f @@ -2585,7 +2585,7 @@ test bind-19.15 {DeleteVirtualEvent procedure: owned by many, first} -setup { event generate .t.g event generate .t.h event generate .t.h - event delete <> + event delete <> event generate .t.f event generate .t.f event generate .t.g @@ -2659,7 +2659,7 @@ test bind-19.17 {DeleteVirtualEvent procedure: owned by many, last} -setup { event generate .t.g event generate .t.h event generate .t.h - event delete <> + event delete <> event generate .t.f event generate .t.f event generate .t.g @@ -3396,7 +3396,7 @@ test bind-22.55 {HandleEventGenerate: options -override xyz} -setup { set x {} } -body { bind .t.f "lappend x %o" - event generate .t.f -override xyz + event generate .t.f -override xyz } -cleanup { destroy .t.f } -returnCodes error -result {expected boolean value but got "xyz"} @@ -3409,7 +3409,7 @@ test bind-22.56 {HandleEventGenerate: options -override 1} -setup { set x {} } -body { bind .t.f "lappend x %o" - event generate .t.f -override 1 + event generate .t.f -override 1 return $x } -cleanup { destroy .t.f @@ -3423,7 +3423,7 @@ test bind-22.57 {HandleEventGenerate: options -override 1} -setup { set x {} } -body { bind .t.f "lappend x %o" - event generate .t.f -override 1 + event generate .t.f -override 1 return $x } -cleanup { destroy .t.f @@ -3437,7 +3437,7 @@ test bind-22.58 {HandleEventGenerate: options -override 1} -setup { set x {} } -body { bind .t.f "lappend x %o" - event generate .t.f -override 1 + event generate .t.f -override 1 return $x } -cleanup { destroy .t.f @@ -3451,7 +3451,7 @@ test bind-22.59 {HandleEventGenerate: options -override 1} -setup { set x {} } -body { bind .t.f "lappend x %k" - event generate .t.f -override 1 + event generate .t.f -override 1 } -cleanup { destroy .t.f } -returnCodes error -result { event doesn't accept "-override" option} @@ -3464,7 +3464,7 @@ test bind-22.60 {HandleEventGenerate: options -place xyz} -setup { set x {} } -body { bind .t.f "lappend x %p" - event generate .t.f -place xyz + event generate .t.f -place xyz } -cleanup { destroy .t.f } -returnCodes error -result {bad -place value "xyz": must be PlaceOnTop, or PlaceOnBottom} @@ -3477,7 +3477,7 @@ test bind-22.61 {HandleEventGenerate: options -place PlaceOnTop} -se set x {} } -body { bind .t.f "lappend x %p" - event generate .t.f -place PlaceOnTop + event generate .t.f -place PlaceOnTop return $x } -cleanup { destroy .t.f @@ -3491,7 +3491,7 @@ test bind-22.62 {HandleEventGenerate: options -place PlaceOnTop} -setup { set x {} } -body { bind .t.f "lappend x %k" - event generate .t.f -place PlaceOnTop + event generate .t.f -place PlaceOnTop } -cleanup { destroy .t.f } -returnCodes error -result { event doesn't accept "-place" option} @@ -3504,7 +3504,7 @@ test bind-22.63 {HandleEventGenerate: options -root .xyz} -setup { set x {} } -body { bind .t.f "lappend x %R" - event generate .t.f -root .xyz + event generate .t.f -root .xyz } -cleanup { destroy .t.f } -returnCodes error -result {bad window path name ".xyz"} @@ -3517,7 +3517,7 @@ test bind-22.64 {HandleEventGenerate: options -root .t} -setup { set x {} } -body { bind .t.f "lappend x %R" - event generate .t.f -root .t + event generate .t.f -root .t expr {[winfo id .t] eq $x} } -cleanup { destroy .t.f @@ -3531,7 +3531,7 @@ test bind-22.65 {HandleEventGenerate: options -root xyz} -setup { set x {} } -body { bind .t.f "lappend x %R" - event generate .t.f -root xyz + event generate .t.f -root xyz } -cleanup { destroy .t.f } -returnCodes error -result {bad window name/identifier "xyz"} @@ -3544,7 +3544,7 @@ test bind-22.66 {HandleEventGenerate: options -root [winfo id .t]} -setup set x {} } -body { bind .t.f "lappend x %R" - event generate .t.f -root [winfo id .t] + event generate .t.f -root [winfo id .t] expr {[winfo id .t] eq $x} } -cleanup { destroy .t.f @@ -3558,7 +3558,7 @@ test bind-22.67 {HandleEventGenerate: options