rutui 0.4 → 0.7

data/lib/rutui/table.rb

@@ -1,209 +1,212 @@
-## Table Object Class
-# Creates an Table element
-#
-# Attributes (all accessible):
-# 	:x				MUST
-# 	:y				MUST
-#	:table			- the tabular data in an array (like: [[1,"A"], [2, "B"]])
-#	:background		- Background color (0-255)
-#	:foreground 	- Foreground color (0-255)
-# 	:hover			- Hover color (0-255)
-# 	:ascii 			- Draw ASCII decoration
-#   :highlight 		- To highlight line
-# 	:highlight_direction - Highlight direction
-#   :cols 			- Header and meta definitions (see example)
-# 	:pixel 			- Default pixel (colors) for border
-#
-class Table < BaseObject
-	attr_accessor :table, :ascii, :highlight, :highlight_direction, :cols
-
-	def initialize options
-		@bg = options[:background]
-		@hover = options[:hover]
-		@fg = options[:foreground]
-		@bg = Theme.get(:background).bg if @bg.nil?
-		@fg = Theme.get(:textcolor) if @fg.nil?
-		@bg2 = @bg if @bg2.nil?
-		@ascii = options[:ascii]
-		@ascii = true if @ascii.nil?
-
-		@pixel = options[:pixel]
-		@pixel = Theme.get(:border) if @pixel.nil?
-
-		@table = options[:table]
-		@table = [] if @table.nil?
-
-		@cols = options[:cols]
-		@cols = [] if @cols.nil?
-
-		@highlight = options[:highlight]
-		@highlight = 0 if @highlight.nil?
-
-		@highlight_direction = options[:highlight_direction]
-		@highlight_direction = :horizontal if @highlight_direction.nil?
-
-		@x = options[:x]
-		@x = 1 if @x.nil?
-		@y = options[:y]
-		@y = 1 if @y.nil?
-
-		@reverse = false
-		@header = false
-		@header = true if options[:header] == true
-
-		@meta = { :height => @table.size, :cols => 0 }
-		index_col_widths
-
-		create
-
-		@height = @table.size
-		#@height += 2 if @ascii
-		@width  = @table[0].size
+module RuTui
+	## Table Object Class
+	# Creates an Table element
+	#
+	# Attributes (all accessible):
+	# 	:x				MUST
+	# 	:y				MUST
+	#	:table			- the tabular data in an array (like: [[1,"A"], [2, "B"]])
+	#	:background		- Background color (0-255)
+	#	:foreground 	- Foreground color (0-255)
+	# 	:hover			- Hover color (0-255)
+	# 	:ascii 			- Draw ASCII decoration
+	#   :highlight 		- To highlight line
+	# 	:highlight_direction - Highlight direction
+	#   :cols 			- Header and meta definitions (see example)
+	# 	:pixel 			- Default pixel (colors) for border
+	#
+	class Table < BaseObject
+		attr_accessor :table, :ascii, :highlight, :highlight_direction, :cols
+
+		def initialize options
+			@bg = options[:background]
+			@hover = options[:hover]
+			@fg = options[:foreground]
+			@bg = -1 if @bg.nil?
+			@fg = Theme.get(:textcolor) if @fg.nil?
+			@bg2 = @bg if @bg2.nil?
+			@ascii = options[:ascii]
+			@ascii = true if @ascii.nil?
+
+			@pixel = options[:pixel]
+			@pixel = Theme.get(:border) if @pixel.nil?
+
+			@table = options[:table]
+			@table = [] if @table.nil?
+
+			@cols = options[:cols]
+			@cols = [] if @cols.nil?
+
+			@highlight = options[:highlight]
+			@highlight = 0 if @highlight.nil?
+
+			@highlight_direction = options[:highlight_direction]
+			@highlight_direction = :horizontal if @highlight_direction.nil?
+
+			@x = options[:x]
+			@x = 1 if @x.nil?
+			@y = options[:y]
+			@y = 1 if @y.nil?
 
