diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-17 14:38:53 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-17 14:38:53 +0000 |
| commit | 71cb70065e6819c26f101ff11e34c10383487b30 (patch) | |
| tree | 6a4e2d6adb6bfbb029a93fa4c992613228a49e24 /render/box_textarea.c | |
| parent | b99357616cebe750e523f123701f284d7ac0037f (diff) | |
| download | netsurf-71cb70065e6819c26f101ff11e34c10383487b30.tar.gz netsurf-71cb70065e6819c26f101ff11e34c10383487b30.tar.bz2 | |
Gadgets can exisit outside forms, so now they store their own ref to the containing html content.
Diffstat (limited to 'render/box_textarea.c')
| -rw-r--r-- | render/box_textarea.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/render/box_textarea.c b/render/box_textarea.c index 298406acd..fe5a7bab1 100644 --- a/render/box_textarea.c +++ b/render/box_textarea.c @@ -107,8 +107,8 @@ bool box_textarea_keypress(html_content *html, struct box *box, uint32_t key) static void box_textarea_callback(void *data, struct textarea_msg *msg) { struct form_textarea_data *d = data; - struct html_content *html = d->html; struct form_control *gadget = d->gadget; + struct html_content *html = d->gadget->html; struct box *box = gadget->box; switch (msg->type) { @@ -119,7 +119,7 @@ static void box_textarea_callback(void *data, struct textarea_msg *msg) union html_drag_owner drag_owner; drag_owner.no_owner = true; - html_set_drag_type(d->html, drag_type, drag_owner, + html_set_drag_type(html, drag_type, drag_owner, NULL); } else { /* Textarea drag started */ @@ -146,7 +146,7 @@ static void box_textarea_callback(void *data, struct textarea_msg *msg) break; } - html_set_drag_type(d->html, drag_type, drag_owner, + html_set_drag_type(html, drag_type, drag_owner, &rect); } break; @@ -171,7 +171,7 @@ static void box_textarea_callback(void *data, struct textarea_msg *msg) union html_selection_owner sel_owner; sel_owner.textarea = box; - html_set_selection(d->html, HTML_SELECTION_TEXTAREA, + html_set_selection(html, HTML_SELECTION_TEXTAREA, sel_owner, msg->data.selection.read_only); } else { @@ -179,7 +179,7 @@ static void box_textarea_callback(void *data, struct textarea_msg *msg) union html_selection_owner sel_owner; sel_owner.none = true; - html_set_selection(d->html, HTML_SELECTION_NONE, + html_set_selection(html, HTML_SELECTION_NONE, sel_owner, true); } break; @@ -191,12 +191,12 @@ static void box_textarea_callback(void *data, struct textarea_msg *msg) if (msg->data.caret.type == TEXTAREA_CARET_HIDE) { union html_focus_owner focus_owner; focus_owner.textarea = box; - html_set_focus(d->html, HTML_FOCUS_TEXTAREA, + html_set_focus(html, HTML_FOCUS_TEXTAREA, focus_owner, true, 0, 0, 0, NULL); } else { union html_focus_owner focus_owner; focus_owner.textarea = box; - html_set_focus(d->html, HTML_FOCUS_TEXTAREA, + html_set_focus(html, HTML_FOCUS_TEXTAREA, focus_owner, false, msg->data.caret.pos.x, msg->data.caret.pos.y, @@ -277,7 +277,6 @@ bool box_textarea_create_textarea(html_content *html, if (read_only) ta_flags |= TEXTAREA_READONLY; - gadget->data.text.data.html = html; gadget->data.text.data.gadget = gadget; font_plot_style_from_css(gadget->box->style, &fstyle); |