raster pushed a commit to branch master.
commit c2535d52b644107579293be064b21899f46f259f
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Wed May 8 12:26:05 2013 +0900
Revert "move ctrl+0,1,2... before imf processing so it works with imf on."
This reverts commit dd23ed64be95599dd8eeab0baf4e07febb204e17.
---
src/bin/termio.c | 64 +++++++++++++++++++++++++-------------------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index c0a09c1..3bd2fc8 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1899,12 +1899,39 @@ _smart_cb_key_down(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
sd = evas_object_smart_data_get(data);
if (!sd) return;
- // handle ctrl+1,2,3...9,0 specially before imf filtering
+ if (sd->imf)
+ {
+ // EXCEPTION. Don't filter modifiers alt+shift -> breaks emacs
+ // and jed (alt+shift+5 for search/replace for example)
+ // Don't filter modifiers alt, is used by shells
+ if (!evas_key_modifier_is_set(ev->modifiers, "Alt"))
+ {
+ Ecore_IMF_Event_Key_Down imf_ev;
+
+ ecore_imf_evas_event_key_down_wrap(ev, &imf_ev);
+ if (!sd->composing)
+ {
+ if (ecore_imf_context_filter_event
+ (sd->imf, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event
*)&imf_ev))
+ goto end;
+ }
+ }
+ }
if ((!evas_key_modifier_is_set(ev->modifiers, "Alt")) &&
(evas_key_modifier_is_set(ev->modifiers, "Control")) &&
(!evas_key_modifier_is_set(ev->modifiers, "Shift")))
{
- if (!strcmp(ev->keyname, "1"))
+ if (!strcmp(ev->keyname, "Prior"))
+ {
+ evas_object_smart_callback_call(data, "prev", NULL);
+ goto end;
+ }
+ else if (!strcmp(ev->keyname, "Next"))
+ {
+ evas_object_smart_callback_call(data, "next", NULL);
+ goto end;
+ }
+ else if (!strcmp(ev->keyname, "1"))
{
_compose_seq_reset(sd);
evas_object_smart_callback_call(data, "tab,1", NULL);
@@ -1965,39 +1992,6 @@ _smart_cb_key_down(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
goto end;
}
}
- if (sd->imf)
- {
- // EXCEPTION. Don't filter modifiers alt+shift -> breaks emacs
- // and jed (alt+shift+5 for search/replace for example)
- // Don't filter modifiers alt, is used by shells
- if (!evas_key_modifier_is_set(ev->modifiers, "Alt"))
- {
- Ecore_IMF_Event_Key_Down imf_ev;
-
- ecore_imf_evas_event_key_down_wrap(ev, &imf_ev);
- if (!sd->composing)
- {
- if (ecore_imf_context_filter_event
- (sd->imf, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event
*)&imf_ev))
- goto end;
- }
- }
- }
- if ((!evas_key_modifier_is_set(ev->modifiers, "Alt")) &&
- (evas_key_modifier_is_set(ev->modifiers, "Control")) &&
- (!evas_key_modifier_is_set(ev->modifiers, "Shift")))
- {
- if (!strcmp(ev->keyname, "Prior"))
- {
- evas_object_smart_callback_call(data, "prev", NULL);
- goto end;
- }
- else if (!strcmp(ev->keyname, "Next"))
- {
- evas_object_smart_callback_call(data, "next", NULL);
- goto end;
- }
- }
if ((!evas_key_modifier_is_set(ev->modifiers, "Alt")) &&
(evas_key_modifier_is_set(ev->modifiers, "Control")) &&
(evas_key_modifier_is_set(ev->modifiers, "Shift")))
--
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
