enerything converted to KeyBind

git-svn-id: http://svn.net-core.org/repos/t-engine4@233 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/ButtonList.lua

 require "engine.class"
 require "engine.Tiles"
 require "engine.Mouse"
-require "engine.KeyCommand"
+require "engine.KeyBind"
 
 --- Handles dialog windows
 module(..., package.seeall, class.make)
@@ -49,18 +49,18 @@ function _M:close()
 end
 
 function _M:setKeyHandling()
-	self.old_key = engine.KeyCommand.current
-	self.key = engine.KeyCommand.new()
+	self.old_key = engine.KeyBind.current
+	self.key = engine.KeyBind.new()
 	self.key:setCurrent()
-	self.key:addCommands
+	self.key:addBinds
 	{
-		_UP = function()
+		MOVE_UP = function()
 			self:select(-1, true)
 		end,
-		_DOWN = function()
+		MOVE_DOWN = function()
 			self:select(1, true)
 		end,
-		_RETURN = function()
+		ACCEPT = function()
 			self:click()
 		end,
 	}

game/engine/KeyBind.lua

@@ -70,7 +70,7 @@ end
 
 function _M:receiveKey(sym, ctrl, shift, alt, meta, unicode)
 	local ks, us = self:makeKeyString(sym, ctrl, shift, alt, meta, unicode)
-	print("[BIND]", sym, ctrl, shift, alt, meta, unicode and string.byte(unicode), " :=: ", ks, us, " ?=? ", self.binds[ks], us and self.binds[us])
+	print("[BIND]", sym, ctrl, shift, alt, meta, unicode, " :=: ", ks, us, " ?=? ", self.binds[ks], us and self.binds[us])
 	if self.binds[ks] and self.virtuals[self.binds[ks]] then
 		self.virtuals[self.binds[ks]](sym, ctrl, shift, alt, meta, unicode)
 		return
@@ -98,6 +98,7 @@ function _M:addBinds(t)
 	local later = {}
 	for virtual, fct in pairs(t) do
 		if type(fct) == "function" then
+		print("bind", virtual, fct)
 			self:addBind(virtual, fct)
 		else
 			later[virtual] = fct

game/engine/init.lua

@@ -27,6 +27,9 @@ window.size = "1024x768"
 ]]
 config.load("/settings.cfg")
 
+-- Load default keys
+engine.KeyBind:load("move,actions")
+
 -- Load remaps
 engine.KeyBind:loadRemap("/keybinds.cfg")
 

game/special/mainmenu/class/Game.lua

 require "engine.class"
 require "engine.Game"
 require "engine.Module"
-require "engine.KeyCommand"
+require "engine.KeyBind"
 local Savefile = require "engine.Savefile"
 local Dialog = require "engine.Dialog"
 local ButtonList = require "engine.ButtonList"
@@ -9,7 +9,7 @@ local ButtonList = require "engine.ButtonList"
 module(..., package.seeall, class.inherit(engine.Game))
 
 function _M:init()
-	engine.Game.init(self, engine.KeyCommand.new())
+	engine.Game.init(self, engine.KeyBind.new())
 
 	self.background = core.display.loadImage("/data/gfx/mainmenu/background.jpg")
 end
@@ -135,7 +135,7 @@ function _M:selectStepNew()
 	self.step = ButtonList.new(self.mod_list, 10, 10, self.w * 0.24, (5 + 35) * #self.mod_list, nil, 5)
 	self.step:setKeyHandling()
 	self.step:setMouseHandling()
-	self.step.key:addCommand("_ESCAPE", function() self:unregisterDialog(display_module) self:selectStepMain() end)
+	self.step.key:addBind("EXIT", function() self:unregisterDialog(display_module) self:selectStepMain() end)
 end
 
 function _M:selectStepLoad()
@@ -185,5 +185,5 @@ function _M:selectStepLoad()
 	self.step:select(2)
 	self.step:setKeyHandling()
 	self.step:setMouseHandling()
-	self.step.key:addCommand("_ESCAPE", function() self:unregisterDialog(display_module) self:selectStepMain() end)
+	self.step.key:addBind("EXIT", function() self:unregisterDialog(display_module) self:selectStepMain() end)
 end