Rework all nodes displaying text according to new font_api

2 files changed, 193 insertions, 189 deletions

diff --git a/signs_api/common.lua b/signs_api/common.lua
deleted file mode 100644
index 2528ff5..0000000
--- a/signs_api/common.lua
+++ /dev/null
@@ -1,188 +0,0 @@
---[[
-    signs mod for Minetest - Various signs with text displayed on
-    (c) Pierre-Yves Rollo
-
-    This file is part of signs.
-
-    signs 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.
-
-    signs 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 signs.  If not, see <http://www.gnu.org/licenses/>.
---]]
-
-local S = signs_api.intllib
-local F = function(...) return minetest.formspec_escape(S(...)) end
-
-function signs_api.set_display_text(pos,text)
-	local meta = minetest.get_meta(pos)
-	meta:set_string("display_text", text)
-	meta:set_string("infotext", "\""..text.."\"")
-	display_api.update_entities(pos)
-end
-
-function signs_api.set_formspec(pos)
-	local meta = minetest.get_meta(pos)
-	local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
-	if ndef and ndef.display_entities and ndef.display_entities["signs:display_text"] then
-		local maxlines = ndef.display_entities["signs:display_text"].maxlines
-		local formspec
-
-		if maxlines == 1 then
-			formspec = "size[6,3]"..
-				default.gui_bg .. default.gui_bg_img .. default.gui_slots ..
-				"field[0.5,0.7;5.5,1;display_text;"..F("Text")..";${display_text}]"..
-				"button_exit[2,2;2,1;ok;"..F("Write").."]"
-		else
-			local extralabel = ""
-			if maxlines then
-				extralabel = F(" (first %s lines only)"):format(maxlines)
-			end
-
-			formspec = "size[6,4]"..
-				default.gui_bg .. default.gui_bg_img .. default.gui_slots ..
-				"textarea[0.5,0.7;5.5,2;display_text;"..F("Text")..""..extralabel..";${display_text}]"..
-				"button_exit[2,3;2,1;ok;"..F("Write").."]"
-		end
-
-		meta:set_string("formspec", formspec)
-	end
-end
-
-function signs_api.on_receive_fields(pos, formname, fields, player)
-	if not minetest.is_protected(pos, player:get_player_name()) then
-		if fields and (fields.ok or fields.key_enter) then
-			signs_api.set_display_text(pos, fields.display_text)
-		end
-	end
-end
-
--- On place callback for direction signs
--- (chooses which sign according to look direction)
-function signs_api.on_place_direction(itemstack, placer, pointed_thing)
-	local name = itemstack:get_name()
-	local ndef = minetest.registered_nodes[name]
-
-    local bdir = {x = pointed_thing.under.x - pointed_thing.above.x,
-                  y = pointed_thing.under.y - pointed_thing.above.y,
-                  z = pointed_thing.under.z - pointed_thing.above.z}
-	local pdir = placer:get_look_dir()
-
-	local ndir, test
-
-	if ndef.paramtype2 == "facedir" then
-		if bdir.x == 0 and bdir.z == 0 then
-			-- Ceiling or floor pointed (facedir chosen from player dir)
-			ndir = minetest.dir_to_facedir({x=pdir.x, y=0, z=pdir.z})
-		else
-			-- Wall pointed
-			ndir = minetest.dir_to_facedir(bdir)
-		end
-
-		test = {[0]=-pdir.x, pdir.z, pdir.x, -pdir.z}
-    end
-
-	if ndef.paramtype2 == "wallmounted" then
-		ndir = minetest.dir_to_wallmounted(bdir)
-		if ndir == 0 or ndir == 1 then
-			-- Ceiling or floor
-			ndir = minetest.dir_to_wallmounted({x=pdir.x, y=0, z=pdir.z})
-		end
-
-		test = {0, pdir.z, -pdir.z, -pdir.x, pdir.x}
-	end
-
-	-- Only for direction signs
-	if ndef.signs_other_dir then
-		if test[ndir] > 0 then
-			itemstack:set_name(ndef.signs_other_dir)
-		end
-		itemstack = minetest.item_place(itemstack, placer, pointed_thing, ndir)
-		itemstack:set_name(name)
-
-		return itemstack
-	else
-		return minetest.item_place(itemstack, placer, pointed_thing, ndir)
-	end
-end
-
--- Handles screwdriver rotation. Direction is affected for direction signs
-function signs_api.on_rotate(pos, node, player, mode, new_param2)
-	if mode == 2 then
-		local ndef = minetest.registered_nodes[node.name]
-	    if ndef.signs_other_dir then
-		    minetest.swap_node(pos, {name = ndef.signs_other_dir,
-                param1 = node.param1, param2 = node.param2})
-			display_api.update_entities(pos)
-	    end
-	else
-        display_api.on_rotate(pos, node, user, mode, new_param2)
-	end
-    return false;
-end
-
-function signs_api.register_sign(mod, name, model)
-	-- Default fields
-	local fields = {
-		sunlight_propagates = true,
-		paramtype = "light",
-		paramtype2 = "facedir",
-		drawtype = "nodebox",
-		node_box = {
-			type = "fixed",
-			fixed = {-model.width/2, -model.height/2, 0.5,
-					 model.width/2, model.height/2, 0.5 - model.depth},
-		},
-		groups = {choppy=2, dig_immediate=2, not_blocking_trains = 1, display_modpack_node = 1},
-		sounds = default.node_sound_defaults(),
-		display_entities = {
-			["signs:display_text"] = {
-					on_display_update = font_api.on_display_update,
-					depth = 0.5 - display_api.entity_spacing - model.depth,
-					size = { x = model.width, y = model.height },
-					resolution = { x = 64, y = 64 },
-					maxlines = 1,
-			},
-
-		},
-		on_place = display_api.on_place,
-		on_construct = 	function(pos)
-							signs_api.set_formspec(pos)
-							display_api.on_construct(pos)
-						end,
-		on_destruct = display_api.on_destruct,
-		on_rotate = signs_api.on_rotate,
-		on_receive_fields =  signs_api.on_receive_fields,
-		on_punch = function(pos, node, player, pointed_thing) display_api.update_entities(pos) end,
-	}
-
-	-- Node fields override
-	for key, value in pairs(model.node_fields) do
-		if key == "groups" then
-			for key2, value2 in pairs(value) do
-				fields[key][key2] = value2
-			end
-		else
-			fields[key] = value
-		end
-	end
-
-	if not fields.wield_image then fields.wield_image = fields.inventory_image end
-
-	-- Entity fields override
-	for key, value in pairs(model.entity_fields) do
-		fields.display_entities["signs:display_text"][key] = value
-	end
-
-	minetest.register_node(mod..":"..name, fields)
-end
-
--- Text entity for all signs
-display_api.register_display_entity("signs:display_text")
diff --git a/signs_api/init.lua b/signs_api/init.lua
index c13a253..e8a2b2b 100644
--- a/signs_api/init.lua
+++ b/signs_api/init.lua
@@ -25,8 +25,200 @@ signs_api.path = minetest.get_modpath(signs_api.name)
 -- Load support for intllib.
 local S, NS = dofile(signs_api.path.."/intllib.lua")
 signs_api.intllib = S
