chameleonic.p8

@@ -143,40 +143,63 @@ kbd={}
 add(real_modules,kbd)
 function kbd:init()
  self.real=btn()
- self.state={btn=0}
+ self.down=0
 end
 
 function kbd:update()
  -- figure out what keys are _really_ pressed
- local now_real,was_real=btn(),self.real
+ local now_real=btn()
+ local was_real=self.real
  self.real=now_real
 
  -- add keys that are really pressed 
  -- if they weren't really pressed before
  -- (they may have been force-
  --  released by :release())
- local real_pressed=~was_real&now_real
+ local real_pressed=(~was_real)&now_real
 
- local state=self.state
- local now_down=state.btn&now_real|real_pressed
- local was_down=state.btn
+ local now_down=(self.down&now_real)|real_pressed
+ local was_down=self.down
+ self.down=now_down
 
  -- deduce pressed/released by changes in down
- state.btn,state.btnp,state.btnr=
-  now_down,
-  ~was_down&now_down,
-  ~now_down&was_down
+ local pressed=(~was_down)&now_down
+ local released=(~now_down)&was_down
+
+ self.pressed=pressed
+ self.released=released
 end
 
-for _kbdi in all(split"btn,btnp,btnr") do
- kbd[_kbdi]=function(self,i,t) return 1<<i&self.state[_kbdi]!=0 end
+function kbd:btn(i)
+ return self.down&(1<<i)!=0
+end
+
+function kbd:btnp(i)
+ return self.pressed&(1<<i)!=0
+end
+
+function kbd:btnr(i)
+ return self.released&(1<<i)!=0
 end
 
 function kbd:release(i)
- self.state.btn&=~(1<<i)
+ self.down&=~(1<<i)
 end
 
 function tostring(any)
+ if type(any)=="function" then 
+     return "function" 
+ end
+ if any==nil then 
+     return "nil" 
+ end
+ if type(any)=="string" then
+     return any
+ end
+ if type(any)=="boolean" then
+     if any then return "true" end
+     return "false"
+ end
  if type(any)=="table" then
      local str = "{ "
      for k,v in pairs(any) do
@@ -184,7 +207,10 @@ function tostring(any)
      end
      return str.."}"
  end
- return tostr(any)
+ if type(any)=="number" then
+     return ""..any
+ end
+  return "unknown" -- should never show
 end
 
 -->8