Changeset 265989d in mainline for uspace

Timestamp:

2020-02-24T17:03:26Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2a515dcd

Parents:

1388f7f0

Message:

Applications need to catch up with display server switch

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (2 diffs)
• app/terminal/main.c (modified) (1 diff)
• lib/display/include/types/display.h (modified) (1 diff)
• lib/meson.build (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -399 +399 @@
         printf("Init canvas..\n");
 
-        window = window_open("comp:0/winreg", NULL,
+        window = window_open(DISPLAY_DEFAULT, NULL,
             WINDOW_MAIN | WINDOW_DECORATED, "GFX Demo");
         if (window == NULL) {
@@ -462 +462 @@
         printf("Init display..\n");
 
-        rc = display_open(NULL, &display);
+        rc = display_open(DISPLAY_DEFAULT, &display);
         if (rc != EOK) {
                 printf("Error opening display.\n");

uspace/app/terminal/main.c

@@ -46 +46 @@
         errno_t rc;
 
-        rc = display_open(NULL, &display);
+        rc = display_open(DISPLAY_DEFAULT, &display);
         if (rc != EOK) {
                 printf("%s: Error opening display.\n", NAME);

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

@@ -40 +40 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <stddef.h>
 #include <stdint.h>
+
+/** Use the default display service (argument to display_open() */
+#define DISPLAY_DEFAULT NULL
 
 /** Display server session */

uspace/lib/meson.build

@@ -33 +33 @@
         'c',
         'math',
+        'display',
         'gui',
         'draw',