Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch by Matt Madia: Add the escape key as a shortcut to stop page loads. Closes ticket #6409.

Browse Source 
git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@541 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
anevilyak 2010-07-31 19:12:48 +00:00 committed by Alexandre Deckner
parent e71c5717b1
commit a4841f3a5d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/apps/webpositive/BrowserWindow.cpp
View File

@ -544,6 +544,9 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
} else if (bytes[0] == B_RIGHT_ARROW && modifiers == B_COMMAND_KEY) { } else if (bytes[0] == B_RIGHT_ARROW && modifiers == B_COMMAND_KEY) {
PostMessage(GO_FORWARD); PostMessage(GO_FORWARD);
return; return;
} else if (bytes[0] == B_ESCAPE) {
PostMessage(STOP);
return;
} else if (bytes[0] == B_FUNCTION_KEY) { } else if (bytes[0] == B_FUNCTION_KEY) {
// Some function key Firefox compatibility // Some function key Firefox compatibility
int32 key; int32 key;
@ -2084,27 +2087,27 @@ BrowserWindow::_HandlePageSourceResult(const BMessage* message)
// TODO: What if it isn't HTML, but for example SVG? // TODO: What if it isn't HTML, but for example SVG?
BString source; BString source;
ret = message->FindString("source", &source); ret = message->FindString("source", &source);
if (ret == B_OK) if (ret == B_OK)
ret = find_directory(B_COMMON_TEMP_DIRECTORY, &pathToPageSource); ret = find_directory(B_COMMON_TEMP_DIRECTORY, &pathToPageSource);
BString tmpFileName("PageSource_"); BString tmpFileName("PageSource_");
tmpFileName << system_time() << ".html"; tmpFileName << system_time() << ".html";
if (ret == B_OK) if (ret == B_OK)
ret = pathToPageSource.Append(tmpFileName.String()); ret = pathToPageSource.Append(tmpFileName.String());
BFile pageSourceFile(pathToPageSource.Path(), BFile pageSourceFile(pathToPageSource.Path(),
B_CREATE_FILE | B_ERASE_FILE | B_WRITE_ONLY); B_CREATE_FILE | B_ERASE_FILE | B_WRITE_ONLY);
if (ret == B_OK) if (ret == B_OK)
ret = pageSourceFile.InitCheck(); ret = pageSourceFile.InitCheck();
if (ret == B_OK) { if (ret == B_OK) {
ssize_t written = pageSourceFile.Write(source.String(), ssize_t written = pageSourceFile.Write(source.String(),
source.Length()); source.Length());
if (written != source.Length()) if (written != source.Length())
ret = (status_t)written; ret = (status_t)written;
} }
if (ret == B_OK) { if (ret == B_OK) {
const char* type = "text/html"; const char* type = "text/html";
size_t size = strlen(type); size_t size = strlen(type);