forked from enlightenment/enlightenment
insert key now does it too... and one printf less
SVN revision: 4318
This commit is contained in:
parent
bdbf267aeb
commit
123a82d5bd
35
src/entry.c
35
src/entry.c
|
@ -61,15 +61,8 @@ e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
|
|||
entry = _data;
|
||||
if ((_b == 2) && (!entry->mouse_down))
|
||||
{
|
||||
char *str2;
|
||||
char *type = "Inserted";
|
||||
|
||||
{
|
||||
if (entry->paste_win) e_window_destroy(entry->paste_win);
|
||||
printf("e_selection_request();\n");
|
||||
entry->paste_win = e_selection_request();
|
||||
}
|
||||
|
||||
if (entry->paste_win) e_window_destroy(entry->paste_win);
|
||||
entry->paste_win = e_selection_request();
|
||||
}
|
||||
else if (!entry->mouse_down)
|
||||
{
|
||||
|
@ -369,28 +362,8 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e)
|
|||
}
|
||||
else if (!strcmp(e->key, "Insert"))
|
||||
{
|
||||
char *str2;
|
||||
char *type = "Inserted";
|
||||
|
||||
if (entry->select.start >= 0)
|
||||
{
|
||||
str2 = strdup(e_entry_get_text(entry));
|
||||
if (entry->select.start + entry->select.length > strlen(entry->buffer))
|
||||
entry->select.length = strlen(entry->buffer) - entry->select.start;
|
||||
strcpy(&(str2[entry->select.start]), &(entry->buffer[entry->select.start + entry->select.length]));
|
||||
e_entry_set_text(entry, str2);
|
||||
free(str2);
|
||||
entry->cursor_pos = entry->select.start;
|
||||
entry->select.start = -1;
|
||||
}
|
||||
str2 = malloc(strlen(e_entry_get_text(entry)) + 1 + strlen(type));
|
||||
str2[0] = 0;
|
||||
strncat(str2, entry->buffer, entry->cursor_pos);
|
||||
strcat(str2, type);
|
||||
strcat(str2, &(entry->buffer[entry->cursor_pos]));
|
||||
e_entry_set_text(entry, str2);
|
||||
free(str2);
|
||||
entry->cursor_pos+=strlen(type);
|
||||
if (entry->paste_win) e_window_destroy(entry->paste_win);
|
||||
entry->paste_win = e_selection_request();
|
||||
}
|
||||
else if (!strcmp(e->key, "Home"))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue