diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index 335d62b..a9a0f2c 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -178,13 +178,29 @@ WnnInstance::WnnInstance (WnnFactory *factory, const String& encoding, int id) : IMEngineInstanceBase (factory, encoding, id) { + m_iconv.set_encoding ("EUC-JP"); + m_connected = false; + init(); +} + +WnnInstance::~ WnnInstance() +{ +} + + +/*! + \fn WnnInstance::init() + */ +void WnnInstance::init() +{ m_conversion = false; m_lookup = false; - m_connected = false; + + // @todo jserver�Ȥ���³��������ڤ�褦�ˤ��٤��� + host = _scim_config->read(String(SCIM_CONFIG_WNN_SERVER),String(SCIM_DEFAULT_WNN_SERVER)); rc = _scim_config->read(String(SCIM_CONFIG_WNN_RC),String(SCIM_DEFAULT_WNN_RC)); alp = _scim_config->read(String(SCIM_CONFIG_WNN_ALP),SCIM_DEFAULT_WNN_ALP); - m_iconv.set_encoding ("EUC-JP"); // �ǥե���ȥ������ꡣ scim_string_to_key_list(k_conversion_start, @@ -241,11 +257,6 @@ scim_string_to_key_list(k_convert_katakana, _scim_config->read(String(SCIM_CONFIG_WNN_KEY_CONVERT_KATAKANA), String(SCIM_DEFAULT_WNN_KEY_CONVERT_KATAKANA))); - -} - -WnnInstance::~ WnnInstance() -{ } @@ -651,3 +662,4 @@ } + diff --git a/scim-wnn/src/scim_wnn_imengine.h b/scim-wnn/src/scim_wnn_imengine.h index 42edc0c..d323287 100644 --- a/scim-wnn/src/scim_wnn_imengine.h +++ b/scim-wnn/src/scim_wnn_imengine.h @@ -97,6 +97,7 @@ bool process_conversion_key_event(const KeyEvent &key); void startConversion(WideString s); void createLookupTable(WnnConversionList cList); + void init(); private: WnnKeyEventList