Changes in uspace/srv/hid/rfb/main.c [4c6fd56:0d62c10] in mainline

File:

• uspace/srv/hid/rfb/main.c (modified) (17 diffs)

uspace/srv/hid/rfb/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
@@ -51 +50 @@
 static errno_t rfb_ddev_get_info(void *, ddev_info_t *);
 
-static errno_t rfb_gc_set_clip_rect(void *, gfx_rect_t *);
 static errno_t rfb_gc_set_color(void *, gfx_color_t *);
 static errno_t rfb_gc_fill_rect(void *, gfx_rect_t *);
@@ -68 +66 @@
         rfb_t rfb;
         pixel_t color;
-        gfx_rect_t rect;
-        gfx_rect_t clip_rect;
 } rfb_gc_t;
 
@@ -82 +78 @@
 
 static gfx_context_ops_t rfb_gc_ops = {
-        .set_clip_rect = rfb_gc_set_clip_rect,
         .set_color = rfb_gc_set_color,
         .fill_rect = rfb_gc_fill_rect,
@@ -139 +134 @@
 }
 
-/** Create RFB GC.
- *
- * @param rrgb Place to store pointer to new RFB GC
- * @return EOK on success, ENOMEM if out of memory
- */
-static errno_t rgb_gc_create(rfb_gc_t **rrfb)
-{
-        rfb_gc_t *rfb;
-
-        rfb = calloc(1, sizeof(rfb_gc_t));
-        if (rfb == NULL)
-                return ENOMEM;
-
-        *rrfb = rfb;
-        return EOK;
-}
-
-/** Destroy RFB GC.
- *
- * @param rfb RFB GC
- */
-static void rfb_gc_destroy(rfb_gc_t *rfb)
-{
-        free(rfb);
-}
-
-/** Set clipping rectangle on RFB.
- *
- * @param arg RFB
- * @param rect Rectangle or @c NULL
- *
- * @return EOK on success or an error code
- */
-static errno_t rfb_gc_set_clip_rect(void *arg, gfx_rect_t *rect)
-{
-        rfb_gc_t *rfb = (rfb_gc_t *) arg;
-
-        if (rect != NULL)
-                gfx_rect_clip(rect, &rfb->rect, &rfb->clip_rect);
-        else
-                rfb->clip_rect = rfb->rect;
-
-        return EOK;
-}
-
 /** Set color on RFB.
  *
@@ -213 +163 @@
 {
         rfb_gc_t *rfb = (rfb_gc_t *) arg;
-        gfx_rect_t crect;
         gfx_coord_t x, y;
 
-        gfx_rect_clip(rect, &rfb->clip_rect, &crect);
-
-        for (y = crect.p0.y; y < crect.p1.y; y++) {
-                for (x = crect.p0.x; x < crect.p1.x; x++) {
+        // XXX We should handle p0.x > p1.x and p0.y > p1.y
+
+        for (y = rect->p0.y; y < rect->p1.y; y++) {
+                for (x = rect->p0.x; x < rect->p1.x; x++) {
                         pixelmap_put_pixel(&rfb->rfb.framebuffer, x, y,
                             rfb->color);
@@ -225 +174 @@
         }
 
-        rfb_gc_invalidate_rect(rfb, &crect);
+        rfb_gc_invalidate_rect(rfb, rect);
 
         return EOK;
@@ -309 +258 @@
         gfx_rect_t srect;
         gfx_rect_t drect;
-        gfx_rect_t crect;
         gfx_coord2_t offs;
         gfx_coord2_t bmdim;
@@ -331 +279 @@
         /* Destination rectangle */
         gfx_rect_translate(&offs, &srect, &drect);
-        gfx_rect_clip(&drect, &rfbbm->rfb->clip_rect, &crect);
-        gfx_coord2_subtract(&crect.p1, &crect.p0, &dim);
+        gfx_coord2_subtract(&drect.p1, &drect.p0, &dim);
         gfx_coord2_subtract(&rfbbm->rect.p1, &rfbbm->rect.p0, &bmdim);
 
@@ -373 +320 @@
         }
 
-        rfb_gc_invalidate_rect(rfbbm->rfb, &crect);
+        rfb_gc_invalidate_rect(rfbbm->rfb, &drect);
 
         return EOK;
@@ -399 +346 @@
 {
         rfb_t *rfb = (rfb_t *) arg;
-        rfb_gc_t *rfbgc;
         ddev_srv_t srv;
         sysarg_t svc_id;
@@ -416 +362 @@
                 ddev_conn(icall, &srv);
         } else {
-                rc = rgb_gc_create(&rfbgc);
+                rc = gfx_context_new(&rfb_gc_ops, (void *) rfb, &gc);
                 if (rc != EOK) {
                         async_answer_0(icall, ENOMEM);
@@ -422 +368 @@
                 }
 
-                rfbgc->rect.p0.x = 0;
-                rfbgc->rect.p0.y = 0;
-                rfbgc->rect.p1.x = rfb->width;
-                rfbgc->rect.p1.y = rfb->height;
-                rfbgc->clip_rect = rfbgc->rect;
-
-                rc = gfx_context_new(&rfb_gc_ops, (void *) rfbgc, &gc);
-                if (rc != EOK) {
-                        rfb_gc_destroy(rfbgc);
-                        async_answer_0(icall, ENOMEM);
-                        return;
-                }
-
                 /* GC connection */
                 gc_conn(icall, gc);
@@ -443 +376 @@
 {
         rfb_t rfb;
-        loc_srv_t *srv;
 
         log_init(NAME);
@@ -483 +415 @@
         async_set_fallback_port_handler(client_connection, &rfb);
 
-        errno_t rc = loc_server_register(NAME, &srv);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register server.\n", NAME);
@@ -498 +430 @@
         service_id_t service_id;
 
-        rc = loc_service_register(srv, service_name, &service_id);
+        rc = loc_service_register(service_name, &service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register service %s.\n", service_name);
@@ -513 +445 @@
         }
 
-        rc = loc_service_add_to_cat(srv, service_id, ddev_cid);
+        rc = loc_service_add_to_cat(service_id, ddev_cid);
         if (rc != EOK) {
                 fprintf(stderr, NAME ": Unable to add service to display device category.\n");