test

git-svn-id: http://svn.net-core.org/repos/t-engine4@3323 51575b47-30f0-44d4-a5cc-537603b46e54

@@ -32,9 +32,16 @@ function _M:init(actor, x, y, w, h, bgcolor, fontname, fontsize)
 	self.font = core.display.newFont(fontname or "/data/font/VeraMono.ttf", fontsize or 10)
 	self.font_h = self.font:lineSkip()
 	self.clics = {}
+	self.items = {}
+	self.cache = {}
+	setmetatable(self.cache, {__mode="v"})
 	self:resize(x, y, w, h)
 end
 
+function _M:enableShadow(v)
+	self.shadow = v
+end
+
 --- Resize the display area
 function _M:resize(x, y, w, h)
 	self.display_x, self.display_y = math.floor(x), math.floor(y)
@@ -55,6 +62,7 @@ function _M:resize(x, y, w, h)
 		for i = 0, w, fw do for j = 0, h, fh do
 			self.bg_surface:merge(fill, i, j)
 		end end
+		self.bg_texture, self.bg_texture_w, self.bg_texture_h = self.bg_surface:glTexture()
 	end
 end
 
@@ -82,6 +90,7 @@ function _M:display()
 	local x = 0
 	local y = 0
 	self.clics = {}
+	self.items = {}
 
 	for ii, ts in ipairs(hks) do
 		local s
@@ -114,9 +123,18 @@ function _M:display()
 		end
 
 		txt = ("%1d/%2d) %-"..(self.max_char_w-4-24).."s Key: %s"):format(a.hotkey_page, i - (a.hotkey_page-1) * 12, txt, ts[4])
-		local w, h = self.font:size(txt)
-		if self.cur_sel and self.cur_sel == i then self.surface:erase(0, 50, 120, nil, x, y, w+4, h+4) end
-		self.surface:drawStringBlended(self.font, txt, x+2, y+2, color[1], color[2], color[3])
+		local w, h, gen
+		if self.cache[txt] then
+			gen = self.cache[txt]
+			w, h = gen.fw, gen.fh
+		else
+			w, h = self.font:size(txt)
+			gen = self.font:draw(txt, self.w, color[1], color[2], color[3], true)[1]
+			gen.fw, gen.fh = w, h
+		end
+		gen.x, gen.y = x, y
+		gen.i = i
+		self.items[#self.items+1] = gen
 		self.clics[i] = {x,y,w+4,h+4}
 
 		if y + self.font_h * 2 > self.h then
@@ -126,14 +144,17 @@ function _M:display()
 			y = y + self.font_h
 		end
 	end
-
-	self.surface:updateTexture(self.texture)
-	return self.surface
 end
 
 function _M:toScreen()
 	self:display()
-	self.texture:toScreenFull(self.display_x, self.display_y, self.w, self.h, self.texture_w, self.texture_h)
+	if self.bg_texture then self.bg_texture:toScreenFull(self.display_x, self.display_y, self.w, self.h, self.bg_texture_w, self.bg_texture_h) end
+	for i = 1, #self.items do
+		local item = self.items[i]
+		if self.cur_sel == item.i then core.display.drawQuad(self.display_x + item.x, self.display_y + item.y, item.w, item.h, 0, 50, 120, 180) end
+		if self.shadow then item._tex:toScreenFull(self.display_x + item.x + 2, self.display_y + item.y + 2, item.w, item.h, item._tex_w, item._tex_h, 0, 0, 0, self.shadow) end
+		item._tex:toScreenFull(self.display_x + item.x, self.display_y + item.y, item.w, item.h, item._tex_w, item._tex_h)
+	end
 end
 
 --- Call when a mouse event arrives in this zone

@@ -41,6 +41,7 @@ function _M:init(x, y, w, h, max, fontname, fontsize, color, bgcolor)
 	self.scroll = 0
 	self.changed = true
 	self.cache = {}
+	setmetatable(self.cache, {__mode="v"})
 
 	self:resize(x, y, w, h)
 end

@@ -103,6 +103,7 @@ function _M:run()
 	self.logdisplay:enableShadow(0.6)
 	profile.chat:resize(0, self.h * 0.8 + 7, self.w * 0.5 - 46, self.h * 0.2 - 7, font, size, {255,255,255}, "/data/gfx/ui/message-log.png")
 	self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5 + 46, self.h * 0.8 + 7, self.w * 0.5 - 46, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", font_mono, size_mono)
+	self.hotkeys_display:enableShadow(0.6)
 	self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5 + 46, self.h * 0.8 + 7, self.w * 0.5 - 46, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", font_mono, size_mono)
 	self.tooltip = Tooltip.new(font_mono, size, {255,255,255}, {30,30,30,230})
 	self.tooltip2 = Tooltip.new(font_mono, size, {255,255,255}, {30,30,30,230})

@@ -526,12 +526,10 @@ static int sdl_font_draw(lua_State *L)
 	int r = luaL_checknumber(L, 4);
 	int g = luaL_checknumber(L, 5);
 	int b = luaL_checknumber(L, 6);
+	bool no_linefeed = lua_toboolean(L, 7);
 	int h = TTF_FontLineSkip(*f);
 	SDL_Color color = {r,g,b};
 
-	int space_w = 0, space_h = 0;
-	TTF_SizeUTF8(*f, " ", &space_w, &space_h);
-
 	Uint32 rmask, gmask, bmask, amask;
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 	rmask = 0xff000000; gmask = 0x00ff0000; bmask = 0x0000ff00; amask = 0x000000ff;
@@ -554,7 +552,14 @@ static int sdl_font_draw(lua_State *L)
 	{
 		if ((*next == '\n') || (*next == ' ') || (*next == '\0') || (*next == '#'))
 		{
-			stop = next - 1;
+			bool inced = FALSE;
+			if (*next == ' ' && *(next+1))
+			{
+				inced = TRUE;
+				stop = next;
+				next++;
+			}
+			else stop = next - 1;
 
 			// Make a surface for the word
 			char old = *next;
@@ -564,7 +569,7 @@ static int sdl_font_draw(lua_State *L)
 			else txt = TTF_RenderUTF8_Blended(*f, start, color);
 
 			// If we must do a newline, flush the previous word and the start the new line
-			if (force_nl || (txt && (size + txt->w + space_w > max_width)))
+			if (!no_linefeed && (force_nl || (txt && (size + txt->w > max_width))))
 			{
 				// Push it & reset the surface
 				font_make_texture_line(L, s, nb_lines);
@@ -581,9 +586,10 @@ static int sdl_font_draw(lua_State *L)
 //				printf("Drawing word '%s'\n", start);
 				SDL_SetAlpha(txt, 0, 0);
 				sdlDrawImage(s, txt, size, 0);
-				size += txt->w + space_w;
+				size += txt->w;
 			}
 			*next = old;
+			if (inced) next--;
 			start = next + 1;
 
 			// Force a linefeed