Merge lp:~oppifjellet/cable/color-codes into lp:cable

[Daniele "OpenNingia" Simonetti]

This branch is focused on implementing the support for color codes.
The current implementation parses color codes and visualize colored test as sent by other clients.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-05 22:43:13 +0000
+++ CMakeLists.txt	2013-09-05 22:43:13 +0000
@@ -114,7 +114,10 @@
     tests/TestCase.vala
     tests/TestMain.vala
     tests/TestExample.vala
+    tests/TestColors.vala
     tests/TestMessageHistory.vala
+
+    src/Utils/Utils.vala
     src/Utils/RRStringList.vala
 PACKAGES
     gtk+-3.0

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2013-08-20 17:24:19 +0000
+++ src/Cable.vala	2013-09-05 22:43:13 +0000
@@ -25,7 +25,7 @@
     static bool option_reset = false;
     static bool option_version = false;
     static bool option_test = false;
-    
+
     static const OptionEntry[] option_entries = {
         { "reset", 0, 0, OptionArg.NONE, ref option_reset,
           N_("Reset all settings and configuration to default"), null },
@@ -38,7 +38,7 @@
 
         { null }
     };
-    
+
     static Gee.ArrayList <Controller.Window> controllers {
         get; set;
         default = new Gee.ArrayList <Controller.Window> ();
@@ -86,6 +86,8 @@
         Launcher.init ();
         Settings.init ();
         Utils.init ();
+        Utils.Network.init ();
+        Utils.Identity.init ();
         Irc.init ();
     }
 
@@ -96,7 +98,7 @@
         add_window (window);
         controllers.add (controller);
     }
-    
+
     public static int main (string[] args) {
         var context = new GLib.OptionContext ("");
         context.set_help_enabled (true);
@@ -117,11 +119,11 @@
         if (option_reset) {
             // XXX
         }
-        
+
         if (option_test) {
             return Tests.run (args);
         }
-        
+
 
         var cable = new Cable.App ();
         return cable.run (args);

=== modified file 'src/Utils/Utils.vala'
--- src/Utils/Utils.vala	2013-08-06 15:32:12 +0000
+++ src/Utils/Utils.vala	2013-09-05 22:43:13 +0000
@@ -10,7 +10,7 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
     Lesser General Public License for more details.
- 
+
     You should have received a copy of the GNU Lesser General
     Public License along with this library; if not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -19,9 +19,64 @@
 
 namespace Cable.Utils {
 
+    internal static string[] _palette;
+
+    /*
+mIRC palette
+------------
+0 white
+1 black
+2 blue (navy)
+3 green
+4 red
+5 brown (maroon)
+6 purple
+7 orange (olive)
+8 yellow
+9 light green (lime)
+10 teal (a green/blue cyan)
+11 light cyan (cyan) (aqua)
+12 light blue (royal)
+13 pink (light purple) (fuchsia)
+14 grey
+15 light grey (silver)
+
+0: #FFFFFF
+1: #000000
+2: #00007F
+3: #009300
+4: #FF0000
+5: #7F0000
+6: #9C009C
+7: #FC7F00
+8: #FFFF00
+9: #00FC00
+10: #009393
+11: #00FFFF
+12: #0000FC
+13: #FF00FF
+14: #7F7F7F
+15: #D2D2D2
+*/
+
     public static void init () {
-        Network.init ();
-        Identity.init ();
+        _palette = new string[] {
+            "#EEE",
+            "#000",
+            "#00007F",
+            "#009300",
+            "#FF0000",
+            "#7F0000",
+            "#9C009C",
+            "#FC7F00",
+            "#FFFF00",
+            "#00FC00",
+            "#009393",
+            "#00FFFF",
+            "#0000FC",
+            "#FF00FF",
+            "#D2D2D2"
+        };
     }
 
     class Label : Gtk.Label {
@@ -38,28 +93,106 @@
             this.sensitive = sensitive;
         }
     }
-    
+
     // FIXME this sucks and only works for normal entries
     public void filter (Gtk.Editable editable, string text, string[] needles) {
         foreach (var needle in needles)
             if (needle in text)
                 Signal.stop_emission_by_name (editable, "insert-text");
     }
-    
+
+    public string parse_color_codes(string input) {
+        const string token = "&#x3;";
+        var builder = new StringBuilder ();
+        var offset  = 0;
+        var should_close_tag = false;
+
+        // e.g.
+        // &#x32,4hello &#x31,3world!
+        // hello &#x32,4world!
+
+        while ( true ) {
+            var idx = input.index_of(token, offset);
+            if ( idx == -1 )
+                break;
+
+            if ( idx != offset )
+                builder.append(input[offset:idx]);
+
+            if ( should_close_tag ) {
+                should_close_tag = false;
+                builder.append("</span>");
+            }
+
+            var ifg        = -1;
+            var ibg        = -1;
+            string? fg     = null;
+            string? bg     = null;
+
+            offset = idx + token.length;
+
+            if ( offset >= input.length )
+                break;
+
+            //debug("\npos: %s", input[offset:-1]);
+
+            var bld = new StringBuilder();
+            while ( input[offset].isdigit() && offset < input.length )
+                bld.append_c( input[offset++] );
+            if (bld.str.length > 0)
+                ifg = int.parse(bld.str);
+
+            if ((offset+1) < input.length && input[offset] == ',') {
+                bld.assign("");
+                offset++;
+                while ( input[offset].isdigit() && offset < input.length )
+                    bld.append_c(input[offset++]);
+                if (bld.str.length > 0)
+                    ibg = int.parse(bld.str);
+            }
+
+            if ( ifg < _palette.length && ifg >= 0 )
+                fg = _palette[ifg];
+            if ( ibg < _palette.length && ibg >= 0 )
+                bg = _palette[ibg];
+
+            //debug("\npalette len: %d ifg: %d, ibg: %d, fg: %s, bg: %s", _palette.length, ifg, ibg, fg, bg);
+
+            should_close_tag = (fg != null) || (bg != null);
+            if ( fg != null && bg != null ) {
+                builder.append("<span color=\"%s\" background=\"%s\">".printf(fg,bg));
+            } else if ( fg != null ) {
+                builder.append("<span color=\"%s\">".printf(fg));
+            } else if ( bg != null )  {
+                builder.append("<span background=\"%s\">".printf(bg));
+            }
+        }
+
+        if ( offset < input.length )
+            builder.append(input[offset:input.length]);
+
+        if ( should_close_tag ) {
+            builder.append("</span>");
+        }
+
+        return builder.str;
+    }
+
     /**
      * Escapes critical characters and adds markup to make URLs clickable. To be used
      * for messages and topics.
      */
     public string parse_string_to_markup (string input) {
-        var output = GLib.Markup.escape_text (input);
+        var output = parse_color_codes (GLib.Markup.escape_text (input));
+
         var regex = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.\-]+|(?:www.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9.\-]+)((?:\/[\+~%\/.\w\-_]*)?\??(?:[!-\+=&;%@.\w_]*)#?(?:[,.!\/\-\+=&;%@\w_]*))?)/;
-        
+
         try {
             return regex.replace (output, -1, 0, "<a href=\"\\1\">\\1</a>");
         } catch (GLib.RegexError error) {
             warning (error.message);
         }
-        
+
         return output;
     }
 }

=== added file 'tests/TestColors.vala'
--- tests/TestColors.vala	1970-01-01 00:00:00 +0000
+++ tests/TestColors.vala	2013-09-05 22:43:13 +0000
@@ -0,0 +1,36 @@
+using Cable.Utils;
+
+class TestColors : Gee.TestCase {
+
+  public TestColors() {
+    // assign a name for this class
+    base("TestColors");
+    // add test methods
+    add_test("[Chat] color codes", test_color_codes);
+  }
+
+  public override void set_up () {
+    Cable.Utils.init();
+  }
+
+  public void test_color_codes() {
+    // e.g.
+    // &#x32,4hello &#x31,3world!
+    // hello &#x32,4world!
+    string text        = "&#x3;2hello world!";
+    string parsed_text = parse_color_codes(text);
+    assert(parsed_text == "<span color=\"#00007F\">hello world!</span>");
+
+    text        = "&#x3;2hello &#x3;2,3world!";
+    parsed_text = parse_color_codes(text);
+    assert(parsed_text == "<span color=\"#00007F\">hello </span><span color=\"#00007F\" background=\"#009300\">world!</span>");
+
+    text        = "&#x3;2hello &#x3;world!";
+    parsed_text = parse_color_codes(text);
+    assert(parsed_text == "<span color=\"#00007F\">hello </span>world!");
+  }
+
+  public override void tear_down () {
+    // tear down your test
+  }
+}
\ No newline at end of file

=== modified file 'tests/TestMain.vala'
--- tests/TestMain.vala	2013-09-05 22:43:13 +0000
+++ tests/TestMain.vala	2013-09-05 22:43:13 +0000
@@ -2,6 +2,7 @@
   Test.init (ref args);
   // add any of your test cases here
   TestSuite.get_root().add_suite(new TestExample().get_suite());
+  TestSuite.get_root().add_suite(new TestColors().get_suite());
   TestSuite.get_root().add_suite(new TestMessageHistory().get_suite());
   return Test.run ();
 }
\ No newline at end of file