mosue over works on linked item again

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

game/engines/default/engine/Mouse.lua

@@ -33,21 +33,22 @@ end
 -- @param x coordinate of the click
 -- @param y coordinate of the click
 -- @param isup true if the key was released, false if pressed
-function _M:receiveMouse(button, x, y, isup)
+-- @param force_name if not nil only the zone with this name may trigger
+function _M:receiveMouse(button, x, y, isup, force_name)
 	self.status[button] = not isup
 	if not isup then return end
 
 	for i, m in ipairs(self.areas) do
-		if (not m.mode or m.mode.button) and (x >= m.x1 and x < m.x2 and y >= m.y1 and y < m.y2) then
+		if (not m.mode or m.mode.button) and (x >= m.x1 and x < m.x2 and y >= m.y1 and y < m.y2) and (not force_name or force_name == m.name) then
 			m.fct(button, x, y, nil, nil, x-m.x1, y-m.y1, "button")
 			break
 		end
 	end
 end
 
-function _M:receiveMouseMotion(button, x, y, xrel, yrel)
+function _M:receiveMouseMotion(button, x, y, xrel, yrel, force_name)
 	for i, m in ipairs(self.areas) do
-		if (not m.mode or m.mode.move) and (x >= m.x1 and x < m.x2 and y >= m.y1 and y < m.y2) then
+		if (not m.mode or m.mode.move) and (x >= m.x1 and x < m.x2 and y >= m.y1 and y < m.y2) and (not force_name or force_name == m.name) then
 			m.fct(button, x, y, xrel, yrel, x-m.x1, y-m.y1, "motion")
 			break
 		end
@@ -56,13 +57,13 @@ end
 
 --- Delegate an event from an other mouse handler
 -- if self.delegate_offset_x and self.delegate_offset_y are set hey will be used to change the actual coordinates
-function _M:delegate(button, mx, my, xrel, yrel, bx, by, event)
+function _M:delegate(button, mx, my, xrel, yrel, bx, by, event, name)
 	local ox, oy = (self.delegate_offset_x or 0), (self.delegate_offset_y or 0)
 	mx = mx - ox
 	my = my - oy
 
-	if event == "button" then self:receiveMouse(button, mx, my, true)
-	elseif event == "motion" then self:receiveMouseMotion(button, mx, my, xrel, yrel)
+	if event == "button" then self:receiveMouse(button, mx, my, true, name)
+	elseif event == "motion" then self:receiveMouseMotion(button, mx, my, xrel, yrel, name)
 	end
 end
 

game/engines/default/engine/Tooltip.lua

