# HG changeset patch # User Jan Vrany # Date 1515101740 0 # Node ID a8343a9d983f92d92751e1d0cf974a8745486eed # Parent 5382a417a503a795af5b2f6f8948577461327864 Issue #190: improve #supportsScreenReading to detext XWayland session ...and in that return `false` since XWayland does not support `XGetImage()` https://swing.fit.cvut.cz/projects/stx-jv/ticket/190 diff -r 5382a417a503 -r a8343a9d983f XWorkstation.st --- a/XWorkstation.st Wed Jan 03 22:19:22 2018 +0000 +++ b/XWorkstation.st Thu Jan 04 21:35:40 2018 +0000 @@ -1861,14 +1861,26 @@ Blame: I cannot ask via server vendor, if its a Quartz display, because it does not return a valid server vendor string" OperatingSystem isOSXlike ifTrue:[ - ^ false - ]. + ^ false + ]. + + " + XWayland also does not support XGetImage() and the XWayland's vendor string + is just 'The X.Org Foundation', sigh. + + See https://swing.fit.cvut.cz/projects/stx-jv/ticket/190 + " + ((OperatingSystem getEnvironment:'WAYLAND_DISPLAY') notNil + or:[ (OperatingSystem getEnvironment:'XDG_SESSION_TYPE') = 'wayland']) ifTrue:[ ^ false]. + ^ true " Display serverVendor Display supportsScreenReading " + + "Modified: / 04-01-2018 / 21:00:36 / Jan Vrany " ! supportsUTF8WindowLabels