Added: Parsing css border shorthand

--HG--
branch : html-improvements

code/nel/include/nel/gui/css_style.h

@@ -27,6 +27,11 @@ namespace NLGUI
 
 	typedef std::map<std::string, std::string> TStyle;
 
+	// ie. border-style
+	enum CSSLineStyle { NONE = 0, HIDDEN, SOLID };
+	// ie, border-width (px)
+	enum CSSLineWidth { THIN = 1, MEDIUM = 3, THICK = 5 };
+
 	/**
 	 * \brief CSS style rules
 	 * \date 2019-03-15 10:50 GMT
@@ -62,7 +67,11 @@ namespace NLGUI
 			Height=-1;
 			MaxWidth=-1;
 			MaxHeight=-1;
-			BorderWidth=-1;
+			// border style
+			BorderTopWidth = BorderRightWidth = BorderBottomWidth = BorderLeftWidth = CSSLineWidth::MEDIUM;
+			BorderTopStyle = BorderRightStyle = BorderBottomStyle = BorderLeftStyle = CSSLineStyle::NONE;
+			BorderTopColor = BorderRightColor = BorderBottomColor = BorderLeftColor = NLMISC::CRGBA::Transparent;
+			// background
 			BackgroundColor=NLMISC::CRGBA::Black;
 			BackgroundColorOver=NLMISC::CRGBA::Black;
 		}
@@ -93,7 +102,9 @@ namespace NLGUI
 		sint32 Height;
 		sint32 MaxWidth;
 		sint32 MaxHeight;
-		sint32 BorderWidth;
+		uint32 BorderTopWidth, BorderRightWidth, BorderBottomWidth, BorderLeftWidth;
+		CSSLineStyle BorderTopStyle, BorderRightStyle, BorderBottomStyle, BorderLeftStyle;
+		NLMISC::CRGBA BorderTopColor, BorderRightColor, BorderBottomColor, BorderLeftColor;
 		NLMISC::CRGBA BackgroundColor;
 		NLMISC::CRGBA BackgroundColorOver;
 
@@ -106,6 +117,7 @@ namespace NLGUI
 
 	class CCssStyle {
 	public:
+
 		struct SStyleRule {
 			std::vector<CCssSelector> Selector;
 			TStyle Properties;
@@ -148,9 +160,23 @@ namespace NLGUI
 		// match selector to dom path
 		bool match(const std::vector<CCssSelector> &selector, const CHtmlElement &elm) const;
 
+		// get shorthang 'top right bottom left' index values based size, ie 'padding' syntax
+		bool getShorthandIndices(const uint32 size, uint8 &t, uint8 &r, uint8 &b, uint8 &l) const;
+
+		// break 'border' into 'border-top-color', 'border-top-style', etc rules
+		bool tryBorderWidthShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const;
+		bool tryBorderStyleShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const;
+		bool tryBorderColorShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const;
+		void parseBorderShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const;
+
 		// parse 'background' into 'background-color', 'background-image', etc
 		void parseBackgroundShorthand(const std::string &value, CStyleParams &style) const;
 
+		// parse string value into corresponding value
+		void applyBorderWidth(const std::string &value, uint32 *dest, const uint32 currentWidth, const uint32 fontSize) const;
+		void applyBorderColor(const std::string &value, NLMISC::CRGBA *dest, const NLMISC::CRGBA &currentColor, const NLMISC::CRGBA &textColor) const;
+		void applyLineStyle(const std::string &value, CSSLineStyle *dest, const CSSLineStyle &currentStyle) const;
+
 	public:
 		void reset();
 
@@ -180,7 +206,10 @@ namespace NLGUI
 			Current.Height=-1;
 			Current.MaxWidth=-1;
 			Current.MaxHeight=-1;
-			Current.BorderWidth=-1;
+
+			Current.BorderTopWidth = Current.BorderRightWidth = Current.BorderBottomWidth = Current.BorderLeftWidth = CSSLineWidth::MEDIUM;
+			Current.BorderTopStyle = Current.BorderRightStyle = Current.BorderBottomStyle = Current.BorderLeftStyle = CSSLineStyle::NONE;
+			Current.BorderTopColor = Current.BorderRightColor = Current.BorderBottomColor = Current.BorderLeftColor = Current.TextColor;
 
 			Current.StyleRules.clear();
 		}

code/nel/src/gui/css_style.cpp

@@ -338,9 +338,13 @@ namespace NLGUI
 	// - normalize values
 	void CCssStyle::normalize(const TStyle &styleRules, CStyleParams &style, const CStyleParams &current) const
 	{
+		bool keep = true;
 		TStyle::const_iterator it;
 		for (it=styleRules.begin(); it != styleRules.end(); ++it)
 		{
+			// shorthands will be replaced with proper statements  and shorthand rule is removed
+			keep = true;
+
 			// update local copy of applied style
 			style.StyleRules[it->first] = it->second;
 
@@ -452,9 +456,34 @@ namespace NLGUI
 					style.StyleRules["background-size"] = "100%";
 				}
 
-				TStyle::iterator pos = style.StyleRules.find(it->first);
+				keep = false;
-				if (pos != style.StyleRules.end())
+			}
-					style.StyleRules.erase(pos);
+			else
+			if (it->first == "border"
+				|| it->first == "border-top" || it->first == "border-right"
+				|| it->first == "border-bottom" || it->first == "border-left")
+			{
+				// TODO: use enum or bitmap constant instead of passing a string name (it->first)
+				parseBorderShorthand(it->second, style, it->first);
+				keep = false;
+			}
+			else
+			if (it->first == "border-width")
+			{
+				tryBorderWidthShorthand(it->second, style, it->first);
+				keep = false;
+			}
+			else
+			if (it->first == "border-style")
+			{
+				tryBorderStyleShorthand(it->second, style, it->first);
+				keep = false;
+			}
+			else
+			if (it->first == "border-color")
+			{
+				tryBorderColorShorthand(it->second, style, it->first);
+				keep = false;
 			}
 			else
 			if (it->first == "display")
@@ -464,58 +493,110 @@ namespace NLGUI
 				else
 					style.DisplayBlock = (it->second == "block" || it->second == "table");
 			}
+
+			if (!keep)
+			{
+				TStyle::iterator pos = style.StyleRules.find(it->first);
+				if (pos != style.StyleRules.end())
+					style.StyleRules.erase(pos);
+			}
 		}
 	}
 
-	// apply style rules
+	void CCssStyle::applyBorderWidth(const std::string &value, uint32 *dest, const uint32 currentWidth, const uint32 fontSize) const
-	void CCssStyle::apply(CStyleParams &style, const CStyleParams &current) const
-	{
-		float tmpf;
-		TStyle::const_iterator it;
-		for (it=style.StyleRules.begin(); it != style.StyleRules.end(); ++it)
 	{
-			if (it->first == "border" || it->first == "border-width")
+		if (!dest) return;
-			{
+		if (value == "inherit")
-				// TODO: border: 1px solid red;
-				if (it->second == "inherit")
 		{
-					style.BorderWidth = current.BorderWidth;
+			*dest = currentWidth;
 		}
-				else if (it->second == "none")
+		else if (value == "thin")
 		{
-					style.BorderWidth = 0;
+			*dest = 1;
 		}
-				else if (it->second == "thin")
+		else if (value == "medium")
 		{
-					style.BorderWidth = 1;
+			*dest = 3;
 		}
-				else if (it->second == "medium")
+		else if (value == "thick")
 		{
-					style.BorderWidth = 3;
+			*dest = 5;
 		}
-				else if (it->second == "thick")
+		else if (value == "0")
 		{
-					style.BorderWidth = 5;
+			*dest = 0;
 		}
 		else
 		{
 			float tmpf;
 			std::string unit;
-					if (getCssLength(tmpf, unit, it->second.c_str()))
+			if (getCssLength(tmpf, unit, value.c_str()))
 			{
 				if (unit == "rem")
-							style.BorderWidth = Root.FontSize * tmpf;
+					*dest = fontSize * tmpf;
 				else if (unit == "em")
-							style.BorderWidth = current.FontSize * tmpf;
+					*dest = fontSize * tmpf;
 				else if (unit == "pt")
-							style.BorderWidth = tmpf / 0.75f;
+					*dest = tmpf / 0.75f;
 				else if (unit == "%")
-							style.BorderWidth = 0; // no support for % in border width
+					*dest = 0; // no support for % in border width
 				else
-							style.BorderWidth = tmpf;
+					*dest = tmpf;
+			}
 		}
 	}
+
+	void CCssStyle::applyBorderColor(const std::string &value, CRGBA *dest, const CRGBA &currentColor, const CRGBA &textColor) const
+	{
+		if (!dest) return;
+
+		if (value == "inherit")
+			*dest = currentColor;
+		else if (value == "transparent")
+			*dest = CRGBA::Transparent;
+		else if (value == "currentcolor")
+			*dest  = textColor;
+		else
+			scanHTMLColor(value.c_str(), *dest);
+	}
+
+	void CCssStyle::applyLineStyle(const std::string &value, CSSLineStyle *dest, const CSSLineStyle &currentStyle) const
+	{
+		if (!dest) return;
+
+		if (value == "inherit")
+			*dest = currentStyle;
+		else if (value == "none")
+			*dest = CSSLineStyle::NONE;
+		else if (value == "hidden")
+			*dest = CSSLineStyle::HIDDEN;
+		else if (value == "inset")
+			*dest = CSSLineStyle::INSET;
+		else if (value == "outset")
+			*dest = CSSLineStyle::OUTSET;
+		else if (value == "solid")
+			*dest = CSSLineStyle::SOLID;
 	}
+
+	// apply style rules
+	void CCssStyle::apply(CStyleParams &style, const CStyleParams &current) const
+	{
+		float tmpf;
+		TStyle::const_iterator it;
+		for (it=style.StyleRules.begin(); it != style.StyleRules.end(); ++it)
+		{
+			     if (it->first == "border-top-width")	 applyBorderWidth(it->second, &style.BorderTopWidth, current.BorderTopWidth, current.FontSize);
+			else if (it->first == "border-top-color")	 applyBorderColor(it->second, &style.BorderTopColor, current.BorderTopColor, current.TextColor);
+			else if (it->first == "border-top-style")	 applyLineStyle(it->second, &style.BorderTopStyle, current.BorderTopStyle);
+			else if (it->first == "border-right-width")	 applyBorderWidth(it->second, &style.BorderRightWidth, current.BorderRightWidth, current.FontSize);
+			else if (it->first == "border-right-color")	 applyBorderColor(it->second, &style.BorderRightColor, current.BorderRightColor, current.TextColor);
+			else if (it->first == "border-right-style")	 applyLineStyle(it->second, &style.BorderRightStyle, current.BorderRightStyle);
+			else if (it->first == "border-bottom-width") applyBorderWidth(it->second, &style.BorderBottomWidth, current.BorderBottomWidth, current.FontSize);
+			else if (it->first == "border-bottom-color") applyBorderColor(it->second, &style.BorderBottomColor, current.BorderBottomColor, current.TextColor);
+			else if (it->first == "border-bottom-style") applyLineStyle(it->second, &style.BorderBottomStyle, current.BorderBottomStyle);
+			else if (it->first == "border-left-width")	 applyBorderWidth(it->second, &style.BorderLeftWidth, current.BorderLeftWidth, current.FontSize);
+			else if (it->first == "border-left-color")	 applyBorderColor(it->second, &style.BorderLeftColor, current.BorderLeftColor, current.TextColor);
+			else if (it->first == "border-left-style")	 applyLineStyle(it->second, &style.BorderLeftStyle, current.BorderLeftStyle);
 			else
 			if (it->first == "font-style")
 			{
@@ -864,6 +945,7 @@ namespace NLGUI
 			style.StrikeThrough = current.StrikeThrough;
 	}
 
+	// ***************************************************************************
 	void CCssStyle::parseBackgroundShorthand(const std::string &value, CStyleParams &style) const
 	{
 		// background: url(image.jpg) top center / 200px 200px no-repeat fixed padding-box content-box red;
@@ -1198,6 +1280,233 @@ namespace NLGUI
 		}
 	}
 
+	// ***************************************************************************
+	bool CCssStyle::getShorthandIndices(const uint32 size, uint8 &t, uint8 &r, uint8 &b, uint8 &l) const
+	{
+		if (size == 0 || size > 4) return false;
+
+		if (size == 1)
+		{
+			t = r = b = l = 0;
+		}
+		else if (size == 2)
+		{
+			t = b = 0;
+			r = l = 1;
+		}
+		else if (size == 3)
+		{
+			t = 0;
+			r = l = 1;
+			b = 2;
+		}
+		else // size == 4
+		{
+			t = 0;
+			r = 1;
+			b = 2;
+			l = 3;
+		}
+
+		return true;
+	}
+
+	// ***************************************************************************
+	bool CCssStyle::tryBorderWidthShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const
+	{
+		std::vector<std::string> parts;
+		NLMISC::splitString(toLower(value), " ", parts);
+		float tmpf;
+		std::string unit;
+
+		// verify that parts are valid
+		uint8 maxSize  = (prop == "border" || prop == "border-width") ? 4 : 1;
+		bool hasTop    = (prop == "border" || prop == "border-width" || prop == "border-top"    || prop == "border-top-width");
+		bool hasRight  = (prop == "border" || prop == "border-width" || prop == "border-right"  || prop == "border-right-width");
+		bool hasBottom = (prop == "border" || prop == "border-width" || prop == "border-bottom" || prop == "border-bottom-width");
+		bool hasLeft   = (prop == "border" || prop == "border-width" || prop == "border-left"   || prop == "border-left-width");
+		if (parts.size() > maxSize || (!hasTop && !hasRight && !hasBottom && !hasLeft))
+		{
+			return false;
+		}
+
+		for(uint i = 0; i< parts.size(); ++i)
+		{
+			if (parts[i] != "inherit" && parts[i] != "thin" && parts[i] != "medium" && parts[i] != "thick"
+				&& !getCssLength(tmpf, unit, parts[i].c_str()))
+			{
+				return false;
+			}
+		}
+
+		uint8 t, r, b, l;
+		if (!getShorthandIndices(parts.size(), t, r, b, l)) return false;
+		if (hasTop) style.StyleRules["border-top-width"] = parts[t];
+		if (hasRight) style.StyleRules["border-right-width"] = parts[r];
+		if (hasBottom) style.StyleRules["border-bottom-width"] = parts[b];
+		if (hasLeft) style.StyleRules["border-left-width"] = parts[l];
+
+		return true;
+	}
+	// ***************************************************************************
+	bool CCssStyle::tryBorderStyleShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const
+	{
+		std::vector<std::string> parts;
+		NLMISC::splitString(toLower(value), " ", parts);
+
+		// verify that parts are valid
+		uint8 maxSize  = (prop == "border" || prop == "border-style") ? 4 : 1;
+		bool hasTop    = (prop == "border" || prop == "border-style" || prop == "border-top"    || prop == "border-top-style");
+		bool hasRight  = (prop == "border" || prop == "border-style" || prop == "border-right"  || prop == "border-right-style");
+		bool hasBottom = (prop == "border" || prop == "border-style" || prop == "border-bottom" || prop == "border-bottom-style");
+		bool hasLeft   = (prop == "border" || prop == "border-style" || prop == "border-left"   || prop == "border-left-style");
+		if (parts.size() > maxSize || (!hasTop && !hasRight && !hasBottom && !hasLeft))
+		{
+			return false;
+		}
+
+		const uint nbValues = 10;
+		std::string values[nbValues] = {"none", "hidden", "dotted", "dashed",
+			"solid", "double", "groove", "ridge", "inset", "outset"};
+
+		for(uint i = 0; i < parts.size(); ++i)
+		{
+			bool found = false;
+			for(uint iValue = 0; iValue < nbValues; ++iValue)
+			{
+				if (parts[i] == values[iValue])
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if (!found)
+			{
+				// invalid rule
+				return false;
+			}
+		}
+
+		uint8 t, r, b, l;
+		if (!getShorthandIndices(parts.size(), t, r, b, l)) return false;
+		if (hasTop) style.StyleRules["border-top-style"] = parts[t];
+		if (hasRight) style.StyleRules["border-right-style"] = parts[r];
+		if (hasBottom) style.StyleRules["border-bottom-style"] = parts[b];
+		if (hasLeft) style.StyleRules["border-left-style"] = parts[l];
+
+		return true;
+	}
+	// ***************************************************************************
+	bool CCssStyle::tryBorderColorShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const
+	{
+		std::vector<std::string> parts;
+		NLMISC::splitString(toLower(value), " ", parts);
+		CRGBA color;
+
+		// verify that parts are valid
+		uint8 maxSize  = (prop == "border" || prop == "border-color") ? 4 : 1;
+		bool hasTop    = (prop == "border" || prop == "border-color" || prop == "border-top"    || prop == "border-top-color");
+		bool hasRight  = (prop == "border" || prop == "border-color" || prop == "border-right"  || prop == "border-right-color");
+		bool hasBottom = (prop == "border" || prop == "border-color" || prop == "border-bottom" || prop == "border-bottom-color");
+		bool hasLeft   = (prop == "border" || prop == "border-color" || prop == "border-left"   || prop == "border-left-color");
+		if (parts.size() > maxSize || (!hasTop && !hasRight && !hasBottom && !hasLeft))
+		{
+			return false;
+		}
+
+		for(uint i = 0; i< parts.size(); ++i)
+		{
+			if (!scanHTMLColor(parts[i].c_str(), color) && parts[i] != "currentcolor" && parts[i] != "inherit")
+				return false;
+		}
+
+		uint8 t, r, b, l;
+		if (!getShorthandIndices(parts.size(), t, r, b, l)) return false;
+		if (hasTop) style.StyleRules["border-top-color"] = parts[t];
+		if (hasRight) style.StyleRules["border-right-color"] = parts[r];
+		if (hasBottom) style.StyleRules["border-bottom-color"] = parts[b];
+		if (hasLeft) style.StyleRules["border-left-color"] = parts[l];
+
+		return true;
+	}
+
+	// ***************************************************************************
+	void CCssStyle::parseBorderShorthand(const std::string &value, CStyleParams &style, const std::string &prop) const
+	{
+		// border: 1px solid #000;
+		bool hasTop    = (prop == "border" || prop == "border-top");
+		bool hasRight  = (prop == "border" || prop == "border-right");
+		bool hasBottom = (prop == "border" || prop == "border-bottom");
+		bool hasLeft   = (prop == "border" || prop == "border-left");
+
+		bool foundWidth = false;
+		bool foundStyle = false;
+		bool foundColor = false;
+
+		CStyleParams borderStyle;
+		std::vector<std::string> parts;
+		NLMISC::splitString(toLower(value), " ", parts);
+
+		for(uint index = 0; index < parts.size(); ++index)
+		{
+			bool matched = false;
+			if (!foundWidth)
+			{
+				matched = foundWidth = tryBorderWidthShorthand(parts[index], borderStyle, prop);
+			}
+
+			if (!matched && !foundStyle)
+			{
+				matched = foundStyle = tryBorderStyleShorthand(parts[index], borderStyle, prop);
+			}
+
+			if (!matched && !foundColor)
+			{
+				matched = foundColor = tryBorderColorShorthand(parts[index], borderStyle, prop);
+			}
+
+			// invalid rule if nothing gets matched
+			if (!matched)
+			{
+				return;
+			}
+		}
+
+		// apply rules that are present
+		TStyle::const_iterator it = borderStyle.StyleRules.begin();
+		while(it != borderStyle.StyleRules.end())
+		{
+			style.StyleRules[it->first] = it->second;
+			++it;
+		}
+
+		// reset those not present
+		if (!foundWidth)
+		{
+			if (hasTop) style.StyleRules["border-top-width"] = "medium";
+			if (hasRight) style.StyleRules["border-right-width"] = "medium";
+			if (hasBottom) style.StyleRules["border-bottom-width"] = "medium";
+			if (hasLeft) style.StyleRules["border-left-width"] = "medium";
+		}
+		//
+		if (!foundStyle)
+		{
+			if (hasTop) style.StyleRules["border-top-style"] = "none";
+			if (hasRight) style.StyleRules["border-right-style"] = "none";
+			if (hasBottom) style.StyleRules["border-bottom-style"] = "none";
+			if (hasLeft) style.StyleRules["border-left-style"] = "none";
+		}
+		//
+		if (!foundColor)
+		{
+			if (hasTop) style.StyleRules["border-top-color"] = "currentcolor";
+			if (hasRight) style.StyleRules["border-right-color"] = "currentcolor";
+			if (hasBottom) style.StyleRules["border-bottom-color"] = "currentcolor";
+			if (hasLeft) style.StyleRules["border-left-color"] = "currentcolor";
+		}
+	}
+
 	// ***************************************************************************
 	void CCssStyle::applyCssMinMax(sint32 &width, sint32 &height, sint32 minw, sint32 minh, sint32 maxw, sint32 maxh) const
 	{

code/nel/src/gui/group_html.cpp

@@ -6187,7 +6187,8 @@ namespace NLGUI
 		// width: 5em, height: 1em
 		uint32 width = _Style.Current.Width > -1 ? _Style.Current.Width : _Style.Current.FontSize * 5;
 		uint32 height = _Style.Current.Height > -1 ? _Style.Current.Height : _Style.Current.FontSize;
-		uint32 border = _Style.Current.BorderWidth > -1 ? _Style.Current.BorderWidth : 0;
+		// FIXME: only using border-top
+		uint32 border = _Style.Current.BorderTopWidth > -1 ? _Style.Current.BorderTopWidth : 0;
 
 		uint barw = (uint) (width * meter.getValueRatio());
 		CRGBA bgColor = meter.getBarColor(elm, _Style);
@@ -6402,7 +6403,8 @@ namespace NLGUI
 		// width: 10em, height: 1em
 		uint32 width = _Style.Current.Width > -1 ? _Style.Current.Width : _Style.Current.FontSize * 10;
 		uint32 height = _Style.Current.Height > -1 ? _Style.Current.Height : _Style.Current.FontSize;
-		uint32 border = _Style.Current.BorderWidth > -1 ? _Style.Current.BorderWidth : 0;
+		// FIXME: only using border-top
+		uint32 border = _Style.Current.BorderTopWidth > -1 ? _Style.Current.BorderTopWidth : 0;
 
 		uint barw = (uint) (width * progress.getValueRatio());
 		CRGBA bgColor = progress.getBarColor(elm, _Style);
@@ -6554,9 +6556,10 @@ namespace NLGUI
 		else if (elm.hasNonEmptyAttribute("width"))
 			getPercentage (table->ForceWidthMin, table->TableRatio, elm.getAttribute("width").c_str());
 
-		if (_Style.hasStyle("border") || _Style.hasStyle("border-width"))
+		if (_Style.hasStyle("border") || _Style.hasStyle("border-width") || _Style.hasStyle("border-top-width"))
 		{
-			table->Border = _Style.Current.BorderWidth;
+			// FIXME: only using border-top
+			table->Border = _Style.Current.BorderTopWidth;
 		}
 		else if (elm.hasAttribute("border"))
 		{