summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh13
-rw-r--r--src/lib/elementary/elc_fileselector.c2
-rw-r--r--src/lib/elementary/elm_code_widget.c2
-rw-r--r--src/lib/evas/canvas/efl_input_key.c4
-rw-r--r--src/lib/evas/canvas/efl_input_key.eo2
-rw-r--r--src/tests/elementary/efl_ui_test_win.c2
7 files changed, 9 insertions, 18 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 4b36bf4..e1438db 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -56,7 +56,7 @@ _key_down(void *data, const Efl_Event *ev)
56 // 2. ecore_evas -> evas -> focused obj (elm_win) -> here 56 // 2. ecore_evas -> evas -> focused obj (elm_win) -> here
57 57
58 sprintf(str, "key=%s keyname=%s string=%s compose=%s", 58 sprintf(str, "key=%s keyname=%s string=%s compose=%s",
59 efl_input_key_get(ev->info), 59 efl_input_key_sym_get(ev->info),
60 efl_input_key_name_get(ev->info), 60 efl_input_key_name_get(ev->info),
61 efl_input_key_string_get(ev->info), 61 efl_input_key_string_get(ev->info),
62 efl_input_key_compose_string_get(ev->info)); 62 efl_input_key_compose_string_get(ev->info));
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 02cda67..733592e 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -114,8 +114,7 @@ inline bool is_alias_blacklisted(attributes::alias_def const& alias)
114 114
115inline bool is_property_blacklisted(std::string const& name) 115inline bool is_property_blacklisted(std::string const& name)
116{ 116{
117 return name == "Efl.Input.Key.Key" 117 return name == "Efl.Input.Hold.Hold"
118 || name == "Efl.Input.Hold.Hold"
119 || name == "Efl.IText.Text"; 118 || name == "Efl.IText.Text";
120} 119}
121 120
@@ -135,17 +134,9 @@ inline bool is_property_blacklisted(attributes::property_def const& property, Co
135 134
136template<typename Context> 135template<typename Context>
137inline bool is_property_blacklisted(attributes::property_def const& property, 136inline bool is_property_blacklisted(attributes::property_def const& property,
138 attributes::klass_def const& implementing_class, 137 EINA_UNUSED attributes::klass_def const& implementing_class,
139 Context const& context) 138 Context const& context)
140{ 139{
141 std::string property_name = name_helpers::property_managed_name(property);
142 std::string klass_name = name_helpers::klass_concrete_or_interface_name(implementing_class);
143
144 // This property wrapper is invalidated as it would clash with the implementing
145 // class constructor. CS
146 if (property_name == klass_name)
147 return true;
148
149 return is_property_blacklisted(property, context); 140 return is_property_blacklisted(property, context);
150} 141}
151 142
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index a3ef342..39f1a7c 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1537,7 +1537,7 @@ _files_key_down(void *data, const Efl_Event *event)
1537 1537
1538 if (!searchbar) return; 1538 if (!searchbar) return;
1539 1539
1540 key = efl_input_key_get(ev); 1540 key = efl_input_key_sym_get(ev);
1541 string = efl_input_key_string_get(ev); 1541 string = efl_input_key_string_get(ev);
1542 if (string && *(string) && (isalpha(*string) || isdigit(*string))) 1542 if (string && *(string) && (isalpha(*string) || isdigit(*string)))
1543 { 1543 {
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 4a953e2..17ee786 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1891,7 +1891,7 @@ _elm_code_widget_efl_ui_widget_widget_input_event_handler(Eo *obj EINA_UNUSED, E
1891 if (eo_event->desc != EFL_EVENT_KEY_DOWN) return EINA_FALSE; 1891 if (eo_event->desc != EFL_EVENT_KEY_DOWN) return EINA_FALSE;
1892 1892
1893 // FIXME: This should use key bindings and the standard implementation! 1893 // FIXME: This should use key bindings and the standard implementation!
1894 if (eina_streq(efl_input_key_get(ev), "BackSpace")) 1894 if (eina_streq(efl_input_key_sym_get(ev), "BackSpace"))
1895 { 1895 {
1896 efl_input_processed_set(ev, EINA_TRUE); 1896 efl_input_processed_set(ev, EINA_TRUE);
1897 return EINA_TRUE; 1897 return EINA_TRUE;
diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index 8a55da6..07d5a63 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -95,13 +95,13 @@ _efl_input_key_key_name_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
95} 95}
96 96
97EOLIAN static void 97EOLIAN static void
98_efl_input_key_key_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val) 98_efl_input_key_key_sym_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
99{ 99{
100 eina_stringshare_replace(&pd->key, val); 100 eina_stringshare_replace(&pd->key, val);
101} 101}
102 102
103EOLIAN static const char * 103EOLIAN static const char *
104_efl_input_key_key_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd) 104_efl_input_key_key_sym_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
105{ 105{
106 return pd->key; 106 return pd->key;
107} 107}
diff --git a/src/lib/evas/canvas/efl_input_key.eo b/src/lib/evas/canvas/efl_input_key.eo
index 062d02e..f75d2b1 100644
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -15,7 +15,7 @@ class Efl.Input.Key extends Efl.Object implements Efl.Input.Event, Efl.Input.Sta
15 val: string; [[Key name]] 15 val: string; [[Key name]]
16 } 16 }
17 } 17 }
18 @property key { 18 @property key_sym {
19 [[Logical key. 19 [[Logical key.
20 20
21 Eg. Shift + 1 = exclamation 21 Eg. Shift + 1 = exclamation
diff --git a/src/tests/elementary/efl_ui_test_win.c b/src/tests/elementary/efl_ui_test_win.c
index aecd136..4e61e5b 100644
--- a/src/tests/elementary/efl_ui_test_win.c
+++ b/src/tests/elementary/efl_ui_test_win.c
@@ -139,7 +139,7 @@ _check_key_event(void *data, const Efl_Event *ev)
139 139
140 ck_assert_int_eq(efl_input_timestamp_get(ev->info), TIMESTAMP); 140 ck_assert_int_eq(efl_input_timestamp_get(ev->info), TIMESTAMP);
141 ck_assert_str_eq(efl_input_key_name_get(ev->info), "odiaeresis"); 141 ck_assert_str_eq(efl_input_key_name_get(ev->info), "odiaeresis");
142 ck_assert_str_eq(efl_input_key_get(ev->info), "ö"); 142 ck_assert_str_eq(efl_input_key_sym_get(ev->info), "ö");
143 ck_assert_str_eq(efl_input_key_string_get(ev->info), "Ö"); 143 ck_assert_str_eq(efl_input_key_string_get(ev->info), "Ö");
144 ck_assert_str_eq(efl_input_key_compose_string_get(ev->info), "Ö"); 144 ck_assert_str_eq(efl_input_key_compose_string_get(ev->info), "Ö");
145 ck_assert_int_eq(efl_input_key_code_get(ev->info), 0xffe1); 145 ck_assert_int_eq(efl_input_key_code_get(ev->info), 0xffe1);