Changeset 159776f in mainline

Timestamp:

2019-10-10T10:17:17Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78a71936

Parents:

bef51cf

git-author:

Jiri Svoboda <jiri@…> (2019-10-09 17:07:14)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-10 10:17:17)

Message:

Provisional display server output via canvas/guigfx

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (3 diffs)
• display.h (modified) (3 diffs)
• main.c (modified) (4 diffs)
• meson.build (modified) (1 diff)
• output.c (added)
• output.h (added)
• test/display.c (modified) (2 diffs)
• test/window.c (modified) (1 diff)
• types/display/display.h (modified) (2 diffs)
• window.c (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -36 +36 @@
 #include <disp_srv.h>
 #include <errno.h>
+#include <gfx/context.h>
 #include <io/log.h>
 #include <stdlib.h>
@@ -85 +86 @@
 /** Create display.
  *
+ * @param gc Graphics context for displaying output
  * @param rdisp Place to store pointer to new display.
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ds_display_create(ds_display_t **rdisp)
+errno_t ds_display_create(gfx_context_t *gc, ds_display_t **rdisp)
 {
         ds_display_t *disp;
@@ -98 +100 @@
         list_initialize(&disp->windows);
         disp->next_wnd_id = 1;
+        disp->gc = gc;
         *rdisp = disp;
         return EOK;

uspace/srv/hid/display/display.h

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup display
  * @{
  */
@@ -40 +40 @@
 #include <disp_srv.h>
 #include <errno.h>
+#include <gfx/context.h>
 #include "types/display/display.h"
 #include "types/display/window.h"
@@ -45 +46 @@
 extern display_ops_t display_srv_ops;
 
-extern errno_t ds_display_create(ds_display_t **);
+extern errno_t ds_display_create(gfx_context_t *, ds_display_t **);
 extern void ds_display_destroy(ds_display_t *);
 extern errno_t ds_display_add_window(ds_display_t *, ds_window_t *);

uspace/srv/hid/display/main.c

@@ -7 +7 @@
  * are met:
  *
- * - Redistributions of source code must retain the above copyright
+ * - Redistribution1s of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
@@ -46 +46 @@
 #include <task.h>
 #include "display.h"
+#include "output.h"
 #include "window.h"
 
@@ -56 +57 @@
 {
         ds_display_t *disp = NULL;
+        gfx_context_t *gc = NULL;
         errno_t rc;
 
-        rc = ds_display_create(&disp);
+        rc = output_init(&gc);
+        if (rc != EOK)
+                goto error;
+
+        rc = ds_display_create(gc, &disp);
         if (rc != EOK)
                 goto error;
@@ -82 +88 @@
         return EOK;
 error:
+        if (gc != NULL)
+                gfx_context_delete(gc);
         if (disp != NULL)
                 ds_display_destroy(disp);

uspace/srv/hid/display/meson.build

@@ -32 +32 @@
         'display.c',
         'main.c',
+        'output.c',
         'window.c',
 )

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

@@ -45 +45 @@
         errno_t rc;
 
-        rc = ds_display_create(&disp);
+        rc = ds_display_create(NULL, &disp);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -59 +59 @@
         errno_t rc;
 
-        rc = ds_display_create(&disp);
+        rc = ds_display_create(NULL, &disp);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

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

@@ -47 +47 @@
         errno_t rc;
 
-        rc = ds_display_create(&disp);
+        rc = ds_display_create(NULL, &disp);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

uspace/srv/hid/display/types/display/display.h

@@ -38 +38 @@
 
 #include <adt/list.h>
+#include <gfx/context.h>
 #include "window.h"
 
@@ -45 +46 @@
         /** Next ID to assign to a window */
         ds_wnd_id_t next_wnd_id;
+        /** Output GC */
+        gfx_context_t *gc;
 } ds_display_t;
 

uspace/srv/hid/display/window.c

@@ -65 +65 @@
         ds_window_t *wnd = (ds_window_t *) arg;
 
-        (void) wnd;
         log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color");
-        return EOK;
+        return gfx_set_color(wnd->display->gc, color);
 }
 
@@ -81 +80 @@
         ds_window_t *wnd = (ds_window_t *) arg;
 
-        (void) wnd;
         log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect");
-        return EOK;
+        return gfx_fill_rect(wnd->display->gc, rect);
 }