timr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169f2bc1266172e38449b616494751f1675e3cf7
-  data.tar.gz: b33d71090571dbcd6aa1e21a62a39f2b6fd8c484
+  metadata.gz: 8e2d97ef6133107ff6c5f10ec8d7469ceab22317
+  data.tar.gz: 0eb7ce0ac1b3946fe7c4022c243cdfdd790eb360
 SHA512:
-  metadata.gz: 9425deec3cc7505b9672cbef8eb5a977521ef5374e28c22ba54f7accaa98aae794152e3495486c28dc0df3e04de4da61222a3a70771a4e614be2308586ffc4b8
-  data.tar.gz: 72769b4c7417eecfac58f7a00c0e1e7f19d5b3eb024cf818431a24306bf6d0fc772667fdb544da2633c91651eff95e380980d65ff8a12e38e6f1d6cc3e9a6088
+  metadata.gz: e431719fdaa4d85555c6578e61f80fb81c12e21d49b2ffbe74db47e2d21f727da133766b4eb645fbc04d77881586a35fe26febfc6d3a6ad03c95123f06b96421
+  data.tar.gz: f5fd40d36d15e55298686229bfd61e6dda2571bd8c0d4f306f89c7625ffcc53af52751f6ca6fb4ecfef7d241661c94a28af9d0de72ca7af024ed22327f8284e0

data/.editorconfig

@@ -9,6 +9,6 @@ charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
 
-[*.yml]
+[*.{yml,conf}]
 indent_style = space
 indent_size = 4

data/.gitignore

@@ -1,6 +1,8 @@
 /.bundle/
 .setup
 /bin/dev
+CHANGELOG-*.txt
+Gemfile.lock
 /releases/
 README.html
 /tmp/

data/Makefile

@@ -5,7 +5,7 @@ ALL_TARGETS_EXT = tmp
 include Makefile.common
 
 dev:
-	RUBYOPT=-rbundler/setup ruby ./bin/timr
+	RUBYOPT=-rbundler/setup ruby --debug ./bin/timr -d tmp/timr -c tmp/timr.conf
 
 .PHONY: test
 test:

data/Makefile.common

@@ -1,9 +1,9 @@
 
 # Ruby Common Big
-# 2016-04-09
+# 2016-05-20
 
 MV = mv -nv
-RM = rm -rf
+RM = rm -rfd
 MKDIR = mkdir -p
 CHMOD = chmod
 BUNDLER = bundle
@@ -36,9 +36,7 @@ update:
 
 .PHONY: clean
 clean:
-	$(RM) .bundle
-	$(RM) .setup
-	$(RM) Gemfile.lock
+	$(RM) .bundle .setup Gemfile.lock
 
 .PHONY: release
 release: | releases

data/bin/timr

@@ -7,6 +7,7 @@ require 'timr'
 
 @options = {
 	:dir => nil,
+	:config_path => "#{Dir.home}/.timr/timr.conf",
 }
 opts = OptionParser.new do |o|
 	o.banner = 'Usage: timr [options]'
@@ -16,11 +17,15 @@ opts = OptionParser.new do |o|
 		@options[:dir] = path
 	end
 	
-	o.on('-p', '--project <name>', 'Project Name: use ~/.timr/NAME as path.') do |name|
+	o.on('-p', '--project <name>', 'Project Name: use ~/.timr/projects/NAME as path.') do |name|
 		@options[:dir] = File.expand_path(name, "#{Dir.home}/.timr/projects")
 	end
 	
-	o.on_tail('-v', '--version', 'Show version.') do
+	o.on('-c', '--config <path>', 'Path to config file. Default: ~/.timr/timr.conf') do |path|
+		@options[:config_path] = File.expand_path(path)
+	end
+	
+	o.on_tail('-V', '--version', 'Show version.') do
 		puts "#{TheFox::Timr::NAME} #{TheFox::Timr::VERSION} (#{TheFox::Timr::DATE})"
 		puts "#{TheFox::Timr::HOMEPAGE}"
 		exit
@@ -35,6 +40,10 @@ end
 ARGV << '-h' if ARGV.count == 0
 opts.parse(ARGV)
 
-timr = TheFox::Timr::Timr.new(@options[:dir])
-timr.run
-timr.close
+timr = TheFox::Timr::Timr.new(@options[:dir], @options[:config_path])
+begin
+	timr.run
+rescue Exception => e
+	timr.close
+	raise e
+end

