forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only premultiply for xrender, not for a 32 bit visual

This commit is contained in:
Adam D. Ruppe 2023-09-27 09:05:35 -04:00
parent 0fd808ed32
commit 2433b60d91
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
simpledisplay.d
View File

@ -5232,7 +5232,7 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
this.originalMemoryImage = i; this.originalMemoryImage = i;
if (!active) return; if (!active) return;
if (i !is null) { if (i !is null) {
this.img = Image.fromMemoryImage(i, useAlpha); this.img = Image.fromMemoryImage(i, useAlpha, false);
this.clippixmap = transparencyMaskFromMemoryImage(i, nativeHandle); this.clippixmap = transparencyMaskFromMemoryImage(i, nativeHandle);
// writeln("using pixmap ", clippixmap); // writeln("using pixmap ", clippixmap);
updateNetWmIcon(); updateNetWmIcon();
@ -8066,9 +8066,11 @@ final class Image {
} }
/// ///
static Image fromMemoryImage(MemoryImage i, bool enableAlpha = false) { static Image fromMemoryImage(MemoryImage i, bool enableAlpha = false, bool premultiply = true) {
auto tci = i.getAsTrueColorImage(); auto tci = i.getAsTrueColorImage();
auto img = new Image(tci.width, tci.height, false, enableAlpha); auto img = new Image(tci.width, tci.height, false, enableAlpha);
static if(UsingSimpledisplayX11)
img.premultiply = premultiply;
img.setRgbaBytes(tci.imageData.bytes); img.setRgbaBytes(tci.imageData.bytes);
return img; return img;
} }
@ -14234,6 +14236,7 @@ mixin DynamicLoad!(XRandr, "Xrandr", 2, XRandrLibrarySuccessfullyLoaded) XRandrL
ubyte* rawData; ubyte* rawData;
XShmSegmentInfo shminfo; XShmSegmentInfo shminfo;
bool premultiply = true;
__gshared bool xshmQueryCompleted; __gshared bool xshmQueryCompleted;
__gshared bool _xshmAvailable; __gshared bool _xshmAvailable;
@ -14388,13 +14391,13 @@ mixin DynamicLoad!(XRandr, "Xrandr", 2, XRandrLibrarySuccessfullyLoaded) XRandrL
c.b = rawData[offset + 0]; c.b = rawData[offset + 0];
c.g = rawData[offset + 1]; c.g = rawData[offset + 1];
c.r = rawData[offset + 2]; c.r = rawData[offset + 2];
if(enableAlpha) if(enableAlpha && premultiply)
c.unPremultiply; c.unPremultiply;
return c; return c;
} }
void setPixel(int x, int y, Color c) { void setPixel(int x, int y, Color c) {
if(enableAlpha) if(enableAlpha && premultiply)
c.premultiply(); c.premultiply();
auto offset = (y * width + x) * 4; auto offset = (y * width + x) * 4;
rawData[offset + 0] = c.b; rawData[offset + 0] = c.b;
@ -14415,7 +14418,7 @@ mixin DynamicLoad!(XRandr, "Xrandr", 2, XRandrLibrarySuccessfullyLoaded) XRandrL
where[idx + 2] = rawData[idx + 0]; // b where[idx + 2] = rawData[idx + 0]; // b
where[idx + 3] = enableAlpha ? rawData[idx + 3] : 255; // a where[idx + 3] = enableAlpha ? rawData[idx + 3] : 255; // a
if(enableAlpha) if(enableAlpha && premultiply)
unPremultiplyRgba(where[idx .. idx + 4]); unPremultiplyRgba(where[idx .. idx + 4]);
} }
} }
@ -14431,7 +14434,8 @@ mixin DynamicLoad!(XRandr, "Xrandr", 2, XRandrLibrarySuccessfullyLoaded) XRandrL
rawData[idx + 0] = where[idx + 2]; // b rawData[idx + 0] = where[idx + 2]; // b
if(enableAlpha) { if(enableAlpha) {
rawData[idx + 3] = where[idx + 3]; // a rawData[idx + 3] = where[idx + 3]; // a
premultiplyBgra(rawData[idx .. idx + 4]); if(premultiply)
premultiplyBgra(rawData[idx .. idx + 4]);
} }
} }
} }