vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

selection in backbuffer fix try #2 

get rid of segv's by trying this again in a different way

@fix
This commit is contained in:
Carsten Haitzler 2019-08-26 17:41:22 +01:00 committed by Boris Faure
parent ef9bdfe67a
commit e33d07f492
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/termiointernals.c
View File

@ -816,6 +816,7 @@ _trim_sel_word(Termio *sd)
if (!cells) if (!cells)
return; return;
if (end >= w) end = w - 1;
while (end >= 0 && _to_trim(cells[end].codepoint, EINA_FALSE)) while (end >= 0 && _to_trim(cells[end].codepoint, EINA_FALSE))
end--; end--;
@ -1361,7 +1362,7 @@ termio_selection_dbl_fix(Termio *sd)
((end_y == start_y) && ((end_y == start_y) &&
(end_x >= start_x))) (end_x >= start_x)))
{ {
if (start_x > 0) if ((start_x > 0) && (start_x < w))
{ {
if ((cells[start_x].codepoint == 0) && if ((cells[start_x].codepoint == 0) &&
(cells[start_x].att.dblwidth)) (cells[start_x].att.dblwidth))
@ -2442,7 +2443,7 @@ termio_internal_render(Termio *sd,
tc[x].italic = 0; tc[x].italic = 0;
tc[x].double_width = 0; tc[x].double_width = 0;
if (u && *u != ' ') if (u && *u != ' ' && *u)
{ {
termio_sel_set(sd, EINA_FALSE); termio_sel_set(sd, EINA_FALSE);
u = cp = NULL; u = cp = NULL;
@ -2481,7 +2482,7 @@ termio_internal_render(Termio *sd,
blk->w * sd->font.chw, blk->w * sd->font.chw,
blk->h * sd->font.chh); blk->h * sd->font.chh);
} }
if (u && *u != ' ') if (u && *u != ' ' && *u)
{ {
termio_sel_set(sd, EINA_FALSE); termio_sel_set(sd, EINA_FALSE);
u = cp = NULL; u = cp = NULL;
@ -2508,7 +2509,7 @@ termio_internal_render(Termio *sd,
if ((tc[x].double_width) && (tc[x].codepoint == 0) && if ((tc[x].double_width) && (tc[x].codepoint == 0) &&
(ch2 == x - 1)) (ch2 == x - 1))
ch2 = x; ch2 = x;
if (u && *u != ' ') if (u && *u != ' ' && *u)
{ {
termio_sel_set(sd, EINA_FALSE); termio_sel_set(sd, EINA_FALSE);
u = cp = NULL; u = cp = NULL;