Hi
Some patches for libeflvala from my work on ffalarms. The patches are
against the git svn repository obtained with the commands:
mkdir libeflvala
cd libeflvala
git svn init -T http://svn.enlightenment.org/svn/e/trunk/BINDINGS/vala
git svn fetch -r 46062:46493
>From 4c828280a0290153e76026922930602cafafb51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukp...@o2.pl>
Date: Thu, 4 Mar 2010 18:49:29 +0100
Subject: [PATCH 1/4] fix cname of Evas enum types
---
vapi/evas.vapi | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/vapi/evas.vapi b/vapi/evas.vapi
index 04bc31f..94a043b 100644
--- a/vapi/evas.vapi
+++ b/vapi/evas.vapi
@@ -32,7 +32,7 @@ namespace Evas
public int render_method_lookup( string name );
//=======================================================================
- [CCode (cprefix = "EVAS_FONT_HINTING_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_FONT_HINTING_", cname = "Evas_Font_Hinting_Flags")]
public enum FontHintingFlags
{
NONE, /**< No font hinting */
@@ -41,7 +41,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_ASPECT_CONTROL_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_ASPECT_CONTROL_", cname = "Evas_Aspect_Control")]
public enum AspectControl
{
NONE,
@@ -52,7 +52,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_LOAD_ERROR_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_LOAD_ERROR_", cname = "int")]
public enum LoadError
{
NONE,
@@ -65,7 +65,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_TEXTURE_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_TEXTURE_", cname = "int")]
public enum TextureMode
{
REFLECT,
@@ -86,7 +86,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_BORDER_FILL_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_BORDER_FILL_", cname = "Evas_Border_Fill_Mode")]
public enum BorderFillMode
{
NONE,
@@ -95,7 +95,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_IMAGE_SCALE_HINT_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_IMAGE_SCALE_HINT_", cname = "Evas_Image_Scale_Hint")]
public enum ImageScaleHint
{
NONE,
@@ -341,7 +341,7 @@ namespace Evas
}
//=======================================================================
- [CCode (cprefix = "EVAS_TEXT_STYLE_", cname = "Evas.h")]
+ [CCode (cprefix = "EVAS_TEXT_STYLE_", cname = "Evas_Text_Style_Type")]
public enum TextStyle
{
PLAIN,
--
1.7.0
>From 54f3ef8b4e3d28cf35622830d0d136e1041a6a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukp...@o2.pl>
Date: Thu, 4 Mar 2010 18:51:38 +0100
Subject: [PATCH 2/4] bind event_callback_add, CallbackType and repeat_events_*
---
vapi/evas.vapi | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/vapi/evas.vapi b/vapi/evas.vapi
index 94a043b..8e7ac3c 100644
--- a/vapi/evas.vapi
+++ b/vapi/evas.vapi
@@ -104,6 +104,32 @@ namespace Evas
}
//=======================================================================
+ [CCode (cprefix = "EVAS_CALLBACK_", cname = "Evas_Callback_Type")]
+ public enum CallbackType
+ {
+ MOUSE_IN,
+ MOUSE_OUT,
+ MOUSE_DOWN,
+ MOUSE_UP,
+ MOUSE_MOVE,
+ MOUSE_WHEEL,
+ FREE,
+ KEY_DOWN,
+ KEY_UP,
+ FOCUS_IN,
+ FOCUS_OUT,
+ SHOW,
+ HIDE,
+ MOVE,
+ RESIZE,
+ RESTACK,
+ DEL,
+ HOLD,
+ CHANGED_SIZE_HINTS,
+ IMAGE_PRELOADED
+ }
+
+ //=======================================================================
[Compact]
[CCode (cname = "Evas", free_function = "evas_free")]
public class Canvas
@@ -274,7 +300,12 @@ namespace Evas
public void focus_set( bool focus );
public bool focus_get();
+ public void repeat_events_set( bool repeat );
+ public bool repeat_events_get();
+
public void smart_callback_add( string event, Callback func );
+ public void event_callback_add( CallbackType type, Callback func );
+
}
//=======================================================================
--
1.7.0
>From 9a69e105e13b51cea3b3a61455e667a0e29ad36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukp...@o2.pl>
Date: Thu, 4 Mar 2010 18:54:37 +0100
Subject: [PATCH 3/4] Elm.Win.resize_object_* may be given any Evas.Object
---
vapi/elm.vapi | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vapi/elm.vapi b/vapi/elm.vapi
index a266c8e..c7944a4 100644
--- a/vapi/elm.vapi
+++ b/vapi/elm.vapi
@@ -165,8 +165,8 @@ public class Win : Elm.Object
[CCode (cname = "elm_win_add")]
public Win( Elm.Object? parent = null, string name = "Untitled", WinType t = WinType.BASIC );
- public void resize_object_add( Elm.Object subobj );
- public void resize_object_del( Elm.Object subobj );
+ public void resize_object_add( Evas.Object subobj );
+ public void resize_object_del( Evas.Object subobj );
public void title_set( string title );
public void autodel_set( bool autodel );
public void activate();
--
1.7.0
>From 45989fa3402658bd7763ba19cf0acfa52e601d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukp...@o2.pl>
Date: Thu, 4 Mar 2010 19:02:52 +0100
Subject: [PATCH 4/4] change return type of Elm.Layout.edje_get() to Edje.Object
---
vapi/elm.deps | 1 +
vapi/elm.vapi | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/vapi/elm.deps b/vapi/elm.deps
index 5b30744..a51dc14 100644
--- a/vapi/elm.deps
+++ b/vapi/elm.deps
@@ -1,3 +1,4 @@
eina
evas
ecore
+edje
diff --git a/vapi/elm.vapi b/vapi/elm.vapi
index c7944a4..4facf85 100644
--- a/vapi/elm.vapi
+++ b/vapi/elm.vapi
@@ -421,7 +421,7 @@ public class Layout : Elm.Object
public void file_set( string file, string group );
public void theme_set( string clas, string group, string style );
public void content_set( string swallow, Elm.Object content );
- public weak Elm.Object edje_get();
+ public unowned Edje.Object edje_get();
public void sizing_eval();
}
--
1.7.0
_______________________________________________
Smartphones-userland mailing list
Smartphones-userland@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/smartphones-userland
