diff -cr SDL-1.2.7/Makefile.in SDL-1.2.7-xim/Makefile.in *** SDL-1.2.7/Makefile.in 2004-02-23 06:32:04.000000000 +0900 --- SDL-1.2.7-xim/Makefile.in 2004-05-10 23:36:20.210626024 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 55,61 **** configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = sdl-config SDL.spec SDL.qpg ! am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) SOURCES = --- 55,61 ---- configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = sdl-config SDL.spec SDL.qpg ! am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) SOURCES = *************** *** 377,389 **** cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ ! $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 377,389 ---- cd $(top_builddir) && $(SHELL) ./config.status $@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) ! test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ! $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ else :; fi; \ done *************** *** 391,398 **** @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done mostlyclean-libtool: --- 391,398 ---- @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ! rm -f "$(DESTDIR)$(bindir)/$$f"; \ done mostlyclean-libtool: *************** *** 406,425 **** uninstall-info-am: install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(m4datadir) @list='$(m4data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ ! $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ done uninstall-m4dataDATA: @$(NORMAL_UNINSTALL) @list='$(m4data_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ ! rm -f $(DESTDIR)$(m4datadir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd --- 406,425 ---- uninstall-info-am: install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) ! test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)" @list='$(m4data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ ! $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ done uninstall-m4dataDATA: @$(NORMAL_UNINSTALL) @list='$(m4data_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 649,655 **** distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ ! (cd ../.. && $(mkdir_p) "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ --- 649,655 ---- distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ ! (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ *************** *** 686,692 **** all-am: Makefile $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: ! $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive --- 686,694 ---- all-am: Makefile $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: ! for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive SDL-1.2.7だけに発見: SDL.spec diff -cr SDL-1.2.7/aclocal.m4 SDL-1.2.7-xim/aclocal.m4 *** SDL-1.2.7/aclocal.m4 2004-02-23 06:31:55.000000000 +0900 --- SDL-1.2.7-xim/aclocal.m4 2004-05-10 23:36:15.235382376 +0900 *************** *** 1,4 **** ! # generated automatically by aclocal 1.8.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. --- 1,4 ---- ! # generated automatically by aclocal 1.8.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. *************** *** 40,46 **** # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.8.2])]) # AM_AUX_DIR_EXPAND --- 40,46 ---- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.8.3])]) # AM_AUX_DIR_EXPAND *************** *** 149,155 **** Usually this means the macro was only invoked conditionally.]) fi])]) ! # serial 6 -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. --- 149,155 ---- Usually this means the macro was only invoked conditionally.]) fi])]) ! # serial 7 -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. *************** *** 236,242 **** : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 236,244 ---- : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 312,318 **** # Generate code to set up dependency tracking. -*- Autoconf -*- ! # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # 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 --- 314,320 ---- # Generate code to set up dependency tracking. -*- Autoconf -*- ! # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # 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 *************** *** 351,364 **** grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop --- 353,366 ---- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. ! DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop *************** *** 717,724 **** # # Do not use -m 0755 and let people choose whatever they expect by # setting umask. AC_DEFUN([AM_PROG_MKDIR_P], ! [if mkdir -p -- . 2>/dev/null; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) --- 719,734 ---- # # Do not use -m 0755 and let people choose whatever they expect by # setting umask. + # + # We cannot accept any implementation of `mkdir' that recognizes `-p'. + # Some implementations (such as Solaris 8's) are not thread-safe: if a + # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' + # concurrently, both version can detect that a/ is missing, but only + # one can create it and the other will error out. Consequently we + # restrict ourselves to GNU make (using the --version option ensures + # this.) AC_DEFUN([AM_PROG_MKDIR_P], ! [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) *************** *** 731,737 **** # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--; do test -d $d && rmdir $d done --- 741,747 ---- # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--version; do test -d $d && rmdir $d done SDL-1.2.7-ximだけに発見: autom4te.cache diff -cr SDL-1.2.7/configure SDL-1.2.7-xim/configure *** SDL-1.2.7/configure 2004-02-23 06:32:33.000000000 +0900 --- SDL-1.2.7-xim/configure 2004-05-10 23:36:48.057392672 +0900 *************** *** 1,6 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation --- 1,6 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.58. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation *************** *** 1049,1054 **** --- 1049,1055 ---- --enable-endian Enable the endian subsystem default=yes --enable-file Enable the file subsystem default=yes --enable-cpuinfo Enable the cpuinfo subsystem default=yes + --enable-im-event Enable character conversion default=yes --enable-oss support the OSS audio API default=yes --enable-alsa support the ALSA audio API default=yes --enable-esd support the Enlightened Sound Daemon default=yes *************** *** 1158,1200 **** ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac --- 1159,1198 ---- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac *************** *** 1233,1239 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ --- 1231,1237 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.58. Invocation command line was $ $0 $@ *************** *** 1855,1861 **** echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi ! if mkdir -p -- . 2>/dev/null; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) --- 1853,1859 ---- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi ! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) *************** *** 1868,1874 **** # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--; do test -d $d && rmdir $d done --- 1866,1872 ---- # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. ! for d in ./-p ./--version; do test -d $d && rmdir $d done *************** *** 3216,3222 **** : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 3214,3222 ---- : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 5200,5206 **** : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 5200,5208 ---- : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 5584,5590 **** # Provide some information about the compiler. ! echo "$as_me:5587:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 --- 5586,5592 ---- # Provide some information about the compiler. ! echo "$as_me:5589:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 *************** *** 6615,6625 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6618: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6622: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 6617,6627 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6620: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6624: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 6847,6857 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 6849,6859 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6852: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6856: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 6914,6924 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6917: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:6921: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 6916,6926 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6919: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:6923: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 9034,9040 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:11295: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 11290,11300 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:11293: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:11297: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 11355,11365 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:11358: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:11362: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 11357,11367 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:11360: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:11364: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 12686,12692 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13613: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 13608,13618 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13611: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13615: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 13673,13683 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13676: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:13680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 13675,13685 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13678: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:13682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 15641,15651 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15644: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15648: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 15643,15653 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15646: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15650: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 15873,15883 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15876: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15880: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 15875,15885 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15878: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15882: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 15940,15950 **** -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15943: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:15947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized --- 15942,15952 ---- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15945: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:15949: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized *************** *** 18060,18066 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 19965,19973 ---- : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 20598,20604 **** : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! : > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf --- 20602,20610 ---- : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c ! # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ! # Solaris 8's {/usr,}/bin/sh. ! touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf *************** *** 21441,21446 **** --- 21447,21460 ---- CFLAGS="$CFLAGS -DDISABLE_CPUINFO" fi + # Check whether --enable-im_event or --disable-im_event was given. + if test "${enable_im_event+set}" = set; then + enableval="$enable_im_event" + + else + enable_im_event=yes + fi; + CheckOSS() { # Check whether --enable-oss or --disable-oss was given. *************** *** 24419,24424 **** --- 24433,24499 ---- SYSTEM_LIBS="$SYSTEM_LIBS -lxme" fi fi + + if test x$enable_im_event = xyes; then + echo "$as_me:$LINENO: checking for XIM X Input Method support" >&5 + echo $ECHO_N "checking for XIM X Input Method support... $ECHO_C" >&6 + video_x11_xim=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include + + int + main () + { + + XIM im; + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + video_x11_xim=yes + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $video_x11_xim" >&5 + echo "${ECHO_T}$video_x11_xim" >&6 + if test x$video_x11_xim = xyes; then + CFLAGS="$CFLAGS -DENABLE_IM_EVENT" + fi + fi fi fi } *************** *** 31103,31109 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 31178,31184 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.58. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 31161,31167 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. --- 31236,31242 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.58, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 31748,31790 **** ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac --- 31823,31862 ---- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac *************** *** 31936,31978 **** ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac --- 32008,32047 ---- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac *************** *** 32008,32021 **** grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop --- 32077,32090 ---- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. ! DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop diff -cr SDL-1.2.7/configure.in SDL-1.2.7-xim/configure.in *** SDL-1.2.7/configure.in 2004-02-23 06:31:47.000000000 +0900 --- SDL-1.2.7-xim/configure.in 2004-05-10 23:35:27.461645088 +0900 *************** *** 236,241 **** --- 236,245 ---- CFLAGS="$CFLAGS -DDISABLE_CPUINFO" fi + AC_ARG_ENABLE(im_event, + [ --enable-im-event Enable character conversion [default=yes]], + , enable_im_event=yes) + dnl See if the OSS audio interface is supported CheckOSS() { *************** *** 696,701 **** --- 700,721 ---- SYSTEM_LIBS="$SYSTEM_LIBS -lxme" fi fi + + if test x$enable_im_event = xyes; then + AC_MSG_CHECKING(for XIM X Input Method support) + video_x11_xim=no + AC_TRY_COMPILE([ + #include + ],[ + XIM im; + ],[ + video_x11_xim=yes + ]) + AC_MSG_RESULT($video_x11_xim) + if test x$video_x11_xim = xyes; then + CFLAGS="$CFLAGS -DENABLE_IM_EVENT" + fi + fi fi fi } diff -cr SDL-1.2.7/docs/Makefile.in SDL-1.2.7-xim/docs/Makefile.in *** SDL-1.2.7/docs/Makefile.in 2004-02-23 06:32:04.000000000 +0900 --- SDL-1.2.7-xim/docs/Makefile.in 2004-05-10 23:36:20.431592432 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/docs/html/Makefile.in SDL-1.2.7-xim/docs/html/Makefile.in *** SDL-1.2.7/docs/html/Makefile.in 2004-02-23 06:32:04.000000000 +0900 --- SDL-1.2.7-xim/docs/html/Makefile.in 2004-05-10 23:36:20.639560816 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/docs/man3/Makefile.in SDL-1.2.7-xim/docs/man3/Makefile.in *** SDL-1.2.7/docs/man3/Makefile.in 2004-02-23 06:32:04.000000000 +0900 --- SDL-1.2.7-xim/docs/man3/Makefile.in 2004-05-10 23:36:20.863526768 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 48,54 **** SOURCES = DIST_SOURCES = man3dir = $(mandir)/man3 ! am__installdirs = $(DESTDIR)$(man3dir) NROFF = nroff MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --- 48,54 ---- SOURCES = DIST_SOURCES = man3dir = $(mandir)/man3 ! am__installdirs = "$(DESTDIR)$(man3dir)" NROFF = nroff MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) *************** *** 470,476 **** uninstall-info-am: install-man3: $(man3_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(man3dir) @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ --- 470,476 ---- uninstall-info-am: install-man3: $(man3_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)" @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ *************** *** 489,496 **** inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ ! $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ done uninstall-man3: @$(NORMAL_UNINSTALL) --- 489,496 ---- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ ! $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ done uninstall-man3: @$(NORMAL_UNINSTALL) *************** *** 510,517 **** inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ ! rm -f $(DESTDIR)$(man3dir)/$$inst; \ done tags: TAGS TAGS: --- 510,517 ---- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ ! rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ done tags: TAGS TAGS: *************** *** 551,557 **** check: check-am all-am: Makefile $(MANS) installdirs: ! $(mkdir_p) $(DESTDIR)$(man3dir) install: install-am install-exec: install-exec-am install-data: install-data-am --- 551,559 ---- check: check-am all-am: Makefile $(MANS) installdirs: ! for dir in "$(DESTDIR)$(man3dir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am install-data: install-data-am diff -cr SDL-1.2.7/include/Makefile.in SDL-1.2.7-xim/include/Makefile.in *** SDL-1.2.7/include/Makefile.in 2004-02-23 06:32:04.000000000 +0900 --- SDL-1.2.7-xim/include/Makefile.in 2004-05-10 23:36:21.089492416 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 51,57 **** CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = ! am__installdirs = $(DESTDIR)$(libSDLincludedir) libSDLincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libSDLinclude_HEADERS) ETAGS = etags --- 51,57 ---- CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = ! am__installdirs = "$(DESTDIR)$(libSDLincludedir)" libSDLincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libSDLinclude_HEADERS) ETAGS = etags *************** *** 335,354 **** uninstall-info-am: install-libSDLincludeHEADERS: $(libSDLinclude_HEADERS) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(libSDLincludedir) @list='$(libSDLinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libSDLincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libSDLincludedir)/$$f"; \ ! $(libSDLincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libSDLincludedir)/$$f; \ done uninstall-libSDLincludeHEADERS: @$(NORMAL_UNINSTALL) @list='$(libSDLinclude_HEADERS)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libSDLincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libSDLincludedir)/$$f; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- 335,354 ---- uninstall-info-am: install-libSDLincludeHEADERS: $(libSDLinclude_HEADERS) @$(NORMAL_INSTALL) ! test -z "$(libSDLincludedir)" || $(mkdir_p) "$(DESTDIR)$(libSDLincludedir)" @list='$(libSDLinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libSDLincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDLincludedir)/$$f'"; \ ! $(libSDLincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDLincludedir)/$$f"; \ done uninstall-libSDLincludeHEADERS: @$(NORMAL_UNINSTALL) @list='$(libSDLinclude_HEADERS)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libSDLincludedir)/$$f'"; \ ! rm -f "$(DESTDIR)$(libSDLincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 428,434 **** check: check-am all-am: Makefile $(HEADERS) installdirs: ! $(mkdir_p) $(DESTDIR)$(libSDLincludedir) install: install-am install-exec: install-exec-am install-data: install-data-am --- 428,436 ---- check: check-am all-am: Makefile $(HEADERS) installdirs: ! for dir in "$(DESTDIR)$(libSDLincludedir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am install-data: install-data-am diff -cr SDL-1.2.7/include/SDL_events.h SDL-1.2.7-xim/include/SDL_events.h *** SDL-1.2.7/include/SDL_events.h 2004-02-19 02:21:57.000000000 +0900 --- SDL-1.2.7-xim/include/SDL_events.h 2004-05-07 21:44:36.000000000 +0900 *************** *** 324,329 **** --- 324,333 ---- #define SDL_ENABLE 1 extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state); + /* + * Set IM position. + */ + extern DECLSPEC int SDL_SetIMPosition( int x, int y ); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff -cr SDL-1.2.7/include/SDL_keyboard.h SDL-1.2.7-xim/include/SDL_keyboard.h *** SDL-1.2.7/include/SDL_keyboard.h 2004-02-19 02:21:57.000000000 +0900 --- SDL-1.2.7-xim/include/SDL_keyboard.h 2004-05-07 20:35:23.000000000 +0900 *************** *** 60,65 **** --- 60,68 ---- SDLKey sym; /* SDL virtual keysym */ SDLMod mod; /* current key modifiers */ Uint16 unicode; /* translated character */ + + const char *im_compose; /* string composed by input method */ + } SDL_keysym; /* This is the mask which refers to all hotkey bindings */ diff -cr SDL-1.2.7/src/Makefile.in SDL-1.2.7-xim/src/Makefile.in *** SDL-1.2.7/src/Makefile.in 2004-02-23 06:32:05.000000000 +0900 --- SDL-1.2.7-xim/src/Makefile.in 2004-05-10 23:36:21.380448184 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 48,54 **** $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ! am__installdirs = $(DESTDIR)$(libdir) libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__objects_1 = SDL.lo SDL_error.lo SDL_fatal.lo SDL_getenv.lo \ --- 48,54 ---- $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ! am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__objects_1 = SDL.lo SDL_error.lo SDL_fatal.lo SDL_getenv.lo \ *************** *** 358,369 **** cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done --- 358,369 ---- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) ! test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done *************** *** 371,378 **** @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: --- 371,378 ---- @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: *************** *** 593,599 **** all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: ! $(mkdir_p) $(DESTDIR)$(libdir) install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive --- 593,601 ---- all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: ! for dir in "$(DESTDIR)$(libdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff -cr SDL-1.2.7/src/audio/Makefile.in SDL-1.2.7-xim/src/audio/Makefile.in *** SDL-1.2.7/src/audio/Makefile.in 2004-02-23 06:32:05.000000000 +0900 --- SDL-1.2.7-xim/src/audio/Makefile.in 2004-05-10 23:36:21.670404104 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/alsa/Makefile.in SDL-1.2.7-xim/src/audio/alsa/Makefile.in *** SDL-1.2.7/src/audio/alsa/Makefile.in 2004-02-23 06:32:05.000000000 +0900 --- SDL-1.2.7-xim/src/audio/alsa/Makefile.in 2004-05-10 23:36:21.937363520 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/arts/Makefile.in SDL-1.2.7-xim/src/audio/arts/Makefile.in *** SDL-1.2.7/src/audio/arts/Makefile.in 2004-02-23 06:32:05.000000000 +0900 --- SDL-1.2.7-xim/src/audio/arts/Makefile.in 2004-05-10 23:36:22.199323696 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/baudio/Makefile.in SDL-1.2.7-xim/src/audio/baudio/Makefile.in *** SDL-1.2.7/src/audio/baudio/Makefile.in 2004-02-23 06:32:06.000000000 +0900 --- SDL-1.2.7-xim/src/audio/baudio/Makefile.in 2004-05-10 23:36:22.461283872 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/dc/Makefile.in SDL-1.2.7-xim/src/audio/dc/Makefile.in *** SDL-1.2.7/src/audio/dc/Makefile.in 2004-02-23 06:32:06.000000000 +0900 --- SDL-1.2.7-xim/src/audio/dc/Makefile.in 2004-05-10 23:36:22.719244656 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/disk/Makefile.in SDL-1.2.7-xim/src/audio/disk/Makefile.in *** SDL-1.2.7/src/audio/disk/Makefile.in 2004-02-23 06:32:06.000000000 +0900 --- SDL-1.2.7-xim/src/audio/disk/Makefile.in 2004-05-10 23:36:22.975205744 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/dma/Makefile.in SDL-1.2.7-xim/src/audio/dma/Makefile.in *** SDL-1.2.7/src/audio/dma/Makefile.in 2004-02-23 06:32:06.000000000 +0900 --- SDL-1.2.7-xim/src/audio/dma/Makefile.in 2004-05-10 23:36:23.235166224 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/dmedia/Makefile.in SDL-1.2.7-xim/src/audio/dmedia/Makefile.in *** SDL-1.2.7/src/audio/dmedia/Makefile.in 2004-02-23 06:32:07.000000000 +0900 --- SDL-1.2.7-xim/src/audio/dmedia/Makefile.in 2004-05-10 23:36:23.498126248 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/dsp/Makefile.in SDL-1.2.7-xim/src/audio/dsp/Makefile.in *** SDL-1.2.7/src/audio/dsp/Makefile.in 2004-02-23 06:32:07.000000000 +0900 --- SDL-1.2.7-xim/src/audio/dsp/Makefile.in 2004-05-10 23:36:23.754087336 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/esd/Makefile.in SDL-1.2.7-xim/src/audio/esd/Makefile.in *** SDL-1.2.7/src/audio/esd/Makefile.in 2004-02-23 06:32:08.000000000 +0900 --- SDL-1.2.7-xim/src/audio/esd/Makefile.in 2004-05-10 23:36:24.010048424 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/macrom/Makefile.in SDL-1.2.7-xim/src/audio/macrom/Makefile.in *** SDL-1.2.7/src/audio/macrom/Makefile.in 2004-02-23 06:32:08.000000000 +0900 --- SDL-1.2.7-xim/src/audio/macrom/Makefile.in 2004-05-10 23:36:24.266009512 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/mint/Makefile.in SDL-1.2.7-xim/src/audio/mint/Makefile.in *** SDL-1.2.7/src/audio/mint/Makefile.in 2004-02-23 06:32:08.000000000 +0900 --- SDL-1.2.7-xim/src/audio/mint/Makefile.in 2004-05-10 23:36:24.543967256 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/mme/Makefile.in SDL-1.2.7-xim/src/audio/mme/Makefile.in *** SDL-1.2.7/src/audio/mme/Makefile.in 2004-02-23 06:32:09.000000000 +0900 --- SDL-1.2.7-xim/src/audio/mme/Makefile.in 2004-05-10 23:36:24.800928192 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/nas/Makefile.in SDL-1.2.7-xim/src/audio/nas/Makefile.in *** SDL-1.2.7/src/audio/nas/Makefile.in 2004-02-23 06:32:09.000000000 +0900 --- SDL-1.2.7-xim/src/audio/nas/Makefile.in 2004-05-10 23:36:25.058888976 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/nto/Makefile.in SDL-1.2.7-xim/src/audio/nto/Makefile.in *** SDL-1.2.7/src/audio/nto/Makefile.in 2004-02-23 06:32:09.000000000 +0900 --- SDL-1.2.7-xim/src/audio/nto/Makefile.in 2004-05-10 23:36:25.315849912 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/openbsd/Makefile.in SDL-1.2.7-xim/src/audio/openbsd/Makefile.in *** SDL-1.2.7/src/audio/openbsd/Makefile.in 2004-02-23 06:32:09.000000000 +0900 --- SDL-1.2.7-xim/src/audio/openbsd/Makefile.in 2004-05-10 23:36:25.574810544 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/paudio/Makefile.in SDL-1.2.7-xim/src/audio/paudio/Makefile.in *** SDL-1.2.7/src/audio/paudio/Makefile.in 2004-02-23 06:32:10.000000000 +0900 --- SDL-1.2.7-xim/src/audio/paudio/Makefile.in 2004-05-10 23:36:25.832771328 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/riscos/Makefile.in SDL-1.2.7-xim/src/audio/riscos/Makefile.in *** SDL-1.2.7/src/audio/riscos/Makefile.in 2004-02-23 06:32:10.000000000 +0900 --- SDL-1.2.7-xim/src/audio/riscos/Makefile.in 2004-05-10 23:36:26.090732112 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/sun/Makefile.in SDL-1.2.7-xim/src/audio/sun/Makefile.in *** SDL-1.2.7/src/audio/sun/Makefile.in 2004-02-23 06:32:10.000000000 +0900 --- SDL-1.2.7-xim/src/audio/sun/Makefile.in 2004-05-10 23:36:26.348692896 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/ums/Makefile.in SDL-1.2.7-xim/src/audio/ums/Makefile.in *** SDL-1.2.7/src/audio/ums/Makefile.in 2004-02-23 06:32:10.000000000 +0900 --- SDL-1.2.7-xim/src/audio/ums/Makefile.in 2004-05-10 23:36:26.607653528 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/windib/Makefile.in SDL-1.2.7-xim/src/audio/windib/Makefile.in *** SDL-1.2.7/src/audio/windib/Makefile.in 2004-02-23 06:32:11.000000000 +0900 --- SDL-1.2.7-xim/src/audio/windib/Makefile.in 2004-05-10 23:36:26.866614160 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/audio/windx5/Makefile.in SDL-1.2.7-xim/src/audio/windx5/Makefile.in *** SDL-1.2.7/src/audio/windx5/Makefile.in 2004-02-23 06:32:11.000000000 +0900 --- SDL-1.2.7-xim/src/audio/windx5/Makefile.in 2004-05-10 23:36:27.125574792 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/Makefile.in SDL-1.2.7-xim/src/cdrom/Makefile.in *** SDL-1.2.7/src/cdrom/Makefile.in 2004-02-23 06:32:11.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/Makefile.in 2004-05-10 23:36:27.396533600 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/aix/Makefile.in SDL-1.2.7-xim/src/cdrom/aix/Makefile.in *** SDL-1.2.7/src/cdrom/aix/Makefile.in 2004-02-23 06:32:12.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/aix/Makefile.in 2004-05-10 23:36:27.648495296 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/beos/Makefile.in SDL-1.2.7-xim/src/cdrom/beos/Makefile.in *** SDL-1.2.7/src/cdrom/beos/Makefile.in 2004-02-23 06:32:12.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/beos/Makefile.in 2004-05-10 23:36:27.900456992 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/bsdi/Makefile.in SDL-1.2.7-xim/src/cdrom/bsdi/Makefile.in *** SDL-1.2.7/src/cdrom/bsdi/Makefile.in 2004-02-23 06:32:12.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/bsdi/Makefile.in 2004-05-10 23:36:28.158417776 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/dc/Makefile.in SDL-1.2.7-xim/src/cdrom/dc/Makefile.in *** SDL-1.2.7/src/cdrom/dc/Makefile.in 2004-02-23 06:32:12.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/dc/Makefile.in 2004-05-10 23:36:28.411379320 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/dummy/Makefile.in SDL-1.2.7-xim/src/cdrom/dummy/Makefile.in *** SDL-1.2.7/src/cdrom/dummy/Makefile.in 2004-02-23 06:32:13.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/dummy/Makefile.in 2004-05-10 23:36:28.664340864 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/freebsd/Makefile.in SDL-1.2.7-xim/src/cdrom/freebsd/Makefile.in *** SDL-1.2.7/src/cdrom/freebsd/Makefile.in 2004-02-23 06:32:13.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/freebsd/Makefile.in 2004-05-10 23:36:28.919302104 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/linux/Makefile.in SDL-1.2.7-xim/src/cdrom/linux/Makefile.in *** SDL-1.2.7/src/cdrom/linux/Makefile.in 2004-02-23 06:32:13.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/linux/Makefile.in 2004-05-10 23:36:29.172263648 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/macos/Makefile.in SDL-1.2.7-xim/src/cdrom/macos/Makefile.in *** SDL-1.2.7/src/cdrom/macos/Makefile.in 2004-02-23 06:32:13.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/macos/Makefile.in 2004-05-10 23:36:29.431224280 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/macosx/Makefile.in SDL-1.2.7-xim/src/cdrom/macosx/Makefile.in *** SDL-1.2.7/src/cdrom/macosx/Makefile.in 2004-02-25 04:25:36.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/macosx/Makefile.in 2004-05-10 23:36:29.716180960 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/mint/Makefile.in SDL-1.2.7-xim/src/cdrom/mint/Makefile.in *** SDL-1.2.7/src/cdrom/mint/Makefile.in 2004-02-23 06:32:14.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/mint/Makefile.in 2004-05-10 23:36:29.969142504 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/openbsd/Makefile.in SDL-1.2.7-xim/src/cdrom/openbsd/Makefile.in *** SDL-1.2.7/src/cdrom/openbsd/Makefile.in 2004-02-23 06:32:14.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/openbsd/Makefile.in 2004-05-10 23:36:30.225103592 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/osf/Makefile.in SDL-1.2.7-xim/src/cdrom/osf/Makefile.in *** SDL-1.2.7/src/cdrom/osf/Makefile.in 2004-02-23 06:32:15.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/osf/Makefile.in 2004-05-10 23:36:30.480064832 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/qnx/Makefile.in SDL-1.2.7-xim/src/cdrom/qnx/Makefile.in *** SDL-1.2.7/src/cdrom/qnx/Makefile.in 2004-02-23 06:32:15.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/qnx/Makefile.in 2004-05-10 23:36:30.734026224 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cdrom/win32/Makefile.in SDL-1.2.7-xim/src/cdrom/win32/Makefile.in *** SDL-1.2.7/src/cdrom/win32/Makefile.in 2004-02-23 06:32:15.000000000 +0900 --- SDL-1.2.7-xim/src/cdrom/win32/Makefile.in 2004-05-10 23:36:30.988987464 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/cpuinfo/Makefile.in SDL-1.2.7-xim/src/cpuinfo/Makefile.in *** SDL-1.2.7/src/cpuinfo/Makefile.in 2004-02-23 06:32:15.000000000 +0900 --- SDL-1.2.7-xim/src/cpuinfo/Makefile.in 2004-05-10 23:36:31.243948704 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/endian/Makefile.in SDL-1.2.7-xim/src/endian/Makefile.in *** SDL-1.2.7/src/endian/Makefile.in 2004-02-23 06:32:16.000000000 +0900 --- SDL-1.2.7-xim/src/endian/Makefile.in 2004-05-10 23:36:31.498909944 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/events/Makefile.in SDL-1.2.7-xim/src/events/Makefile.in *** SDL-1.2.7/src/events/Makefile.in 2004-02-23 06:32:16.000000000 +0900 --- SDL-1.2.7-xim/src/events/Makefile.in 2004-05-10 23:36:31.761869968 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/events/SDL_events.c SDL-1.2.7-xim/src/events/SDL_events.c *** SDL-1.2.7/src/events/SDL_events.c 2004-02-19 02:21:59.000000000 +0900 --- SDL-1.2.7-xim/src/events/SDL_events.c 2004-05-07 21:45:57.000000000 +0900 *************** *** 478,480 **** --- 478,494 ---- /* Update internal event state */ return(posted); } + + int SDL_SetIMPosition( int x, int y ) + { + #ifdef ENABLE_IM_EVENT + SDL_VideoDevice *video = current_video; + SDL_VideoDevice *this = current_video; + + if ( video ) { + return video->SetIMPosition(this, x, y); + } + #endif + return -1; + + } diff -cr SDL-1.2.7/src/events/SDL_keyboard.c SDL-1.2.7-xim/src/events/SDL_keyboard.c *** SDL-1.2.7/src/events/SDL_keyboard.c 2004-02-19 02:22:00.000000000 +0900 --- SDL-1.2.7-xim/src/events/SDL_keyboard.c 2004-05-07 20:18:50.000000000 +0900 *************** *** 500,516 **** return(0); } ! /* Drop events that don't change state */ ! if ( SDL_KeyState[keysym->sym] == state ) { ! return(0); ! } ! /* Update internal keyboard state */ ! SDL_ModState = (SDLMod)modstate; ! SDL_KeyState[keysym->sym] = state; /* Post the event, if desired */ posted = 0; if ( SDL_ProcessEvents[event.type] == SDL_ENABLE ) { event.key.state = state; event.key.keysym = *keysym; --- 500,524 ---- return(0); } ! #ifdef ENABLE_IM_EVENT ! if ( keysym->sym != SDLK_UNKNOWN ) { ! #endif ! /* Drop events that don't change state */ ! if ( SDL_KeyState[keysym->sym] == state ) { ! return(0); ! } ! ! /* Update internal keyboard state */ ! SDL_ModState = (SDLMod)modstate; ! SDL_KeyState[keysym->sym] = state; ! #ifdef ENABLE_IM_EVENT ! } ! #endif /* Post the event, if desired */ posted = 0; + if ( SDL_ProcessEvents[event.type] == SDL_ENABLE ) { event.key.state = state; event.key.keysym = *keysym; *************** *** 522,527 **** --- 530,536 ---- SDL_KeyRepeat.firsttime = 1; SDL_KeyRepeat.timestamp=SDL_GetTicks(); } + if ( (SDL_EventOK == NULL) || SDL_EventOK(&event) ) { posted = 1; SDL_PushEvent(&event); diff -cr SDL-1.2.7/src/file/Makefile.in SDL-1.2.7-xim/src/file/Makefile.in *** SDL-1.2.7/src/file/Makefile.in 2004-02-23 06:32:16.000000000 +0900 --- SDL-1.2.7-xim/src/file/Makefile.in 2004-05-10 23:36:32.017831056 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/hermes/Makefile.in SDL-1.2.7-xim/src/hermes/Makefile.in *** SDL-1.2.7/src/hermes/Makefile.in 2004-02-23 06:32:17.000000000 +0900 --- SDL-1.2.7-xim/src/hermes/Makefile.in 2004-05-10 23:36:32.263793664 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/Makefile.in SDL-1.2.7-xim/src/joystick/Makefile.in *** SDL-1.2.7/src/joystick/Makefile.in 2004-02-23 06:32:17.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/Makefile.in 2004-05-10 23:36:32.549750192 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/amigaos/Makefile.in SDL-1.2.7-xim/src/joystick/amigaos/Makefile.in *** SDL-1.2.7/src/joystick/amigaos/Makefile.in 2004-02-23 06:32:17.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/amigaos/Makefile.in 2004-05-10 23:36:32.807710976 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/beos/Makefile.in SDL-1.2.7-xim/src/joystick/beos/Makefile.in *** SDL-1.2.7/src/joystick/beos/Makefile.in 2004-02-23 06:32:17.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/beos/Makefile.in 2004-05-10 23:36:33.061672368 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/bsd/Makefile.in SDL-1.2.7-xim/src/joystick/bsd/Makefile.in *** SDL-1.2.7/src/joystick/bsd/Makefile.in 2004-02-23 06:32:18.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/bsd/Makefile.in 2004-05-10 23:36:33.320633000 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/darwin/Makefile.in SDL-1.2.7-xim/src/joystick/darwin/Makefile.in *** SDL-1.2.7/src/joystick/darwin/Makefile.in 2004-02-23 06:32:18.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/darwin/Makefile.in 2004-05-10 23:36:33.579593632 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/dc/Makefile.in SDL-1.2.7-xim/src/joystick/dc/Makefile.in *** SDL-1.2.7/src/joystick/dc/Makefile.in 2004-02-23 06:32:18.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/dc/Makefile.in 2004-05-10 23:36:33.874548792 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/dummy/Makefile.in SDL-1.2.7-xim/src/joystick/dummy/Makefile.in *** SDL-1.2.7/src/joystick/dummy/Makefile.in 2004-02-23 06:32:18.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/dummy/Makefile.in 2004-05-10 23:36:34.132509576 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/linux/Makefile.in SDL-1.2.7-xim/src/joystick/linux/Makefile.in *** SDL-1.2.7/src/joystick/linux/Makefile.in 2004-02-23 06:32:19.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/linux/Makefile.in 2004-05-10 23:36:34.393469904 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/macos/Makefile.in SDL-1.2.7-xim/src/joystick/macos/Makefile.in *** SDL-1.2.7/src/joystick/macos/Makefile.in 2004-02-23 06:32:19.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/macos/Makefile.in 2004-05-10 23:36:34.652430536 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/mint/Makefile.in SDL-1.2.7-xim/src/joystick/mint/Makefile.in *** SDL-1.2.7/src/joystick/mint/Makefile.in 2004-02-23 06:32:19.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/mint/Makefile.in 2004-05-10 23:36:34.911391168 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/riscos/Makefile.in SDL-1.2.7-xim/src/joystick/riscos/Makefile.in *** SDL-1.2.7/src/joystick/riscos/Makefile.in 2004-02-23 06:32:20.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/riscos/Makefile.in 2004-05-10 23:36:35.170351800 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/joystick/win32/Makefile.in SDL-1.2.7-xim/src/joystick/win32/Makefile.in *** SDL-1.2.7/src/joystick/win32/Makefile.in 2004-02-23 06:32:20.000000000 +0900 --- SDL-1.2.7-xim/src/joystick/win32/Makefile.in 2004-05-10 23:36:35.430312280 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/main/Makefile.in SDL-1.2.7-xim/src/main/Makefile.in *** SDL-1.2.7/src/main/Makefile.in 2004-02-23 06:32:20.000000000 +0900 --- SDL-1.2.7-xim/src/main/Makefile.in 2004-05-10 23:36:35.836250568 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 54,65 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ARFLAGS = cru ! am__installdirs = $(DESTDIR)$(libdir) libLIBRARIES_INSTALL = $(INSTALL_DATA) LIBRARIES = $(lib_LIBRARIES) libSDLmain_a_AR = $(AR) $(ARFLAGS) libSDLmain_a_LIBADD = ! am__libSDLmain_a_SOURCES_DIST = dummy/SDL_dummy_main.c @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_FALSE@@TARGET_WIN32_FALSE@am__objects_1 = SDL_dummy_main.$(OBJEXT) @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE@am__objects_1 = SDL_qtopia_main.$(OBJEXT) @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE@am__objects_1 = \ --- 54,67 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = ARFLAGS = cru ! am__installdirs = "$(DESTDIR)$(libdir)" libLIBRARIES_INSTALL = $(INSTALL_DATA) LIBRARIES = $(lib_LIBRARIES) libSDLmain_a_AR = $(AR) $(ARFLAGS) libSDLmain_a_LIBADD = ! am__libSDLmain_a_SOURCES_DIST = dummy/SDL_dummy_main.c \ ! qtopia/SDL_qtopia_main.cc macosx/SDLMain.m macosx/SDLMain.h \ ! win32/SDL_win32_main.c @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_FALSE@@TARGET_WIN32_FALSE@am__objects_1 = SDL_dummy_main.$(OBJEXT) @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE@am__objects_1 = SDL_qtopia_main.$(OBJEXT) @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE@am__objects_1 = \ *************** *** 69,75 **** libSDLmain_a_OBJECTS = $(am_libSDLmain_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) libarch_la_LIBADD = ! am__libarch_la_SOURCES_DIST = arch.c @TARGET_BEOS_FALSE@am__objects_2 = arch.lo @TARGET_BEOS_TRUE@am__objects_2 = SDL_BeApp.lo am_libarch_la_OBJECTS = $(am__objects_2) --- 71,78 ---- libSDLmain_a_OBJECTS = $(am_libSDLmain_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) libarch_la_LIBADD = ! am__libarch_la_SOURCES_DIST = arch.c beos/SDL_BeApp.cc \ ! beos/SDL_BeApp.h @TARGET_BEOS_FALSE@am__objects_2 = arch.lo @TARGET_BEOS_TRUE@am__objects_2 = SDL_BeApp.lo am_libarch_la_OBJECTS = $(am__objects_2) *************** *** 366,385 **** cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(libdir) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ ! $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done @$(POST_INSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ ! $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done --- 369,388 ---- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) ! test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @$(POST_INSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ ! $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ else :; fi; \ done *************** *** 387,394 **** @$(NORMAL_UNINSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ ! rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLIBRARIES: --- 390,397 ---- @$(NORMAL_UNINSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLIBRARIES: *************** *** 704,710 **** check: check-am all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) installdirs: ! $(mkdir_p) $(DESTDIR)$(libdir) install: install-am install-exec: install-exec-am install-data: install-data-am --- 707,715 ---- check: check-am all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) installdirs: ! for dir in "$(DESTDIR)$(libdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am install-data: install-data-am diff -cr SDL-1.2.7/src/main/macosx/Makefile SDL-1.2.7-xim/src/main/macosx/Makefile *** SDL-1.2.7/src/main/macosx/Makefile 2004-02-23 06:33:22.000000000 +0900 --- SDL-1.2.7-xim/src/main/macosx/Makefile 2004-05-10 23:37:00.494501944 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # src/main/macosx/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # src/main/macosx/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 27,33 **** pkgincludedir = $(includedir)/SDL top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /usr/bin/ginstall -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c --- 27,33 ---- pkgincludedir = $(includedir)/SDL top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c *************** *** 54,60 **** CONFIG_CLEAN_FILES = Info.plist SOURCES = DIST_SOURCES = ! am__installdirs = $(DESTDIR)$(hackhacknibdatadir) $(DESTDIR)$(nibdatadir) hackhacknibdataDATA_INSTALL = $(INSTALL_DATA) nibdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(hackhacknibdata_DATA) $(nibdata_DATA) --- 54,60 ---- CONFIG_CLEAN_FILES = Info.plist SOURCES = DIST_SOURCES = ! am__installdirs = "$(DESTDIR)$(hackhacknibdatadir)" "$(DESTDIR)$(nibdatadir)" hackhacknibdataDATA_INSTALL = $(INSTALL_DATA) nibdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(hackhacknibdata_DATA) $(nibdata_DATA) *************** *** 66,76 **** AMTAR = tar AR = ar ARCH = linux ! ARTSCCONFIG = /usr/local/bin/artsc-config AS = as ASFLAGS = ! AUDIO_DRIVERS = disk/libaudio_disk.la dsp/libaudio_dsp.la dma/libaudio_dma.la arts/libaudio_arts.la esd/libaudio_esd.la ! AUDIO_SUBDIRS = disk dsp dma arts esd AUTOCONF = autoconf AUTOHEADER = autoheader AUTOMAKE = automake-1.8 --- 66,76 ---- AMTAR = tar AR = ar ARCH = linux ! ARTSCCONFIG = /usr/kde/3.2/bin/artsc-config AS = as ASFLAGS = ! AUDIO_DRIVERS = disk/libaudio_disk.la dsp/libaudio_dsp.la dma/libaudio_dma.la alsa/libaudio_alsa.la arts/libaudio_arts.la esd/libaudio_esd.la ! AUDIO_SUBDIRS = disk dsp dma alsa arts esd AUTOCONF = autoconf AUTOHEADER = autoheader AUTOMAKE = automake-1.8 *************** *** 78,93 **** CC = gcc CCAS = gcc CCASFLAGS = ! CCDEPMODE = depmode=gcc CDROM_DRIVERS = linux/libcdrom_linux.la CDROM_SUBDIRS = linux ! CFLAGS = -g -O2 -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_DLOPEN -DUSE_ASMBLIT -I./hermes -I$(top_srcdir)/src/hermes -DOSS_SUPPORT -DARTSC_SUPPORT -DARTSC_DYNAMIC=$(arts_lib) -I/usr/local/include/artsc -DESD_SUPPORT -DESD_DYNAMIC=$(esd_lib) -I/usr/X11R6/include -DENABLE_X11 -DXTHREADS -I./include -I./src/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA -DENABLE_FBCON -DHAVE_OPENGL -DUSE_INPUT_EVENTS -D_REENTRANT -DSDL_USE_PTHREADS -DHAVE_SIGACTION -I$(top_srcdir)/include -I$(top_srcdir)/include/SDL -I$(top_srcdir)/src -I$(top_srcdir)/src/main/linux -I$(top_srcdir)/src/audio -I$(top_srcdir)/src/video -I$(top_srcdir)/src/video/XFree86/extensions -I$(top_srcdir)/src/events -I$(top_srcdir)/src/joystick -I$(top_srcdir)/src/cdrom -I$(top_srcdir)/src/thread -I$(top_srcdir)/src/timer -I$(top_srcdir)/src/endian -I$(top_srcdir)/src/file -I$(top_builddir)/src/thread CPP = gcc -E CPPFLAGS = CXX = g++ CXXCPP = g++ -E ! CXXDEPMODE = depmode=gcc ! CXXFLAGS = -g -O2 -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_DLOPEN -DUSE_ASMBLIT -I./hermes -I$(top_srcdir)/src/hermes -DOSS_SUPPORT -DARTSC_SUPPORT -DARTSC_DYNAMIC=$(arts_lib) -I/usr/local/include/artsc -DESD_SUPPORT -DESD_DYNAMIC=$(esd_lib) -I/usr/X11R6/include -DENABLE_X11 -DXTHREADS -I./include -I./src/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -Isrc/video -DENABLE_DGA -DENABLE_FBCON -DHAVE_OPENGL -DUSE_INPUT_EVENTS -D_REENTRANT -DSDL_USE_PTHREADS -DHAVE_SIGACTION -I$(top_srcdir)/include -I$(top_srcdir)/include/SDL -I$(top_srcdir)/src -I$(top_srcdir)/src/main/linux -I$(top_srcdir)/src/audio -I$(top_srcdir)/src/video -I$(top_srcdir)/src/video/XFree86/extensions -I$(top_srcdir)/src/events -I$(top_srcdir)/src/joystick -I$(top_srcdir)/src/cdrom -I$(top_srcdir)/src/thread -I$(top_srcdir)/src/timer -I$(top_srcdir)/src/endian -I$(top_srcdir)/src/file -I$(top_builddir)/src/thread CYGPATH_W = echo DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"SDL\" -DVERSION=\"1.2.7\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 DEPDIR = .deps --- 78,93 ---- CC = gcc CCAS = gcc CCASFLAGS = ! CCDEPMODE = depmode=gcc3 CDROM_DRIVERS = linux/libcdrom_linux.la CDROM_SUBDIRS = linux ! CFLAGS = -g -O2 -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_DLOPEN -DUSE_ASMBLIT -I./hermes -I$(top_srcdir)/src/hermes -DOSS_SUPPORT -DALSA_SUPPORT -DARTSC_SUPPORT -DARTSC_DYNAMIC=$(arts_lib) -I/usr/kde/3.2/include/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DESD_SUPPORT -DESD_DYNAMIC=$(esd_lib) -I/usr/X11R6/include -DENABLE_X11 -DXTHREADS -I./include -I./src/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -DENABLE_IM_EVENT -Isrc/video -DENABLE_DGA -DENABLE_FBCON -DHAVE_OPENGL -DUSE_INPUT_EVENTS -D_REENTRANT -DSDL_USE_PTHREADS -DHAVE_SIGACTION -I$(top_srcdir)/include -I$(top_srcdir)/include/SDL -I$(top_srcdir)/src -I$(top_srcdir)/src/main/linux -I$(top_srcdir)/src/audio -I$(top_srcdir)/src/video -I$(top_srcdir)/src/video/XFree86/extensions -I$(top_srcdir)/src/events -I$(top_srcdir)/src/joystick -I$(top_srcdir)/src/cdrom -I$(top_srcdir)/src/thread -I$(top_srcdir)/src/timer -I$(top_srcdir)/src/endian -I$(top_srcdir)/src/file -I$(top_builddir)/src/thread CPP = gcc -E CPPFLAGS = CXX = g++ CXXCPP = g++ -E ! CXXDEPMODE = depmode=gcc3 ! CXXFLAGS = -g -O2 -Wall -DENABLE_DUMMYVIDEO -DDISKAUD_SUPPORT -DUSE_DLOPEN -DUSE_ASMBLIT -I./hermes -I$(top_srcdir)/src/hermes -DOSS_SUPPORT -DALSA_SUPPORT -DARTSC_SUPPORT -DARTSC_DYNAMIC=$(arts_lib) -I/usr/kde/3.2/include/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DESD_SUPPORT -DESD_DYNAMIC=$(esd_lib) -I/usr/X11R6/include -DENABLE_X11 -DXTHREADS -I./include -I./src/video -DXFREE86_VM -DXFREE86_VMGAMMA -DXFREE86_DGAMOUSE -DDEFAULT_DGAMOUSE -DXFREE86_XV -DHAVE_XINERAMA -DENABLE_IM_EVENT -Isrc/video -DENABLE_DGA -DENABLE_FBCON -DHAVE_OPENGL -DUSE_INPUT_EVENTS -D_REENTRANT -DSDL_USE_PTHREADS -DHAVE_SIGACTION -I$(top_srcdir)/include -I$(top_srcdir)/include/SDL -I$(top_srcdir)/src -I$(top_srcdir)/src/main/linux -I$(top_srcdir)/src/audio -I$(top_srcdir)/src/video -I$(top_srcdir)/src/video/XFree86/extensions -I$(top_srcdir)/src/events -I$(top_srcdir)/src/joystick -I$(top_srcdir)/src/cdrom -I$(top_srcdir)/src/thread -I$(top_srcdir)/src/timer -I$(top_srcdir)/src/endian -I$(top_srcdir)/src/file -I$(top_builddir)/src/thread CYGPATH_W = echo DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"SDL\" -DVERSION=\"1.2.7\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 DEPDIR = .deps *************** *** 105,111 **** ENABLE_STATIC_TRUE = ESD_CFLAGS = ESD_CONFIG = /usr/bin/esd-config ! ESD_LIBS = -L/usr/lib -lesd -laudiofile -lm EXEEXT = F77 = g77 FFLAGS = -g -O2 --- 105,111 ---- ENABLE_STATIC_TRUE = ESD_CFLAGS = ESD_CONFIG = /usr/bin/esd-config ! ESD_LIBS = -L/usr/lib -lesd -laudiofile -lm -lasound EXEEXT = F77 = g77 FFLAGS = -g -O2 *************** *** 128,134 **** LT_RELEASE = 1.2 LT_REVISION = 0 MAKEINFO = makeinfo ! NASM = /usr/local/bin/nasm NASMFLAGS = -f elf OBJC = OBJCDEPMODE = --- 128,134 ---- LT_RELEASE = 1.2 LT_REVISION = 0 MAKEINFO = makeinfo ! NASM = /usr/bin/nasm NASMFLAGS = -f elf OBJC = OBJCDEPMODE = *************** *** 160,168 **** SET_MAKE = SHARED_SYSTEM_LIBS = SHELL = /bin/sh ! STATIC_SYSTEM_LIBS = -lm -ldl -L/usr/X11R6/lib -lX11 -lXext STRIP = strip ! SYSTEM_LIBS = -lm -ldl -L/usr/X11R6/lib -lX11 -lXext TARGET_AIX_FALSE = TARGET_AIX_TRUE = # TARGET_BEOS_FALSE = --- 160,168 ---- SET_MAKE = SHARED_SYSTEM_LIBS = SHELL = /bin/sh ! STATIC_SYSTEM_LIBS = -lm -ldl -lasound -L/usr/X11R6/lib -lX11 -lXext STRIP = strip ! SYSTEM_LIBS = -lm -ldl -lasound -L/usr/X11R6/lib -lX11 -lXext TARGET_AIX_FALSE = TARGET_AIX_TRUE = # TARGET_BEOS_FALSE = *************** *** 207,222 **** ac_ct_AR = ar ac_ct_AS = ac_ct_CC = gcc ! ac_ct_CXX = g++ ac_ct_DLLTOOL = ac_ct_F77 = g77 ac_ct_OBJDUMP = ac_ct_RANLIB = ranlib ac_ct_STRIP = strip ! am__fastdepCC_FALSE = ! am__fastdepCC_TRUE = # ! am__fastdepCXX_FALSE = ! am__fastdepCXX_TRUE = # am__fastdepOBJC_FALSE = am__fastdepOBJC_TRUE = # am__include = include --- 207,222 ---- ac_ct_AR = ar ac_ct_AS = ac_ct_CC = gcc ! ac_ct_CXX = ac_ct_DLLTOOL = ac_ct_F77 = g77 ac_ct_OBJDUMP = ac_ct_RANLIB = ranlib ac_ct_STRIP = strip ! am__fastdepCC_FALSE = # ! am__fastdepCC_TRUE = ! am__fastdepCXX_FALSE = # ! am__fastdepCXX_TRUE = am__fastdepOBJC_FALSE = am__fastdepOBJC_TRUE = # am__include = include *************** *** 239,252 **** host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info ! install_sh = /usr/src/SDL12/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man mkdir_p = mkdir -p -- . oldincludedir = /usr/include ! prefix = /usr/local program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com --- 239,252 ---- host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info ! install_sh = /usr/local/src/SDL-1.2.7-xim/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man mkdir_p = mkdir -p -- . oldincludedir = /usr/include ! prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com *************** *** 312,348 **** uninstall-info-am: install-hackhacknibdataDATA: $(hackhacknibdata_DATA) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(hackhacknibdatadir) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(hackhacknibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(hackhacknibdatadir)/$$f"; \ ! $(hackhacknibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(hackhacknibdatadir)/$$f; \ done uninstall-hackhacknibdataDATA: @$(NORMAL_UNINSTALL) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(hackhacknibdatadir)/$$f"; \ ! rm -f $(DESTDIR)$(hackhacknibdatadir)/$$f; \ done install-nibdataDATA: $(nibdata_DATA) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(nibdatadir) @list='$(nibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(nibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(nibdatadir)/$$f"; \ ! $(nibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(nibdatadir)/$$f; \ done uninstall-nibdataDATA: @$(NORMAL_UNINSTALL) @list='$(nibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(nibdatadir)/$$f"; \ ! rm -f $(DESTDIR)$(nibdatadir)/$$f; \ done tags: TAGS TAGS: --- 312,348 ---- uninstall-info-am: install-hackhacknibdataDATA: $(hackhacknibdata_DATA) @$(NORMAL_INSTALL) ! test -z "$(hackhacknibdatadir)" || $(mkdir_p) "$(DESTDIR)$(hackhacknibdatadir)" @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(hackhacknibdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hackhacknibdatadir)/$$f'"; \ ! $(hackhacknibdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hackhacknibdatadir)/$$f"; \ done uninstall-hackhacknibdataDATA: @$(NORMAL_UNINSTALL) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(hackhacknibdatadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(hackhacknibdatadir)/$$f"; \ done install-nibdataDATA: $(nibdata_DATA) @$(NORMAL_INSTALL) ! test -z "$(nibdatadir)" || $(mkdir_p) "$(DESTDIR)$(nibdatadir)" @list='$(nibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(nibdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(nibdatadir)/$$f'"; \ ! $(nibdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(nibdatadir)/$$f"; \ done uninstall-nibdataDATA: @$(NORMAL_UNINSTALL) @list='$(nibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(nibdatadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(nibdatadir)/$$f"; \ done tags: TAGS TAGS: *************** *** 385,391 **** check: check-am all-am: Makefile $(DATA) installdirs: ! $(mkdir_p) $(DESTDIR)$(hackhacknibdatadir) $(DESTDIR)$(nibdatadir) install: install-am install-exec: install-exec-am install-data: install-data-am --- 385,393 ---- check: check-am all-am: Makefile $(DATA) installdirs: ! for dir in "$(DESTDIR)$(hackhacknibdatadir)" "$(DESTDIR)$(nibdatadir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am install-data: install-data-am diff -cr SDL-1.2.7/src/main/macosx/Makefile.in SDL-1.2.7-xim/src/main/macosx/Makefile.in *** SDL-1.2.7/src/main/macosx/Makefile.in 2004-02-23 06:32:20.000000000 +0900 --- SDL-1.2.7-xim/src/main/macosx/Makefile.in 2004-05-10 23:36:36.049218192 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 54,60 **** CONFIG_CLEAN_FILES = Info.plist SOURCES = DIST_SOURCES = ! am__installdirs = $(DESTDIR)$(hackhacknibdatadir) $(DESTDIR)$(nibdatadir) hackhacknibdataDATA_INSTALL = $(INSTALL_DATA) nibdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(hackhacknibdata_DATA) $(nibdata_DATA) --- 54,60 ---- CONFIG_CLEAN_FILES = Info.plist SOURCES = DIST_SOURCES = ! am__installdirs = "$(DESTDIR)$(hackhacknibdatadir)" "$(DESTDIR)$(nibdatadir)" hackhacknibdataDATA_INSTALL = $(INSTALL_DATA) nibdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(hackhacknibdata_DATA) $(nibdata_DATA) *************** *** 312,348 **** uninstall-info-am: install-hackhacknibdataDATA: $(hackhacknibdata_DATA) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(hackhacknibdatadir) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(hackhacknibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(hackhacknibdatadir)/$$f"; \ ! $(hackhacknibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(hackhacknibdatadir)/$$f; \ done uninstall-hackhacknibdataDATA: @$(NORMAL_UNINSTALL) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(hackhacknibdatadir)/$$f"; \ ! rm -f $(DESTDIR)$(hackhacknibdatadir)/$$f; \ done install-nibdataDATA: $(nibdata_DATA) @$(NORMAL_INSTALL) ! $(mkdir_p) $(DESTDIR)$(nibdatadir) @list='$(nibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(nibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(nibdatadir)/$$f"; \ ! $(nibdataDATA_INSTALL) $$d$$p $(DESTDIR)$(nibdatadir)/$$f; \ done uninstall-nibdataDATA: @$(NORMAL_UNINSTALL) @list='$(nibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(nibdatadir)/$$f"; \ ! rm -f $(DESTDIR)$(nibdatadir)/$$f; \ done tags: TAGS TAGS: --- 312,348 ---- uninstall-info-am: install-hackhacknibdataDATA: $(hackhacknibdata_DATA) @$(NORMAL_INSTALL) ! test -z "$(hackhacknibdatadir)" || $(mkdir_p) "$(DESTDIR)$(hackhacknibdatadir)" @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(hackhacknibdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hackhacknibdatadir)/$$f'"; \ ! $(hackhacknibdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hackhacknibdatadir)/$$f"; \ done uninstall-hackhacknibdataDATA: @$(NORMAL_UNINSTALL) @list='$(hackhacknibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(hackhacknibdatadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(hackhacknibdatadir)/$$f"; \ done install-nibdataDATA: $(nibdata_DATA) @$(NORMAL_INSTALL) ! test -z "$(nibdatadir)" || $(mkdir_p) "$(DESTDIR)$(nibdatadir)" @list='$(nibdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(nibdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(nibdatadir)/$$f'"; \ ! $(nibdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(nibdatadir)/$$f"; \ done uninstall-nibdataDATA: @$(NORMAL_UNINSTALL) @list='$(nibdata_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(nibdatadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(nibdatadir)/$$f"; \ done tags: TAGS TAGS: *************** *** 385,391 **** check: check-am all-am: Makefile $(DATA) installdirs: ! $(mkdir_p) $(DESTDIR)$(hackhacknibdatadir) $(DESTDIR)$(nibdatadir) install: install-am install-exec: install-exec-am install-data: install-data-am --- 385,393 ---- check: check-am all-am: Makefile $(DATA) installdirs: ! for dir in "$(DESTDIR)$(hackhacknibdatadir)" "$(DESTDIR)$(nibdatadir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am install-data: install-data-am diff -cr SDL-1.2.7/src/thread/Makefile.in SDL-1.2.7-xim/src/thread/Makefile.in *** SDL-1.2.7/src/thread/Makefile.in 2004-02-23 06:32:21.000000000 +0900 --- SDL-1.2.7-xim/src/thread/Makefile.in 2004-05-10 23:36:36.359171072 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/timer/Makefile.in SDL-1.2.7-xim/src/timer/Makefile.in *** SDL-1.2.7/src/timer/Makefile.in 2004-02-23 06:32:21.000000000 +0900 --- SDL-1.2.7-xim/src/timer/Makefile.in 2004-05-10 23:36:36.668124104 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, *************** *** 51,57 **** LTLIBRARIES = $(noinst_LTLIBRARIES) libtimer_la_LIBADD = am__libtimer_la_SOURCES_DIST = SDL_timer.c SDL_timer_c.h \ ! SDL_systimer.h SDL_systimer.c am__objects_1 = SDL_timer.lo @TARGET_MINT_FALSE@am__objects_2 = SDL_systimer.lo @TARGET_MINT_TRUE@am__objects_2 = SDL_systimer.lo SDL_vbltimer.lo --- 51,58 ---- LTLIBRARIES = $(noinst_LTLIBRARIES) libtimer_la_LIBADD = am__libtimer_la_SOURCES_DIST = SDL_timer.c SDL_timer_c.h \ ! SDL_systimer.h SDL_systimer.c mint/SDL_vbltimer.S \ ! mint/SDL_vbltimer_s.h am__objects_1 = SDL_timer.lo @TARGET_MINT_FALSE@am__objects_2 = SDL_systimer.lo @TARGET_MINT_TRUE@am__objects_2 = SDL_systimer.lo SDL_vbltimer.lo diff -cr SDL-1.2.7/src/video/Makefile.in SDL-1.2.7-xim/src/video/Makefile.in *** SDL-1.2.7/src/video/Makefile.in 2004-02-23 06:32:21.000000000 +0900 --- SDL-1.2.7-xim/src/video/Makefile.in 2004-05-10 23:36:36.955080480 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/SDL_sysvideo.h SDL-1.2.7-xim/src/video/SDL_sysvideo.h *** SDL-1.2.7/src/video/SDL_sysvideo.h 2004-02-19 02:22:04.000000000 +0900 --- SDL-1.2.7-xim/src/video/SDL_sysvideo.h 2004-05-07 21:46:23.000000000 +0900 *************** *** 273,278 **** --- 273,284 ---- void (*PumpEvents)(_THIS); /* * * */ + /* IM manager function */ + + /* set im position to (x,y) */ + int (*SetIMPosition)(_THIS, int x, int y); + + /* * * */ /* Data common to all drivers */ SDL_Surface *screen; SDL_Surface *shadow; diff -cr SDL-1.2.7/src/video/XFree86/Makefile.in SDL-1.2.7-xim/src/video/XFree86/Makefile.in *** SDL-1.2.7/src/video/XFree86/Makefile.in 2004-02-23 06:32:22.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/Makefile.in 2004-05-10 23:36:37.163048864 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/XFree86/Xinerama/Makefile.in SDL-1.2.7-xim/src/video/XFree86/Xinerama/Makefile.in *** SDL-1.2.7/src/video/XFree86/Xinerama/Makefile.in 2004-02-23 06:32:22.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/Xinerama/Makefile.in 2004-05-10 23:36:37.423009344 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/XFree86/Xv/Makefile.in SDL-1.2.7-xim/src/video/XFree86/Xv/Makefile.in *** SDL-1.2.7/src/video/XFree86/Xv/Makefile.in 2004-02-23 06:32:22.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/Xv/Makefile.in 2004-05-10 23:36:37.688968912 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/XFree86/Xxf86dga/Makefile.in SDL-1.2.7-xim/src/video/XFree86/Xxf86dga/Makefile.in *** SDL-1.2.7/src/video/XFree86/Xxf86dga/Makefile.in 2004-02-23 06:32:22.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/Xxf86dga/Makefile.in 2004-05-10 23:36:37.948929392 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/XFree86/Xxf86vm/Makefile.in SDL-1.2.7-xim/src/video/XFree86/Xxf86vm/Makefile.in *** SDL-1.2.7/src/video/XFree86/Xxf86vm/Makefile.in 2004-02-23 06:32:23.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/Xxf86vm/Makefile.in 2004-05-10 23:36:38.208889872 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/XFree86/extensions/Makefile.in SDL-1.2.7-xim/src/video/XFree86/extensions/Makefile.in *** SDL-1.2.7/src/video/XFree86/extensions/Makefile.in 2004-02-23 06:32:23.000000000 +0900 --- SDL-1.2.7-xim/src/video/XFree86/extensions/Makefile.in 2004-05-10 23:36:38.420857648 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/aalib/Makefile.in SDL-1.2.7-xim/src/video/aalib/Makefile.in *** SDL-1.2.7/src/video/aalib/Makefile.in 2004-02-23 06:32:23.000000000 +0900 --- SDL-1.2.7-xim/src/video/aalib/Makefile.in 2004-05-10 23:36:38.690816608 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/ataricommon/Makefile.in SDL-1.2.7-xim/src/video/ataricommon/Makefile.in *** SDL-1.2.7/src/video/ataricommon/Makefile.in 2004-02-23 06:32:23.000000000 +0900 --- SDL-1.2.7-xim/src/video/ataricommon/Makefile.in 2004-05-10 23:36:38.985771768 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/bwindow/Makefile.in SDL-1.2.7-xim/src/video/bwindow/Makefile.in *** SDL-1.2.7/src/video/bwindow/Makefile.in 2004-02-23 06:32:24.000000000 +0900 --- SDL-1.2.7-xim/src/video/bwindow/Makefile.in 2004-05-10 23:36:39.260729968 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/cybergfx/Makefile.in SDL-1.2.7-xim/src/video/cybergfx/Makefile.in *** SDL-1.2.7/src/video/cybergfx/Makefile.in 2004-02-23 06:32:24.000000000 +0900 --- SDL-1.2.7-xim/src/video/cybergfx/Makefile.in 2004-05-10 23:36:39.535688168 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/dc/Makefile.in SDL-1.2.7-xim/src/video/dc/Makefile.in *** SDL-1.2.7/src/video/dc/Makefile.in 2004-02-23 06:32:24.000000000 +0900 --- SDL-1.2.7-xim/src/video/dc/Makefile.in 2004-05-10 23:36:39.808646672 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/dga/Makefile.in SDL-1.2.7-xim/src/video/dga/Makefile.in *** SDL-1.2.7/src/video/dga/Makefile.in 2004-02-23 06:32:25.000000000 +0900 --- SDL-1.2.7-xim/src/video/dga/Makefile.in 2004-05-10 23:36:40.080605328 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/directfb/Makefile.in SDL-1.2.7-xim/src/video/directfb/Makefile.in *** SDL-1.2.7/src/video/directfb/Makefile.in 2004-02-23 06:32:25.000000000 +0900 --- SDL-1.2.7-xim/src/video/directfb/Makefile.in 2004-05-10 23:36:40.358563072 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/dummy/Makefile.in SDL-1.2.7-xim/src/video/dummy/Makefile.in *** SDL-1.2.7/src/video/dummy/Makefile.in 2004-02-23 06:32:25.000000000 +0900 --- SDL-1.2.7-xim/src/video/dummy/Makefile.in 2004-05-10 23:36:40.631521576 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/epoc/Makefile.in SDL-1.2.7-xim/src/video/epoc/Makefile.in *** SDL-1.2.7/src/video/epoc/Makefile.in 2004-02-23 06:32:25.000000000 +0900 --- SDL-1.2.7-xim/src/video/epoc/Makefile.in 2004-05-10 23:36:40.902480384 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/fbcon/Makefile.in SDL-1.2.7-xim/src/video/fbcon/Makefile.in *** SDL-1.2.7/src/video/fbcon/Makefile.in 2004-02-23 06:32:26.000000000 +0900 --- SDL-1.2.7-xim/src/video/fbcon/Makefile.in 2004-05-10 23:36:41.177438584 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/gem/Makefile.in SDL-1.2.7-xim/src/video/gem/Makefile.in *** SDL-1.2.7/src/video/gem/Makefile.in 2004-02-23 06:32:26.000000000 +0900 --- SDL-1.2.7-xim/src/video/gem/Makefile.in 2004-05-10 23:36:41.451396936 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/ggi/Makefile.in SDL-1.2.7-xim/src/video/ggi/Makefile.in *** SDL-1.2.7/src/video/ggi/Makefile.in 2004-02-23 06:32:26.000000000 +0900 --- SDL-1.2.7-xim/src/video/ggi/Makefile.in 2004-05-10 23:36:41.726355136 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/maccommon/Makefile.in SDL-1.2.7-xim/src/video/maccommon/Makefile.in *** SDL-1.2.7/src/video/maccommon/Makefile.in 2004-02-23 06:32:26.000000000 +0900 --- SDL-1.2.7-xim/src/video/maccommon/Makefile.in 2004-05-10 23:36:42.003313032 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/macdsp/Makefile.in SDL-1.2.7-xim/src/video/macdsp/Makefile.in *** SDL-1.2.7/src/video/macdsp/Makefile.in 2004-02-23 06:32:27.000000000 +0900 --- SDL-1.2.7-xim/src/video/macdsp/Makefile.in 2004-05-10 23:36:42.278271232 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/macrom/Makefile.in SDL-1.2.7-xim/src/video/macrom/Makefile.in *** SDL-1.2.7/src/video/macrom/Makefile.in 2004-02-23 06:32:27.000000000 +0900 --- SDL-1.2.7-xim/src/video/macrom/Makefile.in 2004-05-10 23:36:42.553229432 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/nanox/Makefile.in SDL-1.2.7-xim/src/video/nanox/Makefile.in *** SDL-1.2.7/src/video/nanox/Makefile.in 2004-02-23 06:32:27.000000000 +0900 --- SDL-1.2.7-xim/src/video/nanox/Makefile.in 2004-05-10 23:36:42.831187176 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/photon/Makefile.in SDL-1.2.7-xim/src/video/photon/Makefile.in *** SDL-1.2.7/src/video/photon/Makefile.in 2004-02-23 06:32:28.000000000 +0900 --- SDL-1.2.7-xim/src/video/photon/Makefile.in 2004-05-10 23:36:43.116143856 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/picogui/Makefile.in SDL-1.2.7-xim/src/video/picogui/Makefile.in *** SDL-1.2.7/src/video/picogui/Makefile.in 2004-02-23 06:32:28.000000000 +0900 --- SDL-1.2.7-xim/src/video/picogui/Makefile.in 2004-05-10 23:36:43.392101904 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/ps2gs/Makefile.in SDL-1.2.7-xim/src/video/ps2gs/Makefile.in *** SDL-1.2.7/src/video/ps2gs/Makefile.in 2004-02-23 06:32:28.000000000 +0900 --- SDL-1.2.7-xim/src/video/ps2gs/Makefile.in 2004-05-10 23:36:43.668059952 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/qtopia/Makefile.in SDL-1.2.7-xim/src/video/qtopia/Makefile.in *** SDL-1.2.7/src/video/qtopia/Makefile.in 2004-02-23 06:32:28.000000000 +0900 --- SDL-1.2.7-xim/src/video/qtopia/Makefile.in 2004-05-10 23:36:43.945017848 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/quartz/Makefile.in SDL-1.2.7-xim/src/video/quartz/Makefile.in *** SDL-1.2.7/src/video/quartz/Makefile.in 2004-02-23 06:32:29.000000000 +0900 --- SDL-1.2.7-xim/src/video/quartz/Makefile.in 2004-05-10 23:36:44.218976200 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/riscos/Makefile.in SDL-1.2.7-xim/src/video/riscos/Makefile.in *** SDL-1.2.7/src/video/riscos/Makefile.in 2004-02-23 06:32:29.000000000 +0900 --- SDL-1.2.7-xim/src/video/riscos/Makefile.in 2004-05-10 23:36:44.498933640 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/svga/Makefile.in SDL-1.2.7-xim/src/video/svga/Makefile.in *** SDL-1.2.7/src/video/svga/Makefile.in 2004-02-23 06:32:29.000000000 +0900 --- SDL-1.2.7-xim/src/video/svga/Makefile.in 2004-05-10 23:36:44.781890624 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/vgl/Makefile.in SDL-1.2.7-xim/src/video/vgl/Makefile.in *** SDL-1.2.7/src/video/vgl/Makefile.in 2004-02-23 06:32:30.000000000 +0900 --- SDL-1.2.7-xim/src/video/vgl/Makefile.in 2004-05-10 23:36:45.060848216 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/wincommon/Makefile.in SDL-1.2.7-xim/src/video/wincommon/Makefile.in *** SDL-1.2.7/src/video/wincommon/Makefile.in 2004-02-23 06:32:30.000000000 +0900 --- SDL-1.2.7-xim/src/video/wincommon/Makefile.in 2004-05-10 23:36:45.347804592 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/windib/Makefile.in SDL-1.2.7-xim/src/video/windib/Makefile.in *** SDL-1.2.7/src/video/windib/Makefile.in 2004-02-23 06:32:30.000000000 +0900 --- SDL-1.2.7-xim/src/video/windib/Makefile.in 2004-05-10 23:36:45.625762336 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/windx5/Makefile.in SDL-1.2.7-xim/src/video/windx5/Makefile.in *** SDL-1.2.7/src/video/windx5/Makefile.in 2004-02-23 06:32:30.000000000 +0900 --- SDL-1.2.7-xim/src/video/windx5/Makefile.in 2004-05-10 23:36:45.924716888 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/x11/Makefile.in SDL-1.2.7-xim/src/video/x11/Makefile.in *** SDL-1.2.7/src/video/x11/Makefile.in 2004-02-23 06:32:31.000000000 +0900 --- SDL-1.2.7-xim/src/video/x11/Makefile.in 2004-05-10 23:36:46.206674024 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -cr SDL-1.2.7/src/video/x11/SDL_x11events.c SDL-1.2.7-xim/src/video/x11/SDL_x11events.c *** SDL-1.2.7/src/video/x11/SDL_x11events.c 2004-02-19 02:22:09.000000000 +0900 --- SDL-1.2.7-xim/src/video/x11/SDL_x11events.c 2004-05-08 21:59:03.000000000 +0900 *************** *** 57,68 **** /* Define this if you want to debug X11 events */ ! /*#define DEBUG_XEVENTS*/ /* The translation tables from an X11 keysym to a SDL keysym */ static SDLKey ODD_keymap[256]; static SDLKey MISC_keymap[256]; ! SDL_keysym *X11_TranslateKey(Display *display, XKeyEvent *xkey, KeyCode kc, SDL_keysym *keysym); /* Check to see if this is a repeated key. --- 57,68 ---- /* Define this if you want to debug X11 events */ ! /* #define DEBUG_XEVENTS */ /* The translation tables from an X11 keysym to a SDL keysym */ static SDLKey ODD_keymap[256]; static SDLKey MISC_keymap[256]; ! SDL_keysym *X11_TranslateKey(_THIS, XKeyEvent *xkey, KeyCode kc, SDL_keysym *keysym); /* Check to see if this is a repeated key. *************** *** 162,167 **** --- 162,175 ---- XNextEvent(SDL_Display, &xevent); posted = 0; + + #ifdef ENABLE_IM_EVENT + if ( SDL_TranslateUNICODE ) { + if ( XFilterEvent(&xevent,None) == True ) + return 0; + } + #endif + switch (xevent.type) { /* Gaining mouse coverage? */ *************** *** 219,224 **** --- 227,238 ---- /* Queue entry into fullscreen mode */ switch_waiting = 0x01 | SDL_FULLSCREEN; switch_time = SDL_GetTicks() + 1500; + + #ifdef ENABLE_IM_EVENT + if ( SDL_XIC ) + XSetICFocus(SDL_XIC); + #endif + } break; *************** *** 232,237 **** --- 246,256 ---- /* Queue leaving fullscreen mode */ switch_waiting = 0x01; switch_time = SDL_GetTicks() + 200; + + #ifdef ENABLE_IM_EVENT + if ( SDL_XIC ) + XUnsetICFocus(SDL_XIC); + #endif } break; *************** *** 240,246 **** #ifdef DEBUG_XEVENTS printf("KeymapNotify!\n"); #endif ! X11_SetKeyboardState(SDL_Display, xevent.xkeymap.key_vector); } break; --- 259,265 ---- #ifdef DEBUG_XEVENTS printf("KeymapNotify!\n"); #endif ! X11_SetKeyboardState( this, xevent.xkeymap.key_vector); } break; *************** *** 292,298 **** printf("KeyPress (X11 keycode = 0x%X)\n", xevent.xkey.keycode); #endif posted = SDL_PrivateKeyboard(SDL_PRESSED, ! X11_TranslateKey(SDL_Display, &xevent.xkey, xevent.xkey.keycode, &keysym)); } --- 311,317 ---- printf("KeyPress (X11 keycode = 0x%X)\n", xevent.xkey.keycode); #endif posted = SDL_PrivateKeyboard(SDL_PRESSED, ! X11_TranslateKey(this, &xevent.xkey, xevent.xkey.keycode, &keysym)); } *************** *** 308,314 **** /* Check to see if this is a repeated key */ if ( ! X11_KeyRepeat(SDL_Display, &xevent) ) { posted = SDL_PrivateKeyboard(SDL_RELEASED, ! X11_TranslateKey(SDL_Display, &xevent.xkey, xevent.xkey.keycode, &keysym)); } --- 327,333 ---- /* Check to see if this is a repeated key */ if ( ! X11_KeyRepeat(SDL_Display, &xevent) ) { posted = SDL_PrivateKeyboard(SDL_RELEASED, ! X11_TranslateKey(this, &xevent.xkey, xevent.xkey.keycode, &keysym)); } *************** *** 611,624 **** MISC_keymap[XK_Hyper_R&0xFF] = SDLK_MENU; /* Windows "Menu" key */ } ! SDL_keysym *X11_TranslateKey(Display *display, XKeyEvent *xkey, KeyCode kc, SDL_keysym *keysym) { KeySym xsym; /* Get the raw keyboard scancode */ keysym->scancode = kc; ! xsym = XKeycodeToKeysym(display, kc, 0); #ifdef DEBUG_KEYS fprintf(stderr, "Translating key 0x%.4x (%d)\n", xsym, kc); #endif --- 630,643 ---- MISC_keymap[XK_Hyper_R&0xFF] = SDLK_MENU; /* Windows "Menu" key */ } ! SDL_keysym *X11_TranslateKey(_THIS, XKeyEvent *xkey, KeyCode kc, SDL_keysym *keysym) { KeySym xsym; /* Get the raw keyboard scancode */ keysym->scancode = kc; ! xsym = XKeycodeToKeysym( SDL_Display, kc, 0); #ifdef DEBUG_KEYS fprintf(stderr, "Translating key 0x%.4x (%d)\n", xsym, kc); #endif *************** *** 693,701 **** --- 712,725 ---- /* If UNICODE is on, get the UNICODE value for the key */ keysym->unicode = 0; if ( SDL_TranslateUNICODE && xkey ) { + #ifdef ENABLE_IM_EVENT + Status state; + int len; + #else static XComposeStatus state; /* Until we handle the IM protocol, use XLookupString() */ unsigned char keybuf[32]; + #endif #define BROKEN_XFREE86_INTERNATIONAL_KBD /* This appears to be a magical flag that is used with AltGr on *************** *** 709,716 **** xkey->state |= (1<<13); } #endif /* Look up the translated value for the key event */ ! if ( XLookupString(xkey, (char *)keybuf, sizeof(keybuf), NULL, &state) ) { /* * FIXME,: XLookupString() may yield more than one --- 733,775 ---- xkey->state |= (1<<13); } #endif + + #ifdef ENABLE_IM_EVENT /* Look up the translated value for the key event */ ! ! if ( SDL_XIC ) { ! len = XmbLookupString( SDL_XIC, xkey, (char *)im_compose_buffer, im_compose_len, ! NULL, &state); ! ! if ( len == (im_compose_len-1) ) { ! free( im_compose_buffer ); ! ! im_compose_len = len*2; ! im_compose_buffer = malloc( im_compose_len ); ! ! len = XmbLookupString( SDL_XIC, xkey, (char *)im_compose_buffer, im_compose_len, ! NULL, &state); ! ! im_compose_buffer[len] = '\0'; ! } ! ! } else { ! len = XLookupString( xkey, im_compose_buffer, im_compose_len, NULL, NULL ); ! } ! ! if ( len > 0 ) { ! im_compose_buffer[len] = '\0'; ! ! keysym->unicode = im_compose_buffer[0]; ! keysym->im_compose = im_compose_buffer; ! } else { ! keysym->im_compose = NULL; ! } ! } else { ! keysym->im_compose = NULL; ! #else /* ENABLE_IM_EVENT */ ! /* Look up the translated value for the key event */ ! if ( XLookupString(xkey, (char *)keybuf, sizeof(keybuf)-1, NULL, &state) ) { /* * FIXME,: XLookupString() may yield more than one *************** *** 720,726 **** --- 779,790 ---- */ keysym->unicode = keybuf[0]; } + keysym->im_compose = NULL; + #endif + } + + return(keysym); } *************** *** 836,842 **** * synthetic keypress/release events. * key_vec is a bit vector of keycodes (256 bits) */ ! void X11_SetKeyboardState(Display *display, const char *key_vec) { char keys_return[32]; int i; --- 900,906 ---- * synthetic keypress/release events. * key_vec is a bit vector of keycodes (256 bits) */ ! void X11_SetKeyboardState(_THIS, const char *key_vec) { char keys_return[32]; int i; *************** *** 850,863 **** /* The first time the window is mapped, we initialize key state */ if ( ! key_vec ) { ! XQueryKeymap(display, keys_return); key_vec = keys_return; } /* Get the keyboard modifier state */ modstate = 0; ! get_modifier_masks(display); ! if ( XQueryPointer(display, DefaultRootWindow(display), &junk_window, &junk_window, &x, &y, &x, &y, &mask) ) { if ( mask & LockMask ) { modstate |= KMOD_CAPS; --- 914,927 ---- /* The first time the window is mapped, we initialize key state */ if ( ! key_vec ) { ! XQueryKeymap(SDL_Display, keys_return); key_vec = keys_return; } /* Get the keyboard modifier state */ modstate = 0; ! get_modifier_masks(SDL_Display); ! if ( XQueryPointer(SDL_Display, DefaultRootWindow(SDL_Display), &junk_window, &junk_window, &x, &y, &x, &y, &mask) ) { if ( mask & LockMask ) { modstate |= KMOD_CAPS; *************** *** 885,891 **** if(key_vec[i] & (1 << j)) { SDL_keysym sk; KeyCode kc = i << 3 | j; ! X11_TranslateKey(display, NULL, kc, &sk); new_kstate[sk.sym] = SDL_PRESSED; xcode[sk.sym] = kc; } --- 949,955 ---- if(key_vec[i] & (1 << j)) { SDL_keysym sk; KeyCode kc = i << 3 | j; ! X11_TranslateKey(this, NULL, kc, &sk); new_kstate[sk.sym] = SDL_PRESSED; xcode[sk.sym] = kc; } *************** *** 950,952 **** --- 1014,1048 ---- X11_InitKeymap(); } + #ifdef ENABLE_IM_EVENT + int X11_SetIMPosition(_THIS, int x, int y) + { + XVaNestedList preedit_attr; + XPoint im_pos; + + if ( !SDL_XIC ) { + return -1; + } + + im_pos.x = x; + im_pos.y = y; + + preedit_attr = XVaCreateNestedList( 0, + XNSpotLocation, &im_pos, + NULL ); + + XSetICValues( SDL_XIC, + XNPreeditAttributes, preedit_attr, + NULL ); + + XFree( preedit_attr ); + + return 0; + } + #else + int X11_SetIMPosition(_THIS, int x, int y) + { + x = y; + return -1; + } + #endif SDL-1.2.7-xim/src/video/x11だけに発見: SDL_x11events.c~ diff -cr SDL-1.2.7/src/video/x11/SDL_x11events_c.h SDL-1.2.7-xim/src/video/x11/SDL_x11events_c.h *** SDL-1.2.7/src/video/x11/SDL_x11events_c.h 2004-02-19 02:22:09.000000000 +0900 --- SDL-1.2.7-xim/src/video/x11/SDL_x11events_c.h 2004-05-07 21:46:42.000000000 +0900 *************** *** 30,34 **** /* Functions to be exported */ extern void X11_InitOSKeymap(_THIS); extern void X11_PumpEvents(_THIS); ! extern void X11_SetKeyboardState(Display *display, const char *key_vec); --- 30,40 ---- /* Functions to be exported */ extern void X11_InitOSKeymap(_THIS); extern void X11_PumpEvents(_THIS); ! extern void X11_SetKeyboardState(_THIS, const char *key_vec); ! ! /* FIXME: be font variable */ ! #define XIM_DEFAULT_FONT_NAME "-*-*-*-R-Normal--14-130-75-75-*-*" ! #define XIM_FONT_SIZE 14 ! ! extern int X11_SetIMPosition(_THIS, int x, int y); diff -cr SDL-1.2.7/src/video/x11/SDL_x11video.c SDL-1.2.7-xim/src/video/x11/SDL_x11video.c *** SDL-1.2.7/src/video/x11/SDL_x11video.c 2004-02-19 02:22:09.000000000 +0900 --- SDL-1.2.7-xim/src/video/x11/SDL_x11video.c 2004-05-08 21:57:25.000000000 +0900 *************** *** 36,41 **** --- 36,42 ---- #include #include #include + #include #include #ifdef MTRR_SUPPORT #include *************** *** 181,186 **** --- 182,189 ---- device->InitOSKeymap = X11_InitOSKeymap; device->PumpEvents = X11_PumpEvents; + device->SetIMPosition = X11_SetIMPosition; + device->free = X11_DeleteDevice; return device; *************** *** 259,264 **** --- 262,339 ---- return(XIO_handler(d)); } + #ifdef ENABLE_IM_EVENT + static unsigned long setup_xim( _THIS ) + { + XFontSet im_font; + XVaNestedList preedit_attr, status_attr; + char **missing_list; + int missing_count; + + XPoint spot_pos; + XRectangle win_rect; + + unsigned long ic_ev; + + setlocale( LC_ALL, "" ); + + /* fixme: fix length */ + im_compose_len = 255; + im_compose_buffer = malloc( im_compose_len+1 ); + + SDL_XIM = XOpenIM( SDL_Display, NULL, NULL, NULL ); + + if ( SDL_XIM == NULL ) { + fputs("XOpenIM failed\n", stderr); + + SDL_XIC = NULL; + return 0; + } + + im_font = XCreateFontSet( SDL_Display, XIM_DEFAULT_FONT_NAME, &missing_list, + &missing_count, NULL); + XFreeStringList( missing_list ); + + spot_pos.x = 0; + spot_pos.y = XIM_FONT_SIZE; + preedit_attr = XVaCreateNestedList( 0, + XNSpotLocation, &spot_pos, + XNFontSet, im_font, + NULL ); + + /* ?? */ + win_rect.x = 0; + win_rect.y = 0; + win_rect.width = 0; + win_rect.height = 0; + status_attr = XVaCreateNestedList( 0, + XNArea, &win_rect, + XNFontSet, im_font, + NULL ); + + + SDL_XIC = XCreateIC(SDL_XIM, + XNInputStyle, XIMPreeditPosition | XIMStatusArea, + XNClientWindow, WMwindow, + XNPreeditAttributes, preedit_attr, + XNStatusAttributes, status_attr, + NULL); + + XFree( preedit_attr ); + XFree( status_attr ); + + if( SDL_XIC == NULL ){ + XCloseIM(SDL_XIM); + SDL_XIM = NULL; + + return 0; + } + XGetICValues( SDL_XIC, XNFilterEvents, &ic_ev, NULL ); + + return ic_ev; + } + #endif /* ENABLE_IM_EVENT */ + /* Create auxiliary (toplevel) windows with the current visual */ static void create_aux_windows(_THIS) { *************** *** 267,272 **** --- 342,351 ---- XTextProperty titleprop, iconprop; int def_vis = (SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen)); + #ifdef ENABLE_IM_EVENT + unsigned long im_events; + #endif + /* Don't create any extra windows if we are being managed */ if ( SDL_windowid ) { FSwindow = 0; *************** *** 342,350 **** --- 421,437 ---- XFree(iconprop.value); } + #ifdef ENABLE_IM_EVENT + im_events = setup_xim( this ); + + XSelectInput(SDL_Display, WMwindow, + FocusChangeMask | KeyPressMask | KeyReleaseMask + | PropertyChangeMask | StructureNotifyMask | KeymapStateMask | im_events); + #else /* ENABLE_IM_EVENT */ XSelectInput(SDL_Display, WMwindow, FocusChangeMask | KeyPressMask | KeyReleaseMask | PropertyChangeMask | StructureNotifyMask | KeymapStateMask); + #endif /* ENABLE_IM_EVENT */ /* Set the class hints so we can get an icon (AfterStep) */ { *************** *** 782,787 **** --- 869,875 ---- /* Create (or use) the X11 display window */ if ( !SDL_windowid ) { + if ( flags & SDL_OPENGL ) { if ( X11_GL_CreateWindow(this, w, h) < 0 ) { return(-1); *************** *** 799,804 **** --- 887,893 ---- | CWColormap, &swa); } /* Only manage our input if we own the window */ + XSelectInput(SDL_Display, SDL_Window, ( EnterWindowMask | LeaveWindowMask | ButtonPressMask | ButtonReleaseMask *************** *** 850,856 **** } /* Update the internal keyboard state */ ! X11_SetKeyboardState(SDL_Display, NULL); /* When the window is first mapped, ignore non-modifier keys */ { --- 939,945 ---- } /* Update the internal keyboard state */ ! X11_SetKeyboardState(this, NULL); /* When the window is first mapped, ignore non-modifier keys */ { *************** *** 1229,1234 **** --- 1318,1334 ---- /* Start shutting down the windows */ X11_DestroyImage(this, this->screen); X11_DestroyWindow(this, this->screen); + + #ifdef ENABLE_IM_EVENT + if ( SDL_XIC ) { + XDestroyIC( SDL_XIC ); + free( im_compose_buffer ); + } + + if ( SDL_XIM ) + XCloseIM( SDL_XIM ); + #endif /* ENABLE_IM_EVENT */ + X11_FreeVideoModes(this); if ( SDL_XColorMap != SDL_DisplayColormap ) { XFreeColormap(SDL_Display, SDL_XColorMap); SDL-1.2.7-xim/src/video/x11だけに発見: SDL_x11video.c~ diff -cr SDL-1.2.7/src/video/x11/SDL_x11video.h SDL-1.2.7-xim/src/video/x11/SDL_x11video.h *** SDL-1.2.7/src/video/x11/SDL_x11video.h 2004-02-19 02:22:09.000000000 +0900 --- SDL-1.2.7-xim/src/video/x11/SDL_x11video.h 2004-05-07 20:22:16.000000000 +0900 *************** *** 66,71 **** --- 66,79 ---- Atom WM_DELETE_WINDOW; /* "close-window" protocol atom */ WMcursor *BlankCursor; /* The invisible cursor */ + #ifdef ENABLE_IM_EVENT + XIM xim; + XIC xic; + + char *compose_buffer; + int compose_len; + #endif + char *SDL_windowid; /* Flag: true if we have been passed a window */ /* Direct Graphics Access extension information */ *************** *** 190,195 **** --- 198,211 ---- #define gamma_changed (this->hidden->gamma_changed) #define SDL_iconcolors (this->hidden->iconcolors) + + #ifdef ENABLE_IM_EVENT + #define SDL_XIC (this->hidden->xic) + #define SDL_XIM (this->hidden->xim) + #define im_compose_buffer (this->hidden->compose_buffer) + #define im_compose_len (this->hidden->compose_len) + #endif + /* Some versions of XFree86 have bugs - detect if this is one of them */ #define BUGGY_XFREE86(condition, buggy_version) \ ((strcmp(ServerVendor(SDL_Display), "The XFree86 Project, Inc") == 0) && \ diff -cr SDL-1.2.7/src/video/xbios/Makefile.in SDL-1.2.7-xim/src/video/xbios/Makefile.in *** SDL-1.2.7/src/video/xbios/Makefile.in 2004-02-23 06:32:31.000000000 +0900 --- SDL-1.2.7-xim/src/video/xbios/Makefile.in 2004-05-10 23:36:46.496629944 +0900 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.8.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- 1,4 ---- ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,