lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lisyarus:7dd55d94a9ac76ea02705501952ed278c9caec53
Branches Tags
lisyarus:master
...
compare: lisyarus:151afec7f058fb39f18875162fcf97e70855e89b
Branches Tags
lisyarus:master

2 commits
7dd55d94a9 ... 151afec7f0

Author SHA1 Message Date
lisyarus
151afec7f0 Fix app context lifetime in emscripten
All checks were successful
Run tests / Run tests (push) Successful in 7m49s
Details
2026-07-04 16:31:34 +03:00
lisyarus
abf45f3dcb Fix handling key events (this also intercepts browser shortcuts, sadly) 2026-07-04 16:30:44 +03:00
3 changed files with 6 additions and 5 deletions
Show stats Expand all files Collapse all files

5
libs/sdl2/source/main.cpp
View file

@ -20,6 +20,7 @@
{ {
std::unique_ptr<psemek::app::application> application; std::unique_ptr<psemek::app::application> application;
std::unique_ptr<psemek::sdl2::window> window; std::unique_ptr<psemek::sdl2::window> window;
psemek::app::application::context context;
} em_state; } em_state;
#endif #endif
@ -59,7 +60,11 @@ int main(int argc, char ** argv) try
sdl2::window window(options); sdl2::window window(options);
#endif #endif
#ifdef __EMSCRIPTEN__
auto & context = em_state.context;
#else
app::application::context context; app::application::context context;
#endif
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
context.args.push_back(argv[i]); context.args.push_back(argv[i]);
context.show_cursor = [&](bool show){ window.show_cursor(show); }; context.show_cursor = [&](bool show){ window.show_cursor(show); };

4
libs/sdl2/source/window.cpp
View file

@ -22,10 +22,6 @@ namespace psemek::sdl2
window::window(psemek::app::application::options const & options) window::window(psemek::app::application::options const & options)
{ {
#ifdef __EMSCRIPTEN__
SDL_SetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT, "#canvas");
#endif
sdl_init_ = init(SDL_INIT_EVENTS | SDL_INIT_VIDEO); sdl_init_ = init(SDL_INIT_EVENTS | SDL_INIT_VIDEO);
std::uint32_t flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE; std::uint32_t flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE;

2
package/web/template.html
View file

@ -8,7 +8,7 @@
</style> </style>
</head> </head>
<body> <body>
<canvas id="canvas" oncontextmenu="event.preventDefault()"></canvas> <canvas id="canvas" tabindex="-1" oncontextmenu="event.preventDefault()"></canvas>
<script type="text/javascript"> <script type="text/javascript">
var Module = { var Module = {
canvas: document.getElementById('canvas'), canvas: document.getElementById('canvas'),