Kouhei Sutou
kous****@users*****
Sun Dec 31 22:19:38 JST 2006
Index: kazehakase/src/utils/Makefile.am
diff -u kazehakase/src/utils/Makefile.am:1.31 kazehakase/src/utils/Makefile.am:1.32
--- kazehakase/src/utils/Makefile.am:1.31 Wed Dec 6 15:08:04 2006
+++ kazehakase/src/utils/Makefile.am Sun Dec 31 22:19:38 2006
@@ -20,7 +20,6 @@
gtk-utils.c gtk-utils.h \
gobject-utils.h \
kz-base64.h kz-base64.c \
- migemo.c migemo.h \
utils.c utils.h
libkzutils_la_LIBADD = \
Index: kazehakase/src/utils/migemo.c
diff -u kazehakase/src/utils/migemo.c:1.16 kazehakase/src/utils/migemo.c:removed
--- kazehakase/src/utils/migemo.c:1.16 Sun Dec 31 21:54:06 2006
+++ kazehakase/src/utils/migemo.c Sun Dec 31 22:19:38 2006
@@ -1,193 +0,0 @@
-/* -*- 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 "migemo.h"
-#if USE_MIGEMO
-
-#include "kazehakase.h"
-#include "eggregex.h"
-
-#define MIGEMO_MAX_LENGTH 64
-
-static Migemo *migemo = NULL;
-
-gboolean
-migemo_init (void)
-{
- gboolean ret;
- GSpawnFlags flags;
- gint argc;
- gchar **argv = NULL;
- gchar *migemo_command;
-
- if (!migemo)
- migemo = g_new0(Migemo, 1);
-
- migemo_command = KZ_CONF_GET_STR("Global", "migemo_command");
- if (!migemo_command)
- migemo_command = g_strdup("migemo -t perl -d /usr/share/migemo/migemo-dict");
-
- 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 ret;
-}
-
-void
-migemo_exit (void)
-{
- g_spawn_close_pid(migemo->pid);
- g_free(migemo);
-}
-
-gchar *
-migemo_get_regex(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(text, NULL);
-
- if (!migemo && !migemo_init())
- return 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 *
-migemo_get_matched_text(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(body, NULL);
- g_return_val_if_fail(text, NULL);
- g_return_val_if_fail(g_utf8_validate(body, -1, NULL), NULL);
-
- regex = migemo_get_regex(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/utils/migemo.h
diff -u kazehakase/src/utils/migemo.h:1.10 kazehakase/src/utils/migemo.h:removed
--- kazehakase/src/utils/migemo.h:1.10 Sun Feb 27 21:07:06 2005
+++ kazehakase/src/utils/migemo.h Sun Dec 31 22:19:38 2006
@@ -1,58 +0,0 @@
-/* -*- 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 __MIGEMO_H__
-#define __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 _Migemo Migemo;
-
-struct _Migemo
-{
- GPid pid;
-
- gint input;
- gint output;
- gint error;
-};
-
-gboolean migemo_init (void);
-void migemo_exit (void);
-gchar *migemo_get_regex (const gchar *text);
-gchar *migemo_get_matched_text (const gchar *body,
- const gchar *text,
- const gboolean last);
-
-G_END_DECLS
-
-#endif /* USE_MIGEMO */
-#endif /* __MIGEMO_H__ */