Changeset 0e6e77f in mainline for uspace/srv

Timestamp:

2020-02-28T15:44:55Z (6 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

Location:

uspace/srv/hid/display

Files:

• dsops.c (modified) (4 diffs)
• test/display.c (modified) (4 diffs)
• test/window.c (modified) (1 diff)
• window.c (modified) (5 diffs)
• window.h (modified) (1 diff)

uspace/srv/hid/display/dsops.c

@@ -36 +36 @@
 #include <disp_srv.h>
 #include <errno.h>
+#include <gfx/coord.h>
 #include <io/log.h>
 #include "client.h"
@@ -45 +46 @@
 static errno_t disp_window_create(void *, display_wnd_params_t *, sysarg_t *);
 static errno_t disp_window_destroy(void *, sysarg_t);
+static errno_t disp_window_resize(void *, sysarg_t, gfx_coord2_t *,
+    gfx_rect_t *);
 static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *);
 
@@ -50 +53 @@
         .window_create = disp_window_create,
         .window_destroy = disp_window_destroy,
+        .window_resize = disp_window_resize,
         .get_event = disp_get_event
 };
@@ -98 +102 @@
 }
 
+static errno_t disp_window_resize(void *arg, sysarg_t wnd_id,
+    gfx_coord2_t *offs, gfx_rect_t *nbound)
+{
+        ds_client_t *client = (ds_client_t *) arg;
+        ds_window_t *wnd;
+
+        wnd = ds_client_find_window(client, wnd_id);
+        if (wnd == NULL)
+                return ENOENT;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "disp_window_resize()");
+        return ds_window_resize(wnd, offs, nbound);
+}
+
 static errno_t disp_get_event(void *arg, sysarg_t *wnd_id,
     display_wnd_ev_t *event)

uspace/srv/hid/display/test/display.c

@@ -53 +53 @@
         printf("test_ds_ev_pending\n");
         *called_cb = true;
-
 }
 
@@ -265 +264 @@
         event.c = L'\0';
 
-        PCUT_ASSERT_FALSE(called_cb);
+        called_cb = false;
 
         rc = ds_display_post_kbd_event(disp, &event);
@@ -316 +315 @@
         event.c = L'\0';
 
-        PCUT_ASSERT_FALSE(called_cb);
+        called_cb = false;
 
         rc = ds_display_post_kbd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
+
+        /* Got gocus/unfocus events */
+        PCUT_ASSERT_TRUE(called_cb);
 
         /* Next window should be focused */
         PCUT_ASSERT_EQUALS(w1, seat->focus);
 
+        called_cb = false;
+
         rc = ds_display_post_kbd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
+
+        /* Got gocus/unfocus events */
+        PCUT_ASSERT_TRUE(called_cb);
 
         /* Focus should be back to the first window */
@@ -361 +366 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        /*
+         * For PTD_MOVE to work we need to set display dimensions (as pointer
+         * move is clipped to the display rectangle. Here we do it directly
+         * instead of adding a display device.
+         */
+        disp->rect.p0.x = 0;
+        disp->rect.p0.y = 0;
+        disp->rect.p1.x = 500;
+        disp->rect.p1.y = 500;
+
         display_wnd_params_init(&params);
         params.rect.p0.x = params.rect.p0.y = 0;

uspace/srv/hid/display/test/window.c

@@ -49 +49 @@
         .fill_rect = dummy_fill_rect
 };
+
+/** Test ds_window_resize(). */
+PCUT_TEST(window_resize)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        gfx_coord2_t offs;
+        gfx_rect_t nrect;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 10;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        wnd->dpos.x = 100;
+        wnd->dpos.y = 100;
+
+        offs.x = -2;
+        offs.y = -3;
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = 12;
+        params.rect.p1.y = 13;
+        rc = ds_window_resize(wnd, &offs, &nrect);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(98, wnd->dpos.x);
+        PCUT_ASSERT_INT_EQUALS(97, wnd->dpos.y);
+
+        ds_window_destroy(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
 
 /** Test ds_window_get_ctx(). */

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;
 }
 

uspace/srv/hid/display/window.h

@@ -51 +51 @@
     ds_window_t **);
 extern void ds_window_destroy(ds_window_t *);
+extern errno_t ds_window_resize(ds_window_t *, gfx_coord2_t *, gfx_rect_t *);
 extern gfx_context_t *ds_window_get_ctx(ds_window_t *);
 extern errno_t ds_window_paint(ds_window_t *, gfx_rect_t *);