Changeset f7a90df in mainline

Timestamp:

2020-10-25T19:20:57Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d284ce9

Parents:

5a43bd0

Message:

Prototype UI and window classes

It is difficult to do any useful testing on ui_window without a real
display_t. Without display, there is no window, without window no GC,
without GC no UI resource.

As a compromise, in case of unit test, create UI with display == NULL,
in which case create window with NULL dwindow and a dummy GC
(so we have valid UI resource).

Location:

uspace/lib

Files:

• display/src/display.c (modified) (2 diffs)
• display/test/display.c (modified) (1 diff)
• ui/include/types/ui/ui.h (added)
• ui/include/types/ui/window.h (added)
• ui/include/ui/ui.h (added)
• ui/include/ui/window.h (added)
• ui/meson.build (modified) (2 diffs)
• ui/private/dummygc.h (added)
• ui/private/ui.h (added)
• ui/private/window.h (added)
• ui/src/dummygc.c (added)
• ui/src/ui.c (added)
• ui/src/window.c (added)
• ui/test/main.c (modified) (1 diff)
• ui/test/ui.c (added)
• ui/test/window.c (added)

uspace/lib/display/src/display.c

@@ -198 +198 @@
 /** Destroy display window.
  *
- * @param window Window
+ * @param window Window or @c NULL
  * @return EOK on success or an error code. In both cases @a window must
  *         not be accessed anymore
@@ -206 +206 @@
         async_exch_t *exch;
         errno_t rc;
+
+        if (window == NULL)
+                return EOK;
 
         exch = async_exchange_begin(window->display->sess);

uspace/lib/display/test/display.c

@@ -331 +331 @@
 }
 
+/** display_window_destroy() can handle NULL argument */
+PCUT_TEST(window_destroy_null)
+{
+        display_window_destroy(NULL);
+}
+
 /** display_window_move_req() with server returning error response works. */
 PCUT_TEST(window_move_req_failure)

uspace/lib/ui/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gfx', 'gfxfont' ]
+deps = [ 'gfx', 'gfxfont', 'display' ]
 src = files(
+        'src/dummygc.c',
         'src/label.c',
         'src/paint.c',
         'src/pbutton.c',
         'src/resource.c',
-        'src/wdecor.c'
+        'src/ui.c',
+        'src/wdecor.c',
+        'src/window.c',
 )
 
@@ -42 +45 @@
         'test/pbutton.c',
         'test/resource.c',
+        'test/ui.c',
         'test/wdecor.c',
+        'test/window.c',
 )

uspace/lib/ui/test/main.c

@@ -35 +35 @@
 PCUT_IMPORT(pbutton);
 PCUT_IMPORT(resource);
+PCUT_IMPORT(ui);
 PCUT_IMPORT(wdecor);
+PCUT_IMPORT(window);
 
 PCUT_MAIN();