diff options
Diffstat (limited to 'tests/test-homescreen.c')
| -rw-r--r-- | tests/test-homescreen.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c index ae3ad70..68c6d23 100644 --- a/tests/test-homescreen.c +++ b/tests/test-homescreen.c @@ -526,7 +526,8 @@ search_surfaceid(struct display *display, const int surfaceid) static void window_created(void *data, struct ico_window_mgr *ico_window_mgr, - uint32_t surfaceid, const char *winname, int32_t pid, const char *appid) + uint32_t surfaceid, const char *winname, int32_t pid, + const char *appid, int32_t layertype) { struct display *display = data; struct surface_name *p; @@ -541,12 +542,14 @@ window_created(void *data, struct ico_window_mgr *ico_window_mgr, p = p->next; } if (p) { - print_log("HOMESCREEN: Event[window_created] surface=%08x(app=%s,name=%s) exist", - (int)surfaceid, appid, winname); + print_log("HOMESCREEN: Event[window_created] " + "surface=%08x(app=%s,name=%s,type=%x) exist", + (int)surfaceid, appid, winname, layertype); } else { - print_log("HOMESCREEN: Event[window_created] new surface=%08x(app=%s) winname=%s", - (int)surfaceid, appid, winname); + print_log("HOMESCREEN: Event[window_created] " + "new surface=%08x(app=%s) winname=%s layertype=%x", + (int)surfaceid, appid, winname, layertype); p = malloc(sizeof(struct surface_name)); if (! p) { return; @@ -650,15 +653,15 @@ window_visible(void *data, struct ico_window_mgr *ico_window_mgr, static void window_configure(void *data, struct ico_window_mgr *ico_window_mgr, - uint32_t surfaceid, uint32_t node, uint32_t layer, + uint32_t surfaceid, uint32_t node, int32_t layertype, uint32_t layer, int32_t x, int32_t y, int32_t width, int32_t height, int32_t hint) { struct display *display = data; struct surface_name *p; print_log("HOMESCREEN: Event[window_configure] surface=%08x " - "node=%x x/y=%d/%d w/h=%d/%d hint=%d", - (int)surfaceid, node, x, y, width, height, hint); + "node=%x layer=%x.%x x/y=%d/%d w/h=%d/%d hint=%d", + (int)surfaceid, node, layertype, layer, x, y, width, height, hint); p = search_surfaceid(display, (int)surfaceid); if (! p) { @@ -692,9 +695,9 @@ window_active(void *data, struct ico_window_mgr *ico_window_mgr, static void window_surfaces(void *data, struct ico_window_mgr *ico_window_mgr, - const char *appid, struct wl_array *surfaces) + const char *appid, int32_t pid, struct wl_array *surfaces) { - print_log("HOMESCREEN: Event[app_surfaces] app=%s", appid); + print_log("HOMESCREEN: Event[app_surfaces] app=%s pid=%d", appid, pid); } static void @@ -702,9 +705,6 @@ window_map(void *data, struct ico_window_mgr *ico_window_mgr, int32_t event, uint32_t surfaceid, uint32_t type, uint32_t target, int32_t width, int32_t height, int32_t stride, uint32_t format) { -#if 0 - struct display *display = data; -#endif char sevt[16]; switch (event) { @@ -724,14 +724,6 @@ window_map(void *data, struct ico_window_mgr *ico_window_mgr, print_log("HOMESCREEN: Event[map_surface] ev=%s(%d) surf=%08x type=%d target=%x " "w/h/s/f=%d/%d/%d/%x", sevt, event, (int)surfaceid, type, target, width, height, stride, format); -#if 0 - if ((event == ICO_WINDOW_MGR_MAP_SURFACE_EVENT_MAP) || - (event == ICO_WINDOW_MGR_MAP_SURFACE_EVENT_CONTENTS)) { - opengl_thumbnail(display->display, surfaceid, display->surface->dpy, - display->surface->conf, display->surface->egl_surface, - display->surface->ctx, target, width, height, stride, format); - } -#endif } static const struct ico_window_mgr_listener window_mgr_listener = { @@ -789,8 +781,8 @@ cb_input_regions(void *data, struct ico_input_mgr_device *ico_input_mgr_device, if (regions) { wl_array_for_each(region, regions) { n ++; - print_log("HOMESCREEN: Event[input_regions] number of regions=%d", n); } + print_log("HOMESCREEN: Event[input_regions] number of regions=%d", n); n = 0; wl_array_for_each(region, regions) { n ++; @@ -808,7 +800,7 @@ cb_input_regions(void *data, struct ico_input_mgr_device *ico_input_mgr_device, sprintf(schange, "?%d?", region->change); break; } - print_log("HOMESCREEN:%2d. %s %d.%08(%d/%d) &d/%d-%d/%d " + print_log("HOMESCREEN:%2d. %s %d.%08x(%d/%d) %d/%d-%d/%d " "hot=%d/%d cur=%d/%d-%d/%d attr=%x", n, schange, region->node, region->surfaceid, region->surface_x, region->surface_y, region->x, region->y, region->width, |