rutui 0.1 → 0.2

data/{rutui.rb → lib/rutui.rb}

@@ -7,7 +7,7 @@
 # Author: Roman Pramberger (roman.pramberger@gmail.com)
 # License: MIT
 #
-# Son Jul 22 16:26:42 CEST 2012
+# Sam Okt 27 19:04:33 CEST 2012
 #
 class RuTui
 class Color
@@ -62,6 +62,57 @@ class Utils
 		system("tput cnorm")
 	end
 end
+class Pixel
+	attr_accessor :fg, :bg, :symbol
+	def initialize foreground = 15, background = nil, symbol = " "
+			@fg = foreground
+			@bg = background
+			@symbol = symbol
+	end
+	def self.random sym = "#"
+		Pixel.new(rand(255),rand(255),sym)
+	end
+end
+class Theme
+	@@themes = {}
+	@@use = :default
+	# init themes
+	def self.init
+		@@themes[:default] = {
+			:background => Pixel.new(236,234,":"),
+			:border 		=> Pixel.new(144,234,"-"),
+			:textcolor  => 11,
+			:rainbow 		=> [1,3,11,2,4,5]
+		}
+		@@themes[:light] = {
+			:background => Pixel.new(251,253,":"),
+			:border 		=> Pixel.new(237,253,"-"),
+			:textcolor  => 0,
+			:rainbow 		=> [1,3,11,2,4,5]
+		}
+	end
+	# Create new theme
+	def self.create name, theme
+		@@themes[name] = theme
+	end
+	# Delete theme
+	def self.delete name
+		@@themes.delete(name)
+	end
+	# Set value from current theme
+	def self.set key, val
+		@@themes[@@use][key] = val
+	end
+	# Get value from current theme
+	def self.get val
+		@@themes[@@use][val]
+	end
+	# set current theme
+	def self.use name
+		@@use = name if !@@themes[name].nil?
+	end
+end
+Theme.init
 class BaseObject
 	attr_accessor :x, :y, :width, :height, :obj
 	# Ex.: BaseObject.new({ :x => 1, :y => 20, :obj => [[Pixel.new(1),Pixel.new(2,4,"#")]] })
@@ -81,11 +132,19 @@ class BaseObject
 	def set_pixel x, y, pixel
 		@obj[x][y] = pixel if !@obj[x].nil? and !@obj[x][y].nil?
 	end
+	# Get pixel by position
+	def get_pixel x, y
+		@obj[x][y] if !@obj[x].nil? and !@obj[x][y].nil?
+	end
 	# "special" each methods for objects
-	def each 
-		@obj.each_with_index do |row,row_count|
-			row.each_with_index do |pixel,col_count|
-				yield row_count, col_count, pixel
+	def each
+		if !@obj.nil?
+			@obj.each_with_index do |row,row_count|
+				if !row.nil?
+					row.each_with_index do |pixel,col_count|
+						yield row_count, col_count, pixel
+					end
+				end
 			end
 		end
 	end
@@ -103,9 +162,10 @@ class Box < RuTui::BaseObject
 		@vertical   = options[:vertical]
 		@horizontal = options[:horizontal]
 		@corner   	= options[:corner]
-		@horizontal = Pixel.new(3,0,"-") if options[:horizontal].nil?
-		@vertical   = Pixel.new(3,0,"|") if options[:vertical].nil?
-		@corner     = Pixel.new(3,0,"*") if options[:corner].nil?
+		ref = Theme.get(:border)
+		@horizontal = Pixel.new(ref.fg,ref.bg,"-") if options[:horizontal].nil?
+		@vertical   = Pixel.new(ref.fg,ref.bg,"|") if options[:vertical].nil?
+		@corner     = Pixel.new(ref.fg,ref.bg,"*") if options[:corner].nil?
 		@width = 3 if @width < 3
 		@height = 3 if @height < 3
 		create
@@ -147,8 +207,8 @@ class Line < BaseObject
 		return if @x.nil? or @y.nil? or @width.nil?
 		@pixel = options[:pixel]
 		@endpixel = options[:endpixel]
-		@pixel = Pixel.new(2) if @pixel.nil?
-		create
+		@pixel = Theme.get(:border) if @pixel.nil?
+		self.create
 	end
 	# Create Line
 	# can be recalled any time on attribute changes
@@ -173,6 +233,7 @@ class Circle < BaseObject
 		@radius = options[:radius]
 		@pixel = options[:pixel]
 		@fill = options[:fill_pixel]
+		@pixel = Theme.get(:border) if @pixel.nil?
 		return if @x.nil? or @y.nil? or @radius.nil?
 		@width = options[:radius]*2 # needed?
 		@height = @width # needed?