+			@reverse = false
+			@header = false
+			@header = true if options[:header] == true
 
-	end
+			@meta = { :height => @table.size, :cols => 0 }
+			index_col_widths
 
-	##
-	# Set data
-	def set_table table
-		@table = table
-		index_col_widths
-		create
-	end
+			create
+
+			@height = @table.size
+			#@height += 2 if @ascii
+			@width  = @table[0].size
 
-	##
-	# Add line to table
-	def add line
-		@table << line
-		@height += 1
-		index_col_widths
-		create
-	end
 
-	##
-	# Delete line from table by index
-	def delete line_id
-		if !@table[line_id].nil?
-			@table.delete_at(line_id)
-			@height -= 1
+		end
+
+		##
+		# Set data
+		def set_table table
+			@table = table
 			index_col_widths
 			create
 		end
-	end
 
-	##
-	# highlight line
-	def highlight line_id
-		return highlight if line_id.nil?
-		@highlight = line_id
-		@reverse = false
-		create
-	end
+		##
+		# Add line to table
+		def add line
+			@table << line
+			@height += 1
+			index_col_widths
+			create
+		end
 
-	##
-	# create or recreate the table object
-	def create
-		obj = []
-		if @header
-			obj << ascii_table_line if @ascii
-			_obj = []
-			_obj << Pixel.new(@pixel.fg,@bg,"|") if @ascii
-			@cols.each_with_index do |col, index|
-				fg = @pixel.fg
-				fg = @cols[index][:title_color] if !@cols[index].nil? and !@cols[index][:title_color].nil?
-				chars = "".to_s.split("")
-				chars = " #{ col[:title] }".to_s.split("") if !col.nil? and !col[:title].nil?
-				chars.each_with_index do |e, char_count|
-					_obj << Pixel.new(fg,@bg,e)
-				end
-				(@meta[:max_widths][index]-chars.size+2).times do |i|
-					_obj << Pixel.new(@pixel.fg,@bg," ")
-				end
-				_obj << Pixel.new(@pixel.fg,@bg,"|") if @ascii
+		##
+		# Delete line from table by index
+		def delete line_id
+			if !@table[line_id].nil?
+				@table.delete_at(line_id)
+				@height -= 1
+				index_col_widths
+				create
 			end
-			obj << _obj
 		end
-		obj << ascii_table_line if @ascii
-		@table.each_with_index do |line, lindex|
-			bg = @bg
-			bg = @hover if lindex == @highlight and @highlight_direction == :horizontal
-			_obj = []
-			_obj << Pixel.new(@pixel.fg,bg,"|") if @ascii
-			line.each_with_index do |col, index|
-				fg = @fg
-				fg = @cols[index][:color] if !@cols[index].nil? and !@cols[index][:color].nil?
-
-				if @highlight_direction == :vertical 
-					if index == @highlight
-						bg = @hover
-					else
-						bg = @bg
+
+		##
+		# highlight line
+		def highlight line_id
+			return highlight if line_id.nil?
+			@highlight = line_id
+			@reverse = false
+			create
+		end
+
+		##
+		# create or recreate the table object
+		def create
+			obj = []
+			if @header
+				obj << ascii_table_line if @ascii
+				_obj = []
+				_obj << Pixel.new(@pixel.fg,@bg,"|") if @ascii
+				_obj << nil
+				@cols.each_with_index do |col, index|
+					fg = @pixel.fg
+					fg = @cols[index][:title_color] if !@cols[index].nil? and !@cols[index][:title_color].nil?
+					chars = "".to_s.split("")
+					chars = "#{ col[:title] }".to_s.split("") if !col.nil? and !col[:title].nil?
+					chars.each_with_index do |e, char_count|
+						_obj << Pixel.new(fg,@bg,e)
 					end
