Changeset 315babf

Timestamp:

May 16, 2009, 2:55:30 AM (16 years ago)

Author:

Nelson Elhage <nelhage@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:

d73e3af

Parents:

b8bf727 (diff), 73ba824 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'mark'

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• global.c (modified) (2 diffs)
• keys.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• owl.c (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm (modified) (1 diff)
• perlwrap.pm (modified) (4 diffs)

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 the positions of the pointer and the 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);
+  owl_function_makemsg("Mark set");
+}
+
+void owl_function_swap_cur_marked()
+{
+  int marked_id;
+  owl_message *m;
+  owl_view *v;
+
+  marked_id=owl_global_get_markedmsgid(&g);
+  if (marked_id == -1) {
+    owl_function_error("Mark not set.");
+    return;
+  }
+
+  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));
+  _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

@@ -35 +35 @@
   g->curmsg=0;
   g->topmsg=0;
+  g->markedmsgid=-1;
   g->needrefresh=1;
   g->startupargs=NULL;
@@ -199 +200 @@
 }
 
+/* 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

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

owl.c

@@ -243 +243 @@
   f=owl_malloc(sizeof(owl_filter));
   owl_filter_init_fromstring(f, "personal", "isprivate ^true$ and ( not type ^zephyr$"
-                             " or ( class ^message and"
-                             " ( instance ^personal$ or instance ^urgent$ ) ) )");
+                             " or ( class ^message  ) )");
   owl_list_append_element(owl_global_get_filterlist(&g), f);
 

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -70 +70 @@
 sub context {shift->{network};}
 sub subcontext {shift->{recipient};}
+sub personal_context {"on " . shift->{network};}
 
 sub long_sender {shift->{from} || ""};

perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm

@@ -50 +50 @@
 sub subcontext {
     return shift->subject || "";
+}
+
+sub personal_context {
+    my $self = shift;
+    if ($self->is_incoming) {
+        return "to " . $self->to;
+    } else {
+        return "from " . $self->from;
+    }
 }
 

perlwrap.pm

@@ -390 +390 @@
 sub pretty_sender    { return shift->sender; }
 sub pretty_recipient { return shift->recipient; }
+
+# Override if you want a context (instance, network, etc.) on personals
+sub personal_context { return ""; }
 
 sub delete {
@@ -584 +587 @@
     my ($m) = @_;
     return ((lc($m->class) eq "message")
-            && (lc($m->instance) eq "personal")
             && $m->is_private);
 }
@@ -601 +603 @@
     my ($m) = @_;
     return strip_realm($m->recipient);
+}
+
+sub personal_context {
+    my ($m) = @_;
+    if (lc($m->instance) eq "personal") {
+        return "";
+    } else {
+        return "-i " . $m->instance;
+    }
 }
 
@@ -1023 +1034 @@
     my $header;
     if ( $m->is_personal ) {
+        my $personal_context = $m->personal_context;
+        $personal_context = ' [' . $personal_context . ']' if $personal_context;
+
         if ( $m->direction eq "out" ) {
-            $header = ucfirst $m->type . " sent to " . $m->pretty_recipient;
+            $header = ucfirst $m->type . $personal_context . " sent to " . $m->pretty_recipient;
         } else {
-            $header = ucfirst $m->type . " from " . $m->pretty_sender;
+            $header = ucfirst $m->type . $personal_context . " from " . $m->pretty_sender;
         }
     } else {