Changeset 0e6e77f in mainline for uspace/srv/hid/display/window.c

Timestamp:

2020-02-28T15:44:55Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a8eed5f

Parents:

2a515dcd

git-author:

Jiri Svoboda <jiri@…> (2020-02-26 18:26:13)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-28 15:44:55)

Message:

Window resize by client request

File:

• uspace/srv/hid/display/window.c (modified) (5 diffs)

uspace/srv/hid/display/window.c

@@ -264 +264 @@
         gfx_context_t *gc = NULL;
         gfx_context_t *dgc;
-        gfx_rect_t rect;
         gfx_coord2_t dims;
         gfx_bitmap_params_t bparams;
@@ -282 +281 @@
         ds_client_add_window(client, wnd);
         ds_display_add_window(client->display, wnd);
-
-        gfx_rect_points_sort(&params->rect, &rect);
-        gfx_coord2_subtract(&rect.p1, &rect.p0, &dims);
 
         bparams.rect = params->rect;
@@ -298 +294 @@
                         goto error;
 
+                gfx_rect_dims(&params->rect, &dims);
                 wnd->pixelmap.width = dims.x;
                 wnd->pixelmap.height = dims.y;
                 wnd->pixelmap.data = alloc.pixels;
-
-                if (wnd->pixelmap.data == NULL) {
-                        rc = ENOMEM;
-                        goto error;
-                }
         }
 
@@ -323 +315 @@
 }
 
-/** Delete window GC.
- *
- * @param wnd Window GC
+/** Destroy window.
+ *
+ * @param wnd Window
  */
 void ds_window_destroy(ds_window_t *wnd)
@@ -343 +335 @@
 
         (void) ds_display_paint(disp, NULL);
+}
+
+/** Resize window.
+ *
+ * @param wnd Window
+ */
+errno_t ds_window_resize(ds_window_t *wnd, gfx_coord2_t *offs,
+    gfx_rect_t *nrect)
+{
+        gfx_context_t *dgc;
+        gfx_bitmap_params_t bparams;
+        gfx_bitmap_t *nbitmap;
+        pixelmap_t npixelmap;
+        gfx_coord2_t dims;
+        gfx_bitmap_alloc_t alloc;
+        gfx_coord2_t ndpos;
+        errno_t rc;
+
+        dgc = ds_display_get_gc(wnd->display); // XXX
+        if (dgc != NULL) {
+                bparams.rect = *nrect;
+
+                rc = gfx_bitmap_create(dgc, &bparams, NULL, &nbitmap);
+                if (rc != EOK)
+                        return ENOMEM;
+
+                rc = gfx_bitmap_get_alloc(nbitmap, &alloc);
+                if (rc != EOK) {
+                        gfx_bitmap_destroy(nbitmap);
+                        return ENOMEM;
+                }
+
+                gfx_rect_dims(nrect, &dims);
+                npixelmap.width = dims.x;
+                npixelmap.height = dims.y;
+                npixelmap.data = alloc.pixels;
+
+                /* TODO: Transfer contents within overlap */
+
+                if (wnd->bitmap != NULL)
+                        gfx_bitmap_destroy(wnd->bitmap);
+
+                wnd->bitmap = nbitmap;
+                wnd->pixelmap = npixelmap;
+        }
+
+        gfx_coord2_add(&wnd->dpos, offs, &ndpos);
+
+        wnd->dpos = ndpos;
+        wnd->rect = *nrect;
+
+        (void) ds_display_paint(wnd->display, NULL);
+        return EOK;
 }