diff options
Diffstat (limited to 'src/hangulin.c')
-rw-r--r-- | src/hangulin.c | 69 |
1 files changed, 20 insertions, 49 deletions
diff --git a/src/hangulin.c b/src/hangulin.c index 7f41509e83..c04a1800ba 100644 --- a/src/hangulin.c +++ b/src/hangulin.c @@ -96,9 +96,7 @@ static short_u kind_table_for_3[] = * 3 bulsik: (current initial sound, input english) -> compound initial sound. */ -static int comfcon3(v, c) -int v; -int c; +static int comfcon3(int v, int c) { if (v == 2 && c == 2) return 3; @@ -117,9 +115,7 @@ int c; * 3 bulsik: (current vowel, input english) -> compound vowel. */ -static int comvow3(v, c) -int v; -int c; +static int comvow3(int v, int c) { switch (v) { case 13: /* ¤Ç */ @@ -156,9 +152,7 @@ int c; * VIM: V = initial sound, I = medial vowel, M = final consonant. */ -static int comcon3(k, c) -int k; -int c; +static int comcon3(int k, int c) { switch (k) { case 2: /* ¤¡ */ @@ -212,8 +206,7 @@ int c; /****** 2 ¹ú½ÄÀÚÆÇÀ» À§ÇÑ ·çƾ (Routines for 2 bulsik keyboard) ******/ /**********************************************************************/ -static int kind_table_for_2(c) -int c; +static int kind_table_for_2(int c) { static char_u table[] = { @@ -235,8 +228,7 @@ int c; * (2 bulsik: conversion english char. to initial sound of compound type) * °á°ú: ÃʼºÀÌ ¾Æ´Ï¸é 0 (If it is not initial sound, return 0). */ -static int fcon(c) -int c; +static int fcon(int c) { static char_u table[] = { @@ -259,8 +251,7 @@ int c; * (2 bulsik: conversion english char. to medial vowel) * °á°ú: Áß¼ºÀÌ ¾Æ´Ï¸é 0 (If it is not medial vowel, return 0). */ -static int vow(c) -int c; +static int vow(int c) { static char_u table[] = { @@ -282,8 +273,7 @@ int c; * (2 bulsik: conversion english char. to prop) * °á°ú: ¹ÞħÀÌ ¾Æ´Ï¸é 0 (If not prop, return 0) */ -static int lcon(c) -int c; +static int lcon(int c) { static char_u table[] = { @@ -304,9 +294,7 @@ int c; * (2 bulsik: conversion (curr. prop, input english) to prop) */ -static int comcon2(k, c) -int k; -int c; +static int comcon2(int k, int c) { switch (k) { case 2: /* ¤¡ */ @@ -359,9 +347,7 @@ int c; * vowel) */ -static int comvow2(v, c) -int v; -int c; +static int comvow2(int v, int c) { switch (v) { case 13: /* ¤Ç */ @@ -396,22 +382,21 @@ int c; return 0; } -int hangul_input_state_get() { +int hangul_input_state_get(void) { return hangul_input_state; } -void hangul_input_state_set(state) -int state; +void hangul_input_state_set(int state) { hangul_input_state = state; hangul_input_clear(); } -int im_get_status() { +int im_get_status(void) { return hangul_input_state_get(); } -void hangul_input_state_toggle() { +void hangul_input_state_toggle(void) { if (hangul_input_state_get()) { hangul_input_state_set(0); if (composing_hangul) { @@ -428,9 +413,7 @@ void hangul_input_state_toggle() { } -static int hangul_automata2(buf, c) -char_u *buf; -int_u *c; +static int hangul_automata2(char_u *buf, int_u *c) { int t,t2; @@ -570,9 +553,7 @@ int_u *c; return AUTOMATA_ERROR; /* RrEeAaLlLlYy EeRrRrOoRr */ } -static int hangul_automata3(buf, c) -char_u *buf; -int_u *c; +static int hangul_automata3(char_u *buf, int_u *c) { int t, t2; @@ -665,7 +646,7 @@ int_u *c; return AUTOMATA_SPECIAL; } -void hangul_keyboard_set() { +void hangul_keyboard_set(void) { int keyboard; char *s; @@ -683,9 +664,7 @@ void hangul_keyboard_set() { } } -int hangul_input_process(s, len) -char_u *s; -int len; +int hangul_input_process(char_u *s, int len) { int n; unsigned int c; @@ -746,7 +725,7 @@ int len; return len; } -void hangul_input_clear() { +void hangul_input_clear(void) { sp = 0; f = F_NULL; m = M_NULL; @@ -1416,11 +1395,7 @@ static const char_u johab_lcon_to_wan[] = 0xbb, 0xbc, 0xbd, 0xbe /* ¤», ¤¼, ¤½, ¤¾ */ }; -static void convert_ks_to_3(src, fp, mp, lp) -const char_u *src; -int *fp; -int *mp; -int *lp; +static void convert_ks_to_3(const char_u *src, int *fp, int *mp, int *lp) { int h = *src; int low = *(src + 1); @@ -1447,11 +1422,7 @@ int *lp; } } -static int convert_3_to_ks(fv, mv, lv, des) -int fv; -int mv; -int lv; -char_u *des; +static int convert_3_to_ks(int fv, int mv, int lv, char_u *des) { char_u key[3]; register int hi, lo, mi = 0, result, found; |