Changeset f9c43ae for functions.c

Timestamp:

Sep 21, 2002, 7:52:22 PM (22 years ago)

Author:

James M. Kretchmar <kretch@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:

bde7714

Parents:

1583c90

Message:

Fixed up the normal scrolling code.  Now it should always
  land on a message, but it's still not optimal.
Added the variable 'smartstrip' which will strip kerberos
  instances out for the 'reply' command.
Added -R/usr/athena/lib to the build for Athena

File:

• functions.c (modified) (17 diffs)

functions.c

@@ -759 +759 @@
   recwinlines=owl_global_get_recwin_lines(&g);
 
+  /*
   if (owl_view_get_size(v) < 1) {
     return;
   }
+  */
 
   switch (owl_global_get_scrollmode(&g)) {
   case OWL_SCROLLMODE_TOP:
-    topmsg = owl_function_calculate_topmsg_top(direction, v, curmsg,
-                                               topmsg, recwinlines);
+    topmsg = owl_function_calculate_topmsg_top(direction, v, curmsg, topmsg, recwinlines);
     break;
   case OWL_SCROLLMODE_NEARTOP:
-    topmsg = owl_function_calculate_topmsg_neartop(direction, v, curmsg, 
-                                                   topmsg, recwinlines);
+    topmsg = owl_function_calculate_topmsg_neartop(direction, v, curmsg, topmsg, recwinlines);
     break;
   case OWL_SCROLLMODE_CENTER:
-    topmsg = owl_function_calculate_topmsg_center(direction, v, curmsg,
-                                                  topmsg, recwinlines);
+    topmsg = owl_function_calculate_topmsg_center(direction, v, curmsg, topmsg, recwinlines);
     break;
   case OWL_SCROLLMODE_PAGED:
-    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, 
-                                                 topmsg, recwinlines, 0);
+    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, topmsg, recwinlines, 0);
     break;
   case OWL_SCROLLMODE_PAGEDCENTER:
-    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, 
-                                                 topmsg, recwinlines, 1);
+    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, topmsg, recwinlines, 1);
     break;
   case OWL_SCROLLMODE_NORMAL:
   default:
-    topmsg = owl_function_calculate_topmsg_normal(direction, v, curmsg,
-                                                  topmsg, recwinlines);
+    topmsg = owl_function_calculate_topmsg_normal(direction, v, curmsg, topmsg, recwinlines);
   }
   owl_function_debugmsg("Calculated a topmsg of %i", topmsg);
@@ -801 +797 @@
  */
 int owl_function_calculate_topmsg_top(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines) {
-  return curmsg;
+  return(curmsg);
 }
 
@@ -808 +804 @@
       && (owl_message_get_numlines(owl_view_get_element(v, curmsg-1))
           <  recwinlines/2)) {
-    return curmsg-1;
+    return(curmsg-1);
   } else {
-    return curmsg;
+    return(curmsg);
   }
 }
@@ -824 +820 @@
     last = i;
   }
-  return last;
+  return(last);
 }
   
@@ -841 +837 @@
     }
     if (center_on_page) {
-      return owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
+      return(owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines));
     } else {
-      return last;
+      return(last);
     }
   }
@@ -856 +852 @@
   if (savey > recwinlines) {
     if (center_on_page) {
-      return owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
+      return(owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines));
     } else {
-      return curmsg;
+      return(curmsg);
     }
   }
 
   /* else just stay as we are... */
-  return topmsg;
+  return(topmsg);
 }
 
@@ -869 +865 @@
 int owl_function_calculate_topmsg_normal(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines) {
   int savey, j, i, foo, y;
-  
+
+  /* If we're off the top of the screen then center */
+  if (curmsg<topmsg) {
+    topmsg=owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
+  }
+
   /* Find number of lines from top to bottom of curmsg (store in savey) */
   savey=0;
@@ -876 +877 @@
   }
 
