rutui 0.4 → 0.7

data/lib/rutui/pixel.rb

@@ -1,22 +1,24 @@
-## Pixel Class
-# Each pixel consinsts of foreground, background and
-# a symbol. What it is, is self explainaring
-#
-# Colors can be numbers between 0 and 255
-# (dunno how windows or OSX handles colors over 16)
-#
-# The Symbol may eats every in Ruby working Ascii Symbol
-#
-class Pixel
-	attr_accessor :fg, :bg, :symbol
+module RuTui
+	## Pixel Class
+	# Each pixel consinsts of foreground, background and
+	# a symbol. What it is, is self explainaring
+	#
+	# Colors can be numbers between 0 and 255
+	# (dunno how windows or OSX handles colors over 16)
+	#
+	# The Symbol may eats every in Ruby working Ascii Symbol
+	#
+	class Pixel
+		attr_accessor :fg, :bg, :symbol
 
-	def initialize foreground = 15, background = nil, symbol = " "
-			@fg = foreground
-			@bg = background
-			@symbol = symbol
-	end
+		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)
+		def self.random sym = "#"
+			Pixel.new(rand(255),rand(255),sym)
+		end
 	end
 end

data/lib/rutui/screen.rb

@@ -1,107 +1,149 @@
 # This File contains the Screen Class
 
-## Screen Class
-# The Screen is the root element of your app.
-# Its basicly a map containing you screens pixels
-#
-class Screen
-	# Initialize me with a default pixel, if you want
-	def initialize default_pixel = Theme.get(:background)
-		size = Utils.winsize
-		@smap = Array.new(size[0]){ Array.new(size[1]) }
-		@map = @smap.dup
-		@default = default_pixel
-		@objects = []
-		@statics = []
-		# Set as default if first screen
-		ScreenManager.add :default, self if ScreenManager.size == 0
-	end
-
-	# regen screen (size change?)
-	def rescreen
-		size = Utils.winsize
-		@smap = Array.new(size[0]){ Array.new(size[1]) }
+require 'io/console'
 
-		@statics.each do |s|
-			self.add_static s
+module RuTui
+	## Screen Class
+	# The Screen is the root element of your app.
+	# Its basicly a map containing you screens pixels
+	#
+	class Screen
+		# Initialize me with a default pixel, if you want
+		def initialize default_pixel = Theme.get(:background)
+			size = Screen.size
+			@smap = Array.new(size[0]){ Array.new(size[1]) }
+			@map = @smap.dup
+			@default = default_pixel
+			@objects = []
+			@statics = []
+			# Set as default if first screen
+			ScreenManager.add :default, self if ScreenManager.size == 0
 		end
 
-		@map = @smap.dup
-	end
+		# regen screen (size change?)
+		def rescreen
+			size = Screen.size
+			@smap = Array.new(size[0]){ Array.new(size[1]) }
 
-	# Set default/background pixel
-	#  Ex.: screen.set_default Pixel.new(244,1,";")
-	def set_default pixel
-		@default = pixel
-	end
+			@statics.each do |s|
+				self.add_static s
+			end
 
-	##
-	# Get default/background pixel
-	def get_default
-		@default
-	end
+			@map = @smap.dup
+		end
 
-	##
-	# add object that doesnt change over time
-	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
+		# Set default/background pixel
+		#  Ex.: screen.set_default Pixel.new(244,1,";")
+		def set_default pixel
+			@default = pixel
 		end
-	end
 
-	##
-	# add dynamic object
-	def add object
-		@objects << object
-	end
+		##
+		# Get default/background pixel
+		def get_default
+			@default
+		end
 
-	##
-	# remove object
-	def delete object
-		@objects.delete(object)
-	end
+		##
+		# add object that doesnt change over time
+		def add_static object
+			@statics << object if !@statics.include? object
+			object.each do |ri,ci,pixel|
+				if !pixel.nil? and object.y+ri >= 0 and object.y+ci >= 0
+					if @smap[object.y+ri][object.x+ci].nil?
+						if pixel.bg == -1
+							pixel.bg = @map[object.y + ri][object.x + ci].bg if !@map[object.y + ri][object.x + ci].nil?
+							pixel.bg = Theme.get(:background).bg if pixel.bg == -1
+						end
+						if pixel.fg == -1
+							pixel.fg = @map[object.y + ri][object.x + ci].fg if !@map[object.y + ri][object.x + ci].nil?
+							pixel.fg = Theme.get(:background).fg if pixel.fg == -1
+						end
 
