diff options
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/MANIFEST | 1 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 14 | ||||
| -rw-r--r-- | ext/tk/lib/tkafter.rb | 18 | ||||
| -rw-r--r-- | ext/tk/sample/tktimer2.rb | 29 |
4 files changed, 53 insertions, 9 deletions
diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST index 058ed4bcc8..b8bbdf8e65 100644 --- a/ext/tk/MANIFEST +++ b/ext/tk/MANIFEST @@ -27,3 +27,4 @@ sample/tkfrom.rb sample/tkhello.rb sample/tkline.rb sample/tktimer.rb +sample/tktimer2.rb diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 35b9e7ce97..464f7f179e 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -765,7 +765,7 @@ module TkCore TclTkLib.mainloop_watchdog(check_root) end - def do_one_event(flag = 0) + def do_one_event(flag = TclTkLib::EventFlag::ALL) TclTkLib.do_one_event(flag) end @@ -777,6 +777,14 @@ module TkCore TclTkLib.get_eventloop_tick end + def set_no_event_wait(wait) + TclTkLib.set_no_even_wait(wait) + end + + def get_no_event_wait() + TclTkLib.get_no_eventloop_wait + end + def set_eventloop_weight(loop_max, no_event_tick) TclTkLib.set_eventloop_weight(loop_max, no_event_tick) end @@ -972,6 +980,10 @@ module Tk tk_call('destroy', *wins) end + def Tk.exit + tk_call('destroy', '.') + end + def Tk.current_grabs tk_split_list(tk_call('grab', 'current')) end diff --git a/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb index 5176db3e35..a75ad5a237 100644 --- a/ext/tk/lib/tkafter.rb +++ b/ext/tk/lib/tkafter.rb @@ -5,7 +5,7 @@ # require 'tk' -class TkAfter +class TkTimer include TkCore extend TkCore @@ -20,19 +20,19 @@ class TkAfter end INTERP._invoke("proc", "rb_after", "id", - "ruby [format \"TkAfter.callback %%Q!%s!\" $id]") + "ruby [format \"#{self.name}.callback %%Q!%s!\" $id]") ############################### # class methods ############################### - def TkAfter.callback(obj_id) + def self.callback(obj_id) @after_id = nil ex_obj = Tk_CBTBL[obj_id] return nil if ex_obj == nil; # canceled _get_eval_string(ex_obj.do_callback) end - def TkAfter.info + def self.info tk_call('after', 'info').split(' ').collect!{|id| ret = Tk_CBTBL.find{|key,val| val.after_id == id} (ret == nil)? id: ret[1] @@ -68,6 +68,7 @@ class TkAfter @after_id = tk_call('after', sleep, @after_script) @current_args = args @current_script = [sleep, @after_script] + self end def set_next_callback(args) @@ -286,11 +287,12 @@ class TkAfter alias stop cancel def continue(wait=nil) + fail RuntimeError, "is already running" if @running sleep, cmd = @current_script - return nil if cmd == nil || @running == true + fail RuntimeError, "no procedure to continue" unless cmd if wait if not wait.kind_of? Integer - fail format("%s need to be Integer", wait.inspect) + fail RuntimeError, format("%s need to be Integer", wait.inspect) end sleep = wait end @@ -301,7 +303,7 @@ class TkAfter end def skip - return nil if @running == false + fail RuntimeError, "is not running now" unless @running cancel Tk_CBTBL[@id] = self @running = true @@ -319,4 +321,4 @@ class TkAfter end end -TkTimer = TkAfter +TkAfter = TkTimer diff --git a/ext/tk/sample/tktimer2.rb b/ext/tk/sample/tktimer2.rb new file mode 100644 index 0000000000..0359ac4d08 --- /dev/null +++ b/ext/tk/sample/tktimer2.rb @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class. + +require "tk" + +label = TkLabel.new(:relief=>:raised, :width=>10) \ + .pack(:side=>:bottom, :fill=>:both) + +tick = proc{|aobj| + cnt = aobj.return_value + 5 + label.text format("%d.%02d", *(cnt.divmod(100))) + cnt +} + +timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 }) + +TkButton.new(:text=>'Start') { + command proc{ timer.continue unless timer.running? } + pack(:side=>:left, :fill=>:both, :expand=>true) +} +TkButton.new(:text=>'Stop') { + command proc{ timer.stop if timer.running? } + pack('side'=>'right','fill'=>'both','expand'=>'yes') +} + +ev_quit = TkVirtualEvent.new('Control-c', 'Control-q') +Tk.root.bind(ev_quit, proc{Tk.exit}).focus + +Tk.mainloop |