[Adonthell-commits] CVS: adonthell/src/input listener.cc, 1.2, 1.3 listener.h, 1.2, 1.3

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/input
In directory subversions:/tmp/cvs-serv17798/src/input

Modified Files:
        listener.cc listener.h 
Log Message:
FIXED Memory leak in the python callbacks
FIXED Uncatched errors in the python callbacks
REMOVED stupid debugging messages in surface_sdl::draw_line
CHANGED input callbacks to return booleans instead of integers


Index: listener.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/input/listener.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** listener.cc 24 Jul 2003 12:57:58 -0000      1.2
--- listener.cc 28 Jul 2003 15:02:19 -0000      1.3
***************
*** 39,43 ****
  
  
!     void 
listener::connect_keyboard_function(base::functor_1ret<keyboard_event *, int> * 
f)
      {
          disconnect_keyboard_function();
--- 39,43 ----
  
  
!     void 
listener::connect_keyboard_function(base::functor_1ret<keyboard_event *, bool> 
* f)
      {
          disconnect_keyboard_function();
***************
*** 45,49 ****
      }
  
!     void listener::connect_mouse_function(base::functor_1ret<mouse_event *, 
int> * f)
      {
          disconnect_mouse_function();
--- 45,49 ----
      }
  
!     void listener::connect_mouse_function(base::functor_1ret<mouse_event *, 
bool> * f)
      {
          disconnect_mouse_function();
***************
*** 51,55 ****
      }
  
!     void 
listener::connect_joystick_function(base::functor_1ret<joystick_event *, int> * 
f)
      {
          disconnect_joystick_function();
--- 51,55 ----
      }
  
!     void 
listener::connect_joystick_function(base::functor_1ret<joystick_event *, bool> 
* f)
      {
          disconnect_joystick_function();
***************
*** 57,61 ****
      }
  
!     void listener::connect_control_function(base::functor_1ret<control_event 
*, int> * f)
      {
          disconnect_control_function();
--- 57,61 ----
      }
  
!     void listener::connect_control_function(base::functor_1ret<control_event 
*, bool> * f)
      {
          disconnect_control_function();

Index: listener.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/input/listener.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** listener.h  24 Jul 2003 12:57:58 -0000      1.2
--- listener.h  28 Jul 2003 15:02:19 -0000      1.3
***************
*** 90,100 ****
           * @param f callback function to call when an event of type \e t is 
raised
           */
!         void connect_keyboard_function(base::functor_1ret<keyboard_event *, 
int> * f);
  
!         void connect_mouse_function(base::functor_1ret<mouse_event *, int> * 
f);
  
!         void connect_joystick_function(base::functor_1ret<joystick_event *, 
int> * f);
  
!         void connect_control_function(base::functor_1ret<control_event *, 
int> * f);
  
          /**
--- 90,100 ----
           * @param f callback function to call when an event of type \e t is 
raised
           */
!         void connect_keyboard_function(base::functor_1ret<keyboard_event *, 
bool> * f);
  
!         void connect_mouse_function(base::functor_1ret<mouse_event *, bool> * 
f);
  
!         void connect_joystick_function(base::functor_1ret<joystick_event *, 
bool> * f);
  
!         void connect_control_function(base::functor_1ret<control_event *, 
bool> * f);
  
          /**
***************
*** 128,135 ****
  
      private:
!         base::functor_1ret<keyboard_event *, int> * Keyboard_callback;
!         base::functor_1ret<mouse_event *, int> * Mouse_callback;
!         base::functor_1ret<joystick_event *, int> * Joystick_callback;
!         base::functor_1ret<control_event *, int> * Control_callback;
      };
  }
--- 128,135 ----
  
      private:
!         base::functor_1ret<keyboard_event *, bool> * Keyboard_callback;
!         base::functor_1ret<mouse_event *, bool> * Mouse_callback;
!         base::functor_1ret<joystick_event *, bool> * Joystick_callback;
!         base::functor_1ret<control_event *, bool> * Control_callback;
      };
  }