From: Enlightenment C. <no...@cv...> - 2007-08-07 11:03:34
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/doc Log Message: Directory /cvs/e/e17/proto/eflpp/doc added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-07 15:21:00
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/doc Added Files: eflpp.css foot.html head.html Log Message: start of doxygen docs |
From: Enlightenment C. <no...@cv...> - 2007-08-07 15:21:00
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp Added Files: Doxyfile Log Message: start of doxygen docs |
From: Enlightenment C. <no...@cv...> - 2007-08-07 15:21:55
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp Modified Files: Doxyfile Log Message: wrong name =================================================================== RCS file: /cvs/e/e17/proto/eflpp/Doxyfile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Doxyfile 7 Aug 2007 15:20:58 -0000 1.1 +++ Doxyfile 7 Aug 2007 15:21:53 -0000 1.2 @@ -1,4 +1,4 @@ -PROJECT_NAME = Evas +PROJECT_NAME = EFLpp PROJECT_NUMBER = OUTPUT_DIRECTORY = doc INPUT = ./src ./src/edje |
From: Enlightenment C. <no...@cv...> - 2007-08-07 15:56:11
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/doc/img Log Message: Directory /cvs/e/e17/proto/eflpp/doc/img added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-07 20:39:23
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/doc/img Added Files: eflpp.png eflpp_big.png eflpp_mini.png eflpp_small.png hilite.png Log Message: - doxygen images - library dependency information - esmart group changes |
From: Enlightenment C. <no...@cv...> - 2007-08-07 20:39:23
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/esmart Modified Files: eflpp_esmart_group.cpp eflpp_esmart_group.h Log Message: - doxygen images - library dependency information - esmart group changes =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_esmart_group.cpp 10 Jul 2007 21:38:10 -0000 1.1 +++ eflpp_esmart_group.cpp 7 Aug 2007 20:39:20 -0000 1.2 @@ -41,6 +41,11 @@ evasObjectList.push_back (object); } +void EvasEsmartGroup::remove (EvasObject* object) +{ + cerr << "EvasEsmartGroup::remove" << endl; +} + // Handler functions void EvasEsmartGroup::addHandler() @@ -79,6 +84,14 @@ void EvasEsmartGroup::hideHandler() { cerr << "EvasEsmartGroup::hideHandler" << endl; + for (list<EvasObject*>::iterator eol_it = evasObjectList.begin (); + eol_it != evasObjectList.end (); + eol_it++) + { + EvasObject *eo = (*eol_it); + + eo->hide(); + } } void EvasEsmartGroup::colorSetHandler( int r, int g, int b, int a ) =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_esmart_group.h 10 Jul 2007 21:38:10 -0000 1.1 +++ eflpp_esmart_group.h 7 Aug 2007 20:39:20 -0000 1.2 @@ -19,6 +19,7 @@ virtual ~EvasEsmartGroup(); void add (EvasObject* object); + void remove (EvasObject* object); protected: // smart object handlers |
From: Enlightenment C. <no...@cv...> - 2007-08-07 20:39:52
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src Modified Files: Makefile.am Log Message: - doxygen images - library dependency information - esmart group changes =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 10 Jul 2007 21:38:09 -0000 1.4 +++ Makefile.am 7 Aug 2007 20:39:20 -0000 1.5 @@ -23,5 +23,18 @@ ewl/libeflpp_ewl.la\ misc/libeflpp_misc.la +libeflpp_la_DEPENDENCIES = common/libeflpp_common.la\ + ecore/libeflpp_ecore.la\ + edb/libeflpp_edb.la\ + edje/libeflpp_edje.la\ + eet/libeflpp_eet.la\ + emotion/libeflpp_emotion.la\ + esmart/libeflpp_esmart.la\ + etk/libeflpp_etk.la\ + evas/libeflpp_evas.la\ + ewl/libeflpp_ewl.la\ + misc/libeflpp_misc.la + + libeflpp_la_LIBADD = @PACKAGE_LIBS@ |
From: Enlightenment C. <no...@cv...> - 2007-08-07 22:34:27
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/ecore/calibrate Modified Files: calibrate.cpp Log Message: removed deprecated functions =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/ecore/calibrate/calibrate.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- calibrate.cpp 3 Aug 2007 18:09:57 -0000 1.3 +++ calibrate.cpp 7 Aug 2007 22:34:24 -0000 1.4 @@ -179,9 +179,6 @@ bool CalibrationRectangle::handleShow() { -#ifdef ENABLE_EFLPP_FB - ecore_fb_touch_screen_calibrate_set( 1, 0, 0, 0, 0 ); -#endif filter = ecore_event_filter_add( &calibration_event_filter_start, &calibration_event_filter_event, &calibration_event_filter_end, this ); @@ -215,9 +212,6 @@ */ //crosshair->hide(); //text->hide(); -#ifdef ENABLE_EFLPP_FB - ecore_fb_touch_screen_calibrate_set( 0, 0, 0, 0, 0 ); -#endif ecore_event_filter_del( filter ); calibrate(); done.emit(); |
From: Enlightenment C. <no...@cv...> - 2007-08-08 19:32:06
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp Modified Files: README Added Files: eflpp.anjuta Removed Files: eflpp.prj Log Message: - some temporary debug messages in Esmart - README updated - replaced Anjuta 1 with Anjuta 2 files (Hint: Anjuta isn't needed for building; only optional project support) =================================================================== RCS file: /cvs/e/e17/proto/eflpp/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- README 3 Jul 2007 22:42:22 -0000 1.1 +++ README 8 Aug 2007 19:32:03 -0000 1.2 @@ -11,16 +11,12 @@ A: LGPL Q: What are the requirements? -A: You need a C++ toolchain (recommended: g++ 4.1.1), qmake 2.00a (from Qt4), libsigc-2.x, Evas, Ecore, Edje. +A: You need a C++ toolchain (recommended: g++ 4.1.1), libsigc-2.x, Evas, Ecore, Edje. For a debugging build, you need libcwd, see http://libcwd.sourceforge.net - Optional parts need Esmart, Epsilon, Ewl, Etk, and Emotion - you can configure the build by modifying include.pro + Optional parts need Esmart, Epsilon, Ewl, Etk, and Emotion -Q: How do I build efl++? -A: source makevars.sh; qmake efl++.pro; make - -Q: What's that qmake thing? Where is the autotools stuff or the handcrafted Makefile? -A: I'm not very fond of autoconf and friends, nor do I like handcrafted Makefiles. - qmake is a build utility done by TrollTech - see http://doc.trolltech.com/4.0/qmake-manual.html +Q: How do I build eflpp? +A: ./autogen.sh && make && make install Q: Why no inline functions [yet]? A: Premature optimization is the root of all evil. @@ -30,8 +26,8 @@ After all, I'm targetting embedded systems... Q: Why a monolithic library and not just one library for every EFL sublibrary? -A: EFL++ as a class library benefits from putting everything into one library. - I may reconsider this when I have more knowledge about the EFL++ use-cases. +A: EFLpp as a class library benefits from putting everything into one library. + I may reconsider this when I have more knowledge about the EFLpp use-cases. Q: How stable is the API yet? A: Not at all! Trust me, everything can change. I know this is a bit sucky for all potential |
From: Enlightenment C. <no...@cv...> - 2007-08-08 19:32:06
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/esmart Modified Files: eflpp_esmart.cpp eflpp_esmart_group.cpp Log Message: - some temporary debug messages in Esmart - README updated - replaced Anjuta 1 with Anjuta 2 files (Hint: Anjuta isn't needed for building; only optional project support) =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp_esmart.cpp 10 Jul 2007 21:38:10 -0000 1.2 +++ eflpp_esmart.cpp 8 Aug 2007 19:32:03 -0000 1.3 @@ -6,15 +6,14 @@ namespace efl { -static EvasEsmart *selfEsmartPointer; - //=============================================================================================== // EvasEsmart //=============================================================================================== EvasEsmart::EvasEsmart(EvasCanvas *canvas, const char *type, const char *name ) :EvasObject( canvas, type, name ) { - selfEsmartPointer = this; + printf ("EvasEsmart constructor\n"); + //selfEsmartPointer = this; } EvasEsmart::~EvasEsmart() @@ -27,6 +26,8 @@ evasobj = evas_object_smart_add(canvas()->obj(), getEsmart(name)); + evas_object_smart_data_set(evasobj, this); + return evasobj; } @@ -57,47 +58,56 @@ void EvasEsmart::wrap_add( Evas_Object *o ) { - selfEsmartPointer->addHandler(); + //EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + //es->addHandler(); } void EvasEsmart::wrap_del(Evas_Object *o) { - selfEsmartPointer->delHandler(); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->delHandler(); } void EvasEsmart::wrap_move(Evas_Object *o, Evas_Coord x, Evas_Coord y) { - selfEsmartPointer->moveHandler( x, y ); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->moveHandler( x, y ); } void EvasEsmart::wrap_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) { - selfEsmartPointer->resizeHandler( w, h ); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->resizeHandler( w, h ); } void EvasEsmart::wrap_show(Evas_Object *o) { - selfEsmartPointer->showHandler(); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->showHandler(); } void EvasEsmart::wrap_hide(Evas_Object *o) { - selfEsmartPointer->hideHandler(); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->hideHandler(); } void EvasEsmart::wrap_color_set(Evas_Object *o, int r, int g, int b, int a) { - selfEsmartPointer->colorSetHandler( r, g, b, a ); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->colorSetHandler( r, g, b, a ); } void EvasEsmart::wrap_clip_set(Evas_Object *o, Evas_Object *clip) { - selfEsmartPointer->clipSetHandler( clip ); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->clipSetHandler( clip ); } void EvasEsmart::wrap_clip_unset(Evas_Object *o) { - selfEsmartPointer->clipUnsetHandler(); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + es->clipUnsetHandler(); } } // end namespace efl =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp_esmart_group.cpp 7 Aug 2007 20:39:20 -0000 1.2 +++ eflpp_esmart_group.cpp 8 Aug 2007 19:32:03 -0000 1.3 @@ -14,20 +14,20 @@ EvasEsmartGroup::EvasEsmartGroup( EvasCanvas* canvas, const char* name ) :EvasEsmart( canvas, "<attach>", name ) { - o = newEsmart( "EsmartGroup" ); + o = newEsmart( name ); } EvasEsmartGroup::EvasEsmartGroup( int x, int y, EvasCanvas* canvas, const char* name ) :EvasEsmart( canvas, "<attach>", name ) { - o = newEsmart( "EsmartGroup" ); + o = newEsmart( name ); move( x, y ); } EvasEsmartGroup::EvasEsmartGroup( int x, int y, int width, int height, EvasCanvas* canvas, const char* name ) :EvasEsmart( canvas, "<attach>", name ) { - o = newEsmart( "EsmartGroup" ); + o = newEsmart( name ); move( x, y ); resize( width, height ); } @@ -39,6 +39,7 @@ void EvasEsmartGroup::add (EvasObject *object) { evasObjectList.push_back (object); + printf ("add (%p) -> size: %d\n", this, evasObjectList.size ()); } void EvasEsmartGroup::remove (EvasObject* object) @@ -70,26 +71,26 @@ void EvasEsmartGroup::showHandler() { - cerr << "EvasEsmartGroup::showHandler" << endl; + printf ("EvasEsmartGroup::showHandler (%p) -> size: %d\n", this, evasObjectList.size()); for (list<EvasObject*>::iterator eol_it = evasObjectList.begin (); eol_it != evasObjectList.end (); eol_it++) { EvasObject *eo = (*eol_it); - + cerr << "show" << endl; eo->show(); } } void EvasEsmartGroup::hideHandler() { - cerr << "EvasEsmartGroup::hideHandler" << endl; + printf ("EvasEsmartGroup::hideHandler (%p) -> size: %d\n", this, evasObjectList.size()); for (list<EvasObject*>::iterator eol_it = evasObjectList.begin (); eol_it != evasObjectList.end (); eol_it++) { EvasObject *eo = (*eol_it); - + cerr << "hide" << endl; eo->hide(); } } |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:14
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/ewl Modified Files: eflpp_ewl.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/ewl/eflpp_ewl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_ewl.cpp 3 Jul 2007 22:42:36 -0000 1.1 +++ eflpp_ewl.cpp 14 Aug 2007 20:58:03 -0000 1.2 @@ -112,7 +112,7 @@ //==========================================================================// EvasEwl::EvasEwl( EwlEmbed* ewlobj, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "<attach>", name ) + :EvasObject( canvas ) { #warning not sure whether this belongs here |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/edje Modified Files: eflpp_edje.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/edje/eflpp_edje.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp_edje.cpp 6 Aug 2007 09:00:48 -0000 1.2 +++ eflpp_edje.cpp 14 Aug 2007 20:58:03 -0000 1.3 @@ -13,8 +13,11 @@ // EvasEdje //=============================================================================================== EvasEdje::EvasEdje( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "edje", name ) + :EvasObject( canvas ) { + o = edje_object_add( canvas->obj() ); + init( name ? name : "edje" ); + #ifdef CWDEBUG edje_object_message_handler_set( o, &_edje_message_handler_callback, 0 ); edje_object_signal_callback_add( o, "*", "*", &_edje_signal_handler_callback, 0 ); @@ -22,8 +25,11 @@ } EvasEdje::EvasEdje( const char* filename, const char* groupname, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "edje", name ? name : groupname ) + :EvasObject( canvas ) { + o = edje_object_add( canvas->obj() ); + init( name ? name : groupname ); + #ifdef CWDEBUG edje_object_message_handler_set( o, &_edje_message_handler_callback, 0 ); edje_object_signal_callback_add( o, "*", "*", &_edje_signal_handler_callback, 0 ); @@ -32,8 +38,11 @@ } EvasEdje::EvasEdje( int x, int y, const char* filename, const char* groupname, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "edje", name ? name : groupname ) + :EvasObject( canvas ) { + o = edje_object_add( canvas->obj() ); + init( name ? name : groupname ); + #ifdef CWDEBUG edje_object_message_handler_set( o, &_edje_message_handler_callback, 0 ); edje_object_signal_callback_add( o, "*", "*", &_edje_signal_handler_callback, 0 ); |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/evas Modified Files: eflpp_evas.cpp eflpp_evas.h Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eflpp_evas.cpp 15 Jul 2007 14:27:39 -0000 1.3 +++ eflpp_evas.cpp 14 Aug 2007 20:58:03 -0000 1.4 @@ -179,65 +179,27 @@ // EvasObject //=============================================================================================== -EvasObject::EvasObject( EvasCanvas* canvas, const char* type, const char* name ) - :_type( type ), _canvas( canvas ) +EvasObject::EvasObject( EvasCanvas* canvas, const char* name ) + : _canvas( canvas ) { AllocTag( this, type ); Dout( dc::notice, "EvasObject::Object " << "created new " << type << " (" << ( name ? name : "null" ) << ")" ); +} - /* Native Evas Objects */ - if ( strcmp( "line", type ) == 0 ) - o = evas_object_line_add( canvas->obj() ); - else if ( strcmp( "rectangle", type ) == 0 ) - o = evas_object_rectangle_add( canvas->obj() ); - else if ( strcmp( "polygon", type ) == 0 ) - o = evas_object_polygon_add( canvas->obj() ); - else if ( strcmp( "text", type ) == 0 ) - o = evas_object_text_add( canvas->obj() ); - else if ( strcmp( "textblock", type ) == 0 ) - o = evas_object_textblock_add( canvas->obj() ); - else if ( strcmp( "image", type ) == 0 ) - o = evas_object_image_add( canvas->obj() ); - else if ( strcmp( "gradient", type ) == 0 ) - o = evas_object_gradient_add( canvas->obj() ); - /* Edje Object */ - else if ( strcmp( "edje", type ) == 0 ) - o = edje_object_add( canvas->obj() ); -#ifdef EFL_SUPPORT_ESMART - /* Esmart objects */ - else if ( strcmp( "esmart_container", type ) == 0 ) - o = esmart_container_new( canvas->obj() ); - else if ( strcmp( "esmart_textentry", type ) == 0 ) - o = esmart_text_entry_new( canvas->obj() ); -#endif -#ifdef EFL_SUPPORT_EMOTION - else if ( strcmp( "emotion", type ) == 0 ) - o = emotion_object_add( canvas->obj() ); -#endif - /* Attach to an already existing low level object */ - else if ( strcmp( "<attach>", type ) == 0 ) - { - Dout( dc::notice, "EvasObject::EvasObject - attaching to existing C object." ); - return; - } - else - { - DoutFatal( dc::fatal, "EvasObject::EvasObject: unknown type '" << type << "'" ); - } - setName( name ? name : type ); +void EvasObject::init (const char *name) +{ + setName( name ); /* Set up magic object back link */ evas_object_data_set( o, "obj_c++", this ); /* Set up callbacks */ registerCallbacks(); - } EvasObject::~EvasObject() { Dout( dc::notice, *this << " EvasObject::~EvasObject" ); - evas_object_del( o ); } const char* EvasObject::name() const @@ -625,18 +587,24 @@ //=============================================================================================== EvasLine::EvasLine( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "line", name ) + :EvasObject( canvas ) { + o = evas_object_line_add( canvas->obj() ); + init( name ? name : "line" ); } -EvasLine::~EvasLine() +EvasLine::EvasLine( int x1, int y1, int x2, int y2, EvasCanvas* canvas, const char* name ) + :EvasObject( canvas ) { + o = evas_object_line_add( canvas->obj() ); + init( name ? name : "line" ); + + evas_object_line_xy_set( o, x1, y1, x2, y2 ); } -EvasLine::EvasLine( int x1, int y1, int x2, int y2, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "line", name ) +EvasLine::~EvasLine() { - evas_object_line_xy_set( o, x1, y1, x2, y2 ); + evas_object_del( o ); } void EvasLine::setGeometry( int x, int y, int width, int height ) @@ -649,24 +617,33 @@ //=============================================================================================== EvasRectangle::EvasRectangle( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "rectangle", name ) + :EvasObject( canvas ) { + o = evas_object_rectangle_add( canvas->obj() ); + init( name ? name : "rectangle" ); } EvasRectangle::EvasRectangle( int x, int y, int width, int height, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "rectangle", name ) +:EvasObject( canvas ) { - setGeometry( x, y, width, height ); + o = evas_object_rectangle_add( canvas->obj() ); + init( name ? name : "rectangle" ); + + setGeometry( x, y, width, height ); } EvasRectangle::EvasRectangle( const Rect& r, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "rectangle", name ) +:EvasObject( canvas ) { - setGeometry( r ); + o = evas_object_rectangle_add( canvas->obj() ); + init( name ? name : "rectangle" ); + + setGeometry( r ); } EvasRectangle::~EvasRectangle() { + evas_object_del( o ); } //=============================================================================================== @@ -674,12 +651,15 @@ //=============================================================================================== EvasPolygon::EvasPolygon( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "polygon", name ) + :EvasObject( canvas ) { + o = evas_object_polygon_add( canvas->obj() ); + init( name ? name : "polygon" ); } EvasPolygon::~EvasPolygon() { + evas_object_del( o ); } void EvasPolygon::addPoint( int x, int y ) @@ -698,38 +678,53 @@ //=============================================================================================== EvasText::EvasText( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "text", name ) + :EvasObject( canvas ) { + o = evas_object_text_add( canvas->obj() ); + init( name ? name : "text" ); + setFont( EvasFont() ); } EvasText::EvasText( int x, int y, const char* text, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "text", name ) + :EvasObject( canvas ) { + o = evas_object_text_add( canvas->obj() ); + init( name ? name : "text" );; + move( x, y ); setFont( EvasFont() ); setText( text ); } EvasText::EvasText( const char* font, int size, const char* text, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "text", name ) + :EvasObject( canvas ) { + o = evas_object_text_add( canvas->obj() ); + init( name ? name : "text" ); + setFont( font, size ); setText( text ); } EvasText::EvasText( const char* font, int size, int x, int y, const char* text, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "text", name ) + :EvasObject( canvas ) { + o = evas_object_text_add( canvas->obj() ); + init( name ? name : "text" ); + move( x, y ); setFont( font, size ); setText( text ); } EvasText::EvasText( EvasText* ao ) - :EvasObject( ao->canvas(), "text" ) + :EvasObject( ao->canvas() ) { Dout( dc::notice, *this << " EvasText::EvasText copy constructor" ); + o = evas_object_text_add( ao->canvas()->obj() ); + init( "text" ); + setGeometry( ao->geometry() ); setLayer( ao->layer() ); setText( ao->text() ); @@ -819,6 +814,7 @@ EvasText::~EvasText() { + evas_object_del( o ); } //=============================================================================================== @@ -826,13 +822,18 @@ //=============================================================================================== EvasTextBlock::EvasTextBlock( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "textblock", name ) + :EvasObject( canvas ) { + o = evas_object_textblock_add( canvas->obj() ); + init( name ? name : "textblock" ); } EvasTextBlock::EvasTextBlock( int x, int y, const char* text, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "textblock", name ) + :EvasObject( canvas ) { + o = evas_object_textblock_add( canvas->obj() ); + init( name ? name : "textblock" ); + move( x, y ); insertText( text ); //setFont( "Vera", 10 ); @@ -867,6 +868,7 @@ EvasTextBlock::~EvasTextBlock() { + evas_object_del( o ); } //=============================================================================================== @@ -874,38 +876,54 @@ //=============================================================================================== EvasImage::EvasImage( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "image" ) + :EvasObject( canvas ) { + o = evas_object_image_add( canvas->obj() ); + init( name ? name : "image" ); + _size = size (); resize( _size ); } EvasImage::EvasImage( const char* filename, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "image", name ? name : filename ) + :EvasObject( canvas ) { + o = evas_object_image_add( canvas->obj() ); + init( name ? name : filename ); + setFile( filename ); _size = size(); resize( _size ); } EvasImage::EvasImage( int x, int y, const char* filename, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "image", name ? name : filename ) + :EvasObject( canvas ) { + o = evas_object_image_add( canvas->obj() ); + init( name ? name : filename ); + setFile( filename ); move( x, y ); _size = size(); resize( _size ); } +// attach temporary disabled +#if 0 EvasImage::EvasImage( Evas_Object* object, EvasCanvas* canvas, const char* name ) :EvasObject( canvas, "<attach>", name ) { + o = evas_object_image_add( canvas->obj() ); + init( name ? name : type ); + o = object; _size = size(); } +#endif EvasImage::~EvasImage() { + evas_object_del( o ); } bool EvasImage::setFile( const char* path, const char* key ) @@ -1002,18 +1020,25 @@ //=============================================================================================== EvasGradient::EvasGradient( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "gradient", name ) + : EvasObject( canvas ) { + o = evas_object_gradient_add( canvas->obj() ); + init( name ? name : "gradient" ); } EvasGradient::EvasGradient( int x, int y, int width, int height, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "gradient", name ) + :EvasObject( canvas ) { + o = evas_object_gradient_add( canvas->obj() ); + + init( name ? name : "gradient" ); + setGeometry( x, y, width, height ); } EvasGradient::~EvasGradient() { + evas_object_del( o ); } void EvasGradient::addColorStop( int r, int g, int b, int a, int distance ) @@ -1036,4 +1061,4 @@ return evas_object_gradient_angle_get( o ); } -} +} // end namespace efl =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eflpp_evas.h 15 Jul 2007 14:27:39 -0000 1.3 +++ eflpp_evas.h 14 Aug 2007 20:58:03 -0000 1.4 @@ -103,7 +103,6 @@ protected: // construction/destruction EvasObject( EvasCanvas* canvas, - const char* type = "unknown", const char* name = "(null)" ); virtual ~EvasObject(); @@ -111,7 +110,6 @@ bool operator==(const EvasObject& rhs) { return rhs.o == o; }; /* don't use these */ - const char* type() const { return _type; }; Evas_Object* obj() const { return o; }; EvasCanvas* canvas() const { return _canvas; }; // FIXME: Rename to parent() ? @@ -181,9 +179,10 @@ static void dispatcher( void *data, Evas *evas, Evas_Object *evas_object, void *event_info); protected: - const char* _type; Evas_Object* o; EvasCanvas* _canvas; + + void init (const char *name); private: EvasObject(); // disable default constructor @@ -364,7 +363,7 @@ } inline ostream& operator<<( ostream& s, const EvasObject& obj ) { - return s << "<" << obj.type() << " Object '" << obj.name() << "' @ " << obj.geometry() << ">"; + return s << "<" << " Object '" << obj.name() << "' @ " << obj.geometry() << ">"; } } |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/emotion Modified Files: eflpp_emotion.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/emotion/eflpp_emotion.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_emotion.cpp 3 Jul 2007 22:42:36 -0000 1.1 +++ eflpp_emotion.cpp 14 Aug 2007 20:58:03 -0000 1.2 @@ -15,26 +15,37 @@ //=============================================================================================== EvasEmotion::EvasEmotion( EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "emotion", name ) + :EvasObject( canvas ) { + o = emotion_object_add( canvas->obj() ); + init( name ? name : "emotion" ); } EvasEmotion::EvasEmotion( const char* filename, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "emotion", name ? name : filename ) + :EvasObject( canvas ) { + o = emotion_object_add( canvas->obj() ); + init( name ? name : filename ); + setFile( filename ); } EvasEmotion::EvasEmotion( int x, int y, const char* filename, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "emotion", name ? name : filename ) + :EvasObject( canvas ) { + o = emotion_object_add( canvas->obj() ); + init( name ? name : filename ); + setFile( filename ); move( x, y ); } EvasEmotion::EvasEmotion( int x, int y, int width, int height, const char* filename, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "emotion", name ? name : filename ) + :EvasObject( canvas ) { + o = emotion_object_add( canvas->obj() ); + init( name ? name : filename ); + setFile( filename ); move( x, y ); resize( width, height ); |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/esmart/container Modified Files: main.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/esmart/container/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.cpp 10 Jul 2007 21:38:09 -0000 1.2 +++ main.cpp 14 Aug 2007 20:58:03 -0000 1.3 @@ -34,7 +34,7 @@ buttontext->setLayer( 11 ); EvasEsmartContainer* vbox = new EvasEsmartContainer( 50, 50, EvasEsmartContainer::Vertical, evas ); - vbox->resize( 100, 100 ); + vbox->resize( 150, 100 ); vbox->setLayer( 20 ); vbox->setAlignment( EvasEsmartContainer::Right ); //vbox->setPadding( 10, 10, 10, 10 ); |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/etk Modified Files: eflpp_etk.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/etk/eflpp_etk.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_etk.cpp 3 Jul 2007 22:42:36 -0000 1.1 +++ eflpp_etk.cpp 14 Aug 2007 20:58:03 -0000 1.2 @@ -169,7 +169,7 @@ //==========================================================================// EvasEtk::EvasEtk( EtkEmbed* ewlobj, EvasCanvas* canvas, const char* name ) - :EvasObject( canvas, "<attach>", name ) + :EvasObject( canvas ) { o = etk_embed_object_get( ETK_EMBED(ewlobj->obj()) ); |
From: Enlightenment C. <no...@cv...> - 2007-08-14 20:58:49
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/esmart Modified Files: eflpp_esmart.cpp eflpp_esmart_container.cpp eflpp_esmart_container.h eflpp_esmart_group.cpp eflpp_esmart_textentry.cpp Log Message: - changed object creation from father to child =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eflpp_esmart.cpp 8 Aug 2007 19:32:03 -0000 1.3 +++ eflpp_esmart.cpp 14 Aug 2007 20:58:03 -0000 1.4 @@ -10,7 +10,7 @@ // EvasEsmart //=============================================================================================== EvasEsmart::EvasEsmart(EvasCanvas *canvas, const char *type, const char *name ) - :EvasObject( canvas, type, name ) + :EvasObject( canvas ) { printf ("EvasEsmart constructor\n"); //selfEsmartPointer = this; =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_container.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_esmart_container.cpp 15 Jul 2007 10:38:07 -0000 1.1 +++ eflpp_esmart_container.cpp 14 Aug 2007 20:58:03 -0000 1.2 @@ -11,33 +11,46 @@ //=============================================================================================== EvasEsmartContainer::EvasEsmartContainer( EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_container", name ) + :EvasEsmart( canvas ) { + o = esmart_container_new( canvas->obj() ); + init( name ? name : "esmart_container" ); } EvasEsmartContainer::EvasEsmartContainer( Direction dir, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_container", name ) + :EvasEsmart( canvas ) { - setDirection( dir ); + o = esmart_container_new( canvas->obj() ); + init( name ? name : "esmart_container" ); + + setDirection( dir ); } EvasEsmartContainer::EvasEsmartContainer( int x, int y, Direction dir, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_container", name ) + :EvasEsmart( canvas ) { - setDirection( dir ); - move( x, y ); + o = esmart_container_new( canvas->obj() ); + + init( name ? name : "esmart_container" ); + + setDirection( dir ); + move( x, y ); } EvasEsmartContainer::EvasEsmartContainer( int x, int y, int width, int height, Direction dir, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_container", name ) + :EvasEsmart( canvas ) { - setDirection( dir ); - move( x, y ); - resize( width, height ); + o = esmart_container_new( canvas->obj() ); + init( name ? name : "esmart_container" ); + + setDirection( dir ); + move( x, y ); + resize( width, height ); } EvasEsmartContainer::~EvasEsmartContainer() { + evas_object_del( o ); } void EvasEsmartContainer::setDirection( Direction dir ) =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_container.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_esmart_container.h 15 Jul 2007 10:38:07 -0000 1.1 +++ eflpp_esmart_container.h 14 Aug 2007 20:58:03 -0000 1.2 @@ -90,7 +90,7 @@ protected: -virtual void addHandler() {}; + virtual void addHandler() {}; virtual void delHandler() {}; virtual void moveHandler( Evas_Coord x, Evas_Coord y ) {}; virtual void resizeHandler( Evas_Coord w, Evas_Coord h ) {}; =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_group.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eflpp_esmart_group.cpp 8 Aug 2007 19:32:03 -0000 1.3 +++ eflpp_esmart_group.cpp 14 Aug 2007 20:58:03 -0000 1.4 @@ -12,28 +12,34 @@ //===========================================================================// EvasEsmartGroup::EvasEsmartGroup( EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "<attach>", name ) + :EvasEsmart( canvas ) { - o = newEsmart( name ); + o = newEsmart( name ); + init( name ? name : "esmart_group" ); } EvasEsmartGroup::EvasEsmartGroup( int x, int y, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "<attach>", name ) + :EvasEsmart( canvas ) { - o = newEsmart( name ); - move( x, y ); + o = newEsmart( name ); + init( name ? name : "esmart_group" ); + + move( x, y ); } EvasEsmartGroup::EvasEsmartGroup( int x, int y, int width, int height, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "<attach>", name ) + :EvasEsmart( canvas ) { - o = newEsmart( name ); - move( x, y ); - resize( width, height ); + o = newEsmart( name ); + init( name ? name : "esmart_group" ); + + move( x, y ); + resize( width, height ); } EvasEsmartGroup::~EvasEsmartGroup() { + evas_object_del( o ); } void EvasEsmartGroup::add (EvasObject *object) =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart_textentry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp_esmart_textentry.cpp 15 Jul 2007 10:38:07 -0000 1.1 +++ eflpp_esmart_textentry.cpp 14 Aug 2007 20:58:03 -0000 1.2 @@ -11,28 +11,34 @@ //===========================================================================// EvasEsmartTextEntry::EvasEsmartTextEntry( EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_textentry", name ) + :EvasEsmart( canvas ) { + o = esmart_text_entry_new( canvas->obj() ); + init( name ? name : "esmart_textentry" ); } EvasEsmartTextEntry::EvasEsmartTextEntry( int x, int y, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_textentry", name ) + :EvasEsmart( canvas ) { - move( x, y ); + o = esmart_text_entry_new( canvas->obj() ); + init( name ? name : "esmart_textentry" ); + + move( x, y ); } EvasEsmartTextEntry::EvasEsmartTextEntry( int x, int y, int width, int height, EvasCanvas* canvas, const char* name ) - :EvasEsmart( canvas, "esmart_textentry", name ) + :EvasEsmart( canvas ) { - //esmart_text_entry_max_chars_set(o, 32); - //esmart_text_entry_is_password_set(o, true); + o = esmart_text_entry_new( canvas->obj() ); + init( name ? name : "esmart_textentry" ); - move( x, y ); - resize( width, height ); + move( x, y ); + resize( width, height ); } EvasEsmartTextEntry::~EvasEsmartTextEntry() { + evas_object_del( o ); } void EvasEsmartTextEntry::setText (const char *str) |
From: Enlightenment C. <no...@cv...> - 2007-08-15 20:03:16
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/edje Modified Files: eflpp_edje.cpp eflpp_edje.h Log Message: revert get syntax =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/edje/eflpp_edje.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eflpp_edje.cpp 14 Aug 2007 20:58:03 -0000 1.3 +++ eflpp_edje.cpp 15 Aug 2007 20:03:10 -0000 1.4 @@ -62,7 +62,7 @@ return ( errorcode == 0 ); } -Size EvasEdje::getMinimalSize() const +Size EvasEdje::minimalSize() const { int w, h; edje_object_size_min_get( o, &w, &h ); @@ -70,7 +70,7 @@ return Size( w, h ); } -Size EvasEdje::getMaximumSize() const +Size EvasEdje::maximumSize() const { int w, h; edje_object_size_max_get( o, &w, &h ); =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/edje/eflpp_edje.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp_edje.h 6 Aug 2007 09:00:48 -0000 1.2 +++ eflpp_edje.h 15 Aug 2007 20:03:10 -0000 1.3 @@ -173,8 +173,8 @@ void setMinimumSize( const Size& size ); void setMaximumSize( const Size& size ); - Size getMinimalSize() const; - Size getMaximumSize() const; + Size minimalSize() const; + Size maximumSize() const; void recalculateLayout(); |
From: Enlightenment C. <no...@cv...> - 2007-08-15 20:03:42
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/etk/embed Modified Files: main.cpp Log Message: revert get syntax =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/etk/embed/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.cpp 6 Aug 2007 09:00:48 -0000 1.2 +++ main.cpp 15 Aug 2007 20:03:10 -0000 1.3 @@ -39,7 +39,7 @@ #if 1 EvasEdje* edje = new EvasEdje( 0, 0, PACKAGE_DATA_DIR "/edjes/angstrom-bootmanager.edj", "background", evas ); edje->resize( WIDTH, HEIGHT ); - Size s = edje->getMinimalSize(); + Size s = edje->minimalSize(); edje->setLayer( 1 ); edje->show(); #else |
From: Enlightenment C. <no...@cv...> - 2007-08-15 20:03:42
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/edje/simple Modified Files: main.cpp Log Message: revert get syntax =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/edje/simple/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.cpp 6 Aug 2007 09:00:47 -0000 1.2 +++ main.cpp 15 Aug 2007 20:03:10 -0000 1.3 @@ -26,7 +26,7 @@ EvasEdje* edje = new EvasEdje( 0, 0, PACKAGE_DATA_DIR "/edjes/simple.edj", "test", evas ); edje->resize( WIDTH, HEIGHT ); - Size s = edje->getMinimalSize(); + Size s = edje->minimalSize(); edje->setLayer( 0 ); edje->show(); |
From: Enlightenment C. <no...@cv...> - 2007-08-15 20:03:42
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/ewl/embed Modified Files: main.cpp Log Message: revert get syntax =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/ewl/embed/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.cpp 6 Aug 2007 09:00:48 -0000 1.2 +++ main.cpp 15 Aug 2007 20:03:10 -0000 1.3 @@ -47,7 +47,7 @@ EvasEdje* edje = new EvasEdje( 0, 0, PACKAGE_DATA_DIR "/edjes/angstrom-bootmanager.edj", "background", evas ); edje->resize( WIDTH, HEIGHT ); - Size s = edje->getMinimalSize(); + Size s = edje->minimalSize(); edje->setLayer( 1 ); edje->show(); |
From: Enlightenment C. <no...@cv...> - 2007-08-18 18:28:03
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/evas Modified Files: eflpp_evas.h Log Message: Moved to new Evas_Smart_Class API =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- eflpp_evas.h 14 Aug 2007 20:58:03 -0000 1.4 +++ eflpp_evas.h 18 Aug 2007 18:28:00 -0000 1.5 @@ -59,7 +59,13 @@ /* Output Methods */ int lookupRenderMethod( const char* method ); + + /*! \brief Set the Evas output method. + * This does include a call to lookupRenderMethod(). + * @param method Name of the output method. (See C API docs). + */ bool setOutputMethod( const char* method ); + void resize( int width, int height ); Size size() const; Rect geometry() const; |
From: Enlightenment C. <no...@cv...> - 2007-08-18 18:28:33
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/edje/simple Modified Files: main.cpp Log Message: Moved to new Evas_Smart_Class API =================================================================== RCS file: /cvs/e/e17/proto/eflpp/examples/edje/simple/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- main.cpp 15 Aug 2007 20:03:10 -0000 1.3 +++ main.cpp 18 Aug 2007 18:28:00 -0000 1.4 @@ -15,7 +15,7 @@ EcoreApplication* app = new EcoreApplication( argc, argv, "Simple Edje Test" ); /* Create the main window, a window with an embedded canvas */ - EcoreEvasWindow* mw = new EcoreEvasWindow( WIDTH, HEIGHT ); + EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( WIDTH, HEIGHT ); EvasCanvas* evas = mw->canvas(); |
From: Enlightenment C. <no...@cv...> - 2007-08-18 18:28:34
|
Enlightenment CVS committal Author : andreas Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/src/esmart Modified Files: eflpp_esmart.cpp eflpp_esmart.h Log Message: Moved to new Evas_Smart_Class API =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- eflpp_esmart.cpp 14 Aug 2007 20:58:03 -0000 1.4 +++ eflpp_esmart.cpp 18 Aug 2007 18:28:00 -0000 1.5 @@ -2,6 +2,7 @@ #include <iostream> #include <assert.h> + using namespace std; namespace efl { @@ -13,7 +14,6 @@ :EvasObject( canvas ) { printf ("EvasEsmart constructor\n"); - //selfEsmartPointer = this; } EvasEsmart::~EvasEsmart() @@ -33,24 +33,21 @@ Evas_Smart *EvasEsmart::getEsmart( const char *name ) { - Evas_Smart *smart = evas_smart_new (name, - wrap_add, - wrap_del, - NULL, //deprecated - NULL, //deprecated - NULL, //deprecated - NULL, //deprecated - NULL, //deprecated - wrap_move, - wrap_resize, - wrap_show, - wrap_hide, - wrap_color_set, - wrap_clip_set, - wrap_clip_unset, - NULL - ); - + sc.name = name; + sc.version = EVAS_SMART_CLASS_VERSION; + sc.add = wrap_add; + sc.del = wrap_del; + sc.move = wrap_move; + sc.resize = wrap_resize; + sc.show = wrap_show; + sc.hide = wrap_hide; + sc.color_set = wrap_color_set; + sc.clip_set = wrap_clip_set; + sc.clip_unset = wrap_clip_unset; + sc.data = NULL;//(void *) this; + + Evas_Smart *smart = evas_smart_class_new( &sc ); + return smart; } @@ -58,49 +55,52 @@ void EvasEsmart::wrap_add( Evas_Object *o ) { + // FIXME: data not bound to object at this point. Think about new wrapper design... //EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); //es->addHandler(); } void EvasEsmart::wrap_del(Evas_Object *o) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->delHandler(); } void EvasEsmart::wrap_move(Evas_Object *o, Evas_Coord x, Evas_Coord y) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(sc)); es->moveHandler( x, y ); } void EvasEsmart::wrap_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->resizeHandler( w, h ); } void EvasEsmart::wrap_show(Evas_Object *o) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + cerr << "wrap_show" << endl; + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->showHandler(); } void EvasEsmart::wrap_hide(Evas_Object *o) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + cerr << "wrap_hide" << endl; + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->hideHandler(); } void EvasEsmart::wrap_color_set(Evas_Object *o, int r, int g, int b, int a) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->colorSetHandler( r, g, b, a ); } void EvasEsmart::wrap_clip_set(Evas_Object *o, Evas_Object *clip) { - EvasEsmart *es = static_cast<EvasEsmart*> (evas_object_smart_data_get(o)); + EvasEsmart *es = static_cast<EvasEsmart*> (evas_smart_data_get(o)); es->clipSetHandler( clip ); } =================================================================== RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp_esmart.h 10 Jul 2007 21:38:10 -0000 1.2 +++ eflpp_esmart.h 18 Aug 2007 18:28:00 -0000 1.3 @@ -52,6 +52,8 @@ // TODO: Evas_Object -> EvasObject? static void wrap_clip_set(Evas_Object *o, Evas_Object *clip); static void wrap_clip_unset(Evas_Object *o); + + Evas_Smart_Class sc; }; |