i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Terminal: Support paths starting with '~' in hyperlink mode

Browse Source 
Implements #12282.
This commit is contained in:
Ingo Weinhold
2015-08-03 13:15:59 +02:00
parent 7771139cdf
commit 52100b0c0e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermViewStates.cpp
+13 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2013, Haiku, Inc. * Copyright 2001-2015, Haiku, Inc.
* Copyright 2003-2004 Kian Duffy, [email protected] * Copyright 2003-2004 Kian Duffy, [email protected]
* Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai. * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
* All rights reserved. Distributed under the terms of the MIT license. * All rights reserved. Distributed under the terms of the MIT license.
@@ -23,8 +23,10 @@
#include <Catalog.h> #include <Catalog.h>
#include <Clipboard.h> #include <Clipboard.h>
#include <Cursor.h> #include <Cursor.h>
#include <FindDirectory.h>
#include <LayoutBuilder.h> #include <LayoutBuilder.h>
#include <MessageRunner.h> #include <MessageRunner.h>
#include <Path.h>
#include <PopUpMenu.h> #include <PopUpMenu.h>
#include <ScrollBar.h> #include <ScrollBar.h>
#include <UTF8.h> #include <UTF8.h>
@@ -896,7 +898,8 @@ TermView::HyperLinkState::_GetHyperLinkAt(BPoint where, bool pathPrefixOnly,
path.Truncate(colonIndex); path.Truncate(colonIndex);
if (_EntryExists(path, actualPath)) { if (_EntryExists(path, actualPath)) {
BString address = path == actualPath BString address = path == actualPath
? text : BString(fCurrentDirectory) << '/' << text; ? text
: BString(actualPath) << (text.String() + colonIndex);
_link = HyperLink(text, address, _link = HyperLink(text, address,
i == 0 i == 0
? HyperLink::TYPE_PATH_WITH_LINE ? HyperLink::TYPE_PATH_WITH_LINE
@@ -920,6 +923,14 @@ TermView::HyperLinkState::_EntryExists(const BString& path,
if (path[0] == '/' || fCurrentDirectory.IsEmpty()) { if (path[0] == '/' || fCurrentDirectory.IsEmpty()) {
_actualPath = path; _actualPath = path;
} else if (path == "~" || path.StartsWith("~/")) {
// Replace '~' with the user's home directory. We don't handle "~user"
// here yet.
BPath homeDirectory;
if (find_directory(B_USER_DIRECTORY, &homeDirectory) != B_OK)
return false;
_actualPath = homeDirectory.Path();
_actualPath << path.String() + 1;
} else { } else {
_actualPath.Truncate(0); _actualPath.Truncate(0);
_actualPath << fCurrentDirectory << '/' << path; _actualPath << fCurrentDirectory << '/' << path;