summaryrefslogtreecommitdiffstats
path: root/library/text.tcl
diff options
context:
space:
mode:
authorwelch <welch>1998-06-27 18:06:37 (GMT)
committerwelch <welch>1998-06-27 18:06:37 (GMT)
commitadcb060b5ab8d310f5aff8a1119d3b97baf86641 (patch)
tree759f8786c82028afeb67bd971309b7b328d81d7f /library/text.tcl
parentd010dca55fd7a02e3fe6e50910359d8d4915f003 (diff)
downloadtk-adcb060b5ab8d310f5aff8a1119d3b97baf86641.zip
tk-adcb060b5ab8d310f5aff8a1119d3b97baf86641.tar.gz
tk-adcb060b5ab8d310f5aff8a1119d3b97baf86641.tar.bz2
plugin updates
Diffstat (limited to 'library/text.tcl')
-rw-r--r--library/text.tcl94
1 files changed, 47 insertions, 47 deletions
diff --git a/library/text.tcl b/library/text.tcl
index 891a9ed..9191a03 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -216,7 +216,7 @@ bind Text <Delete> {
bind Text <BackSpace> {
if {[%W tag nextrange sel 1.0 end] != ""} {
%W delete sel.first sel.last
- } elseif [%W compare insert != 1.0] {
+ } elseif {[%W compare insert != 1.0]} {
%W delete insert-1c
%W see insert
}
@@ -278,33 +278,33 @@ if {$tcl_platform(platform) == "macintosh"} {
# Additional emacs-like bindings:
bind Text <Control-a> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W {insert linestart}
}
}
bind Text <Control-b> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W insert-1c
}
}
bind Text <Control-d> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W delete insert
}
}
bind Text <Control-e> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W {insert lineend}
}
}
bind Text <Control-f> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W insert+1c
}
}
bind Text <Control-k> {
- if !$tk_strictMotif {
- if [%W compare insert == {insert lineend}] {
+ if {!$tk_strictMotif} {
+ if {[%W compare insert == {insert lineend}]} {
%W delete insert
} else {
%W delete insert {insert lineend}
@@ -312,67 +312,67 @@ bind Text <Control-k> {
}
}
bind Text <Control-n> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W [tkTextUpDownLine %W 1]
}
}
bind Text <Control-o> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W insert insert \n
%W mark set insert insert-1c
}
}
bind Text <Control-p> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W [tkTextUpDownLine %W -1]
}
}
bind Text <Control-t> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextTranspose %W
}
}
if {$tcl_platform(platform) != "windows"} {
bind Text <Control-v> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextScrollPages %W 1
}
}
}
bind Text <Meta-b> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
}
}
bind Text <Meta-d> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W delete insert [tkTextNextWord %W insert]
}
}
bind Text <Meta-f> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W [tkTextNextWord %W insert]
}
}
bind Text <Meta-less> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W 1.0
}
}
bind Text <Meta-greater> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
tkTextSetCursor %W end-1c
}
}
bind Text <Meta-BackSpace> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
}
}
bind Text <Meta-Delete> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
}
}
@@ -420,15 +420,15 @@ bind Text <Shift-Option-Down> {
# A few additional bindings of my own.
bind Text <Control-h> {
- if !$tk_strictMotif {
- if [%W compare insert != 1.0] {
+ if {!$tk_strictMotif} {
+ if {[%W compare insert != 1.0]} {
%W delete insert-1c
%W see insert
}
}
}
bind Text <2> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
%W scan mark %x %y
set tkPriv(x) %x
set tkPriv(y) %y
@@ -436,11 +436,11 @@ bind Text <2> {
}
}
bind Text <B2-Motion> {
- if !$tk_strictMotif {
+ if {!$tk_strictMotif} {
if {(%x != $tkPriv(x)) || (%y != $tkPriv(y))} {
set tkPriv(mouseMoved) 1
}
- if $tkPriv(mouseMoved) {
+ if {$tkPriv(mouseMoved)} {
%W scan dragto %x %y
}
}
@@ -460,7 +460,7 @@ set tkPriv(prevPos) {}
proc tkTextClosestGap {w x y} {
set pos [$w index @$x,$y]
set bbox [$w bbox $pos]
- if ![string compare $bbox ""] {
+ if {![string compare $bbox ""]} {
return $pos
}
if {($x - [lindex $bbox 0]) < ([lindex $bbox 2]/2)} {
@@ -506,7 +506,7 @@ proc tkTextSelectTo {w x y} {
global tkPriv tcl_platform
set cur [tkTextClosestGap $w $x $y]
- if [catch {$w index anchor}] {
+ if {[catch {$w index anchor}]} {
$w mark set anchor $cur
}
set anchor [$w index anchor]
@@ -515,7 +515,7 @@ proc tkTextSelectTo {w x y} {
}
switch $tkPriv(selectMode) {
char {
- if [$w compare $cur < anchor] {
+ if {[$w compare $cur < anchor]} {
set first $cur
set last anchor
} else {
@@ -524,7 +524,7 @@ proc tkTextSelectTo {w x y} {
}
}
word {
- if [$w compare $cur < anchor] {
+ if {[$w compare $cur < anchor]} {
set first [tkTextPrevPos $w "$cur + 1c" tcl_wordBreakBefore]
set last [tkTextNextPos $w "anchor" tcl_wordBreakAfter]
} else {
@@ -533,7 +533,7 @@ proc tkTextSelectTo {w x y} {
}
}
line {
- if [$w compare $cur < anchor] {
+ if {[$w compare $cur < anchor]} {
set first [$w index "$cur linestart"]
set last [$w index "anchor - 1c lineend + 1c"]
} else {
@@ -568,11 +568,11 @@ proc tkTextKeyExtend {w index} {
global tkPriv
set cur [$w index $index]
- if [catch {$w index anchor}] {
+ if {[catch {$w index anchor}]} {
$w mark set anchor $cur
}
set anchor [$w index anchor]
- if [$w compare $cur < anchor] {
+ if {[$w compare $cur < anchor]} {
set first $cur
set last anchor
} else {
@@ -640,7 +640,7 @@ proc tkTextAutoScan {w} {
proc tkTextSetCursor {w pos} {
global tkPriv
- if [$w compare $pos == end] {
+ if {[$w compare $pos == end]} {
set pos {end - 1 chars}
}
$w mark set insert $pos
@@ -662,14 +662,14 @@ proc tkTextKeySelect {w new} {
global tkPriv
if {[$w tag nextrange sel 1.0 end] == ""} {
- if [$w compare $new < insert] {
+ if {[$w compare $new < insert]} {
$w tag add sel $new insert
} else {
$w tag add sel insert $new
}
$w mark set anchor insert
} else {
- if [$w compare $new < anchor] {
+ if {[$w compare $new < anchor]} {
set first $new
set last anchor
} else {
@@ -709,11 +709,11 @@ proc tkTextResetAnchor {w index} {
set a [$w index $index]
set b [$w index sel.first]
set c [$w index sel.last]
- if [$w compare $a < $b] {
+ if {[$w compare $a < $b]} {
$w mark set anchor sel.last
return
}
- if [$w compare $a > $c] {
+ if {[$w compare $a > $c]} {
$w mark set anchor sel.first
return
}
@@ -783,7 +783,7 @@ proc tkTextUpDownLine {w n} {
if {[string compare $tkPriv(prevPos) $i] != 0} {
set tkPriv(char) $char
}
- set new [$w index [expr $line + $n].$tkPriv(char)]
+ set new [$w index [expr {$line + $n}].$tkPriv(char)]
if {[$w compare $new == end] || [$w compare $new == "insert linestart"]} {
set new $i
}
@@ -805,8 +805,8 @@ proc tkTextPrevPara {w pos} {
while 1 {
if {(([$w get "$pos - 1 line"] == "\n") && ([$w get $pos] != "\n"))
|| ($pos == "1.0")} {
- if [regexp -indices {^[ ]+(.)} [$w get $pos "$pos lineend"] \
- dummy index] {
+ if {[regexp -indices {^[ ]+(.)} [$w get $pos "$pos lineend"] \
+ dummy index]} {
set pos [$w index "$pos + [lindex $index 0] chars"]
}
if {[$w compare $pos != insert] || ($pos == "1.0")} {
@@ -829,19 +829,19 @@ proc tkTextPrevPara {w pos} {
proc tkTextNextPara {w start} {
set pos [$w index "$start linestart + 1 line"]
while {[$w get $pos] != "\n"} {
- if [$w compare $pos == end] {
+ if {[$w compare $pos == end]} {
return [$w index "end - 1c"]
}
set pos [$w index "$pos + 1 line"]
}
while {[$w get $pos] == "\n"} {
set pos [$w index "$pos + 1 line"]
- if [$w compare $pos == end] {
+ if {[$w compare $pos == end]} {
return [$w index "end - 1c"]
}
}
- if [regexp -indices {^[ ]+(.)} [$w get $pos "$pos lineend"] \
- dummy index] {
+ if {[regexp -indices {^[ ]+(.)} [$w get $pos "$pos lineend"] \
+ dummy index]} {
return [$w index "$pos + [lindex $index 0] chars"]
}
return $pos
@@ -863,7 +863,7 @@ proc tkTextScrollPages {w count} {
set bbox [$w bbox insert]
$w yview scroll $count pages
if {$bbox == ""} {
- return [$w index @[expr [winfo height $w]/2],0]
+ return [$w index @[expr {[winfo height $w]/2}],0]
}
return [$w index @[lindex $bbox 0],[lindex $bbox 1]]
}
@@ -880,11 +880,11 @@ proc tkTextScrollPages {w count} {
proc tkTextTranspose w {
set pos insert
- if [$w compare $pos != "$pos lineend"] {
+ if {[$w compare $pos != "$pos lineend"]} {
set pos [$w index "$pos + 1 char"]
}
set new [$w get "$pos - 1 char"][$w get "$pos - 2 char"]
- if [$w compare "$pos - 1 char" == 1.0] {
+ if {[$w compare "$pos - 1 char" == 1.0]} {
return
}
$w delete "$pos - 2 char" $pos