From 27e06af0039936ed88c7a2915dec687e65d1a664 Mon Sep 17 00:00:00 2001 From: Ray Redondo Date: Fri, 20 Aug 2021 18:26:34 -0500 Subject: [PATCH] avm2: Initial MouseEvent stubs (#5065) * avm2: Start MouseEvent stubs * avm2: More MouseEvent work * chore: clippy * chore: fmt Co-authored-by: Adrian Wielgosik --- core/src/avm2/globals.rs | 6 +++ core/src/avm2/globals/flash/events.rs | 1 + .../avm2/globals/flash/events/mouseevent.rs | 49 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 core/src/avm2/globals/flash/events/mouseevent.rs diff --git a/core/src/avm2/globals.rs b/core/src/avm2/globals.rs index 99b2fc7cf..8a29e1647 100644 --- a/core/src/avm2/globals.rs +++ b/core/src/avm2/globals.rs @@ -544,6 +544,12 @@ pub fn load_player_globals<'gc>( domain, script, )?; + class( + activation, + flash::events::mouseevent::create_class(mc), + domain, + script, + )?; // package `flash.utils` avm2_system_class!( bytearray, diff --git a/core/src/avm2/globals/flash/events.rs b/core/src/avm2/globals/flash/events.rs index 3fdd0e2f7..4c56771ae 100644 --- a/core/src/avm2/globals/flash/events.rs +++ b/core/src/avm2/globals/flash/events.rs @@ -3,3 +3,4 @@ pub mod event; pub mod eventdispatcher; pub mod ieventdispatcher; +pub mod mouseevent; diff --git a/core/src/avm2/globals/flash/events/mouseevent.rs b/core/src/avm2/globals/flash/events/mouseevent.rs new file mode 100644 index 000000000..b27eb9a27 --- /dev/null +++ b/core/src/avm2/globals/flash/events/mouseevent.rs @@ -0,0 +1,49 @@ +use crate::avm2::activation::Activation; +use crate::avm2::class::{Class, ClassAttributes}; +use crate::avm2::method::Method; +use crate::avm2::names::{Namespace, QName}; +use crate::avm2::object::Object; +use crate::avm2::value::Value; +use crate::avm2::Error; +use gc_arena::{GcCell, MutationContext}; + +/// Implements `flash.events.MouseEvent`'s instance constructor. +pub fn instance_init<'gc>( + activation: &mut Activation<'_, 'gc, '_>, + this: Option>, + args: &[Value<'gc>], +) -> Result, Error> { + if let Some(this) = this { + activation.super_init(this, args)?; // Event uses the first three parameters + } + Ok(Value::Undefined) +} + +/// Implements `flash.events.MouseEvent`'s class constructor. +pub fn class_init<'gc>( + _activation: &mut Activation<'_, 'gc, '_>, + _this: Option>, + _args: &[Value<'gc>], +) -> Result, Error> { + Ok(Value::Undefined) +} + +/// Construct `MouseEvent`'s class. +pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> { + let class = Class::new( + QName::new(Namespace::package("flash.events"), "MouseEvent"), + Some(QName::new(Namespace::package("flash.events"), "Event").into()), + Method::from_builtin(instance_init, "", mc), + Method::from_builtin(class_init, "", mc), + mc, + ); + + let mut write = class.write(mc); + + write.set_attributes(ClassAttributes::SEALED); + + const CONSTANTS: &[(&str, &str)] = &[("CLICK", "click")]; + write.define_public_constant_string_class_traits(CONSTANTS); + + class +}