notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Onscreen keyboard working on Windows, by TOYAMA Shin-ichi.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-12-15 20:35:43 +01:00
parent 7bc0e2c157
commit 4749214383
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/im.c
View file

@ -54,6 +54,11 @@
#include "android_mbstowcs.h" #include "android_mbstowcs.h"
#endif #endif
#ifdef WIN32
#include <windows.h>
#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,0,tok,-1,wtok,size)
#endif
/* *************************************************************************** /* ***************************************************************************
* I18N GETTEXT * I18N GETTEXT
*/ */

10
src/onscreen_keyboard.c
View file

@ -53,7 +53,8 @@ static void print_composemap(osk_composenode * composemap, char *sp);
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,MB_COMPOSITE,tok,-1,wtok,size) #define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,0,tok,-1,wtok,size)
#define wcstombs(tok, wtok, size) WideCharToMultiByte(CP_UTF8,0,wtok,-1,tok,size,NULL,NULL)
#endif #endif
struct osk_keyboard *osk_create(char * layout_name, SDL_Surface * canvas, struct osk_keyboard *osk_create(char * layout_name, SDL_Surface * canvas,
@ -1829,9 +1830,12 @@ struct osk_keyboard *osk_clicked(on_screen_keyboard * keyboard, int x, int y)
if (keyboard->composed_type == 1) if (keyboard->composed_type == 1)
wcstombs(event.text.text, keyboard->composed, 16); wcstombs(event.text.text, keyboard->composed, 16);
// event.text.text = *keyboard->composed; // event.text.text = *keyboard->composed;
else else{
snprintf(event.text.text, 16, "%lc", keysym2unicode(mnemo2keysym(mnemo, keyboard), keyboard)); //snprintf(event.text.text, 16, "%lc", keysym2unicode(mnemo2keysym(mnemo, keyboard), keyboard));
int iwc = keysym2unicode(mnemo2keysym(mnemo, keyboard), keyboard);
wcstombs(event.text.text, (wchar_t *) &iwc, 16);
//event.text.text = keysym2unicode(mnemo2keysym(mnemo, keyboard), keyboard); //event.text.text = keysym2unicode(mnemo2keysym(mnemo, keyboard), keyboard);
}
clear_dead_sticks(keyboard); clear_dead_sticks(keyboard);
event.type = SDL_TEXTINPUT; event.type = SDL_TEXTINPUT;