* library/entry.tcl:

	* library/text.tcl: Adjust <Double-1> and <Triple-1> bindings
	so that no anchor point is set and the insertion cursor is
	set to the last character in the selection. [Bug 220943]
	* tests/event.test: Add test cases for double click and
	drag as well as triple click and drag in the text and
	entry widgets.

3 files changed, 206 insertions, 7 deletions

diff --git a/library/entry.tcl b/library/entry.tcl
index 943e719..b869788 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk entry widgets and provides
 # procedures that help in implementing those bindings.
 #
-# RCS: @(#) $Id: entry.tcl,v 1.17 2001/12/27 22:26:41 hobbs Exp $
+# RCS: @(#) $Id: entry.tcl,v 1.18 2002/02/15 05:48:08 mdejong Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -82,12 +82,12 @@ bind Entry <B1-Motion> {
 bind Entry <Double-1> {
     set tk::Priv(selectMode) word
     tk::EntryMouseSelect %W %x
-    catch {%W icursor sel.first}
+    catch {%W icursor sel.last}
 }
 bind Entry <Triple-1> {
     set tk::Priv(selectMode) line
     tk::EntryMouseSelect %W %x
-    %W icursor 0
+    %W icursor sel.last
 }
 bind Entry <Shift-1> {
     set tk::Priv(selectMode) char
diff --git a/library/text.tcl b/library/text.tcl
index 928b61c..2dd8d87 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk text widgets and provides
 # procedures that help in implementing the bindings.
 #
-# RCS: @(#) $Id: text.tcl,v 1.20 2001/12/28 23:03:23 hobbs Exp $
+# RCS: @(#) $Id: text.tcl,v 1.21 2002/02/15 05:48:08 mdejong Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -54,13 +54,11 @@ bind Text <Double-1> {
     set tk::Priv(selectMode) word
     tk::TextSelectTo %W %x %y
     catch {%W mark set insert sel.last}
-    catch {%W mark set anchor sel.first}
 }
 bind Text <Triple-1> {
     set tk::Priv(selectMode) line
     tk::TextSelectTo %W %x %y
     catch {%W mark set insert sel.last}
-    catch {%W mark set anchor sel.first}
 }
 bind Text <Shift-1> {
     tk::TextResetAnchor %W @%x,%y
diff --git a/tests/event.test b/tests/event.test
index bd48393..67c5afb 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: event.test,v 1.8 2002/02/14 12:13:51 mdejong Exp $
+# RCS: @(#) $Id: event.test,v 1.9 2002/02/15 05:48:08 mdejong Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -450,6 +450,207 @@ test event-click-drag-1.2 { click and drag in an entry widget, this
 
 
 
+test event-double-click-drag-1.1 { click down, click up, click down again,
+                            then drag in a text widget } {
+    destroy .t
+    set t [toplevel .t]
+    set e [text $t.e]
+    pack $e
+    tkwait visibility $e
+    focus -force $e
+    _keypress_string $e "Word select test"
+    set anchor 1.8
+
+    # Get the x,y coords of the second e in "select"
+    foreach {anchor_x anchor_y} [_text_ind_to_x_y $e $anchor] break
+
+    # Click down, release, then click down again
+    event generate $e <Enter>
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonRelease-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+
+    # Save the highlighted text
+    set result [list]
+    lappend result [_get_selection $e]
+
+    # Insert cursor should be at end of "select"
+    lappend result [$e index insert]
+
+    # Move mouse one character to the left
+    set current [$e index [list $anchor - 1 char]]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    # Insert cursor should be before the l in "select"
+    lappend result [$e index insert]
+
+    # Selection should still be the word "select"
+    lappend result [_get_selection $e]
+
+    # Move mouse to the space before the word "select"
+    set current [$e index [list $current - 3 char]]
+
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 200
+
+    lappend result [$e index insert]
+    lappend result [_get_selection $e]
+
+    # Move mouse to the r in "Word"
+    set current 1.2
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    # Selection should now be "Word select"
+    lappend result [_get_selection $e]
+
+    # Insert cursor should be before the r in "Word"
+    lappend result [$e index insert]
+
+    set result
+} {select 1.11 1.7 select 1.4 { select} {Word select} 1.2}
+
+
+
+test event-double-click-drag-1.2 { click down, click up, click down again,
+                            then drag in an entry widget } {
+    destroy .t
+    set t [toplevel .t]
+    set e [entry $t.e]
+    pack $e
+    tkwait visibility $e
+    focus -force $e
+    _keypress_string $e "Word select test"
+
+    set anchor 8
+
+    # Get the x,y coords of the second e in "select"
+    foreach {anchor_x anchor_y} [_text_ind_to_x_y $e $anchor] break
+
+    # Click down, release, then click down again
+    event generate $e <Enter>
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonRelease-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+
+    set result [list]
+    lappend result [_get_selection $e]
+
+    # Insert cursor should be at the end of "select"
+    lappend result [$e index insert]
+
+    # Move mouse one character to the left
+    set current [expr {$anchor - 1}]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    # Insert cursor should be before the l in "select"
+    lappend result [$e index insert]
+
+    # Selection should still be the word "select"
+    lappend result [_get_selection $e]
+
+    # Move mouse to the space before the word "select"
+    set current [expr {$current - 3}]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    lappend result [$e index insert]
+    lappend result [_get_selection $e]
+
+    # Move mouse to the r in "Word"
+    set current [expr {$current - 2}]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    # Selection should now be "Word select"
+    lappend result [_get_selection $e]
+
+    # Insert cursor should be before the r in "Word"
+    lappend result [$e index insert]
+
+    set result
+} {select 11 7 select 4 { select} {Word select} 2}
+
+
+test event-triple-click-drag-1.1 { Triple click and drag across lines in
+        a text widget, this should extend the selection to the new line } {
+    destroy .t
+    set t [toplevel .t]
+    set e [text $t.e]
+    pack $e
+    tkwait visibility $e
+    focus -force $e
+    _keypress_string $e "LINE ONE\nLINE TWO\nLINE THREE"
+
+    set anchor 3.2
+
+    # Triple click one third line leaving mouse down
+
+    foreach {anchor_x anchor_y} [_text_ind_to_x_y $e $anchor] break
+
+    event generate $e <Enter>
+
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonRelease-1> -x $anchor_x -y $anchor_y
+    _pause 50
+
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+    event generate $e <ButtonRelease-1> -x $anchor_x -y $anchor_y
+    _pause 50
+
+    event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
+    _pause 50
+
+    set result [list]
+    lappend result [_get_selection $e]
+
+    # Drag up to second line
+
+    set current [$e index [list $anchor - 1 line]]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    lappend result [_get_selection $e]
+
+    # Drag up to first line
+
+    set current [$e index [list $current - 1 line]]
+    foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
+
+    event generate $e <B1-Motion> -x $current_x -y $current_y
+    _pause 50
+
+    lappend result [_get_selection $e]
+
+    set result
+
+} [list "LINE THREE\n" "LINE TWO\nLINE THREE\n" \
+        "LINE ONE\nLINE TWO\nLINE THREE\n"]
+
+
 # cleanup
 
 destroy .t