mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: rework create_layer_notification

Browse Source 
The add_notification_layer_surface API accepts a simple
wl_listener instead of a ivi-shell specific notification
function. Therefore, the API is renamed to add_listener_layer_surface.

This change has several advantages:
1. Code cleanup
2. No dynamic memory allocation. Listeners are allocated
   by controller plugins
3. Remove API is not needed. Controller plugins can easily
   remove the listener link.

The remove API is removed too:
- ivi_layout_remove_notification_create_layer

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Ucan, Emre (ADITG/SW1)
2016-04-04 08:05:12 +00:00
committed by Pekka Paalanen
parent 970f831588
commit c98f2cf16b
3 changed files with 24 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ivi_layout-internal-test.c
+11 -7
View File
@@ -43,6 +43,7 @@ struct test_context {
uint32_t user_flags;
struct wl_listener layer_property_changed;
struct wl_listener layer_created;
};
static void
@@ -718,11 +719,13 @@ test_layer_properties_changed_notification(struct test_context *ctx)
}
static void
test_layer_create_notification_callback(struct ivi_layout_layer *ivilayer,
void *userdata)
test_layer_create_notification_callback(struct wl_listener *listener, void *data)
{
struct test_context *ctx = userdata;
struct test_context *ctx =
container_of(listener, struct test_context,
layer_created);
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_layer *ivilayer = data;
const struct ivi_layout_layer_properties *prop = lyt->get_properties_of_layer(ivilayer);
iassert(lyt->get_id_of_layer(ivilayer) == IVI_TEST_LAYER_ID(0));
@@ -743,15 +746,16 @@ test_layer_create_notification(struct test_context *ctx)
struct ivi_layout_layer *ivilayers[LAYER_NUM] = {};
ctx->user_flags = 0;
ctx->layer_created.notify = test_layer_create_notification_callback;
iassert(lyt->add_notification_create_layer(
test_layer_create_notification_callback, ctx) == IVI_SUCCEEDED);
iassert(lyt->add_listener_create_layer(&ctx->layer_created) == IVI_SUCCEEDED);
ivilayers[0] = lyt->layer_create_with_dimension(layers[0], 200, 300);
iassert(ctx->user_flags == 1);
ctx->user_flags = 0;
lyt->remove_notification_create_layer(test_layer_create_notification_callback, ctx);
// remove layer created listener.
wl_list_remove(&ctx->layer_created.link);
ivilayers[1] = lyt->layer_create_with_dimension(layers[1], 400, 500);
@@ -840,7 +844,7 @@ test_layer_bad_create_notification(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
iassert(lyt->add_notification_create_layer(NULL, NULL) == IVI_FAILED);
iassert(lyt->add_listener_create_layer(NULL) == IVI_FAILED);
}
static void