Changeset 70110286

Timestamp:

May 12, 2009, 11:25:10 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

bd783db

Parents:

e1b136bf

Message:

Implement mark and swap.

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• global.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• owl.h (modified) (1 diff)

commands.c

@@ -336 +336 @@
   OWLCMD_VOID("recv:pageup", owl_function_mainwin_pageup, OWL_CTX_INTERACTIVE,
               "scrolls up by a page", "", ""),
+
+  OWLCMD_VOID("recv:mark", owl_function_mark_message,
+              OWL_CTX_INTERACTIVE,
+              "mark the current message", "", ""),
+
+  OWLCMD_VOID("recv:swapmark", owl_function_swap_cur_marked,
+              OWL_CTX_INTERACTIVE,
+              "swap curmsg and mark", "", ""),
 
   OWLCMD_INT ("recv:scroll", owl_function_page_curmsg, OWL_CTX_INTERACTIVE,

functions.c

@@ -3532 +3532 @@
   sigprocmask(SIG_UNBLOCK, &intr, oldmask);
 }
+
+void _owl_function_mark_message(owl_message *m)
+{
+  if (m)
+    owl_global_set_markedmsgid(&g, owl_message_get_id(m));
+}
+
+void owl_function_mark_message()
+{
+  owl_message *m;
+  owl_view *v;
+
+  v=owl_global_get_current_view(&g);
+
+  /* bail if there's no current message */
+  if (owl_view_get_size(v) < 1) {
+    owl_function_error("No messages to mark");
+    return;
+  }
+
+  /* mark the message */
+  m=owl_view_get_element(v, owl_global_get_curmsg(&g));
+  _owl_function_mark_message(m);
+}
+
+void owl_function_swap_cur_marked()
+{
+  int marked_id;
+  owl_message *m;
+  owl_view *v;
+
+  v=owl_global_get_current_view(&g);
+  /* bail if there's no current message */
+  if (owl_view_get_size(v) < 1) {
+    return;
+  }
+  m=owl_view_get_element(v, owl_global_get_curmsg(&g));
+  marked_id=owl_global_get_markedmsgid(&g);
+
+  _owl_function_mark_message(m);
+
+  owl_global_set_curmsg(&g, owl_view_get_nearest_to_msgid(v, marked_id));
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_global_set_direction_downwards(&g);
+}

global.c

@@ -199 +199 @@
 }
 
+/* markedmsgid */
+
+int owl_global_get_markedmsgid(owl_global *g) {
+  return(g->markedmsgid);
+}
+
+void owl_global_set_markedmsgid(owl_global *g, int i) {
+  g->markedmsgid=i;
+  /* i; index of message in the current view.
+  owl_message *m;
+  owl_view *v;
+
+  v = owl_global_get_current_view(&g);
+  m = owl_view_get_element(v, i);
+  g->markedmsgid = m ? owl_message_get_id(m) : 0;
+  */
+}
+
 /* windows */
 

keys.c

@@ -263 +263 @@
   BIND_CMD("M-v",    "recv:pageup",    "");
   BIND_CMD("PPAGE",  "recv:pageup",    "");
+  BIND_CMD("C-@",    "recv:mark",      "");
+  BIND_CMD("C-x C-x",    "recv:swapmark",  "");
 
   BIND_CMD("SPACE",     "recv:scroll  10", "scroll message down a page");

owl.h

@@ -535 +535 @@
   owl_errqueue errqueue;
   int lines, cols;
-  int curmsg, topmsg;
+  int curmsg, topmsg, markedmsg;
+  int markedmsgid;              /* for finding the marked message when it has moved. */
   int curmsg_vert_offset;
   owl_view current_view;