Changeset 9be2358 in mainline

Timestamp:

2019-09-23T13:05:52Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

00e8290

Parents:

3e828ea

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 13:04:48)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 13:05:52)

Message:

Caller needs entire console GC to be able to destroy it properly

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (3 diffs)
• lib/gfx/include/gfx/backend/console.h (modified) (1 diff)
• lib/gfx/private/backend/console.h (modified) (2 diffs)
• lib/gfx/src/backend/console.c (modified) (3 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -44 +44 @@
         console_ctrl_t *con = NULL;
         gfx_color_t *color = NULL;
-        gfx_context_t *gc = NULL;
+        console_gc_t *cgc = NULL;
+        gfx_context_t *gc;
         gfx_rect_t rect;
         int i;
@@ -55 +56 @@
 
         printf("Create console GC\n");
-        rc = console_gc_create(con, stdout, &gc);
+        rc = console_gc_create(con, stdout, &cgc);
         if (rc != EOK)
                 return 1;
+
+        gc = console_gc_get_ctx(cgc);
 
         while (true) {
@@ -85 +88 @@
         }
 
-        // TODO How will we free GC subclass?
-
-        // rc = gfx_context_delete(gc);
-        // if (rc != EOK)
-        //      return 1;
+        rc = console_gc_delete(cgc);
+        if (rc != EOK)
+                return 1;
 
         return 0;

uspace/lib/gfx/include/gfx/backend/console.h

@@ -45 +45 @@
 extern gfx_context_ops_t console_gc_ops;
 
-extern errno_t console_gc_create(console_ctrl_t *, FILE *, gfx_context_t **);
+extern errno_t console_gc_create(console_ctrl_t *, FILE *, console_gc_t **);
+extern errno_t console_gc_delete(console_gc_t *);
+extern gfx_context_t *console_gc_get_ctx(console_gc_t *);
 
 #endif

uspace/lib/gfx/private/backend/console.h

@@ -40 +40 @@
 #include <io/console.h>
 #include <stdio.h>
+#include "../context.h"
 
 /** Actual structure of graphics context.
@@ -46 +47 @@
  */
 struct console_gc {
+        /** Base graphic context */
+        gfx_context_t *gc;
         /** Console control structure */
         console_ctrl_t *con;

uspace/lib/gfx/src/backend/console.c

@@ -115 +115 @@
  */
 errno_t console_gc_create(console_ctrl_t *con, FILE *fout,
-    gfx_context_t **rgc)
+    console_gc_t **rgc)
 {
         console_gc_t *cgc = NULL;
@@ -131 +131 @@
                 goto error;
 
+        cgc->gc = gc;
         cgc->con = con;
         cgc->fout = fout;
-        *rgc = gc;
+        *rgc = cgc;
         return EOK;
 error:
@@ -142 +143 @@
 }
 
+/** Delete console GC.
+ *
+ * @param cgc Console GC
+ */
+errno_t console_gc_delete(console_gc_t *cgc)
+{
+        errno_t rc;
+
+        rc = gfx_context_delete(cgc->gc);
+        if (rc != EOK)
+                return rc;
+
+        free(cgc);
+        return EOK;
+}
+
+/** Get generic graphic context from console GC.
+ *
+ * @param cgc Console GC
+ * @return Graphic context
+ */
+gfx_context_t *console_gc_get_ctx(console_gc_t *cgc)
+{
+        return cgc->gc;
+}
+
 /** @}
  */