Mouse events implementation

2 files changed, 41 insertions, 14 deletions

diff --git a/elock.c b/elock.c
index ace4769..349266f 100644
--- a/elock.c
+++ b/elock.c
@@ -21,8 +21,6 @@ Ecore_Timer *	timer;
 
 int main (int argc, char **argv)
 {
-	int timer_result;
-	int event_hand_result;
 	double time;
 
 	/* Check no args to the program */	
@@ -39,7 +37,7 @@ int main (int argc, char **argv)
 	ecore_init();
 	
 	/* calling timer with the duration */
-	timer = elock_timer(time);
+	timer = elock_build_timer(time);
 	if (!timer)
 		fprintf (stdout,"ERROR OF TIMER");
 
@@ -58,9 +56,12 @@ int main (int argc, char **argv)
         evas_object_focus_set(base_rect, 1);
         evas_object_show(base_rect);
 
-        evas_object_event_callback_add(base_rect,EVAS_CALLBACK_KEY_DOWN, key_down, timer);      
-
-        ecore_main_loop_begin();
+        evas_object_event_callback_add(base_rect,EVAS_CALLBACK_KEY_DOWN, elock_key_event_cb, timer);
+	evas_object_event_callback_add(base_rect,EVAS_CALLBACK_MOUSE_MOVE, elock_key_event_cb, timer);
+	evas_object_event_callback_add(base_rect,EVAS_CALLBACK_MOUSE_WHEEL, elock_key_event_cb, timer);
+	evas_object_event_callback_add(base_rect,EVAS_CALLBACK_MOUSE_DOWN, elock_mouse_event_cb, timer);
+	
+       	ecore_main_loop_begin();
         
         ecore_evas_shutdown();
         ecore_shutdown();
@@ -78,7 +79,7 @@ int check_args (int arg)
 	return 1;
 }
 
-Ecore_Timer *elock_timer (double laps)
+Ecore_Timer *elock_build_timer (double laps)
 {
 	Ecore_Timer *timer;	
 	timer = ecore_timer_add(laps, elock_timer_callback, NULL);
@@ -145,14 +146,36 @@ int elock_event_cb (void *data, int ev_type, void *ev)
    return 1;
 }*/
 
-void key_down(void *data, Evas *e, Evas_Object *obj, void *event_info) {
-        Evas_Event_Key_Down *ev;
+void elock_key_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) 
+{
+      
+        fprintf(stdout,"DEBUG ICI");	
+       	Evas_Event_Key_Down *ev;
+        fprintf(stdout,"DEBUG LA");	
 
         ev = (Evas_Event_Key_Down *)event_info;
   	fprintf(stdout,"You hit key: %s\n", ev->keyname);
 	fprintf(stdout," and TIMER RESET\n");
-	ecore_timer_del(timer);
-	timer = NULL;
-	timer = elock_timer((double)TIME);
+	elock_kill_timer(timer);
+}
+
+void elock_mouse_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) 
+{
+	fprintf(stdout,"MOUSE DOWN EVENT");
+      
+  	Evas_Event_Mouse_Down *ev;
+
+        ev = (Evas_Event_Mouse_Down *)event_info;
+  	fprintf(stdout,"You hit key: %s\n", ev->button);
+	fprintf(stdout," and TIMER RESET\n");
+	elock_kill_timer(timer);
 }
 
+int elock_kill_timer(Ecore_Timer *elock_timer)
+{
+	ecore_timer_del(elock_timer);
+	timer = NULL;
+	timer = elock_build_timer((double)TIME);
+	
+	return 0;
+}
diff --git a/elock.h b/elock.h
index 97f5bfe..29091c4 100644
--- a/elock.h
+++ b/elock.h
@@ -13,13 +13,17 @@
 #define HEIGHT 400
 #define TIME 10
 
+Ecore_Timer *elock_build_timer (double laps);
 Ecore_Timer *elock_timer_callback(void *donnee);
-Ecore_Timer *elock_timer (double laps);
+
 
 int check_args (int arg);	
 int elock_event_handler();
 int elock_event_cb (void *data, int ev_type, void *ev);
+int elock_kill_timer(Ecore_Timer *elock_timer);
+
+void elock_key_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+void elock_mouse_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-void key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 	
 #endif