Merge branch 'better-chat-ui'

@@ -18,7 +18,6 @@
 -- darkgod@te4.org
 
 require "engine.class"
-require "engine.dialogs.Chat"
 require "Json2"
 local slt2 = require "slt2"
 
@@ -26,6 +25,7 @@ local slt2 = require "slt2"
 -- @classmod engine.Chat
 module(..., package.seeall, class.make)
 
+_M.chat_dialog = "engine.dialogs.Chat"
 _M.chat_context_strings = {"#{italic}##LIGHT_GREEN#", "#LAST##{normal}#"}
 _M.chat_bold_strings = {"#{bold}#", "#{normal}#"}
 
@@ -413,7 +413,7 @@ function _M:invoke(id)
 	local hd = {"Chat:invoke", id = id or self.default_id }
 	self:triggerHook(hd)
 
-	local d = engine.dialogs.Chat.new(self, hd.id, self.force_dialog_width or 500)
+	local d = require(self.chat_dialog).new(self, hd.id, self.force_dialog_width or 500)
 	game:registerDialog(d)
 	return d
 end

@@ -37,17 +37,29 @@ function _M:init(chat, id, width)
 	self.npc = chat.npc
 	self.player = chat.player
 	self.no_offscreen = "bottom"
-	Dialog.init(self, self.npc.getName and self.npc:getName() or self.npc.name, width or 500, 400)
+	Dialog.init(self, self.force_title or (self.npc.getName and self.npc:getName() or self.npc.name), width or 500, 400)
 
+	self:generateList()
+
+	self:makeUI()
+
+	self.key:addCommands{
+		__TEXTINPUT = function(c)
+			if self.list and self.list.chars[c] then
+				self:use(self.list[self.list.chars[c]])
+			end
+		end,
+	}
+end
+
+function _M:makeUI()
 	local xoff = 0
 	if self.show_portraits then
 		xoff = 64
 	end
 
