コミット: efe9a0d83a72233b7834deb9cb32ec1f68138029 - ibus_freewnn (git)

ibus-fwnnをaonotoがいじってみる(予定)

コミットメタ情報

• リビジョン: efe9a0d83a72233b7834deb9cb32ec1f68138029 (tree)
• 日時: 2015-08-07 03:26:20
• 作者: Hashimoto Masahiko <hashimom@X201...>
• コミッター: Hashimoto Masahiko

ログメッセージ

equip real-time-convert

変更サマリ

• modified: src/convert.c
• modified: src/engine.c
• modified: src/fwnnserver.c
• modified: src/fwnnserver.h

差分

--- a/src/convert.c
+++ b/src/convert.c
@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <syslog.h>
+#include <stdlib.h>
 #include "convert.h"
 
 typedef struct {

--- a/src/engine.c
+++ b/src/engine.c
@@ -16,6 +16,7 @@ struct _IBusFwnnEngine {
 
     /* members */
     GString *preedit;
+    GString *convedit;
     gint cursor_pos;
 
     IBusLookupTable *table;
@@ -35,6 +36,7 @@ static gboolean
                                              guint               	 keyval,
                                              guint               	 keycode,
                                              guint               	 modifiers);
+#if 0
 static void ibus_fwnn_engine_focus_in    (IBusEngine             *engine);
 static void ibus_fwnn_engine_focus_out   (IBusEngine             *engine);
 static void ibus_fwnn_engine_reset       (IBusEngine             *engine);
@@ -61,6 +63,7 @@ static void ibus_fwnn_engine_property_show
 static void ibus_fwnn_engine_property_hide
 											(IBusEngine             *engine,
                                              const gchar            *prop_name);
+#endif
 
 static void ibus_fwnn_engine_update      (IBusFwnnEngine      *fwnn);
 
@@ -93,6 +96,7 @@ ibus_fwnn_engine_init (IBusFwnnEngine *fwnn)
 		printf("ibus_fwnn_engine init FAILED\n");
 	}
 	fwnn->preedit = g_string_new ("");
+	fwnn->convedit = g_string_new ("");
 	fwnn->cursor_pos = 0;
 
 	fwnn->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
@@ -113,6 +117,7 @@ ibus_fwnn_engine_destroy (IBusFwnnEngine *fwnn)
 	
 	if (fwnn->preedit) {
 		g_string_free (fwnn->preedit, TRUE);
+		g_string_free (fwnn->convedit, TRUE);
 		fwnn->preedit = NULL;
 	}
 
@@ -124,6 +129,7 @@ ibus_fwnn_engine_destroy (IBusFwnnEngine *fwnn)
 	((IBusObjectClass *) ibus_fwnn_engine_parent_class)->destroy ((IBusObject *)fwnn);
 }
 
+#if 0
 static void
 ibus_fwnn_engine_update_lookup_table (IBusFwnnEngine *fwnn)
 {
@@ -157,25 +163,29 @@ ibus_fwnn_engine_update_lookup_table (IBusFwnnEngine *fwnn)
 //    if (sugs)
 //        fwnn_dict_free_suggestions (dict, sugs);
 }
+#endif
 
 static gboolean
 ibus_fwnn_engine_kanren (IBusFwnnEngine *fwnn)
 {
 	IBusText *text;
-	char *kanren_p = NULL;
+	unsigned char *kanren_p = NULL;
 	gint retval;
 
 	kanren_p = fwnnserver_kanren(fwnn->preedit->str);
 	text = ibus_text_new_from_static_string (kanren_p);
-	g_string_assign (fwnn->preedit, text->text);
-	ibus_text_append_attribute(text, IBUS_ATTR_TYPE_FOREGROUND, 0x00FFFF, 0, fwnn->preedit->len);
+	g_string_assign (fwnn->convedit, text->text);
+
+	text->attrs = ibus_attr_list_new ();
+	ibus_attr_list_append (text->attrs,
+		ibus_attr_underline_new (IBUS_ATTR_UNDERLINE_SINGLE, 0, fwnn->convedit->len));
+
 	ibus_engine_update_preedit_text ((IBusEngine *)fwnn,
 										text,
 										fwnn->cursor_pos,
 										TRUE);
 
 	ibus_engine_hide_lookup_table ((IBusEngine *)fwnn);
-
 	return TRUE;
 }
 
@@ -188,9 +198,10 @@ ibus_fwnn_engine_commit (IBusFwnnEngine *fwnn)
 	if (fwnn->preedit->len == 0)
 		return FALSE;
 
-	text = ibus_text_new_from_static_string (fwnn->preedit->str);
+	text = ibus_text_new_from_static_string (fwnn->convedit->str);
 	ibus_engine_commit_text ((IBusEngine *)fwnn, text);
 	g_string_assign (fwnn->preedit, "");
