diff --git a/honoka/m4/Makefile b/honoka/m4/Makefile index cf5f95a..946cb80 100644 --- a/honoka/m4/Makefile +++ b/honoka/m4/Makefile @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # m4/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -61,19 +61,19 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/tamra/ANef/honoka/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/tamra/devel/honoka/missing --run aclocal-1.9 ALLOCA = AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/tamra/ANef/honoka/missing --run tar +AMTAR = ${SHELL} /home/tamra/devel/honoka/missing --run tar ANTHYCONVERSION = ANTHYCONVERSION_FALSE = # ANTHYCONVERSION_TRUE = ANTHY_LIBS = -lanthy -lanthydic AR = ar -AUTOCONF = ${SHELL} /home/tamra/ANef/honoka/missing --run autoconf -AUTOHEADER = ${SHELL} /home/tamra/ANef/honoka/missing --run autoheader -AUTOMAKE = ${SHELL} /home/tamra/ANef/honoka/missing --run automake-1.9 +AUTOCONF = ${SHELL} /home/tamra/devel/honoka/missing --run autoconf +AUTOHEADER = ${SHELL} /home/tamra/devel/honoka/missing --run autoheader +AUTOMAKE = ${SHELL} /home/tamra/devel/honoka/missing --run automake-1.9 AWK = gawk BUILD_INCLUDED_LIBINTL = no CANNACONVERSION = @@ -102,7 +102,7 @@ ECHO_T = EGREP = grep -E EXEEXT = -F77 = g77 +F77 = f95 FFLAGS = -g -O2 GENCAT = gencat GETTEXT_PACKAGE = honoka @@ -135,11 +135,12 @@ LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL_DEPS = ./ltmain.sh +LIBTOOL_EXPORT_OPTIONS = -export-symbols-regex "^[^_].*" LN_S = ln -s LTLIBICONV = LTLIBINTL = LTLIBOBJS = -MAKEINFO = ${SHELL} /home/tamra/ANef/honoka/missing --run makeinfo +MAKEINFO = ${SHELL} /home/tamra/devel/honoka/missing --run makeinfo MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs MSGFMT = /usr/bin/msgfmt MSGMERGE = /usr/bin/msgmerge @@ -160,11 +161,11 @@ SCIM_CFLAGS = -I/usr/include/scim-1.0 SCIM_DATADIR = /usr/share/scim SCIM_DEBUG_FLAGS = -SCIM_GTKUTILS_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/include/scim-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -SCIM_GTKUTILS_LIBS = -Wl,--export-dynamic -lscim-gtkutils-1.0 -lgtk-x11-2.0 -lscim-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +SCIM_GTKUTILS_CFLAGS = -I/usr/include/scim-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +SCIM_GTKUTILS_LIBS = -lscim-gtkutils-1.0 -lgtk-x11-2.0 -lscim-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 SCIM_ICONDIR = /usr/share/scim/icons SCIM_LIBS = -lscim-1.0 -SCIM_MODULEDIR = /usr/lib/scim-1.0 +SCIM_MODULEDIR = /usr/lib/scim-1.0/1.4.0 SCIM_VERSION = 1.2.0 SET_MAKE = SHELL = /bin/sh @@ -175,15 +176,16 @@ WNNCONVERSION = WNNCONVERSION_FALSE = # WNNCONVERSION_TRUE = -WNN_LIBS = -lcrypt -lwnn +WNN_LIBS = -lcrypt -lwnn7 XGETTEXT = /usr/bin/xgettext ac_aux_dir = . ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_F77 = g77 +ac_ct_F77 = f95 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip +ac_pt_PKG_CONFIG = /usr/bin/pkg-config am__fastdepCC_FALSE = # am__fastdepCC_TRUE = am__fastdepCXX_FALSE = # @@ -208,7 +210,7 @@ host_vendor = redhat includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/tamra/ANef/honoka/install-sh +install_sh = /home/tamra/devel/honoka/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var diff --git a/honoka/m4/Makefile.in b/honoka/m4/Makefile.in index 7645a8f..b0772c8 100644 --- a/honoka/m4/Makefile.in +++ b/honoka/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -135,6 +135,7 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -184,6 +185,7 @@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ diff --git a/honoka/plugins/asciiinput.cpp b/honoka/plugins/asciiinput.cpp index 516f04f..31e2051 100644 --- a/honoka/plugins/asciiinput.cpp +++ b/honoka/plugins/asciiinput.cpp @@ -243,7 +243,9 @@ (key.code == SCIM_KEY_Super_L) || (key.code == SCIM_KEY_Super_R) || (key.code == SCIM_KEY_Hyper_L) || - (key.code == SCIM_KEY_Hyper_R)) return true; + (key.code == SCIM_KEY_Hyper_R)|| + (key.code == SCIM_KEY_Mode_switch) || + (key.code == SCIM_KEY_ISO_Next_Group)) return true; if ((compose)) { if (composeKey1.code == 0) { diff --git a/honoka/plugins/kanainput.cpp b/honoka/plugins/kanainput.cpp index 3e16c29..3fbbfac 100644 --- a/honoka/plugins/kanainput.cpp +++ b/honoka/plugins/kanainput.cpp @@ -197,7 +197,10 @@ (key.code == SCIM_KEY_Super_L) || (key.code == SCIM_KEY_Super_R) || (key.code == SCIM_KEY_Hyper_L) || - (key.code == SCIM_KEY_Hyper_R)) return true; + (key.code == SCIM_KEY_Hyper_R) || + (key.code == SCIM_KEY_Mode_switch) || + (key.code == SCIM_KEY_ISO_Next_Group)) return true; + for(unsigned int i = 0;HonokaKanaInputTable[i].code != 0;++ i) { if (key.code == HonokaKanaInputTable[i].code) { diff --git a/honoka/plugins/nicolainput.cpp b/honoka/plugins/nicolainput.cpp index e0fb916..aec1d58 100644 --- a/honoka/plugins/nicolainput.cpp +++ b/honoka/plugins/nicolainput.cpp @@ -267,7 +267,10 @@ (key.code == SCIM_KEY_Super_L) || (key.code == SCIM_KEY_Super_R) || (key.code == SCIM_KEY_Hyper_L) || - (key.code == SCIM_KEY_Hyper_R)) return true; + (key.code == SCIM_KEY_Hyper_R) || + (key.code == SCIM_KEY_Mode_switch) || + (key.code == SCIM_KEY_ISO_Next_Group)) return true; + map::iterator it = keymap.find(key); if (it == keymap.end()) { diff --git a/honoka/plugins/romkan.cpp b/honoka/plugins/romkan.cpp index 1d9cb1a..38f690d 100644 --- a/honoka/plugins/romkan.cpp +++ b/honoka/plugins/romkan.cpp @@ -662,7 +662,10 @@ (key.code == SCIM_KEY_Super_L) || (key.code == SCIM_KEY_Super_R) || (key.code == SCIM_KEY_Hyper_L) || - (key.code == SCIM_KEY_Hyper_R)) return true; + (key.code == SCIM_KEY_Hyper_R) || + (key.code == SCIM_KEY_Mode_switch) || + (key.code == SCIM_KEY_ISO_Next_Group)) return true; + if (key_a2k.comp(key)) { asciiToKana(); return true; diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index bf6be38..b83c5a0 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -1079,7 +1079,9 @@ (key.code == SCIM_KEY_Super_L) || (key.code == SCIM_KEY_Super_R) || (key.code == SCIM_KEY_Hyper_L) || - (key.code == SCIM_KEY_Hyper_R)) return true; + (key.code == SCIM_KEY_Hyper_R) || + (key.code == SCIM_KEY_Mode_switch) || + (key.code == SCIM_KEY_ISO_Next_Group)) return true; // ��ư����ݥåץ��åפΥ�����ȷ׻��� if ((alp <= alp_count) && (alp != 0)) {