diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 74bf855..a38fb21 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -113,7 +113,7 @@ jobs: - name: Download Dependencies run: | sudo apt update -qq - sudo apt install gettext -qq + sudo apt install gettext imagemagick -qq - name: Build Burn-My-Windows run: make - name: Test Burn-My-Windows diff --git a/tests/find-target.sh b/tests/find-target.sh new file mode 100755 index 0000000..b371acc --- /dev/null +++ b/tests/find-target.sh @@ -0,0 +1,124 @@ +#!/bin/bash + +# -------------------------------------------------------------------------------------- # +# This script searches for a given image on the screen and prints the coordinates of the # +# upper left corner to STDOUT if it's found. If the image is not found, an exit code # +# of 1 is returned. # +# # +# -s scale_factor: In order to optimize the performance, both, the target image and the # +# screen capture is scaled down by 1 / scale_factor. Lower numbers can # +# help finding difficult targets but will also increase the calculation # +# time. Reasonable values are [1...10], default is 4. # +# -f fuzziness: A mean-squared-error threshold under which a location is considered # +# to be a match. Default is 0.01. Increase this to make finding a # +# target more likely but also increase the possibility of false # +# positives. # +# -------------------------------------------------------------------------------------- # + +usage() { + echo "Usage: $0 -s scale_factor -f fuzziness screen.png target.png" >&2 +} + +SCALE_FACTOR=4 +FUZZINESS=0.01 + +while getopts "s:f:h" opt; do + case $opt in + s) SCALE_FACTOR="${OPTARG}";; + f) FUZZINESS="${OPTARG}";; + h) usage; exit 0;; + *) usage; exit 1;; + esac +done + +shift $((OPTIND-1)) +SCREEN=$1 +TARGET=$2 + +# Make sure the screen image is given. +if [[ -z "${SCREEN}" ]]; then + usage + exit 1 +fi + +# Make sure the target image is given. +if [[ -z "${TARGET}" ]]; then + usage + exit 1 +fi + +# Create a temporary directory. +WORK_DIR=$(mktemp -d) +if [[ ! "${WORK_DIR}" || ! -d "${WORK_DIR}" ]]; then + echo "Failed to create tmp directory!" >&2 + exit 1 +fi + +# Deletes the temp directory on exit. +function cleanup { + rm -r "${WORK_DIR}" +} + +trap cleanup EXIT + +# Reduce the size of the screen capture and the target to optimize the search performance. +convert ${SCREEN} -resize $((100 / SCALE_FACTOR))% "${WORK_DIR}/screen_small.png" +convert ${TARGET} -resize $((100 / SCALE_FACTOR))% "${WORK_DIR}/target_small.png" + +# Make a search on the reduced images. +RESULT=$(compare -metric MSE -subimage-search \ + "${WORK_DIR}/screen_small.png" "${WORK_DIR}/target_small.png" "${WORK_DIR}/out.png" 2>&1) + +if [[ $RESULT == *"error"* ]]; then + echo "Failed to find the target: ${RESULT}" >&2 + exit 1 +fi + +# We use the position of match to crop the original screen capture tightly around the +# match. Some padding is added to make sure that the target is contained in the cropped +# screen capture. We then search one more in the full resolution to get the exact pixel +# location. + +# Here we extract the pixel location of the match in the scaled-down version. +CROP_X=$(echo "${RESULT}" | awk -F[\,\ ] '{print $4}') +CROP_Y=$(echo "${RESULT}" | awk -F[\,\ ] '{print $5}') + +# We add more padding if the images are more scaled down. +PADDING=$SCALE_FACTOR + +CROP_X=$((CROP_X * SCALE_FACTOR - PADDING)) +CROP_Y=$((CROP_Y * SCALE_FACTOR - PADDING)) + +# Clamp the result. +CROP_X=$((CROP_X < 0 ? 0 : CROP_X)) +CROP_Y=$((CROP_Y < 0 ? 0 : CROP_Y)) + +# The crop size depends on the target image size. +TARGET_WIDTH=$(identify -format "%[fx:w]" "${TARGET}") +TARGET_HEIGHT=$(identify -format "%[fx:h]" "${TARGET}") +CROP_WIDTH=$((TARGET_WIDTH + 2*PADDING)) +CROP_HEIGHT=$((TARGET_HEIGHT + 2*PADDING)) + +# Perform the crop. +convert "${SCREEN}" -crop ${CROP_WIDTH}x${CROP_HEIGHT}+${CROP_X}+${CROP_Y} \ + +repage "${WORK_DIR}/screen_cropped.png" + +# Search again on the full resolution. +RESULT=$(compare -metric MSE -dissimilarity-threshold ${FUZZINESS} -subimage-search \ + "${WORK_DIR}/screen_cropped.png" "${TARGET}" "${WORK_DIR}/out.png" 2>&1) + +if [[ $RESULT == *"error"* ]]; then + echo "Failed to find the target: ${RESULT}" >&2 + exit 1 +fi + +# Extract the pixel location from the result. This is now relative to the crop position. +POS_X=$(echo "${RESULT}" | awk -F[\,\ ] '{print $4}') +POS_Y=$(echo "${RESULT}" | awk -F[\,\ ] '{print $5}') + +# Therefore we have to add the crop position to the result. +POS_X=$((POS_X + CROP_X)) +POS_Y=$((POS_Y + CROP_Y)) + +# Finally print our result. +echo "$POS_X $POS_Y" diff --git a/tests/references/apparition-close-gnome-wayland-nested-33.png b/tests/references/apparition-close-gnome-wayland-nested-33.png index e3cc4e4..482d88e 100755 Binary files a/tests/references/apparition-close-gnome-wayland-nested-33.png and b/tests/references/apparition-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/apparition-close-gnome-wayland-nested-34.png b/tests/references/apparition-close-gnome-wayland-nested-34.png index c3c11a2..1d406ca 100755 Binary files a/tests/references/apparition-close-gnome-wayland-nested-34.png and b/tests/references/apparition-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/apparition-close-gnome-wayland-nested-35.png b/tests/references/apparition-close-gnome-wayland-nested-35.png index c3c11a2..e338448 100755 Binary files a/tests/references/apparition-close-gnome-wayland-nested-35.png and b/tests/references/apparition-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/apparition-close-gnome-wayland-nested-36.png b/tests/references/apparition-close-gnome-wayland-nested-36.png index b65e2fb..e338448 100755 Binary files a/tests/references/apparition-close-gnome-wayland-nested-36.png and b/tests/references/apparition-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/apparition-close-gnome-xsession-33.png b/tests/references/apparition-close-gnome-xsession-33.png index e3cc4e4..91c319e 100755 Binary files a/tests/references/apparition-close-gnome-xsession-33.png and b/tests/references/apparition-close-gnome-xsession-33.png differ diff --git a/tests/references/apparition-close-gnome-xsession-34.png b/tests/references/apparition-close-gnome-xsession-34.png index c3c11a2..d7bf222 100755 Binary files a/tests/references/apparition-close-gnome-xsession-34.png and b/tests/references/apparition-close-gnome-xsession-34.png differ diff --git a/tests/references/apparition-close-gnome-xsession-35.png b/tests/references/apparition-close-gnome-xsession-35.png index c3c11a2..63d0bd4 100755 Binary files a/tests/references/apparition-close-gnome-xsession-35.png and b/tests/references/apparition-close-gnome-xsession-35.png differ diff --git a/tests/references/apparition-close-gnome-xsession-36.png b/tests/references/apparition-close-gnome-xsession-36.png index ee77d52..63d0bd4 100755 Binary files a/tests/references/apparition-close-gnome-xsession-36.png and b/tests/references/apparition-close-gnome-xsession-36.png differ diff --git a/tests/references/apparition-open-gnome-wayland-nested-33.png b/tests/references/apparition-open-gnome-wayland-nested-33.png index e3cc4e4..482d88e 100755 Binary files a/tests/references/apparition-open-gnome-wayland-nested-33.png and b/tests/references/apparition-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/apparition-open-gnome-wayland-nested-34.png b/tests/references/apparition-open-gnome-wayland-nested-34.png index c3c11a2..1d406ca 100755 Binary files a/tests/references/apparition-open-gnome-wayland-nested-34.png and b/tests/references/apparition-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/apparition-open-gnome-wayland-nested-35.png b/tests/references/apparition-open-gnome-wayland-nested-35.png index c3c11a2..e338448 100755 Binary files a/tests/references/apparition-open-gnome-wayland-nested-35.png and b/tests/references/apparition-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/apparition-open-gnome-wayland-nested-36.png b/tests/references/apparition-open-gnome-wayland-nested-36.png index b65e2fb..e338448 100755 Binary files a/tests/references/apparition-open-gnome-wayland-nested-36.png and b/tests/references/apparition-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/apparition-open-gnome-xsession-33.png b/tests/references/apparition-open-gnome-xsession-33.png index e3cc4e4..91c319e 100755 Binary files a/tests/references/apparition-open-gnome-xsession-33.png and b/tests/references/apparition-open-gnome-xsession-33.png differ diff --git a/tests/references/apparition-open-gnome-xsession-34.png b/tests/references/apparition-open-gnome-xsession-34.png index c3c11a2..d7bf222 100755 Binary files a/tests/references/apparition-open-gnome-xsession-34.png and b/tests/references/apparition-open-gnome-xsession-34.png differ diff --git a/tests/references/apparition-open-gnome-xsession-35.png b/tests/references/apparition-open-gnome-xsession-35.png index c3c11a2..63d0bd4 100755 Binary files a/tests/references/apparition-open-gnome-xsession-35.png and b/tests/references/apparition-open-gnome-xsession-35.png differ diff --git a/tests/references/apparition-open-gnome-xsession-36.png b/tests/references/apparition-open-gnome-xsession-36.png index ee77d52..63d0bd4 100755 Binary files a/tests/references/apparition-open-gnome-xsession-36.png and b/tests/references/apparition-open-gnome-xsession-36.png differ diff --git a/tests/references/broken-glass-close-gnome-wayland-nested-34.png b/tests/references/broken-glass-close-gnome-wayland-nested-34.png index 7f60f45..75f3e47 100755 Binary files a/tests/references/broken-glass-close-gnome-wayland-nested-34.png and b/tests/references/broken-glass-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/broken-glass-close-gnome-wayland-nested-35.png b/tests/references/broken-glass-close-gnome-wayland-nested-35.png index 720c87b..2639ba3 100755 Binary files a/tests/references/broken-glass-close-gnome-wayland-nested-35.png and b/tests/references/broken-glass-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/broken-glass-close-gnome-wayland-nested-36.png b/tests/references/broken-glass-close-gnome-wayland-nested-36.png index 543aed5..2639ba3 100755 Binary files a/tests/references/broken-glass-close-gnome-wayland-nested-36.png and b/tests/references/broken-glass-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/broken-glass-close-gnome-xsession-34.png b/tests/references/broken-glass-close-gnome-xsession-34.png index ac19965..159064e 100755 Binary files a/tests/references/broken-glass-close-gnome-xsession-34.png and b/tests/references/broken-glass-close-gnome-xsession-34.png differ diff --git a/tests/references/broken-glass-close-gnome-xsession-35.png b/tests/references/broken-glass-close-gnome-xsession-35.png index b261c96..c635fbb 100755 Binary files a/tests/references/broken-glass-close-gnome-xsession-35.png and b/tests/references/broken-glass-close-gnome-xsession-35.png differ diff --git a/tests/references/broken-glass-close-gnome-xsession-36.png b/tests/references/broken-glass-close-gnome-xsession-36.png index 945b7e9..c635fbb 100755 Binary files a/tests/references/broken-glass-close-gnome-xsession-36.png and b/tests/references/broken-glass-close-gnome-xsession-36.png differ diff --git a/tests/references/broken-glass-open-gnome-wayland-nested-34.png b/tests/references/broken-glass-open-gnome-wayland-nested-34.png index 585da59..471cb84 100755 Binary files a/tests/references/broken-glass-open-gnome-wayland-nested-34.png and b/tests/references/broken-glass-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/broken-glass-open-gnome-wayland-nested-35.png b/tests/references/broken-glass-open-gnome-wayland-nested-35.png index 2a92457..d889869 100755 Binary files a/tests/references/broken-glass-open-gnome-wayland-nested-35.png and b/tests/references/broken-glass-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/broken-glass-open-gnome-wayland-nested-36.png b/tests/references/broken-glass-open-gnome-wayland-nested-36.png index 3622103..d889869 100755 Binary files a/tests/references/broken-glass-open-gnome-wayland-nested-36.png and b/tests/references/broken-glass-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/broken-glass-open-gnome-xsession-34.png b/tests/references/broken-glass-open-gnome-xsession-34.png index 39c6a8b..adbf0da 100755 Binary files a/tests/references/broken-glass-open-gnome-xsession-34.png and b/tests/references/broken-glass-open-gnome-xsession-34.png differ diff --git a/tests/references/broken-glass-open-gnome-xsession-35.png b/tests/references/broken-glass-open-gnome-xsession-35.png index 72feddf..6665439 100755 Binary files a/tests/references/broken-glass-open-gnome-xsession-35.png and b/tests/references/broken-glass-open-gnome-xsession-35.png differ diff --git a/tests/references/broken-glass-open-gnome-xsession-36.png b/tests/references/broken-glass-open-gnome-xsession-36.png index f56f373..6665439 100755 Binary files a/tests/references/broken-glass-open-gnome-xsession-36.png and b/tests/references/broken-glass-open-gnome-xsession-36.png differ diff --git a/tests/references/doom-close-gnome-wayland-nested-33.png b/tests/references/doom-close-gnome-wayland-nested-33.png index d405334..2dd77ca 100755 Binary files a/tests/references/doom-close-gnome-wayland-nested-33.png and b/tests/references/doom-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/doom-close-gnome-wayland-nested-34.png b/tests/references/doom-close-gnome-wayland-nested-34.png index d918d36..8879b22 100755 Binary files a/tests/references/doom-close-gnome-wayland-nested-34.png and b/tests/references/doom-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/doom-close-gnome-wayland-nested-35.png b/tests/references/doom-close-gnome-wayland-nested-35.png index d918d36..ac7b54b 100755 Binary files a/tests/references/doom-close-gnome-wayland-nested-35.png and b/tests/references/doom-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/doom-close-gnome-wayland-nested-36.png b/tests/references/doom-close-gnome-wayland-nested-36.png index 33136b4..84ea46d 100755 Binary files a/tests/references/doom-close-gnome-wayland-nested-36.png and b/tests/references/doom-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/doom-close-gnome-xsession-33.png b/tests/references/doom-close-gnome-xsession-33.png index d405334..b701718 100755 Binary files a/tests/references/doom-close-gnome-xsession-33.png and b/tests/references/doom-close-gnome-xsession-33.png differ diff --git a/tests/references/doom-close-gnome-xsession-34.png b/tests/references/doom-close-gnome-xsession-34.png index d918d36..2966413 100755 Binary files a/tests/references/doom-close-gnome-xsession-34.png and b/tests/references/doom-close-gnome-xsession-34.png differ diff --git a/tests/references/doom-close-gnome-xsession-35.png b/tests/references/doom-close-gnome-xsession-35.png index d918d36..8e2f7d0 100755 Binary files a/tests/references/doom-close-gnome-xsession-35.png and b/tests/references/doom-close-gnome-xsession-35.png differ diff --git a/tests/references/doom-close-gnome-xsession-36.png b/tests/references/doom-close-gnome-xsession-36.png index 33136b4..aa6aa94 100755 Binary files a/tests/references/doom-close-gnome-xsession-36.png and b/tests/references/doom-close-gnome-xsession-36.png differ diff --git a/tests/references/doom-open-gnome-wayland-nested-33.png b/tests/references/doom-open-gnome-wayland-nested-33.png index 38e1a98..99f23b2 100755 Binary files a/tests/references/doom-open-gnome-wayland-nested-33.png and b/tests/references/doom-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/doom-open-gnome-wayland-nested-34.png b/tests/references/doom-open-gnome-wayland-nested-34.png index 123f03d..cce83f4 100755 Binary files a/tests/references/doom-open-gnome-wayland-nested-34.png and b/tests/references/doom-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/doom-open-gnome-wayland-nested-35.png b/tests/references/doom-open-gnome-wayland-nested-35.png index 123f03d..7d5fd80 100755 Binary files a/tests/references/doom-open-gnome-wayland-nested-35.png and b/tests/references/doom-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/doom-open-gnome-wayland-nested-36.png b/tests/references/doom-open-gnome-wayland-nested-36.png index 3101509..7d5fd80 100755 Binary files a/tests/references/doom-open-gnome-wayland-nested-36.png and b/tests/references/doom-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/doom-open-gnome-xsession-33.png b/tests/references/doom-open-gnome-xsession-33.png index 38e1a98..3eb5ded 100755 Binary files a/tests/references/doom-open-gnome-xsession-33.png and b/tests/references/doom-open-gnome-xsession-33.png differ diff --git a/tests/references/doom-open-gnome-xsession-34.png b/tests/references/doom-open-gnome-xsession-34.png index 123f03d..a70227f 100755 Binary files a/tests/references/doom-open-gnome-xsession-34.png and b/tests/references/doom-open-gnome-xsession-34.png differ diff --git a/tests/references/doom-open-gnome-xsession-35.png b/tests/references/doom-open-gnome-xsession-35.png index 123f03d..63a82cf 100755 Binary files a/tests/references/doom-open-gnome-xsession-35.png and b/tests/references/doom-open-gnome-xsession-35.png differ diff --git a/tests/references/doom-open-gnome-xsession-36.png b/tests/references/doom-open-gnome-xsession-36.png index 3101509..63a82cf 100755 Binary files a/tests/references/doom-open-gnome-xsession-36.png and b/tests/references/doom-open-gnome-xsession-36.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-32.png b/tests/references/energize-a-close-gnome-wayland-nested-32.png index d0a7564..bade347 100755 Binary files a/tests/references/energize-a-close-gnome-wayland-nested-32.png and b/tests/references/energize-a-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-33.png b/tests/references/energize-a-close-gnome-wayland-nested-33.png index 80fc98c..e505dd1 100755 Binary files a/tests/references/energize-a-close-gnome-wayland-nested-33.png and b/tests/references/energize-a-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-34.png b/tests/references/energize-a-close-gnome-wayland-nested-34.png index 0039f23..0700ce9 100755 Binary files a/tests/references/energize-a-close-gnome-wayland-nested-34.png and b/tests/references/energize-a-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-35.png b/tests/references/energize-a-close-gnome-wayland-nested-35.png index 0039f23..c583ff5 100755 Binary files a/tests/references/energize-a-close-gnome-wayland-nested-35.png and b/tests/references/energize-a-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-36.png b/tests/references/energize-a-close-gnome-wayland-nested-36.png index edbfffd..c583ff5 100755 Binary files a/tests/references/energize-a-close-gnome-wayland-nested-36.png and b/tests/references/energize-a-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-32.png b/tests/references/energize-a-close-gnome-xsession-32.png index d0a7564..e37596f 100755 Binary files a/tests/references/energize-a-close-gnome-xsession-32.png and b/tests/references/energize-a-close-gnome-xsession-32.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-33.png b/tests/references/energize-a-close-gnome-xsession-33.png index 80fc98c..3a16e34 100755 Binary files a/tests/references/energize-a-close-gnome-xsession-33.png and b/tests/references/energize-a-close-gnome-xsession-33.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-34.png b/tests/references/energize-a-close-gnome-xsession-34.png index e70b9c8..3496f88 100755 Binary files a/tests/references/energize-a-close-gnome-xsession-34.png and b/tests/references/energize-a-close-gnome-xsession-34.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-35.png b/tests/references/energize-a-close-gnome-xsession-35.png index e70b9c8..0f2d371 100755 Binary files a/tests/references/energize-a-close-gnome-xsession-35.png and b/tests/references/energize-a-close-gnome-xsession-35.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-36.png b/tests/references/energize-a-close-gnome-xsession-36.png index a38b887..0f2d371 100755 Binary files a/tests/references/energize-a-close-gnome-xsession-36.png and b/tests/references/energize-a-close-gnome-xsession-36.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-32.png b/tests/references/energize-a-open-gnome-wayland-nested-32.png index 27c1432..3966031 100755 Binary files a/tests/references/energize-a-open-gnome-wayland-nested-32.png and b/tests/references/energize-a-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-33.png b/tests/references/energize-a-open-gnome-wayland-nested-33.png index 43af776..b5f9df2 100755 Binary files a/tests/references/energize-a-open-gnome-wayland-nested-33.png and b/tests/references/energize-a-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-34.png b/tests/references/energize-a-open-gnome-wayland-nested-34.png index 6f2d2e0..24b85b9 100755 Binary files a/tests/references/energize-a-open-gnome-wayland-nested-34.png and b/tests/references/energize-a-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-35.png b/tests/references/energize-a-open-gnome-wayland-nested-35.png index 6f2d2e0..4024c33 100755 Binary files a/tests/references/energize-a-open-gnome-wayland-nested-35.png and b/tests/references/energize-a-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-36.png b/tests/references/energize-a-open-gnome-wayland-nested-36.png index bee3b34..4024c33 100755 Binary files a/tests/references/energize-a-open-gnome-wayland-nested-36.png and b/tests/references/energize-a-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-32.png b/tests/references/energize-a-open-gnome-xsession-32.png index 27c1432..b62ccba 100755 Binary files a/tests/references/energize-a-open-gnome-xsession-32.png and b/tests/references/energize-a-open-gnome-xsession-32.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-33.png b/tests/references/energize-a-open-gnome-xsession-33.png index 43af776..fd25d0d 100755 Binary files a/tests/references/energize-a-open-gnome-xsession-33.png and b/tests/references/energize-a-open-gnome-xsession-33.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-34.png b/tests/references/energize-a-open-gnome-xsession-34.png index 4fcd15a..7020eff 100755 Binary files a/tests/references/energize-a-open-gnome-xsession-34.png and b/tests/references/energize-a-open-gnome-xsession-34.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-35.png b/tests/references/energize-a-open-gnome-xsession-35.png index 48a1baf..338becf 100755 Binary files a/tests/references/energize-a-open-gnome-xsession-35.png and b/tests/references/energize-a-open-gnome-xsession-35.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-36.png b/tests/references/energize-a-open-gnome-xsession-36.png index ac804f4..338becf 100755 Binary files a/tests/references/energize-a-open-gnome-xsession-36.png and b/tests/references/energize-a-open-gnome-xsession-36.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-32.png b/tests/references/energize-b-close-gnome-wayland-nested-32.png index 032ca10..8fa371a 100755 Binary files a/tests/references/energize-b-close-gnome-wayland-nested-32.png and b/tests/references/energize-b-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-33.png b/tests/references/energize-b-close-gnome-wayland-nested-33.png index 2409b49..5e6974b 100755 Binary files a/tests/references/energize-b-close-gnome-wayland-nested-33.png and b/tests/references/energize-b-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-34.png b/tests/references/energize-b-close-gnome-wayland-nested-34.png index 5538640..8a27f10 100755 Binary files a/tests/references/energize-b-close-gnome-wayland-nested-34.png and b/tests/references/energize-b-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-35.png b/tests/references/energize-b-close-gnome-wayland-nested-35.png index 5538640..119f62b 100755 Binary files a/tests/references/energize-b-close-gnome-wayland-nested-35.png and b/tests/references/energize-b-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-36.png b/tests/references/energize-b-close-gnome-wayland-nested-36.png index 84ed343..119f62b 100755 Binary files a/tests/references/energize-b-close-gnome-wayland-nested-36.png and b/tests/references/energize-b-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-32.png b/tests/references/energize-b-close-gnome-xsession-32.png index 032ca10..095214e 100755 Binary files a/tests/references/energize-b-close-gnome-xsession-32.png and b/tests/references/energize-b-close-gnome-xsession-32.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-33.png b/tests/references/energize-b-close-gnome-xsession-33.png index 2409b49..642931e 100755 Binary files a/tests/references/energize-b-close-gnome-xsession-33.png and b/tests/references/energize-b-close-gnome-xsession-33.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-34.png b/tests/references/energize-b-close-gnome-xsession-34.png index 5538640..506daac 100755 Binary files a/tests/references/energize-b-close-gnome-xsession-34.png and b/tests/references/energize-b-close-gnome-xsession-34.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-35.png b/tests/references/energize-b-close-gnome-xsession-35.png index 5538640..5d0f079 100755 Binary files a/tests/references/energize-b-close-gnome-xsession-35.png and b/tests/references/energize-b-close-gnome-xsession-35.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-36.png b/tests/references/energize-b-close-gnome-xsession-36.png index 84ed343..5d0f079 100755 Binary files a/tests/references/energize-b-close-gnome-xsession-36.png and b/tests/references/energize-b-close-gnome-xsession-36.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-32.png b/tests/references/energize-b-open-gnome-wayland-nested-32.png index 4ad0499..0043ea6 100755 Binary files a/tests/references/energize-b-open-gnome-wayland-nested-32.png and b/tests/references/energize-b-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-33.png b/tests/references/energize-b-open-gnome-wayland-nested-33.png index 6ac3d63..28a91e5 100755 Binary files a/tests/references/energize-b-open-gnome-wayland-nested-33.png and b/tests/references/energize-b-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-34.png b/tests/references/energize-b-open-gnome-wayland-nested-34.png index b4246d3..f9fa7c4 100755 Binary files a/tests/references/energize-b-open-gnome-wayland-nested-34.png and b/tests/references/energize-b-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-35.png b/tests/references/energize-b-open-gnome-wayland-nested-35.png index b4246d3..65a9f54 100755 Binary files a/tests/references/energize-b-open-gnome-wayland-nested-35.png and b/tests/references/energize-b-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-36.png b/tests/references/energize-b-open-gnome-wayland-nested-36.png index 9921f2f..65a9f54 100755 Binary files a/tests/references/energize-b-open-gnome-wayland-nested-36.png and b/tests/references/energize-b-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-32.png b/tests/references/energize-b-open-gnome-xsession-32.png index 4ad0499..a581c15 100755 Binary files a/tests/references/energize-b-open-gnome-xsession-32.png and b/tests/references/energize-b-open-gnome-xsession-32.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-33.png b/tests/references/energize-b-open-gnome-xsession-33.png index 6ac3d63..604f62e 100755 Binary files a/tests/references/energize-b-open-gnome-xsession-33.png and b/tests/references/energize-b-open-gnome-xsession-33.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-34.png b/tests/references/energize-b-open-gnome-xsession-34.png index b4246d3..a1d5516 100755 Binary files a/tests/references/energize-b-open-gnome-xsession-34.png and b/tests/references/energize-b-open-gnome-xsession-34.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-35.png b/tests/references/energize-b-open-gnome-xsession-35.png index b4246d3..41e29ae 100755 Binary files a/tests/references/energize-b-open-gnome-xsession-35.png and b/tests/references/energize-b-open-gnome-xsession-35.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-36.png b/tests/references/energize-b-open-gnome-xsession-36.png index 9921f2f..41e29ae 100755 Binary files a/tests/references/energize-b-open-gnome-xsession-36.png and b/tests/references/energize-b-open-gnome-xsession-36.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-32.png b/tests/references/fire-close-gnome-wayland-nested-32.png index 9589da5..6333c92 100755 Binary files a/tests/references/fire-close-gnome-wayland-nested-32.png and b/tests/references/fire-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-33.png b/tests/references/fire-close-gnome-wayland-nested-33.png index 17b17e2..d18fd97 100755 Binary files a/tests/references/fire-close-gnome-wayland-nested-33.png and b/tests/references/fire-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-34.png b/tests/references/fire-close-gnome-wayland-nested-34.png index 92ace14..eac730c 100755 Binary files a/tests/references/fire-close-gnome-wayland-nested-34.png and b/tests/references/fire-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-35.png b/tests/references/fire-close-gnome-wayland-nested-35.png index 92ace14..59eaa40 100755 Binary files a/tests/references/fire-close-gnome-wayland-nested-35.png and b/tests/references/fire-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-36.png b/tests/references/fire-close-gnome-wayland-nested-36.png index ca174c4..59eaa40 100755 Binary files a/tests/references/fire-close-gnome-wayland-nested-36.png and b/tests/references/fire-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/fire-close-gnome-xsession-32.png b/tests/references/fire-close-gnome-xsession-32.png index 9589da5..f502cc7 100755 Binary files a/tests/references/fire-close-gnome-xsession-32.png and b/tests/references/fire-close-gnome-xsession-32.png differ diff --git a/tests/references/fire-close-gnome-xsession-33.png b/tests/references/fire-close-gnome-xsession-33.png index 17b17e2..34d5179 100755 Binary files a/tests/references/fire-close-gnome-xsession-33.png and b/tests/references/fire-close-gnome-xsession-33.png differ diff --git a/tests/references/fire-close-gnome-xsession-34.png b/tests/references/fire-close-gnome-xsession-34.png index 92ace14..c6745eb 100755 Binary files a/tests/references/fire-close-gnome-xsession-34.png and b/tests/references/fire-close-gnome-xsession-34.png differ diff --git a/tests/references/fire-close-gnome-xsession-35.png b/tests/references/fire-close-gnome-xsession-35.png index 92ace14..992c9b6 100755 Binary files a/tests/references/fire-close-gnome-xsession-35.png and b/tests/references/fire-close-gnome-xsession-35.png differ diff --git a/tests/references/fire-close-gnome-xsession-36.png b/tests/references/fire-close-gnome-xsession-36.png index ca174c4..992c9b6 100755 Binary files a/tests/references/fire-close-gnome-xsession-36.png and b/tests/references/fire-close-gnome-xsession-36.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-32.png b/tests/references/fire-open-gnome-wayland-nested-32.png index 711712d..839fafd 100755 Binary files a/tests/references/fire-open-gnome-wayland-nested-32.png and b/tests/references/fire-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-33.png b/tests/references/fire-open-gnome-wayland-nested-33.png index f0f4487..6a6506f 100755 Binary files a/tests/references/fire-open-gnome-wayland-nested-33.png and b/tests/references/fire-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-34.png b/tests/references/fire-open-gnome-wayland-nested-34.png index 4354233..c686ba1 100755 Binary files a/tests/references/fire-open-gnome-wayland-nested-34.png and b/tests/references/fire-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-35.png b/tests/references/fire-open-gnome-wayland-nested-35.png index 4354233..7e2048b 100755 Binary files a/tests/references/fire-open-gnome-wayland-nested-35.png and b/tests/references/fire-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-36.png b/tests/references/fire-open-gnome-wayland-nested-36.png index 820ea15..7e2048b 100755 Binary files a/tests/references/fire-open-gnome-wayland-nested-36.png and b/tests/references/fire-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/fire-open-gnome-xsession-32.png b/tests/references/fire-open-gnome-xsession-32.png index 711712d..abe01eb 100755 Binary files a/tests/references/fire-open-gnome-xsession-32.png and b/tests/references/fire-open-gnome-xsession-32.png differ diff --git a/tests/references/fire-open-gnome-xsession-33.png b/tests/references/fire-open-gnome-xsession-33.png index f0f4487..0603ac3 100755 Binary files a/tests/references/fire-open-gnome-xsession-33.png and b/tests/references/fire-open-gnome-xsession-33.png differ diff --git a/tests/references/fire-open-gnome-xsession-34.png b/tests/references/fire-open-gnome-xsession-34.png index 4354233..fb51e2b 100755 Binary files a/tests/references/fire-open-gnome-xsession-34.png and b/tests/references/fire-open-gnome-xsession-34.png differ diff --git a/tests/references/fire-open-gnome-xsession-35.png b/tests/references/fire-open-gnome-xsession-35.png index 4354233..24999d2 100755 Binary files a/tests/references/fire-open-gnome-xsession-35.png and b/tests/references/fire-open-gnome-xsession-35.png differ diff --git a/tests/references/fire-open-gnome-xsession-36.png b/tests/references/fire-open-gnome-xsession-36.png index 820ea15..24999d2 100755 Binary files a/tests/references/fire-open-gnome-xsession-36.png and b/tests/references/fire-open-gnome-xsession-36.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-32.png b/tests/references/hexagon-close-gnome-wayland-nested-32.png index fae638b..ffd6fb2 100755 Binary files a/tests/references/hexagon-close-gnome-wayland-nested-32.png and b/tests/references/hexagon-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-33.png b/tests/references/hexagon-close-gnome-wayland-nested-33.png index ee72221..3a65623 100755 Binary files a/tests/references/hexagon-close-gnome-wayland-nested-33.png and b/tests/references/hexagon-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-34.png b/tests/references/hexagon-close-gnome-wayland-nested-34.png index 7f6661d..8d82404 100755 Binary files a/tests/references/hexagon-close-gnome-wayland-nested-34.png and b/tests/references/hexagon-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-35.png b/tests/references/hexagon-close-gnome-wayland-nested-35.png index 7f6661d..1cbb519 100755 Binary files a/tests/references/hexagon-close-gnome-wayland-nested-35.png and b/tests/references/hexagon-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-36.png b/tests/references/hexagon-close-gnome-wayland-nested-36.png index e4cf475..1cbb519 100755 Binary files a/tests/references/hexagon-close-gnome-wayland-nested-36.png and b/tests/references/hexagon-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-32.png b/tests/references/hexagon-close-gnome-xsession-32.png index fae638b..ed84528 100755 Binary files a/tests/references/hexagon-close-gnome-xsession-32.png and b/tests/references/hexagon-close-gnome-xsession-32.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-33.png b/tests/references/hexagon-close-gnome-xsession-33.png index ee72221..0ac8061 100755 Binary files a/tests/references/hexagon-close-gnome-xsession-33.png and b/tests/references/hexagon-close-gnome-xsession-33.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-34.png b/tests/references/hexagon-close-gnome-xsession-34.png index 7f6661d..02b1d7b 100755 Binary files a/tests/references/hexagon-close-gnome-xsession-34.png and b/tests/references/hexagon-close-gnome-xsession-34.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-35.png b/tests/references/hexagon-close-gnome-xsession-35.png index 7f6661d..0077804 100755 Binary files a/tests/references/hexagon-close-gnome-xsession-35.png and b/tests/references/hexagon-close-gnome-xsession-35.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-36.png b/tests/references/hexagon-close-gnome-xsession-36.png index e4cf475..0077804 100755 Binary files a/tests/references/hexagon-close-gnome-xsession-36.png and b/tests/references/hexagon-close-gnome-xsession-36.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-32.png b/tests/references/hexagon-open-gnome-wayland-nested-32.png index fae638b..ffd6fb2 100755 Binary files a/tests/references/hexagon-open-gnome-wayland-nested-32.png and b/tests/references/hexagon-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-33.png b/tests/references/hexagon-open-gnome-wayland-nested-33.png index ee72221..3a65623 100755 Binary files a/tests/references/hexagon-open-gnome-wayland-nested-33.png and b/tests/references/hexagon-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-34.png b/tests/references/hexagon-open-gnome-wayland-nested-34.png index 7f6661d..8d82404 100755 Binary files a/tests/references/hexagon-open-gnome-wayland-nested-34.png and b/tests/references/hexagon-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-35.png b/tests/references/hexagon-open-gnome-wayland-nested-35.png index 7f6661d..1cbb519 100755 Binary files a/tests/references/hexagon-open-gnome-wayland-nested-35.png and b/tests/references/hexagon-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-36.png b/tests/references/hexagon-open-gnome-wayland-nested-36.png index e4cf475..1cbb519 100755 Binary files a/tests/references/hexagon-open-gnome-wayland-nested-36.png and b/tests/references/hexagon-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-32.png b/tests/references/hexagon-open-gnome-xsession-32.png index fae638b..ed84528 100755 Binary files a/tests/references/hexagon-open-gnome-xsession-32.png and b/tests/references/hexagon-open-gnome-xsession-32.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-33.png b/tests/references/hexagon-open-gnome-xsession-33.png index ee72221..0ac8061 100755 Binary files a/tests/references/hexagon-open-gnome-xsession-33.png and b/tests/references/hexagon-open-gnome-xsession-33.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-34.png b/tests/references/hexagon-open-gnome-xsession-34.png index 7f6661d..02b1d7b 100755 Binary files a/tests/references/hexagon-open-gnome-xsession-34.png and b/tests/references/hexagon-open-gnome-xsession-34.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-35.png b/tests/references/hexagon-open-gnome-xsession-35.png index 7f6661d..0077804 100755 Binary files a/tests/references/hexagon-open-gnome-xsession-35.png and b/tests/references/hexagon-open-gnome-xsession-35.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-36.png b/tests/references/hexagon-open-gnome-xsession-36.png index e4cf475..0077804 100755 Binary files a/tests/references/hexagon-open-gnome-xsession-36.png and b/tests/references/hexagon-open-gnome-xsession-36.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-32.png b/tests/references/incinerate-close-gnome-wayland-nested-32.png index af5f156..7503c19 100755 Binary files a/tests/references/incinerate-close-gnome-wayland-nested-32.png and b/tests/references/incinerate-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-33.png b/tests/references/incinerate-close-gnome-wayland-nested-33.png index 6e1c6f9..873daeb 100755 Binary files a/tests/references/incinerate-close-gnome-wayland-nested-33.png and b/tests/references/incinerate-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-34.png b/tests/references/incinerate-close-gnome-wayland-nested-34.png index 070589c..6ac74c7 100755 Binary files a/tests/references/incinerate-close-gnome-wayland-nested-34.png and b/tests/references/incinerate-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-35.png b/tests/references/incinerate-close-gnome-wayland-nested-35.png index 070589c..e51bf15 100755 Binary files a/tests/references/incinerate-close-gnome-wayland-nested-35.png and b/tests/references/incinerate-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-36.png b/tests/references/incinerate-close-gnome-wayland-nested-36.png index 9414234..e51bf15 100755 Binary files a/tests/references/incinerate-close-gnome-wayland-nested-36.png and b/tests/references/incinerate-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-32.png b/tests/references/incinerate-close-gnome-xsession-32.png index af5f156..507b3ce 100755 Binary files a/tests/references/incinerate-close-gnome-xsession-32.png and b/tests/references/incinerate-close-gnome-xsession-32.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-33.png b/tests/references/incinerate-close-gnome-xsession-33.png index 6e1c6f9..645a151 100755 Binary files a/tests/references/incinerate-close-gnome-xsession-33.png and b/tests/references/incinerate-close-gnome-xsession-33.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-34.png b/tests/references/incinerate-close-gnome-xsession-34.png index 070589c..2b4f356 100755 Binary files a/tests/references/incinerate-close-gnome-xsession-34.png and b/tests/references/incinerate-close-gnome-xsession-34.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-35.png b/tests/references/incinerate-close-gnome-xsession-35.png index 070589c..d321ab5 100755 Binary files a/tests/references/incinerate-close-gnome-xsession-35.png and b/tests/references/incinerate-close-gnome-xsession-35.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-36.png b/tests/references/incinerate-close-gnome-xsession-36.png index 1b2678a..d321ab5 100755 Binary files a/tests/references/incinerate-close-gnome-xsession-36.png and b/tests/references/incinerate-close-gnome-xsession-36.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-32.png b/tests/references/incinerate-open-gnome-wayland-nested-32.png index dcd9a7a..8fa2157 100755 Binary files a/tests/references/incinerate-open-gnome-wayland-nested-32.png and b/tests/references/incinerate-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-33.png b/tests/references/incinerate-open-gnome-wayland-nested-33.png index f0e67b7..a4a7978 100755 Binary files a/tests/references/incinerate-open-gnome-wayland-nested-33.png and b/tests/references/incinerate-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-34.png b/tests/references/incinerate-open-gnome-wayland-nested-34.png index 12c9baa..f9ab93f 100755 Binary files a/tests/references/incinerate-open-gnome-wayland-nested-34.png and b/tests/references/incinerate-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-35.png b/tests/references/incinerate-open-gnome-wayland-nested-35.png index 12c9baa..ff6ecb7 100755 Binary files a/tests/references/incinerate-open-gnome-wayland-nested-35.png and b/tests/references/incinerate-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-36.png b/tests/references/incinerate-open-gnome-wayland-nested-36.png index e286fd5..ff6ecb7 100755 Binary files a/tests/references/incinerate-open-gnome-wayland-nested-36.png and b/tests/references/incinerate-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-32.png b/tests/references/incinerate-open-gnome-xsession-32.png index eafbcbe..e7206a4 100755 Binary files a/tests/references/incinerate-open-gnome-xsession-32.png and b/tests/references/incinerate-open-gnome-xsession-32.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-33.png b/tests/references/incinerate-open-gnome-xsession-33.png index d6d4cd9..3908b79 100755 Binary files a/tests/references/incinerate-open-gnome-xsession-33.png and b/tests/references/incinerate-open-gnome-xsession-33.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-34.png b/tests/references/incinerate-open-gnome-xsession-34.png index 12c9baa..ea7534b 100755 Binary files a/tests/references/incinerate-open-gnome-xsession-34.png and b/tests/references/incinerate-open-gnome-xsession-34.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-35.png b/tests/references/incinerate-open-gnome-xsession-35.png index 12c9baa..8b93c59 100755 Binary files a/tests/references/incinerate-open-gnome-xsession-35.png and b/tests/references/incinerate-open-gnome-xsession-35.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-36.png b/tests/references/incinerate-open-gnome-xsession-36.png index 5cfe4c2..8b93c59 100755 Binary files a/tests/references/incinerate-open-gnome-xsession-36.png and b/tests/references/incinerate-open-gnome-xsession-36.png differ diff --git a/tests/references/matrix-close-gnome-wayland-nested-34.png b/tests/references/matrix-close-gnome-wayland-nested-34.png index 9ae49e1..4816a0e 100755 Binary files a/tests/references/matrix-close-gnome-wayland-nested-34.png and b/tests/references/matrix-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/matrix-close-gnome-wayland-nested-35.png b/tests/references/matrix-close-gnome-wayland-nested-35.png index bc24253..1235b09 100755 Binary files a/tests/references/matrix-close-gnome-wayland-nested-35.png and b/tests/references/matrix-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/matrix-close-gnome-wayland-nested-36.png b/tests/references/matrix-close-gnome-wayland-nested-36.png index 187f140..1235b09 100755 Binary files a/tests/references/matrix-close-gnome-wayland-nested-36.png and b/tests/references/matrix-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/matrix-close-gnome-xsession-34.png b/tests/references/matrix-close-gnome-xsession-34.png index 9ae49e1..626726d 100755 Binary files a/tests/references/matrix-close-gnome-xsession-34.png and b/tests/references/matrix-close-gnome-xsession-34.png differ diff --git a/tests/references/matrix-close-gnome-xsession-35.png b/tests/references/matrix-close-gnome-xsession-35.png index bc24253..d5aed0d 100755 Binary files a/tests/references/matrix-close-gnome-xsession-35.png and b/tests/references/matrix-close-gnome-xsession-35.png differ diff --git a/tests/references/matrix-close-gnome-xsession-36.png b/tests/references/matrix-close-gnome-xsession-36.png index 187f140..d5aed0d 100755 Binary files a/tests/references/matrix-close-gnome-xsession-36.png and b/tests/references/matrix-close-gnome-xsession-36.png differ diff --git a/tests/references/matrix-open-gnome-wayland-nested-34.png b/tests/references/matrix-open-gnome-wayland-nested-34.png index bd9eb43..5f06f99 100755 Binary files a/tests/references/matrix-open-gnome-wayland-nested-34.png and b/tests/references/matrix-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/matrix-open-gnome-wayland-nested-35.png b/tests/references/matrix-open-gnome-wayland-nested-35.png index cd52331..22fe175 100755 Binary files a/tests/references/matrix-open-gnome-wayland-nested-35.png and b/tests/references/matrix-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/matrix-open-gnome-wayland-nested-36.png b/tests/references/matrix-open-gnome-wayland-nested-36.png index b648657..22fe175 100755 Binary files a/tests/references/matrix-open-gnome-wayland-nested-36.png and b/tests/references/matrix-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/matrix-open-gnome-xsession-34.png b/tests/references/matrix-open-gnome-xsession-34.png index bd9eb43..2c84cb1 100755 Binary files a/tests/references/matrix-open-gnome-xsession-34.png and b/tests/references/matrix-open-gnome-xsession-34.png differ diff --git a/tests/references/matrix-open-gnome-xsession-35.png b/tests/references/matrix-open-gnome-xsession-35.png index cd52331..27e18c8 100755 Binary files a/tests/references/matrix-open-gnome-xsession-35.png and b/tests/references/matrix-open-gnome-xsession-35.png differ diff --git a/tests/references/matrix-open-gnome-xsession-36.png b/tests/references/matrix-open-gnome-xsession-36.png index b648657..27e18c8 100755 Binary files a/tests/references/matrix-open-gnome-xsession-36.png and b/tests/references/matrix-open-gnome-xsession-36.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-32.png b/tests/references/pixelate-close-gnome-wayland-nested-32.png index e545ebc..034ccf2 100755 Binary files a/tests/references/pixelate-close-gnome-wayland-nested-32.png and b/tests/references/pixelate-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-33.png b/tests/references/pixelate-close-gnome-wayland-nested-33.png index 1b8becc..80c3859 100755 Binary files a/tests/references/pixelate-close-gnome-wayland-nested-33.png and b/tests/references/pixelate-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-34.png b/tests/references/pixelate-close-gnome-wayland-nested-34.png index 114dced..d69f762 100755 Binary files a/tests/references/pixelate-close-gnome-wayland-nested-34.png and b/tests/references/pixelate-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-35.png b/tests/references/pixelate-close-gnome-wayland-nested-35.png index 114dced..6998a1b 100755 Binary files a/tests/references/pixelate-close-gnome-wayland-nested-35.png and b/tests/references/pixelate-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-36.png b/tests/references/pixelate-close-gnome-wayland-nested-36.png index 7644aa2..6998a1b 100755 Binary files a/tests/references/pixelate-close-gnome-wayland-nested-36.png and b/tests/references/pixelate-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-32.png b/tests/references/pixelate-close-gnome-xsession-32.png index e545ebc..512a1e6 100755 Binary files a/tests/references/pixelate-close-gnome-xsession-32.png and b/tests/references/pixelate-close-gnome-xsession-32.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-33.png b/tests/references/pixelate-close-gnome-xsession-33.png index 1b8becc..46e22b7 100755 Binary files a/tests/references/pixelate-close-gnome-xsession-33.png and b/tests/references/pixelate-close-gnome-xsession-33.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-34.png b/tests/references/pixelate-close-gnome-xsession-34.png index 114dced..69b2720 100755 Binary files a/tests/references/pixelate-close-gnome-xsession-34.png and b/tests/references/pixelate-close-gnome-xsession-34.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-35.png b/tests/references/pixelate-close-gnome-xsession-35.png index 114dced..e186432 100755 Binary files a/tests/references/pixelate-close-gnome-xsession-35.png and b/tests/references/pixelate-close-gnome-xsession-35.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-36.png b/tests/references/pixelate-close-gnome-xsession-36.png index 7644aa2..e186432 100755 Binary files a/tests/references/pixelate-close-gnome-xsession-36.png and b/tests/references/pixelate-close-gnome-xsession-36.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-32.png b/tests/references/pixelate-open-gnome-wayland-nested-32.png index 95cde89..034ccf2 100755 Binary files a/tests/references/pixelate-open-gnome-wayland-nested-32.png and b/tests/references/pixelate-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-33.png b/tests/references/pixelate-open-gnome-wayland-nested-33.png index 1b8becc..80c3859 100755 Binary files a/tests/references/pixelate-open-gnome-wayland-nested-33.png and b/tests/references/pixelate-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-34.png b/tests/references/pixelate-open-gnome-wayland-nested-34.png index 114dced..d69f762 100755 Binary files a/tests/references/pixelate-open-gnome-wayland-nested-34.png and b/tests/references/pixelate-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-35.png b/tests/references/pixelate-open-gnome-wayland-nested-35.png index 114dced..6998a1b 100755 Binary files a/tests/references/pixelate-open-gnome-wayland-nested-35.png and b/tests/references/pixelate-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-36.png b/tests/references/pixelate-open-gnome-wayland-nested-36.png index 7644aa2..6998a1b 100755 Binary files a/tests/references/pixelate-open-gnome-wayland-nested-36.png and b/tests/references/pixelate-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-32.png b/tests/references/pixelate-open-gnome-xsession-32.png index e545ebc..512a1e6 100755 Binary files a/tests/references/pixelate-open-gnome-xsession-32.png and b/tests/references/pixelate-open-gnome-xsession-32.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-33.png b/tests/references/pixelate-open-gnome-xsession-33.png index 1b8becc..46e22b7 100755 Binary files a/tests/references/pixelate-open-gnome-xsession-33.png and b/tests/references/pixelate-open-gnome-xsession-33.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-34.png b/tests/references/pixelate-open-gnome-xsession-34.png index 114dced..69b2720 100755 Binary files a/tests/references/pixelate-open-gnome-xsession-34.png and b/tests/references/pixelate-open-gnome-xsession-34.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-35.png b/tests/references/pixelate-open-gnome-xsession-35.png index 114dced..e186432 100755 Binary files a/tests/references/pixelate-open-gnome-xsession-35.png and b/tests/references/pixelate-open-gnome-xsession-35.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-36.png b/tests/references/pixelate-open-gnome-xsession-36.png index 7644aa2..e186432 100755 Binary files a/tests/references/pixelate-open-gnome-xsession-36.png and b/tests/references/pixelate-open-gnome-xsession-36.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-32.png b/tests/references/preferences-gnome-wayland-nested-32.png new file mode 100755 index 0000000..2c7169d Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-32.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-33.png b/tests/references/preferences-gnome-wayland-nested-33.png new file mode 100755 index 0000000..f8ea612 Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-33.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-34.png b/tests/references/preferences-gnome-wayland-nested-34.png new file mode 100755 index 0000000..db2b185 Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-34.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-35.png b/tests/references/preferences-gnome-wayland-nested-35.png new file mode 100755 index 0000000..db2b185 Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-35.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-36.png b/tests/references/preferences-gnome-wayland-nested-36.png new file mode 100755 index 0000000..f3e8eee Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-36.png differ diff --git a/tests/references/preferences-gnome-xsession-32.png b/tests/references/preferences-gnome-xsession-32.png new file mode 100755 index 0000000..2c7169d Binary files /dev/null and b/tests/references/preferences-gnome-xsession-32.png differ diff --git a/tests/references/preferences-gnome-xsession-33.png b/tests/references/preferences-gnome-xsession-33.png new file mode 100755 index 0000000..f8ea612 Binary files /dev/null and b/tests/references/preferences-gnome-xsession-33.png differ diff --git a/tests/references/preferences-gnome-xsession-34.png b/tests/references/preferences-gnome-xsession-34.png new file mode 100755 index 0000000..add2dbd Binary files /dev/null and b/tests/references/preferences-gnome-xsession-34.png differ diff --git a/tests/references/preferences-gnome-xsession-35.png b/tests/references/preferences-gnome-xsession-35.png new file mode 100755 index 0000000..add2dbd Binary files /dev/null and b/tests/references/preferences-gnome-xsession-35.png differ diff --git a/tests/references/preferences-gnome-xsession-36.png b/tests/references/preferences-gnome-xsession-36.png new file mode 100755 index 0000000..6191d22 Binary files /dev/null and b/tests/references/preferences-gnome-xsession-36.png differ diff --git a/tests/references/snap-close-gnome-wayland-nested-34.png b/tests/references/snap-close-gnome-wayland-nested-34.png index 97887b5..a09d8c0 100755 Binary files a/tests/references/snap-close-gnome-wayland-nested-34.png and b/tests/references/snap-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/snap-close-gnome-wayland-nested-35.png b/tests/references/snap-close-gnome-wayland-nested-35.png index c037f7e..0fc91fb 100755 Binary files a/tests/references/snap-close-gnome-wayland-nested-35.png and b/tests/references/snap-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/snap-close-gnome-wayland-nested-36.png b/tests/references/snap-close-gnome-wayland-nested-36.png index 30ddd3c..0fc91fb 100755 Binary files a/tests/references/snap-close-gnome-wayland-nested-36.png and b/tests/references/snap-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/snap-close-gnome-xsession-34.png b/tests/references/snap-close-gnome-xsession-34.png index 97887b5..34982be 100755 Binary files a/tests/references/snap-close-gnome-xsession-34.png and b/tests/references/snap-close-gnome-xsession-34.png differ diff --git a/tests/references/snap-close-gnome-xsession-35.png b/tests/references/snap-close-gnome-xsession-35.png index 6d318d9..6c92eb3 100755 Binary files a/tests/references/snap-close-gnome-xsession-35.png and b/tests/references/snap-close-gnome-xsession-35.png differ diff --git a/tests/references/snap-close-gnome-xsession-36.png b/tests/references/snap-close-gnome-xsession-36.png index 30ddd3c..6c92eb3 100755 Binary files a/tests/references/snap-close-gnome-xsession-36.png and b/tests/references/snap-close-gnome-xsession-36.png differ diff --git a/tests/references/snap-open-gnome-wayland-nested-34.png b/tests/references/snap-open-gnome-wayland-nested-34.png index 649660a..2c1d8c8 100755 Binary files a/tests/references/snap-open-gnome-wayland-nested-34.png and b/tests/references/snap-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/snap-open-gnome-wayland-nested-35.png b/tests/references/snap-open-gnome-wayland-nested-35.png index 2119258..a913ef0 100755 Binary files a/tests/references/snap-open-gnome-wayland-nested-35.png and b/tests/references/snap-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/snap-open-gnome-wayland-nested-36.png b/tests/references/snap-open-gnome-wayland-nested-36.png index 858d7c7..a913ef0 100755 Binary files a/tests/references/snap-open-gnome-wayland-nested-36.png and b/tests/references/snap-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/snap-open-gnome-xsession-34.png b/tests/references/snap-open-gnome-xsession-34.png index 649660a..2821955 100755 Binary files a/tests/references/snap-open-gnome-xsession-34.png and b/tests/references/snap-open-gnome-xsession-34.png differ diff --git a/tests/references/snap-open-gnome-xsession-35.png b/tests/references/snap-open-gnome-xsession-35.png index a858aed..e3bc2f3 100755 Binary files a/tests/references/snap-open-gnome-xsession-35.png and b/tests/references/snap-open-gnome-xsession-35.png differ diff --git a/tests/references/snap-open-gnome-xsession-36.png b/tests/references/snap-open-gnome-xsession-36.png index 858d7c7..e3bc2f3 100755 Binary files a/tests/references/snap-open-gnome-xsession-36.png and b/tests/references/snap-open-gnome-xsession-36.png differ diff --git a/tests/references/trex-close-gnome-wayland-nested-34.png b/tests/references/trex-close-gnome-wayland-nested-34.png index bf6dd24..86e4921 100755 Binary files a/tests/references/trex-close-gnome-wayland-nested-34.png and b/tests/references/trex-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/trex-close-gnome-wayland-nested-35.png b/tests/references/trex-close-gnome-wayland-nested-35.png index 93be804..e962cf6 100755 Binary files a/tests/references/trex-close-gnome-wayland-nested-35.png and b/tests/references/trex-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/trex-close-gnome-wayland-nested-36.png b/tests/references/trex-close-gnome-wayland-nested-36.png index 2949e4d..e962cf6 100755 Binary files a/tests/references/trex-close-gnome-wayland-nested-36.png and b/tests/references/trex-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/trex-close-gnome-xsession-34.png b/tests/references/trex-close-gnome-xsession-34.png index 526b5aa..bad4616 100755 Binary files a/tests/references/trex-close-gnome-xsession-34.png and b/tests/references/trex-close-gnome-xsession-34.png differ diff --git a/tests/references/trex-close-gnome-xsession-35.png b/tests/references/trex-close-gnome-xsession-35.png index 9b9b83f..586ace3 100755 Binary files a/tests/references/trex-close-gnome-xsession-35.png and b/tests/references/trex-close-gnome-xsession-35.png differ diff --git a/tests/references/trex-close-gnome-xsession-36.png b/tests/references/trex-close-gnome-xsession-36.png index 0029429..586ace3 100755 Binary files a/tests/references/trex-close-gnome-xsession-36.png and b/tests/references/trex-close-gnome-xsession-36.png differ diff --git a/tests/references/trex-open-gnome-wayland-nested-34.png b/tests/references/trex-open-gnome-wayland-nested-34.png index 17d003a..b170588 100755 Binary files a/tests/references/trex-open-gnome-wayland-nested-34.png and b/tests/references/trex-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/trex-open-gnome-wayland-nested-35.png b/tests/references/trex-open-gnome-wayland-nested-35.png index 9cdfdff..dd6cf50 100755 Binary files a/tests/references/trex-open-gnome-wayland-nested-35.png and b/tests/references/trex-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/trex-open-gnome-wayland-nested-36.png b/tests/references/trex-open-gnome-wayland-nested-36.png index f4e9368..dd6cf50 100755 Binary files a/tests/references/trex-open-gnome-wayland-nested-36.png and b/tests/references/trex-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/trex-open-gnome-xsession-34.png b/tests/references/trex-open-gnome-xsession-34.png index a111ccf..665690c 100755 Binary files a/tests/references/trex-open-gnome-xsession-34.png and b/tests/references/trex-open-gnome-xsession-34.png differ diff --git a/tests/references/trex-open-gnome-xsession-35.png b/tests/references/trex-open-gnome-xsession-35.png index 793b06d..34172e9 100755 Binary files a/tests/references/trex-open-gnome-xsession-35.png and b/tests/references/trex-open-gnome-xsession-35.png differ diff --git a/tests/references/trex-open-gnome-xsession-36.png b/tests/references/trex-open-gnome-xsession-36.png index 357dbc2..34172e9 100755 Binary files a/tests/references/trex-open-gnome-xsession-36.png and b/tests/references/trex-open-gnome-xsession-36.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-32.png b/tests/references/tv-close-gnome-wayland-nested-32.png index 118a300..1259154 100755 Binary files a/tests/references/tv-close-gnome-wayland-nested-32.png and b/tests/references/tv-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-33.png b/tests/references/tv-close-gnome-wayland-nested-33.png index 59affdb..42d17b9 100755 Binary files a/tests/references/tv-close-gnome-wayland-nested-33.png and b/tests/references/tv-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-34.png b/tests/references/tv-close-gnome-wayland-nested-34.png index 658ddd4..4643947 100755 Binary files a/tests/references/tv-close-gnome-wayland-nested-34.png and b/tests/references/tv-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-35.png b/tests/references/tv-close-gnome-wayland-nested-35.png index 658ddd4..7fce269 100755 Binary files a/tests/references/tv-close-gnome-wayland-nested-35.png and b/tests/references/tv-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-36.png b/tests/references/tv-close-gnome-wayland-nested-36.png index c16c106..7fce269 100755 Binary files a/tests/references/tv-close-gnome-wayland-nested-36.png and b/tests/references/tv-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/tv-close-gnome-xsession-32.png b/tests/references/tv-close-gnome-xsession-32.png index 118a300..44b5ab3 100755 Binary files a/tests/references/tv-close-gnome-xsession-32.png and b/tests/references/tv-close-gnome-xsession-32.png differ diff --git a/tests/references/tv-close-gnome-xsession-33.png b/tests/references/tv-close-gnome-xsession-33.png index 59affdb..c548854 100755 Binary files a/tests/references/tv-close-gnome-xsession-33.png and b/tests/references/tv-close-gnome-xsession-33.png differ diff --git a/tests/references/tv-close-gnome-xsession-34.png b/tests/references/tv-close-gnome-xsession-34.png index 658ddd4..074b001 100755 Binary files a/tests/references/tv-close-gnome-xsession-34.png and b/tests/references/tv-close-gnome-xsession-34.png differ diff --git a/tests/references/tv-close-gnome-xsession-35.png b/tests/references/tv-close-gnome-xsession-35.png index 4489162..4b7f36c 100755 Binary files a/tests/references/tv-close-gnome-xsession-35.png and b/tests/references/tv-close-gnome-xsession-35.png differ diff --git a/tests/references/tv-close-gnome-xsession-36.png b/tests/references/tv-close-gnome-xsession-36.png index c16c106..4b7f36c 100755 Binary files a/tests/references/tv-close-gnome-xsession-36.png and b/tests/references/tv-close-gnome-xsession-36.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-32.png b/tests/references/tv-open-gnome-wayland-nested-32.png index 8c00699..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-wayland-nested-32.png and b/tests/references/tv-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-33.png b/tests/references/tv-open-gnome-wayland-nested-33.png index 3eb88ef..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-wayland-nested-33.png and b/tests/references/tv-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-34.png b/tests/references/tv-open-gnome-wayland-nested-34.png index 78c8130..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-wayland-nested-34.png and b/tests/references/tv-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-35.png b/tests/references/tv-open-gnome-wayland-nested-35.png index 78c8130..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-wayland-nested-35.png and b/tests/references/tv-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-36.png b/tests/references/tv-open-gnome-wayland-nested-36.png index 938fe28..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-wayland-nested-36.png and b/tests/references/tv-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/tv-open-gnome-xsession-32.png b/tests/references/tv-open-gnome-xsession-32.png index 8c00699..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-xsession-32.png and b/tests/references/tv-open-gnome-xsession-32.png differ diff --git a/tests/references/tv-open-gnome-xsession-33.png b/tests/references/tv-open-gnome-xsession-33.png index 3eb88ef..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-xsession-33.png and b/tests/references/tv-open-gnome-xsession-33.png differ diff --git a/tests/references/tv-open-gnome-xsession-34.png b/tests/references/tv-open-gnome-xsession-34.png index 78c8130..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-xsession-34.png and b/tests/references/tv-open-gnome-xsession-34.png differ diff --git a/tests/references/tv-open-gnome-xsession-35.png b/tests/references/tv-open-gnome-xsession-35.png index 5a9fcee..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-xsession-35.png and b/tests/references/tv-open-gnome-xsession-35.png differ diff --git a/tests/references/tv-open-gnome-xsession-36.png b/tests/references/tv-open-gnome-xsession-36.png index 938fe28..5c13ba7 100755 Binary files a/tests/references/tv-open-gnome-xsession-36.png and b/tests/references/tv-open-gnome-xsession-36.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-32.png b/tests/references/wisps-close-gnome-wayland-nested-32.png index b58b673..dea82c3 100755 Binary files a/tests/references/wisps-close-gnome-wayland-nested-32.png and b/tests/references/wisps-close-gnome-wayland-nested-32.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-33.png b/tests/references/wisps-close-gnome-wayland-nested-33.png index 9690417..cb69e57 100755 Binary files a/tests/references/wisps-close-gnome-wayland-nested-33.png and b/tests/references/wisps-close-gnome-wayland-nested-33.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-34.png b/tests/references/wisps-close-gnome-wayland-nested-34.png index d51e761..d2478b9 100755 Binary files a/tests/references/wisps-close-gnome-wayland-nested-34.png and b/tests/references/wisps-close-gnome-wayland-nested-34.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-35.png b/tests/references/wisps-close-gnome-wayland-nested-35.png index d51e761..b1428e3 100755 Binary files a/tests/references/wisps-close-gnome-wayland-nested-35.png and b/tests/references/wisps-close-gnome-wayland-nested-35.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-36.png b/tests/references/wisps-close-gnome-wayland-nested-36.png index 333515b..b1428e3 100755 Binary files a/tests/references/wisps-close-gnome-wayland-nested-36.png and b/tests/references/wisps-close-gnome-wayland-nested-36.png differ diff --git a/tests/references/wisps-close-gnome-xsession-32.png b/tests/references/wisps-close-gnome-xsession-32.png index b58b673..bafaabd 100755 Binary files a/tests/references/wisps-close-gnome-xsession-32.png and b/tests/references/wisps-close-gnome-xsession-32.png differ diff --git a/tests/references/wisps-close-gnome-xsession-33.png b/tests/references/wisps-close-gnome-xsession-33.png index 9690417..30e96c7 100755 Binary files a/tests/references/wisps-close-gnome-xsession-33.png and b/tests/references/wisps-close-gnome-xsession-33.png differ diff --git a/tests/references/wisps-close-gnome-xsession-34.png b/tests/references/wisps-close-gnome-xsession-34.png index 6a9f66d..a13dd42 100755 Binary files a/tests/references/wisps-close-gnome-xsession-34.png and b/tests/references/wisps-close-gnome-xsession-34.png differ diff --git a/tests/references/wisps-close-gnome-xsession-35.png b/tests/references/wisps-close-gnome-xsession-35.png index d51e761..0751740 100755 Binary files a/tests/references/wisps-close-gnome-xsession-35.png and b/tests/references/wisps-close-gnome-xsession-35.png differ diff --git a/tests/references/wisps-close-gnome-xsession-36.png b/tests/references/wisps-close-gnome-xsession-36.png index 333515b..0751740 100755 Binary files a/tests/references/wisps-close-gnome-xsession-36.png and b/tests/references/wisps-close-gnome-xsession-36.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-32.png b/tests/references/wisps-open-gnome-wayland-nested-32.png index 8adc51c..3017f31 100755 Binary files a/tests/references/wisps-open-gnome-wayland-nested-32.png and b/tests/references/wisps-open-gnome-wayland-nested-32.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-33.png b/tests/references/wisps-open-gnome-wayland-nested-33.png index 6819ba0..6551fbc 100755 Binary files a/tests/references/wisps-open-gnome-wayland-nested-33.png and b/tests/references/wisps-open-gnome-wayland-nested-33.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-34.png b/tests/references/wisps-open-gnome-wayland-nested-34.png index fd2fa64..adfdd22 100755 Binary files a/tests/references/wisps-open-gnome-wayland-nested-34.png and b/tests/references/wisps-open-gnome-wayland-nested-34.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-35.png b/tests/references/wisps-open-gnome-wayland-nested-35.png index fd2fa64..9be7b85 100755 Binary files a/tests/references/wisps-open-gnome-wayland-nested-35.png and b/tests/references/wisps-open-gnome-wayland-nested-35.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-36.png b/tests/references/wisps-open-gnome-wayland-nested-36.png index b55014f..9be7b85 100755 Binary files a/tests/references/wisps-open-gnome-wayland-nested-36.png and b/tests/references/wisps-open-gnome-wayland-nested-36.png differ diff --git a/tests/references/wisps-open-gnome-xsession-32.png b/tests/references/wisps-open-gnome-xsession-32.png index 8adc51c..5064f3b 100755 Binary files a/tests/references/wisps-open-gnome-xsession-32.png and b/tests/references/wisps-open-gnome-xsession-32.png differ diff --git a/tests/references/wisps-open-gnome-xsession-33.png b/tests/references/wisps-open-gnome-xsession-33.png index 6819ba0..717d537 100755 Binary files a/tests/references/wisps-open-gnome-xsession-33.png and b/tests/references/wisps-open-gnome-xsession-33.png differ diff --git a/tests/references/wisps-open-gnome-xsession-34.png b/tests/references/wisps-open-gnome-xsession-34.png index b7d5be0..7a23583 100755 Binary files a/tests/references/wisps-open-gnome-xsession-34.png and b/tests/references/wisps-open-gnome-xsession-34.png differ diff --git a/tests/references/wisps-open-gnome-xsession-35.png b/tests/references/wisps-open-gnome-xsession-35.png index fd2fa64..925ff85 100755 Binary files a/tests/references/wisps-open-gnome-xsession-35.png and b/tests/references/wisps-open-gnome-xsession-35.png differ diff --git a/tests/references/wisps-open-gnome-xsession-36.png b/tests/references/wisps-open-gnome-xsession-36.png index b55014f..925ff85 100755 Binary files a/tests/references/wisps-open-gnome-xsession-36.png and b/tests/references/wisps-open-gnome-xsession-36.png differ diff --git a/tests/run-test.sh b/tests/run-test.sh index 5b28e76..5ab0424 100755 --- a/tests/run-test.sh +++ b/tests/run-test.sh @@ -94,39 +94,25 @@ do_in_pod() { # "tests/output/". fail() { echo "${2}" - mkdir "tests/output" - mv "${WORK_DIR}/crop.png" "tests/output/${1}" - mv "${WORK_DIR}/screen.png" tests/output/ + mkdir -p "tests/output" + mv "${WORK_DIR}/screen.png" "tests/output/${1}" LOG=$(do_in_pod sudo journalctl) echo "${LOG}" > tests/output/fail.log exit 1 } -# This captures the center of the virtual screen in the container and cmopares it to the -# given target image (first parameter). If it is not found, an error message (second -# paramter) is printed and the script exits via the fail() method above. -compare_with_target() { - echo "Looking for ${1} on the screen." - - podman cp "${POD}:/opt/Xvfb_screen0" - | tar xf - --to-command "convert xwd:- ${WORK_DIR}/screen.png" - - convert "${WORK_DIR}/screen.png" -crop ${CROP} "${WORK_DIR}/crop.png" - - DIFF=$(compare "${WORK_DIR}/crop.png" "tests/references/${1}" -metric NCC "${WORK_DIR}/diff.png" 2>&1) || true - - if (( $(echo "$DIFF < 0.9" |bc -l) )); then - fail "${1}" "${2}" - fi -} - # This searches the virtual screen of the container for a given target image (first # parameter). If it is not found, an error message (second paramter) is printed and the # script exits via the fail() method above. find_target() { echo "Searching for ${1} on the screen." - POS=$(do_in_pod find-target.sh "${1}") || true + + podman cp "${POD}:/opt/Xvfb_screen0" - | tar xf - --to-command "convert xwd:- ${WORK_DIR}/screen.png" + + POS=$(./tests/find-target.sh "${WORK_DIR}/screen.png" "tests/references/${1}") || true + if [[ -z "${POS}" ]]; then - fail "${2}" + fail "${1}" "${2}" fi } @@ -159,10 +145,10 @@ test_effect() { sleep 1 do_in_pod gnome-terminal sleep 3 - compare_with_target "${1}-open-${SESSION}-${FEDORA_VERSION}.png" "Failed to test ${1} window open effect!" + find_target "${1}-open-${SESSION}-${FEDORA_VERSION}.png" "Failed to test ${1} window open effect!" send_keystroke "Alt+F4" sleep 3 - compare_with_target "${1}-close-${SESSION}-${FEDORA_VERSION}.png" "Failed to test ${1} window close effect!" + find_target "${1}-close-${SESSION}-${FEDORA_VERSION}.png" "Failed to test ${1} window close effect!" } @@ -175,6 +161,7 @@ do_in_pod wait-user-bus.sh > /dev/null 2>&1 # ----------------------------------------------------- install the to-be-tested extension echo "Installing extension." +podman cp "tests/references" "${POD}:/home/gnomeshell/references" podman cp "${EXTENSION}.zip" "${POD}:/home/gnomeshell" do_in_pod gnome-extensions install "${EXTENSION}.zip" @@ -220,7 +207,7 @@ sleep 3 echo "Opening Preferences." do_in_pod gnome-extensions prefs "${EXTENSION}" sleep 3 -find_target "tests/references/preferences-${SESSION}-${FEDORA_VERSION}.png" "Failed to open preferences!" +find_target "preferences-${SESSION}-${FEDORA_VERSION}.png" "Failed to open preferences!" send_keystroke "Alt+F4" # The test mode ensures that the animations are "frozen" and do not change in time.