mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-06-02 01:47:41 +00:00
Fixed bug 2824 - Add Fcitx Input Method Support
Weitian Leung Just moved ibus direct call to SDL_IME_* related functions, and adds fcitx IME support (uses DBus, too), enable with env: SDL_IM_MODULE=fcitx (ibus still the default one)
This commit is contained in:
Sam Lantinga
parent
89abbbfe9e
commit
808c75d1cf
10 changed files with 967 additions and 22 deletions
123
configure
vendored
123
configure
vendored
|
|
@ -849,7 +849,9 @@ enable_video_opengles1
|
|||
enable_video_opengles2
|
||||
enable_libudev
|
||||
enable_dbus
|
||||
enable_ime
|
||||
enable_ibus
|
||||
enable_fcitx
|
||||
enable_input_tslib
|
||||
enable_pthreads
|
||||
enable_pthread_sem
|
||||
|
|
@ -1587,7 +1589,9 @@ Optional Features:
|
|||
include OpenGL ES 2.0 support [[default=yes]]
|
||||
--enable-libudev enable libudev support [[default=yes]]
|
||||
--enable-dbus enable D-Bus support [[default=yes]]
|
||||
--enable-ime enable IME support [[default=yes]]
|
||||
--enable-ibus enable IBus support [[default=yes]]
|
||||
--enable-fcitx enable fcitx support [[default=yes]]
|
||||
--enable-input-tslib use the Touchscreen library for input
|
||||
[[default=yes]]
|
||||
--enable-pthreads use POSIX threads for multi-threading
|
||||
|
|
@ -21650,6 +21654,23 @@ $as_echo "#define HAVE_DBUS_DBUS_H 1" >>confdefs.h
|
|||
fi
|
||||
}
|
||||
|
||||
CheckIME()
|
||||
{
|
||||
# Check whether --enable-ime was given.
|
||||
if test "${enable_ime+set}" = set; then :
|
||||
enableval=$enable_ime;
|
||||
else
|
||||
enable_ime=yes
|
||||
fi
|
||||
|
||||
if test x$enable_ime = xyes; then
|
||||
|
||||
$as_echo "#define SDL_USE_IME 1" >>confdefs.h
|
||||
|
||||
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c"
|
||||
fi
|
||||
}
|
||||
|
||||
CheckIBus()
|
||||
{
|
||||
# Check whether --enable-ibus was given.
|
||||
|
|
@ -21723,7 +21744,11 @@ fi
|
|||
|
||||
CFLAGS="$save_CFLAGS"
|
||||
if test x$have_ibus_ibus_h_hdr = xyes; then
|
||||
if test x$enable_dbus != xyes; then
|
||||
if test x$enable_ime != xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for IBus." >&5
|
||||
$as_echo "$as_me: WARNING: IME support is required for IBus." >&2;}
|
||||
have_ibus_ibus_h_hdr=no
|
||||
elif test x$enable_dbus != xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for IBus." >&5
|
||||
$as_echo "$as_me: WARNING: DBus support is required for IBus." >&2;}
|
||||
have_ibus_ibus_h_hdr=no
|
||||
|
|
@ -21743,6 +21768,90 @@ $as_echo "#define HAVE_IBUS_IBUS_H 1" >>confdefs.h
|
|||
fi
|
||||
}
|
||||
|
||||
CheckFcitx()
|
||||
{
|
||||
# Check whether --enable-fcitx was given.
|
||||
if test "${enable_fcitx+set}" = set; then :
|
||||
enableval=$enable_fcitx;
|
||||
else
|
||||
enable_fcitx=yes
|
||||
fi
|
||||
|
||||
if test x$enable_fcitx = xyes; then
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_PKG_CONFIG+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
||||
$as_echo "$PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test x$PKG_CONFIG != xno; then
|
||||
FCITX_CFLAGS=`$PKG_CONFIG --cflags fcitx`
|
||||
CFLAGS="$CFLAGS $FCITX_CFLAGS"
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "fcitx/frontend.h" "ac_cv_header_fcitx_frontend_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_fcitx_frontend_h" = xyes; then :
|
||||
have_fcitx_frontend_h_hdr=yes
|
||||
else
|
||||
have_fcitx_frontend_h_hdr=no
|
||||
fi
|
||||
|
||||
|
||||
CFLAGS="$save_CFLAGS"
|
||||
if test x$have_fcitx_frontend_h_hdr = xyes; then
|
||||
if test x$enable_ime != xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for fcitx." >&5
|
||||
$as_echo "$as_me: WARNING: IME support is required for fcitx." >&2;}
|
||||
have_fcitx_frontend_h_hdr=no
|
||||
elif test x$enable_dbus != xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for fcitx." >&5
|
||||
$as_echo "$as_me: WARNING: DBus support is required for fcitx." >&2;}
|
||||
have_fcitx_frontend_h_hdr=no
|
||||
else
|
||||
|
||||
$as_echo "#define HAVE_FCITX_FRONTEND_H 1" >>confdefs.h
|
||||
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS $FCITX_CFLAGS"
|
||||
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
CheckTslib()
|
||||
{
|
||||
# Check whether --enable-input-tslib was given.
|
||||
|
|
@ -23031,7 +23140,9 @@ case "$host" in
|
|||
CheckWayland
|
||||
CheckLibUDev
|
||||
CheckDBus
|
||||
CheckIME
|
||||
CheckIBus
|
||||
CheckFcitx
|
||||
case $ARCH in
|
||||
linux)
|
||||
CheckInputEvents
|
||||
|
|
@ -23944,11 +24055,21 @@ if test x$have_dbus_dbus_h_hdr = xyes; then
|
|||
else
|
||||
SUMMARY="${SUMMARY}Using dbus : NO\n"
|
||||
fi
|
||||
if test x$enable_ime = xyes; then
|
||||
SUMMARY="${SUMMARY}Using ime : YES\n"
|
||||
else
|
||||
SUMMARY="${SUMMARY}Using ime : NO\n"
|
||||
fi
|
||||
if test x$have_ibus_ibus_h_hdr = xyes; then
|
||||
SUMMARY="${SUMMARY}Using ibus : YES\n"
|
||||
else
|
||||
SUMMARY="${SUMMARY}Using ibus : NO\n"
|
||||
fi
|
||||
if test x$have_fcitx_frontend_h_hdr = xyes; then
|
||||
SUMMARY="${SUMMARY}Using fcitx : YES\n"
|
||||
else
|
||||
SUMMARY="${SUMMARY}Using fcitx : NO\n"
|
||||
fi
|
||||
ac_config_commands="$ac_config_commands summary"
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue