lib/mnit_input: add `KeyEvent::name`

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/android/input_events.nit b/lib/android/input_events.nit
index c766a16..55f21a5 100644 (file)
--- a/lib/android/input_events.nit
+++ b/lib/android/input_events.nit
@@ -216,6 +216,8 @@ extern class AndroidKeyEvent `{AInputEvent *`}
                return 0;
        `}
 
+       redef fun name do return key_code.to_s
+
        # Was this event raised by the back key?
        fun is_back_key: Bool do return key_code == 4
 

diff --git a/lib/mnit_input.nit b/lib/mnit_input.nit
index cd6c59d..58864e4 100644 (file)
--- a/lib/mnit_input.nit
+++ b/lib/mnit_input.nit
@@ -85,6 +85,11 @@ interface KeyEvent
 
        # Get Char value of key, if any
        fun to_c: nullable Char is abstract
+
+       # Name of the key that raised `self`
+       #
+       # Use mainly for debug since it is implementation dependent.
+       fun name: String is abstract
 end
 
 # Mobile hardware (or pseudo hardware) event

diff --git a/lib/sdl.nit b/lib/sdl.nit
index 41ddc5b..446e347 100644 (file)
--- a/lib/sdl.nit
+++ b/lib/sdl.nit
@@ -369,27 +369,27 @@ class SDLKeyEvent
        super KeyEvent
        super SDLInputEvent
 
-       var key_name: String
+       redef var name
        var down: Bool
 
        init (key_name: String, down: Bool)
        do
-               self.key_name = key_name
+               self.name = key_name
                self.down = down
        end
 
        redef fun to_c: nullable Char
        do
-               if key_name.length == 1 then return key_name.chars.first
+               if name.length == 1 then return name.chars.first
                return null
        end
 
        redef fun to_s
        do
                if down then
-                       return "KeyboardEvent key {key_name} down"
+                       return "KeyboardEvent key {name} down"
                else
-                       return "KeyboardEvent key {key_name} up"
+                       return "KeyboardEvent key {name} up"
                end
        end
 
@@ -397,13 +397,13 @@ class SDLKeyEvent
        redef fun is_down do return down
 
        # Return true if the key is the up arrow
-       redef fun is_arrow_up do return key_name == "up"
+       redef fun is_arrow_up do return name == "up"
        # Return true if the key is the left arrow
-       redef fun is_arrow_left do return key_name == "left"
+       redef fun is_arrow_left do return name == "left"
        # Return true if the key is the down arrow
-       redef fun is_arrow_down do return key_name == "down"
+       redef fun is_arrow_down do return name == "down"
        # Return true if the key is the right arrow
-       redef fun is_arrow_right do return key_name == "right"
+       redef fun is_arrow_right do return name == "right"
 end
 
 class SDLQuitEvent