+					(@meta[:max_widths][index]-chars.size+2).times do |i|
+						_obj << nil
+					end
+					_obj << Pixel.new(@pixel.fg,@bg,"|") if @ascii
 				end
+				obj << _obj
+			end
+			obj << ascii_table_line if @ascii
+			@table.each_with_index do |line, lindex|
+				bg = @bg
+				bg = @hover if lindex == @highlight and @highlight_direction == :horizontal
+				_obj = []
+				_obj << Pixel.new(@pixel.fg,bg,"|") if @ascii
+				line.each_with_index do |col, index|
+					fg = @fg
+					fg = @cols[index][:color] if !@cols[index].nil? and !@cols[index][:color].nil?
+
+					if @highlight_direction == :vertical
+						if index == @highlight
+							bg = @hover
+						else
+							bg = @bg
+						end
+					end
 
 
-				chars = col.to_s.split("")
-				_obj << Pixel.new(@pixel.fg,bg," ")
-				max_chars = nil
-				max_chars = @cols[index][:max_length]+1 if !@cols[index].nil? and !@cols[index][:max_length].nil?
-				max_chars = @cols[index][:length]+1 if !@cols[index].nil? and !@cols[index][:length].nil?
-				chars.each_with_index do |e, char_count|
-					break if !max_chars.nil? and char_count >= max_chars
-					_obj << Pixel.new(fg,bg,e)
-				end
-				(@meta[:max_widths][index]-chars.size+1).times do |i|
-					_obj << Pixel.new(@pixel.fg,bg," ")
-				end
+					chars = col.to_s.split("")
+					_obj << nil
+					max_chars = nil
+					max_chars = @cols[index][:max_length]+1 if !@cols[index].nil? and !@cols[index][:max_length].nil?
+					max_chars = @cols[index][:length]+1 if !@cols[index].nil? and !@cols[index][:length].nil?
+					chars.each_with_index do |e, char_count|
+						break if !max_chars.nil? and char_count >= max_chars
+						_obj << Pixel.new(fg,bg,e)
+					end
+					(@meta[:max_widths][index]-chars.size+1).times do |i|
+						_obj << nil
+					end
 
-				bg = @bg if @highlight_direction == :vertical
-				_obj << Pixel.new(@pixel.fg,bg,"|") if @ascii
+					bg = @bg if @highlight_direction == :vertical
+					_obj << Pixel.new(@pixel.fg,bg,"|") if @ascii
+				end
+				obj << _obj
 			end
-			obj << _obj
+			obj << ascii_table_line if @ascii
+			@obj = obj
 		end
-		obj << ascii_table_line if @ascii
-		@obj = obj
-	end
 
-	##
-	# sort by column
-	def sort col
-		@table.sort! { |a,b| a[col] <=> b[col] }
-		@table.reverse! if @reverse
-		if @reverse == false
-			@reverse = true 
-		else
-			@reverse = false
+		##
+		# sort by column
+		def sort col
+			@table.sort! { |a,b| a[col] <=> b[col] }
+			@table.reverse! if @reverse
+			if @reverse == false
+				@reverse = true
+			else
+				@reverse = false
+			end
+			create
 		end
-		create
-	end
 
-	private
-	def ascii_table_line
-		_obj = []
-		_obj << Pixel.new(@pixel.fg,@bg,"+")
-		@meta[:max_widths].each do |index,mw|
-			(mw+2).times do |i|
-				_obj << Pixel.new(@pixel.fg,@bg,"-")
-			end
+		private
+		def ascii_table_line
+			_obj = []
 			_obj << Pixel.new(@pixel.fg,@bg,"+")
+			@meta[:max_widths].each do |index,mw|
+				(mw+2).times do |i|
+					_obj << Pixel.new(@pixel.fg,@bg,"-")
+				end
+				_obj << Pixel.new(@pixel.fg,@bg,"+")
+			end
+			_obj
 		end
-		_obj
-	end
 
