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

ivi-shell: rework remove_surface notification

Browse Source 
The add_notification_remove_surface API accepts a simple
wl_listener instead of a ivi-shell specific notification
function. Therefore, the API is renamed to add_listener_remove_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_remove_surface

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:18 +00:00
committed by Pekka Paalanen
parent 562f2ecb0c
commit 67f0aa8767
5 changed files with 34 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ivi_layout-internal-test.c
+1 -1
View File
@@ -873,7 +873,7 @@ test_surface_bad_remove_notification(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
iassert(lyt->add_notification_remove_surface(NULL, NULL) == IVI_FAILED);
iassert(lyt->add_listener_remove_surface(NULL) == IVI_FAILED);
}
/************************ tests end ********************************/
tests/ivi_layout-test-plugin.c
+11 -8
View File
@@ -86,6 +86,7 @@ struct test_context {
struct wl_listener surface_property_changed;
struct wl_listener surface_created;
struct wl_listener surface_removed;
};
static struct test_context static_context;
@@ -952,11 +953,13 @@ RUNNER_TEST(surface_create_notification_p3)
}
static void
test_surface_remove_notification_callback(struct ivi_layout_surface *ivisurf,
void *userdata)
test_surface_remove_notification_callback(struct wl_listener *listener, void *data)
{
struct test_context *ctx = userdata;
struct test_context *ctx =
container_of(listener, struct test_context,
surface_removed);
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_surface *ivisurf = data;
runner_assert_or_return(lyt->get_id_of_surface(ivisurf) == IVI_TEST_SURFACE_ID(0));
@@ -967,19 +970,19 @@ RUNNER_TEST(surface_remove_notification_p1)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
runner_assert(lyt->add_notification_remove_surface(
test_surface_remove_notification_callback, ctx) == IVI_SUCCEEDED);
ctx->surface_removed.notify = test_surface_remove_notification_callback;
runner_assert(lyt->add_listener_remove_surface(&ctx->surface_removed)
== IVI_SUCCEEDED);
ctx->user_flags = 0;
}
RUNNER_TEST(surface_remove_notification_p2)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
runner_assert(ctx->user_flags == 1);
lyt->remove_notification_remove_surface(test_surface_remove_notification_callback, ctx);
// remove surface removed listener.
wl_list_remove(&ctx->surface_removed.link);
ctx->user_flags = 0;
}