Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add basic keyboard support for magicleap #22491

Merged
merged 1 commit into from Dec 23, 2018
Merged

Add basic keyboard support for magicleap #22491

merged 1 commit into from Dec 23, 2018
+129 −4

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Dec 18, 2018 •
edited by SimonSapin

Add basic keyboard support for magicleap servo.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #22401
  • These changes do not require tests because we don't test magicleap UI

This change is Reviewable
@asajeffrey
Add basic keyboard support for magicleap
Loading status checks…
3af2f9a
@highfive
Copy link

highfive commented Dec 18, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@jdm
jdm requested changes Dec 21, 2018
View changes
support/magicleap/Servo2D/code/src/Servo2D.cpp
}

bool Servo2D::keyboardEventListener(const lumin::ui::KeyboardEvent::EventData& event) {
if (event.getEventType() != lumin::ui::KeyboardEvent::EventType::KEY_PRESSED) {

This comment has been minimized.

Sign in to view
@jdm

jdm Dec 21, 2018

Member

Why not pass along KEY_DOWN and KEY_UP like we do in the glutin port, rather than simulating them in libmlservo?

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Dec 21, 2018

Author Member

Er, because there aren't key down and up, only pressed at https://creator.magicleap.com/learn/reference/public/v0.16.0/LuminRT/namespacelumin_1_1____lr1__0_1_1ui_1_1_keyboard_event.html

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Dec 21, 2018

Author Member

Filed #22524.

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Dec 21, 2018

Author Member

Checked with magicleap, and there's no way to access the down/up events. https://forum.magicleap.com/hc/en-us/community/posts/360035146792-Keyboard-key-up-and-key-down-events-
ports/libmlservo/src/lib.rs
..key_down.clone()
};

// TODO: can the ML1 generate separate press and release events?

This comment has been minimized.

Sign in to view
@jdm

jdm Dec 21, 2018

Member

https://github.com/webmixedreality/exokit/blob/master/deps/exokit-bindings/magicleap/src/magicleap.cc#L1451-L1473 suggests yes.

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Dec 21, 2018

Author Member

That's using their own keyboard event impl, not the lumin runtime one. https://github.com/webmixedreality/exokit/blob/106bfbb4829057906067e6a88e4450df3e1895c2/deps/exokit-bindings/magicleap/include/magicleap.h#L86 uses https://github.com/webmixedreality/exokit/blob/106bfbb4829057906067e6a88e4450df3e1895c2/deps/exokit-bindings/magicleap/include/magicleap.h#L69 which has separate events for up and down.

The matching lumin events only have a pressed event: https://creator.magicleap.com/learn/reference/public/v0.16.0/LuminRT/namespacelumin_1_1____lr1__0_1_1ui_1_1_keyboard_event.html
ports/libmlservo/src/lib.rs Show resolved Hide resolved
@jdm jdm assigned jdm and unassigned Manishearth Dec 21, 2018
@asajeffrey
Copy link
Member Author

asajeffrey commented Dec 21, 2018

@bors-servo r=jdm (on IRC https://mozilla.logbot.info/servo/20181221#c15753794)
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

📌 Commit 3af2f9a has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

⌛ Testing commit 3af2f9a with merge d66ac0e...
bors-servo added a commit that referenced this pull request Dec 21, 2018
@bors-servo
Auto merge of #22491 - asajeffrey:magicleap-keyboard-visibility, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d66ac0e 
Add basic keyboard support for magicleap

<!-- Please describe your changes on the following line: -->

Add basic keyboard support for magicleap servo.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22401
- [X] These changes do not require tests because we don't test magicleap UI

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22491)
<!-- Reviewable:end -->
@jdm
jdm approved these changes Dec 21, 2018
View changes
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

💔 Test failed - status-taskcluster
@asajeffrey
Copy link
Member Author

asajeffrey commented Dec 21, 2018 

{
    "status": "TIMEOUT", 
    "group": "default", 
    "message": "Test timed out", 
    "stack": null, 
    "subtest": "document.open() aborts documents that are queued for navigation through <meta> refresh with timeout 0 (image loading)", 
    "test": "/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-immediate.window.html", 
    "line": 134218, 
    "action": "test_result", 
    "expected": "PASS"
}

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

💣 Failed to start rebuilding: Unknown error
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

⌛ Testing commit 3af2f9a with merge 349d19d...
bors-servo added a commit that referenced this pull request Dec 21, 2018
@bors-servo
Auto merge of #22491 - asajeffrey:magicleap-keyboard-visibility, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
349d19d 
Add basic keyboard support for magicleap

<!-- Please describe your changes on the following line: -->

Add basic keyboard support for magicleap servo.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22401
- [X] These changes do not require tests because we don't test magicleap UI

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22491)
<!-- Reviewable:end -->
@jdm
Copy link
Member

jdm commented Dec 21, 2018

@asajeffrey Very few PRs can land right now. I am dealing with it; don't bother retrying.
@asajeffrey
Copy link
Member Author

asajeffrey commented Dec 21, 2018

OK, I'll try to be patient.
@bors-servo
Copy link
Contributor

bors-servo commented Dec 21, 2018

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Dec 22, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2018

⌛ Testing commit 3af2f9a with merge cc8649d...
bors-servo added a commit that referenced this pull request Dec 23, 2018
@bors-servo
Auto merge of #22491 - asajeffrey:magicleap-keyboard-visibility, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cc8649d 
Add basic keyboard support for magicleap

<!-- Please describe your changes on the following line: -->

Add basic keyboard support for magicleap servo.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22401
- [X] These changes do not require tests because we don't test magicleap UI

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22491)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2018

💔 Test failed - mac-rel-wpt4
@jdm
Copy link
Member

jdm commented Dec 23, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2018

⌛ Testing commit 3af2f9a with merge 3d91d83...
bors-servo added a commit that referenced this pull request Dec 23, 2018
@bors-servo
Auto merge of #22491 - asajeffrey:magicleap-keyboard-visibility, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3d91d83 
Add basic keyboard support for magicleap

<!-- Please describe your changes on the following line: -->

Add basic keyboard support for magicleap servo.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22401
- [X] These changes do not require tests because we don't test magicleap UI

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22491)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 23, 2018

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: jdm
Pushing 3d91d83 to master...
@bors-servo bors-servo merged commit 3af2f9a into servo:master Dec 23, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
P-magic leap
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Support making the keyboard visible in magicleap
5 participants
@asajeffrey @highfive @bors-servo @jdm @Manishearth
You can’t perform that action at this time.