Merge with develop

--HG--
branch : compatibility-develop

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

@@ -134,6 +134,12 @@ namespace NLGUI
 		void getStyleParams(const std::string &styleString, CStyleParams &style, const CStyleParams &current) const;
 		void getStyleParams(const TStyle &styleRules, CStyleParams &style, const CStyleParams &current) const;
 
+		// extract from styleRules into style.StyleRules (expand shorthand, normalize, calculate current font-size)
+		void normalize(const TStyle &styleRules, CStyleParams &style, const CStyleParams &current) const;
+
+		// apply style.StyleRyles
+		void apply(CStyleParams &style, const CStyleParams &current) const;
+
 		// merge src into dest by overwriting key in dest
 		void merge(TStyle &dst, const TStyle &src) const;
 

code/nel/src/gui/css_style.cpp

@@ -332,10 +332,18 @@ namespace NLGUI
 			return;
 		}
 
-		// first pass:
+		normalize(styleRules, style, current);
+		apply(style, current);
+	}
+
+	// first pass
 	// - get font-size for 'em' sizes
 	// - split shorthand to its parts
 	// - get TextColor value that could be used for 'currentcolor'
+	// - normalize values
+	void CCssStyle::normalize(const TStyle &styleRules, CStyleParams &style, const CStyleParams &current) const
+	{
+		TStyle::const_iterator it;
 		for (it=styleRules.begin(); it != styleRules.end(); ++it)
 		{
 			// update local copy of applied style
@@ -407,6 +415,7 @@ namespace NLGUI
 				}
 				else
 				{
+					float tmpf;
 					std::string unit;
 					if (getCssLength(tmpf, unit, it->second.c_str()))
 					{
@@ -428,10 +437,39 @@ namespace NLGUI
 			{
 				parseBackgroundShorthand(it->second, style);
 			}
+			else
+			if (it->first == "background-repeat")
+			{
+				// old ryzom specific value
+				if (it->second == "1")
+					style.StyleRules[it->first] = "repeat";
+			}
+			else
+			if (it->first == "background-scale")
+			{
+				// replace old ryzom specific rule with background-size
+				if (it->second != "1")
+				{
+					style.StyleRules["background-size"] = "auto";
+				}
+				else
+				{
+					style.StyleRules["background-size"] = "100%";
 				}
 
-		// second pass: rest of style
+				TStyle::iterator pos = style.StyleRules.find(it->first);
-		for (it=styleRules.begin(); it != styleRules.end(); ++it)
+				if (pos != style.StyleRules.end())
+					style.StyleRules.erase(pos);
+			}
+		}
+	}
+
+	// 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" || it->first == "border-width")
 			{
@@ -458,6 +496,7 @@ namespace NLGUI
 				}
 				else
 				{
+					float tmpf;
 					std::string unit;
 					if (getCssLength(tmpf, unit, it->second.c_str()))
 					{
@@ -767,6 +806,42 @@ namespace NLGUI
 				else
 					scanHTMLColor(it->second.c_str(), style.BackgroundColorOver);
 			}
+			else
+			if (it->first == "background-image")
+			{
+				// normalize
+				std::string image = trim(it->second);
+				if (toLower(image.substr(0, 4)) == "url(")
+				{
+					image = image.substr(4, image.size()-5);
+				}
+				style.StyleRules[it->first] = trimQuotes(image);
+			}
+			else
+			if (it->first == "background-repeat")
+			{
+				// normalize
+				std::string val = toLower(trim(it->second));
+				std::vector<std::string> parts;
+				NLMISC::splitString(val, " ", parts);
+				// check for "repeat repeat"
+				if (parts.size() == 2 && parts[0] == parts[1])
+					val = parts[0];
+
+				style.StyleRules[it->first] = val;
+			}
+			else
+			if (it->first == "background-size")
+			{
+				// normalize
+				std::string val = toLower(trim(it->second));
+				std::vector<std::string> parts;
+				NLMISC::splitString(val, " ", parts);
+				if (parts.size() == 2 && parts[0] == parts[1])
+					val = parts[0];
+
+				style.StyleRules[it->first] = val;
+			}
 		}
 
 		// if outer element has underline set, then inner element cannot remove it
@@ -795,47 +870,169 @@ namespace NLGUI
 			"background-attachment", "background-origin", "background-clip", "background-color"};
 		std::string values[nbProps];
 		bool found[nbProps] = {false};