@@ -17,169 +17,6 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
---[[
-require "engine.class"
-local Map = require "engine.Map"
-
---- Displays a tooltip
-module(..., package.seeall, class.make)
-
-tiles = engine.Tiles.new(16, 16)
-
-function _M:init(fontname, fontsize, color, bgcolor, max)
-	self.color = color or {255,255,255}
-	self.bgcolor = bgcolor or {0,0,0}
-	self.bgcolor[4] = self.bgcolor[4] or 200
-	self.font = core.display.newFont(fontname or "/data/font/Vera.ttf", fontsize or 12)
-	self.font_h = self.font:lineSkip()
-	self.max = max or 300
-	self.changed = true
-	self.old_text = ""
-	self.old_tmx, self.old_tmy = -1,-1
-	self.old_turn = -1
-end
-
---- Set the tooltip text
-function _M:set(str, ...)
-	if type(str) == "string" then str = str:format(...):toTString()
-	else str = str:toTString() end
-	self.text, self.w = str:splitLines(self.max, self.font)
-	self.h = self.text:countLines() * self.font_h
-	self.w = math.min(self.w, self.max) + 8
-	self.h = self.h + 8
-	self.changed = true
-end
-
-function _M:drawWBorder(s, x, y, w)
-	for i = x, x + w do
-		s:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_8.png"), i, y)
-	end
-end
-
-function _M:erase()
-	self.surface = nil
-	self.texture = nil
-end
-
-function _M:display()
-	-- If nothing changed, return the same surface as before
-	if not self.changed then return self.surface end
-	self.changed = false
-
-	self.surface = core.display.newSurface(self.w, self.h)
-
-	-- Erase and the display the tooltip
-	self.surface:erase(self.bgcolor[1], self.bgcolor[2], self.bgcolor[3], self.bgcolor[4])
-
-	self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_7.png"), 0, 0)
-	self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_9.png"), self.w - 8, 0)
-	self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_1.png"), 0, self.h - 8)
-	self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_3.png"), self.w - 8, self.h - 8)
-	for i = 8, self.w - 9 do
-		self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_8.png"), i, 0)
-		self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_8.png"), i, self.h - 3)
-	end
-	for i = 8, self.h - 9 do
-		self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_4.png"), 0, i)
-		self.surface:merge(tiles:get(nil, 0,0,0, 0,0,0, "border_4.png"), self.w - 3, i)
-	end
-
-	self.text:drawOnSurface(self.surface, 100000, nil, self.font, 4, 4, self.color[1], self.color[2], self.color[3], true, function(v, w, h)
-		if v == "---" then
-			self:drawWBorder(self.surface, 4, 4 + h + 0.5 * self.font_h, self.w - 8)
-			return 0, h
-		end
-	end)
-
-	self.texture, self.texture_w, self.texture_h = self.surface:glTexture()
-end
-
-function _M:toScreen(x, y)
-	if self.texture then
-		self.texture:toScreenFull(x, y, self.w, self.h, self.texture_w, self.texture_h)
-	end
-end
-
---- Displays the tooltip at the given map coordinates
--- @param tmx the map coordinate to get tooltip from
--- @param tmy the map coordinate to get tooltip from
--- @param mx the screen coordinate to display at, if nil it will be computed from tmx
--- @param my the screen coordinate to display at, if nil it will be computed from tmy
--- @param text a text to display, if nil it will interrogate the map under the mouse using the "tooltip" property
-function _M:displayAtMap(tmx, tmy, mx, my, text)
-	if not mx then
-		mx, my = game.level.map:getTileToScreen(tmx, tmy)
-	end
-
-	if text then
-		if text ~= self.old_text then
-			if type(text) == "string" then
-				self:set("%s", text)
-			else
-				self:set(text)
-			end
-			self:display()
-			self.old_text = text
-		end
-	else
-		if self.old_tmx ~= tmx or self.old_tmy ~= tmy or (game.paused and self.old_turn ~= game.turn) then
-			self.old_text = ""
-			self.old_tmx, self.old_tmy = tmx, tmy
-			self.old_turn = game.turn
-			local tt = {}
-			local seen = game.level.map.seens(tmx, tmy)
-			local remember = game.level.map.remembers(tmx, tmy)
-			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
-			if #tt > 0 then
-				local ts = tstring{}
-				for i = 1, #tt do
-					ts:merge(tt[i]:toTString())
-					if i < #tt then ts:add(true, "---", true) end
-				end
-				self:set(ts)
-				self:display()
-			else
-				self:erase()
-			end
-		end
-	end
-
-	if self.texture then
---		mx = mx - self.w / 2 + game.level.map.tile_w / 2
---		my = my - self.h
-		if mx < 0 then mx = 0 end
-		if my < 0 then my = 0 end
-		if mx > game.w - self.w then mx = game.w - self.w end
-		if my > game.h - self.h then my = game.h - self.h end
-		self.last_display_x = mx
-		self.last_display_y = my
-		self.texture:toScreenFull(mx, my, self.w, self.h, self.texture_w, self.texture_h)
-	end
-end
-]]
--- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011 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 Base = require "engine.ui.Base"
 local TextzoneList = require "engine.ui.TextzoneList"
@@ -341,19 +178,8 @@ function _M:displayAtMap(tmx, tmy, mx, my, text)
 			self.old_tmx, self.old_tmy = tmx, tmy
 			self.old_turn = game.turn
 			local tt = {}
