Songhun · Songhun · Oct 28, 2012 · Nov 1, 2012 · Nov 1, 2012 · Nov 3, 2012
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.idea
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 CboxLauncher
 ============
 
-Cbox의 기본이 되는 Launcher 입니다.
+Cbox의 기본이 되는 Launcher 입니다.
+# Prototype버전이며, v0.2로 다시 뵙겠습니다.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -1,29 +1,29 @@
-{
-    "prompt_for_name": {
-        "message": "What's your name?",
-        "description": "Ask for the user's name"
-    },
-    "hello": {
-        "message": "Hello, $USER$",
-        "description": "Greet the user",
-        "placeholders": {
-            "user": {
-                "content": "$1",
-                "example": "Cira"
-            }
-        }
-    },
-    "bye": {
-        "message": "Goodbye, $USER$. Come back to $OUR_SITE$ soon!",
-        "description": "Say goodbye to the user",
-        "placeholders": {
-            "our_site": {
-                "content": "Example.com"
-            },
-            "user": {
-                "content": "$1",
-                "example": "Cira"
-            }
-        }
-    }
+{
+    "prompt_for_name": {
+        "message": "What's your name?",
+        "description": "Ask for the user's name"
+    },
+    "hello": {
+        "message": "Hello, $USER$",
+        "description": "Greet the user",
+        "placeholders": {
+            "user": {
+                "content": "$1",
+                "example": "Cira"
+            }
+        }
+    },
+    "bye": {
+        "message": "Goodbye, $USER$. Come back to $OUR_SITE$ soon!",
+        "description": "Say goodbye to the user",
+        "placeholders": {
+            "our_site": {
+                "content": "Example.com"
+            },
+            "user": {
+                "content": "$1",
+                "example": "Cira"
+            }
+        }
+    }
 }
diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json
@@ -1,29 +1,29 @@
-{
-    "prompt_for_name": {
-        "message": "What's your name?",
-        "description": "Ask for the user's name"
-    },
-    "hello": {
-        "message": "Hello, $USER$",
-        "description": "Greet the user",
-        "placeholders": {
-            "user": {
-                "content": "$1",
-                "example": "Cira"
-            }
-        }
-    },
-    "bye": {
-        "message": "Goodbye, $USER$. Come back to $OUR_SITE$ soon!",
-        "description": "Say goodbye to the user",
-        "placeholders": {
-            "our_site": {
-                "content": "Example.com"
-            },
-            "user": {
-                "content": "$1",
-                "example": "Cira"
-            }
-        }
-    }
+images{
+    "prompt_for_name": {
+        "message": "What's your name?",
+        "description": "Ask for the user's name"
+    },
+    "hello": {
+        "message": "Hello, $USER$",
+        "description": "Greet the user",
+        "placeholders": {
+            "user": {
+                "content": "$1",
+                "example": "Cira"
+            }
+        }
+    },
+    "bye": {
+        "message": "Goodbye, $USER$. Come back to $OUR_SITE$ soon!",
+        "description": "Say goodbye to the user",
+        "placeholders": {
+            "our_site": {
+                "content": "Example.com"
+            },
+            "user": {
+                "content": "$1",
+                "example": "Cira"
+            }
+        }
+    }
 }
diff --git a/games/breakout.jpg b/games/breakout.jpg
diff --git a/games/breakout.png b/games/breakout.png
diff --git a/games/cboxtech.png b/games/cboxtech.png
diff --git a/games/cboxtest.png b/games/cboxtest.png
diff --git a/games/dkingkong.jpg b/games/dkingkong.jpg
diff --git a/games/garaga.gif b/games/garaga.gif
diff --git a/games/padv.jpg b/games/padv.jpg
diff --git a/games/penguin-adv.png b/games/penguin-adv.png
diff --git a/games/ramface.jpg b/games/ramface.jpg
diff --git a/games/smario.jpg b/games/smario.jpg
diff --git a/games/sugarpang.png b/games/sugarpang.png
diff --git a/images/android-256.png b/images/android-256.png
diff --git a/main.html b/main.html
@@ -7,23 +7,22 @@
     <script type="text/javascript" src="static/jquery.js"></script>
     <script type="text/javascript" src="static/underscore.js"></script>
     <script type="text/javascript" src="static/backbone.js"></script>
+    <script type="text/javascript" src="static/pubsub.js"></script>
     <script type="text/javascript" src="static/cbox.sdk.js"></script>
     <script type="text/javascript" src="static/backbone.tv.keyevent.js"></script>
+    <script type="text/javascript" src="static/jquery.transition.min.js"></script>
     <script type="text/javascript" src="static/game-launcher.js"></script>
     <script type="text/javascript" src="static/homescreen.js"></script>
+    <script type="text/javascript" src="static/config.js"></script>
     <script type="text/javascript" src="static/main.js"></script>
 </head>
 <body>
-
-<div id="osx-container">
-    <div id="osx-modal-content">
-        <div id="osx-modal-title">Connect Game Controllers</div>
-        <div class="close"><a href="#" class="simplemodal-close">x</a></div>
-        <div id="osx-modal-data">
-            Click button for connecting controllers.
-            <p><button id="listener" class="simplemodal-close">Connect</button></p>
-        </div>
-    </div>
+<div id="listenerWebSocket">
+    <embed name="nacl_module"
+           id="websocket"
+           width=0 height=0
+           src="static/websocket/websocket.nmf"
+    type="application/x-nacl" />
 </div>
 </body>
 </html>
diff --git a/manifest.json b/manifest.json
@@ -17,8 +17,32 @@
           "128": "chrome-grey-128.png"
       }
   },