@@ -202,16 +263,17 @@ class Circle < BaseObject
 end
 class Text < BaseObject
 	attr_accessor :bg, :fg, :text, :do_rainbow
-	@@rainbow = [1,3,11,2,4,5]
+	@@rainbow = nil
 	def initialize options
+		@@rainbow = Theme.get(:rainbow) if @@rainbow.nil?
 		@do_rainbow = options[:rainbow]
 		@text = options[:text]
 		@x = options[:x]
 		@y = options[:y]
 		@bg = options[:background]
 		@fg = options[:foreground]
-		@bg = 236 if @bg.nil?
-		@fg = 245 if @fg.nil?
+		@bg = Theme.get(:background).bg if @bg.nil?
+		@fg = Theme.get(:textcolor) if @fg.nil?
 		return if @x.nil? or @y.nil?
 		@height = 1
 		create
@@ -241,20 +303,9 @@ class Text < BaseObject
 		create
 	end
 end
-class Pixel
-	attr_accessor :fg, :bg, :symbol
-	def initialize foreground = 15, background = nil, symbol = " "
-			@fg = foreground
-			@bg = background
-			@symbol = symbol
-	end
-	def self.random sym = "#"
-		Pixel.new(rand(255),rand(255),sym)
-	end
-end
 class Screen
 	# Initialize me with a default pixel, if you want
-	def initialize default_pixel = Pixel.new(238,236,":")
+	def initialize default_pixel = Theme.get(:background)
 		size = Utils.winsize
 		@smap = Array.new(size[0]){ Array.new(size[1]) }
 		@map = @smap.dup
@@ -286,9 +337,17 @@ class Screen
 	def add_static object
 		@statics << object if !@statics.include? object
 		object.each do |ri,ci,pixel|
-			@smap[object.y+ri][object.x+ci] = pixel if !pixel.nil? and object.y+ri > 0 and object.y+ci > 0
+			@smap[object.y+ri][object.x+ci] = pixel if !pixel.nil? and object.y+ri >= 0 and object.x+ci >= 0
 		end
 	end
+	# Set pixel on map
+	def set_pixel x,y,val
+		@smap[y][x] = val
+	end
+	# Get pixel from map
+	def get_pixel x,y
+		@smap[y][x]
+	end
 	# add dynamic object
 	def add object
 		@objects << object
@@ -357,10 +416,9 @@ class ScreenManager
 		@@screens[name]
 	end
 	# Refit screen size
-	def refit
+	def self.refit
 		size = Utils.winsize
 		if @autofit or size != @lastsize
-			File.open("log.log", 'w') {|f| f.write("#{size[0]}-#{size[1]}\n") }
 			@@screens[@@current].rescreen
 			@lastsize = size
 		end
@@ -375,6 +433,7 @@ class ScreenManager
 	def self.loop options
 		autodraw = options[:autodraw]
 		@autofit = options[:autofit]
+		@autofit = true if @autofit.nil?
 		@lastsize = nil
 		Utils.init
 		ScreenManager.draw
@@ -385,17 +444,35 @@ class ScreenManager
 			ScreenManager.draw if autodraw
 		end
 	end
+	def self.draw_loop options
+		autofit = options[:autofit]
+		while true
+			key = Utils.gets
+			yield
+			ScreenManager.refit if @autofit
+			ScreenManager.draw
+		end
+	end
+	def self.input_loop options
+		Thread.new {
+			while true
+				key = Utils.gets
+				yield key
+			end
+		}
+	end
 end
 class Figlet < BaseObject
 	attr_accessor :text, :rainbow, :font, :colors
-	# Figlet font: '!" #$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]~ÄÖÜäöüß'
-	@@chars = '!!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]~ÄÖÜäöüß'.split("")
-	@@rainbow = [1,3,11,2,4,5]
+	# Figlet font: '!" #$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]'
+	@@chars = '!!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]'.split("")
+	@@rainbow = nil
 	@@fonts = {}
 	# Initialize (see above)
 	def initialize options
 		@x = options[:x]
 		@y = options[:y]
+		@@rainbow = Theme.get(:rainbow) if @@rainbow.nil?
 		return if @x.nil? or @y.nil?
 		@font = options[:font]
 		@text = options[:text]
@@ -403,7 +480,7 @@ class Figlet < BaseObject
 		@space = options[:space]
 		@space = 0 if @space.nil?
 		@colors = options[:colors]
-		@colors = [Pixel.new(15)] if @colors.nil?
+		@colors = [Pixel.new(Theme.get(:textcolor))] if @colors.nil?
 		create
 	end
 	