-			local seen = game.level.map.seens(tmx, tmy)
-			local remember = game.level.map.remembers(tmx, tmy)
-			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
-			tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
-			if #tt > 0 then
-				local ts = tstring{}
-				for i = 1, #tt do
-					ts:merge(tt[i]:toTString())
-					if i < #tt then ts:add(true, "---", true) end
-				end
+			local ts = self:getTooltipAtMap(tmx, tmy, mx, my)
+			if ts then
 				self:set(ts)
 				self:display()
 			else
@@ -374,3 +200,25 @@ function _M:displayAtMap(tmx, tmy, mx, my, text)
 		self:toScreen(mx, my)
 	end
 end
+
+--- Gets the tooltips at the given map coord
+-- This method can/should be overloaded by a module to provide custom tooltips
+function _M:getTooltipAtMap(tmx, tmy, mx, my)
+	local tt = {}
+	local seen = game.level.map.seens(tmx, tmy)
+	local remember = game.level.map.remembers(tmx, tmy)
+	tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
+	if #tt > 0 then
+		local ts = tstring{}
+		for i = 1, #tt do
+			ts:merge(tt[i]:toTString())
+			if i < #tt then ts:add(true, "---", true) end
+		end
+		return ts
+	end
+	return nil
+end

game/engines/default/engine/UserChat.lua

@@ -345,11 +345,9 @@ function _M:resize(x, y, w, h, fontname, fontsize, color, bgcolor)
 			local citem = nil
 			for i = 1, #self.dlist do
 				local item = self.dlist[i]
-				if item.dh and y >= item.dh - self.mouse.delegate_offset_y then citem = item break end
-			end
-			if citem and citem.login and self.channels[self.cur_channel].users[citem.login] then
-				self.on_mouse(self.channels[self.cur_channel].users[citem.login], citem, button, event)
+				if item.dh and y >= item.dh - self.mouse.delegate_offset_y then citem = self.dlist[i].src break end
 			end
+			self.on_mouse(citem and citem.login and self.channels[self.cur_channel].users[citem.login], citem and citem.login and citem, button, event, x, y, xrel, yrel, bx, by)
 		end
 	end)
 
@@ -412,7 +410,7 @@ function _M:display()
 		for i = #gen, 1, -1 do
 			gen[i].login = log[z].login
 			gen[i].extra_data = log[z].extra_data
-			self.dlist[#self.dlist+1] = {item=gen[i], date=log[z].timestamp}
+			self.dlist[#self.dlist+1] = {item=gen[i], date=log[z].timestamp, src=log[z]}
 			h = h + self.fh
 			if h > self.h - self.fh - (self.do_display_chans and self.fh or 0) then stop=true break end
 		end
@@ -436,9 +434,10 @@ function _M:toScreen()
 			if fade < self.fading * 1000 then fade = 1
 			elseif fade < self.fading * 2000 then fade = (self.fading * 2000 - fade) / (self.fading * 1000)
 			else fade = 0 end
+			self.dlist[i].src.faded = fade
 		end
 
-		item.dh = h
+		self.dlist[i].dh = h
 		if self.shadow then item._tex:toScreenFull(self.display_x+2, h+2, item.w, item.h, item._tex_w, item._tex_h, 0,0,0, self.shadow * fade) end
 		item._tex:toScreenFull(self.display_x, h, item.w, item.h, item._tex_w, item._tex_h, 1, 1, 1, fade)
 		h = h - self.fh

game/modules/tome/class/Game.lua

@@ -52,7 +52,7 @@ local LogDisplay = require "engine.LogDisplay"
 local LogFlasher = require "engine.LogFlasher"
 local DebugConsole = require "engine.DebugConsole"
 local FlyingText = require "engine.FlyingText"
-local Tooltip = require "engine.Tooltip"
+local Tooltip = require "mod.class.Tooltip"
 local Calendar = require "engine.Calendar"
 local Gestures = require "engine.ui.Gestures"
 
@@ -1278,19 +1278,11 @@ function _M:setupMouse(reset)
 
 		-- Handle the mouse movement/scrolling
 		self.player:mouseHandleDefault(self.key, self.key == self.normal_key, button, mx, my, xrel, yrel, event)
-	end)
+	end, nil, "playmap")
 	-- Scroll message log
