XFree86 3.9r - xterm patch #53 - 1997/10/12 - T.Dickey This patch adds a fix and implements a new feature (as well as some minor typos): + JCHANDRA@Inf.COM (JCHANDRA) noted that there was still a problem with the wait call with the logging option. It hung when the logfile was opened as a command-line option. I fixed this by moving the StartLogging() call down past the place where I'd reset the setuid mode. So the logfile is opened as the real user, without having to fork. + Michael Rohleder sent me a patch which implements right-scrollbars for xterm. I used that as a starting point, renamed the command-line options and reduced the number of ifdef's. -------------------------------------------------------------------------------- INSTALL | 2 Imakefile | 5 XTerm.ad | 2 button.c | 11 - charproc.c | 12 + configure | 380 ++++++++++++++++++++++++++++++--------------------------- configure.in | 11 + main.c | 29 ++-- misc.c | 4 os2main.c | 30 +++- ptyx.h | 12 + screen.c | 7 - scrollbar.c | 57 ++++---- util.c | 25 +-- xterm.h | 2 xterm.man | 26 +++ xtermcfg.hin | 1 17 files changed, 359 insertions, 257 deletions -------------------------------------------------------------------------------- Index: INSTALL Prereq: 1.2 --- xterm-52+/INSTALL Tue Sep 30 07:04:42 1997 +++ xterm-53/INSTALL Sun Oct 12 17:49:13 1997 @@ -1,4 +1,4 @@ --- $Id: INSTALL,v 1.2 1997/09/29 23:09:28 tom Exp $ +-- $XFree86$ -- Thomas E. Dickey Xterm is normally built as part of the X Windows source tree, using @@ -42,6 +42,7 @@ --disable-i18n disable internationalization (default: on) --disable-imake disable use of imake for definitions (default: on) --disable-input-method disable input-method (default: on) + --disable-rightbar enable logging (default: on) --disable-vt52 disable VT52 emulation (default: on) --enable-logging enable logging (default: off) --enable-trace test: set to enable debugging traces (default: off) Index: Imakefile --- xterm-52+/Imakefile Wed Aug 27 06:48:32 1997 +++ xterm-53/Imakefile Sun Oct 12 14:32:13 1997 @@ -9,6 +9,9 @@ XCOMM or add -Dbcopy=mybcopy to the DEFINES list below. XCOMM +/* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */ +SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT + /* * Fixes to allow compile with X11R5 */ @@ -73,7 +76,7 @@ -DOSMINORVERSION=$(OSMINORVERSION) MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines - DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) + DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) #ifdef OS2Architecture MAINSRC = os2main.c Index: XTerm.ad --- xterm-52+/XTerm.ad Tue Sep 30 07:04:42 1997 +++ xterm-53/XTerm.ad Sun Oct 12 16:05:18 1997 @@ -22,7 +22,7 @@ *mainMenu*redraw*Label: Redraw Window *mainMenu*8-bit control*Label: 8-Bit Controls *mainMenu*backarrow key*Label: Backarrow Key -*mainMenu*sun function keys*Label: Sun Function-Keys +*mainMenu*sun function-keys*Label: Sun Function-Keys *mainMenu*sun keyboard*Label: Sun/PC Keyboard *mainMenu*suspend*Label: Send STOP Signal *mainMenu*continue*Label: Send CONT Signal Index: button.c --- xterm-52+/button.c Wed Aug 27 06:48:32 1997 +++ xterm-53/button.c Sun Oct 12 13:21:53 1997 @@ -208,8 +208,7 @@ strcpy( Line, "\030\033G " ); line = ( event->xbutton.y - screen->border ) / FontHeight( screen ); - col = (event->xbutton.x - screen->border - Scrollbar(screen)) - / FontWidth(screen); + col = ( event->xbutton.x - OriginX(screen)) / FontWidth( screen ); Line[3] = ' ' + col; Line[4] = ' ' + line; v_write(pty, Line, 5 ); @@ -829,7 +828,7 @@ row = firstValidRow; else if(row > lastValidRow) row = lastValidRow; - col = (x - screen->border - Scrollbar(screen)) / FontWidth(screen); + col = (x - OriginX(screen)) / FontWidth(screen); if(col < 0) col = 0; else if(col > screen->max_col+1) { @@ -1489,10 +1488,8 @@ button = event->button - 1; - row = (event->y - screen->border) - / FontHeight(screen); - col = (event->x - screen->border - Scrollbar(screen)) - / FontWidth(screen); + row = (event->y - screen->border) / FontHeight(screen); + col = (event->x - OriginX(screen)) / FontWidth(screen); if (screen->control_eight_bits) { line[count++] = CSI; } else { Index: charproc.c --- xterm-52+/charproc.c Tue Sep 30 07:04:42 1997 +++ xterm-53/charproc.c Sun Oct 12 17:00:33 1997 @@ -222,6 +222,7 @@ #define XtNautoWrap "autoWrap" #define XtNsaveLines "saveLines" #define XtNscrollBar "scrollBar" +#define XtNrightScrollBar "rightScrollBar" #define XtNscrollTtyOutput "scrollTtyOutput" #define XtNscrollKey "scrollKey" #define XtNscrollLines "scrollLines" @@ -305,6 +306,7 @@ #define XtCPrinterFormFeed "PrinterFormFeed" #define XtCSaveLines "SaveLines" #define XtCScrollBar "ScrollBar" +#define XtCRightScrollBar "RightScrollBar" #define XtCScrollLines "ScrollLines" #define XtCScrollPos "ScrollPos" #define XtCScrollCond "ScrollCond" @@ -621,6 +623,11 @@ {XtNscrollBar, XtCScrollBar, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, misc.scrollbar), XtRBoolean, (XtPointer) &defaultFALSE}, +#ifdef SCROLLBAR_RIGHT +{XtNrightScrollBar, XtCRightScrollBar, XtRBoolean, sizeof(Boolean), + XtOffsetOf(XtermWidgetRec, misc.useRight), + XtRBoolean, (XtPointer) &defaultFALSE}, +#endif {XtNscrollTtyOutput,XtCScrollCond, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, screen.scrollttyoutput), XtRBoolean, (XtPointer) &defaultTRUE}, @@ -3271,7 +3278,7 @@ XClearArea( screen->display, TextWindow(screen), - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (int) top * FontHeight(screen) + screen->border, (unsigned) Width(screen), (unsigned) (screen->max_row - top + 1) @@ -4900,8 +4907,7 @@ } DoResizeScreen (term); /* set to the new natural size */ if (screen->scrollWidget) - ResizeScrollBar (screen->scrollWidget, -1, -1, - screen->fullVwin.height + screen->border * 2); + ResizeScrollBar (screen); Redraw (); } set_vt_box (screen); Index: configure --- xterm-52+/configure Tue Sep 30 07:04:42 1997 +++ xterm-53/configure Sun Oct 12 17:46:41 1997 @@ -1,8 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.16 - - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -43,6 +40,8 @@ ac_help="$ac_help --enable-logging enable logging (default: off)" ac_help="$ac_help + --disable-rightbar enable logging (default: on)" +ac_help="$ac_help --enable-trace test: set to enable debugging traces (default: off)" ac_help="$ac_help --disable-vt52 disable VT52 emulation (default: on)" @@ -588,7 +587,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:592: checking host system type" >&5 +echo "configure:591: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -639,7 +638,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:643: checking for $ac_word" >&5 +echo "configure:642: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -668,7 +667,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:672: checking for $ac_word" >&5 +echo "configure:671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -716,7 +715,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -726,11 +725,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -750,12 +749,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:759: checking whether we are using GNU C" >&5 +echo "configure:758: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -764,7 +763,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -779,7 +778,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:783: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:782: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -807,7 +806,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:811: checking how to run the C preprocessor" >&5 +echo "configure:810: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -822,13 +821,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -839,13 +838,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -869,13 +868,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:873: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:872: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -893,7 +892,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -925,7 +924,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:929: checking for a BSD compatible install" >&5 +echo "configure:928: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -977,9 +976,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:981: checking for AIX" >&5 +echo "configure:980: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1005: checking for POSIXized ISC" >&5 +echo "configure:1004: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1023,17 +1022,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1027: checking for minix/config.h" >&5 +echo "configure:1026: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1075,12 +1074,12 @@ ### checks for typedefs echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1079: checking for ANSI C header files" >&5 +echo "configure:1078: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1088,7 +1087,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1105,7 +1104,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1123,7 +1122,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1144,7 +1143,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1155,7 +1154,7 @@ exit (0); } EOF -if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1179,12 +1178,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1183: checking for size_t" >&5 +echo "configure:1182: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1212,12 +1211,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1216: checking for time_t" >&5 +echo "configure:1215: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1253,12 +1252,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1257: checking for $ac_func" >&5 +echo "configure:1256: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1309,7 +1308,7 @@ if test ".$ac_cv_func_memmove" != .yes ; then if test $ac_cv_func_bcopy = yes ; then echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:1313: checking if bcopy does overlapping moves" >&5 +echo "configure:1312: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1317,7 @@ cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1365,7 +1364,7 @@ echo $ac_n "checking for workable tgetent function""... $ac_c" 1>&6 -echo "configure:1369: checking for workable tgetent function" >&5 +echo "configure:1368: checking for workable tgetent function" >&5 if eval "test \"`echo '$''{'cf_cv_func_tgetent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1381,7 +1380,7 @@ cf_cv_func_tgetent=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "yes, there is a termcap/tgetent present" 1>&5 cf_cv_func_tgetent=yes @@ -1416,14 +1415,14 @@ for cf_termlib in $cf_TERMLIB do cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "there is a terminfo/tgetent present" 1>&5 cf_cv_func_tgetent=$cf_termlib @@ -1449,17 +1448,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1453: checking for $ac_hdr" >&5 +echo "configure:1452: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1497,13 +1496,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1501: checking for declaration of fd_set" >&5 +echo "configure:1500: checking for declaration of fd_set" >&5 if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1511,7 +1510,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1519,7 +1518,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1528,7 +1527,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1553,12 +1552,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1557: checking for working const" >&5 +echo "configure:1556: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1629,7 +1628,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1633: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1632: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1647,7 +1646,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1697,7 +1696,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1701: checking for X" >&5 +echo "configure:1700: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1759,12 +1758,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1833,14 +1832,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1940,7 +1939,7 @@ # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:1944: checking for open in -lc_s" >&5 +echo "configure:1943: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1948,7 +1947,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1976,7 +1975,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:1980: checking for gethostname in -lbsd" >&5 +echo "configure:1979: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1984,7 +1983,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2012,7 +2011,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:2016: checking for gethostname in -lnsl_s" >&5 +echo "configure:2015: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2020,7 +2019,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2048,7 +2047,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:2052: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2051: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2056,7 +2055,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2084,7 +2083,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:2088: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2087: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2092,7 +2091,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2144,7 +2143,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2148: checking for socket in -lsocket" >&5 +echo "configure:2147: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2152,7 +2151,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2191,7 +2190,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2195: checking for gethostname in -lnsl" >&5 +echo "configure:2194: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2199,7 +2198,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2261,17 +2260,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2265: checking whether -R must be followed by a space" >&5 +echo "configure:2264: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2287,14 +2286,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2326,7 +2325,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2330: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2329: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2334,7 +2333,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2367,7 +2366,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2371: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2370: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2375,7 +2374,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2415,12 +2414,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2419: checking for gethostbyname" >&5 +echo "configure:2418: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2464,7 +2463,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2468: checking for gethostbyname in -lnsl" >&5 +echo "configure:2467: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2472,7 +2471,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2513,12 +2512,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2517: checking for connect" >&5 +echo "configure:2516: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2562,7 +2561,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2566: checking for connect in -lsocket" >&5 +echo "configure:2565: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2570,7 +2569,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2605,12 +2604,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2609: checking for remove" >&5 +echo "configure:2608: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2654,7 +2653,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2658: checking for remove in -lposix" >&5 +echo "configure:2657: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2662,7 +2661,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2697,12 +2696,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2701: checking for shmat" >&5 +echo "configure:2700: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2746,7 +2745,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2750: checking for shmat in -lipc" >&5 +echo "configure:2749: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2754,7 +2753,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2798,7 +2797,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2802: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2801: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2806,7 +2805,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2844,7 +2843,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2848: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2847: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2852,7 +2851,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2884,7 +2883,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2888: checking for XtAppInitialize in -lXt" >&5 +echo "configure:2887: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2892,7 +2891,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2948,17 +2947,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2952: checking for $ac_hdr" >&5 +echo "configure:2951: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3006,17 +3005,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3010: checking for $ac_hdr" >&5 +echo "configure:3009: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3044,7 +3043,7 @@ echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3048: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3047: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3052,7 +3051,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3090,7 +3089,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3094: checking for XmuClientWindow in -lXmu_s" >&5 +echo "configure:3093: checking for XmuClientWindow in -lXmu_s" >&5 ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3098,7 +3097,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3140,7 +3139,7 @@ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3144: checking for XextCreateExtension in -lXext" >&5 +echo "configure:3143: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3148,7 +3147,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3181,7 +3180,7 @@ echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 -echo "configure:3185: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +echo "configure:3184: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3189,7 +3188,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$cf_x_athena $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3220,7 +3219,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6 -echo "configure:3224: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +echo "configure:3223: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3228,7 +3227,7 @@ ac_save_LIBS="$LIBS" LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3267,7 +3266,7 @@ LIBS="$LIBS $X_EXTRA_LIBS" echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3271: checking if we should use imake to help" >&5 +echo "configure:3270: checking if we should use imake to help" >&5 # Check whether --enable-imake or --disable-imake was given. if test "${enable_imake+set}" = set; then enableval="$enable_imake" @@ -3291,7 +3290,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3295: checking for $ac_word" >&5 +echo "configure:3294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3386,7 +3385,7 @@ echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3390: checking for default terminal-id" >&5 +echo "configure:3389: checking for default terminal-id" >&5 # Check whether --with-terminal-id or --without-terminal-id was given. if test "${with_terminal_id+set}" = set; then withval="$with_terminal_id" @@ -3407,7 +3406,7 @@ ### checks for optional features echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:3411: checking if you want active-icons" >&5 +echo "configure:3410: checking if you want active-icons" >&5 # Check whether --enable-active-icon or --disable-active-icon was given. if test "${enable_active_icon+set}" = set; then enableval="$enable_active_icon" @@ -3432,7 +3431,7 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3436: checking if you want ANSI color" >&5 +echo "configure:3435: checking if you want ANSI color" >&5 # Check whether --enable-ansi-color or --disable-ansi-color was given. if test "${enable_ansi_color+set}" = set; then enableval="$enable_ansi_color" @@ -3455,7 +3454,7 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3459: checking if you want 16 colors like aixterm" >&5 +echo "configure:3458: checking if you want 16 colors like aixterm" >&5 # Check whether --enable-16-color or --disable-16-color was given. if test "${enable_16_color+set}" = set; then enableval="$enable_16_color" @@ -3478,7 +3477,7 @@ echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:3482: checking if you want bold colors mapped like IBM PC" >&5 +echo "configure:3481: checking if you want bold colors mapped like IBM PC" >&5 # Check whether --enable-bold-color or --disable-bold-color was given. if test "${enable_bold_color+set}" = set; then enableval="$enable_bold_color" @@ -3501,7 +3500,7 @@ echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:3505: checking if you want color-mode enabled by default" >&5 +echo "configure:3504: checking if you want color-mode enabled by default" >&5 # Check whether --enable-color-mode or --disable-color-mode was given. if test "${enable_color_mode+set}" = set; then enableval="$enable_color_mode" @@ -3524,7 +3523,7 @@ echo $ac_n "checking for doublesize characters""... $ac_c" 1>&6 -echo "configure:3528: checking for doublesize characters" >&5 +echo "configure:3527: checking for doublesize characters" >&5 # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then enableval="$enable_doublechars" @@ -3547,7 +3546,7 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3551: checking if you want support for input-method" >&5 +echo "configure:3550: checking if you want support for input-method" >&5 # Check whether --enable-input-method or --disable-input-method was given. if test "${enable_input_method+set}" = set; then enableval="$enable_input_method" @@ -3572,7 +3571,7 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3576: checking if you want support for internationalization" >&5 +echo "configure:3575: checking if you want support for internationalization" >&5 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then enableval="$enable_i18n" @@ -3597,7 +3596,7 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:3601: checking if you want support for logging" >&5 +echo "configure:3600: checking if you want support for logging" >&5 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then enableval="$enable_logging" @@ -3621,8 +3620,33 @@ fi +echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 +echo "configure:3625: checking if you want support for right-scrollbar" >&5 +# Check whether --enable-rightbar or --disable-rightbar was given. +if test "${enable_rightbar+set}" = set; then + enableval="$enable_rightbar" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_rightbar=no + else + enable_rightbar=yes + fi +else + enableval=yes + enable_rightbar=yes + +fi + +echo "$ac_t""$enable_rightbar" 1>&6 +if test $enable_rightbar = yes ; then + cat >> confdefs.h <<\EOF +#define SCROLLBAR_RIGHT 1 +EOF + +fi + echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:3626: checking if you want debugging traces" >&5 +echo "configure:3650: checking if you want debugging traces" >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -3649,7 +3673,7 @@ fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:3653: checking if you want VT52 emulation" >&5 +echo "configure:3677: checking if you want VT52 emulation" >&5 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then enableval="$enable_vt52" @@ -3674,7 +3698,7 @@ # development/testing aids echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3678: checking if you want to see long compiling messages" >&5 +echo "configure:3702: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then enableval="$enable_echo" @@ -3713,7 +3737,7 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:3717: checking if you want magic cookie emulation" >&5 +echo "configure:3741: checking if you want magic cookie emulation" >&5 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. if test "${enable_xmc_glitch+set}" = set; then enableval="$enable_xmc_glitch" @@ -3742,7 +3766,7 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3746: checking if you want to turn on gcc warnings" >&5 +echo "configure:3770: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" @@ -3781,9 +3805,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:3785: checking for gcc __attribute__ directives" >&5 +echo "configure:3809: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h # else @@ -3838,11 +3862,11 @@ if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:3846: checking for gcc warning options" >&5 +echo "configure:3870: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3860,7 +3884,7 @@ Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" Index: configure.in --- xterm-52+/configure.in Tue Sep 30 07:04:42 1997 +++ xterm-53/configure.in Sun Oct 12 17:46:32 1997 @@ -27,7 +27,6 @@ dnl --------------------------------------------------------------------------- dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.16 $) AC_PREREQ(2.12) AC_INIT(charproc.c) AC_CONFIG_HEADER(xtermcfg.h:xtermcfg.hin) @@ -182,6 +181,16 @@ AC_MSG_RESULT($enable_logging) if test $enable_logging = yes ; then AC_DEFINE(ALLOWLOGGING) +fi + +AC_MSG_CHECKING(if you want support for right-scrollbar) +CF_ARG_DISABLE(rightbar, + [ --disable-rightbar enable logging], + [enable_rightbar=no], + [enable_rightbar=yes]) +AC_MSG_RESULT($enable_rightbar) +if test $enable_rightbar = yes ; then + AC_DEFINE(SCROLLBAR_RIGHT) fi AC_MSG_CHECKING(if you want debugging traces) Index: main.c --- xterm-52+/main.c Tue Sep 30 07:04:42 1997 +++ xterm-53/main.c Sun Oct 12 16:55:42 1997 @@ -819,16 +819,20 @@ {"+s", "*multiScroll", XrmoptionNoArg, (caddr_t) "off"}, {"-sb", "*scrollBar", XrmoptionNoArg, (caddr_t) "on"}, {"+sb", "*scrollBar", XrmoptionNoArg, (caddr_t) "off"}, +#ifdef SCROLLBAR_RIGHT +{"-leftbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "off"}, +{"-rightbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "on"}, +#endif {"-sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "on"}, {"+sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "off"}, -{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"}, -{"+si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "on"}, +{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"}, +{"+si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "on"}, {"-sk", "*scrollKey", XrmoptionNoArg, (caddr_t) "on"}, {"+sk", "*scrollKey", XrmoptionNoArg, (caddr_t) "off"}, {"-sl", "*saveLines", XrmoptionSepArg, (caddr_t) NULL}, #if OPT_SUNPC_KBD -{"-sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "on"}, -{"+sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "off"}, +{"-sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "on"}, +{"+sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "off"}, #endif {"-t", "*tekStartup", XrmoptionNoArg, (caddr_t) "on"}, {"+t", "*tekStartup", XrmoptionNoArg, (caddr_t) "off"}, @@ -910,6 +914,10 @@ { "-/+rw", "turn on/off reverse wraparound" }, { "-/+s", "turn on/off multiscroll" }, { "-/+sb", "turn on/off scrollbar" }, +#ifdef SCROLLBAR_RIGHT +{ "-useRight", "force scrollbar right (default left)" }, +{ "-useLeft", "force scrollbar left" }, +#endif { "-/+sf", "turn on/off Sun Function Key escape codes" }, { "-/+si", "turn on/off scroll-on-tty-output inhibit" }, { "-/+sk", "turn on/off scroll-on-keypress" }, @@ -1614,11 +1622,6 @@ } #endif /* !AMOEBA */ -#ifdef ALLOWLOGGING - if (term->misc.log_on) { - StartLog(screen); - } -#endif screen->inhibit = inhibit; #ifdef AIXV3 @@ -1688,11 +1691,17 @@ (void) setgid (screen->gid); done_setuid = 1; +#ifdef ALLOWLOGGING + if (term->misc.log_on) { + StartLog(screen); + } +#endif for( ; ; ) { if(screen->TekEmu) { TekRun(); - } else + } else { VTRun(); + } } } Index: misc.c --- xterm-52+/misc.c Tue Sep 30 07:04:42 1997 +++ xterm-53/misc.c Sun Oct 12 17:23:05 1997 @@ -524,6 +524,10 @@ * symbolic links, but that is messy and has race conditions. * Forking is messy, too, but we can't count on setreuid() or saved set-uids * being available. + * + * Note: when called for user logging, we have ensured that the real and + * effective user ids are the same, so this remains as a convenience function + * for the debug logs. */ void creat_as(uid, gid, pathname, mode) Index: os2main.c --- xterm-52+/os2main.c Tue Sep 30 07:04:42 1997 +++ xterm-53/os2main.c Sun Oct 12 16:57:04 1997 @@ -348,16 +348,20 @@ {"+s", "*multiScroll", XrmoptionNoArg, (caddr_t) "off"}, {"-sb", "*scrollBar", XrmoptionNoArg, (caddr_t) "on"}, {"+sb", "*scrollBar", XrmoptionNoArg, (caddr_t) "off"}, +#ifdef SCROLLBAR_RIGHT +{"-leftbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "off"}, +{"-rightbar", "*rightScrollBar", XrmoptionNoArg, (caddr_t) "on"}, +#endif {"-sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "on"}, {"+sf", "*sunFunctionKeys", XrmoptionNoArg, (caddr_t) "off"}, -{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"}, -{"+si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "on"}, +{"-si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "off"}, +{"+si", "*scrollTtyOutput", XrmoptionNoArg, (caddr_t) "on"}, {"-sk", "*scrollKey", XrmoptionNoArg, (caddr_t) "on"}, {"+sk", "*scrollKey", XrmoptionNoArg, (caddr_t) "off"}, {"-sl", "*saveLines", XrmoptionSepArg, (caddr_t) NULL}, #if OPT_SUNPC_KBD -{"-sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "on"}, -{"+sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "off"}, +{"-sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "on"}, +{"+sp", "*sunKeyboard", XrmoptionNoArg, (caddr_t) "off"}, #endif {"-t", "*tekStartup", XrmoptionNoArg, (caddr_t) "on"}, {"+t", "*tekStartup", XrmoptionNoArg, (caddr_t) "off"}, @@ -439,6 +443,10 @@ { "-/+rw", "turn on/off reverse wraparound" }, { "-/+s", "turn on/off multiscroll" }, { "-/+sb", "turn on/off scrollbar" }, +#ifdef SCROLLBAR_RIGHT +{ "-useRight", "force scrollbar right (default left)" }, +{ "-useLeft", "force scrollbar left" }, +#endif { "-/+sf", "turn on/off Sun Function Key escape codes" }, { "-/+si", "turn on/off scroll-on-tty-output inhibit" }, { "-/+sk", "turn on/off scroll-on-keypress" }, @@ -1022,13 +1030,22 @@ max_plus1 = (screen->respond < ConnectionNumber(screen->display)) ? (1 + ConnectionNumber(screen->display)) : (1 + screen->respond); - + #ifdef DEBUG if (debug) printf ("debugging on\n"); #endif /* DEBUG */ XSetErrorHandler(xerror); XSetIOErrorHandler(xioerror); + (void) setuid (screen->uid); /* we're done with privileges... */ + (void) setgid (screen->gid); + done_setuid = 1; + +#ifdef ALLOWLOGGING + if (term->misc.log_on) { + StartLog(screen); + } +#endif for( ; ; ) { if(screen->TekEmu) { TekRun(); @@ -1038,7 +1055,8 @@ } } -char *base_name(name) +static char * +base_name(name) char *name; { register char *cp; Index: ptyx.h --- xterm-52+/ptyx.h Tue Sep 30 07:04:42 1997 +++ xterm-53/ptyx.h Sun Oct 12 15:34:26 1997 @@ -736,6 +736,9 @@ Boolean signalInhibit; Boolean tekInhibit; Boolean scrollbar; +#ifdef SCROLLBAR_RIGHT + Boolean useRight; +#endif Boolean titeInhibit; Boolean tekSmall; /* start tek window in small size */ Boolean appcursorDefault; @@ -861,8 +864,13 @@ #define DEC_PROTECT 1 #define ISO_PROTECT 2 -#define CursorX(screen,col) ((col) * FontWidth(screen) + screen->border \ - + Scrollbar(screen)) +#ifdef SCROLLBAR_RIGHT +#define OriginX(screen) (((term->misc.useRight)?0:Scrollbar(screen)) + screen->border) +#else +#define OriginX(screen) (Scrollbar(screen) + screen->border) +#endif + +#define CursorX(screen,col) ((col) * FontWidth(screen) + OriginX(screen)) #define CursorY(screen,row) ((((row) - screen->topline) * FontHeight(screen)) \ + screen->border) Index: screen.c --- xterm-52+/screen.c Tue Sep 30 07:04:42 1997 +++ xterm-53/screen.c Sun Oct 12 15:24:21 1997 @@ -805,11 +805,12 @@ } else if(FullHeight(screen) == height && FullWidth(screen) == width) return(0); /* nothing has changed at all */ - if(screen->scrollWidget) - ResizeScrollBar(screen->scrollWidget, -1, -1, height); - screen->fullVwin.fullheight = height; screen->fullVwin.fullwidth = width; + + if(screen->scrollWidget) + ResizeScrollBar(screen); + ResizeSelection (screen, rows, cols); #ifndef NO_ACTIVE_ICON Index: scrollbar.c --- xterm-52+/scrollbar.c Fri Sep 19 13:58:52 1997 +++ xterm-53/scrollbar.c Sun Oct 12 15:33:37 1997 @@ -57,7 +57,6 @@ static Widget CreateScrollBar PROTO((XtermWidget xw, int x, int y, int height)); static int params_to_pixels PROTO((TScreen *screen, String *params, Cardinal n)); static int specialcmplowerwiths PROTO((char *a, char *b)); -static void RealizeScrollBar PROTO((Widget sbw, TScreen *screen)); static void ResizeScreen PROTO((XtermWidget xw, int min_width, int min_height)); /* Event handlers */ @@ -155,10 +154,10 @@ sizehints.height = (screen->max_row + 1) * FontHeight(screen) + min_height; #endif - + /* - * Note: width and height are not set here because they are - * obsolete. + * Note: width and height are not set here because they are + * obsolete. */ XtVaSetValues(XtParent(xw), XtNbaseWidth, min_width, @@ -211,26 +210,20 @@ {XtNreverseVideo, (XtArgVal) 0}, {XtNorientation, (XtArgVal) XtorientVertical}, {XtNborderWidth, (XtArgVal) 1}, - }; + }; argList[0].value = (XtArgVal) x; argList[1].value = (XtArgVal) y; argList[2].value = (XtArgVal) height; argList[3].value = (XtArgVal) xw->misc.re_verse; - scrollWidget = XtCreateWidget("scrollbar", scrollbarWidgetClass, + scrollWidget = XtCreateWidget("scrollbar", scrollbarWidgetClass, (Widget)xw, argList, XtNumber(argList)); XtAddCallback (scrollWidget, XtNscrollProc, ScrollTextUpDownBy, 0); XtAddCallback (scrollWidget, XtNjumpProc, ScrollTextTo, 0); return (scrollWidget); } -static void RealizeScrollBar (sbw, screen) - Widget sbw; - TScreen *screen GCC_UNUSED; -{ - XtRealizeWidget (sbw); -} void ScrollBarReverseVideo(scrollWidget) @@ -264,7 +257,7 @@ { register TScreen *screen = &term->screen; register int thumbTop, thumbHeight, totalHeight; - + thumbTop = screen->topline + screen->savedlines; thumbHeight = screen->max_row + 1; totalHeight = thumbHeight + screen->savedlines; @@ -275,14 +268,25 @@ } void -ResizeScrollBar(scrollWidget, x, y, height) - register Widget scrollWidget; - int x, y; - unsigned height; +ResizeScrollBar(screen) + TScreen *screen; { - XtConfigureWidget(scrollWidget, x, y, scrollWidget->core.width, - height, scrollWidget->core.border_width); - ScrollBarDrawThumb(scrollWidget); + XtConfigureWidget( + screen->scrollWidget, +#ifdef SCROLLBAR_RIGHT + (term->misc.useRight) + ? (screen->fullVwin.fullwidth - + screen->scrollWidget->core.width - + screen->scrollWidget->core.border_width) + : 0, +#else + 0, +#endif + 0, + screen->scrollWidget->core.width, + screen->fullVwin.height + screen->border * 2, + screen->scrollWidget->core.border_width); + ScrollBarDrawThumb(screen->scrollWidget); } void @@ -315,7 +319,7 @@ scrolltop = lines; refreshtop = scrollheight; } - x = Scrollbar(screen) + screen->border; + x = OriginX(screen); scrolling_copy_area(screen, scrolltop, scrollheight, -i); screen->topline = top; @@ -323,9 +327,9 @@ XClearArea( screen->display, - TextWindow(screen), + TextWindow(screen), (int) x, - (int) refreshtop * FontHeight(screen) + screen->border, + (int) refreshtop * FontHeight(screen) + screen->border, (unsigned) Width(screen), (unsigned) lines * FontHeight(screen), FALSE); @@ -375,7 +379,7 @@ == NULL) Error (ERROR_SBRALLOC); screen->buf = &screen->allbuf[MAX_PTRS * screen->savelines]; - memmove( (char *)screen->buf, (char *)screen->allbuf, + memmove( (char *)screen->buf, (char *)screen->allbuf, MAX_PTRS * (screen->max_row + 2) * sizeof (char *)); for(i = MAX_PTRS * screen->savelines - 1 ; i >= 0 ; i--) if((screen->allbuf[i] = @@ -384,9 +388,8 @@ Error (ERROR_SBRALLOC2); } - ResizeScrollBar (screen->scrollWidget, -1, -1, - screen->fullVwin.height + border); - RealizeScrollBar (screen->scrollWidget, screen); + ResizeScrollBar (screen); + XtRealizeWidget (screen->scrollWidget); screen->fullVwin.scrollbar = screen->scrollWidget->core.width + screen->scrollWidget->core.border_width; Index: util.c --- xterm-52+/util.c Tue Sep 30 07:04:42 1997 +++ xterm-53/util.c Sun Oct 12 12:59:27 1997 @@ -134,7 +134,7 @@ if(refreshheight > 0) { ClearCurBackground(screen, (int) refreshtop * FontHeight(screen) + screen->border, - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); ScrnRefresh(screen, refreshtop, 0, refreshheight, @@ -253,7 +253,7 @@ if(refreshheight > 0) { ClearCurBackground(screen, (int) refreshtop * FontHeight(screen) + screen->border, - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); if(refreshheight > shift) @@ -331,7 +331,7 @@ if(refreshheight > 0) { ClearCurBackground(screen, (int) refreshtop * FontHeight(screen) + screen->border, - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); } @@ -391,7 +391,7 @@ if(refreshheight > 0) { ClearCurBackground(screen, (int) refreshtop * FontHeight(screen) + screen->border, - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); } @@ -467,7 +467,7 @@ if(refreshheight > 0) { ClearCurBackground(screen, (int) refreshtop * FontHeight(screen) + screen->border, - (int) screen->border + Scrollbar(screen), + (int) OriginX(screen), (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); } @@ -592,7 +592,7 @@ if((height -= top) > 0) { ClearCurBackground(screen, top * FontHeight(screen) + screen->border, - screen->border + Scrollbar(screen), + OriginX(screen), height * FontHeight(screen), Width(screen)); } @@ -626,7 +626,7 @@ if(++top <= screen->max_row) { ClearCurBackground(screen, top * FontHeight(screen) + screen->border, - screen->border + Scrollbar(screen), + OriginX(screen), (screen->max_row - top + 1) * FontHeight(screen), Width(screen)); } @@ -787,7 +787,7 @@ FlushScroll(screen); ClearCurBackground(screen, top * FontHeight(screen) + screen->border, - screen->border + Scrollbar(screen), + OriginX(screen), (screen->max_row - top + 1) * FontHeight(screen), Width(screen)); } @@ -987,7 +987,7 @@ int amount; /* number of lines to move up (neg=down) */ { if(nlines > 0) { - int src_x = screen->border + Scrollbar(screen); + int src_x = OriginX(screen); int src_y = firstline * FontHeight(screen) + screen->border; copy_area(screen, src_x, src_y, @@ -1083,15 +1083,14 @@ toprow = (rect_y - screen->border) / FontHeight(screen); if(toprow < 0) toprow = 0; - leftcol = (rect_x - screen->border - Scrollbar(screen)) + leftcol = (rect_x - OriginX(screen)) / CurFontWidth(screen,screen->cur_row); if(leftcol < 0) leftcol = 0; nrows = (rect_y + rect_height - 1 - screen->border) / FontHeight(screen) - toprow + 1; - ncols = - (rect_x + rect_width - 1 - screen->border - Scrollbar(screen)) / - FontWidth(screen) - leftcol + 1; + ncols = (rect_x + rect_width - 1 - OriginX(screen)) / + FontWidth(screen) - leftcol + 1; toprow -= screen->scrolls; if (toprow < 0) { nrows += toprow; Index: xterm.h --- xterm-52+/xterm.h Tue Sep 30 07:04:42 1997 +++ xterm-53/xterm.h Sun Oct 12 15:26:22 1997 @@ -184,7 +184,7 @@ extern void DoResizeScreen PROTO((XtermWidget xw)); extern void HandleScrollBack PROTO_XT_ACTIONS_ARGS; extern void HandleScrollForward PROTO_XT_ACTIONS_ARGS; -extern void ResizeScrollBar PROTO((Widget scrollWidget, int x, int y, unsigned height)); +extern void ResizeScrollBar PROTO((TScreen *screen)); extern void ScrollBarDrawThumb PROTO((Widget scrollWidget)); extern void ScrollBarOff PROTO((TScreen *screen)); extern void ScrollBarOn PROTO((XtermWidget xw, int init, int doalloc)); Index: xterm.man --- xterm-52+/xterm.man Tue Sep 30 07:04:42 1997 +++ xterm-53/xterm.man Sun Oct 12 17:18:59 1997 @@ -86,7 +86,7 @@ .B Tektronix menu; see below). The name of the file will be -``\fBCOPY\fIyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fR'', where +``\fBCOPY\fIyyyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fR'', where .IR yy , .IR MM , .IR dd , @@ -277,6 +277,10 @@ .B \+j This option indicates that \fIxterm\fP should not do jump scrolling. .TP 8 +.B \-leftbar +Force scrollbar to the left side of VT100 screen. +This is the default, unless you have set the rightScrollBar resource. +.TP 8 .B \-ls This option indicates that the shell that is started in the \fIxterm\fP window will be a login shell (i.e., the first character of argv[0] will be a dash, @@ -318,6 +322,9 @@ .B \+pc This option disables the PC-style use of bold colors. .TP 8 +.B \-rightbar +Force scrollbar to the right side of VT100 screen. +.TP 8 .B \-rw This option indicates that reverse-wraparound should be allowed. This allows the cursor to back up from the leftmost column of one line to the rightmost @@ -466,7 +473,7 @@ This option specifies the preferred size and position of the Tektronix window. It is shorthand for specifying the ``\fI*tekGeometry\fP'' resource. .TP 8 -.B \#\fIgeom\fP +.B \ #\fIgeom\fP This option specifies the preferred position of the icon window. It is shorthand for specifying the ``\fI*iconGeometry\fP'' resource. .TP 8 @@ -950,6 +957,11 @@ Specifies whether or not reverse-wraparound should be enabled. The default is ``false.'' .TP 8 +.B "rightScrollBar (\fPclass\fB RightScrollBar)" +Specifies whether or not the scrollbar should be displayed on the right +rather than the left. +The default is ``false.'' +.TP 8 .B "saveLines (\fPclass\fB SaveLines)" Specifies the number of lines to save beyond the top of the screen when a scrollbar is turned on. The default is 64. @@ -1063,6 +1075,9 @@ .B "allowsends (\fPclass\fB SmeBSB)" This entry invokes the \fBallow-send-events(toggle)\fP action. .TP 8 +.B "logging (\fPclass\fB SmeBSB)" +This entry invokes the \fBlogging(toggle)\fP action. +.TP 8 .B "redraw (\fPclass\fB SmeBSB)" This entry invokes the \fBredraw()\fP action. .TP 8 @@ -1075,8 +1090,11 @@ .B "backarrow key (\fPclass\fB SmeBSB)" This entry invokes the \fBset-backarrow(toggle)\fP action. .TP 8 -.B "sun-function-keys (\fPclass\fB SmeBSB)" -This entry invokes the \fBsun-function-keys(toggle)\fP action. +.B "sun\ function-keys (\fPclass\fB SmeBSB)" +This entry invokes the \fBsun\ function-keys(toggle)\fP action. +.TP 8 +.B "sun\ keyboard (\fPclass\fB SmeBSB)" +This entry invokes the \fBsun\ keyboard(toggle)\fP action. .TP 8 .B "line2 (\fPclass\fB SmeLine)" This is a separator. Index: xtermcfg.hin --- xterm-52+/xtermcfg.hin Tue Sep 30 07:04:42 1997 +++ xterm-53/xtermcfg.hin Sun Oct 12 15:44:41 1997 @@ -48,6 +48,7 @@ #undef OPT_TRACE /* CF_ARG_ENABLE(trace) */ #undef OPT_VT52_MODE /* CF_ARG_DISABLE(vt52) */ #undef OPT_XMC_GLITCH /* CF_ARG_ENABLE(xmc-glitch) */ +#undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */ #undef USE_MY_MEMMOVE /* CF_FUNC_MEMMOVE */ #undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */ #undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */