Skip to content
Snippets Groups Projects
Commit c6f14efe authored by Sergey Linev's avatar Sergey Linev Committed by Bertrand Bellenot
Browse files

webgui: apply clang format for the CEF and Qt5 code

parent a9abd9b4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 335 additions and 379 deletions
gui/canvaspainter/v7/cef/cef_main.cxx
+ 17
− 17
View file @ c6f14efe
......@@ -8,22 +8,22 @@
#include "include/base/cef_logging.h"
// Entry point function for all processes.
int main(int argc, char* argv[]) {
// Provide CEF with command-line arguments.
CefMainArgs main_args(argc, argv);
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
// that share the same executable. This function checks the command-line and,
// if this is a sub-process, executes the appropriate logic.
int exit_code = CefExecuteProcess(main_args, NULL, NULL);
if (exit_code >= 0) {
// The sub-process has completed so return here.
return exit_code;
}
printf("do nothing\n");
return 0;
int main(int argc, char *argv[])
{
// Provide CEF with command-line arguments.
CefMainArgs main_args(argc, argv);
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
// that share the same executable. This function checks the command-line and,
// if this is a sub-process, executes the appropriate logic.
int exit_code = CefExecuteProcess(main_args, NULL, NULL);
if (exit_code >= 0) {
// The sub-process has completed so return here.
return exit_code;
}
printf("do nothing\n");
return 0;
}
gui/canvaspainter/v7/cef/simple_app.cxx
+ 64
− 74
View file @ c6f14efe
......@@ -17,52 +17,47 @@ namespace {
// When using the Views framework this object provides the delegate
// implementation for the CefWindow that hosts the Views-based browser.
class SimpleWindowDelegate : public CefWindowDelegate {
public:
explicit SimpleWindowDelegate(CefRefPtr<CefBrowserView> browser_view)
: browser_view_(browser_view) {
}
void OnWindowCreated(CefRefPtr<CefWindow> window) OVERRIDE {
// Add the browser view and show the window.
window->AddChildView(browser_view_);
window->Show();
// Give keyboard focus to the browser view.
browser_view_->RequestFocus();
}
void OnWindowDestroyed(CefRefPtr<CefWindow> window) OVERRIDE {
browser_view_ = NULL;
}
bool CanClose(CefRefPtr<CefWindow> window) OVERRIDE {
// Allow the window to close if the browser says it's OK.
CefRefPtr<CefBrowser> browser = browser_view_->GetBrowser();
if (browser)
return browser->GetHost()->TryCloseBrowser();
return true;
}
private:
CefRefPtr<CefBrowserView> browser_view_;
IMPLEMENT_REFCOUNTING(SimpleWindowDelegate);
DISALLOW_COPY_AND_ASSIGN(SimpleWindowDelegate);
public:
explicit SimpleWindowDelegate(CefRefPtr<CefBrowserView> browser_view) : browser_view_(browser_view) {}
void OnWindowCreated(CefRefPtr<CefWindow> window) OVERRIDE
{
// Add the browser view and show the window.
window->AddChildView(browser_view_);
window->Show();
// Give keyboard focus to the browser view.
browser_view_->RequestFocus();
}
void OnWindowDestroyed(CefRefPtr<CefWindow> window) OVERRIDE { browser_view_ = NULL; }
bool CanClose(CefRefPtr<CefWindow> window) OVERRIDE
{
// Allow the window to close if the browser says it's OK.
CefRefPtr<CefBrowser> browser = browser_view_->GetBrowser();
if (browser) return browser->GetHost()->TryCloseBrowser();
return true;
}
private:
CefRefPtr<CefBrowserView> browser_view_;
IMPLEMENT_REFCOUNTING(SimpleWindowDelegate);
DISALLOW_COPY_AND_ASSIGN(SimpleWindowDelegate);
};
} // namespace
} // namespace
SimpleApp::SimpleApp(const std::string &url, const std::string &cef_main) :
fUrl(url), fCefMain(cef_main) {
SimpleApp::SimpleApp(const std::string &url, const std::string &cef_main) : fUrl(url), fCefMain(cef_main)
{
}
SimpleApp::~SimpleApp() {
SimpleApp::~SimpleApp()
{
}
void SimpleApp::OnBeforeCommandLineProcessing(
const CefString& process_type,
CefRefPtr<CefCommandLine> command_line)
void SimpleApp::OnBeforeCommandLineProcessing(const CefString &process_type, CefRefPtr<CefCommandLine> command_line)
{
std::string name = process_type.ToString();
std::string prog = command_line->GetProgram().ToString();
......@@ -70,9 +65,8 @@ void SimpleApp::OnBeforeCommandLineProcessing(
printf("Start process %s %s\n", name.c_str(), prog.c_str());
}
void SimpleApp::OnBeforeChildProcessLaunch(
CefRefPtr<CefCommandLine> command_line) {
void SimpleApp::OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine> command_line)
{
std::string newprog = fCefMain;
......@@ -83,48 +77,44 @@ void SimpleApp::OnBeforeChildProcessLaunch(
printf("OnBeforeChildProcessLaunch %s\n", prog.c_str());
}
void SimpleApp::OnContextInitialized() {
CEF_REQUIRE_UI_THREAD();
void SimpleApp::OnContextInitialized()
{
CEF_REQUIRE_UI_THREAD();
#if defined(OS_WIN) || defined(OS_LINUX)
// Create the browser using the Views framework if "--use-views" is specified
// via the command-line. Otherwise, create the browser using the native
// platform framework. The Views framework is currently only supported on
// Windows and Linux.
const bool use_views = false;
// Create the browser using the Views framework if "--use-views" is specified
// via the command-line. Otherwise, create the browser using the native
// platform framework. The Views framework is currently only supported on
// Windows and Linux.
const bool use_views = false;
#else
const bool use_views = false;
const bool use_views = false;
#endif
// SimpleHandler implements browser-level callbacks.
CefRefPtr<SimpleHandler> handler(new SimpleHandler(use_views));
// SimpleHandler implements browser-level callbacks.
CefRefPtr<SimpleHandler> handler(new SimpleHandler(use_views));
// Specify CEF browser settings here.
CefBrowserSettings browser_settings;
// Specify CEF browser settings here.
CefBrowserSettings browser_settings;
if (use_views) {
// Create the BrowserView.
CefRefPtr<CefBrowserView> browser_view = CefBrowserView::CreateBrowserView(
handler, fUrl, browser_settings, NULL, NULL);
if (use_views) {
// Create the BrowserView.
CefRefPtr<CefBrowserView> browser_view =
CefBrowserView::CreateBrowserView(handler, fUrl, browser_settings, NULL, NULL);
// Create the Window. It will show itself after creation.
CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view));
} else {
// Information used when creating the native window.
CefWindowInfo window_info;
// Create the Window. It will show itself after creation.
CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view));
} else {
// Information used when creating the native window.
CefWindowInfo window_info;
#if defined(OS_WIN)
// On Windows we need to specify certain flags that will be passed to
// CreateWindowEx().
window_info.SetAsPopup(NULL, "cefsimple");
// On Windows we need to specify certain flags that will be passed to
// CreateWindowEx().
window_info.SetAsPopup(NULL, "cefsimple");
#endif
// Create the first browser window.
CefBrowserHost::CreateBrowser(window_info, handler, fUrl, browser_settings,
NULL);
}
// Create the first browser window.
CefBrowserHost::CreateBrowser(window_info, handler, fUrl, browser_settings, NULL);
}
}
gui/canvaspainter/v7/cef/simple_app.h
+ 14
− 18
View file @ c6f14efe
......@@ -8,31 +8,27 @@
#include "include/cef_app.h"
// Implement application-level callbacks for the browser process.
class SimpleApp : public CefApp,
public CefBrowserProcessHandler {
class SimpleApp : public CefApp, public CefBrowserProcessHandler {
protected:
std::string fUrl; ///<! first URL to open
std::string fUrl; ///<! first URL to open
std::string fCefMain; ///!< executable used for extra processed
public:
public:
SimpleApp(const std::string &url, const std::string &cef_main);
virtual ~SimpleApp();
// CefApp methods:
virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler()
OVERRIDE { return this; }
// CefApp methods:
virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() OVERRIDE { return this; }
// CefBrowserProcessHandler methods:
virtual void OnContextInitialized() OVERRIDE;
// CefBrowserProcessHandler methods:
virtual void OnContextInitialized() OVERRIDE;
void OnBeforeCommandLineProcessing(
const CefString& process_type,
CefRefPtr<CefCommandLine> command_line) OVERRIDE;
void OnBeforeCommandLineProcessing(const CefString &process_type, CefRefPtr<CefCommandLine> command_line) OVERRIDE;
void OnBeforeChildProcessLaunch(
CefRefPtr<CefCommandLine> command_line) OVERRIDE;
private:
// Include the default reference counting implementation.
IMPLEMENT_REFCOUNTING(SimpleApp);
void OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine> command_line) OVERRIDE;
private:
// Include the default reference counting implementation.
IMPLEMENT_REFCOUNTING(SimpleApp);
};
#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_
#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_
gui/canvaspainter/v7/cef/simple_handler.cxx
+ 89
− 93
View file @ c6f14efe
......@@ -14,121 +14,117 @@
#include "include/wrapper/cef_closure_task.h"
#include "include/wrapper/cef_helpers.h"
namespace {
SimpleHandler* g_instance = NULL;
SimpleHandler *g_instance = NULL;
} // namespace
} // namespace
SimpleHandler::SimpleHandler(bool use_views)
: use_views_(use_views),
is_closing_(false) {
DCHECK(!g_instance);
g_instance = this;
SimpleHandler::SimpleHandler(bool use_views) : use_views_(use_views), is_closing_(false)
{
DCHECK(!g_instance);
g_instance = this;
}
SimpleHandler::~SimpleHandler() {
g_instance = NULL;
SimpleHandler::~SimpleHandler()
{
g_instance = NULL;
}
// static
SimpleHandler* SimpleHandler::GetInstance() {
return g_instance;
SimpleHandler *SimpleHandler::GetInstance()
{
return g_instance;
}
void SimpleHandler::OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) {
CEF_REQUIRE_UI_THREAD();
if (use_views_) {
// Set the title of the window using the Views framework.
CefRefPtr<CefBrowserView> browser_view =
CefBrowserView::GetForBrowser(browser);
if (browser_view) {
CefRefPtr<CefWindow> window = browser_view->GetWindow();
if (window)
window->SetTitle(title);
}
} else {
// Set the title of the window using platform APIs.
PlatformTitleChange(browser, title);
}
void SimpleHandler::OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString &title)
{
CEF_REQUIRE_UI_THREAD();
if (use_views_) {
// Set the title of the window using the Views framework.
CefRefPtr<CefBrowserView> browser_view = CefBrowserView::GetForBrowser(browser);
if (browser_view) {
CefRefPtr<CefWindow> window = browser_view->GetWindow();
if (window) window->SetTitle(title);
}
} else {
// Set the title of the window using platform APIs.
PlatformTitleChange(browser, title);
}
}
void SimpleHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
CEF_REQUIRE_UI_THREAD();
void SimpleHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser)
{
CEF_REQUIRE_UI_THREAD();
// Add to the list of existing browsers.
browser_list_.push_back(browser);
// Add to the list of existing browsers.
browser_list_.push_back(browser);
}
bool SimpleHandler::DoClose(CefRefPtr<CefBrowser> browser) {
CEF_REQUIRE_UI_THREAD();
// Closing the main window requires special handling. See the DoClose()
// documentation in the CEF header for a detailed destription of this
// process.
if (browser_list_.size() == 1) {
// Set a flag to indicate that the window close should be allowed.
is_closing_ = true;
}
// Allow the close. For windowed browsers this will result in the OS close
// event being sent.
return false;
bool SimpleHandler::DoClose(CefRefPtr<CefBrowser> browser)
{
CEF_REQUIRE_UI_THREAD();
// Closing the main window requires special handling. See the DoClose()
// documentation in the CEF header for a detailed destription of this
// process.
if (browser_list_.size() == 1) {
// Set a flag to indicate that the window close should be allowed.
is_closing_ = true;
}
// Allow the close. For windowed browsers this will result in the OS close
// event being sent.
return false;
}
void SimpleHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
CEF_REQUIRE_UI_THREAD();
// Remove from the list of existing browsers.
BrowserList::iterator bit = browser_list_.begin();
for (; bit != browser_list_.end(); ++bit) {
if ((*bit)->IsSame(browser)) {
browser_list_.erase(bit);
break;
}
}
if (browser_list_.empty()) {
// All browser windows have closed. Quit the application message loop.
CefQuitMessageLoop();
}
void SimpleHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser)
{
CEF_REQUIRE_UI_THREAD();
// Remove from the list of existing browsers.
BrowserList::iterator bit = browser_list_.begin();
for (; bit != browser_list_.end(); ++bit) {
if ((*bit)->IsSame(browser)) {
browser_list_.erase(bit);
break;
}
}
if (browser_list_.empty()) {
// All browser windows have closed. Quit the application message loop.
CefQuitMessageLoop();
}
}
void SimpleHandler::OnLoadError(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
ErrorCode errorCode,
const CefString& errorText,
const CefString& failedUrl) {
CEF_REQUIRE_UI_THREAD();
// Don't display an error for downloaded files.
if (errorCode == ERR_ABORTED)
return;
// Display a load error message.
std::stringstream ss;
ss << "<html><body bgcolor=\"white\">"
"<h2>Failed to load URL " << std::string(failedUrl) <<
" with error " << std::string(errorText) << " (" << errorCode <<
").</h2></body></html>";
frame->LoadString(ss.str(), failedUrl);
void SimpleHandler::OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, ErrorCode errorCode,
const CefString &errorText, const CefString &failedUrl)
{
CEF_REQUIRE_UI_THREAD();
// Don't display an error for downloaded files.
if (errorCode == ERR_ABORTED) return;
// Display a load error message.
std::stringstream ss;
ss << "<html><body bgcolor=\"white\">"
"<h2>Failed to load URL "
<< std::string(failedUrl) << " with error " << std::string(errorText) << " (" << errorCode
<< ").</h2></body></html>";
frame->LoadString(ss.str(), failedUrl);
}
void SimpleHandler::CloseAllBrowsers(bool force_close) {
if (!CefCurrentlyOn(TID_UI)) {
// Execute on the UI thread.
CefPostTask(TID_UI,
base::Bind(&SimpleHandler::CloseAllBrowsers, this, force_close));
return;
}
void SimpleHandler::CloseAllBrowsers(bool force_close)
{
if (!CefCurrentlyOn(TID_UI)) {
// Execute on the UI thread.
CefPostTask(TID_UI, base::Bind(&SimpleHandler::CloseAllBrowsers, this, force_close));
return;
}
if (browser_list_.empty())
return;
if (browser_list_.empty()) return;
BrowserList::const_iterator it = browser_list_.begin();
for (; it != browser_list_.end(); ++it)
(*it)->GetHost()->CloseBrowser(force_close);
BrowserList::const_iterator it = browser_list_.begin();
for (; it != browser_list_.end(); ++it) (*it)->GetHost()->CloseBrowser(force_close);
}
gui/canvaspainter/v7/cef/simple_handler.h
+ 46
− 60
View file @ c6f14efe
......@@ -9,65 +9,51 @@
#include <list>
class SimpleHandler : public CefClient,
public CefDisplayHandler,
public CefLifeSpanHandler,
public CefLoadHandler {
public:
explicit SimpleHandler(bool use_views);
~SimpleHandler();
// Provide access to the single global instance of this object.
static SimpleHandler* GetInstance();
// CefClient methods:
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE {
return this;
}
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE {
return this;
}
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE {
return this;
}
// CefDisplayHandler methods:
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) OVERRIDE;
// CefLifeSpanHandler methods:
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefLoadHandler methods:
virtual void OnLoadError(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
ErrorCode errorCode,
const CefString& errorText,
const CefString& failedUrl) OVERRIDE;
// Request that all existing browser windows close.
void CloseAllBrowsers(bool force_close);
bool IsClosing() const { return is_closing_; }
private:
// Platform-specific implementation.
void PlatformTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title);
// True if the application is using the Views framework.
const bool use_views_;
// List of existing browser windows. Only accessed on the CEF UI thread.
typedef std::list<CefRefPtr<CefBrowser> > BrowserList;
BrowserList browser_list_;
bool is_closing_;
// Include the default reference counting implementation.
IMPLEMENT_REFCOUNTING(SimpleHandler);
class SimpleHandler : public CefClient, public CefDisplayHandler, public CefLifeSpanHandler, public CefLoadHandler {
public:
explicit SimpleHandler(bool use_views);
~SimpleHandler();
// Provide access to the single global instance of this object.
static SimpleHandler *GetInstance();
// CefClient methods:
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE { return this; }
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE { return this; }
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE { return this; }
// CefDisplayHandler methods:
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString &title) OVERRIDE;
// CefLifeSpanHandler methods:
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
// CefLoadHandler methods:
virtual void OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, ErrorCode errorCode,
const CefString &errorText, const CefString &failedUrl) OVERRIDE;
// Request that all existing browser windows close.
void CloseAllBrowsers(bool force_close);
bool IsClosing() const { return is_closing_; }
private:
// Platform-specific implementation.
void PlatformTitleChange(CefRefPtr<CefBrowser> browser, const CefString &title);
// True if the application is using the Views framework.
const bool use_views_;
// List of existing browser windows. Only accessed on the CEF UI thread.
typedef std::list<CefRefPtr<CefBrowser>> BrowserList;
BrowserList browser_list_;
bool is_closing_;
// Include the default reference counting implementation.
IMPLEMENT_REFCOUNTING(SimpleHandler);
};
#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_
#endif // CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_
gui/canvaspainter/v7/cef/simple_handler_linux.cxx
+ 27
− 40
View file @ c6f14efe
......@@ -4,7 +4,6 @@
#include "simple_handler.h"
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <string>
......@@ -12,43 +11,31 @@
#include "include/base/cef_logging.h"
#include "include/cef_browser.h"
void SimpleHandler::PlatformTitleChange(CefRefPtr<CefBrowser> browser,
const CefString& title) {
std::string titleStr(title);
// Retrieve the X11 display shared with Chromium.
::Display* display = cef_get_xdisplay();
DCHECK(display);
// Retrieve the X11 window handle for the browser.
::Window window = browser->GetHost()->GetWindowHandle();
DCHECK(window != kNullWindowHandle);
// Retrieve the atoms required by the below XChangeProperty call.
const char* kAtoms[] = {
"_NET_WM_NAME",
"UTF8_STRING"
};
Atom atoms[2];
int result = XInternAtoms(display, const_cast<char**>(kAtoms), 2, false,
atoms);
if (!result)
NOTREACHED();
// Set the window title.
XChangeProperty(display,
window,
atoms[0],
atoms[1],
8,
PropModeReplace,
reinterpret_cast<const unsigned char*>(titleStr.c_str()),
titleStr.size());
// TODO(erg): This is technically wrong. So XStoreName and friends expect
// this in Host Portable Character Encoding instead of UTF-8, which I believe
// is Compound Text. This shouldn't matter 90% of the time since this is the
// fallback to the UTF8 property above.
XStoreName(display, browser->GetHost()->GetWindowHandle(), titleStr.c_str());
void SimpleHandler::PlatformTitleChange(CefRefPtr<CefBrowser> browser, const CefString &title)
{
std::string titleStr(title);
// Retrieve the X11 display shared with Chromium.
::Display *display = cef_get_xdisplay();
DCHECK(display);
// Retrieve the X11 window handle for the browser.
::Window window = browser->GetHost()->GetWindowHandle();
DCHECK(window != kNullWindowHandle);
// Retrieve the atoms required by the below XChangeProperty call.
const char *kAtoms[] = {"_NET_WM_NAME", "UTF8_STRING"};
Atom atoms[2];
int result = XInternAtoms(display, const_cast<char **>(kAtoms), 2, false, atoms);
if (!result) NOTREACHED();
// Set the window title.
XChangeProperty(display, window, atoms[0], atoms[1], 8, PropModeReplace,
reinterpret_cast<const unsigned char *>(titleStr.c_str()), titleStr.size());
// TODO(erg): This is technically wrong. So XStoreName and friends expect
// this in Host Portable Character Encoding instead of UTF-8, which I believe
// is Compound Text. This shouldn't matter 90% of the time since this is the
// fallback to the UTF8 property above.
XStoreName(display, browser->GetHost()->GetWindowHandle(), titleStr.c_str());
}
gui/canvaspainter/v7/qt5/rootqt5.cpp
+ 62
− 61
View file @ c6f14efe
......@@ -2,8 +2,8 @@
/// \ingroup CanvasPainter ROOT7
/// \author Sergey Linev <S.Linev@gsi.de>
/// \date 2017-06-29
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback is welcome!
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback
/// is welcome!
/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
......@@ -19,7 +19,6 @@
#include <qtwebengineglobal.h>
#include <QThread>
#include <QWebEngineUrlSchemeHandler>
#include <QWebEngineProfile>
#include <QWebEngineUrlRequestJob>
......@@ -60,19 +59,21 @@ public:
THttpServer *server = 0;
// TODO: memory cleanup of these arguments
class TWebGuiCallArg : public THttpCallArg {
protected:
QWebEngineUrlRequestJob *fRequest;
int fDD;
int fDD;
public:
TWebGuiCallArg(QWebEngineUrlRequestJob *req) : THttpCallArg(), fRequest(req), fDD(0) { }
virtual ~TWebGuiCallArg() { if (fDD!=1) printf("FAAAAAAAAAAAAAIL %d\n", fDD); }
TWebGuiCallArg(QWebEngineUrlRequestJob *req) : THttpCallArg(), fRequest(req), fDD(0) {}
virtual ~TWebGuiCallArg()
{
if (fDD != 1) printf("FAAAAAAAAAAAAAIL %d\n", fDD);
}
void SendFile(const char *fname) {
void SendFile(const char *fname)
{
const char *mime = THttpServer::GetMimeType(fname);
printf("Sending file %s\n", fname);
......@@ -89,15 +90,18 @@ public:
file.close();
buffer->close();
fRequest->reply(mime, buffer); fDD++;
fRequest->reply(mime, buffer);
fDD++;
}
virtual void HttpReplied() {
virtual void HttpReplied()
{
if (Is404()) {
printf("Request MISS %s %s\n", GetPathName(), GetFileName());
fRequest->fail(QWebEngineUrlRequestJob::UrlNotFound); fDD++;
fRequest->fail(QWebEngineUrlRequestJob::UrlNotFound);
fDD++;
// abort request
} else if (IsFile()) {
// send file
......@@ -110,19 +114,20 @@ public:
QBuffer *buffer = new QBuffer;
fRequest->connect(fRequest, SIGNAL(destroyed()), buffer, SLOT(deleteLater()));
buffer->setData((const char *) GetContent(), GetContentLength());
buffer->setData((const char *)GetContent(), GetContentLength());
fRequest->reply(GetContentType(), buffer); fDD++;
fRequest->reply(GetContentType(), buffer);
fDD++;
}
}
};
class ROOTSchemeHandler : public QWebEngineUrlSchemeHandler {
public:
ROOTSchemeHandler(QObject *p = Q_NULLPTR) : QWebEngineUrlSchemeHandler(p) {}
virtual void requestStarted(QWebEngineUrlRequestJob *request) {
virtual void requestStarted(QWebEngineUrlRequestJob *request)
{
QUrl url = request->requestUrl();
......@@ -130,8 +135,8 @@ public:
// printf("[%ld] Request started %s\n", TThread::SelfId(), ba.data());
if (server==0) {
server = (THttpServer*) gROOT->ProcessLine("TWebGuiFactory::GetHttpServer()");
if (server == 0) {
server = (THttpServer *)gROOT->ProcessLine("TWebGuiFactory::GetHttpServer()");
printf("Get HTTP server %p\n", server);
if (!server) {
printf("FAIL to get server\n");
......@@ -139,7 +144,7 @@ public:
}
}
TWebGuiCallArg* arg = new TWebGuiCallArg(request);
TWebGuiCallArg *arg = new TWebGuiCallArg(request);
QString inp_path = url.path();
QString inp_query = url.query();
......@@ -170,16 +175,16 @@ public:
class ROOTRequestInterceptor : public QWebEngineUrlRequestInterceptor {
public:
ROOTRequestInterceptor(QObject *p = Q_NULLPTR) : QWebEngineUrlRequestInterceptor(p) {}
virtual void interceptRequest(QWebEngineUrlRequestInfo &info) {
QUrl url = info.requestUrl();
ROOTRequestInterceptor(QObject *p = Q_NULLPTR) : QWebEngineUrlRequestInterceptor(p) {}
virtual void interceptRequest(QWebEngineUrlRequestInfo &info)
{
QByteArray ba = url.toString().toLatin1();
QUrl url = info.requestUrl();
printf("[%ld] Request intercepted %s\n", TThread::SelfId(), ba.data());
QByteArray ba = url.toString().toLatin1();
}
printf("[%ld] Request intercepted %s\n", TThread::SelfId(), ba.data());
}
};
extern "C" void webgui_start_browser_new(const char *url)
......@@ -194,57 +199,53 @@ extern "C" void webgui_start_browser_new(const char *url)
view->show();
}
int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
int argc2 = 1;
char *argv2[10];
argv2[0] = argv[0];
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
// printf("[%ld] Start minimal app\n", TThread::SelfId());
int argc2 = 1;
char *argv2[10];
argv2[0] = argv[0];
QApplication app(argc2, argv2);
// printf("[%ld] Start minimal app\n", TThread::SelfId());
QApplication app(argc2, argv2);
QtWebEngine::initialize();
QtWebEngine::initialize();
//QQmlApplicationEngine engine;
//engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
//engine.load(QUrl("http://jsroot.gsi.de/dev/examples.htm"));
// QQmlApplicationEngine engine;
// engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
// engine.load(QUrl("http://jsroot.gsi.de/dev/examples.htm"));
TRint* d = new TRint("Rint", &argc, argv);
TQt5Timer *timer = new TQt5Timer(10, kTRUE);
timer->TurnOn();
TRint *d = new TRint("Rint", &argc, argv);
TQt5Timer *timer = new TQt5Timer(10, kTRUE);
timer->TurnOn();
// use only for debugging or may be for redirection
// QWebEngineProfile::defaultProfile()->setRequestInterceptor(new ROOTRequestInterceptor());
// use only for debugging or may be for redirection
//QWebEngineProfile::defaultProfile()->setRequestInterceptor(new ROOTRequestInterceptor());
const QByteArray EXAMPLE_SCHEMA_HANDLER = QByteArray("example");
const QByteArray EXAMPLE_SCHEMA_HANDLER = QByteArray("example");
ROOTSchemeHandler *handler = new ROOTSchemeHandler();
ROOTSchemeHandler* handler = new ROOTSchemeHandler();
QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(EXAMPLE_SCHEMA_HANDLER, handler);
QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(EXAMPLE_SCHEMA_HANDLER, handler);
// const QWebEngineUrlSchemeHandler* installed =
// QWebEngineProfile::defaultProfile()->urlSchemeHandler(EXAMPLE_SCHEMA_HANDLER);
// const QWebEngineUrlSchemeHandler* installed = QWebEngineProfile::defaultProfile()->urlSchemeHandler(EXAMPLE_SCHEMA_HANDLER);
// QWebEngineView *view = new QWebEngineView();
// view->load(QUrl("http://jsroot.gsi.de/dev/examples.htm"));
// view->show();
//QWebEngineView *view = new QWebEngineView();
//view->load(QUrl("http://jsroot.gsi.de/dev/examples.htm"));
//view->show();
d->Run();
d->Run();
// while (true) {
// QApplication::processEvents();
// QApplication::sendPostedEvents();
// QThread::msleep(10);
// }
//while (true) {
// QApplication::processEvents();
// QApplication::sendPostedEvents();
// QThread::msleep(10);
// }
return 0;
return 0;
// return app.exec();
// return app.exec();
}
gui/canvaspainter/v7/qt5/rootwebpage.cpp
+ 4
− 4
View file @ c6f14efe
......@@ -2,7 +2,8 @@
/// \ingroup CanvasPainter ROOT7
/// \author Sergey Linev <S.Linev@gsi.de>
/// \date 2017-06-29
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback is welcome!
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback
/// is welcome!
/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
......@@ -12,13 +13,12 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
#include "rootwebpage.h"
#include <stdio.h>
void RootWebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel,
const QString &message, int lineNumber, const QString &sourceID)
void RootWebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &message, int lineNumber,
const QString &sourceID)
{
QByteArray ba = message.toLatin1();
QByteArray src = sourceID.toLatin1();
......
gui/canvaspainter/v7/qt5/rootwebpage.h
+ 4
− 5
View file @ c6f14efe
......@@ -2,7 +2,8 @@
/// \ingroup CanvasPainter ROOT7
/// \author Sergey Linev <S.Linev@gsi.de>
/// \date 2017-06-29
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback is welcome!
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback
/// is welcome!
/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
......@@ -20,14 +21,12 @@
class RootWebPage : public QWebEnginePage {
Q_OBJECT
protected:
virtual void javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
const QString &message, int lineNumber, const QString &sourceID);
virtual void javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
int lineNumber, const QString &sourceID);
public:
RootWebPage(QObject *parent = 0) : QWebEnginePage(parent) {}
virtual ~RootWebPage() {}
};
#endif
gui/canvaspainter/v7/qt5/rootwebview.cpp
+ 5
− 3
View file @ c6f14efe
......@@ -2,7 +2,8 @@
/// \ingroup CanvasPainter ROOT7
/// \author Sergey Linev <S.Linev@gsi.de>
/// \date 2017-06-29
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback is welcome!
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback
/// is welcome!
/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
......@@ -15,11 +16,12 @@
#include "rootwebview.h"
#include "rootwebpage.h"
RootWebView::RootWebView(QWidget* parent) : QWebEngineView(parent)
RootWebView::RootWebView(QWidget *parent) : QWebEngineView(parent)
{
setPage(new RootWebPage());
//connect(this, SIGNAL(javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &, int, const QString &)),
// connect(this, SIGNAL(javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &, int, const QString
// &)),
// this, SLOT(doConsole(JavaScriptConsoleMessageLevel, const QString &, int, const QString &)));
// connect(this, &QWebEngineView::javaScriptConsoleMessage, this, &RootWebView::doConsole);
......
gui/canvaspainter/v7/qt5/rootwebview.h
+ 3
− 4
View file @ c6f14efe
......@@ -2,7 +2,8 @@
/// \ingroup CanvasPainter ROOT7
/// \author Sergey Linev <S.Linev@gsi.de>
/// \date 2017-06-29
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback is welcome!
/// \warning This is part of the ROOT 7 prototype! It will change without notice. It might trigger earthquakes. Feedback
/// is welcome!
/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
......@@ -20,11 +21,9 @@
class RootWebView : public QWebEngineView {
Q_OBJECT
protected:
public:
RootWebView(QWidget* parent = 0);
RootWebView(QWidget *parent = 0);
virtual ~RootWebView();
};
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment