mirror of
https://github.com/rkd77/elinks.git
synced 2024-10-27 08:00:32 -04:00
Changed type uint16_t to unicode_val_T.Changed var x and xi to xbase and x.
This commit is contained in:
parent
f515f14e08
commit
546539b25e
@ -274,7 +274,7 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
|
|||||||
struct box *box;
|
struct box *box;
|
||||||
int vx, vy;
|
int vx, vy;
|
||||||
int sl, ye;
|
int sl, ye;
|
||||||
int x, y;
|
int x, xbase, y;
|
||||||
|
|
||||||
assert(term && doc_view && doc_view->document && doc_view->vs && link);
|
assert(term && doc_view && doc_view->document && doc_view->vs && link);
|
||||||
if_assert_failed return;
|
if_assert_failed return;
|
||||||
@ -294,7 +294,7 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
|
|||||||
sl = fs->vypos;
|
sl = fs->vypos;
|
||||||
while (line->start != -1 && sl) sl--, line++;
|
while (line->start != -1 && sl) sl--, line++;
|
||||||
|
|
||||||
x = link->points[0].x + box->x - vx;
|
xbase = link->points[0].x + box->x - vx;
|
||||||
y = link->points[0].y + box->y - vy;
|
y = link->points[0].y + box->y - vy;
|
||||||
ye = y + fc->rows;
|
ye = y + fc->rows;
|
||||||
|
|
||||||
@ -310,11 +310,10 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
|
|||||||
|
|
||||||
if (!row_is_in_box(box, y)) continue;
|
if (!row_is_in_box(box, y)) continue;
|
||||||
|
|
||||||
for (i = 0; i < fc->cols; i++) {
|
for (i = 0, x = xbase; i < fc->cols; i++, x++) {
|
||||||
uint16_t data;
|
unicode_val_T data;
|
||||||
int xi = x + i;
|
|
||||||
|
|
||||||
if (!col_is_in_box(box, xi))
|
if (!col_is_in_box(box, x))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (i >= -fs->vpos
|
if (i >= -fs->vpos
|
||||||
@ -323,7 +322,7 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
|
|||||||
else
|
else
|
||||||
data = '_';
|
data = '_';
|
||||||
|
|
||||||
draw_char_data(term, xi, y, data);
|
draw_char_data(term, x, y, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -332,11 +331,9 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
|
|||||||
|
|
||||||
if (!row_is_in_box(box, y)) continue;
|
if (!row_is_in_box(box, y)) continue;
|
||||||
|
|
||||||
for (i = 0; i < fc->cols; i++) {
|
for (i = 0, x = xbase; i < fc->cols; i++, x++) {
|
||||||
int xi = x + i;
|
if (col_is_in_box(box, x))
|
||||||
|
draw_char_data(term, x, y, '_');
|
||||||
if (col_is_in_box(box, xi))
|
|
||||||
draw_char_data(term, xi, y, '_');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user