diff -crN ./gtk+/configure.in /users3/olivap/sb/m240/src/./gtk+/configure.in *** ./gtk+/configure.in Thu Sep 4 19:06:42 2003 --- /users3/olivap/sb/m240/src/./gtk+/configure.in Fri Apr 16 10:03:22 2004 *************** *** 1,3 **** --- 1,4 ---- + # require autoconf 2.52 AC_PREREQ(2.52) *************** *** 625,631 **** use_la_modules=false case $host in ! *-aix*) use_la_modules=true esac if $use_la_modules ; then --- 626,632 ---- use_la_modules=false case $host in ! *) use_la_modules=false esac if $use_la_modules ; then diff -crN ./gtk+/contrib/gdk-pixbuf-xlib/Makefile.am /users3/olivap/sb/m240/src/./gtk+/contrib/gdk-pixbuf-xlib/Makefile.am *** ./gtk+/contrib/gdk-pixbuf-xlib/Makefile.am Sun Sep 29 23:24:22 2002 --- /users3/olivap/sb/m240/src/./gtk+/contrib/gdk-pixbuf-xlib/Makefile.am Fri Apr 16 10:03:22 2004 *************** *** 14,20 **** -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) libgdk_pixbuf_xlib_2_0_la_LIBADD = \ ! @GDK_PIXBUF_XLIB_DEP_LIBS@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ --- 14,21 ---- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) libgdk_pixbuf_xlib_2_0_la_LIBADD = \ ! @GDK_PIXBUF_XLIB_DEP_LIBS@ \ ! $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ diff -crN ./gtk+/demos/Makefile.am /users3/olivap/sb/m240/src/./gtk+/demos/Makefile.am *** ./gtk+/demos/Makefile.am Fri Jun 6 02:52:59 2003 --- /users3/olivap/sb/m240/src/./gtk+/demos/Makefile.am Fri Apr 16 10:03:22 2004 *************** *** 44,50 **** (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ cd $(srcdir) && \ $(pixbuf_csource) --build-list \ ! apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false)) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) --- 44,50 ---- (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ cd $(srcdir) && \ $(pixbuf_csource) --build-list \ ! apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h.X && mv $$curdir/test-inline-pixbufs.h.X $$curdir/test-inline-pixbufs.h) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) diff -crN ./gtk+/gdk/x11/Makefile.am /users3/olivap/sb/m240/src/./gtk+/gdk/x11/Makefile.am *** ./gtk+/gdk/x11/Makefile.am Sun Nov 17 23:03:50 2002 --- /users3/olivap/sb/m240/src/./gtk+/gdk/x11/Makefile.am Fri Apr 16 10:03:22 2004 *************** *** 86,89 **** $(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h $(top_srcdir)/gdk/gdkenumtypes.h: ! @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h --- 86,89 ---- $(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h $(top_srcdir)/gdk/gdkenumtypes.h: ! @cd $(top_builddir)/gdk && $(MAKE) $(AM_MAKEFLAGS) gdkenumtypes.h diff -crN ./gtk+/gdk/x11/gdkevents-x11.c /users3/olivap/sb/m240/src/./gtk+/gdk/x11/gdkevents-x11.c *** ./gtk+/gdk/x11/gdkevents-x11.c Mon Aug 11 18:08:21 2003 --- /users3/olivap/sb/m240/src/./gtk+/gdk/x11/gdkevents-x11.c Tue Jun 14 11:16:47 2005 *************** *** 1971,1991 **** GdkEvent *event; XEvent xevent; Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); while (!_gdk_event_queue_find_first(display) && XPending (xdisplay)) { XNextEvent (xdisplay, &xevent); switch (xevent.type) ! { ! case KeyPress: ! case KeyRelease: ! break; ! default: ! if (XFilterEvent (&xevent, None)) ! continue; ! } ! event = gdk_event_new (GDK_NOTHING); event->any.window = NULL; --- 1971,2020 ---- GdkEvent *event; XEvent xevent; Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); + char *xmod=NULL ; + char *xlang=NULL; + char *im="@im"; + char *wn="XWNMO"; + char *jp="JA"; + char upper[3]; + int i; + while (!_gdk_event_queue_find_first(display) && XPending (xdisplay)) { XNextEvent (xdisplay, &xevent); + /* Workaround to use Wnn7 im with Japanese Environment */ + + xmod=(char *) getenv("XMODIFIERS"); + xlang=(char *) getenv("LANG"); + + if(xlang != NULL) { + for(i=0;i<2;i++){ + upper[i]=toupper(xlang[i]); + if(upper[i]==0) break; + } + upper[i]=0; + } + + if((strstr(xmod,im) != NULL) && (strstr(xmod,wn) != NULL) && (strcmp(upper,jp) == 0 )) { + switch (xevent.type) ! { ! case KeyPress: ! case KeyRelease: ! break; ! default: ! if (XFilterEvent (&xevent, None)) ! continue; ! } ! } ! else { ! if (XFilterEvent (&xevent, None)) ! continue; ! } ! /* End Workaround */ ! event = gdk_event_new (GDK_NOTHING); event->any.window = NULL; diff -crN ./gtk+/gtk/Makefile.am /users3/olivap/sb/m240/src/./gtk+/gtk/Makefile.am *** ./gtk+/gtk/Makefile.am Wed Sep 3 21:50:06 2003 --- /users3/olivap/sb/m240/src/./gtk+/gtk/Makefile.am Fri Apr 16 10:03:22 2004 *************** *** 551,556 **** --- 551,557 ---- gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources) + libgtk_x11_2_0_la_LIBADD = -lX11 libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources) libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) diff -crN ./gtk+/gtk/gtkimmodule.c /users3/olivap/sb/m240/src/./gtk+/gtk/gtkimmodule.c *** ./gtk+/gtk/gtkimmodule.c Fri May 30 03:10:50 2003 --- /users3/olivap/sb/m240/src/./gtk+/gtk/gtkimmodule.c Fri Apr 16 10:03:22 2004 *************** *** 513,522 **** if (strcmp (against, "*") == 0) return 1; ! if (strcmp (locale, against) == 0) return 4; ! if (strncmp (locale, against, 2) == 0) return (against_len == 2) ? 3 : 2; return 0; --- 513,522 ---- if (strcmp (against, "*") == 0) return 1; ! if (g_ascii_strcasecmp (locale, against) == 0) return 4; ! if (g_ascii_strncasecmp (locale, against, 2) == 0) return (against_len == 2) ? 3 : 2; return 0; diff -crN ./gtk+/modules/input/gtkimcontextxim.c /users3/olivap/sb/m240/src/./gtk+/modules/input/gtkimcontextxim.c *** ./gtk+/modules/input/gtkimcontextxim.c Tue Aug 19 23:17:31 2003 --- /users3/olivap/sb/m240/src/./gtk+/modules/input/gtkimcontextxim.c Fri Apr 16 10:03:22 2004 *************** *** 982,988 **** GtkIMContext *context = GTK_IM_CONTEXT (client_data); GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context); ! if (!context_xim->finalizing) g_signal_emit_by_name (context, "preedit_end"); } --- 982,995 ---- GtkIMContext *context = GTK_IM_CONTEXT (client_data); GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context); ! if (context_xim->preedit_length) ! { ! context_xim->preedit_length = 0; ! if (!context_xim->finalizing) ! g_signal_emit_by_name (context_xim, "preedit_changed"); ! } ! ! if (!context_xim->finalizing) g_signal_emit_by_name (context, "preedit_end"); } diff -crN ./gtk+/modules/input/imxim.c /users3/olivap/sb/m240/src/./gtk+/modules/input/imxim.c *** ./gtk+/modules/input/imxim.c Fri May 30 02:34:25 2003 --- /users3/olivap/sb/m240/src/./gtk+/modules/input/imxim.c Fri Apr 16 10:03:22 2004 *************** *** 27,33 **** N_("X Input Method"), /* Human readable name */ GETTEXT_PACKAGE, /* Translation domain */ GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */ ! "ko:ja:zh" /* Languages for which this module is the default */ }; static const GtkIMContextInfo *info_list[] = { --- 27,33 ---- N_("X Input Method"), /* Human readable name */ GETTEXT_PACKAGE, /* Translation domain */ GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */ ! "iw:ko:ja:zh" /* Languages for which this module is the default */ }; static const GtkIMContextInfo *info_list[] = {