rutui 0.2 → 0.3.1

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

@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env ruby
+# encoding: UTF-8
 # Generated one file script of rutui
 # This file is commandless and stripped down
 # For full source please visit:
@@ -7,7 +8,7 @@
 # Author: Roman Pramberger (roman.pramberger@gmail.com)
 # License: MIT
 #
-# Sam Okt 27 19:04:33 CEST 2012
+# Mon Jul  1 13:54:29 CEST 2013
 #
 class RuTui
 class Color
@@ -51,7 +52,7 @@ class Utils
 		ensure
 			system("stty -raw echo")
 		end
-		return str
+		return str.ord
 	end
 	# Hides the cursor
 	def self.init
@@ -137,14 +138,10 @@ class BaseObject
 		@obj[x][y] if !@obj[x].nil? and !@obj[x][y].nil?
 	end
 	# "special" each methods for objects
-	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
+	def each 
+		@obj.each_with_index do |row,row_count|
+			row.each_with_index do |pixel,col_count|
+				yield row_count, col_count, pixel
 			end
 		end
 	end
@@ -208,7 +205,7 @@ class Line < BaseObject
 		@pixel = options[:pixel]
 		@endpixel = options[:endpixel]
 		@pixel = Theme.get(:border) if @pixel.nil?
-		self.create
+		create
 	end
 	# Create Line
 	# can be recalled any time on attribute changes
@@ -337,17 +334,9 @@ 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.x+ci >= 0
+			@smap[object.y+ri][object.x+ci] = pixel if !pixel.nil? and object.y+ri > 0 and object.y+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
@@ -444,28 +433,11 @@ 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("")
+	# Figlet font: '!" #$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]~ÄÖÜäöüß'
+	@@chars = '!!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz[|]~ÄÖÜäöüß'.split("")
 	@@rainbow = nil
 	@@fonts = {}
 	# Initialize (see above)
@@ -480,7 +452,7 @@ class Figlet < BaseObject
 		@space = options[:space]
 		@space = 0 if @space.nil?
 		@colors = options[:colors]
-		@colors = [Pixel.new(Theme.get(:textcolor))] if @colors.nil?
+		@colors = [Pixel.new(Theme.get(:textcolor), Theme.get(:background).bg, Theme.get(:background).symbol)] if @colors.nil?
 		create
 	end
 	
@@ -491,10 +463,7 @@ class Figlet < BaseObject
 		@@fonts[@font]['n'].size.times do 
 			obj << []
 		end
-		p obj
 		current = 0
-		p @@fonts[@font]['F']
-		p @@fonts[@font]['L']
 		count = 0
 		@text.each_byte do |c|
 			if @@chars.include? c.chr
@@ -519,21 +488,21 @@ class Figlet < BaseObject
 					@@fonts[@font]['n'].size.times do |ri|
 						@space.times do
 							if @rainbow
-								obj[ri] << Pixel.new(@@rainbow[current], @colors[0].bg," ")
+								obj[ri] << Pixel.new(@@rainbow[current], @colors[0].bg,Theme.get(:background).symbol)
 							else
-								obj[ri] << Pixel.new(@colors[current].fg,@colors[current].bg," ")
+								obj[ri] << Pixel.new(@colors[current].fg,@colors[current].bg,Theme.get(:background).symbol)
 							end
 						end
 					end
 				end
 			# SPace
-			elsif c.chr == " "
+			else
 				@@fonts[@font]['n'].size.times do |ri|
 					3.times do
 						if @rainbow
-							obj[ri] << Pixel.new(@@rainbow[current], @colors[0].bg," ")
+							obj[ri] << Pixel.new(@@rainbow[current], @colors[0].bg, Theme.get(:background).symbol)
 						else
-							obj[ri] << Pixel.new(@colors[current].fg,@colors[current].bg," ")
+							obj[ri] << Pixel.new(@colors[current].fg,@colors[current].bg, Theme.get(:background).symbol)
 						end
 					end
 				end
@@ -595,6 +564,9 @@ end
 class Axx < BaseObject
 	def initialize options
 		@file = options[:file]
+		@x = options[:x]
+		@y = options[:y]
+	
 		return if @file.nil?
 		return if !File.exists? @file
 		@img = File.open(@file).read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rutui
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies: []
 description: Create Pure Ruby textbased interfaces of all kinds (Unix only)
 email: roman.pramberger@gmail.com
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rutui.rb
+- rutui.rb
 homepage: http://rubygems.org/gems/rutui
 licenses: []
 post_install_message: 
@@ -38,8 +38,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RUby Textbased User Interface
 test_files: []
+has_rdoc: