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

Korean IM crash bug fix, add L-ALT for mode switch.

Browse source
This commit is contained in:
Mark K. Kim 2007-04-30 04:04:39 +00:00
parent a85bc639be
commit 0ea24f916b
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/im.c
View file

@ -89,6 +89,9 @@ static const char* const im_tip_text[NUM_IM_TIPS] =
#endif #endif
/**
* Event types that im_event_*() functions need to handle.
*/
enum { enum {
IM_REQ_TRANSLATE, /* The ever-more important IM translation request */ IM_REQ_TRANSLATE, /* The ever-more important IM translation request */
IM_REQ_INIT, /* Initialization request */ IM_REQ_INIT, /* Initialization request */
@ -99,6 +102,9 @@ enum {
}; };
/**
* Match statuses.
*/
enum { enum {
MATCH_STAT_NONE = 0x00, MATCH_STAT_NONE = 0x00,
MATCH_STAT_NOMOSTATES = 0x01, MATCH_STAT_NOMOSTATES = 0x01,
@ -110,6 +116,9 @@ enum {
* TYPES * TYPES
*/ */
/**
* All im_event_*() functions have this type.
*/
typedef int (*IM_EVENT_FN)(IM_DATA*, SDL_keysym); /* IM_EVENT_FN type */ typedef int (*IM_EVENT_FN)(IM_DATA*, SDL_keysym); /* IM_EVENT_FN type */
@ -891,7 +900,7 @@ static int im_event_ko_isvowel(CHARMAP* cm, wchar_t c)
next = sm_search_shallow(start, (char)c); next = sm_search_shallow(start, (char)c);
unicode = next ? next->output : NULL; unicode = next ? next->output : NULL;
return (wcslen(unicode) == 1 && 0x314F <= unicode[0] && unicode[0] <= 0x3163); return (unicode && wcslen(unicode) == 1 && 0x314F <= unicode[0] && unicode[0] <= 0x3163);
} }
@ -961,14 +970,13 @@ static int im_event_ko(IM_DATA* im, SDL_keysym ks)
case SDLK_NUMLOCK: case SDLK_CAPSLOCK: case SDLK_SCROLLOCK: case SDLK_NUMLOCK: case SDLK_CAPSLOCK: case SDLK_SCROLLOCK:
case SDLK_LSHIFT: case SDLK_RSHIFT: case SDLK_LSHIFT: case SDLK_RSHIFT:
case SDLK_LCTRL: case SDLK_RCTRL: case SDLK_LCTRL: case SDLK_RCTRL:
case SDLK_LALT:
case SDLK_LMETA: case SDLK_RMETA: case SDLK_LMETA: case SDLK_RMETA:
case SDLK_LSUPER: case SDLK_RSUPER: case SDLK_LSUPER: case SDLK_RSUPER:
case SDLK_MODE: case SDLK_COMPOSE: case SDLK_MODE: case SDLK_COMPOSE:
break; break;
/* Right-Alt mapped to mode-switch */ /* Right-Alt mapped to mode-switch */
case SDLK_RALT: case SDLK_LALT: case SDLK_RALT:
cm.section = (++cm.section % SEC_TOTAL); /* Change section */ cm.section = (++cm.section % SEC_TOTAL); /* Change section */
im_softreset(im); /* Soft reset */ im_softreset(im); /* Soft reset */
@ -1239,7 +1247,7 @@ void im_free(IM_DATA* im)
*/ */
int im_read(IM_DATA* im, SDL_keysym ks) int im_read(IM_DATA* im, SDL_keysym ks)
{ {
IM_EVENT_FN im_event_fp = NULL; IM_EVENT_FN* im_event_fp = NULL;
int discard = 0; int discard = 0;
/* Sanity check */ /* Sanity check */
@ -1249,7 +1257,7 @@ int im_read(IM_DATA* im, SDL_keysym ks)
} }
/* Function pointer to the language-specific im_event_* function */ /* Function pointer to the language-specific im_event_* function */
im_event_fp = im_event_fns[im->lang]; im_event_fp = &im_event_fns[im->lang];
#ifdef DEBUG #ifdef DEBUG
if(im_event_fp) printf("Loading IM for %s...\n", lang_prefixes[im->lang]); if(im_event_fp) printf("Loading IM for %s...\n", lang_prefixes[im->lang]);

6
src/po/ko.po
View file

@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Tux Paint 0.9.16\n" "Project-Id-Version: Tux Paint 0.9.16\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-09-10 11:18-0700\n" "POT-Creation-Date: 2006-09-10 11:18-0700\n"
"PO-Revision-Date: 2006-03-25 06:50-0700\n" "PO-Revision-Date: 2007-04-29 23:10-0400\n"
"Last-Translator: Mark K. Kim <mkkim214@gmail.com>\n" "Last-Translator: Mark K. Kim <mkkim214@gmail.com>\n"
"Language-Team: N/A\n" "Language-Team: N/A\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -98,7 +98,7 @@ msgstr ""
#. especially important for users who have scroll buttons disabled. #. especially important for users who have scroll buttons disabled.
#. Translators should do whatever is needed to put crummy fonts last. #. Translators should do whatever is needed to put crummy fonts last.
msgid "oO" msgid "oO"
msgstr "oO" msgstr "ㄱㄴ"
#. distinct uppercase and lowercase #. distinct uppercase and lowercase
msgid "`\\%_@$~#{}<>^&*" msgid "`\\%_@$~#{}<>^&*"
@ -496,7 +496,7 @@ msgid "Play"
msgstr "" msgstr ""
msgid "Aa" msgid "Aa"
msgstr "" msgstr "A가"
#. FIXME: Move elsewhere! Or not?! #. FIXME: Move elsewhere! Or not?!
msgid "Yes" msgid "Yes"