Skip to content

Commit

Permalink
Opera 11 WebSockets and Opera '-' key mapping fix.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kanaka committed Jan 24, 2011
1 parent 1756a30 commit 7cc5fbc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/canvas.js
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion include/websock.js
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7cc5fbc

Please sign in to comment.