-
+		bool bgClipFound = false;
+		std::string bgClipValue;
+		std::string bgPositionX;
+		std::string bgPositionY;
 
 		uint partIndex = 0;
 		std::vector<std::string> parts;
 		std::vector<std::string>::iterator it;
 		// FIXME: this will fail if url() contains ' ' chars
+		// FIXME: this will also fail on 'background: rgb(255, 0, 0)'
 		NLMISC::splitString(value, " ", parts);
 
 		bool failed = false;
-		for(uint index = 0; index < parts.size(); index++)
+		bool allowSize = false;
+		uint index = 0;
+		while(!failed && index < parts.size())
 		{
-			const std::string val = toLower(trim(parts[index]));
+			std::string val = toLower(parts[index]);
-
+			bool matches = false;
 			for(uint i = 0; i < nbProps; i++)
 			{
-				if (found[i])
+				if (found[i]) continue;
-				{
-					continue;
-				}
 
 				if (props[i] == "background-image")
 				{
 					if (val.substr(0, 4) == "url(")
 					{
+						matches = true;
+						found[i] = true;
 						// use original value as 'val' is lowercase
 						values[i] = parts[index];
-						found[i] = true;
 					}
 				}
 				else if (props[i] == "background-position")
 				{
-					// TODO:
+					uint next = index;
+					bool loop = false;
+					do
+					{
+						float fval;
+						std::string unit;
+
+						// first loop -> true
+						// second loop -> false && break
+						loop = !loop;
+
+						val = toLower(parts[next]);
+						if (val == "center")
+						{
+							if (bgPositionX.empty()) bgPositionX = "center";
+							if (bgPositionY.empty()) bgPositionY = "center";
+							// consume 'center'
+							next++;
+						}
+						else if (val == "left" || val == "right")
+						{
+							bgPositionX = val;
+							// consume 'left|right'
+							next++;
+							if(next < parts.size() && getCssLength(fval, unit, parts[next]))
+							{
+								bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
+								// consume css length
+								next++;
+							}
+						}
+						else if (val == "top" || val == "bottom")
+						{
+							bgPositionY = val;
+							// consume top|bottom
+							next++;
+							if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+							{
+								bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
+								// consume css length
+								next++;
+							}
+						}
+					} while (loop);
+
+					//
+					if (!bgPositionX.empty() && !bgPositionY.empty())
+					{
+						matches = true;
+						found[i] = true;
+						// consume position values if there were any
+						index = next-1;
+
+						// look ahead to see if size is next
+						if (next < parts.size() && parts[next] == "/")
+							allowSize = true;
+					}
 				}
 				else if (props[i] == "background-size")
 				{
-					// TODO: [<length-percentage> | auto ]{1,2} cover | contain
+					if (allowSize && val == "/")
+					{
+						uint next = index + 1;
+						if (next < parts.size())
+						{
+							val = toLower(parts[next]);
+							if (val == "cover" || val == "contain")
+							{
+								matches = true;
+								found[i] = true;
+								values[i] = val;
+								index = next;
+							}
+							else
+							{
+								float fval;
+								std::string unit;
+								std::string h, v;
+
+								if (val == "auto" || getCssLength(fval, unit, val))
+								{
+									if (val == "auto")
+										h = v = "auto";
+									else
+										h = v = toString("%.0f%s", fval, unit.c_str());
+
+									next++;
+									if (next < parts.size())
+									{
+										val = toLower(parts[next]);
+										if (val == "auto")
+											v = "auto";
+										else if (getCssLength(fval, unit, val))
+											v = toString("%.0f%s", fval, unit.c_str());
+										else
+											next--; // not size token
+									}
+									else
+									{
+										// not size token
+										next--;
+									}
+								}
+
+								if (!h.empty() && !v.empty())
+								{
+									matches = true;
+									found[i] = true;
+									values[i] = h + " " + v;
+									index = next;
+								}
+							}
+						}
+						else
+						{
+							// no size, just '/'
+							failed = true;
+							break;
+						}
+					}
 				}
 				else if (props[i] == "background-repeat")
 				{
 					if (val == "repeat-x" || val == "repeat-y" || val == "repeat" || val == "space" || val == "round" || val == "no-repeat")
 					{
+						matches = true;
+						found[i] = true;
+
 						if (val == "repeat-x")
 						{
 							values[i] = "repeat no-repeat";
@@ -848,63 +1045,104 @@ namespace NLGUI
 						{
 							std::string horiz = val;
 							std::string vert = val;
-							if (index+1 < parts.size())
+							uint next = index + 1;
+							if (next < parts.size())
 							{
-								std::string next = toLower(trim(parts[index+1]));
+								val = toLower(parts[next]);
-								if (next == "repeat" || next == "space" || next == "round" || next == "no-repeat")
+								if (val == "repeat" || val == "space" || val == "round" || val == "no-repeat")
 								{
-									vert = next;
+									vert = val;
-									index++;
+									index = next;
 								}
 							}
-							
+							if (vert == horiz)
+								values[i] = vert;
+							else
 								values[i] = horiz + " " + vert;
 						}
-
-						found[i] = true;
 					}
 				}
 				else if (props[i] == "background-attachment")
 				{
-					// TODO: scroll | fixed | local
+					if (val == "scroll" || val == "fixed" || val == "local")
+					{
+						matches = true;
+						found[i] = true;
+						values[i] = val;
+					}
 				}
-				else if (props[i] == "background-origin" || props[i] == "background-clip")
+				else if (props[i] == "background-origin")
 				{
-					// same values for both
 					if (val == "padding-box" || val == "border-box" || val == "content-box")
 					{
+						matches = true;
+						found[i] = true;
 						values[i] = val;
+
+						// first time background-origin is set, also set background-clip
+						if (!bgClipFound)
+							bgClipValue = val;
+					}
+				}
+				else if (props[i] == "background-clip")
+				{
+					if (val == "text" || val == "padding-box" || val == "border-box" || val == "content-box")
+					{
+						matches = true;
 						found[i] = true;
+						bgClipFound = true;
+						bgClipValue = val;
 					}
 				}
 				else if (props[i] == "background-color")
 				{
 					CRGBA color;
-					if (!scanHTMLColor(val.c_str(), color))
+					if (val == "transparent" || val == "currentcolor" || scanHTMLColor(val.c_str(), color))
 					{
-						failed = true;
+						matches = true;
-						break;
+						found[i] = true;
-					}
 						values[i] = val;
-					// color should come as last item
-					break;
 					}
 				}
+
+				// prop was found and parsed
+				if (found[i])
+					break;
+			}
+			failed = !matches;
+
+			index++;
 		}
 
 		// invalidate whole rule
 		if (failed)
 		{
-			return;
+			bgClipFound = false;
+			for(uint i = 0; i < nbProps; i++)
+			{
+				found[i] = false;
+			}
 		}
 
-		// apply found styles
+		// apply found styles or use default
 		for(uint i = 0; i < nbProps; i++)
 		{
 			if (found[i])
+			{
+				if (props[i] == "background-position")
+				{
+					style.StyleRules["background-position-x"] = bgPositionX;
+					style.StyleRules["background-position-y"] = bgPositionY;
+				}
+				else if (props[i] == "background-clip")
+				{
+					style.StyleRules["background-clip"] = bgClipValue;
+				}
+				else
 				{
 					style.StyleRules[props[i]] = values[i];
 				}
+			}
 			else
 			{
 				// fill in default if one is set
@@ -914,27 +1152,32 @@ namespace NLGUI
 				}
 				else if (props[i] == "background-position")
 				{
-					//style.StyleRules[props[i]] = "0% 0%";
+					style.StyleRules[props[i]] = "0% 0%";
+					style.StyleRules["background-position-x"] = "left 0%";
+					style.StyleRules["background-position-y"] = "top 0%";
 				}
 				else if (props[i] == "background-size")
 				{
-					//style.StyleRules[props[i]] = "auto auto";
+					style.StyleRules[props[i]] = "auto auto";
 				}
 				else if (props[i] == "background-repeat")
 				{
-					style.StyleRules[props[i]] = "repeat repeat";
+					style.StyleRules[props[i]] = "repeat";
 				}
 				else if(props[i] == "background-attachment")
 				{
-					//style.StyleRules[props[i]] = "scroll";
+					style.StyleRules[props[i]] = "scroll";
 				}
 				else if(props[i] == "background-origin")
 				{
-					//style.StyleRules[props[i]] = "padding-box";
+					style.StyleRules[props[i]] = "padding-box";
 				}
 				else if (props[i] == "background-clip")
 				{
-					//style.StyleRules[props[i]] = "border-box";
+					if (bgClipFound)
+						style.StyleRules[props[i]] = bgClipValue;
+					else
+						style.StyleRules[props[i]] = "border-box";
 				}
 				else if (props[i] == "background-color")
 				{

code/nel/src/gui/group_html.cpp

@@ -5059,15 +5059,9 @@ namespace NLGUI
 		// non-empty image
 		if (_Style.hasStyle("background-image"))
 		{
-			// value '1' and 'background-scale' are ryzom only
+			bool repeat = _Style.checkStyle("background-repeat", "repeat");
-			bool repeat = _Style.checkStyle("background-repeat", "1") || _Style.checkStyle("background-repeat", "repeat");
+			bool scale = _Style.checkStyle("background-size", "100%");
-			bool scale = _Style.checkStyle("background-scale", "1") || _Style.checkStyle("background-size", "100% 100%");
+			std::string image = _Style.getStyle("background-image");
-			std::string image = trim(_Style.getStyle("background-image"));
-			string::size_type texExt = toLower(image).find("url(");
-			if (texExt != string::npos)
-			{
-				image = image.substr(texExt+4, image.size()-texExt-5);
-			}
 			if (!image.empty())
 			{
 				if (root)
@@ -5077,7 +5071,7 @@ namespace NLGUI
 				// TODO: else
 
 				// default background color is transparent, so image does not show
-				if (!_Style.hasStyle("background-color"))
+				if (!_Style.hasStyle("background-color") || _Style.checkStyle("background-color", "transparent"))
 				{
 					_Style.applyStyle("background-color: #fff;");
 				}
@@ -6325,29 +6319,16 @@ namespace NLGUI
 
 		_Cells.back() = new CGroupCell(CViewBase::TCtorParam());
 
-		if (_Style.checkStyle("background-repeat", "1") || _Style.checkStyle("background-repeat", "repeat"))
+		if (_Style.checkStyle("background-repeat", "repeat"))
 			_Cells.back()->setTextureTile(true);
 
-		if (_Style.checkStyle("background-scale", "1") || _Style.checkStyle("background-size", "100% 100%"))
+		if (_Style.checkStyle("background-size", "100%"))
 			_Cells.back()->setTextureScale(true);
 
 		if (_Style.hasStyle("background-image"))
 		{
 			string image = _Style.getStyle("background-image");
-
-			string::size_type texExt = toLower(image).find("url(");
-			// Url image
-			if (texExt != string::npos)
-			{
-				// Remove url()
-				image = image.substr(4, image.size()-5);
 			addImageDownload(image, _Cells.back());
-			// Image in BNP
-			}
-			else
-			{
-				_Cells.back()->setTexture(image);
-			}
 		}
 
 		if (elm.hasNonEmptyAttribute("colspan"))