From: Chris Porter <redacted>
Date: Sat, 11 Apr 2009 21:23:46 +0000 (+0100)
Subject: Refactor RFC1459 case handling functions and their callers, as a consequence fixing... 
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/fd3734d4adff434df08316f80ca6637797f9899b

Refactor RFC1459 case handling functions and their callers, as a consequence fixing channel tab completion.
---

diff --git a/js/irc/baseircclient.js b/js/irc/baseircclient.js
index e5fd5d6..008160b 100644
--- a/js/irc/baseircclient.js
+++ b/js/irc/baseircclient.js
@@ -28,7 +28,8 @@ qwebirc.irc.BaseIRCClient = new Class({
     this.send = this.connection.send.bind(this.connection);
     this.connect = this.connection.connect.bind(this.connection);
     this.disconnect = this.connection.disconnect.bind(this.connection);
-    
+
+    this.toIRCLower = qwebirc.irc.RFC1459toIRCLower;
     this.setupGenericErrors();
   },
   dispatch: function(data) {
diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index 589651b..f37cb6d 100644
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -73,10 +73,10 @@ qwebirc.irc.IRCClient = new Class({
       
       if(nc.prefixes.length > 0) {
         var c = nc.prefixes.charAt(0);
-        nx = String.fromCharCode(this.prefixes.indexOf(c)) + n.toIRCLower();
+        nx = String.fromCharCode(this.prefixes.indexOf(c)) + this.toIRCLower(n);
         nh[nx] = c + n;
       } else {
-        nx = tff + n.toIRCLower();
+        nx = tff + this.toIRCLower(n);
         nh[nx] = n;
       }
       names.push(nx);
@@ -94,15 +94,15 @@ qwebirc.irc.IRCClient = new Class({
       w.updateNickList(sortednames);
   },
   getWindow: function(name) {
-    return this.windows[name.toIRCLower()];
+    return this.windows[this.toIRCLower(name)];
   },
   newWindow: function(name, type, select) {
     var w = this.getWindow(name);
     if(!w) {
-      w = this.windows[name.toIRCLower()] = this.ui.newWindow(this, type, name);
+      w = this.windows[this.toIRCLower(name)] = this.ui.newWindow(this, type, name);
       
       w.addEvent("close", function(w) {
-        delete this.windows[name.toIRCLower()];
+        delete this.windows[this.toIRCLower(name)];
       }.bind(this));
     }
     
diff --git a/js/irc/irclib.js b/js/irc/irclib.js
index 7bd93c3..99e0614 100644
--- a/js/irc/irclib.js
+++ b/js/irc/irclib.js
@@ -33,9 +33,7 @@ qwebirc.irc.IRCLowerTable = [
 /* xf8-xff */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
 ];
 
-String.prototype.toIRCLower = function() {
-  var x = this;
-  
+qwebirc.irc.RFC1459toIRCLower = function(x) {
   var p = [];
   for(var i=0;i<x.length;i++) {
     var l = x.charCodeAt(i);
@@ -46,6 +44,10 @@ String.prototype.toIRCLower = function() {
   return p.join("");
 }
 
+qwebirc.irc.ASCIItoIRCLower = function(x) {
+  return x.toLower(); /* does unicode too.... */
+}
+
 String.prototype.hostToNick = function() {
   return this.split("!", 1)[0];
 }
@@ -64,6 +66,6 @@ qwebirc.irc.IRCDate = function(d) {
   return qwebirc.util.DaysOfWeek[d.getDay()] + " " + qwebirc.util.MonthsOfYear[d.getMonth()] + " " + pad(d.getDate()) + " "  + pad(d.getHours()) + ":" + pad(d.getMinutes()) + ":" + pad(d.getSeconds()) + " " + d.getFullYear();
 }
 
-String.prototype.toIRCCompletion = function() {
-  return this.toIRCLower().replace(/[^\w]+/g, "");
+qwebirc.irc.toIRCCompletion = function(client, data) {
+  return client.toIRCLower(data).replace(/[^\w]+/g, "");
 }
diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index 7577e35..55e6a6e 100644
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -47,19 +47,23 @@ qwebirc.ui.BaseUI = new Class({
       return client.id;
     }
   },
-  getWindowIdentifier: function(type, name) {
+  getWindowIdentifier: function(client, type, name) {
     if(type == qwebirc.ui.WINDOW_MESSAGES)
       return "-M";
     if(type == qwebirc.ui.WINDOW_STATUS)
       return "";
-    return "_" + name.toIRCLower();
+
+    if(client == qwebirc.ui.CUSTOM_CLIENT) /* HACK */
+      return "_" + name;
+
+    return "_" + client.toIRCLower(name);
   },
   newWindow: function(client, type, name) {
     var w = this.getWindow(client, type, name);
     if($defined(w))
       return w;
       
-    var wId = this.getWindowIdentifier(type, name);
+    var wId = this.getWindowIdentifier(client, type, name);
     var w = this.windows[this.getClientId(client)][wId] = new this.windowClass(this, client, type, name, wId);
     this.windowArray.push(w);
     
@@ -70,14 +74,14 @@ qwebirc.ui.BaseUI = new Class({
     if(!$defined(c))
       return null;
       
-    return c[this.getWindowIdentifier(type, name)];
+    return c[this.getWindowIdentifier(client, type, name)];
   },
   getActiveWindow: function() {
     return this.active;
   },
   getActiveIRCWindow: function(client) {
     if(!this.active || this.active.type == qwebirc.ui.WINDOW_CUSTOM) {
-      return this.windows[this.getClientId(client)][this.getWindowIdentifier(qwebirc.ui.WINDOW_STATUS)];
+      return this.windows[this.getClientId(client)][this.getWindowIdentifier(client, qwebirc.ui.WINDOW_STATUS)];
     } else {
       return this.active;
     }
diff --git a/js/ui/tabcompleter.js b/js/ui/tabcompleter.js
index 726c48b..2058f77 100644
--- a/js/ui/tabcompleter.js
+++ b/js/ui/tabcompleter.js
@@ -65,19 +65,19 @@ qwebirc.ui.TabCompleterFactory = new Class({
 });
 
 qwebirc.ui.TabIterator = new Class({
-  initialize: function(prefix, list) {
+  initialize: function(client, prefix, list) {
     this.prefix = prefix;
     if(!$defined(list) || list.length == 0) {
       this.list = null;
     } else {
       var l = [];
       
-      var prefixl = prefix.toIRCCompletion();
+      var prefixl = qwebirc.irc.toIRCCompletion(client, prefix);
       
       /* convert the nick list to IRC lower case, stripping all non letters
        * before comparisions */
       for(var i=0;i<list.length;i++) {
-        var l2 = list[i].toIRCCompletion();
+        var l2 = qwebirc.irc.toIRCCompletion(client, list[i]);
         
         if(l2.startsWith(prefixl))
           l.push(list[i]);
@@ -104,11 +104,11 @@ qwebirc.ui.TabIterator = new Class({
 });
 
 qwebirc.ui.BaseTabCompleter = new Class({
-  initialize: function(prefix, existingNick, suffix, list) {
+  initialize: function(client, prefix, existingNick, suffix, list) {
     this.existingNick = existingNick;
     this.prefix = prefix;
     this.suffix = suffix;
-    this.iterator = new qwebirc.ui.TabIterator(existingNick, list);
+    this.iterator = new qwebirc.ui.TabIterator(client, existingNick, list);
   },
   get: function() {
     var n = this.iterator.next();
@@ -123,7 +123,7 @@ qwebirc.ui.BaseTabCompleter = new Class({
 qwebirc.ui.QueryTabCompleter = new Class({
   Extends: qwebirc.ui.BaseTabCompleter,
   initialize: function(prefix, existingNick, suffix, window) {
-    this.parent(prefix, existingNick, suffix, window.client.lastNicks);
+    this.parent(window.client, prefix, existingNick, suffix, window.client.lastNicks);
   }
 });
 
@@ -133,7 +133,7 @@ qwebirc.ui.ChannelNameTabCompleter = new Class({
 
     /* WTB map */
     var l = [];
-    var wa = window.parentObject.windows[window.client];
+    var wa = window.parentObject.windows[window.parentObject.getClientId(window.client)];
     
     for(var c in window.client.channels) {
       var w = wa[c];
@@ -152,7 +152,7 @@ qwebirc.ui.ChannelNameTabCompleter = new Class({
     var l2 = [];    
     for(var i=0;i<l.length;i++)
       l2.push(l[i][1]);
-    this.parent(prefix, existingText, suffix, l2);
+    this.parent(window.client, prefix, existingText, suffix, l2);
   }
 });
 
@@ -161,6 +161,6 @@ qwebirc.ui.ChannelUsersTabCompleter = new Class({
   initialize: function(prefix, existingText, suffix, window) {
     var nc = window.client.tracker.getSortedByLastSpoke(window.name);
 
-    this.parent(prefix, existingText, suffix, nc);
+    this.parent(window.client, prefix, existingText, suffix, nc);
   }
 });