kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

editor: correctly paste multiline windows text

This commit is contained in:
Andy Williams 2015-05-05 21:41:29 +01:00
parent ee9cec7ddd
commit a5e1f82382
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/elm_code/src/lib/elm_code_text.c
View File

@ -220,15 +220,17 @@ elm_code_text_tabwidth_at_position(unsigned int position, unsigned int tabstop)
}
EAPI int
elm_code_text_newlinenpos(const char *text, unsigned int length)
elm_code_text_newlinenpos(const char *text, unsigned int length, short *nllen)
{
int lfpos, crpos;
int check;
if (nllen)
*nllen = 1;
lfpos = elm_code_text_strnpos(text, length, "\n", 0);
check = length;
if (lfpos != ELM_CODE_TEXT_NOT_FOUND)
check = lfpos;
check = lfpos + 1;
crpos = elm_code_text_strnpos(text, check, "\r", 0);
if (lfpos == ELM_CODE_TEXT_NOT_FOUND && crpos == ELM_CODE_TEXT_NOT_FOUND)
@ -238,6 +240,9 @@ elm_code_text_newlinenpos(const char *text, unsigned int length)
return lfpos;
if (lfpos == ELM_CODE_TEXT_NOT_FOUND)
return crpos;
if (nllen)
*nllen = 2;
if (lfpos < crpos)
return lfpos;
return crpos;

2
legacy/elm_code/src/lib/elm_code_text.h
View File

@ -52,7 +52,7 @@ EAPI unsigned int elm_code_text_tabwidth_at_position(unsigned int position, unsi
EAPI int elm_code_text_strnpos(const char *text, unsigned int length, const char *search, int offset);
EAPI int elm_code_text_newlinenpos(const char *text, unsigned int length);
EAPI int elm_code_text_newlinenpos(const char *text, unsigned int length, short *nllen);
EAPI unsigned int elm_code_line_text_column_width_to_position(Elm_Code_Line *line, unsigned int length, unsigned int tabstop);

9
legacy/elm_code/src/lib/widget/elm_code_widget_selection.c
View File

@ -310,6 +310,7 @@ _selection_paste_multi(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd, Elm_Co
Elm_Code_Line *line;
unsigned int position, newrow, remain;
int nlpos;
short nllen;
char *ptr;
line = elm_code_file_line_get(code->file, row);
@ -319,15 +320,15 @@ _selection_paste_multi(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd, Elm_Co
newrow = row;
ptr = (char *)text;
remain = len;
while ((nlpos = elm_code_text_newlinenpos(ptr, remain)) != ELM_CODE_TEXT_NOT_FOUND)
while ((nlpos = elm_code_text_newlinenpos(ptr, remain, &nllen)) != ELM_CODE_TEXT_NOT_FOUND)
{
if (newrow == row)
_selection_paste_single(widget, pd, code, col, row, text, nlpos);
else
elm_code_file_line_insert(code->file, newrow, ptr, nlpos, NULL);
remain -= nlpos + 1; // TODO make this adapt to windows lengths (length param to newlinenpos)
ptr += nlpos + 1;
remain -= nlpos + nllen;
ptr += nlpos + nllen;
newrow++;
}
@ -355,7 +356,7 @@ _selection_paste_cb(void *data, Evas_Object *obj EINA_UNUSED, Elm_Selection_Data
code = elm_code_widget_code_get(),
elm_code_widget_cursor_position_get(&col, &row));
if (elm_code_text_newlinenpos(ev->data, ev->len) == ELM_CODE_TEXT_NOT_FOUND)
if (elm_code_text_newlinenpos(ev->data, ev->len, NULL) == ELM_CODE_TEXT_NOT_FOUND)
_selection_paste_single(widget, pd, code, col, row, ev->data, ev->len - 1);
else
_selection_paste_multi(widget, pd, code, col, row, ev->data, ev->len - 1);