+local F = function(...) return minetest.formspec_escape(S(...)) end
 
-dofile(signs_api.path.."/common.lua")
+local function update_font_index_meta(meta)
+	local font = meta:get_string("font")
+	local count = 0
+	for key, def in pairs(font_api.registered_fonts) do
+		count = count + 1
+		if font == key then
+			meta:set_string("font_idx", count)
+		end
+	end 
+end
+
+function signs_api.set_display_text(pos,text,font)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("display_text", text)
+	meta:set_string("infotext", "\""..text.."\"")
+	meta:set_string("font", font)
+	update_font_index_meta(meta)
+	display_api.update_entities(pos)
+end
+
+function signs_api.set_formspec(pos)
+	local meta = minetest.get_meta(pos)
+	local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
+	if ndef and ndef.display_entities 
+	   and ndef.display_entities["signs:display_text"] then
+		local maxlines = ndef.display_entities["signs:display_text"].maxlines
+		local formspec, formheight
+
+		if maxlines == 1 then
+			formspec =
+				"field[0.5,0.7;5.5,1;display_text;"..F("Text")..
+					";${display_text}]"
+			formheight = 2	
+		else
+			local extralabel = ""
+			if maxlines then
+				extralabel = F(" (first %s lines only)"):format(maxlines)
+			end
+
+			formspec = 
+				"textarea[0.5,0.7;5.5,2;display_text;"..F("Text")..""..
+					extralabel..";${display_text}]"
+			formheight = 3
+		end
+
+		formspec = formspec.."button_exit[2,"..formheight..";2,1;ok;"..
+			F("Write").."]"
+		formheight = formheight + 1
+		formspec = "size[6,"..formheight.."]"..default.gui_bg..
+			default.gui_bg_img..default.gui_slots..formspec
+
+		meta:set_string("formspec", formspec)
+	end
+end
+
+function signs_api.on_receive_fields(pos, formname, fields, player)
+	if not minetest.is_protected(pos, player:get_player_name()) then
+		if fields and (fields.ok or fields.key_enter) then
+			signs_api.set_display_text(pos, fields.display_text, fields.font)
+		end
+	end
+end
+
+-- On place callback for direction signs
+-- (chooses which sign according to look direction)
+function signs_api.on_place_direction(itemstack, placer, pointed_thing)
+	local name = itemstack:get_name()
+	local ndef = minetest.registered_nodes[name]
+
+    local bdir = {x = pointed_thing.under.x - pointed_thing.above.x,
+                  y = pointed_thing.under.y - pointed_thing.above.y,
+                  z = pointed_thing.under.z - pointed_thing.above.z}
+	local pdir = placer:get_look_dir()
+
+	local ndir, test
+
+	if ndef.paramtype2 == "facedir" then
+		if bdir.x == 0 and bdir.z == 0 then
+			-- Ceiling or floor pointed (facedir chosen from player dir)
+			ndir = minetest.dir_to_facedir({x=pdir.x, y=0, z=pdir.z})
+		else
+			-- Wall pointed
+			ndir = minetest.dir_to_facedir(bdir)
+		end
+
+		test = {[0]=-pdir.x, pdir.z, pdir.x, -pdir.z}
+    end
+
+	if ndef.paramtype2 == "wallmounted" then
+		ndir = minetest.dir_to_wallmounted(bdir)
+		if ndir == 0 or ndir == 1 then
+			-- Ceiling or floor
+			ndir = minetest.dir_to_wallmounted({x=pdir.x, y=0, z=pdir.z})
+		end
+
+		test = {0, pdir.z, -pdir.z, -pdir.x, pdir.x}
+	end
+
+	-- Only for direction signs
+	if ndef.signs_other_dir then
+		if test[ndir] > 0 then
+			itemstack:set_name(ndef.signs_other_dir)
+		end
+		itemstack = minetest.item_place(itemstack, placer, pointed_thing, ndir)
+		itemstack:set_name(name)
+
+		return itemstack
+	else
+		return minetest.item_place(itemstack, placer, pointed_thing, ndir)
+	end
+end
+
+-- Handles screwdriver rotation. Direction is affected for direction signs
+function signs_api.on_rotate(pos, node, player, mode, new_param2)
+	if mode == 2 then
+		local ndef = minetest.registered_nodes[node.name]
+	    if ndef.signs_other_dir then
+		    minetest.swap_node(pos, {name = ndef.signs_other_dir,
+                param1 = node.param1, param2 = node.param2})
+			display_api.update_entities(pos)
+	    end
+	else
+        display_api.on_rotate(pos, node, user, mode, new_param2)
+	end
+    return false;
+end
+
+function signs_api.register_sign(mod, name, model)
+	-- Default fields
+	local fields = {
+		sunlight_propagates = true,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = {-model.width/2, -model.height/2, 0.5,
+					 model.width/2, model.height/2, 0.5 - model.depth},
+		},
+		groups = {choppy=2, dig_immediate=2, not_blocking_trains = 1, display_modpack_node = 1},
+		sounds = default.node_sound_defaults(),
+		display_entities = {
+			["signs:display_text"] = {
+					on_display_update = font_api.on_display_update,
+					depth = 0.5 - display_api.entity_spacing - model.depth,
+					size = { x = model.width, y = model.height },
+					aspect_ratio = 1/2,
+					maxlines = 1,
+			},
+
+		},
+		on_place = display_api.on_place,
+		on_construct = 	function(pos)
+				local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
+				local meta = minetest.get_meta(pos)
+				meta:set_string("font", ndef.display_entities.font_name or
+				                        font_api.get_default_font_name())
+				update_font_index_meta(meta)
+				signs_api.set_formspec(pos)
+				display_api.on_construct(pos)
+			end,
+		on_destruct = display_api.on_destruct,
+		on_rotate = signs_api.on_rotate,
+		on_receive_fields =  signs_api.on_receive_fields,
+		on_punch = function(pos, node, player, pointed_thing) 
+				display_api.update_entities(pos)
+			end,
+	}
+
+	-- Node fields override
+	for key, value in pairs(model.node_fields) do
+		if key == "groups" then
+			for key2, value2 in pairs(value) do
+				fields[key][key2] = value2
+			end
+		else
+			fields[key] = value
+		end
+	end
+
+	if not fields.wield_image then fields.wield_image = fields.inventory_image end
+
+	-- Entity fields override
+	for key, value in pairs(model.entity_fields) do
+		fields.display_entities["signs:display_text"][key] = value
+	end
+
+	minetest.register_node(mod..":"..name, fields)
+end
+
+-- Text entity for all signs
+display_api.register_display_entity("signs:display_text")