Kouhei Sutou
kous****@users*****
Sun Dec 31 22:19:38 JST 2006
Index: kazehakase/src/Makefile.am
diff -u kazehakase/src/Makefile.am:1.123 kazehakase/src/Makefile.am:1.124
--- kazehakase/src/Makefile.am:1.123 Sun Dec 31 10:36:03 2006
+++ kazehakase/src/Makefile.am Sun Dec 31 22:19:38 2006
@@ -83,6 +83,7 @@
kz-popup-tablist.h \
kz-search.h \
kz-statusbar.h \
+ kz-migemo.h \
kz-ext.h
enum_source_prefix = kz-enum-types
@@ -120,6 +121,7 @@
kz-popup-tablist.c \
kz-search.c \
kz-statusbar.c \
+ kz-migemo.c \
kz-ext.c \
$(enum_sources) \
$(libkazehakase_public_h_sources)
Index: kazehakase/src/kz-app.c
diff -u kazehakase/src/kz-app.c:1.5 kazehakase/src/kz-app.c:1.6
--- kazehakase/src/kz-app.c:1.5 Sun Dec 31 21:57:17 2006
+++ kazehakase/src/kz-app.c Sun Dec 31 22:19:38 2006
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif /* HAVE_CONFIG_H */
#include <stdlib.h>
@@ -52,7 +52,7 @@
KzProfile *profile;
KzProfile *proxy;
#if USE_MIGEMO
- Migemo *migemo;
+ KzMigemo *migemo;
#endif
};
@@ -219,6 +219,10 @@
"proxyrc", NULL);
priv->proxy = kz_profile_open(proxy_file, sysproxy_file);
+#if USE_MIGEMO
+ priv->migemo = kz_migemo_new();
+#endif
+
kz_icons_init();
#ifdef USE_SSL
@@ -316,7 +320,7 @@
#ifdef USE_MIGEMO
if (priv->migemo)
{
- migemo_exit();
+ kz_migemo_free(priv->migemo);
priv->migemo = NULL;
}
#endif
@@ -391,7 +395,7 @@
}
#if USE_MIGEMO
-Migemo *
+KzMigemo *
kz_app_get_migemo (KzApp *app)
{
return KZ_APP_GET_PRIVATE(app)->migemo;
Index: kazehakase/src/kz-app.h
diff -u kazehakase/src/kz-app.h:1.2 kazehakase/src/kz-app.h:1.3
--- kazehakase/src/kz-app.h:1.2 Sun Dec 31 21:21:47 2006
+++ kazehakase/src/kz-app.h Sun Dec 31 22:19:38 2006
@@ -27,6 +27,7 @@
#include "kz-search.h"
#include "kz-profile.h"
#include "kz-root-bookmark.h"
+#include "kz-migemo.h"
G_BEGIN_DECLS
@@ -63,6 +64,9 @@
KzProfile *kz_app_get_profile (KzApp *app);
KzProfile *kz_app_get_proxy (KzApp *app);
const GList *kz_app_get_window_list (KzApp *app);
+#if USE_MIGEMO
+KzMigemo *kz_app_get_migemo (KzApp *app);
+#endif
G_END_DECLS
Index: kazehakase/src/kz-migemo.c
diff -u /dev/null kazehakase/src/kz-migemo.c:1.1
--- /dev/null Sun Dec 31 22:19:38 2006
+++ kazehakase/src/kz-migemo.c Sun Dec 31 22:19:38 2006
@@ -0,0 +1,203 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * Copyright (C) 2004 Hiroyuki Ikezoe
+ * Copyright (C) 2004 Hidetaka Iwai
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "kz-migemo.h"
+#if USE_MIGEMO
+
+struct _KzMigemo
+{
+ GPid pid;
+
+ gint input;
+ gint output;
+ gint error;
+};
+
+#include "kazehakase.h"
+#include "eggregex.h"
+
+#define MIGEMO_MAX_LENGTH 64
+#define MIGEMO_DEFAULT_COMMAND "migemo -t perl -d /usr/share/migemo/migemo-dict"
+
+KzMigemo *
+kz_migemo_new (void)
+{
+ KzMigemo *migemo = NULL;
+ gboolean ret;
+ GSpawnFlags flags;
+ gint argc;
+ gchar **argv = NULL;
+ gchar *migemo_command;
+
+ migemo = g_new0(KzMigemo, 1);
+
+ migemo_command = KZ_CONF_GET_STR("Global", "migemo_command");
+ if (!migemo_command)
+ migemo_command = g_strdup(MIGEMO_DEFAULT_COMMAND);
+
+ g_shell_parse_argv(migemo_command,
+ &argc,
+ &argv,
+ NULL);
+
+ flags = G_SPAWN_SEARCH_PATH;
+ ret = g_spawn_async_with_pipes(NULL,
+ argv,
+ NULL,
+ flags,
+ NULL,
+ NULL,
+ &migemo->pid,
+ &migemo->input,
+ &migemo->output,
+ &migemo->error,
+ NULL);
+ g_strfreev(argv);
+ g_free(migemo_command);
+
+ if (!ret)
+ {
+ g_free(migemo);
+ migemo = NULL;
+ }
+
+ return migemo;
+}
+
+void
+kz_migemo_free (KzMigemo *migemo)
+{
+ if (migemo)
+ {
+ g_spawn_close_pid(migemo->pid);
+ g_free(migemo);
+ }
+}
+
+gchar *
+kz_migemo_get_regex(KzMigemo *migemo, const gchar *text)
+{
+ GIOChannel *in;
+ GIOChannel *out;
+ gchar *write_buf = NULL, *read_buf = NULL;
+ gchar *euc_text = NULL;
+ gchar *regex;
+ gsize bytes;
+ GError *e = NULL;
+
+ g_return_val_if_fail(migemo, NULL);
+ g_return_val_if_fail(text, NULL);
+
+ if (strlen(text) > MIGEMO_MAX_LENGTH)
+ return NULL;
+
+ euc_text = g_convert(text, strlen(text),
+ "EUC-JP", "UTF-8",
+ NULL, NULL, &e);
+ if (e)
+ {
+ g_error_free(e);
+ return NULL;
+ }
+ in = g_io_channel_unix_new(migemo->input);
+ out = g_io_channel_unix_new(migemo->output);
+
+ g_io_channel_set_encoding(in, NULL, NULL);
+ g_io_channel_set_encoding(out, NULL, NULL);
+
+ write_buf = g_strconcat (euc_text, "\n", NULL);
+ g_free(euc_text);
+
+ g_io_channel_write_chars(in,
+ write_buf,
+ strlen(write_buf),
+ &bytes,
+ NULL);
+ g_io_channel_flush(in, NULL);
+ g_free(write_buf);
+
+ g_io_channel_read_line(out,
+ &read_buf,
+ &bytes,
+ NULL,
+ &e);
+ g_io_channel_unref(in);
+ g_io_channel_unref(out);
+
+ if (e)
+ {
+ g_warning("%s", e->message);
+ g_error_free(e);
+ e = NULL;
+ }
+
+ if (!read_buf) return NULL;
+ regex = g_convert(read_buf, bytes,
+ "UTF-8", "EUC-JP",
+ NULL, NULL, NULL);
+ g_free(read_buf);
+
+ return regex;
+}
+
+gchar *
+kz_migemo_get_matched_text(KzMigemo *migemo, const gchar *body,
+ const gchar *text, const gboolean last)
+{
+ gchar *matched_text = NULL;
+ gchar *regex;
+ EggRegex *egg_regex;
+ GError *e = NULL;
+
+ g_return_val_if_fail(migemo, NULL);
+ g_return_val_if_fail(body, NULL);
+ g_return_val_if_fail(text, NULL);
+ g_return_val_if_fail(g_utf8_validate(body, -1, NULL), NULL);
+
+ regex = kz_migemo_get_regex(migemo, text);
+
+ if (!regex) return NULL;
+
+ egg_regex = egg_regex_new(regex,
+ EGG_REGEX_CASELESS |
+ EGG_REGEX_MULTILINE |
+ EGG_REGEX_EXTENDED,
+ 0, &e);
+ g_free(regex);
+
+ if (e)
+ {
+ g_error_free(e);
+ return NULL;
+ }
+
+ while (egg_regex_match_next(egg_regex, body, -1, 0) > 0)
+ {
+ if (matched_text)
+ g_free(matched_text);
+ matched_text = egg_regex_fetch(egg_regex, body, 0);
+ if (!last) break;
+ }
+ egg_regex_free(egg_regex);
+ return matched_text;
+}
+
+#endif /* USE_MIGEMO */
Index: kazehakase/src/kz-migemo.h
diff -u /dev/null kazehakase/src/kz-migemo.h:1.1
--- /dev/null Sun Dec 31 22:19:38 2006
+++ kazehakase/src/kz-migemo.h Sun Dec 31 22:19:38 2006
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * Copyright (C) 2004 Hiroyuki Ikezoe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __KZ_MIGEMO_H__
+#define __KZ_MIGEMO_H__
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#if USE_MIGEMO
+
+# include <glib.h>
+
+#include "glib-utils.h"
+
+G_BEGIN_DECLS
+
+typedef struct _KzMigemo KzMigemo;
+
+KzMigemo *kz_migemo_new (void);
+void kz_migemo_free (KzMigemo *migemo);
+gchar *kz_migemo_get_regex (KzMigemo *migemo,
+ const gchar *text);
+gchar *kz_migemo_get_matched_text (KzMigemo *migemo,
+ const gchar *body,
+ const gchar *text,
+ const gboolean last);
+G_END_DECLS
+
+#endif /* USE_MIGEMO */
+#endif /* __KZ_MIGEMO_H__ */