-	self:generateList()
-
-	self.c_desc = Textzone.new{font=chat.dialog_text_font, width=self.iw - 10 - xoff, height=1, auto_height=true, text=self.text.."\n"}
-	self.c_list = VariableList.new{font=chat.dialog_answer_font, width=self.iw - 10 - xoff, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
+	self.c_desc = Textzone.new{font=self.chat.dialog_text_font, width=self.iw - 10 - xoff, height=1, auto_height=true, text=self.text.."\n", can_focus=false}
+	self.c_list = VariableList.new{font=self.chat.dialog_answer_font, width=self.iw - 10 - xoff, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
 
 	local uis = {
 		{left=0, top=0, ui=self.c_desc},
@@ -64,14 +76,6 @@ function _M:init(chat, id, width)
 	self:loadUI(uis)
 	self:setFocus(self.c_list)
 	self:setupUI(false, true)
-
-	self.key:addCommands{
-		__TEXTINPUT = function(c)
-			if self.list and self.list.chars[c] then
-				self:use(self.list[self.list.chars[c]])
-			end
-		end,
-	}
 end
 
 function _M:on_register()
@@ -121,7 +125,7 @@ function _M:use(item, a)
 end
 
 function _M:regen()
-	local d = new(self.chat, self.cur_id, self.force_width)
+	local d = require(self.chat.chat_dialog).new(self.chat, self.cur_id, self.force_width)
 	d.__showup = false
 	game:replaceDialog(self, d)
 	self.next_dialog = d

@@ -29,6 +29,8 @@ function _M:init(t)
 	self.actor = assert(t.actor, "no actorframe actor")
 	self.w = assert(t.w, "no actorframe w")
 	self.h = assert(t.h, "no actorframe h")
+	self.allow_cb = t.allow_cb
+	self.allow_shader = t.allow_shader
 	self.tiles = t.tiles or Tiles.new(self.w, self.h, nil, nil, true, nil)
 
 	Base.init(self, t)
@@ -45,9 +47,9 @@ function _M:display(x, y, nb_keyframes, ox, oy)
 	local o = self.actor
 	if o and o.toScreen then
 		if o.image then
-			o:toScreen(self.tiles, x, y, self.w, self.h)
+			o:toScreen(self.tiles, x, y, self.w, self.h, nil, self.allow_cb, self.allow_shader)
 		elseif o.image and o.add_mos then
-			o:toScreen(self.tiles, x, y - h, self.w, self.h * 2)
+			o:toScreen(self.tiles, x, y - h, self.w, self.h * 2, nil, self.allow_cb, self.allow_shader)
 		end
 	end
 

@@ -399,6 +399,8 @@ function _M:init(title, w, h, x, y, alpha, font, showup, skin)
 	self.frame.ox2 = self.frame.ox2 or conf.frame_ox2
 	self.frame.oy1 = self.frame.oy1 or conf.frame_oy1
 	self.frame.oy2 = self.frame.oy2 or conf.frame_oy2
+	if not self.force_min_w and conf.force_min_w then self.force_min_w = conf.force_min_w end
+	if not self.force_min_h and conf.force_min_h then self.force_min_h = conf.force_min_h end
 
 	if self.frame.dialog_h_middles then
 		local t = type(self.frame.dialog_h_middles) == "table" and table.clone(self.frame.dialog_h_middles) or {}
@@ -589,6 +591,17 @@ function _M:setupUI(resizex, resizey, on_resize, addmw, addmh)
 
 		mh = mh + addh + 5 + 22 + 3 + (addmh or 0) + th + padding
 
+		if self.force_min_h then
+			mh = mh - self.frame.oy1 + self.frame.oy2
+			mh = math.max(mh, self.force_min_h)
+			mh = mh + self.frame.oy1 - self.frame.oy2
+		end
+		if self.force_min_w then
+			mw = mw - self.frame.ox1 + self.frame.ox2
+			mw = math.max(mw, self.force_min_w)
+			mw = mw + self.frame.ox1 - self.frame.ox2
+		end
+
 		if on_resize then on_resize(resizex and mw or self.w, resizey and mh or self.h) end
 		nw, nh = resizex and mw or self.w, resizey and mh or self.h
 	else

@@ -2078,11 +2078,14 @@ function _M:setupCommands()
 			print("===============")
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
+			package.loaded["engine.ui.Dialog"] = nil
 			package.loaded["engine.dialogs.Chat"] = nil
+			package.loaded["mod.dialogs.Chat"] = nil
+			package.loaded["mod.dialogs.elements.ChatPortrait"] = nil
 			package.loaded["engine.Chat"] = nil
 			local Chat = require "engine.Chat"
-			engine.dialogs.Chat.show_portraits = true
-			local chat = Chat.new("tareyal+test", game.player, game.player)
+			Chat.chat_dialog = "mod.dialogs.Chat"
+			local chat = Chat.new("tareyal+test", engine.Entity.new{name=_t"Imperium courrier", image="npc/undead_risen_mistress_vira.png"}, game.player)
 			chat:invoke()
 do return end
 			DamageType:get(DamageType.ACID).projector(game.player, game.player.x, game.player.y, DamageType.ACID, 100)

@@ -423,6 +423,7 @@ function _M:act()
 		if self:enoughEnergy() then
 			game.paused = true
 			if game.uiset.logdisplay:getNewestLine() ~= "" then game.log("") end
+			if config.settings.cheat then game.log("Game Turn %d", game.turn) end
 		end
 	elseif not self.player then
 		self:useEnergy()

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2019 Nicolas Casalini
+--
+-- 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 3 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, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+chat = {
+	frame_alpha = 1,
+	frame_darkness = 0.6,
+	frame_ox1 = -64,
+	frame_ox2 = 64,
+	frame_oy1 = -5,
+	frame_oy2 = 10,
+	-- force_min_w = 64 * 4,
+	-- force_min_h = 64 * 4,
+}

+-- TE4 - T-Engine 4
+-- Copyright (C) 2009 - 2019 Nicolas Casalini
+--
+-- 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 3 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, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Chat = require "engine.dialogs.Chat"
+local VariableList = require "engine.ui.VariableList"
+local Textzone = require "engine.ui.Textzone"
+local Separator = require "engine.ui.Separator"
+local ChatPortrait = require "mod.dialogs.elements.ChatPortrait"
+local Map = require "engine.Map"
+local Entity = require "engine.Entity"
+
+module(..., package.seeall, class.inherit(Chat))
+
+function _M:init(chat, id, width)
+	self.ui = "chat"
+	self.force_title = ""
+	self.force_min_h = 256
+
+	Chat.init(self, chat, id, math.max(width, game.w * 0.4))
+end
+
+function _M:makeUI()
+	self.c_desc = Textzone.new{has_box=true, ui="chat", font=self.chat.dialog_text_font, width=self.iw, height=1, auto_height=true, text=self.text, can_focus=false}
+	self.c_list = VariableList.new{font=self.chat.dialog_answer_font, width=self.iw, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
+	local npc_frame = ChatPortrait.new{ui="chat", actor=self:getActorPortrait(self.npc.chat_display_entity or self.npc)}
+	local player_frame = ChatPortrait.new{ui="chat", actor=self:getActorPortrait(self.player.chat_display_entity or self.player)}
+
+	local uis = {
+		{hcenter=0, top=-12, ui=self.c_desc},
+		{right=0, bottom=0, ui=self.c_list},
+		{left=-player_frame.w+self.frame.ox1-5, vcenter=-self.ix-4, ui=player_frame, ignore_size=true},
+		{right=-npc_frame.w-self.frame.ox2-5, vcenter=-self.ix-4, ui=npc_frame, ignore_size=true},
+	}
+
+	self:loadUI(uis)
+	self:setFocus(self.c_list)
+	self:setupUI(false, true, function(w, h)
+		self.force_x = game.w / 2 - w / 2
+		self.force_y = game.h - h - 20
+	end)
+end
+
+function _M:getActorPortrait(actor)
+	local actor = actor.replace_display or actor
+	
+	-- Moddable tiles are already portrait sized
+	if actor.moddable_tile and Map.tiles.no_moddable_tiles then return actor end
+
+	-- No need for anything special
+	if actor.image:find("^portrait/") then return actor end
+
+	-- Find the npc portrait
+	if actor.image == "invis.png" and actor.add_mos and actor.add_mos[1] and actor.add_mos[1].image and actor.add_mos[1].image:find("^npc/") and fs.exists("/data/gfx/shockbolt/"..actor.add_mos[1].image:gsub("^npc/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.add_mos[1].image:gsub("^npc/", "portrait/")}
+	elseif actor.image:find("^npc/") and fs.exists("/data/gfx/shockbolt/"..actor.image:gsub("^npc/", "portrait/")) then
+		return Entity.new{name=actor.name, image=actor.image:gsub("^npc/", "portrait/")}
+	end
+
+	-- Last resort, use it as it is
+	return actor
+end

+-- TE4 - T-Engine 4
+-- Copyright (C) 2009 - 2019 Nicolas Casalini
+--
+-- 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 3 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, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Tiles = require "engine.Tiles"
+local Base = require "engine.ui.Base"
+local ActorFrame = require "engine.ui.ActorFrame"
+
+--- A generic UI image
+-- @classmod engine.ui.Image
+module(..., package.seeall, class.inherit(Base))
+
+function _M:init(t)
+	assert(t.actor, "no ChatPortrait actor")
+	
+	self.name = t.actor.getName and t.actor:getName() or _t(t.actor.name)
+	if t.actor.moddable_tile then
+		self.actor_frame = ActorFrame.new{actor=t.actor, w=128, h=128, allow_cb=false, allow_shader=false}
+	elseif t.actor.image == "invis.png" and t.actor.add_mos and t.actor.add_mos[1] and t.actor.add_mos[1].image then
+		self.image = Tiles:loadImage(t.actor.add_mos[1].image)
+	else
+		self.image = Tiles:loadImage(t.actor.image)
+	end
+	if self.image then
+		local iw, ih = self.image:getSize()
+		if iw <= 64 then iw, ih = iw * 2, ih * 2 end
+		self.iw, self.ih = iw, ih
+		if self.image.getEmptyMargins then
+			local x1, x2, y1, y2 = self.image:getEmptyMargins()
+			self.iy = y1
+		else
+			self.iy = 0
+		end
+	else
+		self.iy = 0
+		self.iw, self.ih = 128, 128
+	end
+
+	Base.init(self, t)
+end
+
+function _M:generate()
+	self.mouse:reset()
+	self.key:reset()
+
+	self.front = self:getUITexture("ui/portrait_frame_front.png")
+	self.back = self:getUITexture("ui/portrait_frame_back.png")
+	self.w, self.h = self.front.w, self.front.h
+
+	if self.image then self.item = {self.image:glTexture(Tiles.sharp_scaling)} end
+
+	self.name_tex = self:drawFontLine(self.font, self.name, nil, 0xff, 0xee, 0xcb)
+end
+
+function _M:display(x, y, nb_keyframes, screen_x, screen_y)
+	self.back.t:toScreenFull(x, y, self.back.w, self.back.h, self.back.tw, self.back.th)
+	core.display.glScissor(true, screen_x + 15, screen_y + 15, 128, 192)
+	local dx, dy = x + 15 + (128 - self.iw) / 2, y + 15 + (192 - self.ih) / 2
+	if self.actor_frame then
+		self.actor_frame:display(dx, dy - self.iy)
+	elseif self.item then
+		self.item[1]:toScreen(dx, dy - self.iy, self.iw, self.ih)
+	end
+	core.display.glScissor(false)
+	self.front.t:toScreenFull(x, y, self.front.w, self.front.h, self.front.tw, self.front.th)
+
+	core.display.glScissor(true, screen_x + 4, screen_y + 229, 152, 23)
+	-- Center if it fits, left align is not
+	if self.name_tex.w <= 229 then
+		self:textureToScreen(self.name_tex, x + 80 - self.name_tex.w / 2, y + 240 - self.name_tex.h / 2)
+	else
+		self:textureToScreen(self.name_tex, x + 4, y + 240 - self.name_tex.h / 2)
+	end
+	core.display.glScissor(false)
+end

@@ -243,6 +243,7 @@ Store:loadStores("/data/general/stores/basic.lua")
 
 -- Configure chat dialogs
 require("engine.dialogs.Chat").show_portraits = true
+require("engine.Chat").chat_dialog = "mod.dialogs.Chat"
 
 -- Inventory tabs
 InventoryUI.default_tabslist = function(self)

@@ -1809,6 +1809,32 @@ static int sdl_load_image_mem(lua_State *L)
 	return 3;
 }
 
+static int sdl_find_empty_margins(lua_State *L) {
+	SDL_Surface **ss = (SDL_Surface**)auxiliar_checkclass(L, "sdl{surface}", 1);
+	SDL_Surface *s = *ss;
+
+	int x1 = s->w, x2 = 0, y1 = s->h, y2 = 0;
+
+	for (int x = 0; x < s->w; x++) {
+		for (int y = 0; y < s->h; y++) {
+			Uint32 *const target_pixel = (Uint32 *)((Uint8 *)s->pixels + y * s->pitch + x * s->format->BytesPerPixel);
+			Uint8 r, g, b, a;
+			SDL_GetRGBA(*target_pixel, s->format, &r, &g, &b, &a);
+			if (a != 0) {
+				if (x < x1) x1 = x;
+				if (y > x2) x2 = x;
+				if (y < y1) y1 = y;
+				if (y > y2) y2 = y;
+			}
+		}
+	}
+	lua_pushnumber(L, x1);
+	lua_pushnumber(L, x2);
+	lua_pushnumber(L, y1);
+	lua_pushnumber(L, y2);
+	return 4;
+}
+
 static int sdl_free_surface(lua_State *L)
 {
 	SDL_Surface **s = (SDL_Surface**)auxiliar_checkclass(L, "sdl{surface}", 1);
@@ -3534,6 +3560,7 @@ static const struct luaL_Reg sdl_surface_reg[] =
 	{"close", sdl_free_surface},
 	{"erase", sdl_surface_erase},
 	{"getSize", sdl_surface_get_size},
+	{"getEmptyMargins", sdl_find_empty_margins},
 	{"merge", sdl_surface_merge},
 	{"toScreen", sdl_surface_toscreen},
 	{"toScreenWithTexture", sdl_surface_toscreen_with_texture},