beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
ladybird/Ladybird/Qt/ConsoleWidget.cpp

221 lines
6.4 KiB
C++
Raw Normal View History

Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
/*
* Copyright (c) 2020, Hunter Salyer <thefalsehonesty@gmail.com>
* Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "ConsoleWidget.h"
Ladybird: Move Qt-specific classes and functions to a Qt subdirectory This will help a lot with developing chromes for different UI frameworks where we can see which helper classes and processes are really using Qt vs just using it to get at helper data. As a bonus, remove Qt dependency from WebDriver.
2023-08-05 16:42:26 +00:00
#include "StringUtils.h"
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
#include "WebContentView.h"
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
#include <AK/StringBuilder.h>
#include <LibJS/MarkupGenerator.h>
Browser+Ladybird: Render text in the JS console with a monospace font
2023-04-26 12:34:24 +00:00
#include <QFontDatabase>
Ladybird: Implement JS console input history One can now use KeyUp and KeyDown to navigate through the already run commands in the JS console.
2023-07-19 12:27:30 +00:00
#include <QKeyEvent>
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
#include <QLineEdit>
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
#include <QPalette>
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
#include <QPushButton>
#include <QTextEdit>
#include <QVBoxLayout>
Ladybird: Let WebContent know if the current system theme is dark This means we now actually respect @media (prefers-color-scheme: dark) by default when in dark mode. :^)
2023-04-29 16:35:06 +00:00
namespace Ladybird {
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
Ladybird: Move classes and types into the Ladybird namespace We were super inconsistent about this, with most "new" classes living in the Ladybird namespace, while "old" ones were in the global namespace, or even sitting in the Browser namespace.
2023-08-02 17:52:59 +00:00
bool is_using_dark_system_theme(QWidget&);
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
ConsoleWidget::ConsoleWidget()
{
setLayout(new QVBoxLayout);
Ladybird+LibWebView+Browser: Remove ability to run with AST interpreter
2023-08-07 14:44:20 +00:00
m_output_view = new WebContentView({}, WebView::EnableCallgrindProfiling::No, UseLagomNetworking::No);
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
if (is_using_dark_system_theme(*this))
m_output_view->update_palette(WebContentView::PaletteMode::Dark);
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
Browser+Ladybird: Render text in the JS console with a monospace font
2023-04-26 12:34:24 +00:00
m_output_view->load("data:text/html,<html style=\"font: 10pt monospace;\"></html>"sv);
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
// Wait until our output WebView is loaded, and then request any messages that occurred before we existed
m_output_view->on_load_finish = [this](auto&) {
if (on_request_messages)
on_request_messages(0);
};
layout()->addWidget(m_output_view);
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
auto* bottom_container = new QWidget(this);
bottom_container->setLayout(new QHBoxLayout);
layout()->addWidget(bottom_container);
Ladybird: Implement JS console input history One can now use KeyUp and KeyDown to navigate through the already run commands in the JS console.
2023-07-19 12:27:30 +00:00
m_input = new ConsoleInputEdit(bottom_container, *this);
Browser+Ladybird: Render text in the JS console with a monospace font
2023-04-26 12:34:24 +00:00
m_input->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
bottom_container->layout()->addWidget(m_input);
setFocusProxy(m_input);
auto* clear_button = new QPushButton(bottom_container);
bottom_container->layout()->addWidget(clear_button);
clear_button->setFixedSize(22, 22);
clear_button->setText("X");
clear_button->setToolTip("Clear the console output");
QObject::connect(clear_button, &QPushButton::pressed, [this] {
clear_output();
});
m_input->setFocus();
}
void ConsoleWidget::request_console_messages()
{
VERIFY(!m_waiting_for_messages);
VERIFY(on_request_messages);
on_request_messages(m_highest_received_message_index + 1);
m_waiting_for_messages = true;
}
void ConsoleWidget::notify_about_new_console_message(i32 message_index)
{
if (message_index <= m_highest_received_message_index) {
dbgln("Notified about console message we already have");
return;
}
if (message_index <= m_highest_notified_message_index) {
dbgln("Notified about console message we're already aware of");
return;
}
m_highest_notified_message_index = message_index;
if (!m_waiting_for_messages)
request_console_messages();
}
Ladybird: Update for AK::{String => DeprecatedString} rename
2022-12-04 18:43:54 +00:00
void ConsoleWidget::handle_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages)
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
{
i32 end_index = start_index + message_types.size() - 1;
if (end_index <= m_highest_received_message_index) {
dbgln("Received old console messages");
return;
}
for (size_t i = 0; i < message_types.size(); i++) {
auto& type = message_types[i];
auto& message = messages[i];
if (type == "html") {
print_html(message);
} else if (type == "clear") {
clear_output();
} else if (type == "group") {
// FIXME: Implement.
} else if (type == "groupCollapsed") {
// FIXME: Implement.
} else if (type == "groupEnd") {
// FIXME: Implement.
} else {
VERIFY_NOT_REACHED();
}
}
m_highest_received_message_index = end_index;
m_waiting_for_messages = false;
if (m_highest_received_message_index < m_highest_notified_message_index)
request_console_messages();
}
void ConsoleWidget::print_source_line(StringView source)
{
StringBuilder html;
html.append("<span class=\"repl-indicator\">"sv);
html.append("&gt; "sv);
html.append("</span>"sv);
Ladybird: Fix build with JS::MarkupGenerator's new string type usage Fix to build after JS::MarkupGenerator got converted to use new string type: https://github.com/SerenityOS/serenity/commit/112b3f73429eff7a3b6947c7fb45c62a0e5c0727
2022-12-07 11:16:52 +00:00
html.append(JS::MarkupGenerator::html_from_source(source).release_value_but_fixme_should_propagate_errors());
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
print_html(html.string_view());
}
void ConsoleWidget::print_html(StringView line)
{
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
StringBuilder builder;
builder.append(R"~~~(
var p = document.createElement("p");
p.innerHTML = ")~~~"sv);
builder.append_escaped_for_json(line);
builder.append(R"~~~("
document.body.appendChild(p);
)~~~"sv);
Ladybird: Scroll the JS console to the bottom on input
2023-07-18 15:03:39 +00:00
// FIXME: It should be sufficient to scrollTo a y value of document.documentElement.offsetHeight,
// but due to an unknown bug offsetHeight seems to not be properly updated after spamming
// a lot of document changes.
//
// The setTimeout makes the scrollTo async and allows the DOM to be updated.
builder.append("setTimeout(function() { window.scrollTo(0, 1_000_000_000); }, 0);"sv);
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
m_output_view->run_javascript(builder.string_view());
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
}
void ConsoleWidget::clear_output()
{
Ladybird: Implement the JavaScript console using a WebContentView This aligns the Ladybird console implementation with the Browser console a bit more, which uses OutOfProcessWebView for rendering console output. This allows us to style the console output to try and match the system theme. Using a WebContentView is simpler than trying to style the old QTextEdit widget, as the console output is HTML with built-in "-libweb-palette-*" colors. These will override any color we set on the QTextEdit widget.
2023-04-23 01:57:08 +00:00
m_output_view->run_javascript(R"~~~(
document.body.innerHTML = "";
)~~~"sv);
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
}
void ConsoleWidget::reset()
{
clear_output();
m_highest_notified_message_index = -1;
m_highest_received_message_index = -1;
m_waiting_for_messages = false;
}
Ladybird: Implement JS console input history One can now use KeyUp and KeyDown to navigate through the already run commands in the JS console.
2023-07-19 12:27:30 +00:00
void ConsoleInputEdit::keyPressEvent(QKeyEvent* event)
{
switch (event->key()) {
case Qt::Key_Down: {
Ladybird: Fix JS console crash when history is empty Do not try to navigate JS console history forward when it is empty. A crash was occurring because of size_t underflow.
2023-07-31 21:07:49 +00:00
if (m_history.is_empty())
break;
Ladybird: Implement JS console input history One can now use KeyUp and KeyDown to navigate through the already run commands in the JS console.
2023-07-19 12:27:30 +00:00
auto last_index = m_history.size() - 1;
if (m_history_index < last_index) {
m_history_index++;
setText(qstring_from_ak_deprecated_string(m_history.at(m_history_index)));
} else if (m_history_index == last_index) {
m_history_index++;
clear();
}
break;
}
case Qt::Key_Up:
if (m_history_index > 0) {
m_history_index--;
setText(qstring_from_ak_deprecated_string(m_history.at(m_history_index)));
}
break;
case Qt::Key_Return: {
auto js_source = ak_deprecated_string_from_qstring(text());
if (js_source.is_whitespace())
return;
if (m_history.is_empty() || m_history.last() != js_source) {
m_history.append(js_source);
m_history_index = m_history.size();
}
clear();
m_console_widget.print_source_line(js_source);
if (m_console_widget.on_js_input)
m_console_widget.on_js_input(js_source);
break;
}
default:
QLineEdit::keyPressEvent(event);
}
}
Ladybird: Port over ConsoleWidget from the SerenityOS Browser While this adds a fair bit of widget code, we're also increasing code sharing by using the same bits in WebContentClient for interacting with the JS console. That said, we should look for more ways to share code here.
2022-10-06 08:39:02 +00:00
}
Reference in a new issue Copy permalink