-  /* If the direction is DOWNWARDS but we're off the bottom of the
-   *  screen, then set the topmsg to curmsg and scroll UPWARDS
-   */
-  if (direction == OWL_DIRECTION_DOWNWARDS) {
-    if (savey > recwinlines) {
-      topmsg=curmsg;
-      savey=owl_message_get_numlines(owl_view_get_element(v, i));
-      direction=OWL_DIRECTION_UPWARDS;
-    }
-  }
-
+  /* If we're off the bottom of the screen, set the topmsg to curmsg
+   * and scroll upwards */
+  if (savey > recwinlines) {
+    topmsg=curmsg;
+    savey=owl_message_get_numlines(owl_view_get_element(v, i));
+    direction=OWL_DIRECTION_UPWARDS;
+  }
+  
   /* If our bottom line is less than 1/4 down the screen then scroll up */
   if (direction == OWL_DIRECTION_UPWARDS || direction == OWL_DIRECTION_NONE) {
@@ -904 +902 @@
       }
       if (j<0) j=0;
-      return j;
+      return(j);
     }
   }
@@ -920 +918 @@
         j--;
       }
-      return j+1;
-    }
-  }
-
-  return topmsg;
+      return(j+1);
+    }
+  }
+
+  return(topmsg);
 }
 
@@ -1554 +1552 @@
     }
 
-
     /* first check if we catch the reply-lockout filter */
     f=owl_global_get_filter(&g, "reply-lockout");
@@ -1568 +1565 @@
       owl_global_set_buffercommand(&g, owl_message_get_zwriteline(m));
     } else if (owl_message_is_type_admin(m)) {
-      owl_function_makemsg("You cannot reply to this admin message");
+      owl_function_makemsg("You cannot reply to an admin message");
     } else {
       if (owl_message_is_login(m)) {
@@ -1603 +1600 @@
       }
       if (*to != '\0') {
-        char *tmp, *oldtmp;
-        tmp=short_zuser(to);
+        char *tmp, *oldtmp, *tmp2;
         if (cc) {
           tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
@@ -1612 +1608 @@
         } else {
           tmp=short_zuser(to);
+          if (owl_global_is_smartstrip(&g)) {
+            tmp2=tmp;
+            tmp=smartstripped_user(tmp2);
+            owl_free(tmp2);
+          }
           buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
           owl_free(oldbuff);
@@ -1748 +1749 @@
   owl_view *v;
   owl_filter *f;
-  int curid=-1, newpos;
-  owl_message *curm;
+  int curid=-1, newpos, curmsg;
+  owl_message *curm=NULL;
 
   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);
-  }
-
+  curmsg=owl_global_get_curmsg(&g);
+  if (curmsg==-1) {
+    owl_function_debugmsg("Hit the curmsg==-1 case in change_view");
+  } else {
+    curm=owl_view_get_element(v, curmsg);
+    if (curm) {
+      curid=owl_message_get_id(curm);
+      owl_view_save_curmsgid(v, curid);
+    }
+  }
+
+  /* grab the filter */;
   f=owl_global_get_filter(&g, filtname);
   if (!f) {
@@ -1764 +1771 @@
   }
 
+  /* free the existing view and create a new one based on the filter */
   owl_view_free(v);
   owl_view_create(v, f);
 
-  /* 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.  */
+  /* Figure out what to set the current message to.
+   * - If the view we're leaving has messages in it, go to the closest message
+   *   to the last message pointed to in that view. 
+   * - If the view we're leaving is empty, try to restore the position
+   *   from the last time we were in the new view.  */
   if (curm) {
     newpos = owl_view_get_nearest_to_msgid(v, curid);
@@ -1780 +1788 @@
   owl_global_set_curmsg(&g, newpos);
 
-  owl_global_set_curmsg_vert_offset(&g, 0);
+  owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_direction_downwards(&g);
-  owl_function_calculate_topmsg(OWL_DIRECTION_NONE);
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 }