1 files changed, 70 insertions, 25 deletions

diff --git a/src/day.c b/src/day.c
index 4c73f43..884d86b 100644
--- a/src/day.c
+++ b/src/day.c
@@ -347,14 +347,15 @@ display_item_date (int incolor, struct apoint *i, int type, long date,
  * Print an item description in the corresponding panel window.
  */
 static void
-display_item (int incolor, char *msg, int recur, int note, int len, int y,
+display_item (int incolor, char *msg, int recur, int note, int width, int y,
               int x)
 {
   WINDOW *win;
   int ch_recur, ch_note;
-  char buf[len];
+  char buf[width * UTF8_MAXLEN];
+  int i;
 
-  if (len <= 0)
+  if (width <= 0)
     return;
 
   win = apad.ptrwin;
@@ -362,12 +363,20 @@ display_item (int incolor, char *msg, int recur, int note, int len, int y,
   ch_note = (note) ? '>' : ' ';
   if (incolor == 0)
     custom_apply_attr (win, ATTR_HIGHEST);
-  if (strlen (msg) < len)
+  if (utf8_strwidth (msg) < width)
     mvwprintw (win, y, x, " %c%c%s", ch_recur, ch_note, msg);
   else
     {
-      (void)strncpy (buf, msg, len - 1);
-      buf[len - 1] = '\0';
+      for (i = 0; msg[i] && width > 0; i++)
+        {
+          if (!UTF8_ISCONT (msg[i]))
+            width -= utf8_width (&msg[i]);
+          buf[i] = msg[i];
+        }
+      if (i)
+        buf[i - 1] = 0;
+      else
+        buf[0] = 0;
       mvwprintw (win, y, x, " %c%c%s...", ch_recur, ch_note, buf);
     }
   if (incolor == 0)
@@ -1034,25 +1043,12 @@ day_edit_note (char *editor)
   struct apoint *a;
   struct recur_event *re;
   struct event *e;
-  char fullname[BUFSIZ];
-  char *filename;
   long date;
   int item_num;
 
   item_num = apoint_hilt ();
   p = day_get_item (item_num);
-  if (p->note == NULL)
-    {
-      if ((filename = new_tempfile (path_notes, NOTESIZ)) == NULL)
-        return;
-      else
-        p->note = filename;
-    }
-  (void)snprintf (fullname, BUFSIZ, "%s%s", path_notes, p->note);
-  wins_launch_external (fullname, editor);
-
-  if (io_file_is_empty (fullname) > 0)
-    erase_note (&p->note, ERASE_FORCE);
+  edit_note (&p->note, editor);
 
   date = calendar_get_slctd_day_sec ();
   switch (p->type)
@@ -1080,12 +1076,61 @@ day_edit_note (char *editor)
 void
 day_view_note (char *pager)
 {
+  struct day_item *p = day_get_item (apoint_hilt ());
+  view_note (p->note, pager);
+}
+
+/* Pipe an appointment or event to an external program. */
+void
+day_pipe_item (struct conf *conf)
+{
+  char cmd[BUFSIZ] = "";
+  int pout;
+  int pid;
+  FILE *fpout;
+  int item_num;
+  long date;
   struct day_item *p;
-  char fullname[BUFSIZ];
+  struct recur_apoint *ra;
+  struct apoint *a;
+  struct recur_event *re;
+  struct event *e;
 
-  p = day_get_item (apoint_hilt ());
-  if (p->note == NULL)
+  status_mesg (_("Pipe item to external command:"), "");
+  if (getstring (win[STA].p, cmd, BUFSIZ, 0, 1) != GETSTRING_VALID)
     return;
-  (void)snprintf (fullname, BUFSIZ, "%s%s", path_notes, p->note);
-  wins_launch_external (fullname, pager);
+
+  wins_prepare_external ();
+  if ((pid = shell_exec (NULL, &pout, cmd)))
+    {
+      fpout = fdopen (pout, "w");
+
+      item_num = apoint_hilt ();
+      p = day_get_item (item_num);
+      date = calendar_get_slctd_day_sec ();
+      switch (p->type)
+        {
+        case RECUR_EVNT:
+          re = recur_get_event (date, day_item_nb (date, item_num, RECUR_EVNT));
+          recur_event_write (re, fpout);
+          break;
+        case EVNT:
+          e = event_get (date, day_item_nb (date, item_num, EVNT));
+          event_write (e, fpout);
+          break;
+        case RECUR_APPT:
+          ra = recur_get_apoint (date, day_item_nb (date, item_num, RECUR_APPT));
+          recur_apoint_write (ra, fpout);
+          break;
+        case APPT:
+          a = apoint_get (date, day_item_nb (date, item_num, APPT));
+          apoint_write (a, fpout);
+          break;
+        }
+
+      fclose (fpout);
+      child_wait (NULL, &pout, pid);
+      press_any_key ();
+    }
+  wins_unprepare_external ();
 }