data/lib/timr/stack.rb

@@ -17,7 +17,7 @@ module TheFox
 				!@task.nil?
 			end
 			
-			def length
+			def size
 				@tasks.length
 			end
 			
@@ -34,15 +34,22 @@ module TheFox
 				if !old.nil?
 					old.stop
 					@task = @tasks.last
-					@task.start if has_task?
+					@task.start if !@task.nil?
 					true
 				else
 					false
 				end
 			end
 			
-			def pop_all(new_task = nil)
-				if @task != new_task
+			def pop_all(new_task = nil, parent_track = nil)
+				if @task == new_task
+					#puts 'tasks =='
+					x = @task.start(parent_track)
+					#puts "return #{x}"
+					#puts
+					x
+				else
+					#puts 'stop all tasks'
 					@tasks.each do |task|
 						task.stop
 					end
@@ -50,20 +57,18 @@ module TheFox
 					@task = nil
 					
 					if !new_task.nil?
-						push(new_task)
+						push(new_task, parent_track)
 					end
 					true
-				else
-					false
 				end
 			end
 			
-			def push(task)
+			def push(task, parent_track = nil)
 				if !@tasks.include?(task)
-					@task.stop if has_task?
+					@task.pause if has_task?
 					
 					@task = task
-					@task.start
+					@task.start(parent_track)
 					@tasks << @task
 					true
 				else

data/lib/timr/task.rb

@@ -19,8 +19,8 @@ module TheFox
 					'id' => UUID.new.generate,
 					'name' => nil,
 					'description' => nil,
-					'created' => Time.now.utc.strftime(TIME_FORMAT),
-					'modified' => Time.now.utc.strftime(TIME_FORMAT),
+					'created' => Time.now.utc.strftime(TIME_FORMAT_FILE),
+					'modified' => Time.now.utc.strftime(TIME_FORMAT_FILE),
 				}
 				@track = nil
 				@timeline = []
@@ -48,7 +48,7 @@ module TheFox
 					timeline_c = @timeline
 						.map{ |track|
 							h = track.to_h
-							h['e'] = Time.now.utc.strftime(TIME_FORMAT) if !h.has_key?('e') || h['e'].nil?
+							h['e'] = Time.now.utc.strftime(TIME_FORMAT_FILE) if !h.has_key?('e') || h['e'].nil?
 							h
 						}
 					
@@ -67,10 +67,16 @@ module TheFox
 				@status == :running
 			end
 			
+			def paused?
+				@status == :paused
+			end
+			
 			def status
 				case @status
 				when :running
 					?>
+				when :paused
+					?#
 				when :stop
 					?|
 				end
@@ -78,7 +84,7 @@ module TheFox
 			
 			def changed
 				@changed = true
-				@meta['modified'] = Time.now.utc.strftime(TIME_FORMAT)
+				@meta['modified'] = Time.now.utc.strftime(TIME_FORMAT_FILE)
 			end
 			
 			def id
@@ -115,22 +121,61 @@ module TheFox
 				@timeline
 			end
 			
-			def start
-				if !running?
-					@changed = true
-					@track = Track.new(self)
+			def start(parent_track = nil)
+				create_new_track = false
+				
+				if running?
+					if !parent_track.nil?
+						if @track.description != parent_track.description
+							stop
+							create_new_track = true
+						end
+					end
+				elsif paused?
+					parent_track = @track
+					create_new_track = true
+				else
+					create_new_track = true
+				end
+				
+				if create_new_track
+					@track = Track.new
+					if !parent_track.nil?
+						@track.parent = parent_track
+						@track.description = parent_track.description
+					end
+					
+					@track.task = self
+					@track.begin_time = Time.now
 					@timeline << @track
+					
+					@changed = true
 				end
+				
 				@status = :running
+				
+				create_new_track
 			end
 			
-			def stop
-				if running? && !@track.nil?
+			def pause
+				if !@track.nil?
+					@status = :paused
 					@changed = true
 					@track.end_time = Time.now
+				end
+			end
+			
+			def stop
+				if !@track.nil?
+					if running?
+						@changed = true
+						@track.end_time = Time.now
+					end
+					
 					@track = nil
 					@timeline_diff_total = nil
 				end
+				
 				@status = :stop
 			end
 			
@@ -143,7 +188,11 @@ module TheFox
 			end
 			
 			def to_s
-				name
+				track_description = ''
+				if has_track? && !@track.description.nil? && @track.description.to_s.length > 0
+					track_description = ": #{@track.description}"
+				end
+				'%s%s' % [name, track_description]
 			end
 			
 			def to_list_s

data/lib/timr/timr.rb

@@ -2,6 +2,8 @@
 require 'curses'
 require 'time'
 require 'fileutils'
+require 'yaml/store'
+require 'thefox-ext'
 
 module TheFox
 	module Timr
@@ -10,19 +12,31 @@ module TheFox
 			
 			#include Curses
 			
-			def initialize(path)
-				@base_dir_path = File.expand_path(path)
+			def initialize(base_dir_path, config_path = nil)
+				@base_dir_path = File.expand_path(base_dir_path)
 				@base_dir_name = File.basename(@base_dir_path)
 				@data_dir_path = "#{@base_dir_path}/data"
+				@config_path = config_path
 				
-				puts "base: #{@base_dir_path}"
-				puts "name: #{@base_dir_name}"
-				puts "data: #{@data_dir_path}"
+				puts "base:   #{@base_dir_path}"
+				puts "name:   #{@base_dir_name}"
+				puts "data:   #{@data_dir_path}"
+				puts "config: #{@config_path}"
 				
 				@stack = Stack.new
 				@tasks = {}
 				@last_write = nil
+				@config = {
+					'clock' => {
+						'default' => '%F %R',
+						'large' => '%F %T',
+						'short' => '%R',
+					},
+				}
+				#@ui_window_refresh_last = nil
+				#@ui_status_line_last = nil
 				
+				config_read
 				init_dirs
 				tasks_load
 				
@@ -37,6 +51,15 @@ module TheFox
 				@window_timeline.tasks = @tasks
 			end
 			
+			def config_read(path = @config_path)
+				if !path.nil? && File.exist?(path)
+					content = YAML::load_file(path)
+					if content
+						@config.merge_recursive!(content)
+					end
+				end
+			end
+			
 			def init_dirs
 				if !Dir.exist?(@base_dir_path)
 					FileUtils.mkdir_p(@base_dir_path)
@@ -108,14 +131,17 @@ module TheFox
 				end
 			end
 			
-			def ui_status_text(text, attrn = Curses::A_NORMAL)
+			# This is the line on the bottom of the screen.
+			def ui_status_text(text = nil, attrn = Curses::A_NORMAL)
 				line_nr = Curses.lines - 1
 				
 				Curses.setpos(line_nr, 0)
 				Curses.clrtoeol
-				Curses.setpos(line_nr, COL)
-				Curses.attron(attrn) do
-					Curses.addstr(text)
+				if !text.nil?
+					Curses.setpos(line_nr, COL)
+					Curses.attron(attrn) do
+						Curses.addstr(text)
+					end
 				end
 				Curses.refresh
 			end
@@ -124,6 +150,7 @@ module TheFox
 				ui_status_text(text, Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD)
 			end
 			
+			# Use the Status Text line to get an input from user.
 			def ui_status_input(text)
 				Curses.echo
 				Curses.timeout = -1
@@ -140,12 +167,17 @@ module TheFox
 						abort = true
 						break
 					when Curses::Key::BACKSPACE
-						Curses.stdscr.delch
-						input = input[0..-2]
+						if input.length > 0
+							Curses.stdscr.delch
+							input = input[0..-2]
+						end
 					when 10
 						break
+					when nil
+						# Do nothing.
+						#sleep TIMEOUT.to_f / 1000
 					else
-						input += key_pressed
+						input += key_pressed.to_s
 					end
 				end
 				if abort
@@ -159,9 +191,75 @@ module TheFox
 				input
 			end
 			
+			# The second line from the bottom:
+			# Show current Track status, Track Time Difference, Task Time Total.
 			def ui_status_line(init = false)
 				line_nr = Curses.lines - 2
 				
