ActiveEvent merged in to Event.xs

diff --git a/Build.PL b/Build.PL
index 0e5a3a5..c4b605d 100644 (file)
--- a/Build.PL
+++ b/Build.PL
@@ -49,13 +49,6 @@ my %subsystems =
                },
                libraries => [qw( SDL )],
        },
-       ActiveEvent => {
-               file      => {
-                       from  => 'src/Core/objects/ActiveEvent.xs',
-                       to    => 'lib/SDL/ActiveEvent.xs',
-               },
-               libraries => [qw( SDL )],
-       },
        Event => {
                file      => {
                        from  => 'src/Core/objects/Event.xs',

diff --git a/src/Core/objects/Event.xs b/src/Core/objects/Event.xs
index a777442..dfda479 100644 (file)
--- a/src/Core/objects/Event.xs
+++ b/src/Core/objects/Event.xs
@@ -67,6 +67,47 @@ event_active ( event, ... )
        OUTPUT:
                RETVAL
 
+Uint8
+event_active_type ( event)
+       SDL_Event *event
+       CODE: 
+               SDL_ActiveEvent * a = &(event->active);
+               RETVAL = a->type;
+       OUTPUT:
+               RETVAL
+
+
+Uint8
+event_active_gain ( event, ... )
+       SDL_Event *event
+       CODE: 
+               SDL_ActiveEvent * a = &(event->active);
+       
+               if( items > 1 )
+               {
+                       a->gain = SvIV( ST(1) );
+
+               }
+               RETVAL = a->gain;
+       OUTPUT:
+               RETVAL
+
+Uint8
+event_active_state ( event, ... )
+       SDL_Event *event
+       CODE: 
+               SDL_ActiveEvent * a = &(event->active);
+               if( items > 1 )
+               {
+                       a->state = SvIV( ST(1) );
+
+               }
+               
+               RETVAL = a->state;
+       OUTPUT:
+               RETVAL
+
+
 SDL_KeyboardEvent *
 event_key ( event, ... )
        SDL_Event *event
@@ -215,4 +256,4 @@ void
 event_DESTROY(self)
        SDL_Event *self
        CODE:
-               //safefree( (char *)self );
+               safefree( (char *)self );

diff --git a/t/core_events.t b/t/core_events.t
index e57069e..1415ddc 100644 (file)
--- a/t/core_events.t
+++ b/t/core_events.t
@@ -3,7 +3,6 @@ use strict;
 use SDL;
 use SDL::Event;
 use SDL::Events;
-use SDL::ActiveEvent;
 use SDL::ExposeEvent;
 use SDL::JoyAxisEvent;
 use SDL::JoyBallEvent;
@@ -49,7 +48,6 @@ syswm
 
 can_ok( 'SDL::Events',           @done); 
 can_ok( 'SDL::Event',            @done_event);
-can_ok( 'SDL::ActiveEvent',      qw/type gain state/);
 can_ok( 'SDL::ExposeEvent',      qw/type/);
 can_ok( 'SDL::JoyAxisEvent',     qw/type which axis value/);
 can_ok( 'SDL::JoyBallEvent',     qw/type which ball xrel yrel/);
@@ -118,7 +116,6 @@ is($qevent->type,  SDL_QUIT, '[SDL::QuitEvent->type] returns correctly');
 is($wrevent->type, SDL_VIDEORESIZE, '[SDL::ResizeEvent->type] returns correctly'); 
 is($wmevent->type, SDL_SYSWMEVENT, '[SDL::SysWMEvent->type] returns correctly'); 
 is($uevent->type,  SDL_USEREVENT, '[SDL::UserEvent->type] returns correctly'); 
-=cut
 
 SDL::init(SDL_INIT_VIDEO);                                                                          
 
@@ -128,11 +125,11 @@ my $event   = SDL::Event->new();
 
 my $aevent  = SDL::Event->new(); 
 $aevent->type( SDL_ACTIVEEVENT);
-$aevent->active->gain(1);
-$aevent->active->state(SDL_APPMOUSEFOCUS);
+$aevent->active_gain(1);
+$aevent->active_state(SDL_APPMOUSEFOCUS);
 
-my $weevent = SDL::Event->new(); 
-$weevent->type(SDL_VIDEOEXPOSE);
+#my $weevent = SDL::Event->new(); 
+#$weevent->type(SDL_VIDEOEXPOSE);
 
 SDL::Events::push_event($aevent); pass '[push_event] Pushed in an Active Event';
 
@@ -155,11 +152,11 @@ last if ($ret == 0 );
 }
 
 is( $got_event, 1, '[poll_event] Got an Active event back out') ;
-is( $event->active->gain() , 1, '[poll_event] Got right active->gain');
-is( $event->active->state() , SDL_APPMOUSEFOCUS, '[poll_event] Got right active->state');
+is( $event->active_gain() , 1, '[poll_event] Got right active->gain');
+is( $event->active_state() , SDL_APPMOUSEFOCUS, '[poll_event] Got right active->state');
 
 
-SDL::Events::push_event($weevent); pass '[push_event] ran';
+SDL::Events::push_event($aevent); pass '[push_event] ran';
 
 SDL::Events::pump_events(); 
 
@@ -167,7 +164,7 @@ my $value = SDL::Events::wait_event($event);
 
 is( $value, 1, '[wait_event] waited for event');
 
-SDL::Events::push_event($weevent); pass '[push_event] ran'; 
+SDL::Events::push_event($aevent); pass '[push_event] ran'; 
 
 SDL::Events::pump_events(); 
 
@@ -175,7 +172,7 @@ SDL::Events::pump_events();
 my $num_peep_events = SDL::Events::peep_events($event, 127, SDL_PEEKEVENT, SDL_ALLEVENTS);
 is($num_peep_events >= 0, 1,  '[peep_events] Size of event queue is ' . $num_peep_events);
 
-
+=cut 
 
 
 my @left = qw/