Merge 0.9->0.10

[prosody.git] / util / termcolours.lua

diff --git a/util/termcolours.lua b/util/termcolours.lua
index df204688fada2690fcd098fc7494eba2ccfb3809..a1c01aa58517aa79f3cb685aa9b3480b3079fcd7 100644 (file)
--- a/util/termcolours.lua
+++ b/util/termcolours.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -9,6 +9,7 @@
 
 local t_concat, t_insert = table.concat, table.insert;
 local char, format = string.char, string.format;
+local tonumber = tonumber;
 local ipairs = ipairs;
 local io_write = io.write;
 
@@ -18,7 +19,7 @@ if os.getenv("WINDIR") then
 end
 local orig_color = windows and windows.get_consolecolor and windows.get_consolecolor();
 
-module "termcolours"
+local _ENV = nil;
 
 local stylemap = {
                        reset = 0; bright = 1, dim = 2, underscore = 4, blink = 5, reverse = 7, hidden = 8;
@@ -34,8 +35,17 @@ local winstylemap = {
        ["1;31"] = 4+8 -- bold red
 }
 
+local cssmap = {
+       [1] = "font-weight: bold", [2] = "opacity: 0.5", [4] = "text-decoration: underline", [8] = "visibility: hidden",
+       [30] = "color:black", [31] = "color:red", [32]="color:green", [33]="color:#FFD700",
+       [34] = "color:blue", [35] = "color: magenta", [36] = "color:cyan", [37] = "color: white",
+       [40] = "background-color:black", [41] = "background-color:red", [42]="background-color:green",
+       [43]="background-color:yellow", [44] = "background-color:blue", [45] = "background-color: magenta",
+       [46] = "background-color:cyan", [47] = "background-color: white";
+};
+
 local fmt_string = char(0x1B).."[%sm%s"..char(0x1B).."[0m";
-function getstring(style, text)
+local function getstring(style, text)
        if style then
                return format(fmt_string, style, text);
        else
@@ -43,7 +53,7 @@ function getstring(style, text)
        end
 end
 
-function getstyle(...)
+local function getstyle(...)
        local styles, result = { ... }, {};
        for i, style in ipairs(styles) do
                style = stylemap[style];
@@ -55,7 +65,7 @@ function getstyle(...)
 end
 
 local last = "0";
-function setstyle(style)
+local function setstyle(style)
        style = style or "0";
        if style ~= last then
                io_write("\27["..style.."m");
@@ -76,4 +86,22 @@ if windows then
        end
 end
 
-return _M;
+local function ansi2css(ansi_codes)
+       if ansi_codes == "0" then return "</span>"; end
+       local css = {};
+       for code in ansi_codes:gmatch("[^;]+") do
+               t_insert(css, cssmap[tonumber(code)]);
+       end
+       return "</span><span style='"..t_concat(css, ";").."'>";
+end
+
+local function tohtml(input)
+       return input:gsub("\027%[(.-)m", ansi2css);
+end
+
+return {
+       getstring = getstring;
+       getstyle = getstyle;
+       setstyle = setstyle;
+       tohtml = tohtml;
+};