From 3edb26cf60935a875d479ee4fa3cb7e1a175c56e Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Thu, 15 Mar 2007 07:57:43 +0000 Subject: [PATCH] Wed Mar 14 21:57:38 2007 Michael Jennings (mej) Reverting changes; kindly test patches BEFORE applying them. ---------------------------------------------------------------------- SVN revision: 28732 --- legacy/ecore/configure.in | 295 +++++++++++++++++- legacy/ecore/ecore.spec.in | 2 +- legacy/ecore/src/lib/ecore/Ecore.h | 2 +- legacy/ecore/src/lib/ecore/Ecore_Data.h | 2 +- legacy/ecore/src/lib/ecore/Ecore_Str.h | 2 +- legacy/ecore/src/lib/ecore_con/Ecore_Con.h | 2 +- .../ecore/src/lib/ecore_config/Ecore_Config.h | 2 +- legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h | 2 +- .../src/lib/ecore_directfb/Ecore_DirectFB.h | 2 +- legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h | 2 +- legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h | 2 +- legacy/ecore/src/lib/ecore_file/Ecore_File.h | 2 +- legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h | 2 +- legacy/ecore/src/lib/ecore_job/Ecore_Job.h | 2 +- legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h | 2 +- legacy/ecore/src/lib/ecore_x/Makefile.am | 30 +- .../ecore/src/lib/ecore_x/ecore_x_drawable.c | 14 - 17 files changed, 311 insertions(+), 56 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index 05e9ea94d1..9508f8a277 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -243,17 +243,288 @@ if test "x$have_ecore_x" = "xyes"; then AC_SUBST(Xcursor_cflags) AC_SUBST(Xcursor_libs) - AC_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract]) - AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension]) - if test "x$use_xdpms" = "xno" ; then - AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension]) - fi - AC_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion]) - AC_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens]) - AC_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens]) - AC_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRSizes]) - AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) - AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput]) + Xprint_libs="" + Xprint_cflags="" + use_Xprint="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Print.h, + [ + AC_CHECK_LIB(Xp, XpQueryScreens, + [ + AC_DEFINE(ECORE_XPRINT, 1, [Build support for Xprint]) + Xprint_cflags="" + Xprint_libs="-lXp" + use_Xprint="yes" + ], [ + Xprint_cflags="" + Xprint_libs="" + use_Xprint="no" + ], [ + $x_libs + ] + ) + ], [ + Xprint_cflags="" + Xprint_libs="" + use_Xprint="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xprint_cflags) + AC_SUBST(Xprint_libs) + + Xinerama_libs="" + Xinerama_cflags="" + use_Xinerama="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Xinerama.h, + [ + AC_CHECK_LIB(Xinerama, XineramaQueryScreens, + [ + AC_DEFINE(ECORE_XINERAMA, 1, [Build support for Xinerama]) + Xinerama_cflags="" + Xinerama_libs="-lXinerama" + use_Xinerama="yes" + ], [ + Xinerama_cflags="" + Xinerama_libs="" + use_Xinerama="no" + ], [ + $x_libs + ] + ) + ], [ + Xinerama_cflags="" + Xinerama_libs="" + use_Xinerama="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xinerama_cflags) + AC_SUBST(Xinerama_libs) + + Xrandr_libs="" + Xrandr_cflags="" + use_Xrandr="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Xrandr.h, + [ + AC_CHECK_LIB(Xrandr, XRRSizes, + [ + AC_DEFINE(ECORE_XRANDR, 1, [Build support for Xrandr]) + Xrandr_cflags="" + Xrandr_libs="-lXrandr" + use_Xrandr="yes" + ], [ + Xrandr_cflags="" + Xrandr_libs="" + use_Xrandr="no" + ], [ + $x_libs + ] + ) + ], [ + Xrandr_cflags="" + Xrandr_libs="" + use_Xrandr="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xrandr_cflags) + AC_SUBST(Xrandr_libs) + + Xss_libs="" + Xss_cflags="" + use_Xss="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/scrnsaver.h, + [ + AC_CHECK_LIB(Xss, XScreenSaverSelectInput, + [ + AC_DEFINE(ECORE_XSS, 1, [Build support for Xss]) + Xss_cflags="" + Xss_libs="-lXss" + use_Xss="yes" + ], [ + Xss_cflags="" + Xss_libs="" + use_Xss="no" + ], [ + $x_libs + ] + ) + ], [ + Xss_cflags="" + Xss_libs="" + use_Xss="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xss_cflags) + AC_SUBST(Xss_libs) + + Xrender_libs="" + Xrender_cflags="" + use_Xrender="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Xrender.h, + [ + AC_CHECK_LIB(Xrender, XRenderFindVisualFormat, + [ + AC_DEFINE(ECORE_XRENDER, 1, [Build support for Xrender]) + Xrender_cflags="" + Xrender_libs="-lXrender" + use_Xrender="yes" + ], [ + Xrender_cflags="" + Xrender_libs="" + use_Xrender="no" + ], [ + $x_libs + ] + ) + ], [ + Xrender_cflags="" + Xrender_libs="" + use_Xrender="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xrender_cflags) + AC_SUBST(Xrender_libs) + + Xfixes_libs="" + Xfixes_cflags="" + use_Xfixes="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Xfixes.h, + [ + AC_CHECK_LIB(Xfixes, XFixesExpandRegion, + [ + AC_DEFINE(ECORE_XFIXES, 1, [Build support for Xfixes]) + Xfixes_cflags="" + Xfixes_libs="-lXfixes" + use_Xfixes="yes" + ], [ + Xfixes_cflags="" + Xfixes_libs="" + use_Xfixes="no" + ], [ + $x_libs + ] + ) + ], [ + Xfixes_cflags="" + Xfixes_libs="" + use_Xfixes="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xfixes_cflags) + AC_SUBST(Xfixes_libs) + + Xdamage_libs="" + Xdamage_cflags="" + use_Xdamage="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/Xdamage.h, + [ + AC_CHECK_LIB(Xdamage, XDamageSubtract, + [ + AC_DEFINE(ECORE_XDAMAGE, 1, [Build support for Xdamage]) + Xdamage_cflags="" + Xdamage_libs="-lXdamage" + use_Xdamage="yes" + ], [ + Xdamage_cflags="" + Xdamage_libs="" + use_Xdamage="no" + ], [ + $x_libs + ] + ) + ], [ + Xdamage_cflags="" + Xdamage_libs="" + use_Xdamage="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xdamage_cflags) + AC_SUBST(Xdamage_libs) + + Xdpms_libs="" + Xdpms_cflags="" + use_Xdpms="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/dpms.h, + [ + AC_CHECK_LIB(Xdpms, DPMSQueryExtension, + [ + AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) + Xdpms_cflags="" + Xdpms_libs="-lXdpms" + use_Xdpms="yes" + ], [ + AC_CHECK_LIB(Xext, DPMSQueryExtension, + [ + AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) + Xdpms_cflags="" + Xdpms_libs="-lXext" + use_Xdpms="yes" + ], [ + Xdpms_cflags="" + Xdpms_libs="" + use_Xdpms="no" + ], [ + $x_libs + ] + ) + ], [ + $x_libs + ] + ) + ], [ + Xdpms_cflags="" + Xdpms_libs="" + use_Xdpms="no" + ], [ + #include + ] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xdpms_cflags) + AC_SUBST(Xdpms_libs) fi @@ -1061,7 +1332,7 @@ echo echo " Ecore_Job....................: $have_ecore_job" echo " Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl)" echo " Ecore_Txt....................: $have_ecore_txt" -echo " Ecore_X......................: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_xprint) (Xinerama: $use_xinerama) (Xrandr: $use_xrandr) (Xscreensaver: $use_xss) (Xrender: $use_xrender) (Xfixes: $use_xfixes) (Xdamage: $use_xdamage) (Xdpms: $use_xdpms)" +echo " Ecore_X......................: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) (Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) (Xdamage: $use_Xdamage) (Xdpms: $use_Xdpms)" echo " Ecore_FB.....................: $have_ecore_fb" echo " Ecore_DFB....................: $have_ecore_dfb" echo " Ecore_Evas...................: $have_ecore_evas" diff --git a/legacy/ecore/ecore.spec.in b/legacy/ecore/ecore.spec.in index dd46fb25c8..ee91a9cdee 100644 --- a/legacy/ecore/ecore.spec.in +++ b/legacy/ecore/ecore.spec.in @@ -33,7 +33,7 @@ Summary: Enlightened Core X interface library Name: @PACKAGE@ Version: @VERSION@ -Release: 0.%(date '+%Y%m%d') +Release: 1.20070314 License: BSD Group: User Interface/X Source: %{name}-%{version}.tar.gz diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h index 74f357341d..9676bdebba 100644 --- a/legacy/ecore/src/lib/ecore/Ecore.h +++ b/legacy/ecore/src/lib/ecore/Ecore.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore/Ecore_Data.h b/legacy/ecore/src/lib/ecore/Ecore_Data.h index dc265840ac..4a8389c050 100644 --- a/legacy/ecore/src/lib/ecore/Ecore_Data.h +++ b/legacy/ecore/src/lib/ecore/Ecore_Data.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore/Ecore_Str.h b/legacy/ecore/src/lib/ecore/Ecore_Str.h index 025f7024da..aa85683133 100644 --- a/legacy/ecore/src/lib/ecore/Ecore_Str.h +++ b/legacy/ecore/src/lib/ecore/Ecore_Str.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h index c67978c093..4c686210dd 100644 --- a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h +++ b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h @@ -7,7 +7,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h index ccb8e0a1c0..5741e881d8 100644 --- a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h +++ b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h b/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h index c1cbcb08bc..ea49a7aab9 100644 --- a/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h +++ b/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h @@ -10,7 +10,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h index 7f9e8982ef..eace6595a1 100644 --- a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h +++ b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h index 6bcb5fafb1..4469495d79 100644 --- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h +++ b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h b/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h index 3eae77b774..b9f7e44019 100644 --- a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h +++ b/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_file/Ecore_File.h b/legacy/ecore/src/lib/ecore_file/Ecore_File.h index f08b3b4ad5..2fdda25ddf 100644 --- a/legacy/ecore/src/lib/ecore_file/Ecore_File.h +++ b/legacy/ecore/src/lib/ecore_file/Ecore_File.h @@ -12,7 +12,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h index 9460178923..066103e1f6 100644 --- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h +++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h b/legacy/ecore/src/lib/ecore_job/Ecore_Job.h index bb2da6c1e4..e4a3eee76c 100644 --- a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h +++ b/legacy/ecore/src/lib/ecore_job/Ecore_Job.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h b/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h index b2bf6d5fee..adfe0d17ed 100644 --- a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h +++ b/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h @@ -4,7 +4,7 @@ #ifdef EAPI #undef EAPI #endif -#ifdef _MSC_VER +#ifdef WIN32 # ifdef BUILDING_DLL # define EAPI __declspec(dllexport) # else diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am index 510b4f37cc..760a1b8b68 100644 --- a/legacy/ecore/src/lib/ecore_x/Makefile.am +++ b/legacy/ecore/src/lib/ecore_x/Makefile.am @@ -2,14 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = \ @Xcursor_cflags@ \ -@XDAMAGE_CFLAGS@ \ -@XDPMS_CFLAGS@ \ -@XFIXES_CFLAGS@ \ -@XINERAMA_CFLAGS@ \ -@XPRINT_CFLAGS@ \ -@XRANDR_CFLAGS@ \ -@XRENDER_CFLAGS@ \ -@XSS_CFLAGS@ \ +@Xrender_cflags@ \ +@Xprint_cflags@ \ +@Xinerama_cflags@ \ +@Xrandr_cflags@ \ +@Xfixes_cflags@ \ +@Xdamage_cflags@ \ +@Xss_cflags@ \ @x_cflags@ \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_txt \ @@ -59,14 +58,13 @@ ecore_x_private.h libecore_x_la_LIBADD = \ @Xcursor_libs@ \ -@XDAMAGE_LIBS@ \ -@XDPMS_LIBS@ \ -@XFIXES_LIBS@ \ -@XINERAMA_LIBS@ \ -@XPRINT_LIBS@ \ -@XRANDR_LIBS@ \ -@XRENDER_LIBS@ \ -@XSS_LIBS@ \ +@Xrender_libs@ \ +@Xprint_libs@ \ +@Xinerama_libs@ \ +@Xrandr_libs@ \ +@Xfixes_libs@ \ +@Xdamage_libs@ \ +@Xss_libs@ \ @x_libs@ \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_txt/libecore_txt.la \ diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c b/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c index efc1c9c02e..da0b17763e 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c @@ -1,17 +1,6 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ - #include "ecore_x_private.h" -/** - * @defgroup Ecore_X_Drawable_Group X Drawable Functions - * - * Functions that operate on drawables. - */ - - /** * Retrieves the geometry of the given drawable. * @param d The given drawable. @@ -19,7 +8,6 @@ * @param y Pointer to an integer into which the Y position is to be stored. * @param w Pointer to an integer into which the width is to be stored. * @param h Pointer to an integer into which the height is to be stored. - * @ingroup Ecore_X_Drawable_Group */ EAPI void ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h) @@ -47,7 +35,6 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h * Retrieves the width of the border of the given drawable. * @param d The given drawable. * @return The border width of the given drawable. - * @ingroup Ecore_X_Drawable_Group */ EAPI int ecore_x_drawable_border_width_get(Ecore_X_Drawable d) @@ -67,7 +54,6 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d) * Retrieves the depth of the given drawable. * @param d The given drawable. * @return The depth of the given drawable. - * @ingroup Ecore_X_Drawable_Group */ EAPI int ecore_x_drawable_depth_get(Ecore_X_Drawable d)