+				status_s = ''
+				track_begin_time_s = ''
+				
+				run_time_track_str = ''
+				run_time_track_h = 0
+				run_time_track_m = 0
+				run_time_track_s = 0
+				
+				run_time_total_str = ''
+				run_time_total_h = 0
+				run_time_total_m = 0
+				run_time_total_s = 0
+				
+				time_s = ''
+				
+				stack_has_task = @stack.has_task?.freeze
+				if stack_has_task
+					status_s = @stack.task.status
+					
+					track_begin_time_s = '--:--'
+					if @stack.task.has_track?
+						track_begin_time_s = @stack.task.track.begin_time.strftime('%R')
+					end
+					
+					run_time_track_h, run_time_track_m, run_time_track_s = @stack.task.run_time_track
+					run_time_total_h, run_time_total_m, run_time_total_s = @stack.task.run_time_total
+				else
+					status_s = TASK_NO_TASK_LOADED_CHAR
+				end
+				
+				if Curses.cols > MIN_COLS
+					if stack_has_task
+						run_time_track_str = '%2d:%02d:%02d' % [run_time_track_h, run_time_track_m, run_time_track_s]
+						run_time_total_str = '%2d:%02d:%02d' % [run_time_total_h, run_time_total_m, run_time_total_s]
+					end
+					
+					time_format = @config['clock']['default']
+					if Curses.cols <= 50
+						if stack_has_task
+							run_time_track_str = '%2d:%02d' % [run_time_track_h, run_time_track_m]
+						end
+						run_time_total_str = ''
+						
+						time_format = nil
+					elsif Curses.cols <= 60
+						if stack_has_task
+							run_time_track_str = '%2d:%02d' % [run_time_track_h, run_time_track_m]
+							run_time_total_str = '%2d:%02d' % [run_time_total_h, run_time_total_m]
+						end
+						
+						time_format = @config['clock']['short']
+					elsif Curses.cols > 80
+						time_format = @config['clock']['large']
+					end
+					if !time_format.nil?
+						time_s = Time.now.strftime(time_format)
+					end
+				end
+				
+				line = "#{status_s} #{track_begin_time_s} #{run_time_track_str} #{run_time_total_str}"
+				
+				rest = Curses.cols - COL - line.length - time_s.length - 1
+				line += ' ' * rest + time_s
+				
 				Curses.attron(Curses.color_pair(Curses::COLOR_GREEN) | Curses::A_NORMAL) do
 					if init
 						Curses.setpos(line_nr, 0)
@@ -170,37 +268,7 @@ module TheFox
 					end
 					
 					Curses.setpos(line_nr, COL)
-					if @stack.has_task?
-						status = @stack.task.status
-						track_begin_time_s = '--:--'
-						if @stack.task.has_track?
-							track_begin_time_s = @stack.task.track.begin_time.strftime('%R')
-						end
-						run_time_track = '%4d:%02d:%02d' % @stack.task.run_time_track
-						run_time_total = '%4d:%02d:%02d' % @stack.task.run_time_total
-						
-						Curses.addstr("#{status} #{track_begin_time_s} #{run_time_track} #{run_time_total}")
-					else
-						Curses.addstr("#{TASK_NO_TASK_LOADED_C} --:-- ----:--:-- ----:--:--")
-					end
-					
-					if Curses.cols > MIN_COLS
-						time_format = '%F %R'
-						if Curses.cols <= 30
-							time_format = '%R'
-						elsif Curses.cols <= 40
-							time_format = '%m-%d %R'
-						elsif Curses.cols <= 50
-							time_format = '%y-%m-%d %R'
-						elsif Curses.cols <= 60
-							time_format = '%F %R'
-						elsif Curses.cols > 80
-							time_format = '%F %T'
-						end
-						time_str = Time.now.strftime(time_format)
-						Curses.setpos(line_nr, Curses.cols - time_str.length - 1)
-						Curses.addstr(time_str)
-					end
+					Curses.addstr(line)
 				end
 				
 				Curses.refresh
@@ -208,18 +276,47 @@ module TheFox
 			
 			def ui_window_show(window)
 				@window = window
-				ui_window_refresh
+				ui_window_refresh_all
 			end
 			
-			def ui_window_refresh
-				max_lines = ui_content_length
-				(1..max_lines).each do |line_nr|
-					Curses.setpos(line_nr, 0)
-					Curses.clrtoeol
+			def ui_content_line(line_nr, text)
+				Curses.setpos(line_nr, 0)
+				Curses.clrtoeol
+				
+				rest = Curses.cols - text.length - COL
+				if rest < 0
+					rest = 0
 				end
+				out = ' ' * COL + text + ' ' * rest
 				
+				if @window.has_cursor? && line_nr == @window.cursor
+					Curses.attron(Curses.color_pair(Curses::COLOR_BLUE) | Curses::A_BOLD) do
+						Curses.addstr(out)
+					end
+				else
+					Curses.addstr(out)
+				end
+			end
+			
+			def ui_window_refresh(lines)
+				ui_window_refresh_all
+				
+				# if !@window.nil?
+				# 	simple_refresh = @window.cursor_on_inner_range?
+					
+				# 	if !simple_refresh || simple_refresh != @ui_window_refresh_last
+				# 		ui_window_refresh_all
+				# 	else
+				# 		ui_window_refresh_simple(lines)
+				# 	end
+					
+				# 	@ui_window_refresh_last = simple_refresh
+				# end
+			end
+			
+			def ui_window_refresh_all
 				if !@window.nil?
-					line_nr = 1
+					content_line_nr = 1
 					@window.content_refresh
 					max_line_len = Curses.cols - 2
 					@window.page.each do |line_object|
@@ -231,36 +328,81 @@ module TheFox
 						end
 						
 						if line_text.length > max_line_len
-							cut = line_text.length - max_line_len + 4
-							line_text = "#{line_text[0..-cut]}..."
+							range = 0..-(line_text.length - max_line_len + 4)
+							line_text = "#{line_text[range]}..."
 						end
 						
-						rest = Curses.cols - line_text.length - COL
+						ui_content_line(content_line_nr, line_text)
 						
-						if @window.has_cursor?
-							if line_nr == @window.cursor
-								Curses.setpos(line_nr, 0)
-								Curses.attron(Curses.color_pair(Curses::COLOR_BLUE) | Curses::A_BOLD) do
-									Curses.addstr(' ' * COL + line_text + ' ' * rest)
-								end
-							else
-								Curses.setpos(line_nr, COL)
-								Curses.addstr(line_text)
-							end
-						else
-							Curses.setpos(line_nr, COL)
-							Curses.addstr(line_text)
-						end
+						content_line_nr += 1
 						
-						line_nr += 1
+						# if $DEBUG
+						# 	Curses.refresh
+						# 	sleep 0.01
+						# end
+					end
+					
+					window_page_length = @window.page_length
+					content_length = ui_content_length
+					if window_page_length < content_length
+						((window_page_length + 1)..content_length).to_a.each do |rest_line_nr|
+							Curses.setpos(rest_line_nr, 0)
+							Curses.clrtoeol
+							
+							# if $DEBUG
+							# 	Curses.addstr("-- CLEAR -- #{rest_line_nr} #{Time.now.strftime('%T')}")
+							# 	Curses.refresh
+							# 	sleep 0.01
+							# end
+						end
 					end
 				end
 				
 				Curses.refresh
 			end
 			
+			def ui_window_refresh_simple(lines)
+				max_line_len = Curses.cols - 2
+				
+				
+				old_cursor = @window.cursor + (lines * -1)
+				old_line_object = @window.page[old_cursor - 1]
+				
+				old_line_text = ''
+				if old_line_object.is_a?(Task) || old_line_object.is_a?(Track)
+					old_line_text = old_line_object.to_list_s
+				else
+					old_line_text = old_line_object.to_s
+				end
+				
+				if old_line_text.length > max_line_len
+					range = 0..-(line_text.length - max_line_len + 4)
+					old_line_text = "#{old_line_text[range]}..."
+				end
+				
+				
+				new_cursor = @window.cursor
+				new_line_object = @window.page[new_cursor - 1]
+				
+				new_line_text = ''
+				if new_line_object.is_a?(Task) || new_line_object.is_a?(Track)
+					new_line_text = new_line_object.to_list_s
+				else
+					new_line_text = new_line_object.to_s
+				end
+				
+				if new_line_text.length > max_line_len
+					range = 0..-(line_text.length - max_line_len + 4)
+					new_line_text = "#{new_line_text[range]}..."
+				end
+				
+				ui_content_line(old_cursor, old_line_text)
+				ui_content_line(@window.cursor, new_line_text)
+				Curses.refresh
+			end
+			
 			def ui_content_length
-				Curses.lines - RESERVED_LINES - @stack.length
+				Curses.lines - RESERVED_LINES - @stack.size
 			end
 			
 			def update_content_length
