[gtk+/broadway: 63/71] [broadway] Only open one websocket for input!



commit 9cc073803f410883edcb9a857a9c844a1af6ac34
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Nov 25 13:23:11 2010 +0100

    [broadway] Only open one websocket for input!

 gdk/broadway/broadway.js |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/gdk/broadway/broadway.js b/gdk/broadway/broadway.js
index d231384..a9568fb 100644
--- a/gdk/broadway/broadway.js
+++ b/gdk/broadway/broadway.js
@@ -265,20 +265,6 @@ function handleLoad(event)
   if (outstanding_commands.length == 1) {
     handleOutstanding()
   }
-
-  if ("WebSocket" in window) {
-    var loc = window.location.toString().replace("http:", "ws:");
-    loc = loc.substr(0, loc.lastIndexOf('/')) + "/input";
-    var ws = new WebSocket(loc, "broadway");
-    ws.onopen = function() {
-      input_socket = ws;
-    };
-    ws.onclose = function() {
-      input_socket = null;
-    };
-  } else {
-     alert("WebSocket not supported, input will not work!");
-  }
 }
 
 function get_surface_id(ev) {
@@ -322,6 +308,19 @@ function connect()
     xhr.send(null);
   }
 
+  if ("WebSocket" in window) {
+    var loc = window.location.toString().replace("http:", "ws:");
+    loc = loc.substr(0, loc.lastIndexOf('/')) + "/input";
+    var ws = new WebSocket(loc, "broadway");
+    ws.onopen = function() {
+      input_socket = ws;
+    };
+    ws.onclose = function() {
+      input_socket = null;
+    };
+  } else {
+     alert("WebSocket not supported, input will not work!");
+  }
   document.onmousemove = on_mouse_move;
   document.onmousedown = on_mouse_down;
   document.onmouseup = on_mouse_up;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]