Changeset 7470d97 in mainline for uspace/lib/congfx/src/console.c

Timestamp:

2021-04-30T15:05:06Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051349b

Parents:

252d03c

Message:

Add GC operation to set clipping rectangle

The number of changed files is due to the proliferation of GC
implementations, mostly these are just dummies in unit tests.
Definitely need to tame those in the future.

File:

• uspace/lib/congfx/src/console.c (modified) (6 diffs)

uspace/lib/congfx/src/console.c

@@ -48 +48 @@
 #include "../private/color.h"
 
+static errno_t console_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t console_gc_set_color(void *, gfx_color_t *);
 static errno_t console_gc_fill_rect(void *, gfx_rect_t *);
@@ -58 +59 @@
 
 gfx_context_ops_t console_gc_ops = {
+        .set_clip_rect = console_gc_set_clip_rect,
         .set_color = console_gc_set_color,
         .fill_rect = console_gc_fill_rect,
@@ -67 +69 @@
 };
 
+/** Set clipping rectangle on console GC.
+ *
+ * @param arg Console GC
+ * @param rect Rectangle
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t console_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
+{
+        console_gc_t *cgc = (console_gc_t *) arg;
+
+        if (rect != NULL)
+                gfx_rect_clip(rect, &cgc->rect, &cgc->clip_rect);
+        else
+                cgc->clip_rect = cgc->rect;
+
+        return EOK;
+}
+
 /** Set color on console GC.
  *
@@ -100 +121 @@
 
         /* Make sure rectangle is clipped and sorted */
-        gfx_rect_clip(rect, &cgc->rect, &crect);
+        gfx_rect_clip(rect, &cgc->clip_rect, &crect);
 
         cols = cgc->rect.p1.x - cgc->rect.p0.x;
@@ -188 +209 @@
         cgc->rect.p1.x = cols;
         cgc->rect.p1.y = rows;
+        cgc->clip_rect = cgc->rect;
         cgc->buf = buf;
 
@@ -330 +352 @@
 
         gfx_rect_translate(&offs, &srect, &drect);
-        gfx_rect_clip(&drect, &cbm->cgc->rect, &crect);
+        gfx_rect_clip(&drect, &cbm->cgc->clip_rect, &crect);
 
         pixelmap.width = cbm->rect.p1.x - cbm->rect.p0.x;