[ruamoko] Add some builtins for passages and text

Just some basic implementation so I can test shaping of passage text.

include/QF/ui/text.h

@@ -102,6 +102,7 @@ extern hb_feature_t CligOn;
 
 struct font_s;
 struct passage_s;
+extern struct ecs_registry_s *text_reg;
 
 shaper_t *Text_NewShaper (struct font_s *font);
 void Text_DeleteShaper (shaper_t *shaper);

libs/ruamoko/rua_gui.c

@@ -42,50 +42,164 @@
 #include "QF/render.h"
 
 #include "QF/ui/font.h"
+#include "QF/ui/passage.h"
+#include "QF/ui/text.h"
 #include "QF/ui/view.h"
 
 #include "QF/plugin/vid_render.h"
 
 #include "rua_internal.h"
 
+typedef struct rua_passage_s {
+	struct rua_passage_s *next;
+	struct rua_passage_s **prev;
+	passage_t  *passage;
+} rua_passage_t;
+
+typedef struct rua_font_s {
+	struct rua_font_s *next;
+	struct rua_font_s **prev;
+	font_t     *font;
+} rua_font_t;
+
 typedef struct {
+	progs_t    *pr;
+	PR_RESMAP (rua_passage_t) passage_map;
+	rua_passage_t *passages;
+	PR_RESMAP (rua_font_t) font_map;
+	rua_font_t *fonts;
 } gui_resources_t;
 
-#define bi(x) static void bi_##x (progs_t *pr, void *_res)
+static rua_passage_t *
-
+passage_new (gui_resources_t *res)
-bi (Font_Load)
 {
-	const char *font_path = P_GSTRING (pr, 0);
+	return PR_RESNEW (res->passage_map);
-	int         font_size = P_INT (pr, 1);
-
-	QFile      *font_file = QFS_FOpenFile (font_path);
-	font_t     *font = Font_Load (font_file, font_size);
-	R_INT (pr) = font->fontid;
 }
 
-bi (Font_String)
+static void
+passage_free (gui_resources_t *res, rua_passage_t *passage)
 {
-	int         x = P_INT (pr, 0);
+	PR_RESFREE (res->passage_map, passage);
-	int         y = P_INT (pr, 1);
-	int         fontid = P_INT (pr, 2);
-	const char *str = P_GSTRING (pr, 3);
-	r_funcs->Draw_FontString (x, y, fontid, str);
 }
 
-#undef bi
+static void
-#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
+passage_reset (gui_resources_t *res)
-#define p(type) PR_PARAM(type)
+{
-#define P(a, s) { .size = (s), .alignment = BITOP_LOG2 (a), }
+	PR_RESRESET (res->passage_map);
-static builtin_t builtins[] = {
+}
-	bi(Font_Load,       2, p(string), p(int)),
-	bi(Font_String,     4, p(int), p(int), p(int), p(string)),
 
-	{0}
+static inline rua_passage_t *
-};
+passage_get (gui_resources_t *res, int index)
+{
+	return PR_RESGET(res->passage_map, index);
+}
+
+static inline int __attribute__((pure))
+passage_index (gui_resources_t *res, rua_passage_t *passage)
+{
+	return PR_RESINDEX(res->passage_map, passage);
+}
+
+static int
+alloc_passage (gui_resources_t *res, passage_t *passage)
+{
+	rua_passage_t *psg = passage_new (res);
+
+	psg->next = res->passages;
+	psg->prev = &res->passages;
+	if (res->passages) {
+		res->passages->prev = &psg->next;
+	}
+	res->passages = psg;
+	psg->passage = passage;
+	return passage_index (res, psg);
+}
+
+static rua_passage_t *
+_get_passage (gui_resources_t *res, int handle, const char *func)
+{
+	rua_passage_t *psg = passage_get (res, handle);
+	if (!psg) {
+		PR_RunError (res->pr, "invalid passage handle passed to %s", func);
+	}
+	return psg;
+}
+#define get_passage(res, handle) _get_passage (res, handle, __FUNCTION__ + 3)
+
+static rua_font_t *
+font_new (gui_resources_t *res)
+{
+	return PR_RESNEW (res->font_map);
+}
+/*
+static void
+font_free (gui_resources_t *res, rua_font_t *font)
+{
+	PR_RESFREE (res->font_map, font);
+}
+*/
+static void
+font_reset (gui_resources_t *res)
+{
+	PR_RESRESET (res->font_map);
+}
+
+static inline rua_font_t *
+font_get (gui_resources_t *res, int index)
+{
+	return PR_RESGET(res->font_map, index);
+}
+
+static inline int __attribute__((pure))
+font_index (gui_resources_t *res, rua_font_t *font)
+{
+	return PR_RESINDEX(res->font_map, font);
+}
+
+static int
+alloc_font (gui_resources_t *res, font_t *font)
+{
+	rua_font_t *psg = font_new (res);
+
+	psg->next = res->fonts;
+	psg->prev = &res->fonts;
+	if (res->fonts) {
+		res->fonts->prev = &psg->next;
+	}
+	res->fonts = psg;
+	psg->font = font;
+	return font_index (res, psg);
+}
+
+static rua_font_t *
+_get_font (gui_resources_t *res, int handle, const char *func)
+{
+	rua_font_t *psg = font_get (res, handle);
+	if (!psg) {
+		PR_RunError (res->pr, "invalid font handle passed to %s", func);
+	}
+	return psg;
+}
+#define get_font(res, handle) _get_font (res, handle, __FUNCTION__ + 3)
 
 static void
 bi_gui_clear (progs_t *pr, void *_res)
 {
+	gui_resources_t *res = _res;
+
+	rua_passage_t *psg;
+	for (psg = res->passages; psg; psg = psg->next) {
+		Passage_Delete (psg->passage);
+	}
+	res->passages = 0;
+	passage_reset (res);
+
+	rua_font_t *font;
+	for (font = res->fonts; font; font = font->next) {
+		//FIXME can't unload fonts
+	}
+	res->fonts = 0;
+	font_reset (res);
 }
 
 static void
