Changeset 59cf91c

Timestamp:

Aug 17, 2002, 1:21:17 PM (22 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

67103d4

Parents:

37c27cf

Message:

	Attempts to stay near the current message when switching views.
	     When switching from an empty view to one we've previously
	     been in, the new current message position will attempt
	     to be close to the current position from the last
	     time we visited that view.

Files:

• ChangeLog (modified) (1 diff)
• filter.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• view.c (modified) (1 diff)

ChangeLog

@@ -8 +8 @@
         renamed owl_fmtext_ztext_stylestrip to owl_function_ztext_styletsrip
              and put it in functions.c
-
+        Attempts to stay near the current message when switching views.
+             When switching from an empty view to one we've previously
+             been in, the new current message position will attempt
+             to be close to the current position from the last 
+             time we visited that view.
+        
 1.2.1
         New framework for command handling.

filter.c

@@ -21 +21 @@
   f->polarity=0;
   f->color=OWL_COLOR_DEFAULT;
+  f->cachedmsgid=-1;
   owl_list_create(&(f->fes));
 
@@ -95 +96 @@
 int owl_filter_get_color(owl_filter *f) {
   return(f->color);
+}
+
+void owl_filter_set_cachedmsgid(owl_filter *f, int cachedmsgid) {
+  f->cachedmsgid=cachedmsgid;
+}
+
+int owl_filter_get_cachedmsgid(owl_filter *f) {
+  return(f->cachedmsgid);
 }
 

functions.c

@@ -1667 +1667 @@
   owl_view *v;
   owl_filter *f;
+  int curid=-1, newpos;
+  owl_message *curm;
 
   v=owl_global_get_current_view(&g);
+  curm=owl_view_get_element(v, owl_global_get_curmsg(&g));
+  if (curm) {
+    curid = owl_message_get_id(curm);
+    owl_view_save_curmsgid(v, curid);
+  }
+
   f=owl_global_get_filter(&g, filtname);
   if (!f) {
@@ -1678 +1686 @@
   owl_view_create(v, f);
 
-  owl_global_set_curmsg(&g, 0);
+  /* Figure out where to set the current message to.
+   * - If the previous view had messages in it, go to the closest message
+   *   to the last message in that view. 
+   * - If the previous view was empty, attempts to restore the position
+   *   from the last time we were in that view.  */
+  if (curm) {
+    newpos = owl_view_get_nearest_to_msgid(v, curid);
+  } else {
+    newpos = owl_view_get_nearest_to_saved(v);
+  }
+
+  owl_global_set_curmsg(&g, newpos);
+
   owl_global_set_curmsg_vert_offset(&g, 0);
   owl_global_set_direction_downwards(&g);

owl.h

@@ -289 +289 @@
   owl_list fes; /* filterelements */
   int color;
+  int cachedmsgid;  /* cached msgid: should move into view eventually */
 } owl_filter;
 

view.c

@@ -56 +56 @@
 }
 
+/* Returns the position in the view with a message closest 
+ * to the passed msgid. */
+int owl_view_get_nearest_to_msgid(owl_view *v, int targetid) {
+  int i, bestdist=-1, bestpos=0, curid, curdist;
+
+  for (i=0; i<owl_view_get_size(v); i++) {
+    curid = owl_message_get_id(owl_view_get_element(v, i));
+    curdist = abs(targetid-curid);
+    if (bestdist<0 || curdist<bestdist) {
+      bestdist = curdist;
+      bestpos = i;
+    }
+  }
+  return bestpos;
+}
+
+int owl_view_get_nearest_to_saved(owl_view *v) {
+  int cachedid = owl_filter_get_cachedmsgid(v->filter);
+  if (cachedid<0) return(0);
+  return owl_view_get_nearest_to_msgid(v, cachedid);
+}
+
+/* saves the current message position in the filter so it can 
+ * be restored later if we switch back to this filter. */
+void owl_view_save_curmsgid(owl_view *v, int curid) {
+  owl_filter_set_cachedmsgid(v->filter, curid);
+}
+
 char *owl_view_get_filtname(owl_view *v) {
   return(owl_filter_get_name(v->filter));