Merge branch 'master' into sdl2.0

There are problems with im that should be investigated...
This commit is contained in:
Pere Pujal i Carabantes 2021-10-24 11:47:54 +02:00
commit 9cf77f684c
184 changed files with 9413 additions and 8107 deletions

View file

@ -1446,7 +1446,6 @@ static int im_event_ja(IM_DATA * im, SDL_Event event)
case SDLK_RSHIFT:
case SDLK_LCTRL:
case SDLK_RCTRL:
case SDLK_LALT:
case SDLK_LGUI:
case SDLK_RGUI:
case SDLK_MENU:
@ -1454,8 +1453,9 @@ static int im_event_ja(IM_DATA * im, SDL_Event event)
case SDLK_APPLICATION:
break;
/* Right-Alt mapped to mode-switch */
/* Left-Alt & Right-Alt mapped to mode-switch */
case SDLK_RALT:
case SDLK_LALT:
cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */
@ -1703,7 +1703,7 @@ static int im_event_ko(IM_DATA * im, SDL_Event event)
case SDLK_APPLICATION:
break;
/* Right-Alt mapped to mode-switch */
/* Left-Alt & Right-Alt mapped to mode-switch */
case SDLK_LALT:
case SDLK_RALT:
cm.section = ((cm.section + 1) % SEC_TOTAL); /* Change section */