@@ -272,20 +414,22 @@ module TheFox
 				@window_timeline.content_length = cl
 			end
 			
-			def ui_refresh
+			def ui_refresh_simple
 				ui_stack_lines_refresh
-				ui_window_refresh
+				ui_window_refresh_all
 			end
 			
 			def ui_refresh_all
+				#@ui_window_refresh_last = nil
+				
 				update_content_length
 				ui_title_line
 				ui_status_line(true)
-				ui_refresh
+				ui_refresh_simple
 			end
 			
 			def ui_stack_lines_refresh
-				line_nr = Curses.lines - (3 + (@stack.length - 1))
+				line_nr = Curses.lines - (3 + (@stack.size - 1))
 				
 				Curses.attron(Curses.color_pair(Curses::COLOR_BLUE)) do
 					@stack.tasks_texts.reverse.each do |line_text|
@@ -302,41 +446,42 @@ module TheFox
 				Curses.refresh
 			end
 			
-			def task_apply(task = nil, push = false)
+			def task_apply(task = nil, parent_track = nil, push = false)
 				if task.nil?
 					@stack.pop_all
 				else
 					@tasks[task.id] = task
 					if push
-						@stack.push(task)
+						@stack.push(task, parent_track)
 					else
-						@stack.pop_all(task)
+						@stack.pop_all(task, parent_track)
 					end
 				end
 				
 				update_content_length
 				window_content_changed
 				ui_stack_lines_refresh
-				ui_window_refresh
+				ui_window_refresh_all
 			end
 			
-			def task_apply_replace_stack(task)
-				task_apply(task, false)
+			def task_apply_replace_stack(task, parent_track = nil)
+				if !task.nil?
+					task_apply(task, parent_track, false)
+				end
 			end
 			
 			def task_apply_stack_pop_all
-				task_apply(nil, false)
+				task_apply(nil, nil, false)
 			end
 			
-			def task_apply_push(task)
-				task_apply(task, true)
+			def task_apply_push(task, parent_track = nil)
+				task_apply(task, parent_track, true)
 			end
 			
 			def task_apply_pop
 				if @stack.pop
 					update_content_length
-					#window_content_changed
-					ui_refresh
+					ui_refresh_simple
 				end
 			end
 			
@@ -350,6 +495,21 @@ module TheFox
 				@window_timeline.content_changed
 			end
 			
+			def window_page_object
+				object = @window.page_object if !@window.nil?
+				
+				task = nil
+				track = nil
+				if object.is_a?(Task)
+					task = object
+				elsif object.is_a?(Track)
+					task = object.task
+					track = object
+				end
+				
+				[task, track]
+			end
+			
 			def write_all_data
 				if @last_write.nil?
 					@last_write = Time.now
@@ -373,32 +533,64 @@ module TheFox
 					case key_pressed
 					when Curses::Key::NPAGE
 						@window.next_page if !@window.nil?
-						ui_window_refresh
+						
+						# if $DEBUG
+						# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes])
+						# end
+						
+						ui_window_refresh_all
 					when Curses::Key::PPAGE
 						@window.previous_page if !@window.nil?
-						ui_window_refresh
+						
+						# if $DEBUG
+						# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes])
+						# end
+						
+						ui_window_refresh_all
 					when Curses::Key::DOWN
 						if !@window.nil? && @window.has_cursor?
-							@window.cursor_next_line 
+							simple_refresh_b = @window.cursor_on_inner_range?
 							
-							#ui_status_text("Cursor: #{@window.cursor} c=#{ui_content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}")
+							@window.cursor_next_line
 							
-							ui_window_refresh
+							simple_refresh_a = @window.cursor_on_inner_range?
+							
+							# if $DEBUG
+							# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d %02d %02d %s %s' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes, @window.cursor_border_top, @window.cursor_border_bottom, simple_refresh_b ? 'SIMPLE' : 'FULL', simple_refresh_a ? 'SIMPLE' : 'FULL'])
+							#end
+							
+							ui_window_refresh(1)
 						end
 					when Curses::Key::UP
 						if !@window.nil? && @window.has_cursor?
+							simple_refresh_b = @window.cursor_on_inner_range?
+							
 							@window.cursor_previous_line
 							
