Fetch the real colorspace for the drawable when creating scratch bitm…

…aps.
waddlesplash · Mar 21, 2022 · 441ad19 · 441ad19
1 parent 8eda2dc
commit 441ad19
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/xlib/Drawables.cpp b/xlib/Drawables.cpp
@@ -6,6 +6,7 @@
 #include "Drawables.h"
 
 #include <interface/Bitmap.h>
+#include <interface/Screen.h>
 
 #include <set>
 #include <atomic>
@@ -400,6 +401,12 @@ XWindow::border_pixel(long border_color)
 	UnlockLooper();
 }
 
+color_space
+XWindow::colorspace()
+{
+	return BScreen(Window()).ColorSpace();
+}
+
 bool
 XWindow::resize(BSize newSize)
 {
@@ -827,6 +834,12 @@ XPixmap::~XPixmap()
 	delete _offscreen;
 }
 
+color_space
+XPixmap::colorspace()
+{
+	return _offscreen->ColorSpace();
+}
+
 bool
 XPixmap::resize(BSize newSize)
 {

diff --git a/xlib/Drawables.h b/xlib/Drawables.h
@@ -72,6 +72,7 @@ class XDrawable : XLIBE_DRAWABLES_PROTECTED BView {
 	virtual ~XDrawable() override;
 
 	BView* view() { return this; }
+	virtual color_space colorspace() = 0;
 
 	Display* display() const { return _display; }
 	Drawable id() const { return _id; }
@@ -112,6 +113,8 @@ class XWindow : public XDrawable {
 
 	void create_bwindow();
 
+	virtual color_space colorspace() override;
+
 	virtual bool resize(BSize newSize) override;
 
 	int border_width() { return _border_width; }
@@ -164,6 +167,8 @@ class XPixmap : public XDrawable {
 	XPixmap(Display* dpy, BRect frame, unsigned int depth);
 	virtual ~XPixmap() override;
 
+	virtual color_space colorspace() override;
+
 	int depth() { return _depth; }
 	BBitmap* offscreen() { return _offscreen; }
 

diff --git a/xlib/Drawing.cpp b/xlib/Drawing.cpp
@@ -372,8 +372,7 @@ XPutImage(Display *display, Drawable d, GC gc, XImage* image,
 			size.height = scratchBounds.Height();
 
 		delete drawable->scratch_bitmap;
-		drawable->scratch_bitmap = new BBitmap(BRect(BPoint(0, 0), size), 0, B_RGB32);
-			// TODO: or FIXME: get the actual color space?
+		drawable->scratch_bitmap = new BBitmap(BRect(BPoint(0, 0), size), 0, drawable->colorspace());
 	}
 
 	// TODO: Optimization: Import only the bits we are about to draw!