-	def index_col_widths
-		@meta[:cols] = 0
-		@meta[:max_widths] = {}
-		@table.each do |line|
-			cols = 0
-			if !line.nil?
-				line.each_with_index do |col, index|
-					@meta[:max_widths][index] = col.size if @meta[:max_widths][index].nil?
-					@meta[:max_widths][index] = col.size if @meta[:max_widths][index] < col.size
-					@meta[:max_widths][index] = @cols[index][:max_length] if !@cols.nil? and !@cols[index].nil? and !@cols[index][:max_length].nil?
-					@meta[:max_widths][index] = @cols[index][:length] if !@cols.nil? and !@cols[index].nil? and !@cols[index][:length].nil?
+		def index_col_widths
+			@meta[:cols] = 0
+			@meta[:max_widths] = {}
+			@table.each do |line|
+				cols = 0
+				if !line.nil?
+					line.each_with_index do |col, index|
+						@meta[:max_widths][index] = col.size if @meta[:max_widths][index].nil?
+						@meta[:max_widths][index] = col.size if @meta[:max_widths][index] < col.size
+						@meta[:max_widths][index] = @cols[index][:max_length] if !@cols.nil? and !@cols[index].nil? and !@cols[index][:max_length].nil?
+						@meta[:max_widths][index] = @cols[index][:length] if !@cols.nil? and !@cols[index].nil? and !@cols[index][:length].nil?
+					end
+					@meta[:cols] = cols if cols > @meta[:cols]
 				end
-				@meta[:cols] = cols if cols > @meta[:cols]
 			end
 		end
 	end
-end
+end

data/lib/rutui/textfield.rb

@@ -1,112 +1,135 @@
-## Textfield Object Class
-# Creates an Textfield element
-#
-# Methods:
-# 	:set_focus 		Set focus to this textfield
-# 	:write CHAR 	Write char to textfield (if has focus)
-# 	:set_text TEXT 	Set text
-# 	:get_text 		Returns text
-# 	:count 			Text count
-#
-# Attributes (all accessible):
-# 	:x				MUST
-# 	:y				MUST
-#	:pixel			- pixel from which colors get inherted
-# 	:allow			- allowed chars
-# 	:password		- boolean: is password field?
-# 	:focus 			- has focus?
-#
-class Textfield < BaseObject
-	attr_accessor :focus, :password, :border, :allow
-
-	def initialize options
-		@width = 14
-		@width = options[:width] if !options[:width].nil?
-
-		@pixel = options[:pixel]
-		@pixel = Theme.get(:border) if @pixel.nil?
-
-		@x = options[:x]
-		@x = 1 if @x.nil?
-		@y = options[:y]
-		@y = 1 if @y.nil?
-
-		@allow = (0..9).to_a + ('a'..'z').to_a + ('A'..'Z').to_a + [" ", ":", "<", ">", "|", "#", 
-			"@", "*", ",", "!", "?", ".", "-", "_", "=", "[", "]", "(", ")", "{", "}", ";"]
-		@allow = options[:allow] if !options[:allow].nil?
-
-		@height = 1
-
-		@focus = false
-		@password = false
-		@password = true if options[:password] == true
-
-		@text = ""
-
-		create
-	end
+module RuTui
+	## Textfield Object Class
+	# Creates an Textfield element
+	#
+	# Methods:
+	# 	:set_focus 		Set focus to this textfield
+	#   :take_focus     Unset focus
+	# 	:write CHAR 	Write char to textfield (if has focus)
+	# 	:set_text TEXT 	Set text
+	# 	:get_text 		Returns text
+	# 	:count 			Text count
+	#
+	# Attributes (all accessible):
+	# 	:x				MUST
+	# 	:y				MUST
+	#	:pixel			- pixel from which colors get inherted
+	#   :focus_pixel    - pixel used when on focus (defaults to pixel)
+	# 	:allow			- allowed chars
+	# 	:password		- boolean: is password field?
+	# 	:focus 			- has focus?
+	#
+	class Textfield < BaseObject
+		attr_accessor :focus, :password, :allow
+
+		def initialize options
+			@width = 14
+			@width = options[:width] if !options[:width].nil?
+
+			@pixel = options[:pixel]
+			@pixel = Theme.get(:border) if @pixel.nil?
+
+			@focus_pixel = options[:focus_pixel]
+			@focus_pixel = @pixel if @focus_pixel.nil?
+
+			@x = options[:x]
+			@x = 1 if @x.nil?
+			@y = options[:y]
+			@y = 1 if @y.nil?
+
+			@allow = (0..9).to_a + ('a'..'z').to_a + ('A'..'Z').to_a + [" ", ":", "<", ">", "|", "#",
+				"@", "*", ",", "!", "?", ".", "-", "_", "=", "[", "]", "(", ")", "{", "}", ";"]
+			@allow = options[:allow] if !options[:allow].nil?
+
+			@height = 1
+
+			@focus = false
+			@password = false
+			@password = true if options[:password] == true
+
+			@text = ""
+
+			create
+		end
 
