Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / wayland / xwayland
Commits: 278b48ac by Olivier Fourdan at 2022-02-11T11:02:59+01:00 xwayland: Fix cursor color When using colored X11 cursors, the colors would appear wrong, yellow would show white, green would show as cyan, and blue would show black whereas red would show fine. This is because the code expanding the cursor data accounts for green for both green and blue channels. Funnily this bug has been there from the beginning. Fix the issue by correctly account for the color channels. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1303 Signed-off-by: Olivier Fourdan <[email protected]> Reviewed-by: Simon Ser <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> (cherry picked from commit 6ad6517a796cb4536d368091b647423981ad1217) - - - - - ef746ca9 by Olivier Fourdan at 2022-02-16T11:18:43+01:00 Bump version to 22.1.0 Xwayland 22.1.0 final release Signed-off-by: Olivier Fourdan <[email protected]> - - - - - 2 changed files: - hw/xwayland/xwayland-cursor.c - meson.build Changes: ===================================== hw/xwayland/xwayland-cursor.c ===================================== @@ -54,9 +54,11 @@ expand_source_and_mask(CursorPtr cursor, CARD32 *data) p = data; fg = ((cursor->foreRed & 0xff00) << 8) | - (cursor->foreGreen & 0xff00) | (cursor->foreGreen >> 8); + (cursor->foreGreen & 0xff00) | + (cursor->foreBlue >> 8); bg = ((cursor->backRed & 0xff00) << 8) | - (cursor->backGreen & 0xff00) | (cursor->backGreen >> 8); + (cursor->backGreen & 0xff00) | + (cursor->backBlue >> 8); stride = BitmapBytePad(bits->width); for (y = 0; y < bits->height; y++) for (x = 0; x < bits->width; x++) { ===================================== meson.build ===================================== @@ -3,7 +3,7 @@ project('xwayland', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '22.0.99.902', + version: '22.1.0', meson_version: '>= 0.47.0', ) release_date = '2021-07-05' View it on GitLab: https://salsa.debian.org/xorg-team/wayland/xwayland/-/compare/c155a4903553129af44e4b5f9cf5f7db1d7b863e...ef746ca96bc28d73b08f39a0cb766e5b63ebf2d1 -- View it on GitLab: https://salsa.debian.org/xorg-team/wayland/xwayland/-/compare/c155a4903553129af44e4b5f9cf5f7db1d7b863e...ef746ca96bc28d73b08f39a0cb766e5b63ebf2d1 You're receiving this email because of your account on salsa.debian.org.
