View difference between Paste ID: vutpszHy and pFHeia96

---[[
+
-The MIT License (MIT)
+
-
+
-Copyright (c) 2013 Lyqyd
+
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy
+
-of this software and associated documentation files (the "Software"), to deal
+
-in the Software without restriction, including without limitation the rights
+
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
-copies of the Software, and to permit persons to whom the Software is
+
-furnished to do so, subject to the following conditions:
+
-
+
-The above copyright notice and this permission notice shall be included in
+
-all copies or substantial portions of the Software.
+
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+			if maxY == minY or i == math.floor((maxY - minY + 1) / 2) then
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+
-THE SOFTWARE.
+
---]]
+
 	return labelTable, name
 end
 
 local Button = {
 	draw = function(self)
 		term.redirect(self.mon)
 		term.setTextColor(colors.white)
 		term.setBackgroundColor(colors.black)
 		term.clear()
 		for name, buttonData in pairs(self.buttonList) do
 			if buttonData.active then
 				term.setBackgroundColor(buttonData.activeColor)
 			else
 				term.setBackgroundColor(buttonData.inactiveColor)
 			end
 			for i = buttonData.yMin, buttonData.yMax do
 				term.setCursorPos(buttonData.xMin, i)
-			if maxY == minY or i == math.floor((maxY - minY) / 2) + 1 then
+
 			end
 		end
 		term.restore()
 	end,
 	add = function(self, name, func, xMin, yMin, xMax, yMax, inactiveColor, activeColor)
 		local label, name = setupLabel(xMax - xMin + 1, yMin, yMax, name)
 		if self.buttonList[name] then error("button already exists", 2) end
 		local x, y = self.mon.getSize()
 		if xMin < 1 or yMin < 1 or xMax > x or yMax > y then error("button out of bounds", 2) end
 		self.buttonList[name] = {
 			func = func,
-		local old = term.redirect(self.mon)
+
 			yMin = yMin,
 			xMax = xMax,
 			yMax = yMax,
 			active = false,
 			inactiveColor = inactiveColor or colors.red,
 			activeColor = activeColor or colors.lime,
-				term.setTextColor(buttonData.activeText)
+
 		}
 		for i = xMin, xMax do
-				term.setTextColor(buttonData.inactiveText)
+
 				if self.clickMap[i][j] ~= nil then
 					--undo changes
 					for k = xMin, xMax do
 						for l = yMin, yMax do
 							if self.clickMap[k][l] == name then
 								self.clickMap[k][l] = nil
-		if old then
+
-			term.redirect(old)
+
 					end
-			term.restore()
+
 					error("overlapping button", 2)
 				end
-	add = function(self, name, func, xMin, yMin, xMax, yMax, inactiveColor, activeColor, inactiveText, activeText)
+
 			end
 		end
 	end,
 	run = function(self)
 		while true do
 			self:draw()
 			local event = {os.pullEvent("monitor_touch")}
 			if event[2] == self.side then
 				local clicked = self.clickMap[event[3]][event[4]]
 				if clicked and self.buttonList[clicked] and self.buttonList[clicked].func then
 					self.buttonList[clicked].func()
 				end
 			end
-			inactiveText = inactiveText or colors.white,
+
-			activeText = activeText or colors.white,
+
 	handleEvents = function(self, ...)
 		local event = {...}
 		if #event == 0 then event = {os.pullEvent()} end
 		if event[1] == "monitor_touch" and event[2] == self.side then
 			local clicked = self.clickMap[event[3]][event[4]]
 			if clicked and self.buttonList[clicked] then
 				return "button_click", clicked
 			end
 		end
 		return unpack(event)
 	end,
 	toggleButton = function(self, name, noDraw)
 		self.buttonList[name].active = not self.buttonList[name].active
 		if not noDraw then self:draw() end
 	end,
 	flash = function(self, name)
 		self:toggleButton(name)
 		sleep(0.15)
 		self:toggleButton(name)
 	end,
-	remove = function(self, name)
+
-		if self.buttonList[name] then
+
-			local button = self.buttonList[name]
+
-			for i = button.xMin, button.xMax do
+		self.buttonList[newName] = self.buttonList[name]
-				for j = button.yMin, button.yMax do
+		self.buttonList[name] = nil
-					self.clickMap[i][j] = nil
+		for i = self.buttonList[newName].xMin, self.buttonList[newName].xMax do
 			for j = self.buttonList[newName].yMin, self.buttonList[newName].yMax do
 				self.clickMap[i][j] = newName
-			self.buttonList[name] = nil
+
 		end
 		self:draw()
 	end,
 }
 
-			local event = {self:handleEvents(os.pullEvent(self.side == "term" and "mouse_click" or "monitor_touch"))}
+
-			if event[1] == "button_click" then
+
-				self.buttonList[event[2]].func()
+		side = monSide,
 		mon = peripheral.wrap(monSide),
 		buttonList = {},
 		clickMap = {},
 	}
 	local x, y = buttonInstance.mon.getSize()
 	for i = 1, x do
-		if (self.side == "term" and event[1] == "mouse_click") or (self.side ~= "term" and event[1] == "monitor_touch" and event[2] == self.side) then
+
 	end
 	setmetatable(buttonInstance, {__index = Button})
 	return buttonInstance
 end