This is a diff file for XView3.0 to make it work on BSDI gamma.4. FTP sites for the XView source: Location Machine Name ftp login ftp directory --------------------------------------------------------------------- west coast xview.ucdavis.edu ftp pub/XView3.0/* east coast export.lcs.mit.edu ftp contrib/xview3 This patch kit includes _MOST_ (perhaps all...) of patches 1 & 2 to XView3.0 available at those sites. Binary copies of the XView libraries and of the WorkMan program (to play audio CD's on a CD-ROM drive) should be somewhere on this FTP site. You will need an updated syscall.s (patch attached :-) to avoid a bug in syscall(2). You probably also want to patch mitsumi.c if you have a Mitsumi CD-ROM player. (see also, attached patch) *** /cdrom/usr/src/lib/libc/i386/sys/syscall.s Wed Jan 1 16:22:58 1992 --- syscall.s Sat Jan 23 01:24:01 1993 *************** *** 45,50 **** --- 45,52 ---- pop %eax /* syscall number */ push %ecx LCALL(7,0) + push %ecx /* need to push *something* to keep stack frame + intact upon return. */ jb 1f ret 1: Description: At least two of my audio CD's induce an infinite loop in mitsumi_probe(). Release: Gamma.4 (0.9.4) Repeat-By: Insert the disk "Claude Bolling Suite for Flute & Jazz Piano Trio, No. 2) (CBS records, catalog MK 42318). Run cdctl. Watch it spend eternity frobbing with the disk. Fix: I don't know what this test in the code is for, but commenting it out gets rid of the problem. Additionally, it would be quite helpful if mitsumi.c used symbolic constants and described the various commands it issues. *** /tmp/RCSA001065 Sat Jan 23 23:23:15 1993 --- /usr/src/lib/libcdrom/mitsumi.c Sat Jan 23 23:22:44 1993 *************** *** 106,113 **** --- 106,115 ---- if (track_num < first_track_num || track_num > last_track_num) continue; + #if 0 if (buf[1] != 1) continue; + #endif tp = &cdinfo->tracks[track_num - first_track_num]; -------------------- AND NOW, the XView3.0 patches! =================================================================== RCS file: lib/libxview/base/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/base/Imakefile *** /tmp/RCSA004901 Sat Jan 23 12:22:33 1993 --- lib/libxview/base/Imakefile Thu Jan 7 21:17:11 1993 *************** *** 1,10 **** - #include - - #include /**/########################################################################### ! /**/# @(#)Imakefile 1.2 10/2/91 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES --- 1,12 ---- #include + #if SharedLibXView + #define DoSharedLib YES + #endif + #include + /**/########################################################################### ! /**/# @(#)Imakefile 1.5 3/24/92 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES *************** *** 35,41 **** drawable.o\ xv_debug.o\ xv_parse.o\ ! xv_list.o\ xv_error.o SRCS=\ --- 37,43 ---- drawable.o\ xv_debug.o\ xv_parse.o\ ! xv_list.o\ xv_error.o SRCS=\ =================================================================== RCS file: lib/libxview/base/RCS/xv_debug.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/base/xv_debug.h *** /tmp/RCSA004901 Sat Jan 23 12:22:33 1993 --- lib/libxview/base/xv_debug.h Thu Jan 7 21:29:05 1993 *************** *** 9,20 **** #ifndef _xv_debug_h_already_included #define _xv_debug_h_already_included ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include /* needed to get definition of Xv_private */ /* * Not strictly necessary to include here, but eliminates --- 9,21 ---- #ifndef _xv_debug_h_already_included #define _xv_debug_h_already_included ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include /* needed to get definition of Xv_private */ /* * Not strictly necessary to include here, but eliminates =================================================================== RCS file: lib/libxview/notify/RCS/ndet_fcntl.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/notify/ndet_fcntl.c *** /tmp/RCSA004901 Sat Jan 23 12:22:33 1993 --- lib/libxview/notify/ndet_fcntl.c Sat Jan 23 03:25:51 1993 *************** *** 22,38 **** --- 22,55 ---- #ifdef SVR4 #include #endif SVR4 + #ifdef __bsdi__ + #include + #endif extern int #ifdef SVR4 xv_fcntl(fd, cmd, arg) #else + #ifdef __bsdi__ + fcntl(int fd, int cmd, ...) + #else fcntl(fd, cmd, arg) + #endif #endif SVR4 + #ifndef __bsdi__ int fd, cmd, arg; + #endif { fd_set bit; int res; + + #ifdef __bsdi__ + int arg; + va_list valist; + va_start(valist, cmd); + arg = va_arg(valist, int); + va_end(valist); + #endif /* Set fd bit */ FD_ZERO(&bit); =================================================================== RCS file: lib/libxview/notify/RCS/ntfy_test.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/notify/ntfy_test.c *** /tmp/RCSA004901 Sat Jan 23 12:22:34 1993 --- lib/libxview/notify/ntfy_test.c Sat Jan 23 01:37:35 1993 *************** *** 989,995 **** fprintf(stderr, "%s in unknown destroy status\n", arg1); goto Error; } ! if ((ne = notify_post_destroy(client, status)) != NOTIFY_OK) { if (!(status == DESTROY_CHECKING && ne == NOTIFY_DESTROY_VETOED)) { notify_perror("notify_destroy"); --- 989,995 ---- fprintf(stderr, "%s in unknown destroy status\n", arg1); goto Error; } ! if ((ne = notify_post_destroy(client, status, NOTIFY_IMMEDIATE)) != NOTIFY_OK) { if (!(status == DESTROY_CHECKING && ne == NOTIFY_DESTROY_VETOED)) { notify_perror("notify_destroy"); *************** *** 1781,1787 **** } /* Send only last client event */ if (*event_count_ptr > 0) { ! (void) notify_event(nclient, *(events + (*event_count_ptr) - 1)); *event_count_ptr--; } /* Send fd 1 input */ --- 1781,1787 ---- } /* Send only last client event */ if (*event_count_ptr > 0) { ! (void) notify_event(nclient, *(events + (*event_count_ptr) - 1),0); *event_count_ptr--; } /* Send fd 1 input */ =================================================================== RCS file: lib/libxview/notify/RCS/ntfy_ctbl.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/notify/ntfy_ctbl.c =================================================================== RCS file: lib/libxview/sel/RCS/seln_impl.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/sel/seln_impl.h *** /tmp/RCSA004901 Sat Jan 23 12:22:34 1993 --- lib/libxview/sel/seln_impl.h Thu Jan 7 21:45:23 1993 *************** *** 5,21 **** /* * (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents ! * pending in the U.S. and foreign countries. See LEGAL NOTICE * file for terms of the license. */ #include ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include #include #include --- 5,22 ---- /* * (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents ! * pending in the U.S. and foreign countries. See LEGAL_NOTICE * file for terms of the license. */ #include ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include =================================================================== RCS file: lib/libxview/dnd/RCS/site.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/dnd/site.c *** /tmp/RCSA004901 Sat Jan 23 12:22:35 1993 --- lib/libxview/dnd/site.c Sat Jan 23 12:19:30 1993 *************** *** 246,252 **** /* (rectNode->rect) is of the wrong type. */ memmove(rect, &(rectNode->rect), sizeof(Rect)); #else ! bcopy(rectNode->rect, rect, sizeof(Rect)); #endif SVR4 return((Xv_opaque)rect); --- 246,252 ---- /* (rectNode->rect) is of the wrong type. */ memmove(rect, &(rectNode->rect), sizeof(Rect)); #else ! bcopy(&(rectNode->rect), rect, sizeof(Rect)); #endif SVR4 return((Xv_opaque)rect); =================================================================== RCS file: lib/libxview/frame/RCS/fm_impl.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/frame/fm_impl.h *** /tmp/RCSA004901 Sat Jan 23 12:22:35 1993 --- lib/libxview/frame/fm_impl.h Thu Jan 7 21:29:43 1993 *************** *** 13,27 **** #define _frame_impl_h_already_included /* standard includes */ ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include - #ifdef OW_I18N - #endif /* OW_I18N */ #include #include #include --- 13,26 ---- #define _frame_impl_h_already_included /* standard includes */ ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include #include =================================================================== RCS file: lib/libxview/frame/RCS/frame_base.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/frame/frame_base.h *** /tmp/RCSA004901 Sat Jan 23 12:22:35 1993 --- lib/libxview/frame/frame_base.h Thu Jan 7 21:39:52 1993 *************** *** 13,24 **** #define _frame_base_h_already_included /* standard includes */ ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include #include #include --- 13,25 ---- #define _frame_base_h_already_included /* standard includes */ ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include =================================================================== RCS file: lib/libxview/frame/RCS/frame_cmd.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/frame/frame_cmd.h *** /tmp/RCSA004901 Sat Jan 23 12:22:35 1993 --- lib/libxview/frame/frame_cmd.h Thu Jan 7 21:40:34 1993 *************** *** 13,24 **** #define _frame_cmd_h_already_included /* standard includes */ ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include #include #include --- 13,25 ---- #define _frame_cmd_h_already_included /* standard includes */ ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include =================================================================== RCS file: lib/libxview/frame/RCS/frame_help.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/frame/frame_help.h *** /tmp/RCSA004901 Sat Jan 23 12:22:36 1993 --- lib/libxview/frame/frame_help.h Thu Jan 7 21:41:14 1993 *************** *** 13,24 **** #define _frame_help_h_already_included /* standard includes */ ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include #include #include --- 13,25 ---- #define _frame_help_h_already_included /* standard includes */ ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include =================================================================== RCS file: lib/libxview/help/RCS/help_file.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/help/help_file.c *** /tmp/RCSA004901 Sat Jan 23 12:22:36 1993 --- lib/libxview/help/help_file.c Sat Jan 23 12:19:45 1993 *************** *** 4,9 **** --- 4,11 ---- #endif #endif + #define LC_MESSAGES 0 + /* * (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents * pending in the U.S. and foreign countries. See LEGAL NOTICE =================================================================== RCS file: lib/libxview/icon/RCS/icon_obj.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/icon/icon_obj.c *** /tmp/RCSA004901 Sat Jan 23 12:22:36 1993 --- lib/libxview/icon/icon_obj.c Thu Jan 7 21:41:56 1993 *************** *** 150,156 **** AVLIST_DECL; va_list valist; ! VA_START(valist, attr); MAKE_AVLIST( valist, avlist ); va_end(valist); return (int) xv_set_avlist(icon_public, avlist); --- 150,156 ---- AVLIST_DECL; va_list valist; ! VA_START(valist, icon_public); MAKE_AVLIST( valist, avlist ); va_end(valist); return (int) xv_set_avlist(icon_public, avlist); =================================================================== RCS file: lib/libxview/menu/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/menu/Imakefile *** /tmp/RCSA004901 Sat Jan 23 12:22:36 1993 --- lib/libxview/menu/Imakefile Thu Jan 7 21:17:15 1993 *************** *** 1,9 **** - #include - #include /**/########################################################################### ! /**/# @(#)Imakefile 1.2 10/2/91 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES --- 1,12 ---- #include + #if SharedLibXView + #define DoSharedLib YES + #endif + #include + /**/########################################################################### ! /**/# @(#)Imakefile 1.5 3/24/92 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES *************** *** 25,31 **** TEXT_OBJS =\ omi.o\ om_public.o\ ! om_render.o\ om_set.o\ om_get.o\ om_compat.o --- 28,34 ---- TEXT_OBJS =\ omi.o\ om_public.o\ ! om_render.o\ om_set.o\ om_get.o\ om_compat.o =================================================================== RCS file: lib/libxview/misc/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/misc/Imakefile *** /tmp/RCSA004901 Sat Jan 23 12:22:36 1993 --- lib/libxview/misc/Imakefile Thu Jan 7 21:17:15 1993 *************** *** 1,10 **** - #include - - #include /**/########################################################################### ! /**/# @(#)Imakefile 1.4 10/3/91 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES --- 1,12 ---- #include + #if SharedLibXView + #define DoSharedLib YES + #endif + #include + /**/########################################################################### ! /**/# @(#)Imakefile 1.7 3/24/92 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES *************** *** 33,39 **** demorandom.o\ getlogindr.o\ expandname.o\ ! expandpath.o\ bitmask.o\ hashfn.o\ db_conv.o\ --- 35,41 ---- demorandom.o\ getlogindr.o\ expandname.o\ ! expandpath.o\ bitmask.o\ hashfn.o\ db_conv.o\ *************** *** 52,58 **** demorandom.c\ getlogindr.c\ expandname.c\ ! expandpath.c\ bitmask.c\ hashfn.c\ db_conv.c\ --- 54,60 ---- demorandom.c\ getlogindr.c\ expandname.c\ ! expandpath.c\ bitmask.c\ hashfn.c\ db_conv.c\ *************** *** 71,77 **** demorandom.o\ getlogindr.o\ expandname.o\ ! expandpath.o\ bitmask.o\ hashfn.o\ db_conv.o\ --- 73,79 ---- demorandom.o\ getlogindr.o\ expandname.o\ ! expandpath.o\ bitmask.o\ hashfn.o\ db_conv.o\ *************** *** 89,95 **** demorandom.c\ getlogindr.c\ expandname.c\ ! expandpath.c\ bitmask.c\ hashfn.c\ db_conv.c\ --- 91,97 ---- demorandom.c\ getlogindr.c\ expandname.c\ ! expandpath.c\ bitmask.c\ hashfn.c\ db_conv.c\ =================================================================== RCS file: lib/libxview/misc/RCS/portable.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/misc/portable.h *** /tmp/RCSA004901 Sat Jan 23 12:22:37 1993 --- lib/libxview/misc/portable.h Sat Jan 9 20:46:09 1993 *************** *** 26,32 **** #ifdef NO_CAST_VATOAV #define AVLIST_DECL Attr_attribute avarray[ATTR_STANDARD_SIZE]; \ ! Attr_avlist avlist = avarray; #define MAKE_AVLIST( valist, avlist ) copy_va_to_av( valist, avlist, 0 ) --- 26,32 ---- #ifdef NO_CAST_VATOAV #define AVLIST_DECL Attr_attribute avarray[ATTR_STANDARD_SIZE]; \ ! Attr_avlist avlist = avarray #define MAKE_AVLIST( valist, avlist ) copy_va_to_av( valist, avlist, 0 ) *************** *** 71,77 **** --- 71,81 ---- #define XV_USE_TERMIOS #define XV_USE_SVR4_PTYS #else /* SVR4 */ + #ifdef __bsdi__ + #define XV_USE_TERMIOS + #else #undef XV_USE_TERMIOS + #endif #undef XV_USE_SVR4_PTYS #endif /* SVR4 */ =================================================================== RCS file: lib/libxview/misc/RCS/i18n_impl.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/misc/i18n_impl.h *** /tmp/RCSA004901 Sat Jan 23 12:22:37 1993 --- lib/libxview/misc/i18n_impl.h Thu Jan 7 21:42:48 1993 *************** *** 8,17 **** #ifndef i18n_impl_h_DEFINED #define i18n_impl_h_DEFINED - #ifndef OS_HAS_LOCALE - #define OS_HAS_LOCALE - #endif - #if defined(SVR4) && defined(OW_I18N) #include #endif /* SVR4 && OW_I18N */ --- 8,13 ---- =================================================================== RCS file: lib/libxview/panel/RCS/panel_impl.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/panel/panel_impl.h *** /tmp/RCSA004901 Sat Jan 23 12:22:37 1993 --- lib/libxview/panel/panel_impl.h Thu Jan 7 21:44:30 1993 *************** *** 9,20 **** #ifndef panel_impl_defined #define panel_impl_defined ! #ifndef FILE ! #ifndef SVR4 #undef NULL ! #endif SVR4 #include ! #endif FILE #include #include #include --- 9,21 ---- #ifndef panel_impl_defined #define panel_impl_defined ! #ifdef NULL #undef NULL ! #endif #include ! #ifndef NULL ! #define NULL 0 ! #endif #include #include #include =================================================================== RCS file: lib/libxview/panel/RCS/p_view.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/panel/p_view.c *** /tmp/RCSA004901 Sat Jan 23 12:22:37 1993 --- lib/libxview/panel/p_view.c Thu Jan 7 21:43:29 1993 *************** *** 1,6 **** #ifndef lint #ifdef sccs ! static char sccsid[] = ""@(#)p_view.c 20.26 91/09/14"; #endif #endif --- 1,6 ---- #ifndef lint #ifdef sccs ! static char sccsid[] = "@(#)p_view.c 20.28 92/03/10"; #endif #endif =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_gtty.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_gtty.c *** /tmp/RCSA004901 Sat Jan 23 12:22:38 1993 --- lib/libxview/ttysw/tty_gtty.c Sat Jan 9 14:05:04 1993 *************** *** 34,41 **** --- 34,70 ---- */ #ifdef XV_USE_TERMIOS + #ifdef __bsdi__ static struct termios default_modes = { BRKINT|ICRNL|IXON|ISTRIP, /* input modes */ + OPOST|ONLCR|OXTABS, /* output modes */ + CS7|PARENB, /* control modes */ + ISIG|ICANON|ECHO|IEXTEN, /* local modes */ + /* control characters */ + { + CEOT, /* VEOF */ + '\033', /* VEOL */ + CEOL, /* VEOL2 */ + CERASE, /* VERASE */ + CWERASE, /* VWERASE */ + CKILL, /* VKILL */ + CRPRNT, /* VREPRINT */ + 0, /* spare 1 */ + CINTR, /* VINTR */ + CQUIT, /* VQUIT */ + CSUSP, /* VSUSP */ + CDSUSP, /* VDSUSP */ + CSTART, /* VSTART */ + CSTOP, /* VSTOP */ + CLNEXT, /* VLNEXT */ + CFLUSH, /* VDISCARD */ + /* ignore VMIN, VTIME, VSTATUS, */ + }, + B9600, B9600, + }; + #else + static struct termios default_modes = { + BRKINT|ICRNL|IXON|ISTRIP, /* input modes */ OPOST|ONLCR|XTABS, /* output modes */ B9600|(B9600 << IBSHIFT)|CS7|PARENB, /* control modes */ ISIG|ICANON|ECHO|IEXTEN, /* local modes */ *************** *** 57,62 **** --- 86,92 ---- CWERASE, /* VWERASE */ CLNEXT, /* VLNEXT */ }; + #endif #else /* XV_USE_TERMIOS */ *************** *** 283,288 **** --- 313,319 ---- } #endif /* XV_USE_TERMIOS */ + /* * Capture fd's current tty modes and store them in *mode. Return 0 on =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_init.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_init.c =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_ntfy.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_ntfy.c *** /tmp/RCSA004901 Sat Jan 23 12:22:39 1993 --- lib/libxview/ttysw/tty_ntfy.c Sat Jan 9 14:32:42 1993 *************** *** 17,23 **** --- 17,25 ---- #include #include #include + #ifndef __bsdi__ #include + #endif #include #include #include =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_main.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_main.c *** /tmp/RCSA004901 Sat Jan 23 12:22:39 1993 --- lib/libxview/ttysw/tty_main.c Sat Jan 9 14:32:41 1993 *************** *** 708,716 **** --- 708,720 ---- if (int_ucntl == (tiocsti & 0xff)) ttysw_process_STI(ttysw, owbp, cc - 1); + #ifdef XV_USE_TERMIOS + tcgetattr(ttysw->ttysw_tty, &ttysw->termios); + #else (void) ioctl(ttysw->ttysw_tty, TIOCGETC, &ttysw->tchars); (void) ioctl(ttysw->ttysw_tty, TIOCGLTC, &ttysw->ltchars); (void) ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw)); /* jcb for nng */ + #endif } else #ifdef OW_I18N owbp += wc_nchar; =================================================================== RCS file: lib/libxview/ttysw/RCS/tty.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty.c *** /tmp/RCSA004901 Sat Jan 23 12:22:40 1993 --- lib/libxview/ttysw/tty.c Sat Jan 9 14:32:40 1993 *************** *** 17,23 **** --- 17,25 ---- #include #include #include + #ifndef __bsdi__ #include + #endif #include #include #include =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_modes.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_modes.c =================================================================== RCS file: lib/libxview/ttysw/RCS/term_ntfy.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/term_ntfy.c *** /tmp/RCSA004901 Sat Jan 23 12:22:40 1993 --- lib/libxview/ttysw/term_ntfy.c Sat Jan 9 14:32:38 1993 *************** *** 16,22 **** --- 16,24 ---- #include #include #include + #ifndef __bsdi__ #include + #endif #include #include #include =================================================================== RCS file: lib/libxview/ttysw/RCS/termsw.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/termsw.c *** /tmp/RCSA004901 Sat Jan 23 12:22:41 1993 --- lib/libxview/ttysw/termsw.c Sat Jan 9 14:32:39 1993 *************** *** 17,23 **** --- 17,25 ---- #include #include #include + #ifndef __bsdi__ #include + #endif #include #include #include =================================================================== RCS file: lib/libxview/ttysw/RCS/tty_impl.h,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/ttysw/tty_impl.h *** /tmp/RCSA004901 Sat Jan 23 12:22:41 1993 --- lib/libxview/ttysw/tty_impl.h Sat Jan 9 14:05:05 1993 *************** *** 191,197 **** --- 191,203 ---- * Access functions for tty characteristics. */ #ifdef XV_USE_TERMIOS + #ifdef __bsdi__ + #include + #include + #define tty_gettabs(t) ((t)->termios.c_oflag & OXTABS) + #else #define tty_gettabs(t) ((t)->termios.c_oflag & XTABS) + #endif #define tty_getdsuspc(t) ((int) ((t)->termios.c_cc[VDSUSP])) #define tty_geteofc(t) ((int) ((t)->termios.c_cc[VEOF])) #define tty_geteolc(t) ((int) ((t)->termios.c_cc[VEOL])) =================================================================== RCS file: lib/libxview/textsw/RCS/txt_edit.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/textsw/txt_edit.c *** /tmp/RCSA004901 Sat Jan 23 12:22:42 1993 --- lib/libxview/textsw/txt_edit.c Thu Jan 7 21:46:15 1993 *************** *** 1,6 **** #ifndef lint #ifdef sccs ! static char sccsid[] = "@(#)txt_edit.c 20.38 91/09/14"; #endif #endif --- 1,6 ---- #ifndef lint #ifdef sccs ! static char sccsid[] = "@(#)txt_edit.c 20.40 92/03/10"; #endif #endif *************** *** 520,526 **** textsw_insert(abstract, buf, buf_len) Textsw abstract; char *buf; ! long int buf_len; { Textsw_view_handle view = VIEW_ABS_TO_REP(abstract); register Textsw_folio folio = FOLIO_FOR_VIEW(view); --- 520,526 ---- textsw_insert(abstract, buf, buf_len) Textsw abstract; char *buf; ! int buf_len; { Textsw_view_handle view = VIEW_ABS_TO_REP(abstract); register Textsw_folio folio = FOLIO_FOR_VIEW(view); =================================================================== RCS file: lib/libxview/textsw/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/textsw/Imakefile *** /tmp/RCSA004901 Sat Jan 23 12:22:42 1993 --- lib/libxview/textsw/Imakefile Sat Jan 23 12:20:03 1993 *************** *** 1,9 **** - #include - #include /**/########################################################################### ! /**/# @(#)Imakefile 1.2 10/2/91 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES --- 1,12 ---- #include + #if SharedLibXView + #define DoSharedLib YES + #endif + #include + /**/########################################################################### ! /**/# @(#)Imakefile 1.6 3/24/92 SMI #ifndef SubdirHasTextObjs #define SubdirHasTextObjs YES *************** *** 24,32 **** NON_EXECS = .text_extras_menu .textswrc #if RedefineTextExtrasMenu ! DEFINES = -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\"" #else ! DEFINES = #endif HDRSPRIVATE= ei.h es.h ev.h ev_impl.h primal.h ps_impl.h\ --- 27,35 ---- NON_EXECS = .text_extras_menu .textswrc #if RedefineTextExtrasMenu ! DEFINES = $(LOCALE_DEFINES) $(MMAP_DEFINES) $(XV_ALLOC_DEFINES) $(XV_STRDUP_DEFINES) -DEXTRASMENU="\"$(TEXT_EXTRAS_MENU)\"" #else ! DEFINES = $(LOCALE_DEFINES) $(MMAP_DEFINES) $(XV_ALLOC_DEFINES) $(XV_STRDUP_DEFINES) #endif HDRSPRIVATE= ei.h es.h ev.h ev_impl.h primal.h ps_impl.h\ =================================================================== RCS file: lib/libxview/textsw/RCS/txt_again.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/textsw/txt_again.c *** /tmp/RCSA004901 Sat Jan 23 12:22:42 1993 --- lib/libxview/textsw/txt_again.c Sat Jan 23 12:21:25 1993 *************** *** 187,206 **** static int #ifdef ANSI_FUNC_PROTO ! textsw_printf(register string_t *ptr_to_string, register char *fmt, ...) #else textsw_printf(ptr_to_string, fmt, va_alist) register string_t *ptr_to_string; ! register char *fmt; va_dcl #endif { #ifndef OW_I18N FILE _strbuf; int result; va_list args; _strbuf._flag = _IOWRT | _IOSTRG; #ifdef sun _strbuf._base = (unsigned char *) TXTSW_STRING_FREE(ptr_to_string); --- 187,217 ---- static int #ifdef ANSI_FUNC_PROTO ! textsw_printf(register string_t *ptr_to_string, char *fmt, ...) #else textsw_printf(ptr_to_string, fmt, va_alist) register string_t *ptr_to_string; ! char *fmt; va_dcl #endif { #ifndef OW_I18N + #ifndef _FSTDIO FILE _strbuf; + #endif int result; va_list args; + #ifdef _FSTDIO + VA_START(args, fmt); + result = vsnprintf((char *) TXTSW_STRING_FREE(ptr_to_string), + ptr_to_string->max_length - + TXTSW_STRING_LENGTH(ptr_to_string), + fmt, + args); + va_end(args); + #else _strbuf._flag = _IOWRT | _IOSTRG; #ifdef sun _strbuf._base = (unsigned char *) TXTSW_STRING_FREE(ptr_to_string); *************** *** 218,223 **** --- 229,235 ---- if (result >= 0) putc('\0', &_strbuf); #endif + #endif return (result); #else OW_I18N *************** *** 581,592 **** /* VARARGS2 */ static int #ifdef ANSI_FUNC_PROTO ! textsw_scanf(register string_t *ptr_to_string, register char *fmt, ...) #else textsw_scanf(ptr_to_string, fmt, va_alist) register string_t *ptr_to_string; ! register char *fmt; va_dcl #endif { --- 593,614 ---- /* VARARGS2 */ static int + eofread(cookie, buf, len) + void *cookie; + char *buf; + int len; + { + + return (0); + } + + static int #ifdef ANSI_FUNC_PROTO ! textsw_scanf(register string_t *ptr_to_string, char *fmt, ...) #else textsw_scanf(ptr_to_string, fmt, va_alist) register string_t *ptr_to_string; ! char *fmt; va_dcl #endif { *************** *** 596,601 **** --- 618,636 ---- int result; va_list args; + #ifdef _FSTDIO + VA_START(args, fmt); + /* cribbed from vsscanf */ + _strbuf._flags = __SRD; + _strbuf._bf._base = _strbuf._p = (unsigned char *)TXTSW_STRING_BASE(ptr_to_string); + _strbuf._bf._size = _strbuf._r = strlen(TXTSW_STRING_BASE(ptr_to_string)); + _strbuf._read = eofread; + _strbuf._ub._base = NULL; + _strbuf._lb._base = NULL; + result = __svfscanf(&_strbuf, fmt, args); + va_end(args); + TXTSW_STRING_BASE(ptr_to_string) = (char *)_strbuf._p; + #else /* _strbuf._flag = _IOREAD | _IOSTRG; */ #ifdef sun _strbuf._base = (unsigned char *) TXTSW_STRING_BASE(ptr_to_string); *************** *** 620,625 **** --- 655,661 ---- result = _doscan(&_strbuf, fmt, args); va_end(args); TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._ptr; + #endif return (result); #else OW_I18N =================================================================== RCS file: lib/libxview/textsw/RCS/txt_e_menu.c,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/textsw/txt_e_menu.c *** /tmp/RCSA004901 Sat Jan 23 12:22:43 1993 --- lib/libxview/textsw/txt_e_menu.c Sat Jan 23 12:21:42 1993 *************** *** 4,9 **** --- 4,11 ---- #endif #endif + #define LC_MESSAGES 0 + /* * (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents * pending in the U.S. and foreign countries. See LEGAL NOTICE =================================================================== RCS file: lib/libxview/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 lib/libxview/Imakefile *** /tmp/RCSA004901 Sat Jan 23 12:22:43 1993 --- lib/libxview/Imakefile Sat Jan 9 01:49:40 1993 *************** *** 1,9 **** - #include - #include /**/########################################################################### ! /**/# @(#)Imakefile 1.2 10/2/91 SMI /**/# makefile rules for Imakefile in libxview library directory. LIBTARGET = xview --- 1,12 ---- #include + #if SharedLibXView + #define DoSharedLib YES + #endif + #include + /**/########################################################################### ! /**/# @(#)Imakefile 1.5 3/24/92 SMI /**/# makefile rules for Imakefile in libxview library directory. LIBTARGET = xview =================================================================== RCS file: bitmaps/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 bitmaps/Imakefile *** /tmp/RCSA005038 Sat Jan 23 12:30:02 1993 --- bitmaps/Imakefile Sun Dec 20 12:25:26 1992 *************** *** 5,11 **** /**/# Imakefile for images directory. XView release 2.0. ! CORE_BITMAPS = \ 1x1 escherknot mailemptymsk sipb txtmvok \ 2x2 flagdown mailfull star txtmvokmask\ flagup mailfullmsk starMask txtmvokmore \ --- 5,11 ---- /**/# Imakefile for images directory. XView release 2.0. ! CORE_BITMAPS = \ 1x1 escherknot mailemptymsk sipb txtmvok \ 2x2 flagdown mailfull star txtmvokmask\ flagup mailfullmsk starMask txtmvokmore \ =================================================================== RCS file: clients/olwm/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 clients/olwm/Imakefile *** /tmp/RCSA005038 Sat Jan 23 12:30:02 1993 --- clients/olwm/Imakefile Sun Dec 20 12:25:56 1992 *************** *** 36,48 **** OBJS = \ Debug.o Error.o Notice.o Select.o WinInfo.o atom.o \ client.o cmdstream.o defaults.o environ.o evbind.o \ ! events.o group.o helpsend.o kbdfuncs.o \ ! list.o mem.o menu.o moveresize.o olwm.o properties.o\ ! resources.o screen.o services.o slave.o slots.o \ ! st.o states.o usermenu.o usleep.o win.o winbusy.o \ ! winbutton.o wincolor.o winframe.o wingframe.o \ ! winicon.o winipane.o winmenu.o winnofoc.o \ ! winpane.o winpinmenu.o winpush.o winresize.o \ winroot.o --- 36,48 ---- OBJS = \ Debug.o Error.o Notice.o Select.o WinInfo.o atom.o \ client.o cmdstream.o defaults.o environ.o evbind.o \ ! events.o group.o helpsend.o kbdfuncs.o \ ! list.o mem.o menu.o moveresize.o olwm.o properties.o\ ! resources.o screen.o services.o slave.o slots.o \ ! st.o states.o usermenu.o usleep.o win.o winbusy.o \ ! winbutton.o wincolor.o winframe.o wingframe.o \ ! winicon.o winipane.o winmenu.o winnofoc.o \ ! winpane.o winpinmenu.o winpush.o winresize.o \ winroot.o =================================================================== RCS file: clients/olwmslave/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 clients/olwmslave/Imakefile *** /tmp/RCSA005038 Sat Jan 23 12:30:02 1993 --- clients/olwmslave/Imakefile Sat Jan 23 12:28:22 1993 *************** *** 1,12 **** #include /**/######################################################################### ! /**/# @(#)Imakefile 1.3 10/4/91 SMI /**/# Imakefile for olwmslave release 3.0. #define HasInfoFiles YES - DEFINES = INCLUDES = -I$(HEADER_DEST) -I$(TOP) SYS_LIBRARIES = DEPLIBS = --- 1,11 ---- #include /**/######################################################################### ! /**/# @(#)Imakefile 1.5 3/24/92 SMI /**/# Imakefile for olwmslave release 3.0. #define HasInfoFiles YES INCLUDES = -I$(HEADER_DEST) -I$(TOP) SYS_LIBRARIES = DEPLIBS = *************** *** 39,45 **** OBJS = \ cmdstream.o \ help_file.o \ ! helprecv.o \ helpwin.o \ mem.o \ olwmslave.o \ --- 38,44 ---- OBJS = \ cmdstream.o \ help_file.o \ ! helprecv.o \ helpwin.o \ mem.o \ olwmslave.o \ =================================================================== RCS file: contrib/examples/misc/RCS/Imakefile,v retrieving revision 1.1 diff -c -r1.1 contrib/examples/misc/Imakefile *** /tmp/RCSA005038 Sat Jan 23 12:30:02 1993 --- contrib/examples/misc/Imakefile Sun Dec 20 12:27:27 1992 *************** *** 20,26 **** INSTALL_SRCS = $(SRCS) $(ICONS) ALLFILES = $(MAKEFILE_SIMPLE) $(SRCS) ! PROGRAMS= fullscreen multi_display multiscreen screen \ svrimage vkbd_fonts vkbd_colors AllTarget($(PROGRAMS)) --- 20,26 ---- INSTALL_SRCS = $(SRCS) $(ICONS) ALLFILES = $(MAKEFILE_SIMPLE) $(SRCS) ! PROGRAMS= fullscreen multi_display multiscreen screen \ svrimage vkbd_fonts vkbd_colors AllTarget($(PROGRAMS)) =================================================================== RCS file: config/RCS/XView.cf,v retrieving revision 1.1 diff -c -r1.1 config/XView.cf *** /tmp/RCSA005038 Sat Jan 23 12:30:02 1993 --- config/XView.cf Sat Jan 23 12:27:37 1993 *************** *** 1,7 **** #ifndef XViewCf #define XViewCf YES /**/########################################################################### ! /**/# @(#)XView.cf 1.8 10/4/91 SMI /**/# XView.cf for XView release 3.0. Specify site preferences here. /* --- 1,7 ---- #ifndef XViewCf #define XViewCf YES /**/########################################################################### ! /**/# @(#)XView.cf 1.10 2/9/92 SMI /**/# XView.cf for XView release 3.0. Specify site preferences here. /* *************** *** 140,146 **** * installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)). */ #ifndef OnlyNeedsNewXViewConfigInstalled ! #define OnlyNeedsNewXViewConfigInstalled NO #endif /* * If you would like the XView man pages to be installed in --- 140,146 ---- * installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)). */ #ifndef OnlyNeedsNewXViewConfigInstalled ! #define OnlyNeedsNewXViewConfigInstalled YES #endif /* * If you would like the XView man pages to be installed in *************** *** 171,177 **** * if you will be doing alot of subclassing, set it to YES. */ #ifndef InstallPrivateHeaders ! #define InstallPrivateHeaders YES #endif /* * If you do want to install the conversion from SunView to XView --- 171,177 ---- * if you will be doing alot of subclassing, set it to YES. */ #ifndef InstallPrivateHeaders ! #define InstallPrivateHeaders NO #endif /* * If you do want to install the conversion from SunView to XView *************** *** 241,247 **** * compatibility with programs which do use the Pixrect library. */ #ifndef InstallPixrectHeaders ! #define InstallPixrectHeaders NO #endif /* * Many of the images are not used by the library or the clients provided --- 241,247 ---- * compatibility with programs which do use the Pixrect library. */ #ifndef InstallPixrectHeaders ! #define InstallPixrectHeaders YES #endif /* * Many of the images are not used by the library or the clients provided *************** *** 307,312 **** * features disabled. */ #ifndef OsHasLocale ! #define OsHasLocale YES #endif #endif /* XViewCf */ --- 307,333 ---- * features disabled. */ #ifndef OsHasLocale ! #define OsHasLocale NO #endif + /* + * There are number of memory allocation macros in lib/libxview/base.h + * that are heavily used by XView. Some compilers do not like the + * construct used to define these macros. If the compiler you are using + * does not like these macros, and there is no other fix for this, set + * XvUseAllocFuncs to YES. Note that this may have some performance hits. + */ + #ifndef XvUseAllocFuncs + #define XvUseAllocFuncs NO + #endif + /* + * If your system does not have strdup(), set XvNoStrdup to YES. + */ + #ifndef XvNoStrdup + #define XvNoStrdup NO + #endif + #define HasGCC YES + #undef CcCmd + #define CcCmd /usr/local/bin/gcc -fno-builtin + /**/#CDEBUGFLAGS=-g -O + EXTRA_DEFINES=-DNO_CAST_VATOAV #endif /* XViewCf */