mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Complete more of the font bindings for libretro builds

Browse source
This commit is contained in:
刘皓 2025-04-04 12:20:33 -04:00
parent 7c7495ab1e
commit 7a2702bf95
No known key found for this signature in database
GPG key ID: 7901753DB465B711
6 changed files with 320 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding-sandbox/binding-sandbox.h
View file

@ -130,7 +130,7 @@ namespace mkxp_sandbox {
// Skip this script object if it's not an array
SANDBOX_AWAIT_AND_SET(script, rb_ary_entry, scripts, i);
SANDBOX_AWAIT_AND_SET(value, rb_obj_is_kind_of, script, sb()->rb_cArray());
if (value != SANDBOX_TRUE) {
if (!SANDBOX_VALUE_TO_BOOL(value)) {
continue;
}

12
binding-sandbox/bitmap-binding.h
View file

@ -79,20 +79,20 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE obj) {
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
Bitmap *bitmap;
Bitmap *orig;
VALUE operator()(VALUE self, VALUE obj) {
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self == obj) {
if (self == value) {
return self;
}
SANDBOX_AWAIT(rb_obj_init_copy, self, obj);
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
orig = get_private_data<Bitmap>(obj);
orig = get_private_data<Bitmap>(value);
GFX_GUARD_EXC(bitmap = new Bitmap(*orig););
SANDBOX_AWAIT(init_props, bitmap, self);
@ -104,7 +104,7 @@ namespace mkxp_sandbox {
}
)
return sb()->bind<struct coro>()()(self, obj);
return sb()->bind<struct coro>()()(self, value);
}
static VALUE dispose(VALUE self) {

36
binding-sandbox/etc-binding.h
View file

@ -71,13 +71,13 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE obj) {
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
VALUE operator()(VALUE self, VALUE obj) {
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self != obj) {
SANDBOX_AWAIT(rb_obj_init_copy, self, obj);
set_private_data(self, new Color(*get_private_data<Color>(obj)));
if (self != value) {
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
set_private_data(self, new Color(*get_private_data<Color>(value)));
}
}
@ -85,7 +85,7 @@ namespace mkxp_sandbox {
}
)
return sb()->bind<struct coro>()()(self, obj);
return sb()->bind<struct coro>()()(self, value);
}
static VALUE set(int32_t argc, wasm_ptr_t argv, VALUE self) {
@ -265,13 +265,13 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE obj) {
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
VALUE operator()(VALUE self, VALUE obj) {
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self != obj) {
SANDBOX_AWAIT(rb_obj_init_copy, self, obj);
set_private_data(self, new Tone(*get_private_data<Tone>(obj)));
if (self != value) {
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
set_private_data(self, new Tone(*get_private_data<Tone>(value)));
}
}
@ -279,7 +279,7 @@ namespace mkxp_sandbox {
}
)
return sb()->bind<struct coro>()()(self, obj);
return sb()->bind<struct coro>()()(self, value);
}
static VALUE set(int32_t argc, wasm_ptr_t argv, VALUE self) {
@ -455,13 +455,13 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE obj) {
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
VALUE operator()(VALUE self, VALUE obj) {
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self != obj) {
SANDBOX_AWAIT(rb_obj_init_copy, self, obj);
set_private_data(self, new Rect(*get_private_data<Rect>(obj)));
if (self != value) {
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
set_private_data(self, new Rect(*get_private_data<Rect>(value)));
}
}
@ -469,7 +469,7 @@ namespace mkxp_sandbox {
}
)
return sb()->bind<struct coro>()()(self, obj);
return sb()->bind<struct coro>()()(self, value);
}
static VALUE set(int32_t argc, wasm_ptr_t argv, VALUE self) {

287
binding-sandbox/font-binding.h
View file

@ -35,10 +35,51 @@ namespace mkxp_sandbox {
SANDBOX_DEF_DFREE(Font)
VALUE klass;
ID default_color_id;
VALUE default_color_klass;
VALUE default_color_obj;
VALUE default_names;
VALUE default_name;
wasm_size_t default_name_index;
SANDBOX_COROUTINE(collect_strings,
VALUE value;
VALUE entry;
wasm_ptr_t str;
wasm_size_t i;
wasm_size_t length;
void operator()(VALUE obj, std::vector<std::string> &out) {
BOOST_ASIO_CORO_REENTER (this) {
SANDBOX_AWAIT_AND_SET(value, rb_obj_is_kind_of, obj, sb()->rb_cString());
if (SANDBOX_VALUE_TO_BOOL(value)) {
SANDBOX_AWAIT_AND_SET(str, rb_string_value_cstr, &obj);
out.push_back((const char *)(**sb() + str));
} else {
SANDBOX_AWAIT_AND_SET(value, rb_obj_is_kind_of, obj, sb()->rb_cArray());
if (SANDBOX_VALUE_TO_BOOL(value)) {
SANDBOX_AWAIT_AND_SET(value, get_length, obj);
SANDBOX_AWAIT_AND_SET(length, rb_num2ulong, value);
for (i = 0; i < length; ++i) {
SANDBOX_AWAIT_AND_SET(entry, rb_ary_entry, obj, i);
/* Non-string objects are tolerated (ignored) */
SANDBOX_AWAIT_AND_SET(value, rb_obj_is_kind_of, entry, sb()->rb_cString());
if (SANDBOX_VALUE_TO_BOOL(value)) {
SANDBOX_AWAIT_AND_SET(str, rb_string_value_cstr, &entry);
out.push_back((const char *)(**sb() + str));
}
}
}
}
}
}
)
static VALUE initialize(int32_t argc, wasm_ptr_t argv, VALUE self) {
SANDBOX_COROUTINE(coro,
Font *font;
std::vector<std::string> *names;
VALUE names_obj;
int32_t size;
ID id;
VALUE klass;
@ -46,30 +87,109 @@ namespace mkxp_sandbox {
VALUE operator()(int32_t argc, wasm_ptr_t argv, VALUE self) {
BOOST_ASIO_CORO_REENTER (this) {
names = new std::vector<std::string>;
if (argc == 0) {
SANDBOX_AWAIT_AND_SET(klass, rb_obj_class, self);
SANDBOX_AWAIT_AND_SET(names_obj, rb_iv_get, klass, "default_name");
font = new Font();
} else if (argc == 1) {
font = new Font(NULL); // TODO: handle names
names_obj = ((VALUE *)(**sb() + argv))[0];
SANDBOX_AWAIT(collect_strings, names_obj, *names);
font = new Font(names);
} else {
SANDBOX_AWAIT_AND_SET(size, rb_num2int, ((VALUE *)(**sb() + argv))[1]);
font = new Font(NULL, size); // TODO: handle names
names_obj = ((VALUE *)(**sb() + argv))[0];
SANDBOX_AWAIT(collect_strings, names_obj, *names);
font = new Font(names, size);
}
set_private_data(self, font);
font->initDynAttribs();
/* This is semantically wrong; the new Font object should take
* a dup'ed object here in case of an array. Ditto for the setters.
* However the same bug/behavior exists in all RM versions. */
SANDBOX_AWAIT(rb_iv_set, self, "name", names_obj);
SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color");
SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id);
SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass);
set_private_data(obj, new Color());
set_private_data(obj, &font->getColor());
SANDBOX_AWAIT(rb_iv_set, self, "color", obj);
}
return SANDBOX_NIL;
}
~coro() {
delete names;
}
)
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
Font *font;
ID id;
VALUE klass;
VALUE obj;
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self != value) {
return self;
}
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
font = new Font(*get_private_data<Font>(value));
set_private_data(self, font);
font->initDynAttribs();
SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color");
SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id);
SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass);
set_private_data(obj, &font->getColor());
SANDBOX_AWAIT(rb_iv_set, self, "color", obj);
}
return self;
}
)
return sb()->bind<struct coro>()()(self, value);
}
static VALUE get_name(VALUE self) {
return sb()->bind<struct rb_iv_get>()()(self, "name");
}
static VALUE set_name(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
std::vector<std::string> *names;
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
names = new std::vector<std::string>;
SANDBOX_AWAIT(collect_strings, value, *names);
get_private_data<Font>(self)->setName(*names);
SANDBOX_AWAIT(rb_iv_set, self, "name", value);
}
return value;
}
~coro() {
delete names;
}
)
return sb()->bind<struct coro>()()(self, value);
}
static VALUE get_size(VALUE self) {
return sb()->bind<struct rb_ll2inum>()()(get_private_data<Font>(self)->getSize());
}
@ -91,6 +211,24 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(self, value);
}
static VALUE get_bold(VALUE self) {
return SANDBOX_BOOL_TO_VALUE(get_private_data<Font>(self)->getBold());
}
static VALUE set_bold(VALUE self, VALUE value) {
get_private_data<Font>(self)->setBold(SANDBOX_VALUE_TO_BOOL(value));
return value;
}
static VALUE get_italic(VALUE self) {
return SANDBOX_BOOL_TO_VALUE(get_private_data<Font>(self)->getItalic());
}
static VALUE set_italic(VALUE self, VALUE value) {
get_private_data<Font>(self)->setItalic(SANDBOX_VALUE_TO_BOOL(value));
return value;
}
static VALUE get_color(VALUE self) {
return sb()->bind<struct rb_iv_get>()()(self, "color");
}
@ -100,8 +238,102 @@ namespace mkxp_sandbox {
return value;
}
static VALUE todo(int32_t argc, wasm_ptr_t argv, VALUE self) {
return SANDBOX_NIL;
static VALUE get_default_name(VALUE self) {
return sb()->bind<struct rb_iv_get>()()(self, "default_name");
}
static VALUE set_default_name(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
std::vector<std::string> *names;
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
names = new std::vector<std::string>;
SANDBOX_AWAIT(collect_strings, value, *names);
get_private_data<Font>(self)->setName(*names);
SANDBOX_AWAIT(rb_iv_set, self, "default_name", value);
}
return value;
}
~coro() {
delete names;
}
)
return sb()->bind<struct coro>()()(self, value);
}
static VALUE get_default_size(VALUE self) {
return Font::getDefaultSize();
}
static VALUE set_default_size(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
int32_t size;
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
SANDBOX_AWAIT_AND_SET(size, rb_num2int, value);
Font::setDefaultSize(size);
}
return value;
}
)
return sb()->bind<struct coro>()()(self, value);
}
static VALUE get_default_bold(VALUE self) {
return SANDBOX_BOOL_TO_VALUE(Font::getDefaultBold());
}
static VALUE set_default_bold(VALUE self, VALUE value) {
Font::setDefaultBold(SANDBOX_VALUE_TO_BOOL(value));
return value;
}
static VALUE get_default_italic(VALUE self) {
return SANDBOX_BOOL_TO_VALUE(Font::getDefaultItalic());
}
static VALUE set_default_italic(VALUE self, VALUE value) {
Font::setDefaultItalic(SANDBOX_VALUE_TO_BOOL(value));
return value;
}
static VALUE get_default_color(VALUE self) {
return sb()->bind<struct rb_iv_get>()()(self, "default_color");
}
static VALUE set_default_color(VALUE self, VALUE value) {
get_private_data<Font>(self)->setDefaultColor(*get_private_data<Color>(value));
return value;
}
static VALUE exist(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
wasm_ptr_t str;
VALUE is_string;
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
SANDBOX_AWAIT_AND_SET(is_string, rb_obj_is_kind_of, value, sb()->rb_cString());
if (SANDBOX_VALUE_TO_BOOL(is_string)) {
SANDBOX_AWAIT_AND_SET(str, rb_string_value_cstr, &value);
return SANDBOX_BOOL_TO_VALUE(Font::doesExist((const char *)(**sb() + str)));
} else {
return SANDBOX_BOOL_TO_VALUE(Font::doesExist(NULL));
}
}
return SANDBOX_UNDEF;
}
)
return sb()->bind<struct coro>()()(self, value);
}
void operator()() {
@ -109,14 +341,51 @@ namespace mkxp_sandbox {
font_type = sb()->rb_data_type("Font", NULL, dfree, NULL, NULL, 0, 0, 0);
SANDBOX_AWAIT_AND_SET(klass, rb_define_class, "Font", sb()->rb_cObject());
SANDBOX_AWAIT(rb_define_alloc_func, klass, alloc);
Font::initDefaultDynAttribs();
SANDBOX_AWAIT_AND_SET(default_color_id, rb_intern, "Color");
SANDBOX_AWAIT_AND_SET(default_color_klass, rb_const_get, sb()->rb_cObject(), default_color_id);
SANDBOX_AWAIT_AND_SET(default_color_obj, rb_obj_alloc, default_color_klass);
set_private_data(default_color_obj, &Font::getDefaultColor());
SANDBOX_AWAIT(rb_iv_set, klass, "default_color", default_color_obj);
if (Font::getInitialDefaultNames().size() == 1) {
SANDBOX_AWAIT_AND_SET(default_names, rb_utf8_str_new_cstr, Font::getInitialDefaultNames()[0].c_str());
} else {
SANDBOX_AWAIT_AND_SET(default_names, rb_ary_new_capa, Font::getInitialDefaultNames().size());
for (default_name_index = 0; default_name_index < Font::getInitialDefaultNames().size(); ++default_name_index) {
SANDBOX_AWAIT_AND_SET(default_name, rb_utf8_str_new_cstr, Font::getInitialDefaultNames()[default_name_index].c_str());
SANDBOX_AWAIT(rb_ary_push, default_names, default_name);
}
}
SANDBOX_AWAIT(rb_iv_set, klass, "default_name", default_names);
SANDBOX_AWAIT(rb_define_method, klass, "initialize", (VALUE (*)(ANYARGS))initialize, -1);
SANDBOX_AWAIT(rb_define_method, klass, "name=", (VALUE (*)(ANYARGS))todo, -1);
SANDBOX_AWAIT(rb_define_method, klass, "initialize_copy", (VALUE (*)(ANYARGS))initialize_copy, -1);
SANDBOX_AWAIT(rb_define_method, klass, "name", (VALUE (*)(ANYARGS))get_name, 0);
SANDBOX_AWAIT(rb_define_method, klass, "name=", (VALUE (*)(ANYARGS))set_name, 1);
SANDBOX_AWAIT(rb_define_method, klass, "size", (VALUE (*)(ANYARGS))get_size, 0);
SANDBOX_AWAIT(rb_define_method, klass, "size=", (VALUE (*)(ANYARGS))set_size, 1);
SANDBOX_AWAIT(rb_define_method, klass, "bold=", (VALUE (*)(ANYARGS))todo, -1);
SANDBOX_AWAIT(rb_define_method, klass, "italic=", (VALUE (*)(ANYARGS))todo, -1);
SANDBOX_AWAIT(rb_define_method, klass, "bold", (VALUE (*)(ANYARGS))get_bold, 0);
SANDBOX_AWAIT(rb_define_method, klass, "bold=", (VALUE (*)(ANYARGS))set_bold, 1);
SANDBOX_AWAIT(rb_define_method, klass, "italic", (VALUE (*)(ANYARGS))get_italic, 0);
SANDBOX_AWAIT(rb_define_method, klass, "italic=", (VALUE (*)(ANYARGS))set_italic, 1);
SANDBOX_AWAIT(rb_define_method, klass, "color", (VALUE (*)(ANYARGS))get_color, 0);
SANDBOX_AWAIT(rb_define_method, klass, "color=", (VALUE (*)(ANYARGS))set_color, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_name", (VALUE (*)(ANYARGS))get_default_name, 0);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_name=", (VALUE (*)(ANYARGS))set_default_name, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_size", (VALUE (*)(ANYARGS))get_default_size, 0);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_size=", (VALUE (*)(ANYARGS))set_default_size, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_bold", (VALUE (*)(ANYARGS))get_default_bold, 0);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_bold=", (VALUE (*)(ANYARGS))set_default_bold, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_italic", (VALUE (*)(ANYARGS))get_default_italic, 0);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_italic=", (VALUE (*)(ANYARGS))set_default_italic, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_color", (VALUE (*)(ANYARGS))get_default_color, 0);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "default_color=", (VALUE (*)(ANYARGS))set_default_color, 1);
SANDBOX_AWAIT(rb_define_singleton_method, klass, "exist?", (VALUE (*)(ANYARGS))exist, 1);
}
}
)

