Changeset c8cf261 in mainline

Timestamp:

2019-10-03T09:10:01Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6af4b4f

Parents:

aac5069

git-author:

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

git-committer:

Jiri Svoboda <jiri@…> (2019-10-03 09:10:01)

Message:

Display server scaffolding

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• uspace/app/gfxdemo/gfxdemo.c (modified) (8 diffs)
• uspace/app/gfxdemo/meson.build (modified) (1 diff)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/lib/display/doc/doxygroups.h (added)
• uspace/lib/display/include/disp_srv.h (added)
• uspace/lib/display/include/display.h (added)
• uspace/lib/display/include/ipc/display.h (added)
• uspace/lib/display/include/types/display.h (added)
• uspace/lib/display/meson.build (added)
• uspace/lib/display/src/disp_srv.c (added)
• uspace/lib/display/src/display.c (added)
• uspace/lib/ipcgfx/include/ipcgfx/server.h (modified) (1 diff)
• uspace/lib/ipcgfx/src/client.c (modified) (3 diffs)
• uspace/lib/ipcgfx/src/server.c (modified) (4 diffs)
• uspace/lib/meson.build (modified) (1 diff)
• uspace/srv/hid/display/display.c (added)
• uspace/srv/hid/display/display.h (added)
• uspace/srv/hid/display/doc/doxygroups.h (added)
• uspace/srv/hid/display/main.c (added)
• uspace/srv/hid/display/meson.build (added)
• uspace/srv/hid/display/types/wingc.h (added)
• uspace/srv/hid/display/wingc.c (added)
• uspace/srv/hid/display/wingc.h (added)
• uspace/srv/meson.build (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -187 +187 @@
             FOURCC_COMPACT('i', 'p', 'c', 't') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_PCI =
-            FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE
+            FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_DISPLAY =
+            FOURCC_COMPACT('d', 's', 'p', 'l') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_GC =
+            FOURCC_COMPACT('g', 'f', 'x', 'c') | IFACE_EXCHANGE_SERIALIZE,
 } iface_t;
 

uspace/app/gfxdemo/gfxdemo.c

@@ -36 +36 @@
 #include <congfx/console.h>
 #include <draw/surface.h>
+#include <display.h>
 #include <fibril.h>
 #include <guigfx/canvas.h>
@@ -117 +118 @@
 static errno_t demo_canvas(void)
 {
-        console_ctrl_t *con = NULL;
         canvas_gc_t *cgc = NULL;
         gfx_context_t *gc;
@@ -128 +128 @@
 
         printf("Init canvas..\n");
-        con = console_init(stdin, stdout);
-        if (con == NULL)
-                return EIO;
 
         window = window_open("comp:0/winreg", NULL,
@@ -145 +142 @@
         if (pixbuf == NULL) {
                 printf("Error allocating memory for pixel buffer.\n");
-                return -1;
+                return ENOMEM;
         }
 
@@ -151 +148 @@
         if (surface == NULL) {
                 printf("Error creating surface.\n");
-                return -1;
+                return EIO;
         }
 
@@ -158 +155 @@
         if (canvas == NULL) {
                 printf("Error creating canvas.\n");
-                return -1;
+                return EIO;
         }
 
@@ -182 +179 @@
 }
 
+/** Run demo on display server. */
+static errno_t demo_display(void)
+{
+        display_t *display = NULL;
+        gfx_context_t *gc;
+        display_window_t *window = NULL;
+        errno_t rc;
+
+        printf("Init display..\n");
+
+        rc = display_open(NULL, &display);
+        if (rc != EOK) {
+                printf("Error opening display.\n");
+                return rc;
+        }
+
+        rc = display_window_create(display, &window);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                return rc;
+        }
+
+        rc = display_window_get_gc(window, &gc);
+        if (rc != EOK) {
+                printf("Error getting graphics context.\n");
+        }
+
+        rc = demo_rects(gc, 400, 300);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_context_delete(gc);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
-        printf("syntax: gfxdemo {canvas|console}\n");
+        printf("syntax: gfxdemo {canvas|console|display}\n");
 }
 
@@ -202 +237 @@
         } else if (str_cmp(argv[1], "canvas") == 0) {
                 rc = demo_canvas();
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "display") == 0) {
+                rc = demo_display();
                 if (rc != EOK)
                         return 1;

uspace/app/gfxdemo/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gfx', 'guigfx', 'congfx', 'ipcgfx' ]
+deps = [ 'gfx', 'guigfx', 'congfx', 'ipcgfx', 'display' ]
 src = files(
         'gfxdemo.c',

uspace/lib/c/include/ipc/services.h

@@ -54 +54 @@
 #define SERVICE_NAME_CLIPBOARD "clipboard"
 #define SERVICE_NAME_CORECFG  "corecfg"
+#define SERVICE_NAME_DISPLAY  "hid/display"
 #define SERVICE_NAME_DHCP     "net/dhcp"
 #define SERVICE_NAME_DNSR     "net/dnsr"

uspace/lib/ipcgfx/include/ipcgfx/server.h

@@ -41 +41 @@
 #include <gfx/context.h>
 
-extern errno_t gc_conn(ipc_call_t *icall, gfx_context_t *gc)
+extern errno_t gc_conn(ipc_call_t *icall, gfx_context_t *gc);
 
 #endif

uspace/lib/ipcgfx/src/client.c

@@ -51 +51 @@
 };
 
+#include <stdio.h>
+
 /** Set color on IPC GC.
  *
@@ -67 +69 @@
         errno_t rc;
 
+        printf("ipc_gc_set_color\n");
         gfx_color_get_rgb_i16(color, &r, &g, &b);
 
@@ -89 +92 @@
         errno_t rc;
 
+        printf("ipc_gc_fill_rect\n");
         exch = async_exchange_begin(ipcgc->sess);
         rc = async_req_4_0(exch, GC_FILL_RECT, rect->p0.x, rect->p0.y,

uspace/lib/ipcgfx/src/server.c

@@ -44 +44 @@
 #include <stdint.h>
 
+#include <stdio.h>
+
 #include <bd_srv.h>
 
@@ -64 +66 @@
         rc = gfx_set_color(gc, color);
         async_answer_0(call, rc);
+        printf("done with rgb_color_srv\n");
 }
 
@@ -85 +88 @@
         async_accept_0(icall);
 
+        printf("gc_conn: accepted connection\n");
+
         while (true) {
                 ipc_call_t call;
@@ -98 +103 @@
                 switch (method) {
                 case GC_SET_RGB_COLOR:
+                        printf("gc_conn: set_rgb_color\n");
                         gc_set_rgb_color_srv(gc, &call);
+                        printf("gc_conn: done set_rgb_color\n");
                         break;
                 case GC_FILL_RECT:
+                        printf("gc_conn: fill_rect_srv\n");
                         gc_fill_rect_srv(gc, &call);
+                        printf("gc_conn: done fill_rect_srv\n");
                         break;
                 default:
+                        printf("gc_conn: answer einval\n");
                         async_answer_0(&call, EINVAL);
+                        printf("gc_conn: done answer einval\n");
                 }
         }

uspace/lib/meson.build

@@ -86 +86 @@
         'guigfx',
         'ieee80211',
-        'ipcgfx'
+        'ipcgfx',
+
+        'display'
 ]
 

uspace/srv/meson.build

@@ -45 +45 @@
         'hid/compositor',
         'hid/console',
+        'hid/display',
         'hid/input',
         'hid/isdv4_tablet',