summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jennings <mej@kainx.org>2007-03-15 07:57:43 +0000
committerMichael Jennings <mej@kainx.org>2007-03-15 07:57:43 +0000
commit3edb26cf60935a875d479ee4fa3cb7e1a175c56e (patch)
tree56865f5188e5152ca36cdf31d7ce6907bf107117
parentd9fa45fe5f1706c565c169a11db9daa1d769099a (diff)
Wed Mar 14 21:57:38 2007 Michael Jennings (mej)
Reverting changes; kindly test patches BEFORE applying them. ---------------------------------------------------------------------- SVN revision: 28732
-rw-r--r--legacy/ecore/configure.in295
-rw-r--r--legacy/ecore/ecore.spec.in2
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore.h2
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore_Data.h2
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore_Str.h2
-rw-r--r--legacy/ecore/src/lib/ecore_con/Ecore_Con.h2
-rw-r--r--legacy/ecore/src/lib/ecore_config/Ecore_Config.h2
-rw-r--r--legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h2
-rw-r--r--legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h2
-rw-r--r--legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h2
-rw-r--r--legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h2
-rw-r--r--legacy/ecore/src/lib/ecore_file/Ecore_File.h2
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h2
-rw-r--r--legacy/ecore/src/lib/ecore_job/Ecore_Job.h2
-rw-r--r--legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h2
-rw-r--r--legacy/ecore/src/lib/ecore_x/Makefile.am30
-rw-r--r--legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c14
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
243 AC_SUBST(Xcursor_cflags) 243 AC_SUBST(Xcursor_cflags)
244 AC_SUBST(Xcursor_libs) 244 AC_SUBST(Xcursor_libs)
245 245
246 AC_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract]) 246 Xprint_libs=""
247 AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension]) 247 Xprint_cflags=""
248 if test "x$use_xdpms" = "xno" ; then 248 use_Xprint="no"
249 AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension]) 249 PCFLAGS=$CFLAGS
250 fi 250 CFLAGS=$x_cflags" "$x_includes
251 AC_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion]) 251 AC_CHECK_HEADER(X11/extensions/Print.h,
252 AC_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens]) 252 [
253 AC_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens]) 253 AC_CHECK_LIB(Xp, XpQueryScreens,
254 AC_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRSizes]) 254 [
255 AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) 255 AC_DEFINE(ECORE_XPRINT, 1, [Build support for Xprint])
256 AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput]) 256 Xprint_cflags=""
257 Xprint_libs="-lXp"
258 use_Xprint="yes"
259 ], [
260 Xprint_cflags=""
261 Xprint_libs=""
262 use_Xprint="no"
263 ], [
264 $x_libs
265 ]
266 )
267 ], [
268 Xprint_cflags=""
269 Xprint_libs=""
270 use_Xprint="no"
271 ], [
272 #include <X11/Xlib.h>
273 ]
274 )
275 CFLAGS=$PCFLAGS
276
277 AC_SUBST(Xprint_cflags)
278 AC_SUBST(Xprint_libs)
279
280 Xinerama_libs=""
281 Xinerama_cflags=""
282 use_Xinerama="no"
283 PCFLAGS=$CFLAGS
284 CFLAGS=$x_cflags" "$x_includes
285 AC_CHECK_HEADER(X11/extensions/Xinerama.h,
286 [
287 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
288 [
289 AC_DEFINE(ECORE_XINERAMA, 1, [Build support for Xinerama])
290 Xinerama_cflags=""
291 Xinerama_libs="-lXinerama"
292 use_Xinerama="yes"
293 ], [
294 Xinerama_cflags=""
295 Xinerama_libs=""
296 use_Xinerama="no"
297 ], [
298 $x_libs
299 ]
300 )
301 ], [
302 Xinerama_cflags=""
303 Xinerama_libs=""
304 use_Xinerama="no"
305 ], [
306 #include <X11/Xlib.h>
307 ]
308 )
309 CFLAGS=$PCFLAGS
310
311 AC_SUBST(Xinerama_cflags)
312 AC_SUBST(Xinerama_libs)
313
314 Xrandr_libs=""
315 Xrandr_cflags=""
316 use_Xrandr="no"
317 PCFLAGS=$CFLAGS
318 CFLAGS=$x_cflags" "$x_includes
319 AC_CHECK_HEADER(X11/extensions/Xrandr.h,
320 [
321 AC_CHECK_LIB(Xrandr, XRRSizes,
322 [
323 AC_DEFINE(ECORE_XRANDR, 1, [Build support for Xrandr])
324 Xrandr_cflags=""
325 Xrandr_libs="-lXrandr"
326 use_Xrandr="yes"
327 ], [
328 Xrandr_cflags=""
329 Xrandr_libs=""
330 use_Xrandr="no"
331 ], [
332 $x_libs
333 ]
334 )
335 ], [
336 Xrandr_cflags=""
337 Xrandr_libs=""
338 use_Xrandr="no"
339 ], [
340 #include <X11/Xlib.h>
341 ]
342 )
343 CFLAGS=$PCFLAGS
344
345 AC_SUBST(Xrandr_cflags)
346 AC_SUBST(Xrandr_libs)
347
348 Xss_libs=""
349 Xss_cflags=""
350 use_Xss="no"
351 PCFLAGS=$CFLAGS
352 CFLAGS=$x_cflags" "$x_includes
353 AC_CHECK_HEADER(X11/extensions/scrnsaver.h,
354 [
355 AC_CHECK_LIB(Xss, XScreenSaverSelectInput,
356 [
357 AC_DEFINE(ECORE_XSS, 1, [Build support for Xss])
358 Xss_cflags=""
359 Xss_libs="-lXss"
360 use_Xss="yes"
361 ], [
362 Xss_cflags=""
363 Xss_libs=""
364 use_Xss="no"
365 ], [
366 $x_libs
367 ]
368 )
369 ], [
370 Xss_cflags=""
371 Xss_libs=""
372 use_Xss="no"
373 ], [
374 #include <X11/Xlib.h>
375 ]
376 )
377 CFLAGS=$PCFLAGS
378
379 AC_SUBST(Xss_cflags)
380 AC_SUBST(Xss_libs)
381
382 Xrender_libs=""
383 Xrender_cflags=""
384 use_Xrender="no"
385 PCFLAGS=$CFLAGS
386 CFLAGS=$x_cflags" "$x_includes
387 AC_CHECK_HEADER(X11/extensions/Xrender.h,
388 [
389 AC_CHECK_LIB(Xrender, XRenderFindVisualFormat,
390 [
391 AC_DEFINE(ECORE_XRENDER, 1, [Build support for Xrender])
392 Xrender_cflags=""
393 Xrender_libs="-lXrender"
394 use_Xrender="yes"
395 ], [
396 Xrender_cflags=""
397 Xrender_libs=""
398 use_Xrender="no"
399 ], [
400 $x_libs
401 ]
402 )
403 ], [
404 Xrender_cflags=""
405 Xrender_libs=""
406 use_Xrender="no"
407 ], [
408 #include <X11/Xlib.h>
409 ]
410 )
411 CFLAGS=$PCFLAGS
412
413 AC_SUBST(Xrender_cflags)
414 AC_SUBST(Xrender_libs)
415
416 Xfixes_libs=""
417 Xfixes_cflags=""
418 use_Xfixes="no"
419 PCFLAGS=$CFLAGS
420 CFLAGS=$x_cflags" "$x_includes
421 AC_CHECK_HEADER(X11/extensions/Xfixes.h,
422 [
423 AC_CHECK_LIB(Xfixes, XFixesExpandRegion,
424 [
425 AC_DEFINE(ECORE_XFIXES, 1, [Build support for Xfixes])
426 Xfixes_cflags=""
427 Xfixes_libs="-lXfixes"
428 use_Xfixes="yes"
429 ], [
430 Xfixes_cflags=""
431 Xfixes_libs=""
432 use_Xfixes="no"
433 ], [
434 $x_libs
435 ]
436 )
437 ], [
438 Xfixes_cflags=""
439 Xfixes_libs=""
440 use_Xfixes="no"
441 ], [
442 #include <X11/Xlib.h>
443 ]
444 )
445 CFLAGS=$PCFLAGS
446
447 AC_SUBST(Xfixes_cflags)
448 AC_SUBST(Xfixes_libs)
449
450 Xdamage_libs=""
451 Xdamage_cflags=""
452 use_Xdamage="no"
453 PCFLAGS=$CFLAGS
454 CFLAGS=$x_cflags" "$x_includes
455 AC_CHECK_HEADER(X11/extensions/Xdamage.h,
456 [
457 AC_CHECK_LIB(Xdamage, XDamageSubtract,
458 [
459 AC_DEFINE(ECORE_XDAMAGE, 1, [Build support for Xdamage])
460 Xdamage_cflags=""
461 Xdamage_libs="-lXdamage"
462 use_Xdamage="yes"
463 ], [
464 Xdamage_cflags=""
465 Xdamage_libs=""
466 use_Xdamage="no"
467 ], [
468 $x_libs
469 ]
470 )
471 ], [
472 Xdamage_cflags=""
473 Xdamage_libs=""
474 use_Xdamage="no"
475 ], [
476 #include <X11/Xlib.h>
477 ]
478 )
479 CFLAGS=$PCFLAGS
480
481 AC_SUBST(Xdamage_cflags)
482 AC_SUBST(Xdamage_libs)
483
484 Xdpms_libs=""
485 Xdpms_cflags=""
486 use_Xdpms="no"
487 PCFLAGS=$CFLAGS
488 CFLAGS=$x_cflags" "$x_includes
489 AC_CHECK_HEADER(X11/extensions/dpms.h,
490 [
491 AC_CHECK_LIB(Xdpms, DPMSQueryExtension,
492 [
493 AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS])
494 Xdpms_cflags=""
495 Xdpms_libs="-lXdpms"
496 use_Xdpms="yes"
497 ], [
498 AC_CHECK_LIB(Xext, DPMSQueryExtension,
499 [
500 AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS])
501 Xdpms_cflags=""
502 Xdpms_libs="-lXext"
503 use_Xdpms="yes"
504 ], [
505 Xdpms_cflags=""
506 Xdpms_libs=""
507 use_Xdpms="no"
508 ], [
509 $x_libs
510 ]
511 )
512 ], [
513 $x_libs
514 ]
515 )
516 ], [
517 Xdpms_cflags=""
518 Xdpms_libs=""
519 use_Xdpms="no"
520 ], [
521 #include <X11/Xlib.h>
522 ]
523 )
524 CFLAGS=$PCFLAGS
525
526 AC_SUBST(Xdpms_cflags)
527 AC_SUBST(Xdpms_libs)
257 528
258fi 529fi
259 530
@@ -1061,7 +1332,7 @@ echo
1061echo " Ecore_Job....................: $have_ecore_job" 1332echo " Ecore_Job....................: $have_ecore_job"
1062echo " Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl)" 1333echo " Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl)"
1063echo " Ecore_Txt....................: $have_ecore_txt" 1334echo " Ecore_Txt....................: $have_ecore_txt"
1064echo " 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)" 1335echo " 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)"
1065echo " Ecore_FB.....................: $have_ecore_fb" 1336echo " Ecore_FB.....................: $have_ecore_fb"
1066echo " Ecore_DFB....................: $have_ecore_dfb" 1337echo " Ecore_DFB....................: $have_ecore_dfb"
1067echo " Ecore_Evas...................: $have_ecore_evas" 1338echo " 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 @@
33Summary: Enlightened Core X interface library 33Summary: Enlightened Core X interface library
34Name: @PACKAGE@ 34Name: @PACKAGE@
35Version: @VERSION@ 35Version: @VERSION@
36Release: 0.%(date '+%Y%m%d') 36Release: 1.20070314
37License: BSD 37License: BSD
38Group: User Interface/X 38Group: User Interface/X
39Source: %{name}-%{version}.tar.gz 39Source: %{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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
7#ifdef EAPI 7#ifdef EAPI
8#undef EAPI 8#undef EAPI
9#endif 9#endif
10#ifdef _MSC_VER 10#ifdef WIN32
11# ifdef BUILDING_DLL 11# ifdef BUILDING_DLL
12# define EAPI __declspec(dllexport) 12# define EAPI __declspec(dllexport)
13# else 13# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
10#ifdef EAPI 10#ifdef EAPI
11#undef EAPI 11#undef EAPI
12#endif 12#endif
13#ifdef _MSC_VER 13#ifdef WIN32
14# ifdef BUILDING_DLL 14# ifdef BUILDING_DLL
15# define EAPI __declspec(dllexport) 15# define EAPI __declspec(dllexport)
16# else 16# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
12#ifdef EAPI 12#ifdef EAPI
13#undef EAPI 13#undef EAPI
14#endif 14#endif
15#ifdef _MSC_VER 15#ifdef WIN32
16# ifdef BUILDING_DLL 16# ifdef BUILDING_DLL
17# define EAPI __declspec(dllexport) 17# define EAPI __declspec(dllexport)
18# else 18# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# 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
2 2
3INCLUDES = \ 3INCLUDES = \
4@Xcursor_cflags@ \ 4@Xcursor_cflags@ \
5@XDAMAGE_CFLAGS@ \ 5@Xrender_cflags@ \
6@XDPMS_CFLAGS@ \ 6@Xprint_cflags@ \
7@XFIXES_CFLAGS@ \ 7@Xinerama_cflags@ \
8@XINERAMA_CFLAGS@ \ 8@Xrandr_cflags@ \
9@XPRINT_CFLAGS@ \ 9@Xfixes_cflags@ \
10@XRANDR_CFLAGS@ \ 10@Xdamage_cflags@ \
11@XRENDER_CFLAGS@ \ 11@Xss_cflags@ \
12@XSS_CFLAGS@ \
13@x_cflags@ \ 12@x_cflags@ \
14-I$(top_srcdir)/src/lib/ecore \ 13-I$(top_srcdir)/src/lib/ecore \
15-I$(top_srcdir)/src/lib/ecore_txt \ 14-I$(top_srcdir)/src/lib/ecore_txt \
@@ -59,14 +58,13 @@ ecore_x_private.h
59 58
60libecore_x_la_LIBADD = \ 59libecore_x_la_LIBADD = \
61@Xcursor_libs@ \ 60@Xcursor_libs@ \
62@XDAMAGE_LIBS@ \ 61@Xrender_libs@ \
63@XDPMS_LIBS@ \ 62@Xprint_libs@ \
64@XFIXES_LIBS@ \ 63@Xinerama_libs@ \
65@XINERAMA_LIBS@ \ 64@Xrandr_libs@ \
66@XPRINT_LIBS@ \ 65@Xfixes_libs@ \
67@XRANDR_LIBS@ \ 66@Xdamage_libs@ \
68@XRENDER_LIBS@ \ 67@Xss_libs@ \
69@XSS_LIBS@ \
70@x_libs@ \ 68@x_libs@ \
71$(top_builddir)/src/lib/ecore/libecore.la \ 69$(top_builddir)/src/lib/ecore/libecore.la \
72$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \ 70$(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,25 +1,13 @@
1/*
2 * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
3 */
4
5#include "ecore_x_private.h" 1#include "ecore_x_private.h"
6 2
7 3
8/** 4/**
9 * @defgroup Ecore_X_Drawable_Group X Drawable Functions
10 *
11 * Functions that operate on drawables.
12 */
13
14
15/**
16 * Retrieves the geometry of the given drawable. 5 * Retrieves the geometry of the given drawable.
17 * @param d The given drawable. 6 * @param d The given drawable.
18 * @param x Pointer to an integer into which the X position is to be stored. 7 * @param x Pointer to an integer into which the X position is to be stored.
19 * @param y Pointer to an integer into which the Y position is to be stored. 8 * @param y Pointer to an integer into which the Y position is to be stored.
20 * @param w Pointer to an integer into which the width is to be stored. 9 * @param w Pointer to an integer into which the width is to be stored.
21 * @param h Pointer to an integer into which the height is to be stored. 10 * @param h Pointer to an integer into which the height is to be stored.
22 * @ingroup Ecore_X_Drawable_Group
23 */ 11 */
24EAPI void 12EAPI void
25ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h) 13ecore_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
47 * Retrieves the width of the border of the given drawable. 35 * Retrieves the width of the border of the given drawable.
48 * @param d The given drawable. 36 * @param d The given drawable.
49 * @return The border width of the given drawable. 37 * @return The border width of the given drawable.
50 * @ingroup Ecore_X_Drawable_Group
51 */ 38 */
52EAPI int 39EAPI int
53ecore_x_drawable_border_width_get(Ecore_X_Drawable d) 40ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
@@ -67,7 +54,6 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
67 * Retrieves the depth of the given drawable. 54 * Retrieves the depth of the given drawable.
68 * @param d The given drawable. 55 * @param d The given drawable.
69 * @return The depth of the given drawable. 56 * @return The depth of the given drawable.
70 * @ingroup Ecore_X_Drawable_Group
71 */ 57 */
72EAPI int 58EAPI int
73ecore_x_drawable_depth_get(Ecore_X_Drawable d) 59ecore_x_drawable_depth_get(Ecore_X_Drawable d)