-	##
-	# draw the pixel-screen map
-	def draw
-		lastpixel = Pixel.new(rand(255), rand(255), ".")
-		@map = Marshal.load( Marshal.dump( @smap )) # Deep copy
-
-		# get all the objects
-		@objects.each do |o|
-			next if o.x.nil? or o.y.nil? 
-			o.each do |ri,ci,pixel|
-				@map[o.y + ri][o.x + ci] = pixel if !pixel.nil? and o.y+ri > 0 and o.x+ci > 0 and o.y+ri < @map.size and o.x+ci < @map[0].size
+						@smap[object.y+ri][object.x+ci] = pixel
+					else
+						@smap[object.y+ri][object.x+ci] = @smap[object.y+ri][object.x+ci].dup
+						@smap[object.y+ri][object.x+ci].fg = pixel.fg if pixel.fg != -1
+						@smap[object.y+ri][object.x+ci].bg = pixel.bg if pixel.bg != -1
+						@smap[object.y+ri][object.x+ci].symbol = pixel.symbol
+					end
+				end
 			end
 		end
+		##
 
-		out = "" # Color.go_home
-		# an DRAW!
-		@map.each do |line|
-			line.each do |pixel|
-				if pixel != lastpixel
-					out += Ansi.clear_color if lastpixel != 0
-					if pixel.nil?
-						lastpixel = pixel
-						out += "#{Ansi.bg(@default.bg)}#{Ansi.fg(@default.fg)}#{@default.symbol}"
-					else
-						lastpixel = pixel
-						out += "#{Ansi.bg(pixel.bg)}#{Ansi.fg(pixel.fg)}#{pixel.symbol}"
+		# add dynamic object
+		def add object
+			@objects << object
+		end
+
+		##
+		# remove object
+		def delete object
+			@objects.delete(object)
+		end
+
+		##
+		# draw the pixel-screen map
+		def draw
+			lastpixel = Pixel.new(rand(255), rand(255), ".")
+			@map = Marshal.load( Marshal.dump( @smap )) # Deep copy
+
+			# get all the objects
+			@objects.each do |o|
+				next if o.x.nil? or o.y.nil?
+				o.each do |ri,ci,pixel|
+					if !pixel.nil? and o.y+ri >= 0 and o.x+ci >= 0 and o.y+ri < @map.size and o.x+ci < @map[0].size
+						# -1 enables a "transparent" effect
+						if pixel.bg == -1
+							pixel.bg = @map[o.y + ri][o.x + ci].bg if !@map[o.y + ri][o.x + ci].nil?
+							pixel.bg = Theme.get(:background).bg if pixel.bg == -1
+						end
+						if pixel.fg == -1
+							pixel.fg = @map[o.y + ri][o.x + ci].fg if !@map[o.y + ri][o.x + ci].nil?
+							pixel.fg = Theme.get(:background).fg if pixel.fg == -1
+						end
+
+						@map[o.y + ri][o.x + ci] = pixel
 					end
-				else
-					if pixel.nil?
-						out += @default.symbol
+				end
+			end
+
+			out = "" # Color.go_home
+			# and DRAW!
+			@map.each do |line|
+				line.each do |pixel|
+					if lastpixel != pixel
+						out += RuTui::Ansi.clear_color if lastpixel != 0
+						if pixel.nil?
+							out += "#{RuTui::Ansi.bg(@default.bg)}#{RuTui::Ansi.fg(@default.fg)}#{@default.symbol}"
+						else
+							out += "#{RuTui::Ansi.bg(pixel.bg)}#{RuTui::Ansi.fg(pixel.fg)}#{pixel.symbol}"
+						end
+						lastpixel = pixel
 					else
-						out += pixel.symbol
+						if pixel.nil?
+							out += @default.symbol
+						else
+							out += pixel.symbol
+						end
 					end
 				end
 			end
+
+			# draw out
+			print out.chomp
+			$stdout.flush
 		end
 
-		# draw out
-		print out
-		$stdout.flush
-	end
+		# Hides the cursor
+		def self.hide_cursor
+			print RuTui::Ansi.hide_cursor
+		end
+
+		def self.size
+			IO.console.winsize
+		end
 
+	end
 end

data/lib/rutui/screenmanager.rb

@@ -1,76 +1,89 @@
 # This file contains the ScreenManager
+module RuTui
+	## Screen Manager Class
+	# Static class to handle screens
+	#
+	class ScreenManager
+		@@screens = {}
+		@@current = :default
+		@@blocked = false
 
