Index: uspace/app/viewer/viewer.c
===================================================================
--- uspace/app/viewer/viewer.c	(revision 0ffa40a7f0accdb5ebdcdf9d8a74a5512a956a5f)
+++ uspace/app/viewer/viewer.c	(revision 3f81cdcfbfdc8a272c50a8df92c53bd212f39b7e)
@@ -50,20 +50,20 @@
 typedef struct {
 	ui_t *ui;
+
+	size_t imgs_count;
+	size_t imgs_current;
+	char **imgs;
+
+	ui_window_t *window;
+	gfx_bitmap_t *bitmap;
+	ui_image_t *image;
+	gfx_context_t *window_gc;
+
+	gfx_rect_t img_rect;
 } viewer_t;
 
-static size_t imgs_count;
-static size_t imgs_current = 0;
-static char **imgs;
-
-static ui_window_t *window = NULL;
-static gfx_bitmap_t *bitmap = NULL;
-static ui_image_t *image = NULL;
-static gfx_context_t *window_gc;
-
-static gfx_rect_t img_rect;
-
-static bool img_load(gfx_context_t *gc, const char *, gfx_bitmap_t **,
+static bool viewer_img_load(viewer_t *, const char *, gfx_bitmap_t **,
     gfx_rect_t *);
-static bool img_setup(gfx_context_t *, gfx_bitmap_t *, gfx_rect_t *);
+static bool viewer_img_setup(viewer_t *, gfx_bitmap_t *, gfx_rect_t *);
 
 static void wnd_close(ui_window_t *, void *);
@@ -97,8 +97,8 @@
 
 	if ((event->type == KEY_PRESS) && (event->key == KC_PAGE_DOWN)) {
-		if (imgs_current == imgs_count - 1)
-			imgs_current = 0;
+		if (viewer->imgs_current == viewer->imgs_count - 1)
+			viewer->imgs_current = 0;
 		else
-			imgs_current++;
+			viewer->imgs_current++;
 
 		update = true;
@@ -106,8 +106,8 @@
 
 	if ((event->type == KEY_PRESS) && (event->key == KC_PAGE_UP)) {
-		if (imgs_current == 0)
-			imgs_current = imgs_count - 1;
+		if (viewer->imgs_current == 0)
+			viewer->imgs_current = viewer->imgs_count - 1;
 		else
-			imgs_current--;
+			viewer->imgs_current--;
 
 		update = true;
@@ -118,10 +118,13 @@
 		gfx_rect_t lrect;
 
-		if (!img_load(window_gc, imgs[imgs_current], &lbitmap, &lrect)) {
-			printf("Cannot load image \"%s\".\n", imgs[imgs_current]);
+		if (!viewer_img_load(viewer, viewer->imgs[viewer->imgs_current],
+		    &lbitmap, &lrect)) {
+			printf("Cannot load image \"%s\".\n",
+			    viewer->imgs[viewer->imgs_current]);
 			exit(4);
 		}
-		if (!img_setup(window_gc, lbitmap, &lrect)) {
-			printf("Cannot setup image \"%s\".\n", imgs[imgs_current]);
+		if (!viewer_img_setup(viewer, lbitmap, &lrect)) {
+			printf("Cannot setup image \"%s\".\n",
+			    viewer->imgs[viewer->imgs_current]);
 			exit(6);
 		}
@@ -129,5 +132,5 @@
 }
 
-static bool img_load(gfx_context_t *gc, const char *fname,
+static bool viewer_img_load(viewer_t *viewer, const char *fname,
     gfx_bitmap_t **rbitmap, gfx_rect_t *rect)
 {
@@ -160,5 +163,5 @@
 	vfs_put(fd);
 
-	rc = decode_tga(gc, tga, stat.size, rbitmap, rect);
+	rc = decode_tga(viewer->window_gc, tga, stat.size, rbitmap, rect);
 	if (rc != EOK) {
 		free(tga);
@@ -168,9 +171,10 @@
 	free(tga);
 
-	img_rect = *rect;
+	viewer->img_rect = *rect;
 	return true;
 }
 
-static bool img_setup(gfx_context_t *gc, gfx_bitmap_t *bmp, gfx_rect_t *rect)
+static bool viewer_img_setup(viewer_t *viewer, gfx_bitmap_t *bmp,
+    gfx_rect_t *rect)
 {
 	gfx_rect_t arect;
@@ -179,17 +183,17 @@
 	errno_t rc;
 
-	ui_res = ui_window_get_res(window);
-
-	ui_window_get_app_rect(window, &arect);
+	ui_res = ui_window_get_res(viewer->window);
+
+	ui_window_get_app_rect(viewer->window, &arect);
 
 	/* Center image on application area */
 	gfx_rect_ctr_on_rect(rect, &arect, &irect);
 
-	if (image != NULL) {
-		ui_image_set_bmp(image, bmp, rect);
-		(void) ui_image_paint(image);
-		ui_image_set_rect(image, &irect);
+	if (viewer->image != NULL) {
+		ui_image_set_bmp(viewer->image, bmp, rect);
+		(void) ui_image_paint(viewer->image);
+		ui_image_set_rect(viewer->image, &irect);
 	} else {
-		rc = ui_image_create(ui_res, bmp, rect, &image);
+		rc = ui_image_create(ui_res, bmp, rect, &viewer->image);
 		if (rc != EOK) {
 			gfx_bitmap_destroy(bmp);
@@ -197,12 +201,12 @@
 		}
 
-		ui_image_set_rect(image, &irect);
-		ui_window_add(window, ui_image_ctl(image));
-	}
-
-	if (bitmap != NULL)
-		gfx_bitmap_destroy(bitmap);
-
-	bitmap = bmp;
+		ui_image_set_rect(viewer->image, &irect);
+		ui_window_add(viewer->window, ui_image_ctl(viewer->image));
+	}
+
+	if (viewer->bitmap != NULL)
+		gfx_bitmap_destroy(viewer->bitmap);
+
+	viewer->bitmap = bmp;
 	return true;
 }
@@ -224,9 +228,16 @@
 	gfx_rect_t wrect;
 	gfx_coord2_t off;
-	ui_t *ui;
+	ui_t *ui = NULL;
 	ui_wnd_params_t params;
-	viewer_t viewer;
+	viewer_t *viewer;
 	errno_t rc;
 	int i;
+	unsigned u;
+
+	viewer = calloc(1, sizeof(viewer_t));
+	if (viewer == NULL) {
+		printf("Out of memory.\n");
+		goto error;
+	}
 
 	i = 1;
@@ -237,5 +248,5 @@
 				printf("Argument missing.\n");
 				print_syntax();
-				return 1;
+				goto error;
 			}
 
@@ -247,5 +258,5 @@
 			printf("Invalid option '%s'.\n", argv[i]);
 			print_syntax();
-			return 1;
+			goto error;
 		}
 	}
@@ -254,19 +265,19 @@
 		printf("No image files specified.\n");
 		print_syntax();
-		return 1;
-	}
-
-	imgs_count = argc - i;
-	imgs = calloc(imgs_count, sizeof(char *));
-	if (imgs == NULL) {
+		goto error;
+	}
+
+	viewer->imgs_count = argc - i;
+	viewer->imgs = calloc(viewer->imgs_count, sizeof(char *));
+	if (viewer->imgs == NULL) {
 		printf("Out of memory.\n");
-		return 1;
+		goto error;
 	}
 
 	for (int j = 0; j < argc - i; j++) {
-		imgs[j] = str_dup(argv[i + j]);
-		if (imgs[j] == NULL) {
+		viewer->imgs[j] = str_dup(argv[i + j]);
+		if (viewer->imgs[j] == NULL) {
 			printf("Out of memory.\n");
-			return 3;
+			goto error;
 		}
 	}
@@ -275,5 +286,5 @@
 	if (rc != EOK) {
 		printf("Error creating UI on display %s.\n", display_spec);
-		return 1;
+		goto error;
 	}
 
@@ -281,5 +292,5 @@
 		fullscreen = true;
 
-	viewer.ui = ui;
+	viewer->ui = ui;
 
 	/*
@@ -299,5 +310,5 @@
 	}
 
-	rc = ui_window_create(ui, &params, &window);
+	rc = ui_window_create(ui, &params, &viewer->window);
 	if (rc != EOK) {
 		printf("Error creating window.\n");
@@ -305,10 +316,12 @@
 	}
 
-	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]);
+	viewer->window_gc = ui_window_get_gc(viewer->window);
+
+	ui_window_set_cb(viewer->window, &window_cb, (void *)viewer);
+
+	if (!viewer_img_load(viewer, viewer->imgs[viewer->imgs_current],
+	    &lbitmap, &lrect)) {
+		printf("Cannot load image \"%s\".\n",
+		    viewer->imgs[viewer->imgs_current]);
 		goto error;
 	}
@@ -323,5 +336,5 @@
 
 	if (!fullscreen) {
-		rc = ui_window_resize(window, &rect);
+		rc = ui_window_resize(viewer->window, &rect);
 		if (rc != EOK) {
 			printf("Error resizing window.\n");
@@ -330,10 +343,11 @@
 	}
 
-	if (!img_setup(window_gc, lbitmap, &lrect)) {
-		printf("Cannot setup image \"%s\".\n", imgs[imgs_current]);
-		goto error;
-	}
-
-	rc = ui_window_paint(window);
+	if (!viewer_img_setup(viewer, lbitmap, &lrect)) {
+		printf("Cannot setup image \"%s\".\n",
+		    viewer->imgs[viewer->imgs_current]);
+		goto error;
+	}
+
+	rc = ui_window_paint(viewer->window);
 	if (rc != EOK) {
 		printf("Error painting window.\n");
@@ -343,12 +357,23 @@
 	ui_run(ui);
 
-	ui_window_destroy(window);
+	ui_window_destroy(viewer->window);
 	ui_destroy(ui);
+	free(viewer);
 
 	return 0;
 error:
-	if (window != NULL)
-		ui_window_destroy(window);
-	ui_destroy(ui);
+	if (viewer != NULL && viewer->imgs != NULL) {
+		for (u = 0; u < viewer->imgs_count; u++) {
+			if (viewer->imgs[i] != NULL)
+				free(viewer->imgs[i]);
+		}
+		free(viewer->imgs);
+	}
+	if (viewer != NULL && viewer->window != NULL)
+		ui_window_destroy(viewer->window);
+	if (ui != NULL)
+		ui_destroy(ui);
+	if (viewer != NULL)
+		free(viewer);
 	return 1;
 }