@@ -517,34 +594,119 @@ class Axx < BaseObject
 end
 class Axx < BaseObject
 	def initialize options
-		@x = options[:x]
-		@y = options[:y]
 		@file = options[:file]
-		@attr, @xx, @yy, @save_x, @save_y, @attr = 0,0,0,0,0,0
-		return if @x.nil? or @y.nil? or @file.nil?
+		return if @file.nil?
 		return if !File.exists? @file
 		@img = File.open(@file).read
-		p @img
 		parse
 	end
 	def parse
 		out = []
 		@img.split("\n").each_with_index do |line,li|
-			out[li] << []
-			line.split("|").each_with_index do |elem,ei|
-				ele = elem.split(";")
-				if ele.size == 3
-					out[li][ei] = Pixel.new(elem[1].to_i,elem[2].to_i,elem[0])
-				elsif ele.size == 2
-					out[li][ei] = Pixel.new(elem[1].to_i,nil,elem[0])
-				else
-					out[li][ei] = Pixel.new(nil,nil,elem[0])
+			if !line.match(/^#/)
+				out[li] = []
+				line.split("|").each_with_index do |elem,ei|
+					ele = elem.split(":")
+					if ele.size == 3
+						out[li][ei] = Pixel.new(ele[1].to_i,ele[2].to_i,ele[0])
+					elsif ele.size == 2
+						out[li][ei] = Pixel.new(ele[1].to_i,nil,ele[0])
+					else
+						if ele[0] == "nil"
+							out[li][ei] = nil
+						else
+							out[li][ei] = Pixel.new(nil,nil,ele[0])
+						end
+					end
 				end
 			end
 		end
+		out.each do |o|
+			out.delete(o) if o.nil?
+		end
 		@obj = out
 		@height = out.size
-		@width = out[0].size
+		@width = out.size
+	end
+	def self.parse data
+		out = []
+		data.split("\n").each_with_index do |line,li|
+			if !line.match(/^#/)
+				out[li] = []
+				line.split("|").each_with_index do |elem,ei|
+					ele = elem.split(":")
+					if ele.size == 3
+						out[li][ei] = Pixel.new(ele[1].to_i,ele[2].to_i,ele[0])
+					elsif ele.size == 2
+						out[li][ei] = Pixel.new(ele[1].to_i,nil,ele[0])
+					else
+						if ele[0] == "nil"
+							out[li][ei] = nil
+						else
+							out[li][ei] = Pixel.new(nil,nil,ele[0])
+						end
+					end
+				end
+			end
+		end
+		out.each do |o|
+			out.delete(o) if o.nil? or o == []
+		end
+		return out
+	end
+end
+class Sprite < BaseObject
+	attr_accessor :tick, :current, :sprites, :ticks, :object
+	@@spr = []
+	def initialize options
+		@x = options[:x]
+		@y = options[:y]
+		@x = 0 if @x.nil?
+		@y = 0 if @y.nil?
+		@tick = 0
+		@object = options[:obj]
+		@file = options[:file]
+		@current = nil
+		@@spr << self
+		@sprites = {}
+		create_from_file if !@file.nil?
+	end
+	def create_from_file
+		if File.exists? @file
+			data = File.open(@file).read
+			# AXX Format
+			if data.include? '---' and data.include? '| :' 
+				out = []
+				data = data.split("---")
+				while data.size > 0
+					while data[0].match(/^#/)
+						data.shift
+					end
+					name = data.shift
+					content = data.shift
+					@sprites[name] = [] if @sprites[name].nil?
+					@sprites[name] << Axx.parse(content)
+					@current = name if @current.nil? # first sprite gets default
+					@obj = @sprites[@current][0]
+				end
+			end
+		end
+	end
+	# set current animation
+	def set_current name
+		@current = name
+		@obj = @sprites[@current][0]
+	end
+	# Add sprite
+	def add name, images
+		@current = name if @current.nil? # first sprite gets default
+		@sprites[name] = images
+	end
+	# Update ticker
+	def update
+		@tick += 1
+		@tick = 0 if @tick >= ( @sprites[@current].size )
+		@obj = @sprites[@current][@tick]
 	end
 end
 end

metadata

@@ -1,66 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rutui
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+version: !ruby/object:Gem::Version
+  version: '0.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Roman Pramberger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-22 00:00:00 +02:00
-default_executable: 
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies: []
-
 description: Create Pure Ruby textbased interfaces of all kinds (Unix only)
 email: roman.pramberger@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- rutui.rb
-has_rdoc: true
+files:
+- lib/rutui.rb
 homepage: http://rubygems.org/gems/rutui
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RUby Textbased User Interface
 test_files: []
-