From 7aa289d90c8d93c1cc4f3a1bb2416eca31b91f14 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sat, 5 Mar 2016 16:25:02 +0100
Subject: [PATCH] Fix color parsing

---
 source/x11-helper.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/source/x11-helper.c b/source/x11-helper.c
index f8d2912a..b2883b30 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -566,8 +566,25 @@ Color color_get ( const char *const name )
         color.pixel = strtoul ( &cname[5], NULL, 16 );
     }
     else if ( strncmp ( cname, "#", 1 ) == 0 ) {
-        color.pixel = strtoul ( &cname[1], NULL, 16 );
-        color.a     = 0xff;
+        unsigned long val = strtoul ( &cname[1], NULL, 16 );
+        ssize_t length = strlen(&cname[1]);
+        switch ( length ) {
+            case 3:
+                color.a = 0xff;
+                color.r = 16*((val&0xF00)>>8);
+                color.g = 16*((val&0x0F0)>>4);
+                color.b = 16*(val&0x00F);
+                break;
+            case 6:
+                color.pixel = val;
+                color.a     = 0xff;
+                break;
+            case 8:
+                color.pixel = val;
+                break;
+            default:
+                break;
+        }
     }
     g_free ( copy );