+    "permissions": [
+        "tabs", "http://*/*","https://*/*"
+    ],
   "update_url" : "http://localhost:8888/",
   "background": { 
-  	"scripts": ["static/background.js"] 
-	}
+  	"scripts": ["static/background.js"]
+	},
+  "content_scripts": [
+	  {
+	      "matches": ["<all_urls>"],
+	      "run_at": "document_start",
+	      "js": ["static/jquery.js",
+	          "static/libs/collie.min.js",
+	          "static/libs/cocos2d.js",
+	          "static/libs/ranking.js"
+	          ],
+	      "all_frames":true
+	  },
+	  {
+      "matches": ["<all_urls>"],
+      "run_at": "document_end",
+      "js": [
+      	"static/pubsub.js",
+	      "static/cbox.controller.js"
+			],
+      "all_frames":true
+  	}
+  ]
 }
diff --git a/sounds/slide.mp3 b/sounds/slide.mp3
diff --git a/static/backbone.tv.keyevent.js b/static/backbone.tv.keyevent.js
@@ -107,8 +107,7 @@
 		},
 		trigger: function(keyevent) {
 			// the events can handle that occurred at body element only.
-			if (!(keyevent.srcElement instanceof HTMLBodyElement)) return this;
-
+			// if (!(keyevent.srcElement instanceof HTMLBodyElement)) return this;
 			var r = KeyEventListener.responder()
 				,	events = KeyEventListener._hotkeys[keyevent.which];
 
@@ -125,7 +124,7 @@
 		on: function(events, callback, context) {
 			var keyEvents = this.keyEvents || (this.keyEvents = {})
 				,	hotKeyEvents = KeyEventListener._hotkeys || (KeyEventListener._hotkeys = {})
-				,	event; 			
+				,	event;
 
 			events = events.split(/\s+/);
 			while (event = events.shift()) {
@@ -162,8 +161,53 @@
 
 	$(document).ready(function() {
 		// register key event.
-		document.body.addEventListener('keyup', Backbone.KeyEventListener.trigger);
-		document.body.addEventListener('keydown', Backbone.KeyEventListener.trigger);
+
+		var debug = false;
+		if (debug) {
+			document.body.addEventListener('keyup', Backbone.KeyEventListener.trigger);
+			document.body.addEventListener('keydown', Backbone.KeyEventListener.trigger);
+		}
+
+		cbox.previousEvent = {
+			pX1: 0,
+			pY1: 0
+		}
+
+		cbox.addEventListener(function(event, context, cbox) {
+			if (event.type != 'Down') return;
+
+			var keycode = undefined;
+			if (cbox.previousEvent.pX1 < event.pX1)
+				keycode = 39;
+			else if (cbox.previousEvent.pX1 > event.pX1)
+				keycode = 37;
+			if (cbox.previousEvent.pY1 < event.pY1)
+				keycode = 40;
+			else if (cbox.previousEvent.pY1 > event.pY1)
+				keycode = 38;
+			else if (event.btnA)
+				keycode = 13;
+			else if (event.btnB)
+				keycode = 27;
+
+			// hard copy events
+			cbox.previousEvent.pX1 = event.pX1;
+			cbox.previousEvent.pY1 = event.pY1;
+			cbox.previousEvent.type = event.type;
+
+			if (keycode) {
+				var ke = document.createEvent("KeyboardEvent");
+				// Chromium Hack, http://goo.gl/QNwqH
+	    	Object.defineProperty(ke, 'keyCode', {get : function() {return this.keyCodeVal;}});
+	    	Object.defineProperty(ke, 'which', {get : function() {return this.keyCodeVal;}});
+
+				ke.initKeyboardEvent(event.type == 'Down' ? 'keydown' : 'keyup', 
+					true, true, null, false, false, false, false, keycode, keycode);
+				ke.keyCodeVal = keycode;
+
+				Backbone.KeyEventListener.trigger(ke);
+			}
+		});
 	});
 
 

diff --git a/static/cbox.controller.js b/static/cbox.controller.js
@@ -0,0 +1,17 @@
+/**
+ * Created with PyCharm.
+ * User: songhun
+ * Date: 11/8/12
+ * Time: 3:37 PM
+ * To change this template use File | Settings | File Templates.
+ */
+
+
+var gameScript = $("#cboxscript").html();
+eval(gameScript);
+
+$(function(){
+    pubsub.sub("controlls",function(msg){
+        cboxgame.fireEvent(msg.data);
+    });
+});