Skip to content

Commit

Permalink
UWP: allow servo's initial URL to be set before Servo starts
Browse files Browse the repository at this point in the history
  • Loading branch information
paulrouget committed Jul 6, 2020
1 parent d93e67a commit 79ecc7e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
4 changes: 2 additions & 2 deletions support/hololens/ServoApp/DefaultUrl.h
Expand Up @@ -4,5 +4,5 @@

// For development purpose.
// Will override DEFAULT_URL_PROD or any locally stored preferences.
// #define OVERRIDE_DEFAULT_URL "data:text/html,<input>"
// #define OVERRIDE_DEFAULT_URL "http://localhost:8000/test.html"
// #define OVERRIDE_DEFAULT_URL L"data:text/html,<input>"
// #define OVERRIDE_DEFAULT_URL L"http://localhost:8000/test.html"
25 changes: 17 additions & 8 deletions support/hololens/ServoApp/ServoControl/Servo.cpp
Expand Up @@ -134,8 +134,8 @@ const char *prompt_input(const char *message, const char *default,
}
}

Servo::Servo(hstring args, GLsizei width, GLsizei height,
EGLNativeWindowType eglNativeWindow, float dpi,
Servo::Servo(std::optional<hstring> initUrl, hstring args, GLsizei width,
GLsizei height, EGLNativeWindowType eglNativeWindow, float dpi,
ServoDelegate &aDelegate)
: mWindowHeight(height), mWindowWidth(width), mDelegate(aDelegate) {
ApplicationDataContainer localSettings =
Expand Down Expand Up @@ -172,13 +172,22 @@ Servo::Servo(hstring args, GLsizei width, GLsizei height,
auto val = unbox_value<bool>(value);
cpref.value = &val;
} else if (type == Windows::Foundation::PropertyType::String) {
cpref.pref_type = capi::CPrefType::Str;
cpref.value = *hstring2char(unbox_value<hstring>(value));
#ifdef OVERRIDE_DEFAULT_URL
hstring strValue;
if (pref.Key() == L"shell.homepage") {
cpref.value = OVERRIDE_DEFAULT_URL;
}
if (initUrl.has_value()) {
strValue = *initUrl;
} else {
#ifdef OVERRIDE_DEFAULT_URL
strValue = OVERRIDE_DEFAULT_URL;
#else
strValue = unbox_value<hstring>(value);
#endif
}
} else {
strValue = unbox_value<hstring>(value);
}
cpref.pref_type = capi::CPrefType::Str;
cpref.value = *hstring2char(strValue);
} else if (type == Windows::Foundation::PropertyType::Int64) {
cpref.pref_type = capi::CPrefType::Int;
auto val = unbox_value<int64_t>(value);
Expand All @@ -200,7 +209,7 @@ Servo::Servo(hstring args, GLsizei width, GLsizei height,

capi::CInitOptions o;
o.prefs = &prefsList;
o.args = *hstring2char(args + L"--devtools");
o.args = *hstring2char(args + L" --devtools");
o.width = mWindowWidth;
o.height = mWindowHeight;
o.density = dpi;
Expand Down
3 changes: 2 additions & 1 deletion support/hololens/ServoApp/ServoControl/Servo.h
Expand Up @@ -26,7 +26,8 @@ class ServoDelegate;

class Servo {
public:
Servo(hstring, GLsizei, GLsizei, EGLNativeWindowType, float, ServoDelegate &);
Servo(std::optional<hstring>, hstring, GLsizei, GLsizei, EGLNativeWindowType,
float, ServoDelegate &);
~Servo();
ServoDelegate &Delegate() { return mDelegate; }

Expand Down
6 changes: 4 additions & 2 deletions support/hololens/ServoApp/ServoControl/ServoControl.cpp
Expand Up @@ -379,6 +379,8 @@ void ServoControl::TryLoadUri(hstring input) {
});
}
});
} else {
mInitUrl = input;
}
}

Expand All @@ -398,8 +400,8 @@ void ServoControl::Loop() {
log(L"Entering loop");
ServoDelegate *sd = static_cast<ServoDelegate *>(this);
EGLNativeWindowType win = GetNativeWindow();
mServo = std::make_unique<Servo>(mArgs, mPanelWidth, mPanelHeight, win,
mDPI, *sd);
mServo = std::make_unique<Servo>(mInitUrl, mArgs, mPanelWidth, mPanelHeight,
win, mDPI, *sd);
} else {
// FIXME: this will fail since create_task didn't pick the thread
// where Servo was running initially.
Expand Down
1 change: 1 addition & 0 deletions support/hololens/ServoApp/ServoControl/ServoControl.h
Expand Up @@ -217,6 +217,7 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
float mDPI = 1;
hstring mCurrentUrl = L"";
bool mTransient = false;
std::optional<hstring> mInitUrl = {};

Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();
void CreateNativeWindow();
Expand Down

0 comments on commit 79ecc7e

Please sign in to comment.