Changeset d6c4d40 in mainline

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

Files:

• c/generic/io/console.c (modified) (1 diff)
• congfx/src/console.c (modified) (4 diffs)
• ui/private/window.h (modified) (2 diffs)
• ui/src/window.c (modified) (4 diffs)

uspace/lib/c/generic/io/console.c

@@ -323 +323 @@
 void console_unmap(console_ctrl_t *ctrl, charfield_t *buf)
 {
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        (void) async_req_0_0(exch, CONSOLE_UNMAP);
+        async_exchange_end(exch);
+
         as_area_destroy(buf);
 }

uspace/lib/congfx/src/console.c

@@ -137 +137 @@
         sysarg_t rows;
         sysarg_t cols;
-        charfield_t *buf;
+        charfield_t *buf = NULL;
         errno_t rc;
 
@@ -149 +149 @@
         if (rc != EOK)
                 goto error;
+
+        console_clear(con);
 
         rc = console_map(con, cols, rows, &buf);
@@ -170 +172 @@
         return EOK;
 error:
+        if (buf != NULL)
+                console_unmap(cgc->con, buf);
         if (cgc != NULL)
                 free(cgc);
@@ -187 +191 @@
         if (rc != EOK)
                 return rc;
+
+        console_clear(cgc->con);
+        console_unmap(cgc->con, cgc->buf);
 
         free(cgc);

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);
 }