Changes in uspace/lib/ui/src/dummygc.c [1fa6292:f7a90df] in mainline

File:

• uspace/lib/ui/src/dummygc.c (modified) (7 diffs)

uspace/lib/ui/src/dummygc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include "../private/dummygc.h"
 
-static errno_t dummygc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t dummygc_set_color(void *, gfx_color_t *);
 static errno_t dummygc_fill_rect(void *, gfx_rect_t *);
-static errno_t dummygc_update(void *);
 static errno_t dummygc_bitmap_create(void *, gfx_bitmap_params_t *,
     gfx_bitmap_alloc_t *, void **);
@@ -53 +51 @@
 /** Dummy GC operations */
 gfx_context_ops_t dummygc_ops = {
-        .set_clip_rect = dummygc_set_clip_rect,
         .set_color = dummygc_set_color,
         .fill_rect = dummygc_fill_rect,
-        .update = dummygc_update,
         .bitmap_create = dummygc_bitmap_create,
         .bitmap_destroy = dummygc_bitmap_destroy,
@@ -109 +105 @@
 }
 
-/** Set clipping rectangle on dummy GC
+/** Set color on dummy GC
+ *
+ * @param arg Argument (dummy_gc_t)
+ * @param color Color
+ * @return EOK on success or an error code
+ */
+static errno_t dummygc_set_color(void *arg, gfx_color_t *color)
+{
+        (void) arg;
+        (void) color;
+        return EOK;
+}
+
+/** Fill rectangle on dummy GC
  *
  * @param arg Argument (dummy_gc_t)
@@ -115 +124 @@
  * @return EOK on success or an error code
  */
-static errno_t dummygc_set_clip_rect(void *arg, gfx_rect_t *rect)
+static errno_t dummygc_fill_rect(void *arg, gfx_rect_t *rect)
 {
         (void) arg;
         (void) rect;
-        return EOK;
-}
-
-/** Set color on dummy GC
- *
- * @param arg Argument (dummy_gc_t)
- * @param color Color
- * @return EOK on success or an error code
- */
-static errno_t dummygc_set_color(void *arg, gfx_color_t *color)
-{
-        (void) arg;
-        (void) color;
-        return EOK;
-}
-
-/** Fill rectangle on dummy GC
- *
- * @param arg Argument (dummy_gc_t)
- * @param rect Rectangle
- * @return EOK on success or an error code
- */
-static errno_t dummygc_fill_rect(void *arg, gfx_rect_t *rect)
-{
-        (void) arg;
-        (void) rect;
-        return EOK;
-}
-
-/** Update dummy GC
- *
- * @param arg Argument (dummy_gc_t)
- * @return EOK on success or an error code
- */
-static errno_t dummygc_update(void *arg)
-{
-        (void) arg;
         return EOK;
 }
@@ -181 +153 @@
                     sizeof(uint32_t);
                 tbm->alloc.off0 = 0;
-                tbm->alloc.pixels = calloc(
+                tbm->alloc.pixels = calloc(sizeof(uint32_t),
                     (params->rect.p1.x - params->rect.p0.x) *
-                    (params->rect.p1.y - params->rect.p0.y),
-                    sizeof(uint32_t));
+                    (params->rect.p1.y - params->rect.p0.y));
                 tbm->myalloc = true;
                 if (tbm->alloc.pixels == NULL) {
@@ -228 +199 @@
 {
         dummygc_bitmap_t *tbm = (dummygc_bitmap_t *)bm;
-
         tbm->dgc->bm_rendered = true;
-
-        tbm->dgc->bm_srect.p0.x = 0;
-        tbm->dgc->bm_srect.p0.y = 0;
-        tbm->dgc->bm_srect.p1.x = 0;
-        tbm->dgc->bm_srect.p1.y = 0;
-
-        tbm->dgc->bm_offs.x = 0;
-        tbm->dgc->bm_offs.y = 0;
-
-        if (srect != NULL)
-                tbm->dgc->bm_srect = *srect;
-
-        if (offs != NULL)
-                tbm->dgc->bm_offs = *offs;
-
+        tbm->dgc->bm_srect = *srect;
+        tbm->dgc->bm_offs = *offs;
         return EOK;
 }