mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 15:29:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-09-23 21:48:22 by bursa]

Browse Source 
Textarea related fixes.

svn path=/import/netsurf/; revision=312
This commit is contained in:
James Bursa 2003-09-23 21:48:22 +00:00
parent 29952cfc1f
commit 6da97decbf
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
desktop/browser.c
View File

@ -643,6 +643,9 @@ void browser_window_textarea_callback(struct browser_window *bw, char key, void
box_coords(textarea, &actual_x, &actual_y); box_coords(textarea, &actual_x, &actual_y);
/* box_dump(textarea, 0); */
LOG(("key %i at %i in '%.*s'", key, char_offset, (int) text_box->length, text_box->text));
if (32 <= key && key != 127) { if (32 <= key && key != 127) {
/* normal character insertion */ /* normal character insertion */
text_box->text = xrealloc(text_box->text, text_box->length + 2); text_box->text = xrealloc(text_box->text, text_box->length + 2);
@ -666,6 +669,9 @@ void browser_window_textarea_callback(struct browser_window *bw, char key, void
} else if (inline_container->prev) { } else if (inline_container->prev) {
/* merge with previous paragraph */ /* merge with previous paragraph */
struct box *prev_container = inline_container->prev; struct box *prev_container = inline_container->prev;
struct box *t;
for (t = inline_container->children; t; t = t->next)
t->parent = prev_container;
prev_container->last->next = inline_container->children; prev_container->last->next = inline_container->children;
inline_container->children->prev = prev_container->last; inline_container->children->prev = prev_container->last;
prev_container->last = inline_container->last; prev_container->last = inline_container->last;
@ -745,7 +751,22 @@ void browser_window_textarea_callback(struct browser_window *bw, char key, void
return; return;
} }
box_dump(textarea, 0); /* for (struct box *ic = textarea->children; ic; ic = ic->next) {
assert(ic->type == BOX_INLINE_CONTAINER);
assert(ic->parent == textarea);
if (ic->next) assert(ic->next->prev == ic);
if (ic->prev) assert(ic->prev->next == ic);
if (!ic->next) assert(textarea->last == ic);
for (struct box *t = ic->children; t; t = t->next) {
assert(t->type == BOX_INLINE);
assert(t->text);
assert(t->font);
assert(t->parent == ic);
if (t->next) assert(t->next->prev == t);
if (t->prev) assert(t->prev->next == t);
if (!t->next) assert(ic->last == t);
}
} */
/* reflow textarea preserving width and height */ /* reflow textarea preserving width and height */
width = textarea->width; width = textarea->width;
@ -754,6 +775,25 @@ void browser_window_textarea_callback(struct browser_window *bw, char key, void
textarea->width = width; textarea->width = width;
textarea->height = height; textarea->height = height;
/* box_dump(textarea, 0); */
/* for (struct box *ic = textarea->children; ic; ic = ic->next) {
assert(ic->type == BOX_INLINE_CONTAINER);
assert(ic->parent == textarea);
if (ic->next) assert(ic->next->prev == ic);
if (ic->prev) assert(ic->prev->next == ic);
if (!ic->next) assert(textarea->last == ic);
for (struct box *t = ic->children; t; t = t->next) {
assert(t->type == BOX_INLINE);
assert(t->text);
assert(t->font);
assert(t->parent == ic);
if (t->next) assert(t->next->prev == t);
if (t->prev) assert(t->prev->next == t);
if (!t->next) assert(ic->last == t);
}
} */
if (text_box->length < char_offset) { if (text_box->length < char_offset) {
/* the text box has been split and the caret is in the second part */ /* the text box has been split and the caret is in the second part */
char_offset -= (text_box->length + 1); /* +1 for the space */ char_offset -= (text_box->length + 1); /* +1 for the space */

8
render/layout.c
View File

@ -431,7 +431,9 @@ struct box * layout_line(struct box * first, unsigned long width, unsigned long
c2->next = c->next; c2->next = c->next;
c->next = c2; c->next = c2;
c2->prev = c; c2->prev = c;
if (!c2->next) if (c2->next)
c2->next->prev = c2;
else
c2->parent->last = c2; c2->parent->last = c2;
b = c2; b = c2;
} }
@ -460,7 +462,9 @@ struct box * layout_line(struct box * first, unsigned long width, unsigned long
c2->next = c->next; c2->next = c->next;
c->next = c2; c->next = c2;
c2->prev = c; c2->prev = c;
if (!c2->next) if (c2->next)
c2->next->prev = c2;
else
c2->parent->last = c2; c2->parent->last = c2;
b = c2; b = c2;
x += space_before + w; x += space_before + w;