Changes in uspace/lib/memgfx/src/memgc.c [bc52b5b:0d62c10] in mainline

File:

• uspace/lib/memgfx/src/memgc.c (modified) (18 diffs)

uspace/lib/memgfx/src/memgc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 #include "../private/memgc.h"
 
-static errno_t mem_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t mem_gc_set_color(void *, gfx_color_t *);
 static errno_t mem_gc_fill_rect(void *, gfx_rect_t *);
-static errno_t mem_gc_update(void *);
 static errno_t mem_gc_bitmap_create(void *, gfx_bitmap_params_t *,
     gfx_bitmap_alloc_t *, void **);
@@ -57 +55 @@
 static errno_t mem_gc_bitmap_render(void *, gfx_rect_t *, gfx_coord2_t *);
 static errno_t mem_gc_bitmap_get_alloc(void *, gfx_bitmap_alloc_t *);
-static errno_t mem_gc_cursor_get_pos(void *, gfx_coord2_t *);
-static errno_t mem_gc_cursor_set_pos(void *, gfx_coord2_t *);
-static errno_t mem_gc_cursor_set_visible(void *, bool);
 static void mem_gc_invalidate_rect(mem_gc_t *, gfx_rect_t *);
 
 gfx_context_ops_t mem_gc_ops = {
-        .set_clip_rect = mem_gc_set_clip_rect,
         .set_color = mem_gc_set_color,
         .fill_rect = mem_gc_fill_rect,
-        .update = mem_gc_update,
         .bitmap_create = mem_gc_bitmap_create,
         .bitmap_destroy = mem_gc_bitmap_destroy,
         .bitmap_render = mem_gc_bitmap_render,
-        .bitmap_get_alloc = mem_gc_bitmap_get_alloc,
-        .cursor_get_pos = mem_gc_cursor_get_pos,
-        .cursor_set_pos = mem_gc_cursor_set_pos,
-        .cursor_set_visible = mem_gc_cursor_set_visible
+        .bitmap_get_alloc = mem_gc_bitmap_get_alloc
 };
-
-/** Set clipping rectangle on memory GC.
- *
- * @param arg Memory GC
- * @param rect Rectangle
- *
- * @return EOK on success or an error code
- */
-static errno_t mem_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
-{
-        mem_gc_t *mgc = (mem_gc_t *) arg;
-
-        if (rect != NULL)
-                gfx_rect_clip(rect, &mgc->rect, &mgc->clip_rect);
-        else
-                mgc->clip_rect = mgc->rect;
-
-        return EOK;
-}
 
 /** Set color on memory GC.
@@ -108 +79 @@
         mem_gc_t *mgc = (mem_gc_t *) arg;
         uint16_t r, g, b;
-        uint8_t attr;
 
         gfx_color_get_rgb_i16(color, &r, &g, &b);
-        gfx_color_get_ega(color, &attr);
-        mgc->color = PIXEL(attr, r >> 8, g >> 8, b >> 8);
+        mgc->color = PIXEL(0, r >> 8, g >> 8, b >> 8);
         return EOK;
 }
@@ -131 +100 @@
 
         /* Make sure we have a sorted, clipped rectangle */
-        gfx_rect_clip(rect, &mgc->clip_rect, &crect);
+        gfx_rect_clip(rect, &mgc->rect, &crect);
 
         assert(mgc->rect.p0.x == 0);
@@ -150 +119 @@
 }
 
