Index: uspace/app/viewer/meson.build =================================================================== --- uspace/app/viewer/meson.build (revision 2c9fdeedc215dcd9caf895b28b729baafa0f3971) +++ uspace/app/viewer/meson.build (revision 63b35c78ce6d4e8e89c73f64421c78ce3a17eaf9) @@ -27,5 +27,5 @@ # -deps = [ 'ui', 'draw', 'compress' ] +deps = [ 'ui', 'gfximage', 'compress' ] src = files('viewer.c') Index: uspace/app/viewer/viewer.c =================================================================== --- uspace/app/viewer/viewer.c (revision 2c9fdeedc215dcd9caf895b28b729baafa0f3971) +++ uspace/app/viewer/viewer.c (revision 63b35c78ce6d4e8e89c73f64421c78ce3a17eaf9) @@ -34,7 +34,6 @@ */ -#include -#include #include +#include #include #include @@ -58,13 +57,13 @@ static ui_window_t *window; -static surface_t *surface = NULL; +static gfx_bitmap_t *bitmap = NULL; static ui_image_t *image = NULL; static gfx_context_t *window_gc; -static surface_coord_t img_width; -static surface_coord_t img_height; - -static bool img_load(const char *, surface_t **); -static bool img_setup(gfx_context_t *, surface_t *); +static gfx_rect_t img_rect; + +static bool img_load(gfx_context_t *gc, const char *, gfx_bitmap_t **, + gfx_rect_t *); +static bool img_setup(gfx_context_t *, gfx_bitmap_t *, gfx_rect_t *); static void wnd_close(ui_window_t *, void *); @@ -115,11 +114,12 @@ if (update) { - surface_t *lsface; - - if (!img_load(imgs[imgs_current], &lsface)) { + gfx_bitmap_t *lbitmap; + gfx_rect_t lrect; + + if (!img_load(window_gc, imgs[imgs_current], &lbitmap, &lrect)) { printf("Cannot load image \"%s\".\n", imgs[imgs_current]); exit(4); } - if (!img_setup(window_gc, lsface)) { + if (!img_setup(window_gc, lbitmap, &lrect)) { printf("Cannot setup image \"%s\".\n", imgs[imgs_current]); exit(6); @@ -128,5 +128,6 @@ } -static bool img_load(const char *fname, surface_t **p_local_surface) +static bool img_load(gfx_context_t *gc, const char *fname, + gfx_bitmap_t **rbitmap, gfx_rect_t *rect) { int fd; @@ -158,6 +159,6 @@ vfs_put(fd); - *p_local_surface = decode_tga(tga, stat.size, SURFACE_FLAG_SHARED); - if (*p_local_surface == NULL) { + rc = decode_tga(gc, tga, stat.size, rbitmap, rect); + if (rc != EOK) { free(tga); return false; @@ -166,15 +167,10 @@ free(tga); - surface_get_resolution(*p_local_surface, &img_width, &img_height); - + img_rect = *rect; return true; } -static bool img_setup(gfx_context_t *gc, surface_t *local_surface) -{ - surface_coord_t w, h; - gfx_bitmap_params_t params; - gfx_bitmap_alloc_t alloc; - gfx_bitmap_t *bmp; +static bool img_setup(gfx_context_t *gc, gfx_bitmap_t *bmp, gfx_rect_t *rect) +{ gfx_rect_t arect; gfx_rect_t irect; @@ -184,31 +180,15 @@ ui_res = ui_window_get_res(window); - surface_get_resolution(local_surface, &w, &h); - gfx_bitmap_params_init(¶ms); - params.rect.p1.x = w; - params.rect.p1.y = h; - ui_window_get_app_rect(window, &arect); - gfx_rect_translate(&arect.p0, ¶ms.rect, &irect); - - alloc.pitch = sizeof(uint32_t) * w; - alloc.off0 = 0; - alloc.pixels = surface_direct_access(local_surface); - - rc = gfx_bitmap_create(gc, ¶ms, &alloc, &bmp); - if (rc != EOK) { - surface_destroy(local_surface); - return false; - } + gfx_rect_translate(&arect.p0, rect, &irect); if (image != NULL) { - ui_image_set_bmp(image, bmp, ¶ms.rect); + ui_image_set_bmp(image, bmp, rect); (void) ui_image_paint(image); ui_image_set_rect(image, &irect); } else { - rc = ui_image_create(ui_res, bmp, ¶ms.rect, &image); + rc = ui_image_create(ui_res, bmp, rect, &image); if (rc != EOK) { gfx_bitmap_destroy(bmp); - surface_destroy(local_surface); return false; } @@ -218,8 +198,8 @@ } - if (surface != NULL) - surface_destroy(surface); - - surface = local_surface; + if (bitmap != NULL) + gfx_bitmap_destroy(bitmap); + + bitmap = bmp; return true; } @@ -235,5 +215,6 @@ { const char *display_spec = DISPLAY_DEFAULT; - surface_t *lsface; + gfx_bitmap_t *lbitmap; + gfx_rect_t lrect; bool fullscreen = false; gfx_rect_t rect; @@ -287,9 +268,4 @@ } - if (!img_load(imgs[imgs_current], &lsface)) { - printf("Cannot load image \"%s\".\n", imgs[imgs_current]); - return 1; - } - // TODO Fullscreen mode if (fullscreen) { @@ -306,30 +282,44 @@ viewer.ui = ui; - rect.p0.x = 0; - rect.p0.y = 0; - rect.p1.x = img_width; - rect.p1.y = img_height; - + /* + * We don't know the image size yet, so create tiny window and resize + * later. + */ ui_wnd_params_init(¶ms); params.caption = "Viewer"; + params.rect.p0.x = 0; + params.rect.p0.y = 0; + params.rect.p1.x = 1; + params.rect.p1.y = 1; + + rc = ui_window_create(ui, ¶ms, &window); + if (rc != EOK) { + printf("Error creating window.\n"); + return 1; + } + + window_gc = ui_window_get_gc(window); + + ui_window_set_cb(window, &window_cb, (void *) &viewer); + + if (!img_load(window_gc, imgs[imgs_current], &lbitmap, &lrect)) { + printf("Cannot load image \"%s\".\n", imgs[imgs_current]); + return 1; + } + /* * Compute window rectangle such that application area corresponds * to rect */ - ui_wdecor_rect_from_app(&rect, &wrect); + ui_wdecor_rect_from_app(&lrect, &wrect); off = wrect.p0; - gfx_rect_rtranslate(&off, &wrect, ¶ms.rect); - - rc = ui_window_create(ui, ¶ms, &window); - if (rc != EOK) { - printf("Error creating window.\n"); - return 1; - } - - window_gc = ui_window_get_gc(window); - - ui_window_set_cb(window, &window_cb, (void *) &viewer); - - if (!img_setup(window_gc, lsface)) { + gfx_rect_rtranslate(&off, &wrect, &rect); + rc = ui_window_resize(window, &rect); + if (rc != EOK) { + printf("Error resizing window.\n"); + return 1; + } + + if (!img_setup(window_gc, lbitmap, &lrect)) { printf("Cannot setup image \"%s\".\n", imgs[imgs_current]); return 1;