View difference between Paste ID: VbxJYB0m and LHWN0yRP

--- version: Unspeakable Crawling Sticky Tentacle
+-- version: Unspeakable Crawling Rachis
 
 Texter = {}
-Texter._lastInputStr = ""
+Texter._LastInputStr  = ""
-Texter._lastInputArgs = "1, 3"
+Texter._LastInputArgs = "1, 3"
 Texter._LastInputFont = "7px"
 Texter._Fonts = {}
 
-	if Texter._findFile("7px") ~= nil then
+
-		Texter.SetFont("7px")
+
 	Texter.LoadFont("TexterFonts")
-		Texter.SetFont("5px")
+	tpt.register_keypress(Texter._HotkeyHandler)
 end
-	tpt.register_keypress(Texter._hotkeyHandler)
+
 -- Internal methods
 function Texter._IsFolder(path)
 	local _isFolder = false
-function Texter._isFolder(path)
+	if(path ~= nil) then
 		-- API bug, not fixed right now (ver 85.0)
-	if path ~= nil then
+		-- if( fs.isDirectory(path)  ) then
-		-- if fs.isDirectory(path) then
+
 		-- end
 		if( fs.isDirectory(path) == fs.isDirectory(".") ) then
 			_isFolder = true
-		if ( fs.isDirectory(path) == fs.isDirectory(".") ) then
+
 	end
 	return _isFolder
 end
 function Texter._FindFileInCurrentDir(fileName, rootPath, optionalSuffix, optionalPrefix)
 	local filePath = nil
-function Texter._findFileInCurrentDir(fileName, rootPath, optionalSuffix, optionalPrefix)
+	if( fs.exists(rootPath.."\\"..fileName)) then
 		filePath = rootPath.."\\"..fileName
-	if fs.exists(rootPath.."\\"..fileName) then
+	else if( fs.exists(rootPath.."\\"..fileName..optionalSuffix)) then
 			filePath = rootPath.."\\"..fileName..optionalSuffix
-	else if fs.exists(rootPath.."\\"..fileName..optionalSuffix) then
+		else if( fs.exists(rootPath.."\\"..optionalPrefix..fileName)) then
 				filePath = rootPath.."\\"..optionalPrefix..fileName
-		else if fs.exists(rootPath.."\\"..optionalPrefix..fileName) then
+			else if( fs.exists(rootPath.."\\"..optionalPrefix..fileName..optionalSuffix)) then
 					filePath = rootPath.."\\"..optionalPrefix..fileName..optionalSuffix
-			else if fs.exists(rootPath.."\\"..optionalPrefix..fileName..optionalSuffix) then
+
 			end
 		end
 	end
 	return filePath
 end
 function Texter._FindFile(fileName, rootPath, optionalSuffix, optionalPrefix, depth)
 	if( rootPath == nil  ) then
-function Texter._findFile(fileName, rootPath, optionalSuffix, optionalPrefix, depth)
+
-	if rootPath == nil then
+
 	if( optionalSuffix == nil  ) then
 		optionalSuffix = ".lua"
-	if optionalSuffix == nil then
+
 	if( optionalPrefix == nil  ) then
 		optionalPrefix = ""
-	if optionalPrefix == nil then
+
 	if( depth == nil  ) then
 		depth = 3 -- Find 3 level of subfolders in default
-	if depth == nil then
+
 	local subs = nil
 	local filePath = Texter._FindFileInCurrentDir(fileName, rootPath, optionalSuffix, optionalPrefix)
 
-	local filePath = Texter._findFileInCurrentDir(fileName, rootPath, optionalSuffix, optionalPrefix)
+
 	if( filePath == nil  ) then
 		subs = fs.list(rootPath)
-	if filePath == nil then
+
 			if( Texter._IsFolder(rootPath.."\\"..subs[i]) and depth > 0  ) then
 				filePath = Texter._FindFile(fileName, rootPath.."\\"..subs[i], optionalSuffix, optionalPrefix, depth - 1)
-			if Texter._isFolder(rootPath.."\\"..subs[i]) and depth > 0 then
+
-				filePath = Texter._findFile(fileName, rootPath.."\\"..subs[i], optionalSuffix, optionalPrefix, depth - 1)
+			if( filePath ~= nil  ) then do break end end
 		end
-			if filePath ~= nil then do break end end
+
 	return filePath
 end
 function Texter._GetFontHeight(fontName)
 	local height = 0
-function Texter._getFontHeight()
+	if( Texter._Fontmatrix[fontName] ~=nil and Texter._Fontmatrix[fontName].height ~= nil  ) then
 		height = Texter._Fontmatrix[fontName].height
-	if fontmatrix.height ~= nil then
+
-		height = fontmatrix.height
+
 	end
 	return height
 end
 function Texter._Input(eventHandler, fonts, paramsText, strText, fontText)
 	local controlHeight = 17
 	if( paramsText == nil  ) then paramsText = "" end
 	if( strText    == nil  ) then strText    = "" end
--- Set the working font
+	if( fontText   == nil  ) then fontText   = "" end
-function Texter.SetFont(fontName, rootPath, optionalSuffix, optionalPrefix, depth)
+	if( fonts      == nil  ) then fonts      = {} end
-	local realPath = Texter._findFile(fontName, rootPath, optionalSuffix, optionalPrefix, depth)
+
-	if realPath ~= nil then
+	local isContains = function(inTable, value)
 		local isContain = false
-		tpt.log("Texter: Font file \""..realPath.."\" loaded.")
+		for i=1, #inTable do
 			if( value == inTable[i]  ) then
 				isContain = true
 				break
 			end
 		end
 		return isContain
 	end
-function Texter.Tchar(char, x, y, ptype)
+
 	local TexterWin = Window:new(-1, -1, 500, 100)
 	local paramsBox = Textbox:new(10, 32, 252, controlHeight, paramsText, "ptype, hspc, vspc")
 	local paramsLabel = Label:new(11, 9, 232, controlHeight, "Enter the element name you want to use and\nthe spacing between letters (horizontal/vertical).")
 	local stringBox = Textbox:new(10, 57, 480, controlHeight, strText, "Input text to create under mouse. Use \\n for new line, \\\\n for \\n. Sorry, you can't get \\\\n.")
 	local fontBtn = Button:new(282, 32, 208, controlHeight, "No font available")
 	local fontLabel = Label:new(283, 9, 150, controlHeight, "Select the font you want to use.")
-	letter = fontmatrix[char]
+	local cancelBtn = Button:new(0, 83, 251, controlHeight, "Cancel")
-	if letter == nil then
+	cancelBtn:action(function(sender)interface.closeWindow(TexterWin)end)
-		letter = fontmatrix["nil"]
+	local okayBtn = Button:new(250, 83, 250, controlHeight, "Okay")
 	okayBtn:action(
 		function(sender)
-	if letter['voffset'] ~= nil then
+			if( eventHandler ~= nil and type(eventHandler) == "function"  ) then
 				-- Use event because I can't make things like tpt.input
 				eventHandler(paramsBox:text(), stringBox:text(), fontBtn:text())
-	if letter['hoffset'] ~= nil then
+
 			interface.closeWindow(TexterWin)
 		end
 	)
 
 	if(#fonts > 0) then
 		if( isContains(fonts, fontText)  ) then
-		if mtx[i] ~= nil then
+			fontBtn:text(fontText)
 		else
 			fontBtn:text(fonts[1])
-				if mtx[i][j]==1 then
+
-					tpt.create(x+j-1+hoffset, y+i-1+voffset, ptype)
+		fontBtn:action(
 			function(sender)
 				local winX, winY = TexterWin:position()
 				local btnX, btnY = fontBtn:position()
 				local btnW, btnH = fontBtn:size()
 				local listWin = Window:new(winX+btnX, winY+btnY-8*(#fonts-1), btnW, (btnH-1)*#fonts)
 				for i=1, #fonts do
 					local optionBtn = Button:new(0, (btnH-1)*(i-1), btnW, btnH, fonts[i])
 					optionBtn:action(
-function Texter.Tstr(str, x, y, ptype, hspacing, vspacing)
+						function(sender)
 							interface.closeWindow(listWin)
 							fontBtn:text(optionBtn:text())
 						end
-	local fontH = Texter._getFontHeight()
+					)
-	if hspacing == nil then
+					listWin:addComponent(optionBtn)
 				end
 				interface.showWindow(listWin)
-	if vspacing == nil then
+
 		)
 	end
 
-		if string.sub(str, i, i) == "\n" then
+	TexterWin:addComponent(cancelBtn)
 	TexterWin:addComponent(okayBtn)
 	TexterWin:addComponent(stringBox)
 	TexterWin:addComponent(paramsBox)
-			ox = hspacing + ox + Texter.Tchar(string.sub(str, i, i), x+ox, y+oy, ptype)
+	TexterWin:addComponent(paramsLabel)
 	TexterWin:addComponent(fontBtn)
 	TexterWin:addComponent(fontLabel)
 
 	interface.showWindow(TexterWin)
 end
 
 -- Load the working font
-function T(str, ptype, hspc, vspc)
+function Texter.LoadFont(fontName, rootPath, optionalSuffix, optionalPrefix, depth)
-	if ptype == nil then
+	local realPath = Texter._FindFile(fontName, rootPath, optionalSuffix, optionalPrefix, depth)
 	if( realPath ~= nil  ) then
 		dofile(realPath)
-	if str == nil then str = "" end
+		if(Texter._Fontmatrix ~= nil) then
-	if ptype == nil then
+			for fontName in pairs(Texter._Fontmatrix) do
 				table.insert(Texter._Fonts, fontName)
 			end
-	Texter.Tstr(str, tpt.mousex, tpt.mousey, ptype, hspc, vspc)
+			tpt.log("Texter: Font file \""..realPath.."\" loaded, "..#Texter._Fonts.." font(s) found.")
 		else
 			tpt.log("Texter: File \""..realPath.."\" loaded, invalid font file.")
 		end
 	else
-function Texter._hotkeyHandler(key, keyNum, modifier, event)
+
-	local str = ""
+
-	local argsStr = ""
+
 end
-	if event==1 and keyNum==116 and modifier==64 then -- Ctrl + t
+
-		-- String to create
+function Texter.Tchar(char, x, y, ptype, fontName)
-		str = tpt.input(
+
-			"Input text to create under mouse",
+
-			"[Format: text]\nUse \\n for new line, \\\\n for \\n.\nSorry, you can't get \\\\n.",
+
-			Texter._lastInputStr
+
 	-- if given font not available, use the first available one
-		if string.len(str) > 0 then
+	if( fontName == nil or Texter._Fontmatrix[fontName] == nil  ) then
-			Texter._lastInputStr = str
+		for font in pairs(Texter._Fontmatrix) do
-			str = string.gsub(str, "([^\\]?)\\n", "%1\n")  -- Small trick
+			fontName = font
-			str = string.gsub(str, "([^\\]?)\\\\n", "%1\\n")
+			break
-			-- Additional settings
+
-			local ptype = elements[tpt.selectedl]
+
-			if ptype == nil then
+	-- if still not available, break
-				ptype = 1 --"DUST"
+	if( fontName == nil  ) then return 0 end
 
-			argsStr = tpt.input(
+
-				"Input parameters for creating text",
+	letter = Texter._Fontmatrix[fontName][char]
-				"[Format: ptype, hspc, vspc]\nptype is element used, e.g. DUST.\nh/vspc is horizontal/vertical spacing.",
+	if( letter == nil  ) then
-				elements.property(ptype, "Name")..", "..Texter._lastInputArgs
+		letter = Texter._Fontmatrix[fontName]["nil"]
-			)
+
-			if string.len(argsStr) > 0 then Texter._lastInputArgs = string.gsub(argsStr, "%s*%w*%s*,%s*(.*)", "%1") end
+
-			local i=1
+	if( letter['voffset'] ~= nil  ) then
-			for arg in string.gmatch(argsStr, "%s*(%w*)%s*,?") do
+
-				args[i] = arg
+
-				i = i+1
+	if( letter['hoffset'] ~= nil  ) then
 		voffset = letter['hoffset']
 	end
-		if pcall(tpt.element, args[1]) == false then
+
-			args[1] = "DUST"
+
 	local width = 3
-		Texter.Tstr(str, tpt.mousex, tpt.mousey, args[1], args[2], args[3])
+
 		if( mtx[i] ~= nil  ) then
 			width = #mtx[i]
 			for j=1,width do
 				if( mtx[i][j]==1  ) then
 					if( pcall(tpt.create, x+j-1+hoffset, y+i-1+voffset, ptype) == false  ) then
 						width = 0
 					end
 				end
 			end
 		end
 	end
 	return width
 end
 -- Draw a string
 function Texter.Tstr(str, x, y, ptype, hspacing, vspacing, fontName)
 	local ox    = 0
 	local oy    = 0
 	local oy    = 0
 	local fontH = Texter._GetFontHeight(fontName)
 	if( hspacing == nil  ) then
 		hspacing = 1
 	end
 	if( vspacing == nil  ) then
 		vspacing = 3
 	end
 	for i=1,string.len(str) do
 		if( string.sub(str, i, i) == "\n"  ) then
 			oy = vspacing + oy + fontH
 			ox = 0
 		else
 			ox = hspacing + ox + Texter.Tchar(string.sub(str, i, i), x+ox, y+oy, ptype, fontName)
 		end
 	end
 	return string.len(str)
 end
 
 -- Shortcut for better user experience
 function T(str, ptype, hspc, vspc, fontName)
 	if( ptype == nil  ) then
 		ptype = elements[tpt.selectedl] -- elements.property(tpt.selectedl, "Name")
 	end
 	if( str == nil  ) then str = "" end
 	if( ptype == nil  ) then
 		ptype = "DUST"
 	end
 	Texter.Tstr(str, tpt.mousex, tpt.mousey, ptype, hspc, vspc, fontName)
 	return string.len(str)
 end
 -- Hotkey handler
 function Texter._HotkeyHandler(key, keyNum, modifier, event)
 	if( event==1 and keyNum==116 and modifier==64  ) then -- Ctrl + t
 		-- Additional settings
 		local ptype = elements[tpt.selectedl]
 		if( ptype == nil  ) then
 			ptype = 1 --"DUST"
 		end
 		-- Prompt
 		Texter._Input(
 			Texter._InputHandler,
 			Texter._Fonts,
 			elements.property(ptype, "Name")..", "..Texter._LastInputArgs,
 			Texter._LastInputStr,
 			Texter._LastInputFont
 		)
 	end
 end
 -- Input handler
 function Texter._InputHandler(params, str, fontName)
 	local args = {}
 	if( string.len(str) > 0  ) then
 		Texter._LastInputStr = str
 		str = string.gsub(str, "([^\\]?)\\n", "%1\n")  -- Small trick
 		str = string.gsub(str, "([^\\]?)\\\\n", "%1\\n")
 	end
 
 	if( string.len(params) > 0  ) then Texter._LastInputArgs = string.gsub(params, "%s*%w*%s*,%s*(.*)", "%1") end
 	local i=1
 	for arg in string.gmatch(params, "%s*(%w*)%s*,?") do
 		args[i] = arg
 		i = i+1
 	end
 	Texter._LastInputFont = fontName
 
 	if( pcall(tpt.element, args[1]) == false  ) then
 		args[1] = "DUST"
 	end
 	Texter.Tstr(str, tpt.mousex, tpt.mousey, args[1], args[2], args[3], fontName)
 end
 
 Texter.Init()