billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4b425b9054f2cb588a341a092e483cf5d6053e91
commit 4b425b9054f2cb588a341a092e483cf5d6053e91 Author: Boris Faure <[email protected]> Date: Tue Aug 19 23:09:50 2014 +0200 constify key_down event in termio --- src/bin/keyin.c | 4 ++-- src/bin/keyin.h | 2 +- src/bin/miniview.c | 2 +- src/bin/miniview.h | 2 +- src/bin/termio.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/keyin.c b/src/bin/keyin.c index c977349..9a0c44a 100644 --- a/src/bin/keyin.c +++ b/src/bin/keyin.c @@ -380,7 +380,7 @@ static const Keyout kps_keyout[] = }; static Eina_Bool -_key_try(Termpty *ty, const Keyout *map, Evas_Event_Key_Down *ev) +_key_try(Termpty *ty, const Keyout *map, const Evas_Event_Key_Down *ev) { int i, inlen; @@ -399,7 +399,7 @@ _key_try(Termpty *ty, const Keyout *map, Evas_Event_Key_Down *ev) } void -keyin_handle(Termpty *ty, Evas_Event_Key_Down *ev, +keyin_handle(Termpty *ty, const Evas_Event_Key_Down *ev, int alt, int shift, int ctrl) { if (!alt) diff --git a/src/bin/keyin.h b/src/bin/keyin.h index 5fa3182..c1e6294 100644 --- a/src/bin/keyin.h +++ b/src/bin/keyin.h @@ -1,7 +1,7 @@ #ifndef _KEYIN_H__ #define _KEYIN_H__ 1 -void keyin_handle(Termpty *ty, Evas_Event_Key_Down *ev, +void keyin_handle(Termpty *ty, const Evas_Event_Key_Down *ev, int alt, int shift, int ctrl); #endif diff --git a/src/bin/miniview.c b/src/bin/miniview.c index deaa4d1..e3ea331 100644 --- a/src/bin/miniview.c +++ b/src/bin/miniview.c @@ -250,7 +250,7 @@ miniview_position_offset(Evas_Object *obj, int by, Eina_Bool sanitize) } Eina_Bool -miniview_handle_key(Evas_Object *obj, Evas_Event_Key_Down *ev) +miniview_handle_key(Evas_Object *obj, const Evas_Event_Key_Down *ev) { Miniview *mv; Evas_Coord ox, oy, ow, oh, mx, my; diff --git a/src/bin/miniview.h b/src/bin/miniview.h index 8ca308a..5ce22b8 100644 --- a/src/bin/miniview.h +++ b/src/bin/miniview.h @@ -7,7 +7,7 @@ Evas_Object * miniview_add(Evas_Object *parent, Evas_Object *termio); void miniview_redraw(Evas_Object *obj); void miniview_position_offset(Evas_Object *obj, int by, Eina_Bool sanitize); -Eina_Bool miniview_handle_key(Evas_Object *obj, Evas_Event_Key_Down *ev); +Eina_Bool miniview_handle_key(Evas_Object *obj, const Evas_Event_Key_Down *ev); void miniview_init(void); void miniview_shutdown(void); diff --git a/src/bin/termio.c b/src/bin/termio.c index d87b5ea..6ea1cf6 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -1863,7 +1863,7 @@ _handle_alt_ctrl(const char *keyname, Evas_Object *term) } static Eina_Bool -_handle_shift(Evas_Event_Key_Down *ev, int by, Evas_Object *term, Termio *sd) +_handle_shift(const Evas_Event_Key_Down *ev, int by, Evas_Object *term, Termio *sd) { if (!strcmp(ev->key, "Prior")) { @@ -1935,7 +1935,7 @@ static void _smart_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { - Evas_Event_Key_Down *ev = event; + const Evas_Event_Key_Down *ev = event; Termio *sd = evas_object_smart_data_get(data); Ecore_Compose_State state; char *compres = NULL; @@ -2092,7 +2092,7 @@ _smart_cb_key_down(void *data, Evas *e EINA_UNUSED, { Ecore_IMF_Event_Key_Down imf_ev; - ecore_imf_evas_event_key_down_wrap(ev, &imf_ev); + ecore_imf_evas_event_key_down_wrap((Evas_Event_Key_Down*)ev, &imf_ev); if (!sd->composing) { if (ecore_imf_context_filter_event --
