Changeset 7e38970d in mainline for uspace/lib/display

Timestamp:

2020-12-07T00:08:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

Location:

uspace/lib/display

Files:

• include/types/display.h (modified) (2 diffs)
• include/types/display/wndparams.h (modified) (1 diff)
• private/display.h (added)
• src/display.c (modified) (3 diffs)
• test/display.c (modified) (2 diffs)

uspace/lib/display/include/types/display.h

@@ -46 +46 @@
 #define DISPLAY_DEFAULT NULL
 
+struct display;
+struct display_window;
+
 /** Display server session */
-typedef struct {
-        /** Session with display server */
-        async_sess_t *sess;
-        /** Synchronize access to display object */
-        fibril_mutex_t lock;
-        /** @c true if callback handler terminated */
-        bool cb_done;
-        /** Signalled when cb_done or ev_pending is changed */
-        fibril_condvar_t cv;
-        /** Windows (of display_window_t) */
-        list_t windows;
-} display_t;
+typedef struct display display_t;
+
+/** Display window */
+typedef struct display_window display_window_t;
 
 /** Display window callbacks */
@@ -76 +71 @@
 } display_wnd_cb_t;
 
-/** Display window */
-typedef struct {
-        /** Display associated with the window */
-        display_t *display;
-        /** Link to @c display->windows */
-        link_t lwindows;
-        /** Window ID */
-        sysarg_t id;
-        /** Callback functions */
-        display_wnd_cb_t *cb;
-        /** Argument to callback functions */
-        void *cb_arg;
-} display_window_t;
-
 #endif
 

uspace/lib/display/include/types/display/wndparams.h

@@ -41 +41 @@
  *
  * The window's dimensions are determined by the bounding rectangle,
- * the position of which does not relate to its positon on the display,
+ * the position of which does not relate to its position on the display,
  * it just determines which range of logical coordinates is used
  * by the window.

uspace/lib/display/src/display.c

@@ -38 +38 @@
 #include <mem.h>
 #include <stdlib.h>
+#include "../private/display.h"
 #include "../private/params.h"
 
@@ -198 +199 @@
 /** 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 +207 @@
         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

@@ -38 +38 @@
 #include <loc.h>
 #include <pcut/pcut.h>
+#include "../private/display.h"
 
 PCUT_INIT;
@@ -331 +332 @@
 }
 
+/** 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)