-## Screen Manager Class
-# Static class to handle screens 
-#
-class ScreenManager
-	@@screens = {}
-	@@current = :default
+		# Set a screen
+		#  Ex.: ScreenManager.set :default, Screen.new
+		def self.add name, screen
+			@@screens[name] = screen
+		end
 
-	# Set a screen
-	#  Ex.: ScreenManager.set :default, Screen.new
-	def self.add name, screen
-		@@screens[name] = screen
-	end
+		# Get count of existing screens
+		def self.size
+			@@screens.size
+		end
 
-	# Get count of existing screens
-	def self.size
-		@@screens.size
-	end
+		# Delete screen by name
+		def self.delete name
+			@@screens.delete(name) if !@@screens[name].nil?
+		end
 
-	# Delete screen by name
-	def self.delete name
-		@@screens.delete(name) if !@@screens[name].nil?
-	end
+		# Set current screen
+		def self.set_current name
+			@@current = name
+		end
 
-	# Set current screen
-	def self.set_current name
-		@@current = name
-	end
+		# Get current screen
+		def self.get_current
+			# Fix size and others of screen here
+			@@current
+		end
 
-	# Get current screen
-	def self.get_current
-		# Fix size and others of screen here
-		@@current
-	end
+		# Get the complete screen by name
+		def self.get_screen name
+			@@screens[name]
+		end
 
-	# Get the complete screen by name
-	def self.get_screen name
-		@@screens[name]
-	end
+		# Refit screen size
+		def self.refit
+			size = Screen.size
+			if @autofit and size != @lastsize
+				@@screens[@@current].rescreen
+				@lastsize = size
+			end
+		end
 
-	# Refit screen size
-	def self.refit
-		size = Utils.winsize
-		if @autofit and size != @lastsize
-			@@screens[@@current].rescreen
-			@lastsize = size
+		# draw current screen
+		def self.draw
+			print RuTui::Ansi.go_home
+			@@screens[@@current].draw
 		end
-	end
 
-	# draw current screen
-	def self.draw
-		print Ansi.go_home
-		@@screens[@@current].draw
-	end
+		# Raw Game Loop
+		#  Ex.: ScreenManager.loop({ :autodraw => true, :autofit => true }){ |key| p key }
+		def self.loop options
+			autodraw = options[:autodraw]
+			@autofit = options[:autofit]
+			@autofit = true if @autofit.nil?
+			@timeout = options[:timeout]
+			@lastsize = nil
+			@lastaction = Time.now.to_f
+			print RuTui::Ansi.clear
+			print RuTui::Ansi.set_start
+			Screen.hide_cursor
+
+			ScreenManager.draw
 
-	# Raw Game Loop
-	#  Ex.: ScreenManager.loop({ :autodraw => true, :autofit => true }){ |key| p key } 
-	def self.loop options
-		autodraw = options[:autodraw]
-		@autofit = options[:autofit]
-		@autofit = true if @autofit.nil?
-		@lastsize = nil
-		print Ansi.clear
-		print Ansi.set_start
-		Utils.init
-		ScreenManager.draw
+			while true
+				if !@@blocked
+					@@blocked = true
+					key = Input.getc
+					yield key
+					if (@timeout.nil? or (@lastaction < Time.now.to_f-@timeout))
+						@lastaction = Time.now.to_f
+						ScreenManager.refit if @autofit
+						ScreenManager.draw if autodraw
+					end
+					@@blocked = false
+				end
+			end
 
-		while true
-			key = Utils.gets
-			yield key
-			ScreenManager.refit if @autofit
-			ScreenManager.draw if autodraw
 		end
 	end
 end

data/lib/rutui/sprites.rb

@@ -1,64 +1,65 @@
-class Sprite < BaseObject
-	attr_accessor :tick, :current, :sprites, :ticks, :object
-	@@spr = []
+module RuTui
+	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?
+		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
+			@tick = 0
+			@object = options[:obj]
+			@file = options[:file]
+			@current = nil
 
-		@@spr << self
+			@@spr << self
 
-		@sprites = {}
+			@sprites = {}
 
-		create_from_file if !@file.nil?
-	end
+			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
+		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
-					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
+		# 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
+		# 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]
+		# Update ticker
+		def update
+			@tick += 1
+			@tick = 0 if @tick >= ( @sprites[@current].size )
+			@obj = @sprites[@current][@tick]
+		end
 	end
-
 end