From: <enl...@li...> - 2003-04-15 11:38:52
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: Tag: SPLIT Ecore_Evas.h ecore_evas_private.h ecore_evas_x.c Log Message: external datatypes for exore are now opaque and not Xlib datatypes... now we can slide a "non xlib" lib like xcb underneath ecore_x... this means i can get on with writing a wm and the xcb work in parallel! :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/Ecore_Evas.h,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -3 -r1.1.2.14 -r1.1.2.15 --- Ecore_Evas.h 13 Feb 2003 01:57:47 -0000 1.1.2.14 +++ Ecore_Evas.h 15 Apr 2003 11:38:48 -0000 1.1.2.15 @@ -19,8 +19,8 @@ extern "C" { #endif -#ifndef X_H -typedef unsigned long Window; +#ifndef _ECORE_X_H +typedef unsigned int Ecore_X_Window; #endif #ifndef _ECORE_EVAS_PRIVATE_H @@ -33,7 +33,7 @@ int ecore_evas_shutdown(void); /* engine/target specific init calls */ -Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Window parent, int x, int y, int w, int h); +Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h); /* gneric manipulation calls */ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_private.h,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -3 -r1.1.2.13 -r1.1.2.14 --- ecore_evas_private.h 13 Feb 2003 01:57:47 -0000 1.1.2.13 +++ ecore_evas_private.h 15 Apr 2003 11:38:48 -0000 1.1.2.14 @@ -6,6 +6,7 @@ #define ECORE_MAGIC_EVAS 0x76543211 #ifdef BUILD_ECORE_X +#include "Ecore_X.h" #include <Evas_Engine_Software_X11.h> #include <X11/Xutil.h> #endif @@ -62,11 +63,11 @@ #ifdef BUILD_ECORE_X struct { - Window win_container; - Window win; - Pixmap pmap; - Pixmap mask; - GC gc; + Ecore_X_Window win_container; + Ecore_X_Window win; + Ecore_X_Pixmap pmap; + Ecore_X_Pixmap mask; + Ecore_X_GC gc; Region damages; } x; #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_x.c,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -3 -r1.1.2.9 -r1.1.2.10 --- ecore_evas_x.c 8 Apr 2003 08:03:22 -0000 1.1.2.9 +++ ecore_evas_x.c 15 Apr 2003 11:38:48 -0000 1.1.2.10 @@ -50,7 +50,7 @@ } static Ecore_Evas * -_ecore_evas_x_match(Window win) +_ecore_evas_x_match(Ecore_X_Window win) { Ecore_List *l; @@ -979,7 +979,7 @@ * <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br> */ Ecore_Evas * -ecore_evas_software_x11_new(const char *disp_name, Window parent, +ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) { #ifdef BUILD_ECORE_X |