Changeset a3f63ac in mainline for uspace/lib/guigfx

Timestamp:

2019-09-24T11:13:18Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

aac5069

Parents:

00e8290

git-author:

Jiri Svoboda <jiri@…> (2019-08-23 17:43:11)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-24 11:13:18)

Message:

Move canvas GC and console GC out of libgfx

We need libgfx not to have any dependencies, it's just a protocol/API

Location:

uspace/lib/guigfx

Files:

• doc/doxygroups.h (added)
• include/guigfx/canvas.h (moved) (moved from uspace/lib/gfx/include/gfx/backend/canvas.h ) (2 diffs)
• include/types/guigfx/canvas.h (moved) (moved from uspace/lib/gfx/include/types/gfx/backend/canvas.h ) (2 diffs)
• meson.build (added)
• private/canvas.h (moved) (moved from uspace/lib/gfx/private/backend/canvas.h ) (2 diffs)
• src/canvas.c (moved) (moved from uspace/lib/gfx/src/backend/canvas.c ) (3 diffs)

uspace/lib/guigfx/include/guigfx/canvas.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libgfx
+/** @addtogroup libguigfx
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef _GFX_BACKEND_CANVAS_H
-#define _GFX_BACKEND_CANVAS_H
+#ifndef _GUIGFX_CANVAS_H
+#define _GUIGFX_CANVAS_H
 
 #include <canvas.h>
-#include <types/gfx/backend/canvas.h>
 #include <types/gfx/context.h>
 #include <types/gfx/ops/context.h>
+#include <types/guigfx/canvas.h>
 
 extern gfx_context_ops_t canvas_gc_ops;

uspace/lib/guigfx/include/types/guigfx/canvas.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libgfx
+/** @addtogroup libguigfx
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef _GFX_TYPES_BACKEND_CANVAS_H
-#define _GFX_TYPES_BACKEND_CANVAS_H
+#ifndef _GUIGFX_TYPES_CANVAS_H
+#define _GUIGFX_TYPES_CANVAS_H
 
 struct canvas_gc;

uspace/lib/guigfx/private/canvas.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libgfx
+/** @addtogroup libguigfx
  * @{
  */
@@ -35 +35 @@
  */
 
-#ifndef _GFX_PRIVATE_BACKEND_CANVAS_H
-#define _GFX_PRIVATE_BACKEND_CANVAS_H
+#ifndef _GUIGFX_PRIVATE_CANVAS_H
+#define _GUIGFX_PRIVATE_CANVAS_H
 
 #include <canvas.h>
 #include <draw/surface.h>
+#include <gfx/context.h>
 #include <io/pixel.h>
-#include "../context.h"
 
 /** Actual structure of graphics context.
  *
- * This is private to libgfx. It is not visible to clients nor backends.
+ * This is private to libguigfx. It is not visible to clients nor backends.
  */
 struct canvas_gc {

uspace/lib/guigfx/src/canvas.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libgfx
+/** @addtogroup libguigfx
  * @{
  */
@@ -37 +37 @@
  */
 
-#include <gfx/backend/canvas.h>
+#include <gfx/color.h>
 #include <gfx/context.h>
 #include <gfx/render.h>
+#include <guigfx/canvas.h>
 #include <io/pixel.h>
 #include <stdlib.h>
-#include "../../private/backend/canvas.h"
-#include "../../private/color.h"
+#include "../private/canvas.h"
+//#include "../../private/color.h"
 
 static errno_t canvas_gc_set_color(void *, gfx_color_t *);
@@ -65 +66 @@
 {
         canvas_gc_t *cgc = (canvas_gc_t *) arg;
+        uint16_t r, g, b;
 
-        cgc->color = PIXEL(0, color->r >> 8, color->g >> 8, color->b >> 8);
+        gfx_color_get_rgb_i16(color, &r, &g, &b);
+        cgc->color = PIXEL(0, r >> 8, g >> 8, b >> 8);
         return EOK;
 }