---[[
-	self.mouse:registerZone(self.logdisplay.display_x, self.logdisplay.display_y, self.w, self.h, function(button, mx, my, xrel, yrel, bx, by, event)
-		if self.show_userchat then
-			profile.chat.mouse:delegate(button, mx, my, xrel, yrel, bx, by, event)
-		else
-			if button == "wheelup" then self.logdisplay:scrollUp(1) end
-			if button == "wheeldown" then self.logdisplay:scrollUp(-1) end
-			if button == "left" then self.logdisplay:showLogDialog(nil, 0.6) end
-		end
+	self.mouse:registerZone(profile.chat.display_x, profile.chat.display_y, profile.chat.w, profile.chat.h, function(button, mx, my, xrel, yrel, bx, by, event)
+		profile.chat.mouse:delegate(button, mx, my, xrel, yrel, bx, by, event)
 	end)
-]]
 	-- Use hotkeys with mouse
 	self.mouse:registerZone(self.hotkeys_display.display_x, self.hotkeys_display.display_y, self.w, self.h, function(button, mx, my, xrel, yrel, bx, by, event)
 		if event == "button" and button == "left" and self.zone and self.zone.wilderness then return end
@@ -1329,15 +1321,22 @@ function _M:setupMouse(reset)
 		end
 	end)
 	-- Chat tooltips
-	profile.chat:onMouse(function(user, item, button, event)
+	profile.chat:onMouse(function(user, item, button, event, x, y, xrel, yrel, bx, by)
+		local mx, my = core.mouse.get()
+		if not item or item.faded == 0 then self.mouse:delegate(button, mx, my, xrel, yrel, nil, nil, event, "playmap") return end
+
 		local str = tstring{{"color","GOLD"}, {"font","bold"}, user.name, {"color","LAST"}, {"font","normal"}, true}
 		str:add({"color","ANTIQUE_WHITE"}, "Playing: ", {"color", "LAST"}, user.current_char, true)
 		str:add({"color","ANTIQUE_WHITE"}, "Game: ", {"color", "LAST"}, user.module, "(", user.valid, ")",true)
 
+		local tmx, tmy = self.level.map:getMouseTile(mx, my)
+		local mstr = self.tooltip:getTooltipAtMap(tmx, tmy, mx, my)
+
 		if item.extra_data and item.extra_data.mode == "tooltip" then
-			local str = item.extra_data.tooltip.."\n---\nLinked by: "..str:toString()
+			local str = item.extra_data.tooltip.."\n---\nLinked by: "..str:toString().."\n---\n"..(mstr and mstr:toString() or "")
 			self.tooltip:displayAtMap(nil, nil, self.w, self.h, str)
 		else
+			if mstr then str:add(true, "---", true) str:merge(mstr) end
 			self.tooltip:displayAtMap(nil, nil, self.w, self.h, str)
 
 			if button == "left" and event == "button" then

game/modules/tome/class/Tooltip.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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 Tooltip = require "engine.Tooltip"
+local Map = require "engine.Map"
+
+module(..., package.seeall, class.inherit(Tooltip))
+
+function _M:init(...)
+	Tooltip.init(self, ...)
+end
+
+--- Gets the tooltips at the given map coord
+function _M:getTooltipAtMap(tmx, tmy, mx, my)
+	local tt = {}
+	local seen = game.level.map.seens(tmx, tmy)
+	local remember = game.level.map.remembers(tmx, tmy)
+	tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
+	tt[#tt+1] = (seen or remember) and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
+	if #tt > 0 then
+		local ts = tstring{}
+		for i = 1, #tt do
+			ts:merge(tt[i]:toTString())
+			if i < #tt then ts:add(true, "---", true) end
+		end
+		ts:add("TOTOOTOT")
+		return ts
+	end
+	return nil
+end