Skip to content

wasm: controller is not multiphase init + workaround for wasm 313t #3137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

wasm: controller is not multiphase init + workaround for wasm 313t #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src_c/_sdl2/controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,15 @@ static PyTypeObject pgController_Type = {
.tp_members = controller_members,
};

/* TODO: multiphase init
#if PY_VERSION_HEX >= 0x030D0000
static struct PyModuleDef_Slot mod_controller_slots[] = {
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
{0, NULL}
};
#endif
*/

MODINIT_DEFINE(controller)
{
PyObject *module;
Expand All @@ -553,7 +562,13 @@ MODINIT_DEFINE(controller)
.m_name = "controller",
.m_doc = DOC_SDL2_CONTROLLER,
.m_size = -1,
.m_methods = _controller_module_methods};
.m_methods = _controller_module_methods,
/*
#if PY_VERSION_HEX >= 0x030D0000
.m_slots = mod_controller_slots,
#endif
*/
};

import_pygame_base();
if (PyErr_Occurred()) {
Expand All @@ -566,7 +581,11 @@ MODINIT_DEFINE(controller)
}

module = PyModule_Create(&_module);

#if Py_GIL_DISABLED
#if (defined(__EMSCRIPTEN__) || defined(__wasi__))
PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
#endif
#endif
if (!module) {
return NULL;
}
Expand Down
34 changes: 17 additions & 17 deletions src_c/static.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#define NO_PYGAME_C_API

#define CONTROLLER_NOPYX

#define PYGAMEAPI_RECT_INTERNAL
#define PYGAMEAPI_EVENT_INTERNAL
#define PYGAMEAPI_JOYSTICK_INTERNAL
Expand Down Expand Up @@ -150,11 +152,13 @@ PyInit_mixer(void);
PyMODINIT_FUNC
PyInit_system(void);

#if defined(CONTROLLER_NOPYX)
PyMODINIT_FUNC
PyInit_controller(void);

#else
PyMODINIT_FUNC
PyInit_controller_old(void);
#endif

PyMODINIT_FUNC
PyInit_transform(void);
Expand Down Expand Up @@ -216,48 +220,44 @@ load_submodule_mphase(const char *parent, PyObject *mdef, PyObject *spec,
{
char fqn[1024];
snprintf(fqn, sizeof(fqn), "%s.%s", parent, alias);

PyObject *modules = PyImport_GetModuleDict();

Py_DECREF(PyObject_GetAttrString(spec, "name"));

PyObject_SetAttrString(spec, "name", PyUnicode_FromString(alias));

PyObject *pmod = PyDict_GetItemString(modules, parent);

PyObject *mod = PyModule_FromDefAndSpec((PyModuleDef *)mdef, spec);

PyDict_SetItemString(PyModule_GetDict(mod), "__package__",
PyUnicode_FromString(parent));

// TODO SET PACKAGE

PyModule_ExecDef(mod, (PyModuleDef *)mdef);

if (!pmod) {
snprintf(fqn, sizeof(fqn), "ERROR: %s.%s", parent, alias);
puts(fqn);
PyErr_Print();
PyErr_Clear();
}
else {
if (pmod) {
PyDict_SetItemString(modules, fqn, mod);
PyDict_SetItemString(PyModule_GetDict(mod), "__name__",
PyUnicode_FromString(fqn));
PyModule_AddObjectRef(pmod, alias, mod);
Py_XDECREF(mod);
}
if (!pmod || PyErr_Occurred()) {
snprintf(fqn, sizeof(fqn), "Error after init in : %s.%s\n", parent,
alias);
fputs(fqn, stderr);
PyErr_Print();
PyErr_Clear();
}
}

static PyObject *
mod_pygame_import_cython(PyObject *self, PyObject *spec)
{
load_submodule_mphase("pygame._sdl2", PyInit_sdl2(), spec, "sdl2");
load_submodule_mphase("pygame._sdl2", PyInit_mixer(), spec, "mixer");
#if defined(CONTROLLER_NOPYX)
load_submodule("pygame._sdl2", PyInit_controller(), "controller");
#else
load_submodule_mphase("pygame._sdl2", PyInit_controller_old(), spec,
"controller_old");
load_submodule_mphase("pygame._sdl2", PyInit_controller(), spec,
"controller");
#endif
load_submodule_mphase("pygame._sdl2", PyInit_audio(), spec, "audio");
load_submodule_mphase("pygame._sdl2", PyInit_video(), spec, "video");

Expand Down
Loading