@@ -95,10 +209,73 @@ bi_gui_destroy (progs_t *pr, void *_res)
 	free (res);
 }
 
+#define bi(x) static void bi_##x (progs_t *pr, void *_res)
+
+bi (Font_Load)
+{
+	gui_resources_t *res = _res;
+	const char *font_path = P_GSTRING (pr, 0);
+	int         font_size = P_INT (pr, 1);
+
+	QFile      *font_file = QFS_FOpenFile (font_path);
+	font_t     *font = Font_Load (font_file, font_size);
+	R_INT (pr) = alloc_font (res, font);
+}
+
+bi (Passage_New)
+{
+	gui_resources_t *res = _res;
+	passage_t  *passage = Passage_New (text_reg);
+	R_INT (pr) = alloc_passage (res, passage);
+}
+
+bi (Passage_ParseText)
+{
+	gui_resources_t *res = _res;
+	int         handle = P_INT (pr, 0);
+	rua_passage_t *psg = get_passage (res, handle);
+	const char *text = P_GSTRING (pr, 1);
+	Passage_ParseText (psg->passage, text);
+}
+
+bi (Passage_Delete)
+{
+	gui_resources_t *res = _res;
+	int         handle = P_INT (pr, 0);
+	rua_passage_t *psg = get_passage (res, handle);
+	Passage_Delete (psg->passage);
+	passage_free (res, psg);
+}
+
+bi (Text_View)
+{
+	gui_resources_t *res = _res;
+	rua_font_t *font = get_font (res, P_INT (pr, 0));
+	rua_passage_t *psg = get_passage (res, P_INT (pr, 1));
+	view_t      view = Text_View (font->font, psg->passage);
+	R_INT (pr) = view.id;//FIXME
+}
+
+#undef bi
+#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
+#define p(type) PR_PARAM(type)
+#define P(a, s) { .size = (s), .alignment = BITOP_LOG2 (a), }
+static builtin_t builtins[] = {
+	bi(Font_Load,           2, p(string), p(int)),
+	bi(Passage_New,         0),
+	bi(Passage_ParseText,   2, p(ptr), p(string)),
+	bi(Passage_Delete,      1, p(ptr)),
+
+	bi(Text_View,           2, p(ptr), p(string)),
+
+	{0}
+};
+
 void
 RUA_GUI_Init (progs_t *pr, int secure)
 {
 	gui_resources_t *res = calloc (1, sizeof (gui_resources_t));
+	res->pr = pr;
 
 	PR_Resources_Register (pr, "Draw", res, bi_gui_clear, bi_gui_destroy);
 	PR_RegisterBuiltins (pr, builtins, res);

libs/ui/text.c

@@ -77,7 +77,7 @@ static const component_t text_components[text_type_count] = {
 		.create = text_features_create,
 	},
 };
-static ecs_registry_t *text_reg;
+ecs_registry_t *text_reg;
 
 void
 Text_Init (void)

ruamoko/qwaq/builtins/graphics.c

@@ -57,6 +57,7 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
 #include "QF/plugin/console.h"
 #include "QF/plugin/vid_render.h"
 #include "QF/ui/font.h"
+#include "QF/ui/text.h"
 
 #include "rua_internal.h"
 
@@ -345,6 +346,7 @@ BI_Graphics_Init (progs_t *pr)
 	Mod_Init ();
 	R_Init ();
 	Font_Init ();
+	Text_Init ();
 
 	R_Progs_Init (pr);
 	RUA_Game_Init (pr, thread->rua_security);