-	##
-	# set focus
-	def set_focus
-		@focus = true
-		Ansi.position @x, @y
-	end
+		##
+		# set focus
+		def set_focus
+			@focus = true
+			RuTui::Ansi.position @x, @y
+			create
+		end
 
-	##
-	# count
-	def count
-		@text.size
-	end
+		##
+		# take focus
+		def take_focus
+			@focus = false
+			create
+		end
 
-	## 
-	# write to textfield
-	def write char
-		if @focus
-			@text += char.chr if @allow.include? char.chr
-			@text = @text[0..-2] if char == 127
+		##
+		# count
+		def count
+			@text.size
 		end
-		create
-	end
 
-	##
-	# set text
-	def set_text text
-		@text = text
-		create
-	end
+		##
+		# write to textfield
+		def write char
+			if @focus
+				@text += char if @allow.include? char
+				@text = @text[0..-2] if char == :backspace or char == :ctrl_h # its 8 on windows
+			end
+			create
+		end
 
-	##
-	# get text
-	def get_text
-		@text
-	end
+		##
+		# set text
+		def set_text text
+			@text = text
+			create
+		end
 
-	##
-	# create or recreate the table object
-	def create
-		obj = []
-		_obj = []
-		if (@text.size+2) < @width
-			text = @text
-		else
-			text = @text.split(//).last(@width).join("").to_s
+		##
+		# get text
+		def get_text
+			@text
 		end
 
-		if password
-			_text = text
-			text = ""
-			_text.size.times do |i|
-				text += "*"
+		##
+		# create or recreate the table object
+		def create
+			obj = []
+			_obj = []
+			if (@text.size+2) < @width
+				text = @text
+			else
+				text = @text.split(//).last(@width).join("").to_s
 			end
-		end
 
-		text.to_s.split("").each do |t|
-			_obj << Pixel.new(@pixel.fg, @pixel.bg, t)
+			if password
+				_text = text
+				text = ""
+				_text.size.times do |i|
+					text += "*"
+				end
+			end
+
+			text.to_s.split("").each do |t|
+				if @focus && @focus_pixel != @pixel
+					_obj << Pixel.new(@focus_pixel.fg, @focus_pixel.bg, t)
+				else
+					_obj << Pixel.new(@pixel.fg, @pixel.bg, t)
+				end
+			end
+
+			if @focus && @focus_pixel != @pixel
+				_obj << Pixel.new(@focus_pixel.fg, @focus_pixel.bg, "_")
+			else
+				_obj << Pixel.new(@pixel.fg, @pixel.bg, "_")
+			end
+			obj << _obj
+			@obj = obj
 		end
-		
-		_obj << Pixel.new(@pixel.fg, @pixel.bg, "_")
-		obj << _obj
-		@obj = obj
 	end
-end
+end