Changeset 3434233 in mainline for uspace/srv/hid/display/test/display.c

Timestamp:

2019-12-16T10:14:12Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

65160d7

Parents:

fdc8e40

git-author:

Jiri Svoboda <jiri@…> (2019-12-15 10:13:47)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-16 10:14:12)

Message:

Store dimensions in display server window structure

File:

• uspace/srv/hid/display/test/display.c (modified) (11 diffs)

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

@@ -27 +27 @@
  */
 
+#include <disp_srv.h>
 #include <errno.h>
 #include <pcut/pcut.h>
@@ -99 +100 @@
         ds_window_t *w1;
         ds_window_t *wnd;
+        display_wnd_params_t params;
         errno_t rc;
 
@@ -107 +109 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_window_create(client, &w1);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_window_create(client, &w0);
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &w1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w0);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -148 +154 @@
         ds_window_t *w1;
         ds_window_t *wnd;
+        display_wnd_params_t params;
         gfx_coord2_t pos;
         errno_t rc;
@@ -157 +164 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_window_create(client, &w0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_window_create(client, &w1);
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 100;
+
+        rc = ds_window_create(client, &params, &w0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w1);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -217 +228 @@
         ds_client_t *client;
         ds_window_t *wnd;
+        display_wnd_params_t params;
         kbd_event_t event;
         bool called_cb = false;
@@ -230 +242 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_window_create(client, &wnd);
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -260 +276 @@
         ds_client_t *client;
         ds_window_t *w0, *w1;
+        display_wnd_params_t params;
         kbd_event_t event;
         bool called_cb = false;
@@ -273 +290 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_window_create(client, &w0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_window_create(client, &w1);
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &w0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w1);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -317 +338 @@
         ds_client_t *client;
         ds_window_t *w0, *w1;
+        display_wnd_params_t params;
         ptd_event_t event;
         bool called_cb = false;
@@ -330 +352 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_window_create(client, &w0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ds_window_create(client, &w1);
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &w0);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &params, &w1);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);