Edje_Real_Part *rp = ed->focused_part;
Entry *en;
Eina_Bool control, alt, shift;
+#if defined(__APPLE__) && defined(__MACH__)
+ Eina_Bool super, altgr;
+#endif
Eina_Bool multiline;
Eina_Bool cursor_changed;
int old_cur_pos;
old_cur_pos = evas_textblock_cursor_pos_get(en->cursor);
+#if defined(__APPLE__) && defined(__MACH__)
+ super = evas_key_modifier_is_set(ev->modifiers, "Super");
+ altgr = evas_key_modifier_is_set(ev->modifiers, "AltGr");
+#endif
control = evas_key_modifier_is_set(ev->modifiers, "Control");
alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
}
if (evas_textblock_cursor_char_prev(en->cursor))
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+#if defined(__APPLE__) && defined(__MACH__)
+ if (altgr) evas_textblock_cursor_word_start(en->cursor);
+#else
/* If control is pressed, go to the start of the word */
if (control) evas_textblock_cursor_word_start(en->cursor);
+#endif
if (en->select_allow)
{
if (shift) _sel_extend(ed, en->cursor, rp->object, en);
}
}
/* If control is pressed, go to the end of the word */
+#if defined(__APPLE__) && defined(__MACH__)
+ if (altgr) evas_textblock_cursor_word_end(en->cursor);
+#else
if (control) evas_textblock_cursor_word_end(en->cursor);
+#endif
if (evas_textblock_cursor_char_next(en->cursor))
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
if (en->select_allow)
_edje_emit(ed, "cursor,changed,manual", rp->part->name);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (!shift) && (!strcmp(ev->keyname, "v")))
+#else
else if ((control) && (!shift) && (!strcmp(ev->keyname, "v")))
+#endif
{
_compose_seq_reset(en);
_edje_emit(ed, "entry,paste,request", rp->part->name);
_edje_emit(ed, "entry,paste,request,3", rp->part->name);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (!strcmp(ev->keyname, "a")))
+#else
else if ((control) && (!strcmp(ev->keyname, "a")))
+#endif
{
_compose_seq_reset(en);
if (shift)
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert")))
+#else
else if ((control) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->key, "Insert")))
+#endif
{
_compose_seq_reset(en);
_edje_emit(ed, "entry,copy,notify", rp->part->name);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m")))))
+#else
else if ((control) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m")))))
+#endif
{
_compose_seq_reset(en);
_edje_emit(ed, "entry,cut,notify", rp->part->name);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (!strcmp(ev->keyname, "z")))
+#else
else if ((control) && (!strcmp(ev->keyname, "z")))
+#endif
{
_compose_seq_reset(en);
if (shift)
}
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
+#if defined(__APPLE__) && defined(__MACH__)
+ else if ((super) && (!shift) && (!strcmp(ev->keyname, "y")))
+#else
else if ((control) && (!shift) && (!strcmp(ev->keyname, "y")))
+#endif
{
_compose_seq_reset(en);
// redo
Evas_Event_Key_Down *ev = event_info;
Efl_Canvas_Text_Cursor *cur;
Eina_Bool control, alt, shift;
+#if defined(__APPLE__) && defined(__MACH__)
+ Eina_Bool super, altgr;
+#endif
Eina_Bool multiline;
int old_cur_pos;
char *string = (char *)ev->string;
control = evas_key_modifier_is_set(ev->modifiers, "Control");
alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
+#if defined(__APPLE__) && defined(__MACH__)
+ super = evas_key_modifier_is_set(ev->modifiers, "Super");
+ altgr = evas_key_modifier_is_set(ev->modifiers, "AltGr");
+#endif
multiline = en->multiline;
/* Translate some keys to strings. */
_key_down_sel_pre(obj, cur, en, shift, EINA_FALSE);
efl_canvas_text_cursor_char_prev(cur);
+#if defined(__APPLE__) && defined(__MACH__)
+ if (altgr) efl_canvas_text_cursor_word_start(cur);
+#else
/* If control is pressed, go to the start of the word */
if (control) efl_canvas_text_cursor_word_start(cur);
+#endif
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
_key_down_sel_post(obj, cur, en, shift);
_compose_seq_reset(en);
_key_down_sel_pre(obj, cur, en, shift, EINA_TRUE);
+#if defined(__APPLE__) && defined(__MACH__)
+ if (altgr) efl_canvas_text_cursor_word_end(cur);
+#else
/* If control is pressed, go to the end of the word */
if (control) efl_canvas_text_cursor_word_end(cur);
+#endif
efl_canvas_text_cursor_char_next(cur);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
free(compres);
compres = NULL;
_compose_seq_reset(en);
+#if defined(__APPLE__) && defined(__MACH__)
+ if (super ||
+ (string && (!string[1]) &&
+ (string[0] != 0xa) && (string[0] != 0x9) &&
+ ((string[0] < 0x20) || (string[0] == 0x7f))))
+#else
if (string && (!string[1]) &&
(string[0] != 0xa) && (string[0] != 0x9) &&
((string[0] < 0x20) || (string[0] == 0x7f)))
+#endif
goto end;
}
else