-							#ui_status_text("Cursor: #{@window.cursor} c=#{ui_content_length}  l=#{@window.current_line}  pr=#{@window.page_refreshes}  cr=#{@window.content_refreshes}")
+							simple_refresh_a = @window.cursor_on_inner_range?
+							
+							# if $DEBUG
+							# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d %02d %02d %s %s' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes, @window.cursor_border_top, @window.cursor_border_bottom, simple_refresh_b ? 'SIMPLE' : 'FULL', simple_refresh_a ? 'SIMPLE' : 'FULL'])
+							# end
 							
-							ui_window_refresh
+							ui_window_refresh(-1)
 						end
 					when Curses::Key::HOME
 						@window.first_page if !@window.nil?
-						ui_window_refresh
+						
+						if $DEBUG
+							ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes])
+						end
+						
+						ui_window_refresh_all
 					when Curses::Key::END
 						@window.last_page if !@window.nil?
-						ui_window_refresh
+						
+						# if $DEBUG
+						# 	ui_status_text('DEBUG: %03d C=%03d L=%03d pr=%03d cr=%03d' % [@window.cursor, ui_content_length, @window.current_line, @window.page_refreshes, @window.content_refreshes])
+						# end
+						
+						ui_window_refresh_all
 					when Curses::Key::RESIZE
 						update_content_length
 						ui_status_text("Window size: #{Curses.cols}x#{Curses.lines}")
@@ -408,36 +600,31 @@ module TheFox
 						# comment this line.
 						ui_refresh_all
 					when 10
-						object = @window.page_object if !@window.nil?
+						task, track = window_page_object
+						task_apply_replace_stack(task, track)
+					when '#'
+						task, * = window_page_object
 						
-						task = nil
-						if object.is_a?(Task)
-							task = object
-						elsif object.is_a?(Track)
-							task = object.task
-						end
+						track_description = ui_status_input('Track Description: ')
+						ui_status_text("Description: '#{track_description}'")
 						
-						if !task.nil? # && @stack.task != task
-							task_apply_replace_stack(task)
-						end
-					when 'b', 'p'
-						object = @window.page_object if !@window.nil?
+						track = Track.new
+						track.task = task
+						track.description = track_description
 						
-						task = nil
-						if object.is_a?(Task)
-							task = object
-						elsif object.is_a?(Track)
-							task = object.task
-						end
+						task_apply_replace_stack(task, track)
+						#ui_status_text('OK')
+					when 'b', 'p'
+						task, track = window_page_object
 						
 						if task.nil?
 							ui_status_text("Unrecognized object: #{object.class}")
 						else
-							task_apply_push(task)
+							task_apply_push(task, track)
 						end
 					when 'r'
 						ui_refresh_all
-						ui_status_text('')
+						ui_status_text
 					when 'n'
 						task_name = ui_status_input('New task: ')
 						if task_name.nil?
@@ -445,30 +632,50 @@ module TheFox
 						else
 							task = Task.new
 							task.name = task_name
+							task.save_to_file(@data_dir_path)
+							
 							task_apply_replace_stack(task)
 							
+							ui_status_text("Task '#{task_name}' created.")
+						end
+					when 't'
+						task_name = ui_status_input('New task: ')
+						if task_name.nil?
+							ui_status_text('Aborted.')
+						else
+							task = Task.new
+							task.name = task_name
+							task.save_to_file(@data_dir_path)
+							
+							@tasks[task.id] = task
+							
+							update_content_length
+							window_content_changed
+							ui_stack_lines_refresh
+							ui_window_refresh_all
+							
 							ui_status_text("Task '#{task_name}' created.")
 						end
 					when 'x'
 						@stack.task.stop if @stack.has_task?
 						window_content_changed
-						ui_refresh
+						ui_refresh_simple
 					when 'c'
 						@stack.task.toggle if @stack.has_task?
 						window_content_changed
-						ui_refresh
+						ui_refresh_simple
 					when 'v'
 						task_apply_pop
 					when 'f'
 						task_apply_stack_pop_all
 					when 'h', '?'
 						ui_window_show(@window_help)
-					when 't' # Test Windows
-						ui_window_show(@window_test)
 					when '1'
 						ui_window_show(@window_timeline)
 					when '2'
 						ui_window_show(@window_tasks)
+					when '3' # Test Windows
+						ui_window_show(@window_test)
 					when 'w'
 						tasks_save(true)
 					when 'q'