gears.color: Add support for named colors

Oh hey, Pango exports an API that allows to query for named colors based on the
famous rgb.txt! Let's use that!

Signed-off-by: Uli Schlachter <psychon@znc.in>

lib/gears/color.lua

@@ -13,14 +13,16 @@ local tonumber = tonumber
 local ipairs = ipairs
 local pairs = pairs
 local type = type
-local cairo = require("lgi").cairo
+local lgi = require("lgi")
+local cairo = lgi.cairo
+local Pango = lgi.Pango
 local surface = require("gears.surface")
 
 local color = { mt = {} }
 local pattern_cache
 
 --- Parse a HTML-color.
--- This function can parse colors like `#rrggbb` and `#rrggbbaa`.
+-- This function can parse colors like `#rrggbb` and `#rrggbbaa` and also `red`.
 -- Thanks to #lua for this. :)
 --
 -- @param col The color to parse
@@ -28,26 +30,39 @@ local pattern_cache
 -- @usage -- This will return 0, 1, 0, 1
 -- gears.color.parse_color("#00ff00ff")
 function color.parse_color(col)
-    -- Get all hex chars
     local rgb = {}
-    for char in string.gmatch(col, "[^#]") do
+    -- Is it a HTML-style color?
-        table.insert(rgb, tonumber(char, 16) / 0xf)
+    if string.match(col, "^#%x+$") then
-    end
+        -- Get all hex chars
-    -- Merge consecutive values until we have at most four groups (rgba)
+        for char in string.gmatch(col, "[^#]") do
-    local factor = 0xf
+            table.insert(rgb, tonumber(char, 16) / 0xf)
-    while #rgb > 4 do
+        end
-        local merged = {}
+        -- Merge consecutive values until we have at most four groups (rgba)
-        local key, value = next(rgb, nil)
+        local factor = 0xf
-        local next_factor = (factor + 1)*(factor + 1) - 1
+        while #rgb > 4 do
-        while key do
+            local merged = {}
-            local key2, value2 = next(rgb, key)
+            local key, value = next(rgb, nil)
-            local v1, v2 = value * factor, value2 * factor
+            local next_factor = (factor + 1)*(factor + 1) - 1
-            local new = v1 * (factor + 1) + v2
+            while key do
-            table.insert(merged, new / next_factor)
+                local key2, value2 = next(rgb, key)
-            key, value = next(rgb, key2)
+                local v1, v2 = value * factor, value2 * factor
+                local new = v1 * (factor + 1) + v2
+                table.insert(merged, new / next_factor)
+                key, value = next(rgb, key2)
+            end
+            rgb = merged
+            factor = next_factor
+        end
+    else
+        -- Let's ask Pango for its opinion (but this doesn't support alpha!)
+        local c = Pango.Color()
+        if c:parse(col) then
+            rgb = {
+                c.red / 0xffff,
+                c.green / 0xffff,
+                c.blue / 0xffff,
+            }
         end
-        rgb = merged
-        factor = next_factor
     end
     -- Add missing groups (missing alpha)
     while #rgb < 4 do

spec/gears/color_spec.lua

@@ -22,6 +22,10 @@ describe("gears.color", function()
             test(0, 0, 0, 0xff, "#000000")
         end)
 
+        it("black", function()
+            test(0, 0, 0, 0xff, "black")
+        end)
+
         it("opaque black", function()
             test(0, 0, 0, 0xff, "#000000ff")
         end)
@@ -34,6 +38,10 @@ describe("gears.color", function()
             test(0xff, 0xff, 0xff, 0x7f, "#ffffff7f")
         end)
 
+        it("chartreuse", function()
+            test(0x7f, 0xff, 0x00, 0xff, "chartreuse")
+        end)
+
         describe("different lengths", function()
             local function gray(e, e_a, input)
                 local o_r, o_g, o_b, o_a, unused = color.parse_color(input)