Merge pull request #305 from retropc/master

[irc/quakenet/qwebirc.git] / js / ui / colour.js

diff --git a/js/ui/colour.js b/js/ui/colour.js
index 2ac575158dca7de005847a5cbec4bb307f6d0be4..641dfe4a4e6cc4ab8e72ef005bb128d4966ba3eb 100644 (file)
--- a/js/ui/colour.js
+++ b/js/ui/colour.js
@@ -1,8 +1,10 @@
-function Colourise(line, entity, execfn) {
+qwebirc.ui.Colourise = function(line, entity, execfn, cmdfn, window) {
   var fg;
   var bg;
   var underline = false;
   var bold = false;
+  var italic = false;
+  var autoNickColour = false;
 
   var out = [];
   var xline = line.split("");
@@ -43,15 +45,27 @@ function Colourise(line, entity, execfn) {
   }
 
   function emitEndToken() {
+    var data;
     if(out.length > 0) {
-      urlificate(element, out.join(""), execfn);
+      var o = out.join("");
+      if (execfn) {
+        data = qwebirc.ui.urlificate(element, o, execfn, cmdfn, window);
+      } else {
+        data = o;
+        element.appendChild(document.createTextNode(o));
+      }
       entity.appendChild(element);
       out = [];
     }
     element = document.createElement("span");
+    return data;
   }  
+  
   function emitStartToken() {
-    classes = []
+    if(autoNickColour)
+      return element;
+      
+    var classes = []
     if(fg != undefined)
       classes.push("Xc" + fg);
     if(bg != undefined)
@@ -60,11 +74,42 @@ function Colourise(line, entity, execfn) {
       classes.push("Xb");
     if(underline)
       classes.push("Xu");
+    if(italic)
+      classes.push("Xi");
     element.className = classes.join(" ");
   }
   
-  for(i=0;i<xline.length;i++) {
+  var nickColouring = window.parentObject.uiOptions.NICK_COLOURS; /* HACK */
+  var capturingNick = false;
+  for(var i=0;i<xline.length;i++) {
     var lc = xline[i];
+
+    if(nickColouring) {
+      if(!capturingNick) {
+        if(lc == "\x00") {
+          capturingNick = true;
+          emitEndToken();
+          continue;
+        }
+      } else {
+        if(lc != "\x00") {
+          out.push(lc);
+        } else {
+          autoNickColour = true;
+          var e = emitStartToken();
+          var text = emitEndToken();
+          
+          var c = text.toHSBColour(window.client);
+          if($defined(c))
+            e.style.color = c.rgbToHex();
+          capturingNick = autoNickColour = false;
+        }
+        continue;
+      }
+    } else if(lc == "\x00") {
+      continue;
+    }
+    
     if(lc == "\x02") {
       emitEndToken();
 
@@ -76,6 +121,12 @@ function Colourise(line, entity, execfn) {
 
       underline = !underline;
       
+      emitStartToken();
+    } else if(lc == "\x1D") {
+      emitEndToken();
+
+      italic = !italic;
+      
       emitStartToken();
     } else if(lc == "\x0F") {
       emitEndToken();
@@ -83,14 +134,15 @@ function Colourise(line, entity, execfn) {
       fg = undefined;
       bg = undefined;
       underline = false;
+      italic = false;
       bold = false;
     } else if(lc == "\x03") {
       emitEndToken();
       
       i = parseColours(xline, i);
-      if(bg > 15)
+      if(bg >= 99)
         bg = undefined;
-      if(fg > 15)
+      if(fg >= 99)
         fg = undefined;
         
       emitStartToken();
@@ -100,4 +152,18 @@ function Colourise(line, entity, execfn) {
   }
   
   emitEndToken();
-}
\ No newline at end of file
+}
+
+String.prototype.toHSBColour = function(client) {
+  var lower = client.toIRCLower(client.stripPrefix(this));
+  if(lower == client.lowerNickname)
+    return null;
+    
+  var hash = 0;
+  for(var i=0;i<lower.length;i++)
+    hash = 31 * hash + lower.charCodeAt(i);
+  
+  var hue = Math.abs(hash) % 360;
+
+  return new Color([hue, 70, 60], "hsb");
+}