diff -crP -x *.ps elk-2.2.orig/MACHINES elk-2.2/MACHINES *** elk-2.2.orig/MACHINES Sun Feb 6 18:45:00 1994 --- elk-2.2/MACHINES Sat Jan 28 13:07:10 1995 *************** *** 354,368 **** X Window System ! o You need either X11R4 or X11R5 to use the Elk/X11 interface. If you are still running X11R4, edit the file lib/xaw/build and remove the lines referring to the Athena widgets that are new in X11R5 (panner, porthole, repeater, and tree). OSF/Motif widgets ! o You need at least Motif 1.1 to use the Elk/Motif interface. o If you are running X11R5 make sure that it has been compiled with the symbol MotifBC set to YES in site.def. --- 354,380 ---- X Window System ! o You need either X11R4, X11R5, or X11R6 to use the Elk/X11 ! extensions, although the current release of Elk hasn't been ! tested with X11R4 any longer. ! If you are still running X11R4, edit the file lib/xaw/build and remove the lines referring to the Athena widgets that are new in X11R5 (panner, porthole, repeater, and tree). + If you are running X11R6, edit lib/xaw/build and remove the + lines referring to the `clock' widget (it isn't in Xaw any + longer). Also, make sure that -lSM -lICE is added after -lXt + in your config/site file if it isn't there (delete it for + X11R5). examples/xaw/porthole.scm and examples/xaw/viewport.scm + don't work with X11R6, as they are using the clock widget. + OSF/Motif widgets ! o You need at least Motif 1.1 to use the Elk/Motif extension, ! although the current release of Elk hasn't been tested with ! Motif 1.1 any longer. o If you are running X11R5 make sure that it has been compiled with the symbol MotifBC set to YES in site.def. diff -crP -x *.ps elk-2.2.orig/lib/xlib/init.c elk-2.2/lib/xlib/init.c *** elk-2.2.orig/lib/xlib/init.c Mon Dec 7 10:50:01 1992 --- elk-2.2/lib/xlib/init.c Sat Jan 28 13:07:08 1995 *************** *** 12,22 **** --- 12,32 ---- #endif } + static Object P_Xlib_Release_6_Or_Laterp () { + #ifdef XLIB_RELEASE_6_OR_LATER + return True; + #else + return False; + #endif + } + init_xlib_init () { Define_Primitive (P_Xlib_Release_4_Or_Laterp, "xlib-release-4-or-later?", 0, 0, EVAL); Define_Primitive (P_Xlib_Release_5_Or_Laterp, "xlib-release-5-or-later?", 0, 0, EVAL); + Define_Primitive (P_Xlib_Release_6_Or_Laterp, + "xlib-release-6-or-later?", 0, 0, EVAL); P_Provide (Intern ("xlib.o")); } diff -crP -x *.ps elk-2.2.orig/lib/xlib/xlib.h elk-2.2/lib/xlib/xlib.h *** elk-2.2.orig/lib/xlib/xlib.h Mon Apr 19 16:42:51 1993 --- elk-2.2/lib/xlib/xlib.h Sat Jan 28 13:07:09 1995 *************** *** 15,20 **** --- 15,24 ---- # define XLIB_RELEASE_5_OR_LATER #endif + #if XlibSpecificationRelease >= 6 + # define XLIB_RELEASE_6_OR_LATER + #endif + #include "scheme.h" extern int T_Display; diff -crP -x *.ps elk-2.2.orig/lib/xt/init.c elk-2.2/lib/xt/init.c *** elk-2.2.orig/lib/xt/init.c Wed May 5 17:07:55 1993 --- elk-2.2/lib/xt/init.c Sat Jan 28 13:07:09 1995 *************** *** 12,17 **** --- 12,25 ---- #endif } + static Object P_Xt_Release_6_Or_Laterp () { + #ifdef XT_RELEASE_6_OR_LATER + return True; + #else + return False; + #endif + } + extern WidgetClass vendorShellWidgetClass; /* The reference to vendorShellWidgetClass is required to make sure *************** *** 31,36 **** --- 39,46 ---- Define_Primitive (P_Xt_Release_4_Or_Laterp, "xt-release-4-or-later?", 0, 0, EVAL); Define_Primitive (P_Xt_Release_5_Or_Laterp, "xt-release-5-or-later?", + 0, 0, EVAL); + Define_Primitive (P_Xt_Release_6_Or_Laterp, "xt-release-6-or-later?", 0, 0, EVAL); XtToolkitInitialize (); P_Provide (Intern ("xt.o")); diff -crP -x *.ps elk-2.2.orig/lib/xt/resource.c elk-2.2/lib/xt/resource.c *** elk-2.2.orig/lib/xt/resource.c Mon Jan 24 12:54:20 1994 --- elk-2.2/lib/xt/resource.c Sat Jan 28 13:07:09 1995 *************** *** 283,291 **** GC_Link2 (ret, tail); /* * Display is needed for resources like cursor and pixmap. ! * XtDisplay(w) is not necessarily the right one! */ ! dpy = XtDisplay (w); for (i = 0; i < ac; i++, tail = Cdr (tail)) { Object o; XtArgVal val = argl[i].value; --- 283,291 ---- GC_Link2 (ret, tail); /* * Display is needed for resources like cursor and pixmap. ! * XtDisplayOfObject(w) is not necessarily the right one! */ ! dpy = XtDisplayOfObject (w); for (i = 0; i < ac; i++, tail = Cdr (tail)) { Object o; XtArgVal val = argl[i].value; diff -crP -x *.ps elk-2.2.orig/lib/xt/widget.c elk-2.2/lib/xt/widget.c *** elk-2.2.orig/lib/xt/widget.c Wed Nov 3 19:03:41 1993 --- elk-2.2/lib/xt/widget.c Sat Jan 28 13:07:10 1995 *************** *** 118,124 **** static Object P_Widget_Display (w) Object w; { Check_Widget (w); ! return Make_Display (0, XtDisplay (WIDGET(w)->widget)); } static Object P_Widget_Parent (w) Object w; { --- 118,124 ---- static Object P_Widget_Display (w) Object w; { Check_Widget (w); ! return Make_Display (0, XtDisplayOfObject (WIDGET(w)->widget)); } static Object P_Widget_Parent (w) Object w; { *************** *** 136,142 **** static Object P_Widget_To_Window (w) Object w; { Check_Widget (w); ! return Make_Window (0, XtDisplay (WIDGET(w)->widget), XtWindow (WIDGET(w)->widget)); } --- 136,142 ---- static Object P_Widget_To_Window (w) Object w; { Check_Widget (w); ! return Make_Window (0, XtDisplayOfObject (WIDGET(w)->widget), XtWindow (WIDGET(w)->widget)); } diff -crP -x *.ps elk-2.2.orig/lib/xt/xt.h elk-2.2/lib/xt/xt.h *** elk-2.2.orig/lib/xt/xt.h Fri Mar 19 17:16:08 1993 --- elk-2.2/lib/xt/xt.h Sat Jan 28 13:07:10 1995 *************** *** 14,19 **** --- 14,23 ---- # define XT_RELEASE_5_OR_LATER #endif + #if XtSpecificationRelease >= 6 + # define XT_RELEASE_6_OR_LATER + #endif + typedef XtArgVal (*PFS2X) P_((Object)); typedef Object (*PFX2S) P_((XtArgVal));