1 files changed, 80 insertions, 12 deletions

diff --git a/ui_nwindow.c b/ui_nwindow.c
index 7098097..bb9c44e 100644
--- a/ui_nwindow.c
+++ b/ui_nwindow.c
@@ -6,7 +6,7 @@
 
 
 struct txtwindow *
-init_txtwindow(unsigned int x, unsigned int y, unsigned int width, unsigned int height, chtype attrs, window_func cb_update)
+init_txtwindow(unsigned int x, unsigned int y, unsigned int width, unsigned int height, chtype attrs, chtype text_attrs, window_func cb_update)
 {
   struct txtwindow *a = calloc(1, sizeof(struct txtwindow));
 
@@ -17,9 +17,10 @@ init_txtwindow(unsigned int x, unsigned int y, unsigned int width, unsigned int
   a->scrollable = false;
   a->title_len = INITIAL_TITLE_LEN;
   a->text_len = INITIAL_TEXT_LEN;
-  a->title = calloc(a->title_len, sizeof(char));
-  a->text = calloc(a->text_len, sizeof(char));
+  a->title = calloc(a->title_len+1, sizeof(char));
+  a->text = calloc(a->text_len+1, sizeof(char));
   a->attrs = attrs;
+  a->text_attrs = text_attrs;
   a->window_func = cb_update;
   return (a);
 }
@@ -36,10 +37,42 @@ free_txtwindow(struct txtwindow *a)
   free(a);
 }
 
+static void
+print_wnd(struct txtwindow *a)
+{
+  int i, x = a->x, y = a->y, w = a->width, h = a->height;
+  char tmp[a->width+1];
+
+  attron(a->attrs);
+  /* print window surface */
+  memset(tmp, ' ', a->width);
+  tmp[a->width] = '\0';
+  for (i = y-1; i < y+h+2; i++)
+    mvprintw(i, x, tmp);
+  /* print window border */
+  mvhline(y-2, x, 0, w);
+  mvhline(y+h+2, x, 0, w);
+  mvvline(y-1, x-1, 0, h+3);
+  mvvline(y-1, x+w, 0, h+3);
+  /* print window border edges */
+  mvaddch(y-2, x-1, ACS_ULCORNER);
+  mvaddch(y+2+h, x-1, ACS_LLCORNER);
+  mvaddch(y-2, x+w, ACS_URCORNER);
+  mvaddch(y+2+h, x+w, ACS_LRCORNER);
+  /* print window title */
+  attroff(a->attrs);
+  attron(a->text_attrs);
+  mvprintw(y-2, (float)x+(float)(w/2)-(float)(a->title_len*2/3), "[ %s ]", a->title);
+  /* print windows text */
+  attroff(a->text_attrs);
+}
+
 int
 txtwindow_cb(WINDOW *win, void *data, bool timedout)
 {
   struct txtwindow *a = (struct txtwindow *) data;
+
+  print_wnd(a);
   return (UICB_OK);
 }
 
@@ -49,22 +82,57 @@ register_txtwindow(struct txtwindow *a)
   register_ui_elt(txtwindow_cb, (void *) a, NULL);
 }
 
-static inline size_t
+static size_t
 __do_textcpy(char **p_dest, size_t sz_dest, const char *p_src, size_t sz_src)
 {
+  size_t cursiz = sz_dest;
+
   if (sz_src > sz_dest) {
-    *p_dest = (char *) realloc(*p_dest, sz_dest * sizeof(char));
+    *p_dest = (char *) realloc(*p_dest, (sz_src+1) * sizeof(char));
+    cursiz = sz_src;
   }
-  memset(*p_dest, '\0', sz_dest);
-  return sz_dest;
+  memset(*p_dest, '\0', (cursiz+1) * sizeof(char));
+  memcpy(*p_dest, p_src, (cursiz+1) * sizeof(char));
+  return sz_src;
 }
 
-void
-set_txtwindow_text(struct txtwindow *a, const char *text)
+static char **
+__do_textadjust(struct txtwindow *a, char *text)
 {
-  size_t len = strlen(text);
+  int i = 0, rows = (int)(strlen(text) / a->width)+1;
+  off_t p_diff;
+  char **adj_text = calloc(rows+1, sizeof(char *));
+  char *result,*p_strtok, *tok, *last_tok = NULL;
+  const char sep[] = "\n";
 
-  if (len > a->text_len) {
-    a->text_len = __do_textcpy(&a->text, a->text_len, text, len);
+  if (rows > a->height) goto error;
+  result = p_strtok = strdup(text);
+  adj_text[0] = text;
+  while ( (tok = strsep(&p_strtok, sep)) && rows-- >= 0 ) {
+    i++;
+    if (last_tok != NULL) last_tok = '\0';
+    p_diff = (p_strtok ? (off_t)(p_strtok-tok)-1 : (off_t)( (result+strlen(text))-tok) );
+    last_tok = (p_strtok + p_diff);
+    adj_text[i] = p_strtok;
+    p_strtok = tok;
   }
+fprintf(stdout, "___[%s],[%s],[%s]\n", adj_text[0], adj_text[1], adj_text[2]);
+  return adj_text;
+error:
+  free(adj_text);
+  return NULL;
+}
+
+void
+set_txtwindow_text(struct txtwindow *a, char *text)
+{
+  char **fmt_text = __do_textadjust(a, text), **curline = fmt_text;
+
+  //a->text_len = __do_textcpy(&a->text, a->text_len, text, strlen(text));
+}
+
+void
+set_txtwindow_title(struct txtwindow *a, const char *title)
+{
+  a->title_len = __do_textcpy(&a->title, a->title_len, title, strlen(title));
 }