Menu
▾
▴
E SVN: pespin IN trunk/BINDINGS/vala: . eflvala examples/ecore examples/ecore-glib examples/edje tests vapi
|
From: Enlightenment S. <no-...@en...> - 2011-10-27 21:07:06
|
Log: eflvala: Move some vapi lines from ecore.vapi to ecore-vala.vapi to match EFL C libs and its pkg-config files. Thanks to David Kozub <zu...@li...> for noticing the change and sending the initial patch. Author: pespin Date: 2011-10-27 14:06:58 -0700 (Thu, 27 Oct 2011) New Revision: 64449 Trac: http://trac.enlightenment.org/e/changeset/64449 Added: trunk/BINDINGS/vala/vapi/ecore-evas.deps trunk/BINDINGS/vala/vapi/ecore-evas.vapi Modified: trunk/BINDINGS/vala/configure.ac trunk/BINDINGS/vala/eflvala/eflvala-1.0.deps trunk/BINDINGS/vala/examples/ecore-glib/Makefile.am trunk/BINDINGS/vala/examples/ecore/Makefile.am trunk/BINDINGS/vala/examples/edje/Makefile.am trunk/BINDINGS/vala/tests/Makefile.am trunk/BINDINGS/vala/vapi/Makefile.am trunk/BINDINGS/vala/vapi/ecore.vapi Modified: trunk/BINDINGS/vala/configure.ac =================================================================== --- trunk/BINDINGS/vala/configure.ac 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/configure.ac 2011-10-27 21:06:58 UTC (rev 64449) @@ -21,6 +21,7 @@ EINA_REQUIRED=0.0.0 EVAS_REQUIRED=0.0.0 ECORE_REQUIRED=0.0.0 +ECORE_EVAS_REQUIRED=0.0.0 EDJE_REQUIRED=0.0.0 ELM_REQUIRED=0.0.0 GLIB_REQUIRED=2.18.0 @@ -33,6 +34,7 @@ eina >= $EINA_REQUIRED evas >= $EVAS_REQUIRED ecore >= $ECORE_REQUIRED + ecore-evas >= $ECORE_EVAS_REQUIRED edje >= $EDJE_REQUIRED elementary >= $ELM_REQUIRED glib-2.0 >= $GLIB_REQUIRED Modified: trunk/BINDINGS/vala/eflvala/eflvala-1.0.deps =================================================================== --- trunk/BINDINGS/vala/eflvala/eflvala-1.0.deps 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/eflvala/eflvala-1.0.deps 2011-10-27 21:06:58 UTC (rev 64449) @@ -1,6 +1,7 @@ eina evas ecore +ecore-evas edje elementary Modified: trunk/BINDINGS/vala/examples/ecore/Makefile.am =================================================================== --- trunk/BINDINGS/vala/examples/ecore/Makefile.am 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/examples/ecore/Makefile.am 2011-10-27 21:06:58 UTC (rev 64449) @@ -25,6 +25,7 @@ $(VALAC) -C --vapidir $(top_srcdir)/vapi \ --pkg evas \ --pkg ecore \ + --pkg ecore-evas \ --save-temps \ --basedir $(top_srcdir) $< touch $^ Modified: trunk/BINDINGS/vala/examples/ecore-glib/Makefile.am =================================================================== --- trunk/BINDINGS/vala/examples/ecore-glib/Makefile.am 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/examples/ecore-glib/Makefile.am 2011-10-27 21:06:58 UTC (rev 64449) @@ -25,6 +25,7 @@ $(VALAC) -C --vapidir $(top_srcdir)/vapi \ --pkg evas \ --pkg ecore \ + --pkg ecore-evas \ --pkg glib-2.0 \ --save-temps \ --basedir $(top_srcdir) $< Modified: trunk/BINDINGS/vala/examples/edje/Makefile.am =================================================================== --- trunk/BINDINGS/vala/examples/edje/Makefile.am 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/examples/edje/Makefile.am 2011-10-27 21:06:58 UTC (rev 64449) @@ -24,6 +24,7 @@ .vala.stamp: $(edje_VALASOURCES) $(VALAC) -C --vapidir $(top_srcdir)/vapi \ --pkg edje \ + --pkg ecore-evas \ --save-temps \ --basedir $(top_srcdir) $< touch $^ Modified: trunk/BINDINGS/vala/tests/Makefile.am =================================================================== --- trunk/BINDINGS/vala/tests/Makefile.am 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/tests/Makefile.am 2011-10-27 21:06:58 UTC (rev 64449) @@ -17,6 +17,7 @@ --pkg eina \ --pkg evas \ --pkg ecore \ + --pkg ecore-evas \ --pkg edje \ --pkg elementary \ --pkg glib-2.0 Modified: trunk/BINDINGS/vala/vapi/Makefile.am =================================================================== --- trunk/BINDINGS/vala/vapi/Makefile.am 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/vapi/Makefile.am 2011-10-27 21:06:58 UTC (rev 64449) @@ -11,6 +11,8 @@ evas.deps \ ecore.vapi \ ecore.deps \ + ecore-evas.vapi \ + ecore-evas.deps \ edje.vapi \ edje.deps \ elementary.vapi \ Modified: trunk/BINDINGS/vala/vapi/ecore.vapi =================================================================== --- trunk/BINDINGS/vala/vapi/ecore.vapi 2011-10-27 19:48:37 UTC (rev 64448) +++ trunk/BINDINGS/vala/vapi/ecore.vapi 2011-10-27 21:06:58 UTC (rev 64449) @@ -630,132 +630,3 @@ //======================================================================= } } - -//======================================================================= -[CCode (cprefix = "Ecore_Evas_", lower_case_cprefix = "ecore_evas_", cheader_filename = "Ecore_Evas.h")] -namespace EcoreEvas -{ - public void init(); - public void shutdown(); - public bool engine_type_supported_get( EngineType engine ); - public Eina.List<string> engines_get(); - public void engines_free( Eina.List<string> engines ); - - //======================================================================= - [CCode (cprefix = "ECORE_EVAS_ENGINE_")] - public enum EngineType - { - SOFTWARE_BUFFER, - SOFTWARE_X11, - XRENDER_X11, - OPENGL_X11, - SOFTWARE_XCB, - XRENDER_XCB, - SOFTWARE_GDI, - SOFTWARE_DDRAW, - DIRECT3D, - OPENGL_GLEW, - QUARTZ, - SOFTWARE_SDL, - DIRECTFB, - SOFTWARE_FB, - SOFTWARE_16_X11, - SOFTWARE_16_DDRAW, - SOFTWARE_16_WINCE - } - - //======================================================================= - [CCode (cprefix = "ECORE_EVAS_AVOID_DAMAGE_")] - public enum AvoidDamageType - { - NONE, - EXPOSE, - BUILT_IN - } - - //======================================================================= - [CCode (cprefix = "ECORE_EVAS_OBJECT_ASSOCIATE_")] - public enum ObjectAssociateFlags - { - BASE, - STACK, - LAYER, - DEL - } - - //======================================================================= - [Compact] - [CCode (cname = "Ecore_Evas", cprefix = "ecore_evas_", free_function = "ecore_evas_free")] - public class Window - { - [CCode (cname = "ecore_evas_new")] - public Window( string engine, int x, int y, int w, int h, string? extra_options ); - - public string engine_name_get(); - // removed: ecore_evas_data_get, ecore_evas_data_set, ecore_evas_callback* - [CCode (cname = "ecore_evas_get")] - public Evas.Canvas evas_get(); - - public void move( int x, int y ); - public void managed_move( int x, int y ); - public void resize( int w, int h ); - public void move_resize( int x, int y, int w, int h ); - public void geometry_get( out int x, out int y, out int w, out int h ); - public void rotation_set( int rot ); - public void rotation_with_resize_set( int rot ); - public int rotation_get(); - public void shaped_set( int shaped ); - public int shaped_get(); - public void alpha_set( int alpha ); - public int alpha_get(); - public void transparent_set( bool transparent ); - public int transparent_get(); - public void show(); - public void hide(); - public int visibility_get(); - public void raise(); - public void lower(); - public void activate(); - public void title_set( string t ); - public unowned string title_get(); - public void name_class_set( string n, string c ); - public void name_class_get( out string n, out string c ); - public void size_min_set( int w, int h ); - public void size_min_get( out int w, out int h ); - public void size_max_set( int w, int h ); - public void size_max_get( out int w, out int h ); - public void size_base_set( int w, int h ); - public void size_base_get( out int w, out int h ); - public void size_step_set( int w, int h ); - public void size_step_get( out int w, out int h ); - public void cursor_set( string file, int layer, int hot_x, int hot_y ); - public void object_cursor_set( Evas.Object obj, int layer, int hot_x, int hot_y ); - public void cursor_get( out Evas.Object obj, out int layer, out int hot_x, out int hot_y ); - public void layer_set( int layer ); - public int layer_get(); - public void focus_set( int on ); - public int focus_get(); - public void iconified_set( int on ); - public int iconified_get(); - public void borderless_set( int on ); - public int borderless_get(); - public void override_set( int on ); - public int override_get(); - public void maximized_set( int on ); - public int maximized_get(); - public int fullscreen_get(); - public void avoid_damage_set( AvoidDamageType avoid ); - public AvoidDamageType avoid_damage_get(); - public void withdrawn_set( int withdrawn ); - public int withdrawn_get(); - public void sticky_set( int sticky ); - public int sticky_get(); - public void ignore_events_set( int ignore ); - public int ignore_events_get(); - public void manual_render_set( int manual_render ); - public int manual_render_get(); - public void manual_render(); - public void comp_sync_set( int do_sync ); - public int comp_sync_get(); - } -} |