ecore-imf.pc.in \
ecore-imf-evas.pc.in \
ecore-ipc.pc.in \
- ecore-txt.pc.in \
ecore-x.pc.in \
ecore-win32.pc.in \
ecore-sdl.pc.in \
pkgconfig_DATA += ecore-ipc.pc
endif
-if BUILD_ECORE_TXT
-pkgconfig_DATA += ecore-txt.pc
-endif
-
if BUILD_ECORE_X
pkgconfig_DATA += ecore-x.pc
endif
ecore_quartz_release_info="-release $release"
ecore_release_info="-release $release"
ecore_sdl_release_info="-release $release"
- ecore_txt_release_info="-release $release"
ecore_win32_release_info="-release $release"
ecore_x_release_info="-release $release"
;;
AC_SUBST(ecore_quartz_release_info)
AC_SUBST(ecore_release_info)
AC_SUBST(ecore_sdl_release_info)
-AC_SUBST(ecore_txt_release_info)
AC_SUBST(ecore_win32_release_info)
AC_SUBST(ecore_wince_release_info)
AC_SUBST(ecore_x_release_info)
# core modules
want_ecore_data="no"
-want_ecore_txt="no"
want_ecore_con="yes"
want_ecore_ipc="no"
want_ecore_file="yes"
requirements_ecore_ipc=""
requirements_ecore_quartz=""
requirements_ecore_sdl=""
-requirements_ecore_txt=""
requirements_ecore_x=""
requirements_ecore_win32=""
requirements_ecore_wince=""
requirements_ecore_imf="evil ${requirements_ecore_imf}"
requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}"
EFL_ECORE_BUILD="-DEFL_ECORE_BUILD"
- EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD"
EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD"
EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD"
EFL_ECORE_IMF_BUILD="-DEFL_ECORE_IMF_BUILD"
esac
AC_SUBST(EFL_ECORE_BUILD)
-AC_SUBST(EFL_ECORE_TXT_BUILD)
AC_SUBST(EFL_ECORE_FILE_BUILD)
AC_SUBST(EFL_ECORE_EVAS_BUILD)
AC_SUBST(EFL_ECORE_IMF_BUILD)
# ecore_data
ECORE_CHECK_MODULE([data], [${want_ecore_data}], [Data])
-# ecore_txt
-ECORE_CHECK_MODULE([txt], [${want_ecore_txt}], [Txt], [yes])
-
# ecore_con
ECORE_CHECK_MODULE([con], [${want_ecore_con}], [Con], [${have_addrinfo}])
AC_SUBST(requirements_ecore_ipc)
AC_SUBST(requirements_ecore_quartz)
AC_SUBST(requirements_ecore_sdl)
-AC_SUBST(requirements_ecore_txt)
AC_SUBST(requirements_ecore_x)
AC_SUBST(requirements_ecore_win32)
AC_SUBST(requirements_ecore_wince)
ecore-input-evas.pc
ecore-win32.pc
ecore-sdl.pc
-ecore-txt.pc
ecore-wince.pc
ecore.pc
doc/ecore.dox
src/lib/ecore_input/Makefile
src/lib/ecore_input_evas/Makefile
src/lib/ecore_ipc/Makefile
-src/lib/ecore_txt/Makefile
src/lib/ecore_win32/Makefile
src/lib/ecore_wince/Makefile
src/lib/ecore_x/Makefile
echo " Thread support.............: $have_pthread"
echo " GLib support...............: $have_glib"
echo " Ecore_Data...................: $have_ecore_data (deprecated)"
-echo " Ecore_Txt....................: $have_ecore_txt (deprecated)"
echo " Ecore_Con....................: $have_ecore_con"
if test "x$have_ecore_con" = "xyes" ; then
echo $ECHO_N " OpenSSL....................: $have_openssl $ECHO_C"
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: ecore-txt
-Description: E core library, Text module
-@pkgconfig_requires_private@: @requirements_ecore_txt@
-Version: @VERSION@
-Libs: -L${libdir} -lecore_txt
-Libs.private: @iconv_libs@
-Cflags: -I${includedir}
ecore \
ecore_input \
ecore_input_evas \
-ecore_txt \
ecore_fb \
ecore_directfb \
ecore_con \
+++ /dev/null
-.deps
-.libs
-Makefile
-Makefile.in
-ecore_txt.lo
-libecore_txt.la
+++ /dev/null
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
-#ifndef _ECORE_TXT_H
-#define _ECORE_TXT_H
-
-#include <Eina.h>
-#warning "this file is deprecated. use Eina.h instead."
-
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_ECORE_TXT_BUILD
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI
-# endif /* ! DLL_EXPORT */
-# else
-# define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_TXT_BUILD */
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif /* ! _WIN32 */
-
-/**
- * @file Ecore_Txt.h
- * @brief Provides a text encoding conversion function.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EAPI char *ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text) EINA_DEPRECATED;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+++ /dev/null
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
-@EFL_ECORE_TXT_BUILD@ \
-@EINA_CFLAGS@
-
-if BUILD_ECORE_TXT
-
-lib_LTLIBRARIES = libecore_txt.la
-
-include_HEADERS = \
-Ecore_Txt.h
-
-libecore_txt_la_SOURCES = \
-ecore_txt.c
-
-libecore_txt_la_LIBADD = @EINA_LIBS@
-
-libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_txt_release_info@
-
-
-endif
-
-EXTRA_DIST = ecore_txt_private.h
+++ /dev/null
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "Ecore_Txt.h"
-
-
-/**
- * @deprecated use eina_str_convert() instead.
- */
-EAPI char *
-ecore_txt_convert(const char *enc_from, const char *enc_to, const char *text)
-{
- EINA_LOG_ERR("use eina_str_convert() instead.");
- return eina_str_convert(enc_from, enc_to, text);
-}
+++ /dev/null
-#ifndef _ECORE_TXT_PRIVATE_H
-#define _ECORE_TXT_PRIVATE_H
-
-extern int _ecore_txt_log_dom;
-
-#ifdef ECORE_TXT_DEFAULT_LOG_COLOR
-# undef ECORE_TXT_DEFAULT_LOG_COLOR
-#endif
-#define ECORE_TXT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_ecore_txt_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_ecore_txt_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_ecore_txt_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_ecore_txt_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_txt_log_dom, __VA_ARGS__)
-#endif
# include <config.h>
#endif
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#ifdef X_HAVE_UTF8_STRING
compose = compose_buffer;
#else
- compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
+ compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
tmp = compose;
#endif
}
if (val > 0)
{
compose_buffer[val] = 0;
- compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
+ compose = eina_str_convert(nl_langinfo(CODESET), "UTF-8", compose_buffer);
tmp = compose;
}
}
}
else if ((ev->type == ECORE_X_ATOM_WM_CHANGE_STATE)
&& (ev->format == 32)
- && (ev->data.data32[0] == XCB_WM_ICONIC_STATE))
+ && (ev->data.data32[0] == XCB_WM_HINT_STATE))
{
Ecore_X_Event_Window_State_Request *e;