Changeset f9c43ae


Ignore:
Timestamp:
Sep 21, 2002, 7:52:22 PM (19 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, 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
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r1583c90 rf9c43ae  
    1212        The built-in personal filter is updated to do so
    1313        Fixed a bug in moving the poiner after an expunge
     14        Fixed up the normal scrolling code.  Now it should always
     15          land on a message, but it's still not optimal.
     16        Added the variable 'smartstrip' which will strip kerberos
     17          instances out for the 'reply' command.
     18        Added -R/usr/athena/lib to the build for Athena
    1419       
    15201.2.3
  • configure

    r6794f72 rf9c43ae  
    763763echo "configure:764: checking for /usr/athena/lib" >&5
    764764if test -d /usr/athena/lib; then
    765         LDFLAGS=-L/usr/athena/lib\ ${LDFLAGS}
     765        LDFLAGS=-L/usr/athena/lib\ -R/usr/athena/lib\ ${LDFLAGS}
    766766        echo "$ac_t""yes" 1>&6
    767767else
     
    769769fi
    770770
    771 
    772 
    773 
    774 
    775 
    776771echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
    777 echo "configure:778: checking for initscr in -lncurses" >&5
     772echo "configure:773: checking for initscr in -lncurses" >&5
    778773ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
    779774if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    783778LIBS="-lncurses  $LIBS"
    784779cat > conftest.$ac_ext <<EOF
    785 #line 786 "configure"
     780#line 781 "configure"
    786781#include "confdefs.h"
    787782/* Override any gcc2 internal prototype to avoid an error.  */
     
    794789; return 0; }
    795790EOF
    796 if { (eval echo configure:797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     791if { (eval echo configure:792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    797792  rm -rf conftest*
    798793  eval "ac_cv_lib_$ac_lib_var=yes"
     
    820815  echo "$ac_t""no" 1>&6
    821816echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
    822 echo "configure:823: checking for initscr in -lcurses" >&5
     817echo "configure:818: checking for initscr in -lcurses" >&5
    823818ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
    824819if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    828823LIBS="-lcurses  $LIBS"
    829824cat > conftest.$ac_ext <<EOF
    830 #line 831 "configure"
     825#line 826 "configure"
    831826#include "confdefs.h"
    832827/* Override any gcc2 internal prototype to avoid an error.  */
     
    839834; return 0; }
    840835EOF
    841 if { (eval echo configure:842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     836if { (eval echo configure:837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    842837  rm -rf conftest*
    843838  eval "ac_cv_lib_$ac_lib_var=yes"
     
    870865
    871866echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6
    872 echo "configure:873: checking for com_err in -lcom_err" >&5
     867echo "configure:868: checking for com_err in -lcom_err" >&5
    873868ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'`
    874869if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    878873LIBS="-lcom_err  $LIBS"
    879874cat > conftest.$ac_ext <<EOF
    880 #line 881 "configure"
     875#line 876 "configure"
    881876#include "confdefs.h"
    882877/* Override any gcc2 internal prototype to avoid an error.  */
     
    889884; return 0; }
    890885EOF
    891 if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     886if { (eval echo configure:887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    892887  rm -rf conftest*
    893888  eval "ac_cv_lib_$ac_lib_var=yes"
     
    917912
    918913echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
    919 echo "configure:920: checking for gethostbyname in -lnsl" >&5
     914echo "configure:915: checking for gethostbyname in -lnsl" >&5
    920915ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
    921916if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    925920LIBS="-lnsl  $LIBS"
    926921cat > conftest.$ac_ext <<EOF
    927 #line 928 "configure"
     922#line 923 "configure"
    928923#include "confdefs.h"
    929924/* Override any gcc2 internal prototype to avoid an error.  */
     
    936931; return 0; }
    937932EOF
    938 if { (eval echo configure:939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     933if { (eval echo configure:934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    939934  rm -rf conftest*
    940935  eval "ac_cv_lib_$ac_lib_var=yes"
     
    964959
    965960echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
    966 echo "configure:967: checking for socket in -lsocket" >&5
     961echo "configure:962: checking for socket in -lsocket" >&5
    967962ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
    968963if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    972967LIBS="-lsocket  $LIBS"
    973968cat > conftest.$ac_ext <<EOF
    974 #line 975 "configure"
     969#line 970 "configure"
    975970#include "confdefs.h"
    976971/* Override any gcc2 internal prototype to avoid an error.  */
     
    983978; return 0; }
    984979EOF
    985 if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     980if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    986981  rm -rf conftest*
    987982  eval "ac_cv_lib_$ac_lib_var=yes"
     
    10111006
    10121007echo $ac_n "checking for krb5_derive_key in -lk5crypto""... $ac_c" 1>&6
    1013 echo "configure:1014: checking for krb5_derive_key in -lk5crypto" >&5
     1008echo "configure:1009: checking for krb5_derive_key in -lk5crypto" >&5
    10141009ac_lib_var=`echo k5crypto'_'krb5_derive_key | sed 'y%./+-%__p_%'`
    10151010if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    10191014LIBS="-lk5crypto  $LIBS"
    10201015cat > conftest.$ac_ext <<EOF
    1021 #line 1022 "configure"
     1016#line 1017 "configure"
    10221017#include "confdefs.h"
    10231018/* Override any gcc2 internal prototype to avoid an error.  */
     
    10301025; return 0; }
    10311026EOF
    1032 if { (eval echo configure:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1027if { (eval echo configure:1028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    10331028  rm -rf conftest*
    10341029  eval "ac_cv_lib_$ac_lib_var=yes"
     
    10581053
    10591054echo $ac_n "checking for des425_req_act_vno in -ldes425""... $ac_c" 1>&6
    1060 echo "configure:1061: checking for des425_req_act_vno in -ldes425" >&5
     1055echo "configure:1056: checking for des425_req_act_vno in -ldes425" >&5
    10611056ac_lib_var=`echo des425'_'des425_req_act_vno | sed 'y%./+-%__p_%'`
    10621057if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    10661061LIBS="-ldes425  $LIBS"
    10671062cat > conftest.$ac_ext <<EOF
    1068 #line 1069 "configure"
     1063#line 1064 "configure"
    10691064#include "confdefs.h"
    10701065/* Override any gcc2 internal prototype to avoid an error.  */
     
    10771072; return 0; }
    10781073EOF
    1079 if { (eval echo configure:1080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1074if { (eval echo configure:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    10801075  rm -rf conftest*
    10811076  eval "ac_cv_lib_$ac_lib_var=yes"
     
    11051100
    11061101echo $ac_n "checking for krb5_get_credentials in -lkrb5""... $ac_c" 1>&6
    1107 echo "configure:1108: checking for krb5_get_credentials in -lkrb5" >&5
     1102echo "configure:1103: checking for krb5_get_credentials in -lkrb5" >&5
    11081103ac_lib_var=`echo krb5'_'krb5_get_credentials | sed 'y%./+-%__p_%'`
    11091104if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    11131108LIBS="-lkrb5  $LIBS"
    11141109cat > conftest.$ac_ext <<EOF
    1115 #line 1116 "configure"
     1110#line 1111 "configure"
    11161111#include "confdefs.h"
    11171112/* Override any gcc2 internal prototype to avoid an error.  */
     
    11241119; return 0; }
    11251120EOF
    1126 if { (eval echo configure:1127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1121if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    11271122  rm -rf conftest*
    11281123  eval "ac_cv_lib_$ac_lib_var=yes"
     
    11521147
    11531148echo $ac_n "checking for krb_sendauth in -lkrb4""... $ac_c" 1>&6
    1154 echo "configure:1155: checking for krb_sendauth in -lkrb4" >&5
     1149echo "configure:1150: checking for krb_sendauth in -lkrb4" >&5
    11551150ac_lib_var=`echo krb4'_'krb_sendauth | sed 'y%./+-%__p_%'`
    11561151if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    11601155LIBS="-lkrb4  $LIBS"
    11611156cat > conftest.$ac_ext <<EOF
    1162 #line 1163 "configure"
     1157#line 1158 "configure"
    11631158#include "confdefs.h"
    11641159/* Override any gcc2 internal prototype to avoid an error.  */
     
    11711166; return 0; }
    11721167EOF
    1173 if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1168if { (eval echo configure:1169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    11741169  rm -rf conftest*
    11751170  eval "ac_cv_lib_$ac_lib_var=yes"
     
    11991194
    12001195echo $ac_n "checking for ZGetSender in -lzephyr""... $ac_c" 1>&6
    1201 echo "configure:1202: checking for ZGetSender in -lzephyr" >&5
     1196echo "configure:1197: checking for ZGetSender in -lzephyr" >&5
    12021197ac_lib_var=`echo zephyr'_'ZGetSender | sed 'y%./+-%__p_%'`
    12031198if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    12071202LIBS="-lzephyr  $LIBS"
    12081203cat > conftest.$ac_ext <<EOF
    1209 #line 1210 "configure"
     1204#line 1205 "configure"
    12101205#include "confdefs.h"
    12111206/* Override any gcc2 internal prototype to avoid an error.  */
     
    12181213; return 0; }
    12191214EOF
    1220 if { (eval echo configure:1221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1215if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    12211216  rm -rf conftest*
    12221217  eval "ac_cv_lib_$ac_lib_var=yes"
     
    12471242
    12481243echo $ac_n "checking for ZInitLocationInfo in -lzephyr""... $ac_c" 1>&6
    1249 echo "configure:1250: checking for ZInitLocationInfo in -lzephyr" >&5
     1244echo "configure:1245: checking for ZInitLocationInfo in -lzephyr" >&5
    12501245ac_lib_var=`echo zephyr'_'ZInitLocationInfo | sed 'y%./+-%__p_%'`
    12511246if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    12551250LIBS="-lzephyr  $LIBS"
    12561251cat > conftest.$ac_ext <<EOF
    1257 #line 1258 "configure"
     1252#line 1253 "configure"
    12581253#include "confdefs.h"
    12591254/* Override any gcc2 internal prototype to avoid an error.  */
     
    12661261; return 0; }
    12671262EOF
    1268 if { (eval echo configure:1269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1263if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    12691264  rm -rf conftest*
    12701265  eval "ac_cv_lib_$ac_lib_var=yes"
     
    12911286
    12921287echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1293 echo "configure:1294: checking how to run the C preprocessor" >&5
     1288echo "configure:1289: checking how to run the C preprocessor" >&5
    12941289# On Suns, sometimes $CPP names a directory.
    12951290if test -n "$CPP" && test -d "$CPP"; then
     
    13061301  # not just through cpp.
    13071302  cat > conftest.$ac_ext <<EOF
    1308 #line 1309 "configure"
     1303#line 1304 "configure"
    13091304#include "confdefs.h"
    13101305#include <assert.h>
     
    13121307EOF
    13131308ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1314 { (eval echo configure:1315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1309{ (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13151310ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13161311if test -z "$ac_err"; then
     
    13231318  CPP="${CC-cc} -E -traditional-cpp"
    13241319  cat > conftest.$ac_ext <<EOF
    1325 #line 1326 "configure"
     1320#line 1321 "configure"
    13261321#include "confdefs.h"
    13271322#include <assert.h>
     
    13291324EOF
    13301325ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1331 { (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1326{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13321327ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13331328if test -z "$ac_err"; then
     
    13401335  CPP="${CC-cc} -nologo -E"
    13411336  cat > conftest.$ac_ext <<EOF
    1342 #line 1343 "configure"
     1337#line 1338 "configure"
    13431338#include "confdefs.h"
    13441339#include <assert.h>
     
    13461341EOF
    13471342ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1348 { (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1343{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13491344ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13501345if test -z "$ac_err"; then
     
    13711366
    13721367echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1373 echo "configure:1374: checking for ANSI C header files" >&5
     1368echo "configure:1369: checking for ANSI C header files" >&5
    13741369if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    13751370  echo $ac_n "(cached) $ac_c" 1>&6
    13761371else
    13771372  cat > conftest.$ac_ext <<EOF
    1378 #line 1379 "configure"
     1373#line 1374 "configure"
    13791374#include "confdefs.h"
    13801375#include <stdlib.h>
     
    13841379EOF
    13851380ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1386 { (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1381{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13871382ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13881383if test -z "$ac_err"; then
     
    14011396  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    14021397cat > conftest.$ac_ext <<EOF
    1403 #line 1404 "configure"
     1398#line 1399 "configure"
    14041399#include "confdefs.h"
    14051400#include <string.h>
     
    14191414  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    14201415cat > conftest.$ac_ext <<EOF
    1421 #line 1422 "configure"
     1416#line 1417 "configure"
    14221417#include "confdefs.h"
    14231418#include <stdlib.h>
     
    14401435else
    14411436  cat > conftest.$ac_ext <<EOF
    1442 #line 1443 "configure"
     1437#line 1438 "configure"
    14431438#include "confdefs.h"
    14441439#include <ctype.h>
     
    14511446
    14521447EOF
    1453 if { (eval echo configure:1454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1448if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    14541449then
    14551450  :
     
    14751470
    14761471echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
    1477 echo "configure:1478: checking for sys/wait.h that is POSIX.1 compatible" >&5
     1472echo "configure:1473: checking for sys/wait.h that is POSIX.1 compatible" >&5
    14781473if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
    14791474  echo $ac_n "(cached) $ac_c" 1>&6
    14801475else
    14811476  cat > conftest.$ac_ext <<EOF
    1482 #line 1483 "configure"
     1477#line 1478 "configure"
    14831478#include "confdefs.h"
    14841479#include <sys/types.h>
     
    14961491; return 0; }
    14971492EOF
    1498 if { (eval echo configure:1499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1493if { (eval echo configure:1494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    14991494  rm -rf conftest*
    15001495  ac_cv_header_sys_wait_h=yes
     
    15201515ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    15211516echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1522 echo "configure:1523: checking for $ac_hdr" >&5
     1517echo "configure:1518: checking for $ac_hdr" >&5
    15231518if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    15241519  echo $ac_n "(cached) $ac_c" 1>&6
    15251520else
    15261521  cat > conftest.$ac_ext <<EOF
    1527 #line 1528 "configure"
     1522#line 1523 "configure"
    15281523#include "confdefs.h"
    15291524#include <$ac_hdr>
    15301525EOF
    15311526ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1532 { (eval echo configure:1533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1527{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15331528ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    15341529if test -z "$ac_err"; then
     
    15621557
    15631558echo $ac_n "checking for the perl xsubpp precompiler""... $ac_c" 1>&6
    1564 echo "configure:1565: checking for the perl xsubpp precompiler" >&5
     1559echo "configure:1560: checking for the perl xsubpp precompiler" >&5
    15651560XSUBPPDIR="`(perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;') | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
    15661561if test -n "${XSUBPPDIR}"; then
     
    15771572ac_safe=`echo "/usr/share/terminfo" | sed 'y%./+-%__p_%'`
    15781573echo $ac_n "checking for /usr/share/terminfo""... $ac_c" 1>&6
    1579 echo "configure:1580: checking for /usr/share/terminfo" >&5
     1574echo "configure:1575: checking for /usr/share/terminfo" >&5
    15801575if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    15811576  echo $ac_n "(cached) $ac_c" 1>&6
     
    16021597ac_safe=`echo "/usr/share/lib/terminfo" | sed 'y%./+-%__p_%'`
    16031598echo $ac_n "checking for /usr/share/lib/terminfo""... $ac_c" 1>&6
    1604 echo "configure:1605: checking for /usr/share/lib/terminfo" >&5
     1599echo "configure:1600: checking for /usr/share/lib/terminfo" >&5
    16051600if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    16061601  echo $ac_n "(cached) $ac_c" 1>&6
  • configure.in

    r5145235 rf9c43ae  
    2222AC_MSG_CHECKING(for /usr/athena/lib)
    2323if test -d /usr/athena/lib; then
    24         LDFLAGS=-L/usr/athena/lib\ ${LDFLAGS}
     24        LDFLAGS=-L/usr/athena/lib\ -R/usr/athena/lib\ ${LDFLAGS}
    2525        AC_MSG_RESULT(yes)
    2626else
  • functions.c

    r1583c90 rf9c43ae  
    759759  recwinlines=owl_global_get_recwin_lines(&g);
    760760
     761  /*
    761762  if (owl_view_get_size(v) < 1) {
    762763    return;
    763764  }
     765  */
    764766
    765767  switch (owl_global_get_scrollmode(&g)) {
    766768  case OWL_SCROLLMODE_TOP:
    767     topmsg = owl_function_calculate_topmsg_top(direction, v, curmsg,
    768                                                topmsg, recwinlines);
     769    topmsg = owl_function_calculate_topmsg_top(direction, v, curmsg, topmsg, recwinlines);
    769770    break;
    770771  case OWL_SCROLLMODE_NEARTOP:
    771     topmsg = owl_function_calculate_topmsg_neartop(direction, v, curmsg,
    772                                                    topmsg, recwinlines);
     772    topmsg = owl_function_calculate_topmsg_neartop(direction, v, curmsg, topmsg, recwinlines);
    773773    break;
    774774  case OWL_SCROLLMODE_CENTER:
    775     topmsg = owl_function_calculate_topmsg_center(direction, v, curmsg,
    776                                                   topmsg, recwinlines);
     775    topmsg = owl_function_calculate_topmsg_center(direction, v, curmsg, topmsg, recwinlines);
    777776    break;
    778777  case OWL_SCROLLMODE_PAGED:
    779     topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg,
    780                                                  topmsg, recwinlines, 0);
     778    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, topmsg, recwinlines, 0);
    781779    break;
    782780  case OWL_SCROLLMODE_PAGEDCENTER:
    783     topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg,
    784                                                  topmsg, recwinlines, 1);
     781    topmsg = owl_function_calculate_topmsg_paged(direction, v, curmsg, topmsg, recwinlines, 1);
    785782    break;
    786783  case OWL_SCROLLMODE_NORMAL:
    787784  default:
    788     topmsg = owl_function_calculate_topmsg_normal(direction, v, curmsg,
    789                                                   topmsg, recwinlines);
     785    topmsg = owl_function_calculate_topmsg_normal(direction, v, curmsg, topmsg, recwinlines);
    790786  }
    791787  owl_function_debugmsg("Calculated a topmsg of %i", topmsg);
     
    801797 */
    802798int owl_function_calculate_topmsg_top(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines) {
    803   return curmsg;
     799  return(curmsg);
    804800}
    805801
     
    808804      && (owl_message_get_numlines(owl_view_get_element(v, curmsg-1))
    809805          <  recwinlines/2)) {
    810     return curmsg-1;
     806    return(curmsg-1);
    811807  } else {
    812     return curmsg;
     808    return(curmsg);
    813809  }
    814810}
     
    824820    last = i;
    825821  }
    826   return last;
     822  return(last);
    827823}
    828824 
     
    841837    }
    842838    if (center_on_page) {
    843       return owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
     839      return(owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines));
    844840    } else {
    845       return last;
     841      return(last);
    846842    }
    847843  }
     
    856852  if (savey > recwinlines) {
    857853    if (center_on_page) {
    858       return owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
     854      return(owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines));
    859855    } else {
    860       return curmsg;
     856      return(curmsg);
    861857    }
    862858  }
    863859
    864860  /* else just stay as we are... */
    865   return topmsg;
     861  return(topmsg);
    866862}
    867863
     
    869865int owl_function_calculate_topmsg_normal(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines) {
    870866  int savey, j, i, foo, y;
    871  
     867
     868  /* If we're off the top of the screen then center */
     869  if (curmsg<topmsg) {
     870    topmsg=owl_function_calculate_topmsg_center(direction, v, curmsg, 0, recwinlines);
     871  }
     872
    872873  /* Find number of lines from top to bottom of curmsg (store in savey) */
    873874  savey=0;
     
    876877  }
    877878
    878   /* If the direction is DOWNWARDS but we're off the bottom of the
    879    *  screen, then set the topmsg to curmsg and scroll UPWARDS
    880    */
    881   if (direction == OWL_DIRECTION_DOWNWARDS) {
    882     if (savey > recwinlines) {
    883       topmsg=curmsg;
    884       savey=owl_message_get_numlines(owl_view_get_element(v, i));
    885       direction=OWL_DIRECTION_UPWARDS;
    886     }
    887   }
    888 
     879  /* If we're off the bottom of the screen, set the topmsg to curmsg
     880   * and scroll upwards */
     881  if (savey > recwinlines) {
     882    topmsg=curmsg;
     883    savey=owl_message_get_numlines(owl_view_get_element(v, i));
     884    direction=OWL_DIRECTION_UPWARDS;
     885  }
     886 
    889887  /* If our bottom line is less than 1/4 down the screen then scroll up */
    890888  if (direction == OWL_DIRECTION_UPWARDS || direction == OWL_DIRECTION_NONE) {
     
    904902      }
    905903      if (j<0) j=0;
    906       return j;
     904      return(j);
    907905    }
    908906  }
     
    920918        j--;
    921919      }
    922       return j+1;
    923     }
    924   }
    925 
    926   return topmsg;
     920      return(j+1);
     921    }
     922  }
     923
     924  return(topmsg);
    927925}
    928926
     
    15541552    }
    15551553
    1556 
    15571554    /* first check if we catch the reply-lockout filter */
    15581555    f=owl_global_get_filter(&g, "reply-lockout");
     
    15681565      owl_global_set_buffercommand(&g, owl_message_get_zwriteline(m));
    15691566    } else if (owl_message_is_type_admin(m)) {
    1570       owl_function_makemsg("You cannot reply to this admin message");
     1567      owl_function_makemsg("You cannot reply to an admin message");
    15711568    } else {
    15721569      if (owl_message_is_login(m)) {
     
    16031600      }
    16041601      if (*to != '\0') {
    1605         char *tmp, *oldtmp;
    1606         tmp=short_zuser(to);
     1602        char *tmp, *oldtmp, *tmp2;
    16071603        if (cc) {
    16081604          tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
     
    16121608        } else {
    16131609          tmp=short_zuser(to);
     1610          if (owl_global_is_smartstrip(&g)) {
     1611            tmp2=tmp;
     1612            tmp=smartstripped_user(tmp2);
     1613            owl_free(tmp2);
     1614          }
    16141615          buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
    16151616          owl_free(oldbuff);
     
    17481749  owl_view *v;
    17491750  owl_filter *f;
    1750   int curid=-1, newpos;
    1751   owl_message *curm;
     1751  int curid=-1, newpos, curmsg;
     1752  owl_message *curm=NULL;
    17521753
    17531754  v=owl_global_get_current_view(&g);
    1754   curm=owl_view_get_element(v, owl_global_get_curmsg(&g));
    1755   if (curm) {
    1756     curid = owl_message_get_id(curm);
    1757     owl_view_save_curmsgid(v, curid);
    1758   }
    1759 
     1755  curmsg=owl_global_get_curmsg(&g);
     1756  if (curmsg==-1) {
     1757    owl_function_debugmsg("Hit the curmsg==-1 case in change_view");
     1758  } else {
     1759    curm=owl_view_get_element(v, curmsg);
     1760    if (curm) {
     1761      curid=owl_message_get_id(curm);
     1762      owl_view_save_curmsgid(v, curid);
     1763    }
     1764  }
     1765
     1766  /* grab the filter */;
    17601767  f=owl_global_get_filter(&g, filtname);
    17611768  if (!f) {
     
    17641771  }
    17651772
     1773  /* free the existing view and create a new one based on the filter */
    17661774  owl_view_free(v);
    17671775  owl_view_create(v, f);
    17681776
    1769   /* Figure out where to set the current message to.
    1770    * - If the previous view had messages in it, go to the closest message
    1771    *   to the last message in that view.
    1772    * - If the previous view was empty, attempts to restore the position
    1773    *   from the last time we were in that view.  */
     1777  /* Figure out what to set the current message to.
     1778   * - If the view we're leaving has messages in it, go to the closest message
     1779   *   to the last message pointed to in that view.
     1780   * - If the view we're leaving is empty, try to restore the position
     1781   *   from the last time we were in the new view.  */
    17741782  if (curm) {
    17751783    newpos = owl_view_get_nearest_to_msgid(v, curid);
     
    17801788  owl_global_set_curmsg(&g, newpos);
    17811789
    1782   owl_global_set_curmsg_vert_offset(&g, 0);
     1790  owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
     1791  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
    17831792  owl_global_set_direction_downwards(&g);
    1784   owl_function_calculate_topmsg(OWL_DIRECTION_NONE);
    1785   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
    17861793}
    17871794
  • util.c

    r42abb10 rf9c43ae  
    411411}
    412412
     413
    413414char *long_zuser(char *in) {
    414415  char *ptr;
     
    421422  }
    422423}
    423                  
     424
     425
     426char *smartstripped_user(char *in) {
     427  /* strip out the instance from a zsender's principal.
     428   * Preserves the realm if present.
     429   * the caller must free the return */
     430
     431  char *ptr, *realm, *out;
     432
     433  out=owl_strdup(in);
     434
     435  /* bail immeaditly if we don't have to do any work */
     436  ptr=strchr(in, '.');
     437  if (!strchr(in, '/') && !ptr) {
     438    return(out);
     439  }
     440  if (ptr && strchr(in, '@') && (ptr > strchr(in, '@'))) {
     441    return(out);
     442  }
     443
     444  /* remove the realm from ptr, but hold on to it */
     445  realm=strchr(out, '@');
     446  if (realm) realm[0]='\0';
     447
     448  /* strip */
     449  ptr=strchr(out, '.');
     450  if (!ptr) ptr=strchr(out, '/');
     451  ptr[0]='\0';
     452
     453  /* reattach the realm if we had one */
     454  if (realm) {
     455    strcat(out, "@");
     456    strcat(out, realm+1);
     457  }
     458
     459  return(out);
     460}
    424461
    425462char *owl_getquoting(char *line) {
  • variable.c

    r61e79a9 rf9c43ae  
    8181  OWLVAR_BOOL( "txping" /* %OwlVarStub */, 1,
    8282               "send pings", "" ),
     83
     84  OWLVAR_BOOL( "smartstrip" /* %OwlVarStub */, 1,
     85               "strip kerberos instance for reply", ""),
    8386
    8487  OWLVAR_BOOL( "displayoutgoing" /* %OwlVarStub */, 1,
Note: See TracChangeset for help on using the changeset viewer.