screenshot/colorpicker: handle 24-bit frames from compositor

core/internal/screenshot/region.go

@@ -382,9 +382,12 @@ func (r *RegionSelector) preCaptureOutput(output *WaylandOutput, pc *PreCapture,
 
 	var capturedBuf *ShmBuffer
 
+	var capturedFormat PixelFormat
 	frame.SetBufferHandler(func(e wlr_screencopy.ZwlrScreencopyFrameV1BufferEvent) {
-		if int(e.Stride) < int(e.Width)*4 {
-			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width)
+		capturedFormat = PixelFormat(e.Format)
+		bpp := capturedFormat.BytesPerPixel()
+		if int(e.Stride) < int(e.Width)*bpp {
+			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width, "bpp", bpp)
 			return
 		}
 		buf, err := CreateShmBuffer(int(e.Width), int(e.Height), int(e.Stride))
@@ -394,7 +397,7 @@ func (r *RegionSelector) preCaptureOutput(output *WaylandOutput, pc *PreCapture,
 		}
 
 		capturedBuf = buf
-		pc.format = e.Format
+		buf.Format = capturedFormat
 
 		pool, err := r.shm.CreatePool(buf.Fd(), int32(buf.Size()))
 		if err != nil {
@@ -429,6 +432,19 @@ func (r *RegionSelector) preCaptureOutput(output *WaylandOutput, pc *PreCapture,
 			return
 		}
 
+		if capturedFormat.Is24Bit() {
+			converted, newFormat, err := capturedBuf.ConvertTo32Bit(capturedFormat)
+			if err != nil {
+				log.Error("convert 24-bit to 32-bit failed", "err", err)
+			} else if converted != capturedBuf {
+				capturedBuf.Close()
+				capturedBuf = converted
+				capturedFormat = newFormat
+			}
+		}
+
+		pc.format = uint32(capturedFormat)
+
 		if pc.yInverted {
 			capturedBuf.FlipVertical()
 			pc.yInverted = false

core/internal/screenshot/screenshot.go

@@ -717,8 +717,10 @@ func (s *Screenshoter) processFrame(frame *wlr_screencopy.ZwlrScreencopyFrameV1,
 	failed := false
 
 	frame.SetBufferHandler(func(e wlr_screencopy.ZwlrScreencopyFrameV1BufferEvent) {
-		if int(e.Stride) < int(e.Width)*4 {
-			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width)
+		format = PixelFormat(e.Format)
+		bpp := format.BytesPerPixel()
+		if int(e.Stride) < int(e.Width)*bpp {
+			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width, "bpp", bpp)
 			return
 		}
 		var err error
@@ -727,7 +729,6 @@ func (s *Screenshoter) processFrame(frame *wlr_screencopy.ZwlrScreencopyFrameV1,
 			log.Error("failed to create buffer", "err", err)
 			return
 		}
-		format = PixelFormat(e.Format)
 		buf.Format = format
 	})
 
@@ -790,6 +791,19 @@ func (s *Screenshoter) processFrame(frame *wlr_screencopy.ZwlrScreencopyFrameV1,
 		return nil, fmt.Errorf("frame capture failed")
 	}
 
+	if format.Is24Bit() {
+		converted, newFormat, err := buf.ConvertTo32Bit(format)
+		if err != nil {
+			buf.Close()
+			return nil, fmt.Errorf("convert 24-bit to 32-bit: %w", err)
+		}
+		if converted != buf {
+			buf.Close()
+			buf = converted
+		}
+		format = newFormat
+	}
+
 	return &CaptureResult{
 		Buffer:    buf,
 		Region:    region,

core/internal/screenshot/shm.go

@@ -9,6 +9,8 @@ const (
 	FormatXRGB8888 = shm.FormatXRGB8888
 	FormatABGR8888 = shm.FormatABGR8888
 	FormatXBGR8888 = shm.FormatXBGR8888
+	FormatRGB888   = shm.FormatRGB888
+	FormatBGR888   = shm.FormatBGR888
 )
 
 const (