From 008cdb42d718ed1e1e61c9c16e6aa22bc345d202 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Wed, 6 Feb 2013 22:30:32 +0000
Subject: Fix empty textarea reflow.  Fix empty line (just \n) redraw.  Add set
 layout function to set size and padding.

---
 desktop/textarea.c | 39 ++++++++++++++++++++++++++++++++++++---
 desktop/textarea.h | 16 +++++++++++++++-
 2 files changed, 51 insertions(+), 4 deletions(-)

(limited to 'desktop')

diff --git a/desktop/textarea.c b/desktop/textarea.c
index 3fe284497..679917b21 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -498,6 +498,13 @@ static bool textarea_reflow(struct textarea *ta, unsigned int start)
 			avail_width = 0;
 		h_extent = avail_width;
 
+		if (ta->text.len == 1) {
+			/* Handle empty textarea */
+			assert(ta->text.data[0] == '\0');
+			ta->lines[line].b_start = 0;
+			ta->lines[line++].b_length = 1;
+		}
+
 		restart = false;
 		for (len = ta->text.len - 1, text = ta->text.data; len > 0;
 				len -= b_off, text += b_off) {
@@ -658,7 +665,6 @@ static bool textarea_reflow(struct textarea *ta, unsigned int start)
  * \param ta		Text area
  * \param x		X coordinate
  * \param y		Y coordinate
- * \param b_off		Updated to byte offset
  * \param c_off		Updated to character offset
  */
 static void textarea_get_xy_offset(struct textarea *ta, int x, int y,
@@ -1033,7 +1039,7 @@ struct textarea *textarea_create(const textarea_flags flags,
 		ret->show = &ret->text;
 	}
 
-	ret->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.2),
+	ret->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.3),
 			FMUL(nscss_screen_dpi,
 			INTTOFIX((setup->text.size /
 			FONT_SIZE_SCALE))))), F_72));
@@ -1365,8 +1371,10 @@ void textarea_redraw(struct textarea *ta, int x, int y, colour bg,
 	for (line = line0; (line <= line1) &&
 			(y + line * ta->line_height <= r.y1 + ta->scroll_y);
 			line++) {
-		if (ta->lines[line].b_length == 0)
+		if (ta->lines[line].b_length == 0) {
+			c_pos++;
 			continue;
+		}
 
 		/* reset clip rectangle */
 		plot->clip(&r);
@@ -2054,3 +2062,28 @@ void textarea_set_dimensions(struct textarea *ta, int width, int height)
 
 	ta->callback(ta->data, &msg);
 }
+
+
+/* exported interface, documented in textarea.h */
+void textarea_set_layout(struct textarea *ta, int width, int height,
+		int top, int right, int bottom, int left)
+{
+	struct textarea_msg msg;
+
+	ta->vis_width = width;
+	ta->vis_height = height;
+	ta->pad_top = top;
+	ta->pad_right = right;
+	ta->pad_bottom = bottom;
+	ta->pad_left = left;
+	textarea_reflow(ta, 0);
+
+	msg.ta = ta;
+	msg.type = TEXTAREA_MSG_REDRAW_REQUEST;
+	msg.data.redraw.x0 = 0;
+	msg.data.redraw.y0 = 0;
+	msg.data.redraw.x1 = ta->vis_width;
+	msg.data.redraw.y1 = ta->vis_height;
+
+	ta->callback(ta->data, &msg);
+}
diff --git a/desktop/textarea.h b/desktop/textarea.h
index c54b08345..4276868c9 100644
--- a/desktop/textarea.h
+++ b/desktop/textarea.h
@@ -128,7 +128,7 @@ bool textarea_set_text(struct textarea *ta, const char *text);
  *
  * \param ta Text area
  * \param buf Pointer to buffer to receive data, or NULL
- *            to read length required
+ *            to read length required (includes trailing '\0')
  * \param len Length (bytes) of buffer pointed to by buf, or 0 to read length
  * \return Length (bytes) written/required or -1 on error
  */
@@ -202,5 +202,19 @@ void textarea_get_dimensions(struct textarea *ta, int *width, int *height);
  * \param height	the new height of the textarea
  */
 void textarea_set_dimensions(struct textarea *ta, int width, int height);
+
+/**
+ * Set the dimensions and padding of a textarea, causing a reflow and
+ * emitting a redraw request.
+ *
+ * \param width 	the new width of the textarea
+ * \param height	the new height of the textarea
+ * \param top		the new top padding of the textarea
+ * \param right		the new right padding of the textarea
+ * \param bottom	the new bottom padding of the textarea
+ * \param left		the new left padding of the textarea
+ */
+void textarea_set_layout(struct textarea *ta, int width, int height,
+		int top, int right, int bottom, int left);
 #endif
 
-- 
cgit v1.2.3