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

Merge branch 'master' into sdl2.0

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

31
src/onscreen_keyboard.c
View file

@ -52,35 +52,8 @@ static void print_composemap(osk_composenode * composemap, char *sp);
#endif
#ifdef WIN32
#include <iconv.h>
#define wcstok(line, delim, pointer) wcstok(line, delim)
#define strtok_r(line, delim, pointer) strtok(line, delim)
static void mtw(wchar_t * wtok, char *tok);
static void mtw(wchar_t * wtok, char *tok)
{
/* workaround using iconv to get a functionallity somewhat approximate as mbstowcs() */
Uint16 *ui16;
char *wrptr;
size_t n, in, out;
iconv_t trans;
n = 255;
in = 250;
out = 250;
ui16 = malloc(sizeof(Uint16) * 255);
wrptr = (char *)ui16;
trans = iconv_open("WCHAR_T", "UTF-8");
iconv(trans, (const char **)&tok, &in, &wrptr, &out);
*((wchar_t *) wrptr) = L'\0';
swprintf(wtok, L"%ls", ui16);
free(ui16);
iconv_close(trans);
}
#define mbstowcs(wtok, tok, size) mtw(wtok, tok)
#include <windows.h>
#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,MB_COMPOSITE,tok,-1,wtok,size)
#endif
struct osk_keyboard *osk_create(char * layout_name, SDL_Surface * canvas,