Skip to content

Implement SDL_GetKeyName #22921

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
Nov 13, 2024
Merged

Implement SDL_GetKeyName #22921

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
11 changes: 9 additions & 2 deletions src/library_sdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1767,9 +1767,16 @@ var LibrarySDL = {
SDL_GetKeyState: () => _SDL_GetKeyboardState(0),

SDL_GetKeyName__proxy: 'sync',
SDL_GetKeyName__deps: ['$stringToNewUTF8'],
SDL_GetKeyName__deps: ['$stringToUTF8', 'realloc'],
SDL_GetKeyName: (key) => {
SDL.keyName ||= stringToNewUTF8('unknown key');
var name = '';
/* ASCII A-Z or 0-9 */
if ((key >= 97 && key <= 122) || (key >= 48 && key <= 57)) {
name = String.fromCharCode(key);
}
var size = lengthBytesUTF8(name) + 1;
SDL.keyName = _realloc(SDL.keyName, size);
stringToUTF8(name, SDL.keyName, size);
Copy link
Member

@kripken kripken Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add keyName: 0 to the SDL class for closure? Though if it doesn't error, maybe it doesn't matter.

Copy link
Collaborator Author

@sbc100 sbc100 Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to do that kind of thing if (and only if) closure complains.

return SDL.keyName;
},

Expand Down
11 changes: 8 additions & 3 deletions test/browser/test_sdl_key_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

#include <stdio.h>
#include <SDL/SDL.h>
#include <SDL/SDL_ttf.h>
#ifdef __EMSCRIPTEN__
#include <emscripten.h>
#endif

int result = 1;

Expand All @@ -21,13 +22,13 @@ void one() {
case SDL_KEYDOWN:
if (!keys[event.key.keysym.sym]) {
keys[event.key.keysym.sym] = 1;
printf("key down: sym %d scancode %d\n", event.key.keysym.sym, event.key.keysym.scancode);
printf("key down: sym=%d scancode=%d name=%s\n", event.key.keysym.sym, event.key.keysym.scancode, SDL_GetKeyName(event.key.keysym.sym));
}
break;
case SDL_KEYUP:
if (keys[event.key.keysym.sym]) {
keys[event.key.keysym.sym] = 0;
printf("key up: sym %d scancode %d\n", event.key.keysym.sym, event.key.keysym.scancode);
printf("key up: sym=%d scancode=%d name=%s\n", event.key.keysym.sym, event.key.keysym.scancode, SDL_GetKeyName(event.key.keysym.sym));
}
break;
}
Expand All @@ -40,7 +41,11 @@ int main(int argc, char **argv) {
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE);

#if __EMSCRIPTEN__
emscripten_set_main_loop(one, 0, 0);
#else
while (1) one();
#endif

return 0;
}
Expand Down
22 changes: 22 additions & 0 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,6 +2392,28 @@ def test_sdl_scan_code_from_key(self):
''')
self.do_runf('main.c', '204\n')

def test_sdl_get_key_name(self):
create_file('main.c', r'''
#include <stdio.h>
#include <SDL/SDL_keyboard.h>

int main() {
printf("a -> '%s'\n", SDL_GetKeyName(SDLK_a));
printf("z -> '%s'\n", SDL_GetKeyName(SDLK_z));
printf("0 -> '%s'\n", SDL_GetKeyName(SDLK_0));
printf("0 -> '%s'\n", SDL_GetKeyName(SDLK_9));
printf("F1 -> '%s'\n", SDL_GetKeyName(SDLK_F1));
return 0;
}
''')
self.do_runf('main.c', '''\
a -> 'a'
z -> 'z'
0 -> '0'
0 -> '9'
F1 -> ''
''')

@requires_network
def test_sdl2_mixer_wav(self):
self.emcc(test_file('browser/test_sdl2_mixer_wav.c'), ['-sUSE_SDL_MIXER=2'], output_filename='a.out.js')
Expand Down
Loading