From b28a16f57c608c21974e3e9ee45d19ca24547f9f Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Sun, 23 Jan 2011 19:36:11 -0600 Subject: [PATCH] Opera 11 WebSockets and Opera '-' key mapping fix. Opera 11 native WebSockets (if enabled) seems to have bad behavior for the bufferedAmount so add change from websockify project to allow max bufferedAmount (before send queue is delay) to be configured. Also, Opera 11 and 10.60 behave like Mozilla regarding the '-' key so translate it correctly. --- include/canvas.js | 4 ++-- include/websock.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/canvas.js b/include/canvas.js index cee1dc1..d131564 100644 --- a/include/canvas.js +++ b/include/canvas.js @@ -770,8 +770,8 @@ function getKeysym(e) { case 186 : keysym = 59; break; // ; (IE) case 187 : keysym = 61; break; // = (IE) case 188 : keysym = 44; break; // , (Mozilla, IE) - case 109 : // - (Mozilla) - if (Util.Engine.gecko) { + case 109 : // - (Mozilla, Opera) + if (Util.Engine.gecko || Util.Engine.presto) { keysym = 45; } break; case 189 : keysym = 45; break; // - (IE) diff --git a/include/websock.js b/include/websock.js index 4901faf..b9f52d7 100644 --- a/include/websock.js +++ b/include/websock.js @@ -169,7 +169,7 @@ function flush() { if (websocket.bufferedAmount !== 0) { Util.Debug("bufferedAmount: " + websocket.bufferedAmount); } - if (websocket.bufferedAmount < 1000) { + if (websocket.bufferedAmount < api.maxBufferedAmount) { //Util.Debug("arr: " + arr); //Util.Debug("sQ: " + sQ); if (sQ) { @@ -281,6 +281,9 @@ function close() { } function constructor() { + // Configuration settings + api.maxBufferedAmount = 200; + // Direct access to send and receive queues api.get_sQ = get_sQ; api.get_rQ = get_rQ;