* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer

  handler when exit from a recursive called eventloop
* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
  realtime operation
* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
  TkText::IndexModMethods
* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
  add them to TkText::IndexModMethods module
* ext/tk/sample/tktextio.rb: add test part of "seek by text index
  modifiers"


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 30 insertions, 12 deletions

diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index b8073a05d..43880e6d2 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -517,10 +517,10 @@ end
 # txt -         Name of text widget
 # index -       The index of the character that the user clicked on.
 
-def invoke (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+def invoke (txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
   return unless tag
-  cursor = txt.cget('cursor')
+  current_cursor = txt.cget('cursor')
   txt.cursor('watch')
   Tk.update
 #  eval `cat #{tag[5..-1]}.rb`
@@ -528,9 +528,9 @@ def invoke (txt, index)
   eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
   Tk.update
 #  txt.cursor('xterm')
-  txt.cursor(cursor)
+  txt.cursor(current_cursor)
 
-  $tag_visited.add("#{index} linestart +1 chars", "#{index} lineend +1 chars")
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
 end
 
 # showStatus --
@@ -791,7 +791,7 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-                'message'=>"Ruby/Tk widget demonstration Ver.1.5.2-en\n\n" + 
+                'message'=>"Ruby/Tk widget demonstration Ver.1.5.3-en\n\n" + 
                            "based on demos of Tk8.1 -- 8.5  " + 
                            "( Copyright:: " + 
                            "(c) 1996-1997 Sun Microsystems, Inc. / " + 
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 59d6309d5..7c559d2a0 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -552,10 +552,10 @@ else # ver >= 8.4
 end
 
 # テキスト上での click に対する動作
-def invoke (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+def invoke (txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
   return unless tag
-  cursor = txt.cget('cursor')
+  current_cursor = txt.cget('cursor')
   txt.cursor('watch')
   Tk.update
 #  eval `cat #{tag[5..-1]}.rb`
@@ -563,9 +563,9 @@ def invoke (txt, index)
   eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
   Tk.update
 #  txt.cursor('xterm')
-  txt.cursor(cursor)
+  txt.cursor(current_cursor)
 
-  $tag_visited.add("#{index} linestart +1 chars", "#{index} lineend +1 chars")
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
 end
 
 # 状態表示
@@ -819,7 +819,7 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.5.2-jp\n\n" + 
+                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.5.3-jp\n\n" + 
                            "based on demos of Tk8.1 -- 8.5  " + 
                            "( Copyright:: " + 
                            "(c) 1996-1997 Sun Microsystems, Inc. / " + 
diff --git a/ext/tk/sample/tktextio.rb b/ext/tk/sample/tktextio.rb
index fecedf6ee..cb59c2d9d 100644
--- a/ext/tk/sample/tktextio.rb
+++ b/ext/tk/sample/tktextio.rb
@@ -581,5 +581,23 @@ if __FILE__ == $0
 
   STDOUT.print("\n================================================\n\n")
 
+  STDOUT.print("\n========= reverse order (seek by lines) ========\n\n")
+
+  tio.seek(-1, IO::SEEK_END)
+  begin
+    begin
+      tio.seek(:linestart, IO::SEEK_CUR)
+    rescue
+      # maybe use old version of tk/textmark.rb
+      tio.seek('0 char linestart', IO::SEEK_CUR)
+    end
+    STDOUT.print(gets)
+    tio.seek('-1 char linestart -1 char', IO::SEEK_CUR)
+  end while(tio.pos > 0)
+
+  STDOUT.print("\n================================================\n\n")
+
+  tio.seek(0, IO::SEEK_END)
+
   Tk.mainloop
 end