jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c499fa160e875eb0d005bc197078d24e462dc117
commit c499fa160e875eb0d005bc197078d24e462dc117
Author: Daniel Zaoui <daniel.za...@samsung.com>
Date: Wed Mar 19 11:24:22 2014 +0200
Eolian: Integration of App Server View
---
src/bin/test_application_server.c | 12 +-
src/lib/Makefile.am | 10 +-
src/lib/elm_app_server.c | 2 +-
src/lib/elm_app_server_view.c | 270 +++++++++-----------------------------
src/lib/elm_app_server_view.eo | 132 +++++++++++++++++++
src/lib/elm_app_server_view_eo.h | 4 +
6 files changed, 212 insertions(+), 218 deletions(-)
diff --git a/src/bin/test_application_server.c
b/src/bin/test_application_server.c
index 5ab51a3..ecf309b 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -113,9 +113,9 @@ _create_view_cb(Elm_App_Server *app_server, const
Eina_Value *args EINA_UNUSED,
elm_app_server_view_new_events_set(5),
elm_app_server_view_window_set(ctx->win),
elm_app_server_view_resume(),
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_CLOSED, _close_cb, ctx),
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_PAUSED, _pause_cb, ctx),
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_RESUMED, _resume_cb,
ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb,
ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb,
ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb,
ctx),
eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx));
return view;
@@ -160,9 +160,9 @@ test_application_server_common(const char *pkg)
ctx->view_name = eina_stringshare_printf("%s %s", pkg, id);
eo_do(view,
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_CLOSED, _close_cb,
ctx),
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_PAUSED, _pause_cb,
ctx),
- eo_event_callback_add(ELM_APP_SERVER_VIEW_EV_RESUMED,
_resume_cb, ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED,
_close_cb, ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED,
_pause_cb, ctx),
+ eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED,
_resume_cb, ctx),
eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx));
}
eina_iterator_free(views_iter);
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5a3958d..6206408 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -547,7 +547,9 @@ BUILT_SOURCES = \
elm_app_client_view.eo.c \
elm_app_client_view.eo.h \
elm_app_server.eo.c \
- elm_app_server.eo.h
+ elm_app_server.eo.h \
+ elm_app_server_view.eo.c \
+ elm_app_server_view.eo.h
EXTRA_DIST += \
elm_widget.eo \
@@ -561,7 +563,8 @@ EXTRA_DIST += \
elm_actionslider.eo \
elm_app_client.eo \
elm_app_client_view.eo \
- elm_app_server.eo
+ elm_app_server.eo \
+ elm_app_server_view.eo
nodist_includesunstable_HEADERS = \
elm_widget.eo.h \
@@ -575,5 +578,6 @@ nodist_includesunstable_HEADERS = \
elm_actionslider.eo.h \
elm_app_client.eo.h \
elm_app_client_view.eo.h \
- elm_app_server.eo.h
+ elm_app_server.eo.h \
+ elm_app_server_view.eo.h
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 6fe19bb..ccf1be2 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -309,7 +309,7 @@ _elm_app_server_save(Eo *obj EINA_UNUSED,
Elm_App_Server_Data *data)
elm_app_server_view_icon_get(&icon_name),
elm_app_server_view_new_events_get(&new_events),
elm_app_server_view_progress_get(&progress),
- eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_SAVE, NULL, NULL));
+ eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL,
NULL));
view_props = elm_app_server_view_props_new(id, title, icon_name,
new_events, progress);
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index aca75cf..654a47d 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -5,27 +5,10 @@
#include <Elementary.h>
#include "elm_priv.h"
-EAPI Eo_Op ELM_APP_SERVER_VIEW_BASE_ID = EO_NOOP;
-
#define MY_CLASS ELM_APP_SERVER_VIEW_CLASS
#define MY_CLASS_NAME "Elm_App_Server_View"
-EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_RESUMED =
- EO_EVENT_DESCRIPTION("resume", "Called when view must be resumed");
-
-EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_PAUSED =
- EO_EVENT_DESCRIPTION("paused", "Called when view must be paused");
-
-EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_CLOSED =
- EO_EVENT_DESCRIPTION("closed", "Called when view must be closed");
-
-EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_SHALLOW =
- EO_EVENT_DESCRIPTION("shallow", "Called when view state is set to
shallow");
-
-EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_SAVE =
- EO_EVENT_DESCRIPTION("save", "Called when view state should be
saved");
-
typedef struct
{
Eldbus_Connection *conn;
@@ -60,7 +43,7 @@ _method_close(const Eldbus_Service_Interface *iface, const
Eldbus_Message *messa
Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
_state_set(data, ELM_APP_VIEW_STATE_CLOSED);
- eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_CLOSED, NULL,
NULL));
+ eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL,
NULL));
return eldbus_message_method_return_new(message);
}
@@ -72,7 +55,7 @@ _method_pause(const Eldbus_Service_Interface *iface, const
Eldbus_Message *messa
Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
_state_set(data, ELM_APP_VIEW_STATE_PAUSED);
- eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_PAUSED, NULL,
NULL));
+ eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL,
NULL));
return eldbus_message_method_return_new(message);
}
@@ -84,7 +67,7 @@ _method_resume(const Eldbus_Service_Interface *iface, const
Eldbus_Message *mess
Elm_App_Server_View_Data *data = eo_data_scope_get(eo, MY_CLASS);
_state_set(data, ELM_APP_VIEW_STATE_LIVE);
- eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_RESUMED, NULL,
NULL));
+ eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL,
NULL));
return eldbus_message_method_return_new(message);
}
@@ -183,55 +166,43 @@ static const Eldbus_Service_Interface_Desc iface_desc = {
"org.enlightenment.ApplicationView1", _methods, _signals, _props, NULL, NULL
};
-static void
-_server_resume(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_resume(Eo *obj, Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
-
_state_set(data, ELM_APP_VIEW_STATE_LIVE);
- eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_RESUMED, NULL,
NULL));
+ eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL,
NULL));
}
-static void
-_server_pause(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_pause(Eo *obj, Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
-
_state_set(data, ELM_APP_VIEW_STATE_PAUSED);
- eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_PAUSED, NULL,
NULL));
+ eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL,
NULL));
}
-static void
-_server_close(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_close(Eo *obj, Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
-
_state_set(data, ELM_APP_VIEW_STATE_CLOSED);
- eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_CLOSED, NULL,
NULL));
+ eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL,
NULL));
}
-static void
-_server_shallow(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_shallow(Eo *obj, Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
-
_state_set(data, ELM_APP_VIEW_STATE_SHALLOW);
- eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EV_SHALLOW, NULL,
NULL));
+ eo_do(obj, eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL,
NULL));
}
-static void
-_server_state_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static Elm_App_View_State
+_elm_app_server_view_state_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
- Elm_App_View_State *ret = va_arg(*list, Elm_App_View_State *);
- *ret = data->state;
+ return data->state;
}
-static void
-_server_window_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_window_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data, Evas_Object *win)
{
- Elm_App_Server_View_Data *data = _pd;
- Evas_Object *win = va_arg(*list, Evas_Object *);
int before = data->window_id;
data->window_id = elm_win_window_id_get(win);
@@ -240,124 +211,98 @@ _server_window_set(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
eldbus_service_property_changed(data->iface, "WindowId");
}
-static void
-_server_title_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_title_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data, const char *title)
{
- Elm_App_Server_View_Data *data = _pd;
- const char *title = va_arg(*list, const char *);
-
title = title ? title : "";
if (eina_stringshare_replace(&data->title, title))
eldbus_service_property_changed(data->iface, "Title");
}
-static void
-_server_title_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static const char*
+_elm_app_server_view_title_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
- const char **ret = va_arg(*list, const char **);
- *ret = data->title;
+ return data->title;
}
-static void
-_server_icon_name_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_icon_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data, const char *icon)
{
- Elm_App_Server_View_Data *data = _pd;
- const char *icon = va_arg(*list, const char *);
-
icon = icon ? icon : "";
if (eina_stringshare_replace(&data->icon_name, icon))
eldbus_service_property_changed(data->iface, "IconName");
}
-static void
-_server_icon_name_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static const char*
+_elm_app_server_view_icon_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
- const char **ret = va_arg(*list, const char **);
- *ret = data->icon_name;
+ return data->icon_name;
}
-static void
-_server_icon_pixels_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list
EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_pixels_set(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data,
+ unsigned int w EINA_UNUSED, unsigned int h EINA_UNUSED,
+ Eina_Bool has_alpha EINA_UNUSED, const unsigned char *pixels EINA_UNUSED)
{
- Elm_App_Server_View_Data *data = _pd;
//TODO
eldbus_service_property_changed(data->iface, "IconPixels");
}
-static void
-_server_icon_pixels_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list
*list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_pixels_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*pd EINA_UNUSED,
+ unsigned int *w EINA_UNUSED, unsigned int *h EINA_UNUSED,
+ Eina_Bool *has_alpha EINA_UNUSED, const unsigned char **pixels
EINA_UNUSED)
{
//TODO
}
-static void
-_server_progress_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_progress_set(Eo *obj EINA_UNUSED,
Elm_App_Server_View_Data *data, short progress)
{
- Elm_App_Server_View_Data *data = _pd;
- short progress = va_arg(*list, int);
-
if (data->progress != progress)
eldbus_service_property_changed(data->iface, "Progress");
data->progress = progress;
}
-static void
-_server_progress_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static short
+_elm_app_server_view_progress_get(Eo *obj EINA_UNUSED,
Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
- short *ret = va_arg(*list, short *);
-
- *ret = data->progress;
+ return data->progress;
}
-static void
-_server_new_events_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_new_events_set(Eo *obj EINA_UNUSED,
Elm_App_Server_View_Data *data, int events)
{
- Elm_App_Server_View_Data *data = _pd;
- int events = va_arg(*list, int);
-
if (data->new_events != events)
eldbus_service_property_changed(data->iface, "NewEvents");
data->new_events = events;
}
-static void
-_server_new_events_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static int
+_elm_app_server_view_new_events_get(Eo *obj EINA_UNUSED,
Elm_App_Server_View_Data *data)
{
- Elm_App_Server_View_Data *data = _pd;
- int *ret = va_arg(*list, int *);
-
- *ret = data->new_events;
+ return data->new_events;
}
-static void
-_server_id_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static Eina_Stringshare*
+_elm_app_server_view_id_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
- Eina_Stringshare **ret = va_arg(*list, Eina_Stringshare **);
-
- *ret = data->id;
+ return data->id;
}
-static void
-_server_path_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static const char*
+_elm_app_server_view_path_get(Eo *obj EINA_UNUSED, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
- const char **ret = va_arg(*list, const char **);
-
- *ret = eldbus_service_object_path_get(data->iface);
+ return eldbus_service_object_path_get(data->iface);
}
-static void
-_app_server_view_constructor(Eo *obj, void *_pd, va_list *list)
+EOLIAN static void
+_elm_app_server_view_constructor(Eo *obj, Elm_App_Server_View_Data *data,
const char *id)
{
- Elm_App_Server_View_Data *data = _pd;
Elm_App_Server *server;
- const char *id = va_arg(*list, const char *), *server_path;
+ const char *server_path;
char view_path[PATH_MAX];
eo_do_super(obj, MY_CLASS, eo_constructor());
@@ -411,11 +356,9 @@ error:
eo_error_set(obj);
}
-static void
-_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data
*data)
{
- Elm_App_Server_View_Data *data = _pd;
-
eina_stringshare_del(data->title);
eina_stringshare_del(data->icon_name);
@@ -427,100 +370,11 @@ _destructor(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
eo_do_super(obj, MY_CLASS, eo_destructor());
}
-static void
-_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_server_view_eo_base_constructor(Eo *obj, Elm_App_Server_View_Data
*_pd EINA_UNUSED)
{
eo_error_set(obj);
ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
}
-static void
-_class_constructor(Eo_Class *klass)
-{
- const Eo_Op_Func_Description func_desc[] = {
- EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
- EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_CONSTRUCTOR),
_app_server_view_constructor),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_RESUME),
_server_resume),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_PAUSE),
_server_pause),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_CLOSE),
_server_close),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_SHALLOW),
_server_shallow),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_STATE_GET),
_server_state_get),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_WINDOW_SET),
_server_window_set),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_TITLE_SET),
_server_title_set),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_TITLE_GET),
_server_title_get),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_ICON_NAME_SET),
_server_icon_name_set),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_ICON_NAME_GET),
_server_icon_name_get),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_ICON_PIXELS_SET),
_server_icon_pixels_set),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_ICON_PIXELS_GET),
_server_icon_pixels_get),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_PROGRESS_SET),
_server_progress_set),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_PROGRESS_GET),
_server_progress_get),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_NEW_EVENTS_SET),
_server_new_events_set),
-
EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_NEW_EVENTS_GET),
_server_new_events_get),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_ID_GET),
_server_id_get),
- EO_OP_FUNC(ELM_APP_SERVER_VIEW_ID(ELM_APP_SERVER_VIEW_SUB_ID_PATH_GET),
_server_path_get),
- EO_OP_FUNC_SENTINEL
- };
- eo_class_funcs_set(klass, func_desc);
-}
-
-static const Eo_Op_Description op_desc[] = {
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_CONSTRUCTOR,
- "Constructor of elm_app_server_view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_RESUME, "Resume view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_PAUSE, "Pause view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_CLOSE, "Close view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_SHALLOW,
- "Shallow view, that means that view is open but dont
have a window(X or Wayland)."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_STATE_GET,
- "Get state of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_WINDOW_SET,
- "Set window of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_TITLE_SET,
- "Set title of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_TITLE_GET,
- "Get title of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_ICON_NAME_SET,
- "Set icon name or path of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_ICON_NAME_GET,
- "Get icon name or path of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_ICON_PIXELS_SET,
- "Set icon to view, using the raw pixels of image."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_ICON_PIXELS_GET,
- "Get raw icon of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_PROGRESS_SET,
- "Set progress of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_PROGRESS_GET,
- "Get progress of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_NEW_EVENTS_SET,
- "Set new events of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_NEW_EVENTS_GET,
- "Get events of view."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_ID_GET,
- "Get view identifier."),
- EO_OP_DESCRIPTION(ELM_APP_SERVER_VIEW_SUB_ID_PATH_GET,
- "Get view DBus path."),
- EO_OP_DESCRIPTION_SENTINEL
-};
-
-static const Eo_Event_Description *event_desc[] = {
- ELM_APP_SERVER_VIEW_EV_RESUMED,
- ELM_APP_SERVER_VIEW_EV_PAUSED,
- ELM_APP_SERVER_VIEW_EV_CLOSED,
- ELM_APP_SERVER_VIEW_EV_SHALLOW,
- ELM_APP_SERVER_VIEW_EV_SAVE,
- NULL
-};
-
-static const Eo_Class_Description class_desc = {
- EO_VERSION,
- MY_CLASS_NAME,
- EO_CLASS_TYPE_REGULAR,
- EO_CLASS_DESCRIPTION_OPS(&ELM_APP_SERVER_VIEW_BASE_ID, op_desc,
ELM_APP_SERVER_VIEW_SUB_ID_LAST),
- event_desc,
- sizeof(Elm_App_Server_View_Data),
- _class_constructor,
- NULL
-};
-
-EO_DEFINE_CLASS(elm_app_server_view_class_get, &class_desc, EO_BASE_CLASS,
NULL);
+#include "elm_app_server_view.eo.c"
diff --git a/src/lib/elm_app_server_view.eo b/src/lib/elm_app_server_view.eo
new file mode 100644
index 0000000..2154573
--- /dev/null
+++ b/src/lib/elm_app_server_view.eo
@@ -0,0 +1,132 @@
+class Elm_App_Server_View (Eo_Base)
+{
+ eo_prefix: elm_app_server_view;
+ constructors {
+ constructor {
+ /*@ Class constructor of elm_app_server_view */
+ params {
+ @in const char *id; /*@ identifier of view */
+ }
+ }
+ }
+ properties {
+ progress {
+ set {
+ legacy null;
+ }
+ get {
+ legacy null;
+ }
+ values {
+ short progress;
+ }
+ }
+ new_events {
+ set {
+ legacy null;
+ }
+ get {
+ legacy null;
+ }
+ values {
+ int events;
+ }
+ }
+ icon {
+ set {
+ legacy null;
+ }
+ get {
+ legacy null;
+ }
+ values {
+ const char *icon;
+ }
+ }
+ title {
+ set {
+ legacy null;
+ }
+ get {
+ legacy null;
+ }
+ values {
+ const char *title;
+ }
+ }
+ window {
+ set {
+ legacy null;
+ }
+ values {
+ Evas_Object *win;
+ }
+ }
+ id {
+ get {
+ legacy null;
+ }
+ values {
+ Eina_Stringshare *ret;
+ }
+ }
+ state {
+ get {
+ legacy null;
+ }
+ values {
+ Elm_App_View_State ret;
+ }
+ }
+ path {
+ get {
+ legacy null;
+ }
+ values {
+ const char *ret;
+ }
+ }
+ pixels {
+ get {
+ /*@ Get application raw icon. */
+ legacy null;
+ }
+ set {
+ /*@ Set icon to application, using the raw pixels of image. */
+ legacy null;
+ }
+ values {
+ unsigned int w;
+ unsigned int h;
+ Eina_Bool has_alpha;
+ const unsigned char *pixels;
+ }
+ }
+ }
+ methods {
+ pause {
+ legacy null;
+ }
+ resume {
+ legacy null;
+ }
+ shallow {
+ legacy null;
+ }
+ close {
+ legacy null;
+ }
+ }
+ implements {
+ Eo_Base::constructor;
+ Eo_Base::destructor;
+ }
+ events {
+ resumed; /*@ Called when view must be resumed */
+ paused; /*@ Called when view must be paused */
+ closed; /*@ Called when view must be closed */
+ shallow; /*@ Called when view state is set to shallow */
+ save; /*@ Called when view state should be saved */
+ }
+
+}
diff --git a/src/lib/elm_app_server_view_eo.h b/src/lib/elm_app_server_view_eo.h
index 3b448cb..aa939f7 100644
--- a/src/lib/elm_app_server_view_eo.h
+++ b/src/lib/elm_app_server_view_eo.h
@@ -1,3 +1,6 @@
+#include "elm_app_server_view.eo.h"
+
+#if 0
#define ELM_APP_SERVER_VIEW_CLASS elm_app_server_view_class_get()
const Eo_Class *elm_app_server_view_class_get(void) EINA_CONST;
@@ -187,3 +190,4 @@ extern EAPI const Eo_Event_Description
_ELM_APP_SERVER_VIEW_EV_SHALLOW;
extern EAPI const Eo_Event_Description _ELM_APP_SERVER_VIEW_EV_SAVE;
#define ELM_APP_SERVER_VIEW_EV_SAVE (&(_ELM_APP_SERVER_VIEW_EV_SAVE))
+#endif
--
