For Aqua, a real implementation of endOfGlyphCluster and startOfGlyphCluster. Makes entry editing fully functional.

1 files changed, 32 insertions, 23 deletions

diff --git a/library/tk.tcl b/library/tk.tcl
index b1b7629..559af38 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -700,34 +700,43 @@ if {[tk windowingsystem] eq "aqua"} {
     }
 }
 
-proc ::tk::endOfGlyphCluster {str start} {
-    if {$start >= [string length $str]} {
-	return -1;
-    }
-    if {[string length [string index $str $start]] > 1} {
-	set start [expr {$start+1}]
+if {[tk windowingsystem] eq "aqua"} {
+    proc ::tk::endOfGlyphCluster {str index} {
+	return [endOfGlyph $str $index]
     }
-    set start [expr {$start+1}]
-    if {[string index $str $start] eq {^}} {
-	set start [expr {$start+1}];# For demo purposes only
+    proc ::tk::startOfGlyphCluster {str index} {
+	return [startOfGlyph $str $index]
     }
-    return $start
+} else {
+    proc ::tk::endOfGlyphCluster {str start} {
+	if {$start >= [string length $str]} {
+	    return -1;
+	}
+	if {[string length [string index $str $start]] > 1} {
+	    set start [expr {$start+1}]
+	}
+	set start [expr {$start+1}]
+	if {[string index $str $start] eq {^}} {
+	    set start [expr {$start+1}];# For demo purposes only
+	}
+	return $start
 }
 
-proc ::tk::startOfGlyphCluster {str start} {
-    if {$start eq "end"} {
-	set start [expr {[string length $str]-1}]
-    }
-    if {$start < 0} {
-	return -1;
-    }
-    if {[string index $str $start] eq {^}} {
-	set start [expr {$start-1}];# For demo purposes only
-    }
-    if {[string length [string index $str [expr {$start-1}]]] > 1} {
-	return [expr {$start-1}]
+    proc ::tk::startOfGlyphCluster {str start} {
+	if {$start eq "end"} {
+	    set start [expr {[string length $str]-1}]
+	}
+	if {$start < 0} {
+	    return -1;
+	}
+	if {[string index $str $start] eq {^}} {
+	    set start [expr {$start-1}];# For demo purposes only
+	}
+	if {[string length [string index $str [expr {$start-1}]]] > 1} {
+	    return [expr {$start-1}]
+	}
+	return $start
     }
-    return $start
 }
 
 # Create a dictionary to store the starting index of the IME marked