Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp
Dir : e17/proto/eflpp/src/ecore Modified Files: eflpp_ecore_window.cpp eflpp_ecore_window.h eflpp_ecore_x_window.cpp eflpp_ecore_x_window.h Log Message: added example for EcoreXWindow =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_window.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- eflpp_ecore_window.cpp 10 Aug 2008 18:59:30 -0000 1.6 +++ eflpp_ecore_window.cpp 10 Aug 2008 20:58:10 -0000 1.7 @@ -460,6 +460,14 @@ } +EcoreXWindow *EcoreEvasWindowGLX11::getXWindow() +{ + Ecore_X_Window exw = ecore_evas_gl_x11_window_get( _ee ); + EcoreXWindow *exwin = new EcoreXWindow( exw ); + + return exwin; +} + EcoreEvasWindowXRenderX11::EcoreEvasWindowXRenderX11( int width, int height, const char* display ) :EcoreEvasWindow() { @@ -490,6 +498,14 @@ EcoreEvasWindowXRenderX11::~EcoreEvasWindowXRenderX11() { +} + +EcoreXWindow *EcoreEvasWindowXRenderX11::getXWindow() +{ + Ecore_X_Window exw = ecore_evas_xrender_x11_window_get( _ee ); + EcoreXWindow *exwin = new EcoreXWindow( exw ); + + return exwin; } // TODO: Possible without #ifdef stuff? =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_window.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- eflpp_ecore_window.h 10 Aug 2008 18:59:30 -0000 1.6 +++ eflpp_ecore_window.h 10 Aug 2008 20:58:10 -0000 1.7 @@ -52,10 +52,10 @@ virtual void preRenderEvent(); virtual void postRenderEvent(); - /** - * @returns a boolean specifying whether the window should be closed upon a delete request or not. - * The default implementation returns true. - **/ + /*! + * \return A boolean specifying whether the window should be closed upon a delete request or not. + * The default implementation returns true. + */ virtual bool canClose() const; static bool isEngineTypeSupported (EngineType et); @@ -145,6 +145,12 @@ EcoreEvasWindowSoftwareX11( int width, int height, const char* display = 0 ); virtual ~EcoreEvasWindowSoftwareX11(); + /*! + * \brief Gets a pointer to the X window. The returned pointer needs to be + * deleted if you don't need it any longer. + * + * \return The EcoreXWindow. + */ EcoreXWindow *getXWindow(); private: @@ -158,6 +164,14 @@ public: EcoreEvasWindowGLX11( int width, int height, const char* display = 0 ); virtual ~EcoreEvasWindowGLX11(); + + /*! + * \brief Gets a pointer to the X window. The returned pointer needs to be + * deleted if you don't need it any longer. + * + * \return The EcoreXWindow. + */ + EcoreXWindow *getXWindow(); private: EcoreEvasWindowGLX11(); @@ -170,6 +184,14 @@ public: EcoreEvasWindowXRenderX11( int width, int height, const char* display = 0 ); virtual ~EcoreEvasWindowXRenderX11(); + + /*! + * \brief Gets a pointer to the X window. The returned pointer needs to be + * deleted if you don't need it any longer. + * + * \return The EcoreXWindow. + */ + EcoreXWindow *getXWindow(); private: EcoreEvasWindowXRenderX11(); @@ -183,7 +205,7 @@ EcoreEvasWindowFB( int width, int height, const char* display = 0, int rotation = 0 ); virtual ~EcoreEvasWindowFB(); - // TODO: Test for supported backends? + EcoreXWindow *getXWindow(); private: EcoreEvasWindowFB(); =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_x_window.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_ecore_x_window.cpp 10 Aug 2008 18:58:24 -0000 1.1 +++ eflpp_ecore_x_window.cpp 10 Aug 2008 20:58:10 -0000 1.2 @@ -27,6 +27,8 @@ //void EcoreXWindow::getNetWMWindowTypePrefetch() //void EcoreXWindow::getNetWMWindowTypeFetch () +//EAPI void ecore_x_netwm_window_type_get_prefetch(Ecore_X_Window window); +//EAPI void ecore_x_netwm_window_type_get_fetch(void); bool EcoreXWindow::getNetWMWindowType( EcoreXWindowType &outType ) { =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_x_window.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_ecore_x_window.h 10 Aug 2008 18:59:30 -0000 1.1 +++ eflpp_ecore_x_window.h 10 Aug 2008 20:58:10 -0000 1.2 @@ -8,8 +8,8 @@ // EcoreXWindow //=============================================================================================== -/* - * TODO: This is an initial wrapper for Ecore_X. The current code is untested. +/*! + * This is an initial wrapper for Ecore_X. */ namespace efl { @@ -39,12 +39,6 @@ //void getNetWMWindowTypePrefetch(); //void getNetWMWindowTypeFetc (); bool getNetWMWindowType( EcoreXWindowType &outType ); - - /*EAPI void ecore_x_netwm_window_type_set(Ecore_X_Window win, Ecore_X_Window_Type type); -EAPI void ecore_x_netwm_window_type_get_prefetch(Ecore_X_Window window); -EAPI void ecore_x_netwm_window_type_get_fetch(void); -EAPI int ecore_x_netwm_window_type_get(Ecore_X_Window win, Ecore_X_Window_Type *type); - */ protected: ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs