Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 20316)
+++ trunk/scconfig/Rev.h	(revision 20317)
@@ -1 +1 @@
-static const int myrev = 20260;
+static const int myrev = 20317;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 20316)
+++ trunk/scconfig/Rev.tab	(revision 20317)
@@ -1,3 +1,4 @@
+20317	configure	new core color infra
 20260	configure	plugin frame for ttf import
 20249	configure	central gettimeofday() wrapper to fix a compilation bug on IRIX
 20233	configure	new plugin: act_draw
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 20316)
+++ trunk/src/Makefile.in	(revision 20317)
@@ -58,6 +58,7 @@
 	build_run.o
 	change.o
 	change_act.o
+	color.o
 	conf.o
 	conf_act.o
 	conf_core.o
Index: trunk/src/color.c
===================================================================
--- trunk/src/color.c	(nonexistent)
+++ trunk/src/color.c	(revision 20317)
@@ -0,0 +1,124 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+
+#include "color.h"
+
+#define PACK_COLOR(clr) ((((unsigned long)clr->r) << 24) || (((unsigned long)clr->g) << 16) || (((unsigned long)clr->b) << 8) || (((unsigned long)clr->a)))
+#define COLOR_TO_FLOAT(clr) \
+do { \
+	clr->fr = (float)clr->r / 255.0; \
+	clr->fg = (float)clr->g / 255.0; \
+	clr->fb = (float)clr->b / 255.0; \
+	clr->fa = (float)clr->a / 255.0; \
+} while(0)
+
+#define COLOR_TO_STR(clr) \
+do { \
+	if (clr->a == 255) \
+		sprintf(clr->str, "#%02x%02x%02x", clr->r, clr->g, clr->b); \
+	else \
+		sprintf(clr->str, "#%02x%02x%02x%02x", clr->r, clr->g, clr->b, clr->a); \
+} while(0)
+
+#define CLAMP01(c) (((c) < 0.0) ? 0.0 : (((c) > 1.0) ? 1.0 : (c)))
+
+int pcb_color_load_int(pcb_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+{
+	dst->r = r;
+	dst->g = g;
+	dst->b = b;
+	dst->a = a;
+	dst->packed = PACK_COLOR(dst);
+	COLOR_TO_FLOAT(dst);
+	COLOR_TO_STR(dst);
+	return 0;
+}
+
+int pcb_color_load_packed(pcb_color_t *dst, unsigned long p)
+{
+	dst->r = (p & 0xff000000UL) >> 24;
+	dst->g = (p & 0x00ff0000UL) >> 16;
+	dst->b = (p & 0x0000ff00UL) >> 8;
+	dst->a = (p & 0x000000ffUL);
+	COLOR_TO_FLOAT(dst);
+	COLOR_TO_STR(dst);
+	return 0;
+}
+
+int pcb_color_load_float(pcb_color_t *dst, float r, float g, float b, float a)
+{
+	dst->r = CLAMP01(r) * 255.0;
+	dst->g = CLAMP01(g) * 255.0;
+	dst->b = CLAMP01(b) * 255.0;
+	dst->a = CLAMP01(a) * 255.0;
+	dst->packed = PACK_COLOR(dst);
+	COLOR_TO_STR(dst);
+	return 0;
+}
+
+/* Convert a hex digit or return -1 on error */
+#define HEXDIGCONV(res, chr) \
+do { \
+	if ((chr >= '0') && (chr <= '9')) res = chr - '0'; \
+	else if ((chr >= 'a') && (chr <= 'f')) res = chr - 'a' + 10; \
+	else if ((chr >= 'A') && (chr <= 'F')) res = chr - 'A' + 10; \
+	else \
+		return -1; \
+} while(0)
+
+/* convert a 2 digit hex number or return -1 on error */
+#define HEXCONV(dst_fld, src, idx) \
+do { \
+	unsigned int tmp1, tmp2; \
+	HEXDIGCONV(tmp1, src[idx]); \
+	HEXDIGCONV(tmp2, src[idx+1]); \
+	dst_fld = tmp1 << 4 | tmp2; \
+} while(0)
+
+int pcb_color_load_str(pcb_color_t *dst, const char *src)
+{
+	if (src[0] != '#')
+		return -1;
+
+	HEXCONV(dst->r, src, 1);
+	HEXCONV(dst->g, src, 3);
+	HEXCONV(dst->b, src, 5);
+	if (src[7] != '\0')
+		HEXCONV(dst->a, src, 5);
+	else
+		dst->a = 255;
+
+	dst->packed = PACK_COLOR(dst);
+	COLOR_TO_FLOAT(dst);
+	COLOR_TO_STR(dst);
+	return 0;
+}
+
+
Index: trunk/src/color.h
===================================================================
--- trunk/src/color.h	(nonexistent)
+++ trunk/src/color.h	(revision 20317)
@@ -0,0 +1,51 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_COLOR_H
+#define PCB_COLOR_H
+
+#include "global_typedefs.h"
+
+struct pcb_color_s {
+	unsigned char r, g, b, a; /* primary storage; alpha is not really supported at the moment */
+	unsigned long packed;     /* cache: 32 bit portable (byte-order-safe) packed version used for lookups */
+	float fr, fg, fb, fa;     /* cache: 0..1 version; using float to save memory^1 */
+	char str[10];             /* cache: "#rrggbb[aa]" \0 terminated string version */
+};
+
+/* Convert a color from various formats to a pcb color; returns 0 on success */
+int pcb_color_load_int(pcb_color_t *dst, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+int pcb_color_load_packed(pcb_color_t *dst, unsigned long p);
+int pcb_color_load_float(pcb_color_t *dst, float r, float g, float b, float a);
+int pcb_color_load_str(pcb_color_t *dst, const char *src);
+
+
+/* Note ^1: openGL uses GLfloat which is guaranteed to be at least 32 bits;
+but at the end for each color component it's unreasonable to use more than 8
+bits and it is unlikely to encounter a system that is capable of doing opengl
+but having a float type with less integer bits than 8. */
+
+#endif
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 20316)
+++ trunk/src/global_typedefs.h	(revision 20317)
@@ -63,6 +63,7 @@
 typedef struct pcb_hid_cfg_s pcb_hid_cfg_t;
 
 typedef unsigned int pcb_cardinal_t;
+typedef struct pcb_color_s pcb_color_t;
 typedef unsigned char pcb_uint8_t;   /* Don't use in new code. */
 
 typedef struct pcb_action_s pcb_action_t;