Compare commits

...

1 Commits

Author SHA1 Message Date
Manish Goregaokar
95a170be9c Add support for squeeze events 2019-11-21 17:56:34 -08:00
4 changed files with 25 additions and 14 deletions

View File

@@ -107,6 +107,9 @@ selectend
selectstart
serif
signalingstatechange
squeeze
squeezeend
squeezestart
srclang
statechange
stroke

View File

@@ -39,8 +39,11 @@ interface XRSession : EventTarget {
// // Events
attribute EventHandler onend;
attribute EventHandler onselect;
attribute EventHandler onsqueeze;
// attribute EventHandler oninputsourceschange;
attribute EventHandler onselectstart;
attribute EventHandler onselectend;
attribute EventHandler onsqueezestart;
attribute EventHandler onsqueezeend;
attribute EventHandler onvisibilitychange;
};

View File

@@ -218,16 +218,22 @@ impl XRSession {
let event = XRSessionEvent::new(&self.global(), atom!("end"), false, false, self);
event.upcast::<Event>().fire(self.upcast());
},
XREvent::Select(input, kind, frame) => {
XREvent::Select(input, is_squeeze, kind, frame) => {
use servo_atoms::Atom;
const START_ATOMS: [Atom; 2] = [atom!("selectstart"), atom!("squeezestart")];
const EVENT_ATOMS: [Atom; 2] = [atom!("select"), atom!("squeeze")];
const END_ATOMS: [Atom; 2] = [atom!("selectend"), atom!("squeezeend")];
// https://immersive-web.github.io/webxr/#primary-action
let source = self.input_sources.find(input);
let atom_index = if is_squeeze { 1 } else { 0 };
if let Some(source) = source {
let frame = XRFrame::new(&self.global(), self, frame);
frame.set_active(true);
if kind == SelectEvent::Start {
let event = XRInputSourceEvent::new(
&self.global(),
atom!("selectstart"),
START_ATOMS[atom_index],
false,
false,
&frame,
@@ -238,7 +244,7 @@ impl XRSession {
if kind == SelectEvent::Select {
let event = XRInputSourceEvent::new(
&self.global(),
atom!("select"),
EVENT_ATOMS[atom_index],
false,
false,
&frame,
@@ -248,7 +254,7 @@ impl XRSession {
}
let event = XRInputSourceEvent::new(
&self.global(),
atom!("selectend"),
END_ATOMS[atom_index],
false,
false,
&frame,
@@ -353,6 +359,15 @@ impl XRSessionMethods for XRSession {
/// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectend
event_handler!(selectend, GetOnselectend, SetOnselectend);
/// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeeze
event_handler!(squeeze, GetOnsqueeze, SetOnsqueeze);
/// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezestart
event_handler!(squeezestart, GetOnsqueezestart, SetOnsqueezestart);
/// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezeend
event_handler!(squeezeend, GetOnsqueezeend, SetOnsqueezeend);
/// https://immersive-web.github.io/webxr/#eventdef-xrsession-visibilitychange
event_handler!(
visibilitychange,

View File

@@ -169,13 +169,3 @@
[WebGLRenderingContext includes WebGLRenderingContextBase: member names are unique]
expected: FAIL
[XRSession interface: attribute onsqueeze]
expected: FAIL
[XRSession interface: attribute onsqueezestart]
expected: FAIL
[XRSession interface: attribute onsqueezeend]
expected: FAIL