Changeset d6c4d40 in mainline for uspace/lib/ui

Timestamp:

2021-03-05T11:23:31Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f73a8e3

Parents:

87822ce

git-author:

Jiri Svoboda <jiri@…> (2021-03-04 20:22:52)

git-committer:

Jiri Svoboda <jiri@…> (2021-03-05 11:23:31)

Message:

Do not forget to clean up when exiting

Location:

uspace/lib/ui

Files:

• private/window.h (modified) (2 diffs)
• src/window.c (modified) (4 diffs)

uspace/lib/ui/private/window.h

@@ -39 +39 @@
 
 #include <errno.h>
+#include <congfx/console.h>
 #include <display.h>
 #include <gfx/context.h>
@@ -60 +61 @@
         /** Display window */
         display_window_t *dwindow;
+        /** Console GC */
+        console_gc_t *cgc;
         /** Window GC */
         gfx_context_t *gc;

uspace/lib/ui/src/window.c

@@ -132 +132 @@
         gfx_bitmap_t *bmp = NULL;
         mem_gc_t *memgc = NULL;
-        console_gc_t *cgc;
+        console_gc_t *cgc = NULL;
         errno_t rc;
 
@@ -256 +256 @@
         window->gc = gc;
 #endif
+        window->cgc = cgc;
+
         rc = ui_resource_create(window->gc, ui_is_textmode(ui), &res);
         if (rc != EOK)
@@ -290 +292 @@
         if (dgc != NULL)
                 dummygc_destroy(dgc);
+        if (cgc != NULL)
+                console_gc_delete(cgc);
         if (dwindow != NULL)
                 display_window_destroy(dwindow);
@@ -321 +325 @@
         if (window->dwindow != NULL)
                 display_window_destroy(window->dwindow);
+        if (window->cgc != NULL)
+                console_gc_delete(window->cgc);
         free(window);
 }