Rename event procedures

diff --git a/examples/04-movement.scm b/examples/04-movement.scm
index e0592c3645f93c65b4d64113249b4af6748a535a..c6efed604d2474ab29a528e2261e079cd7b580ed 100644 (file)
--- a/examples/04-movement.scm
+++ b/examples/04-movement.scm
@@ -54,11 +54,11 @@
   (assoc-ref key-is-down key-code))
 
 (define (on-event event)
-  (if (equal? (event-type event) 'key-input-event)
+  (if (equal? (get-event-type event) 'key-input-event)
       (set! key-is-down
             (assoc-set! key-is-down
-                        (event-key-input-key event)
-                        (event-key-input-pressed event))))
+                        (get-event-key-input-key event)
+                        (get-event-key-input-pressed event))))
   #f)
 
 (define receiver (make-event-receiver on-event))

diff --git a/src/event-receiver.cpp b/src/event-receiver.cpp
index f0ec53aa0160208bc4b1e4592aaef47bc07ade23..56affaf44c429920b88ad3e9880f0f4657b60afb 100644 (file)
--- a/src/event-receiver.cpp
+++ b/src/event-receiver.cpp
@@ -35,11 +35,11 @@ extern "C" {
   {
     init_event_receiver_type ();
     init_event_type ();
-    DEFINE_GSUBR ("event-gui-caller", 1, 0, 0, event_gui_caller);
-    DEFINE_GSUBR ("event-gui-type", 1, 0, 0, event_gui_type);
-    DEFINE_GSUBR ("event-key-input-key", 1, 0, 0, event_key_input_key);
-    DEFINE_GSUBR ("event-key-input-pressed", 1, 0, 0, event_key_input_pressed);
-    DEFINE_GSUBR ("event-type", 1, 0, 0, event_type);
+    DEFINE_GSUBR ("get-event-gui-caller", 1, 0, 0, get_event_gui_caller);
+    DEFINE_GSUBR ("get-event-gui-type", 1, 0, 0, get_event_gui_type);
+    DEFINE_GSUBR ("get-event-key-input-key", 1, 0, 0, get_event_key_input_key);
+    DEFINE_GSUBR ("get-event-key-input-pressed", 1, 0, 0, get_event_key_input_pressed);
+    DEFINE_GSUBR ("get-event-type", 1, 0, 0, get_event_type);
     DEFINE_GSUBR ("make-event-receiver", 1, 0, 0, make_event_receiver);
   }
 
@@ -52,31 +52,31 @@ extern "C" {
                        wrap_event, unwrap_event);
 
   SCM
-  event_gui_caller (SCM event)
+  get_event_gui_caller (SCM event)
   {
     return wrap_gui_element (unwrap_event (event)->GUIEvent.Caller);
   }
 
   SCM
-  event_gui_type (SCM event)
+  get_event_gui_type (SCM event)
   {
     return scm_from_gui_event_type (unwrap_event (event)->GUIEvent.EventType);
   }
 
   SCM
-  event_key_input_key (SCM event)
+  get_event_key_input_key (SCM event)
   {
     return scm_from_key_code (unwrap_event (event)->KeyInput.Key);
   }
 
   SCM
-  event_key_input_pressed (SCM event)
+  get_event_key_input_pressed (SCM event)
   {
     return scm_from_bool (unwrap_event (event)->KeyInput.PressedDown);
   }
 
   SCM
-  event_type (SCM event)
+  get_event_type (SCM event)
   {
     return scm_from_event_type (unwrap_event (event)->EventType);
   }

diff --git a/src/event-receiver.h b/src/event-receiver.h
index 876bf0cbdf75843687b85dee49c39692fd196d11..b85efd4eabb4f5097131babcfab5caac58fa04be 100644 (file)
--- a/src/event-receiver.h
+++ b/src/event-receiver.h
@@ -38,19 +38,19 @@ extern "C" {
                         event_p, wrap_event, unwrap_event);
 
   SCM
-  event_gui_caller (SCM event);
+  get_event_gui_caller (SCM event);
 
   SCM
-  event_gui_type (SCM event);
+  get_event_gui_type (SCM event);
 
   SCM
-  event_key_input_key (SCM event);
+  get_event_key_input_key (SCM event);
 
   SCM
-  event_key_input_pressed (SCM event);
+  get_event_key_input_pressed (SCM event);
 
   SCM
-  event_type (SCM event);
+  get_event_type (SCM event);
 
   SCM
   make_event_receiver (SCM proc_on_event);