From 0748ae316cde3b173e78d964fa37012736ee0fbb Mon Sep 17 00:00:00 2001 From: Choe Hwanjin Date: Tue, 14 Dec 2004 22:41:59 +0900 Subject: Change api of hangul_ic_filter(); remove capslock argument. git-svn-id: http://kldp.net/svn/hangul/trunk/hangul@13 8f00fcd2-89fc-0310-932e-b01be5b65e01 --- hangul/hangul.h | 11 ++++++----- hangul/hangulinputcontext.c | 14 +++----------- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'hangul') diff --git a/hangul/hangul.h b/hangul/hangul.h index 7f45594..11e502c 100644 --- a/hangul/hangul.h +++ b/hangul/hangul.h @@ -54,14 +54,14 @@ typedef struct _HangulJamoCombination HangulJamoCombination; typedef struct _HangulBuffer HangulBuffer; typedef struct _HangulInputContext HangulInputContext; -enum { +typedef enum { HANGUL_KEYBOARD_2, HANGUL_KEYBOARD_32, HANGUL_KEYBOARD_3FINAL, HANGUL_KEYBOARD_390, HANGUL_KEYBOARD_3NOSHIFT, HANGUL_KEYBOARD_3YETGUL -}; +} HangulKeyboardType; enum { HANGUL_OUTPUT_SYLLABLE, @@ -99,14 +99,15 @@ struct _HangulInputContext { wchar_t commit_string[64]; }; -HangulInputContext* hangul_ic_new(int keyboard); +HangulInputContext* hangul_ic_new(HangulKeyboardType keyboard); void hangul_ic_delete(HangulInputContext *hic); -bool hangul_ic_filter(HangulInputContext *hic, int ascii, bool capslock); +bool hangul_ic_filter(HangulInputContext *hic, int ascii); void hangul_ic_reset(HangulInputContext *hic); bool hangul_ic_backspace(HangulInputContext *hic); void hangul_ic_set_output_mode(HangulInputContext *hic, int mode); -void hangul_ic_set_keyboard(HangulInputContext *hic, int keyboard); +void hangul_ic_set_keyboard(HangulInputContext *hic, + HangulKeyboardType keyboard); const wchar_t* hangul_ic_get_preedit_string(HangulInputContext *hic); const wchar_t* hangul_ic_get_commit_string(HangulInputContext *hic); diff --git a/hangul/hangulinputcontext.c b/hangul/hangulinputcontext.c index c54537d..c187ecb 100644 --- a/hangul/hangulinputcontext.c +++ b/hangul/hangulinputcontext.c @@ -434,21 +434,13 @@ hangul_ic_filter_3(HangulInputContext *hic, wchar_t ch) } bool -hangul_ic_filter(HangulInputContext *hic, int ascii, bool capslock) +hangul_ic_filter(HangulInputContext *hic, int ascii) { wchar_t ch; if (hic == NULL) return false; - if (capslock) { - if (isupper(ascii)) { - ascii = tolower(ascii); - } else { - ascii = toupper(ascii); - } - } - ch = hangul_ic_translate_jamo(hic, ascii); hic->preedit_string[0] = L'\0'; @@ -513,7 +505,7 @@ hangul_ic_set_output_mode(HangulInputContext *hic, int mode) } void -hangul_ic_set_keyboard(HangulInputContext *hic, int keyboard) +hangul_ic_set_keyboard(HangulInputContext *hic, HangulKeyboardType keyboard) { if (hic == NULL) return; @@ -566,7 +558,7 @@ hangul_ic_set_keyboard(HangulInputContext *hic, int keyboard) } HangulInputContext* -hangul_ic_new(int keyboard) +hangul_ic_new(HangulKeyboardType keyboard) { HangulInputContext *hic; -- cgit v1.2.1