From 0234239f405779e4640a657abf054e7e21a7609a Mon Sep 17 00:00:00 2001
From: Skyler Lehmkuhl <skycooler@gmail.com>
Date: Mon, 16 Jan 2012 10:38:07 -0500
Subject: [PATCH] More HTML5

---
 base.js          | 54 ++++++++++++++++++++++++++++++++++++++++++++++--
 lightningbeam.py | 12 ++++++++---
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/base.js b/base.js
index 231183e..59d34d6 100644
--- a/base.js
+++ b/base.js
@@ -27,10 +27,10 @@ function _timerBase () {
 	to stop them, call remove() on it. */
 	this.funcs = {}
 	this.add = function (item) {
-		this.funcs[item]=item;
+		this.funcs[item._id]=item;
 	}
 	this.remove = function (item) {
-		delete this.funcs[item];
+		delete this.funcs[item._id];
 	}
 	this.iterate = function() {
 		canvas = Buffers[DrawingBuffer];
@@ -42,6 +42,12 @@ function _timerBase () {
 
 			DrawingBuffer=1-DrawingBuffer;
 			//canvas = Buffers[DrawingBuffer];
+			for (i in this.funcs){
+				if (!this.funcs[i]._loaded) {
+					this.funcs[i].onLoad();
+					this.funcs[i]._loaded = true;
+				}
+			}
 			_root._draw(_rootFrame)
 			if (!(_lastmouse[0]==_root._xmouse&&_lastmouse[1]==_root._ymouse)) {
 				// Mouse moved
@@ -59,8 +65,25 @@ function _timerBase () {
 	setInterval('Timer.iterate()', 1000/fps)
 }
 
+function _eventBase () {
+	this.funcs = {}
+	this.add = function (item) {
+		this.funcs[item._id]=item;
+	}
+	this.remove = function (item) {
+		delete this.funcs[item._id];
+	}
+	this.doEvent = function (event) {
+		for (i in this.funcs) {
+			this.funcs[i][event]();
+		}
+	}
+}
+
 var Timer = new _timerBase()
 
+var Event = new _eventBase()
+
 function ave(x, y, fac) {
 	//Weighted average. 
 	//fac is the weight - 0.5 gives a standard average
@@ -124,7 +147,10 @@ function MovieClip() {
 	this._yscale = 1;
 	this._rotation = 0;
 	this._visible = true;
+	this._id = "MC"+Math.round(Math.random()*1000000000000)
+	this._loaded = false
 	Timer.add(this)
+	Event.add(this)
 	
 	
 	
@@ -661,6 +687,30 @@ Key.SHIFT = 16
 Key.SPACE = 32
 Key.TAB = 9
 Key.UP = 38
+Key.mask = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+Key.press = function (key) {
+	this.keyCode = key.keyCode;
+	this.ascii = key.charCode;
+	this.mask[key.keyCode] = 1;
+}
+Key.release = function (key) {
+	this.mask[key.keyCode] = 0;
+}
+Key.isDown = function (code) {
+	return (this.mask[code]==1)
+}
+Key.getCode = function() {
+	return this.keyCode;
+}
+Key.getAscii = function() {
+	return this.ascii;
+}
+Key.addListener = function(listener) {
+	Event.add(listener)
+}
+Key.removeListener = function(listener) {
+	Event.remove(listener)
+}
 
 //TODO: ContextMenu
 
diff --git a/lightningbeam.py b/lightningbeam.py
index 69dc2fc..b4b7744 100755
--- a/lightningbeam.py
+++ b/lightningbeam.py
@@ -3,7 +3,7 @@
 # © 2012 Skyler Lehmkuhl
 # Released under the GPLv3. For more information, see gpl.txt.
 
-import os
+import os, shutil
 
 #Uncomment to build on OS X
 import objc, AppKit, cPickle
@@ -190,7 +190,9 @@ def run_file(self=None):
 	r.start()
 	if svlgui.PLATFORM=="osx":
 		osx_flash_player_loc = "/Applications/Flash\ Player\ Debugger.app"
-		svlgui.execute("open -a "+osx_flash_player_loc+" test.swf")
+		success = svlgui.execute("open -a "+osx_flash_player_loc+" "+os.getenv('HOME')+"/test.swf")
+		if not success:
+			svlgui.alert("Oops! Didn't work. I probably couldn't find your Flash debugger!")
 	elif svlgui.PLATFORM=='win32':
 		win_flash_player_loc = ""
 		svlgui.execute('start '+win_flash_player_loc+" test.swf")
@@ -218,7 +220,11 @@ def run_html(self=None):
 	global root
 	print "RUNNING"
 	root.descendItem().activelayer.frames[root.descendItem().activelayer.currentframe].actions = MainWindow.scriptwindow.text
-	open("test.html", "w").write(create_html5(root))
+	open(os.getenv('HOME')+"/test.html", "w").write(create_html5(root))
+	try:
+		shutil.copyfile("base.js",os.getenv('HOME')+"/base.js")
+	except IOError:
+		svlgui.alert("Couldn't copy base.js to "+os.getenv('HOME')+"/base.js!")