Merge pull request #100 from yuchanns/feat/node-remove

feat(yoga): add node_remove

Author: cloudwu

docs/app.lua

@@ -14,11 +14,30 @@
 ---@class soluna.app
 local app = {}
 
+---@alias soluna.app.MouseCursor
+---| '"default"'
+---| '"arrow"'
+---| '"ibeam"'
+---| '"crosshair"'
+---| '"pointing_hand"'
+---| '"resize_ew"'
+---| '"resize_ns"'
+---| '"resize_nwse"'
+---| '"resize_nesw"'
+---| '"resize_all"'
+---| '"not_allowed"'
+
 ---请求应用优雅退出
 ---Requests graceful application quit.
 function app.quit()
 end
 
+---设置系统鼠标光标样式；nil 恢复默认样式。
+---Sets the system mouse cursor; nil restores the default cursor.
+---@param cursor? soluna.app.MouseCursor
+function app.set_mouse_cursor(cursor)
+end
+
 ---设置输入法字体
 ---Sets the IME font face and pixel size.
 ---@overload fun()

docs/soluna.lua

@@ -117,6 +117,8 @@ end
 ---@field version_api integer API 版本号 / API version number
 local soluna = {}
 
+---@alias soluna.MouseCursor soluna.app.MouseCursor
+
 ---返回 `.game` 设置表
 ---Returns the `.game` settings table.
 ---@return table settings 游戏设置 / Game settings
@@ -129,6 +131,12 @@ end
 function soluna.set_window_title(text)
 end
 
+---设置系统鼠标光标样式；nil 恢复默认样式。
+---Sets the system mouse cursor; nil restores the default cursor.
+---@param cursor? soluna.MouseCursor
+function soluna.set_mouse_cursor(cursor)
+end
+
 ---设置窗口图标
 ---Sets one icon image or an icon image list.
 ---@param data soluna.IconImage|soluna.IconImage[] 图标数据 / Icon data

src/entry.c

@@ -226,6 +226,37 @@ lset_window_title(lua_State *L) {
 	return 0;
 }
 
+static const char *const MOUSE_CURSOR_NAMES[] = {
+	"default",
+	"arrow",
+	"ibeam",
+	"crosshair",
+	"pointing_hand",
+	"resize_ew",
+	"resize_ns",
+	"resize_nwse",
+	"resize_nesw",
+	"resize_all",
+	"not_allowed",
+	NULL,
+};
+
+static sapp_mouse_cursor
+check_mouse_cursor(lua_State *L, int index) {
+	if (lua_isnoneornil(L, index)) {
+		return SAPP_MOUSECURSOR_DEFAULT;
+	}
+	return (sapp_mouse_cursor)luaL_checkoption(L, index, NULL, MOUSE_CURSOR_NAMES);
+}
+
+static int
+lset_mouse_cursor(lua_State *L) {
+	if (CTX == NULL)
+		return 0;
+	sapp_set_mouse_cursor(check_mouse_cursor(L, 1));
+	return 0;
+}
+
 struct icon_pixels {
 	uint8_t *ptr;
 };