-/** Update memory GC.
- *
- * @param arg Memory GC
- *
- * @return EOK on success or an error code
- */
-static errno_t mem_gc_update(void *arg)
-{
-        mem_gc_t *mgc = (mem_gc_t *) arg;
-
-        mgc->cb->update(mgc->cb_arg);
-        return EOK;
-}
-
 /** Create memory GC.
  *
@@ -170 +125 @@
  * @param rect Bounding rectangle
  * @param alloc Allocation info
- * @param cb Pointer to memory GC callbacks
- * @param cb_arg Argument to callback functions
+ * @param update_cb Function called to update a rectangle
+ * @param cb_arg Argument to callback function
  * @param rgc Place to store pointer to new memory GC
  *
@@ -177 +132 @@
  */
 errno_t mem_gc_create(gfx_rect_t *rect, gfx_bitmap_alloc_t *alloc,
-    mem_gc_cb_t *cb, void *cb_arg, mem_gc_t **rgc)
+    mem_gc_update_cb_t update_cb, void *cb_arg, mem_gc_t **rgc)
 {
         mem_gc_t *mgc = NULL;
@@ -195 +150 @@
         mgc->gc = gc;
         mgc->rect = *rect;
-        mgc->clip_rect = *rect;
         mgc->alloc = *alloc;
 
-        mgc->cb = cb;
+        mgc->update = update_cb;
         mgc->cb_arg = cb_arg;
 
@@ -236 +190 @@
 {
         mgc->rect = *rect;
-        mgc->clip_rect = *rect;
         mgc->alloc = *alloc;
 }
@@ -252 +205 @@
 static void mem_gc_invalidate_rect(mem_gc_t *mgc, gfx_rect_t *rect)
 {
-        mgc->cb->invalidate(mgc->cb_arg, rect);
+        mgc->update(mgc->cb_arg, rect);
 }
 
@@ -378 +331 @@
         gfx_rect_t srect;
         gfx_rect_t drect;
-        gfx_rect_t crect;
         gfx_coord2_t offs;
         gfx_coord_t x, y;
@@ -399 +351 @@
         /* Destination rectangle */
         gfx_rect_translate(&offs, &srect, &drect);
-
-        /* Clip destination rectangle */
-        gfx_rect_clip(&drect, &mbm->mgc->clip_rect, &crect);
 
         assert(mbm->alloc.pitch == (mbm->rect.p1.x - mbm->rect.p0.x) *
@@ -420 +369 @@
         } else if ((mbm->flags & bmpf_color_key) == 0) {
                 /* Simple copy */
-                for (y = crect.p0.y; y < crect.p1.y; y++) {
-                        for (x = crect.p0.x; x < crect.p1.x; x++) {
+                for (y = drect.p0.y; y < drect.p1.y; y++) {
+                        for (x = drect.p0.x; x < drect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -430 +379 @@
         } else if ((mbm->flags & bmpf_colorize) == 0) {
                 /* Color key */
-                for (y = crect.p0.y; y < crect.p1.y; y++) {
-                        for (x = crect.p0.x; x < crect.p1.x; x++) {
+                for (y = drect.p0.y; y < drect.p1.y; y++) {
+                        for (x = drect.p0.x; x < drect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -441 +390 @@
         } else {
                 /* Color key & colorization */
-                for (y = crect.p0.y; y < crect.p1.y; y++) {
-                        for (x = crect.p0.x; x < crect.p1.x; x++) {
+                for (y = drect.p0.y; y < drect.p1.y; y++) {
+                        for (x = drect.p0.x; x < drect.p1.x; x++) {
                                 pixel = pixelmap_get_pixel(&smap,
                                     x - mbm->rect.p0.x - offs.x,
@@ -453 +402 @@
         }
 
-        mem_gc_invalidate_rect(mbm->mgc, &crect);
+        mem_gc_invalidate_rect(mbm->mgc, &drect);
         return EOK;
 }
@@ -470 +419 @@
 }
 
-/** Get cursor position on memory GC.
- *
- * @param arg Memory GC
- * @param pos Place to store position
- *
- * @return EOK on success or an error code
- */
-static errno_t mem_gc_cursor_get_pos(void *arg, gfx_coord2_t *pos)
-{
-        mem_gc_t *mgc = (mem_gc_t *) arg;
-
-        if (mgc->cb->cursor_get_pos != NULL)
-                return mgc->cb->cursor_get_pos(mgc->cb_arg, pos);
-        else
-                return ENOTSUP;
-}
-
-/** Set cursor position on memory GC.
- *
- * @param arg Memory GC
- * @param pos New position
- *
- * @return EOK on success or an error code
- */
-static errno_t mem_gc_cursor_set_pos(void *arg, gfx_coord2_t *pos)
-{
-        mem_gc_t *mgc = (mem_gc_t *) arg;
-
-        if (mgc->cb->cursor_set_pos != NULL)
-                return mgc->cb->cursor_set_pos(mgc->cb_arg, pos);
-        else
-                return ENOTSUP;
-}
-
-/** Set cursor visibility on memory GC.
- *
- * @param arg Memory GC
- * @param visible @c true iff cursor should be made visible
- *
- * @return EOK on success or an error code
- */
-static errno_t mem_gc_cursor_set_visible(void *arg, bool visible)
-{
-        mem_gc_t *mgc = (mem_gc_t *) arg;
-
-        if (mgc->cb->cursor_set_visible != NULL)
-                return mgc->cb->cursor_set_visible(mgc->cb_arg, visible);
-        else
-                return ENOTSUP;
-}
-
 /** @}
  */