Changeset f63a681

Timestamp:

Nov 16, 2009, 8:53:43 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1b9a163

Parents:

3e8625f

git-author:

David Benjamin <davidben@mit.edu> (11/10/09 23:35:53)

git-committer:

David Benjamin <davidben@mit.edu> (11/16/09 20:53:43)

Message:

Mark the current mark with an asterisk

Has priority over the arrow, but not the deletion flag.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• functions.c (modified) (1 diff)
• mainwin.c (modified) (4 diffs)

functions.c

@@ -3559 +3559 @@
 void _owl_function_mark_message(const owl_message *m)
 {
-  if (m)
+  if (m) {
     owl_global_set_markedmsgid(&g, owl_message_get_id(m));
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  }
 }
 

mainwin.c

@@ -12 +12 @@
   int i, p, q, lines, isfull, viewsize;
   int x, y, savey, recwinlines, start;
-  int topmsg, curmsg, fgcolor, bgcolor;
+  int topmsg, curmsg, markedmsgid, fgcolor, bgcolor;
   WINDOW *recwin;
   const owl_view *v;
@@ -18 +18 @@
   const owl_filter *f;
 
-  recwin=owl_global_get_curs_recwin(&g);
-  topmsg=owl_global_get_topmsg(&g);
-  curmsg=owl_global_get_curmsg(&g);
-  v=owl_global_get_current_view(&g);
+  recwin = owl_global_get_curs_recwin(&g);
+  topmsg = owl_global_get_topmsg(&g);
+  curmsg = owl_global_get_curmsg(&g);
+  markedmsgid = owl_global_get_markedmsgid(&g);
+  v = owl_global_get_current_view(&g);
   owl_fmtext_reset_colorpairs();
 
@@ -119 +120 @@
           waddstr(recwin, "-");
         }
-        if (!owl_message_is_delete(m)) {
+        if (owl_message_is_delete(m)) {
+          waddstr(recwin, "D");
+        } else if (markedmsgid == owl_message_get_id(m)) {
+          waddstr(recwin, "*");
+        } else {
           waddstr(recwin, ">");
-        } else {
-          waddstr(recwin, "D");
         }
         wmove(recwin, y, x);
@@ -129 +132 @@
         wmove(recwin, savey, 0);
         waddstr(recwin, " D");
+        wmove(recwin, y, x);
+      } else if (markedmsgid == owl_message_get_id(m)) {
+        wmove(recwin, savey, 0);
+        waddstr(recwin, " *");
         wmove(recwin, y, x);
       }