Changeset 265989d in mainline


Ignore:
Timestamp:
2020-02-24T17:03:26Z (5 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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • tools/export.sh

    r1388f7f0 r265989d  
    4141        uspace/lib/libmath.a \
    4242        uspace/lib/libclui.a \
     43        uspace/lib/libdisplay.a \
     44        uspace/lib/libgfx.a \
    4345        uspace/lib/libgui.a \
     46        uspace/lib/libipcgfx.a \
    4447        uspace/lib/libdraw.a \
    4548        uspace/lib/libsoftrend.a \

  • tools/xcw/bin/helenos-pkg-config

    r1388f7f0 r265989d  
    4444libmath_libs="$LIB_DIR/libmath.a"
    4545
    46 libgui_cflags="-I$INCLUDE_DIR/libgui"
    47 libgui_libs="$LIB_DIR/libgui.a"
     46libgui_cflags="-I$INCLUDE_DIR/libgui -I$INCLUDE_DIR/libdisplay -I$INCLUDE_DIR/libgfx -I$INCLUDE_DIR/libipcgfx"
     47libgui_libs="$LIB_DIR/libgui.a $LIB_DIR/libdisplay.a $LIB_DIR/libipcgfx.a $LIB_DIR/libgfx.a"
    4848
    4949libdraw_cflags="-I$INCLUDE_DIR/libdraw"

  • uspace/app/gfxdemo/gfxdemo.c

    r1388f7f0 r265989d  
    399399        printf("Init canvas..\n");
    400400
    401         window = window_open("comp:0/winreg", NULL,
     401        window = window_open(DISPLAY_DEFAULT, NULL,
    402402            WINDOW_MAIN | WINDOW_DECORATED, "GFX Demo");
    403403        if (window == NULL) {
    … …  
    462462        printf("Init display..\n");
    463463
    464         rc = display_open(NULL, &display);
     464        rc = display_open(DISPLAY_DEFAULT, &display);
    465465        if (rc != EOK) {
    466466                printf("Error opening display.\n");

  • uspace/app/terminal/main.c

    r1388f7f0 r265989d  
    4646        errno_t rc;
    4747
    48         rc = display_open(NULL, &display);
     48        rc = display_open(DISPLAY_DEFAULT, &display);
    4949        if (rc != EOK) {
    5050                printf("%s: Error opening display.\n", NAME);

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

    r1388f7f0 r265989d  
    4040#include <io/kbd_event.h>
    4141#include <io/pos_event.h>
     42#include <stddef.h>
    4243#include <stdint.h>
     44
     45/** Use the default display service (argument to display_open() */
     46#define DISPLAY_DEFAULT NULL
    4347
    4448/** Display server session */

  • uspace/lib/meson.build

    r1388f7f0 r265989d  
    3333        'c',
    3434        'math',
     35        'display',
    3536        'gui',
    3637        'draw',
Note: See TracChangeset for help on using the changeset viewer.