12
binding-sandbox/table-binding.h
View file

@ -73,13 +73,13 @@ namespace mkxp_sandbox {
return sb()->bind<struct coro>()()(argc, argv, self);
}
static VALUE initialize_copy(VALUE self, VALUE obj) {
static VALUE initialize_copy(VALUE self, VALUE value) {
SANDBOX_COROUTINE(coro,
VALUE operator()(VALUE self, VALUE obj) {
VALUE operator()(VALUE self, VALUE value) {
BOOST_ASIO_CORO_REENTER (this) {
if (self != obj) {
SANDBOX_AWAIT(rb_obj_init_copy, self, obj);
set_private_data(self, new Table(*get_private_data<Table>(obj)));
if (self != value) {
SANDBOX_AWAIT(rb_obj_init_copy, self, value);
set_private_data(self, new Table(*get_private_data<Table>(value)));
}
}
@ -87,7 +87,7 @@ namespace mkxp_sandbox {
}
)
return sb()->bind<struct coro>()()(self, obj);
return sb()->bind<struct coro>()()(self, value);
}
static VALUE resize(int32_t argc, wasm_ptr_t argv, VALUE self) {

11
src/display/font.cpp
View file

@ -603,8 +603,18 @@ void Font::initDynAttribs()
void Font::initDefaultDynAttribs()
{
if (FontPrivate::defaultColor != &FontPrivate::defaultColorTmp)
{
delete FontPrivate::defaultColor;
FontPrivate::defaultColor = &FontPrivate::defaultColorTmp;
}
FontPrivate::defaultColor = new Color(FontPrivate::defaultColorTmp);
if (FontPrivate::defaultOutColor != &FontPrivate::defaultOutColorTmp)
{
delete FontPrivate::defaultOutColor;
FontPrivate::defaultOutColor = &FontPrivate::defaultOutColorTmp;
}
if (rgssVer >= 3)
FontPrivate::defaultOutColor = new Color(FontPrivate::defaultOutColorTmp);
}
@ -612,6 +622,7 @@ void Font::initDefaultDynAttribs()
void Font::initDefaults(const SharedFontState &sfs)
{
std::vector<std::string> &names = FontPrivate::initialDefaultNames;
names.clear();
#ifdef MKXPZ_RETRO // TODO: get from config
switch (1)