From 0655f1361534b444e63bf60ee35a76a0f2e5de46 Mon Sep 17 00:00:00 2001
From: Uli Schlachter <psychon@znc.in>
Date: Fri, 16 Jul 2010 18:54:57 +0200
Subject: [PATCH] Read a textbox' text correctly

Previously, querying a textbox' .text property would return the text with all
pango markup stripped.

Signed-off-by: Uli Schlachter <psychon@znc.in>
---
 widgets/textbox.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/widgets/textbox.c b/widgets/textbox.c
index e5e63735f..7c9e8a13f 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -40,6 +40,10 @@ typedef struct
 /** The textbox private data structure */
 typedef struct
 {
+    /** The actual text the textbox is set to */
+    char *text;
+    /** The length of text */
+    size_t text_len;
     draw_text_context_t data;
     /** Textbox width and height */
     int width, height;
@@ -208,6 +212,7 @@ textbox_destructor(widget_t *w)
 {
     textbox_data_t *d = w->data;
     draw_text_context_wipe(&d->data);
+    p_delete(&d->text);
     p_delete(&d);
 }
 
@@ -278,9 +283,9 @@ luaA_textbox_index(lua_State *L, awesome_token_t token)
         luaA_pushcolor(L, &d->border.color);
         return 1;
       case A_TK_TEXT:
-        if(d->data.len > 0)
+        if(d->text_len > 0)
         {
-            lua_pushlstring(L, d->data.text, d->data.len);
+            lua_pushlstring(L, d->text, d->text_len);
             return 1;
         }
         return 0;
@@ -377,20 +382,36 @@ luaA_textbox_newindex(lua_State *L, awesome_token_t token)
         {
             /* delete */
             draw_text_context_wipe(&d->data);
+            p_delete(&d->text);
+            d->text_len = 0;
             p_clear(&d->data, 1);
 
             if(buf)
             {
                 char *text;
                 ssize_t tlen;
+                bool success;
+
                 /* if text has been converted to UTF-8 */
                 if(draw_iso2utf8(buf, len, &text, &tlen))
                 {
-                    draw_text_context_init(&d->data, text, tlen);
+                    success = draw_text_context_init(&d->data, text, tlen);
+                    if(success)
+                    {
+                        d->text = p_dup(text, tlen);
+                        d->text_len = tlen;
+                    }
                     p_delete(&text);
                 }
                 else
-                    draw_text_context_init(&d->data, buf, len);
+                {
+                    success = draw_text_context_init(&d->data, buf, len);
+                    if(success)
+                    {
+                        d->text = p_dup(buf, len);
+                        d->text_len = len;
+                    }
+                }
 
                 d->extents = draw_text_extents(&d->data);
             }