From: JinYong Park Date: Thu, 23 Nov 2017 10:45:09 +0000 (+0900) Subject: edje_entry: fix "command do nothing when capslock on" X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~894 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd20e22ee04826558171f3cbb5ee49c537b33af0;p=platform%2Fupstream%2Fefl.git edje_entry: fix "command do nothing when capslock on" original patch : https://review.tizen.org/gerrit/#/c/98668/ @tizen_fix Change-Id: Ib4866de0295b4dff144c621a71d2e789d46bb437 Signed-off-by: JinYong Park --- diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 3fa1299..cfe1514 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -2032,9 +2032,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (!shift) && (!strcmp(ev->keyname, "v"))) + */ + else if ((super) && (!shift) && (!strcasecmp(ev->keyname, "v"))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (!shift) && (!strcmp(ev->keyname, "v"))) + */ + else if ((control) && (!shift) && (!strcasecmp(ev->keyname, "v"))) + /* END */ #endif { _compose_seq_reset(en); @@ -2043,9 +2051,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (!strcmp(ev->keyname, "a"))) + */ + else if ((super) && (!strcasecmp(ev->keyname, "a"))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (!strcmp(ev->keyname, "a"))) + */ + else if ((control) && (!strcasecmp(ev->keyname, "a"))) + /* END */ #endif { _compose_seq_reset(en); @@ -2061,9 +2077,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert"))) + */ + else if ((super) && (((!shift) && !strcasecmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert"))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert"))) + */ + else if ((control) && (((!shift) && !strcasecmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert"))) + /* END */ #endif { _compose_seq_reset(en); @@ -2071,9 +2095,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m"))))) + */ + else if ((super) && (!shift) && ((!strcasecmp(ev->keyname, "x") || (!strcasecmp(ev->keyname, "m"))))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m"))))) + */ + else if ((control) && (!shift) && ((!strcasecmp(ev->keyname, "x") || (!strcasecmp(ev->keyname, "m"))))) + /* END */ #endif { _compose_seq_reset(en); @@ -2081,9 +2113,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (!strcmp(ev->keyname, "z"))) + */ + else if ((super) && (!strcasecmp(ev->keyname, "z"))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (!strcmp(ev->keyname, "z"))) + */ + else if ((control) && (!strcasecmp(ev->keyname, "z"))) + /* END */ #endif { _compose_seq_reset(en); @@ -2100,9 +2140,17 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; } #if defined(__APPLE__) && defined(__MACH__) + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((super) && (!shift) && (!strcmp(ev->keyname, "y"))) + */ + else if ((super) && (!shift) && (!strcasecmp(ev->keyname, "y"))) + /* END */ #else + /* TIZEN_ONLY(20161118): fix "command do nothing when capslock on" else if ((control) && (!shift) && (!strcmp(ev->keyname, "y"))) + */ + else if ((control) && (!shift) && (!strcasecmp(ev->keyname, "y"))) + /* END */ #endif { _compose_seq_reset(en);