d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix keyboard problems introduced in improvements 

Handling of a lot of ordinary keys was broken, e.g. number row and
non-alphanumeric keys, especially with Shift.

I think what's broken has been fixed, but have reverted the improvement
that Controller/vector is only called once per keypress. Many keys cause
Controller/vector to be called twice, but only once with Controller/key
nonzero.
This commit is contained in:
Andrew Alderwick 2021-06-20 22:14:06 +01:00
parent a683375567
commit b3ffe598c4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/uxnemu.c
View File

@ -145,6 +145,7 @@ init(void)
return error("Texture", SDL_GetError()); return error("Texture", SDL_GetError());
SDL_UpdateTexture(bgTexture, NULL, ppu.bg.pixels, 4); SDL_UpdateTexture(bgTexture, NULL, ppu.bg.pixels, 4);
SDL_UpdateTexture(fgTexture, NULL, ppu.fg.pixels, 4); SDL_UpdateTexture(fgTexture, NULL, ppu.fg.pixels, 4);
SDL_StartTextInput();
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
SDL_zero(as); SDL_zero(as);
as.freq = SAMPLE_FREQUENCY; as.freq = SAMPLE_FREQUENCY;
@ -188,7 +189,11 @@ doctrl(Uxn *u, SDL_Event *event, int z)
Uint8 flag = 0x00; Uint8 flag = 0x00;
SDL_Keymod mods = SDL_GetModState(); SDL_Keymod mods = SDL_GetModState();
devctrl->dat[2] &= 0xf8; devctrl->dat[2] &= 0xf8;
if(mods & KMOD_CTRL) devctrl->dat[2] |= 0x01; if(mods & KMOD_CTRL) {
devctrl->dat[2] |= 0x01;
if(z && event->key.keysym.sym >= SDLK_a && event->key.keysym.sym <= SDLK_z)
devctrl->dat[3] = event->key.keysym.sym & 0x1f;
}
if(mods & KMOD_ALT) devctrl->dat[2] |= 0x02; if(mods & KMOD_ALT) devctrl->dat[2] |= 0x02;
if(mods & KMOD_SHIFT) devctrl->dat[2] |= 0x04; if(mods & KMOD_SHIFT) devctrl->dat[2] |= 0x04;
switch(event->key.keysym.sym) { switch(event->key.keysym.sym) {
@ -204,22 +209,12 @@ doctrl(Uxn *u, SDL_Event *event, int z)
case SDLK_DOWN: flag = 0x20; break; case SDLK_DOWN: flag = 0x20; break;
case SDLK_LEFT: flag = 0x40; break; case SDLK_LEFT: flag = 0x40; break;
case SDLK_RIGHT: flag = 0x80; break; case SDLK_RIGHT: flag = 0x80; break;
case SDLK_DELETE: devctrl->dat[3] = z ? 0x7f : 0x00; break;
} }
if(z) if(z)
devctrl->dat[2] |= flag; devctrl->dat[2] |= flag;
else else
devctrl->dat[2] &= ~flag; devctrl->dat[2] &= ~flag;
if(z && event->key.keysym.sym < 0x80) {
devctrl->dat[3] = event->key.keysym.sym;
if(devctrl->dat[3] >= 0x60 && devctrl->dat[3] < 0x7f) {
if(devctrl->dat[2] & 0x01)
devctrl->dat[3] &= ~0x60;
else if(!(devctrl->dat[2] & 0x04) ^ !(mods & KMOD_CAPS))
devctrl->dat[3] &= ~0x20;
}
} else {
devctrl->dat[3] = 0;
}
} }
#pragma mark - Devices #pragma mark - Devices
@ -364,10 +359,13 @@ start(Uxn *u)
case SDL_QUIT: case SDL_QUIT:
quit(); quit();
break; break;
case SDL_TEXTINPUT:
devctrl->dat[3] = event.text.text[0];
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: case SDL_KEYUP:
doctrl(u, &event, event.type == SDL_KEYDOWN); doctrl(u, &event, event.type == SDL_KEYDOWN);
evaluxn(u, mempeek16(devctrl->dat, 0)); evaluxn(u, mempeek16(devctrl->dat, 0));
devctrl->dat[3] = 0;
break; break;
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL:
devmouse->dat[7] = event.wheel.y; devmouse->dat[7] = event.wheel.y;