+	g_string_assign (fwnn->convedit, "");
 	fwnn->cursor_pos = 0;
 
 	ibus_fwnn_engine_update (fwnn);
@@ -337,7 +348,7 @@ ibus_fwnn_engine_process_key_event (IBusEngine *engine,
 							fwnn->cursor_pos,
 							keyval);
 		fwnn->cursor_pos = conv_run_romajiconv(fwnn->preedit, fwnn->cursor_pos);
-		ibus_fwnn_engine_update (fwnn);
+		ibus_fwnn_engine_kanren(fwnn);
         
 		return TRUE;
 	}

--- a/src/fwnnserver.c
+++ b/src/fwnnserver.c
@@ -18,7 +18,7 @@
 #define PC_DIC		"pubdic/computer.dic"
 #define SYMBOL_DIC	"pubdic/symbol.dic"
 
-#define MAX_CONV_STRLEN	(4096)
+#define MAX_CONV_STRLEN	(1024)
 #define CONV_UTF82EUC	(0)
 #define CONV_EUC2UTF8	(1)
 
@@ -27,7 +27,9 @@ static WNN_ENV *wnnenv;
 static struct wnn_ret_buf wnnbuf= {0, NULL};
 
 /* もちろん仮。malloc して返すように変更する予定 */
-static char wnn_out_kanstr[MAX_CONV_STRLEN];
+static unsigned char wnn_yomi_buf[MAX_CONV_STRLEN];
+static unsigned char wnn_out_kanstr[MAX_CONV_STRLEN];
+
 
 static void set_wnn_env_pram()
 {
@@ -76,7 +78,7 @@ static void strtows(w_char *u, unsigned char *e)
 	*u=0;
 }
 
-static int putws(unsigned short *s, char *outstr)
+static int putws(unsigned short *s, unsigned char *outstr)
 {
 	int ret = 0;
 	
@@ -93,8 +95,8 @@ static void output_js2char(struct wnn_dai_bunsetsu *dlist, int cnt)
 {
 	int i, tmpbuf_len;
 	struct wnn_sho_bunsetsu  *sbn;
-	char kanstr_tmp[MAX_CONV_STRLEN];
-	char kanstr_utf8[MAX_CONV_STRLEN];
+	unsigned char kanstr_tmp[MAX_CONV_STRLEN];
+	unsigned char kanstr_utf8[MAX_CONV_STRLEN];
 
     for ( ; cnt > 0; dlist++, cnt --) {
 		sbn = dlist->sbn;
@@ -169,12 +171,20 @@ int fwnnserver_adddic(char *dicfilename)
 	return dicno;
 }
 
-char *fwnnserver_kanren(char *yomi)
+unsigned char *fwnnserver_kanren(unsigned char *yomi)
 {
 	// とりあえずサイズ決め打ち
-	char yomi_euc[MAX_CONV_STRLEN];
+	unsigned char yomi_euc[MAX_CONV_STRLEN];
 	w_char upstrings[MAX_CONV_STRLEN];
 	int count = 0;
+	int i=0, yomilen = strlen(yomi);
+
+	// 未確定文字ポインタ（暫定実装で削除予定）
+	for (i = 0; i < yomilen;) {
+		if (yomi[i] < 0x7F)
+			break;
+		i += 3;
+	}
 	
 	memset(yomi_euc, 0, MAX_CONV_STRLEN);
 	memset(upstrings, 0, MAX_CONV_STRLEN);
@@ -183,9 +193,13 @@ char *fwnnserver_kanren(char *yomi)
 	exec_iconv(yomi, yomi_euc, CONV_UTF82EUC);
 	strtows(upstrings, yomi_euc);
 	
-	count = js_kanren(wnnenv, upstrings, WNN_ALL_HINSI, NULL, WNN_VECT_KANREN, WNN_VECT_NO, WNN_VECT_BUNSETSU,&wnnbuf);
+	count = js_kanren(wnnenv, upstrings, WNN_ALL_HINSI, NULL,
+			WNN_VECT_KANREN, WNN_VECT_NO, WNN_VECT_BUNSETSU,&wnnbuf);
 	output_js2char((struct wnn_dai_bunsetsu *)wnnbuf.buf, count);
 
+	if (i < yomilen)
+		strcat(wnn_out_kanstr, yomi+i);
+
 	return wnn_out_kanstr;
 }
 

--- a/src/fwnnserver.h
+++ b/src/fwnnserver.h
@@ -2,9 +2,10 @@
 #ifndef __FWNN_H__
 #define __FWNN_H
 
+
 int fwnnserver_open();
 int fwnnserver_close();
 int fwnnserver_adddic(char *dicfilename);
-char *fwnnserver_kanren(char *yomi);
+unsigned char *fwnnserver_kanren(unsigned char *yomi);
 
 #endif