@@ -561,6 +592,7 @@ luaopen_soluna_app(lua_State *L) {
 		{ "sendmessage", lmessage_send },
 		{ "unpackevent", levent_unpack },
 		{ "set_window_title", lset_window_title },
+		{ "set_mouse_cursor", lset_mouse_cursor },
 		{ "set_icon", lset_icon },
 		{ "set_ime_rect", lset_ime_rect },
 		{ "set_ime_font", lset_ime_font },

src/lualib/main.lua

@@ -106,6 +106,10 @@ local function start(config)
 		soluna_app.set_window_title(text)
 	end
 
+	function appmsg.set_cursor(cursor)
+		soluna_app.set_mouse_cursor(cursor)
+	end
+
 	function appmsg.set_icon(data)
 		soluna_app.set_icon(data)
 	end

src/lualib/soluna.lua

@@ -37,6 +37,10 @@ function soluna.set_window_title(text)
 	mqueue.send(app.mqueue(), ltask.pack("set_title", text))
 end
 
+function soluna.set_mouse_cursor(cursor)
+	mqueue.send(app.mqueue(), ltask.pack("set_cursor", cursor))
+end
+
 function soluna.set_icon(data)
 	mqueue.send(app.mqueue(), ltask.pack("set_icon", data))
 end

src/luayoga.c

@@ -59,6 +59,14 @@ lnodeFree(lua_State *L) {
 	return 0;
 }
 
+static int
+lnodeRemove(lua_State *L) {
+	YGNodeRef parent = lua_touserdata(L, 1);
+	YGNodeRef node = lua_touserdata(L, 2);
+	YGNodeRemoveChild(parent, node);
+	return 0;
+}
+
 static int
 lnodeCalc(lua_State *L) {
 	YGNodeRef node = lua_touserdata(L, 1);
@@ -597,6 +605,7 @@ luaopen_layout_yoga(lua_State *L) {
 	luaL_Reg l[] = {
 		{ "node_new", lnodeNew },
 		{ "node_free", lnodeFree },
+		{ "node_remove", lnodeRemove },
 		{ "node_calc", lnodeCalc },
 		{ "node_get", lnodeGet },
 		{ "node_set", NULL },

test/mouse_cursor.lua

@@ -0,0 +1,96 @@
+local app = require "soluna.app"
+local soluna = require "soluna"
+local quad = require "soluna.material.quad"
+
+local args = ...
+local batch = args.batch
+
+local KEY_ESCAPE <const> = 256
+local KEYSTATE_PRESS <const> = 1
+local TILE_W <const> = 132
+local TILE_H <const> = 76
+local GAP <const> = 18
+local PADDING <const> = 28
+
+local tiles <const> = {
+	{ cursor = "default", color = 0xff39445f, hover = 0xff536181 },
+	{ cursor = "arrow", color = 0xff3f4b6b, hover = 0xff5a6b95 },
+	{ cursor = "ibeam", color = 0xff46506d, hover = 0xff64739c },
+	{ cursor = "crosshair", color = 0xff40546b, hover = 0xff5c7895 },
+	{ cursor = "pointing_hand", color = 0xff3e5960, hover = 0xff5a808a },
+	{ cursor = "resize_ew", color = 0xff4f5364, hover = 0xff74798f },
+	{ cursor = "resize_ns", color = 0xff4a5863, hover = 0xff6c808f },
+	{ cursor = "resize_nwse", color = 0xff4b5064, hover = 0xff6f7692 },
+	{ cursor = "resize_nesw", color = 0xff46556a, hover = 0xff667d9b },
+	{ cursor = "resize_all", color = 0xff4f5961, hover = 0xff74828e },
+	{ cursor = "not_allowed", color = 0xff5c4556, hover = 0xff8a657f },
+}
+
+for _, tile in ipairs(tiles) do
+	tile.fill = quad.quad(TILE_W, TILE_H, tile.color)
+	tile.hover_fill = quad.quad(TILE_W, TILE_H, tile.hover)
+	tile.outline = quad.quad(TILE_W + 4, TILE_H + 4, 0xff8fb2ff)
+end
+
+soluna.set_window_title "soluna mouse cursor test"
+
+local callback = {}
+local mouse_x = -1
+local mouse_y = -1
+local active_cursor
+
+local function columns()
+	return math.max(1, math.floor((args.width - PADDING * 2 + GAP) / (TILE_W + GAP)))
+end
+
+local function tile_rect(index)
+	local cols = columns()
+	local col = (index - 1) % cols
+	local row = math.floor((index - 1) / cols)
+	return PADDING + col * (TILE_W + GAP), PADDING + row * (TILE_H + GAP)
+end
+
+local function contains(x, y, left, top)
+	return x >= left and x < left + TILE_W and y >= top and y < top + TILE_H
+end
+
+local function cursor_at(x, y)
+	for index, tile in ipairs(tiles) do
+		local left, top = tile_rect(index)
+		if contains(x, y, left, top) then
+			return tile.cursor
+		end
+	end
+end
+
+local function set_cursor(cursor)
+	if cursor == active_cursor then
+		return
+	end
+	active_cursor = cursor
+	soluna.set_mouse_cursor(cursor)
+end
+
+function callback.mouse_move(x, y)
+	mouse_x, mouse_y = x, y
+	set_cursor(cursor_at(x, y))
+end
+
+function callback.key(keycode, state)
+	if keycode == KEY_ESCAPE and state == KEYSTATE_PRESS then
+		app.quit()
+	end
+end
+
+function callback.frame()
+	for index, tile in ipairs(tiles) do
+		local left, top = tile_rect(index)
+		local hovered = contains(mouse_x, mouse_y, left, top)
+		if hovered then
+			batch:add(tile.outline, left - 2, top - 2)
+		end
+		batch:add(hovered and tile.hover_fill or tile.fill, left, top)
+	end
+end
+
+return callback