frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spelling of Xwayland 

There were just 3 outliers, let's try to prevent them from spreading.
This commit is contained in:
Michel Dänzer 2021-12-14 18:33:55 +01:00 committed by Michel Dänzer
parent 32e89ebaa9
commit cbe15842f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwayland/xwayland-screen.c
View File

@ -517,13 +517,13 @@ xwl_dispatch_events (struct xwl_screen *xwl_screen)
pollout: pollout:
ready = xwl_display_pollout(xwl_screen, 5); ready = xwl_display_pollout(xwl_screen, 5);
if (ready == -1 && errno != EINTR) if (ready == -1 && errno != EINTR)
xwl_give_up("error polling on XWayland fd: %s\n", strerror(errno)); xwl_give_up("error polling on Xwayland fd: %s\n", strerror(errno));
if (ready > 0) if (ready > 0)
ret = wl_display_flush(xwl_screen->display); ret = wl_display_flush(xwl_screen->display);
if (ret == -1 && errno != EAGAIN) if (ret == -1 && errno != EAGAIN)
xwl_give_up("failed to write to XWayland fd: %s\n", strerror(errno)); xwl_give_up("failed to write to Xwayland fd: %s\n", strerror(errno));
xwl_screen->wait_flush = (ready == 0 || ready == -1 || ret == -1); xwl_screen->wait_flush = (ready == 0 || ready == -1 || ret == -1);
} }

2
meson_options.txt
View File

@ -3,7 +3,7 @@ option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
option('xephyr', type: 'boolean', value: false, option('xephyr', type: 'boolean', value: false,
description: 'Enable Xephyr nested X server') description: 'Enable Xephyr nested X server')
option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable XWayland X server') description: 'Enable Xwayland X server')
option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable glamor (default yes for Xorg/Xwayland builds)') description: 'Enable glamor (default yes for Xorg/Xwayland builds)')
option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'], option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'],