Merge remote-tracking branch 'origin/master' into barview

include/widgets/textbox.h

@@ -59,12 +59,16 @@ typedef struct
     int              markup;
     int              changed;
 
+    cairo_surface_t  *icon; // AA TODO - pass in icons for a textbox line if needed
+    int              icon_index;
+
     int              blink;
     guint            blink_timeout;
 
     double           yalign ;
 
     PangoFontMetrics *metrics;
+    int              left_offset;
     //
     const char       *theme_name;
 } textbox;
@@ -84,6 +88,7 @@ typedef enum
         TB_WRAP      = 1 << 21,
         TB_PASSWORD  = 1 << 22,
         TB_INDICATOR = 1 << 23,
+        TB_ICON = 1<<24,
 } TextboxFlags;
 /**
  * Flags indicating current state of the textbox.
@@ -143,6 +148,14 @@ void textbox_font ( textbox *tb, TextBoxFontType tbft );
  */
 void textbox_text ( textbox *tb, const char *text );
 
+/**
+ * @param tb  Handle to the textbox
+ * @param text The icon to show on the textbox
+ *
+ * Set the text to show. Cursor is moved to end (if visible)
+ */
+void textbox_icon ( textbox *tb, cairo_surface_t *icon );
+
 /**
  * @param tb Handle to the textbox
  * @param action the #KeyBindingAction to execute on textbox
@@ -279,6 +292,14 @@ void textbox_set_pango_context ( const char *font, PangoContext *p );
  */
 void textbox_set_pango_attributes ( textbox *tb, PangoAttrList *list );
 
+/**
+ * @param tb Handle to the textbox
+ * @param index character index to draw the icon at. -1 for no icon
+ *
+ * Sets the character index where the icon should be drawn
+ */
+void textbox_set_icon_index ( textbox *tb, int index );
+
 /**
  * @param tb Handle to the textbox
  *