mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: ShellExecute - call '/bin/open' directly

Browse source
This commit is contained in:
Alexander Koblov 2022-11-26 12:28:38 +03:00
commit 8a8eccf5f4
2 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/platform/uOSUtils.pas
View file

@ -201,9 +201,7 @@ uses
, BaseUnix, Unix, uMyUnix, dl
{$IF DEFINED(DARWIN)}
, CocoaAll, uMyDarwin
{$ELSEIF DEFINED(HAIKU)}
, uMyHaiku
{$ELSE}
{$ELSEIF NOT DEFINED(HAIKU)}
, uGio, uClipboard, uXdg, uKde
{$ENDIF}
{$ENDIF}
@ -410,42 +408,44 @@ begin
CFRelease(theFileNameUrlRef);
end;
end;
{$ELSEIF DEFINED(HAIKU)}
begin
Result:= OpenUrl(URL);
end;
{$ELSE}
var
sCmdLine: String;
begin
Result:= False;
sCmdLine:= EmptyStr;
if FileIsUnixExecutable(URL) then
begin
if GetPathType(URL) <> ptAbsolute then
sCmdLine := './';
sCmdLine:= sCmdLine + QuoteStr(URL);
end
else
begin
if (DesktopEnv = DE_KDE) and (HasKdeOpen = True) then
Result:= KioOpen(URL) // Under KDE use "kioclient" to open files
else if HasGio and (DesktopEnv <> DE_XFCE) then
Result:= GioOpen(URL) // Under GNOME, Unity and LXDE use "GIO" to open files
else
begin
if GetPathType(URL) = ptAbsolute then
sCmdLine:= URL
else
begin
sCmdLine := IncludeTrailingPathDelimiter(mbGetCurrentDir);
sCmdLine:= GetAbsoluteFileName(sCmdLine, URL)
end;
sCmdLine:= GetDefaultAppCmd(sCmdLine);
end;
begin
if GetPathType(URL) = ptAbsolute then
sCmdLine:= URL
else begin
sCmdLine:= IncludeTrailingPathDelimiter(mbGetCurrentDir);
sCmdLine:= GetAbsoluteFileName(sCmdLine, URL)
end;
if Length(sCmdLine) <> 0 then
end
else begin
{$IF NOT DEFINED(HAIKU)}
if (DesktopEnv = DE_KDE) and (HasKdeOpen = True) then
Result:= KioOpen(URL) // Under KDE use "kioclient" to open files
else if HasGio and (DesktopEnv <> DE_XFCE) then
Result:= GioOpen(URL) // Under GNOME, Unity and LXDE use "GIO" to open files
else
{$ENDIF}
begin
if GetPathType(URL) = ptAbsolute then
sCmdLine:= URL
else begin
sCmdLine:= IncludeTrailingPathDelimiter(mbGetCurrentDir);
sCmdLine:= GetAbsoluteFileName(sCmdLine, URL)
end;
sCmdLine:= GetDefaultAppCmd(sCmdLine);
end;
end;
if Length(sCmdLine) > 0 then begin
Result:= ExecCmdFork(sCmdLine);
end;
end;
{$ENDIF}

4
src/platform/unix/umyunix.pas
View file

@ -384,6 +384,10 @@ begin
Result:= 'xdg-open ' + QuoteStr(FileName);
FreeAndNil(Filenames);
end;
{$ELSEIF DEFINED(HAIKU)}
begin
Result:= '/bin/open ' + QuoteStr(FileName);
end;
{$ELSE}
begin
Result:= 'xdg-open ' + QuoteStr(FileName);