TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-18 02:10:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Preserve the macOS cursor wire alpha format for older controllers

Browse Source
This commit is contained in:
fufesou
2026-09-12 21:47:08 +08:00
parent 371e5e8f2d
commit afdd1d5c9d
7 changed files with 85 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
flutter/lib/models/model.dart
View File

@@ -3459,18 +3459,11 @@ class CursorModel with ChangeNotifier {
throw FormatException('Invalid cursor pixel ratio: $pixelRatio');
}
List<dynamic> colors = json.decode(evt['colors']);
var rgba = Uint8List.fromList(colors.map((s) => s as int).toList());
final rgba = Uint8List.fromList(colors.map((s) => s as int).toList());
final ui.Image? image;
if (isWeb &&
pixelRatio > 0 &&
if (!isWeb &&
parent.target?.ffiModel.pi.platform == kPeerPlatformMacOS) {
// macOS cursors with density metadata use premultiplied alpha; older
// hosts send straight alpha. Web needs a straight-alpha resize source.
(rgba, image) = await _decodeWebMacCursor(rgba, width, height);
} else if (!isWeb &&
pixelRatio == 0 &&
parent.target?.ffiModel.pi.platform == kPeerPlatformMacOS) {
image = await _decodeLegacyMacCursor(rgba, width, height);
image = await _decodeMacCursor(rgba, width, height);
} else {
image = await img.decodeImageFromPixels(
rgba, width, height, ui.PixelFormat.rgba8888);
@@ -3491,10 +3484,10 @@ class CursorModel with ChangeNotifier {
_updateCurData();
}
Future<ui.Image?> _decodeLegacyMacCursor(
Future<ui.Image?> _decodeMacCursor(
Uint8List rgba, int width, int height) async {
// Old macOS packets are straight alpha. Premultiply a copy for native
// ui.Image, retaining the original colors for the separate byte cache.
// macOS packets keep straight alpha, regardless of density metadata.
// Premultiply only for native ui.Image; the PNG cache needs straight colors.
final source = img2.Image.fromBytes(
width: width, height: height, bytes: rgba.buffer, order: img2.ChannelOrder.rgba);
for (final pixel in source) {
@@ -3507,30 +3500,6 @@ class CursorModel with ChangeNotifier {
source.getBytes(), width, height, ui.PixelFormat.rgba8888);
}
Future<(Uint8List, ui.Image)> _decodeWebMacCursor(
Uint8List rgba, int width, int height) async {
final source = img2.Image.fromBytes(
width: width, height: height, bytes: rgba.buffer, order: img2.ChannelOrder.rgba);
for (final pixel in source) {
final alpha = pixel.a;
if (alpha == 0) continue;
final maxChannel = pixel.maxChannelValue;
// RGB and alpha rounding in capture can differ by one channel value.
pixel.r = min(maxChannel, (pixel.r * maxChannel / alpha).round());
pixel.g = min(maxChannel, (pixel.g * maxChannel / alpha).round());
pixel.b = min(maxChannel, (pixel.b * maxChannel / alpha).round());
}
// Web ImageDescriptor.raw treats RGBA as straight alpha. Decode a PNG so
// both the painted cursor and the resize source use the correct colors.
final codec = await ui.instantiateImageCodec(
Uint8List.fromList(img2.encodePng(source)));
try {
return (source.getBytes(), (await codec.getNextFrame()).image);
} finally {
codec.dispose();
}
}
Future<bool> _updateCache(
Uint8List rgba,
ui.Image image,