From 970cec2a8c9be7f2bdfb3de2090162be3f277914 Mon Sep 17 00:00:00 2001
From: Choe Hwanjin <choe.hwanjin@gmail.com>
Date: Sun, 18 Sep 2022 14:00:56 +0900
Subject: keyboard: Add hangul_ic_switch_keyboard_table() api

HangulKeyboard is support 4 keycode-to-char mapping table.
A new api hangul_ic_switch_keyboard_table() changes the
current mapping table according to the specified table id.

Change tableid to table_id for varible name consistency.
---
 hangul/hangul.h             |  1 +
 hangul/hangulinputcontext.c | 16 +++++++++++++++-
 hangul/hangulkeyboard.c     | 20 ++++++++++----------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/hangul/hangul.h b/hangul/hangul.h
index 36156db..c9201bf 100644
--- a/hangul/hangul.h
+++ b/hangul/hangul.h
@@ -138,6 +138,7 @@ void hangul_ic_set_keyboard(HangulInputContext *hic,
 			    const HangulKeyboard *keyboard);
 void hangul_ic_select_keyboard(HangulInputContext *hic,
 			       const char* id);
+void hangul_ic_switch_keyboard_table(HangulInputContext *hic, int table_id);
 void hangul_ic_connect_callback(HangulInputContext* hic, const char* event,
 				void* callback, void* user_data);
 
diff --git a/hangul/hangulinputcontext.c b/hangul/hangulinputcontext.c
index cd54945..a08ec8a 100644
--- a/hangul/hangulinputcontext.c
+++ b/hangul/hangulinputcontext.c
@@ -197,6 +197,7 @@ struct _HangulInputContext {
     int type;
 
     const HangulKeyboard*    keyboard;
+    int keyboard_table_id;
 
     HangulBuffer buffer;
     int output_mode;
@@ -1079,7 +1080,7 @@ hangul_ic_process(HangulInputContext *hic, int ascii)
     hic->preedit_string[0] = 0;
     hic->commit_string[0] = 0;
 
-    c = hangul_keyboard_get_mapping(hic->keyboard, 0, ascii);
+    c = hangul_keyboard_get_mapping(hic->keyboard, hic->keyboard_table_id, ascii);
     if (hic->on_translate != NULL)
 	hic->on_translate(hic, ascii, &c, hic->on_translate_data);
 
@@ -1464,6 +1465,16 @@ hangul_ic_select_keyboard(HangulInputContext *hic, const char* id)
 
     keyboard = hangul_keyboard_list_get_keyboard(id);
     hic->keyboard = keyboard;
+    hic->keyboard_table_id = 0;
+}
+
+void
+hangul_ic_switch_keyboard_table(HangulInputContext *hic, int table_id)
+{
+    if (hic == NULL)
+        return;
+
+    hic->keyboard_table_id = table_id;
 }
 
 void
@@ -1493,6 +1504,9 @@ hangul_ic_new(const char* keyboard)
     if (hic == NULL)
 	return NULL;
 
+    hic->keyboard = NULL;
+    hic->keyboard_table_id = 0;
+
     hic->preedit_string[0] = 0;
     hic->commit_string[0] = 0;
     hic->flushed_string[0] = 0;
diff --git a/hangul/hangulkeyboard.c b/hangul/hangulkeyboard.c
index 11354d8..1d23ed3 100644
--- a/hangul/hangulkeyboard.c
+++ b/hangul/hangulkeyboard.c
@@ -427,18 +427,18 @@ hangul_keyboard_set_name(HangulKeyboard* keyboard, const char* name)
 }
 
 ucschar
-hangul_keyboard_get_mapping(const HangulKeyboard* keyboard, int tableid, unsigned key)
+hangul_keyboard_get_mapping(const HangulKeyboard* keyboard, int table_id, unsigned key)
 {
     if (keyboard == NULL)
 	return 0;
 
-    if (tableid >= countof(keyboard->table))
-	return 0;
+    if (table_id >= countof(keyboard->table))
+        return 0;
 
     if (key >= HANGUL_KEYBOARD_TABLE_SIZE)
 	return 0;
 
-    ucschar* table = keyboard->table[tableid];
+    ucschar* table = keyboard->table[table_id];
     if (table == NULL)
 	return 0;
 
@@ -446,18 +446,18 @@ hangul_keyboard_get_mapping(const HangulKeyboard* keyboard, int tableid, unsigne
 }
 
 static void
-hangul_keyboard_set_mapping(HangulKeyboard *keyboard, int tableid, unsigned key, ucschar value)
+hangul_keyboard_set_mapping(HangulKeyboard *keyboard, int table_id, unsigned key, ucschar value)
 {
     if (keyboard == NULL)
 	return;
 
-    if (tableid >= countof(keyboard->table))
-	return;
+    if (table_id >= countof(keyboard->table))
+        return;
 
     if (key >= HANGUL_KEYBOARD_TABLE_SIZE)
 	return;
 
-    if (keyboard->table[tableid] == NULL) {
+    if (keyboard->table[table_id] == NULL) {
 	ucschar* new_table = malloc(sizeof(ucschar) * HANGUL_KEYBOARD_TABLE_SIZE);
 	if (new_table == NULL)
 	    return;
@@ -466,10 +466,10 @@ hangul_keyboard_set_mapping(HangulKeyboard *keyboard, int tableid, unsigned key,
 	for (i = 0; i < HANGUL_KEYBOARD_TABLE_SIZE; ++i) {
 	    new_table[i] = 0;
 	}
-	keyboard->table[tableid] = new_table;
+        keyboard->table[table_id] = new_table;
     }
 
-    ucschar* table = keyboard->table[tableid];
+    ucschar* table = keyboard->table[table_id];
     table[key] = value;
 }
 
-- 
cgit v1.2.1