paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-23 05:19:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5,Qt6: fixed paste from firefox under wayland. issue #40423

Browse Source
This commit is contained in:
Željan Rikalo 2023-09-06 21:29:34 +02:00
parent 3b39a80d16
commit 11f4629097
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lcl/interfaces/qt5/qtobjects.pas
View File

@ -4085,17 +4085,46 @@ var
Data: QByteArrayH; Data: QByteArrayH;
p: PAnsiChar; p: PAnsiChar;
s: Integer; s: Integer;
{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
i: integer;
WStr: WideString;
AFormats: QStringListH;
{$ENDIF}
begin begin
Result := False; Result := False;
QtMimeData := getMimeData(ClipbBoardTypeToQtClipboard[ClipBoardType]); QtMimeData := getMimeData(ClipbBoardTypeToQtClipboard[ClipBoardType]);
MimeType := UTF8ToUTF16(FormatToMimeType(FormatID)); MimeType := UTF8ToUTF16(FormatToMimeType(FormatID));
{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
//issue #40423
if (MimeType = 'text/plain') then // do not translate
begin
QGuiApplication_platformName(@WStr);
if CompareText(Copy(UTF16ToUTF8(WStr), 1, 7),'wayland') = 0 then // do not translate
begin
AFormats := QStringList_Create;
QMimeData_formats(QtMimeData, AFormats);
for i := 0 to QStringList_size(AFormats) - 1 do
begin
QStringList_at(AFormats, @WStr, i);
if WStr = 'text/plain;charset=utf-8' then // do not translate
begin
MimeType := WStr;
break;
end;
end;
QStringlist_destroy(AFormats);
end;
end;
{$ENDIF}
Data := QByteArray_create(); Data := QByteArray_create();
QMimeData_data(QtMimeData, Data, @MimeType); QMimeData_data(QtMimeData, Data, @MimeType);
s := QByteArray_size(Data); s := QByteArray_size(Data);
p := QByteArray_data(Data); p := QByteArray_constData(Data);
Stream.Write(p^, s); Stream.Write(p^, s);
// what to do with p? FreeMem or nothing? // what to do with p? FreeMem or nothing?
QByteArray_destroy(Data); QByteArray_destroy(Data);
Result := True; Result := True;
end; end;

31
lcl/interfaces/qt6/qtobjects.pas
View File

@ -4246,17 +4246,46 @@ var
Data: QByteArrayH; Data: QByteArrayH;
p: PAnsiChar; p: PAnsiChar;
s: Integer; s: Integer;
{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
i: integer;
WStr: WideString;
AFormats: QStringListH;
{$ENDIF}
begin begin
Result := False; Result := False;
QtMimeData := getMimeData(ClipbBoardTypeToQtClipboard[ClipBoardType]); QtMimeData := getMimeData(ClipbBoardTypeToQtClipboard[ClipBoardType]);
MimeType := UTF8ToUTF16(FormatToMimeType(FormatID)); MimeType := UTF8ToUTF16(FormatToMimeType(FormatID));
{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
//issue #40423
if (MimeType = 'text/plain') then // do not translate
begin
QGuiApplication_platformName(@WStr);
if CompareText(Copy(UTF16ToUTF8(WStr), 1, 7),'wayland') = 0 then // do not translate
begin
AFormats := QStringList_Create;
QMimeData_formats(QtMimeData, AFormats);
for i := 0 to QStringList_size(AFormats) - 1 do
begin
QStringList_at(AFormats, @WStr, i);
if WStr = 'text/plain;charset=utf-8' then // do not translate
begin
MimeType := WStr;
break;
end;
end;
QStringlist_destroy(AFormats);
end;
end;
{$ENDIF}
Data := QByteArray_create(); Data := QByteArray_create();
QMimeData_data(QtMimeData, Data, @MimeType); QMimeData_data(QtMimeData, Data, @MimeType);
s := QByteArray_size(Data); s := QByteArray_size(Data);
p := QByteArray_data(Data); p := QByteArray_constData(Data);
Stream.Write(p^, s); Stream.Write(p^, s);
// what to do with p? FreeMem or nothing? // what to do with p? FreeMem or nothing?
QByteArray_destroy(Data); QByteArray_destroy(Data);
Result := True; Result := True;
end; end;