[1634] in testers
rsaix motif olh, olc
daemon@ATHENA.MIT.EDU (daemon@ATHENA.MIT.EDU)
Tue Jul 30 18:18:54 1991
Date: Tue, 30 Jul 91 15:17:20 -0700
From: "Jonathan I. Kamens" <jik@cats.UCSC.EDU>
To: basch@MIT.EDU
Cc: brlewis@MIT.EDU, testers@MIT.EDU
In-Reply-To: Richard Basch's message of Tue, 30 Jul 91 18:05:57 -0400 <9107302205.AA04593@tardis.MIT.EDU>
Date: Tue, 30 Jul 91 18:05:57 -0400
From: Richard Basch <basch@MIT.EDU>
X-Work: 1 Amherst St. E40-318, Cambridge, MA 02139, (617)253-0100
The only Motif libraries supplied by Chris were Motif 1.1. xolc and
xolh do not seem to be compatible with these. These have been presented
to the project leader... (lucien)
I had to make these changes to athena/athena.bin/olh/motif in order to
get it to compile with Motif 1.1.something on the Sun:
*** 1.5 1991/04/29 15:05:01
--- Context.c 1991/07/09 07:15:41
***************
*** 8,21 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/Context.c,v $
! * $Id: Context.c,v 1.5 1991/04/29 15:05:01 lwvanels Exp $
! * $Author: lwvanels $
*/
! #include <Xm/Xm.h>
#include <Xm/PushB.h>
- #include "global.h"
#include "widget_num.h"
#include "menu.h"
#include "menupath.h"
--- 8,21 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/Context.c,v $
! * $Id: Context.c,v 1.6 1991/07/09 07:15:26 jik Exp $
! * $Author: jik $
*/
! #include "global.h"
!
#include <Xm/PushB.h>
#include "widget_num.h"
#include "menu.h"
#include "menupath.h"
*** 1.2 1991/02/11 14:26:50
--- Highlight.c 1991/07/09 07:17:01
***************
*** 8,15 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/Highlight.c,v $
! * $Id: Highlight.c,v 1.2 1991/02/11 14:26:50 lwvanels Exp $
! * $Author: lwvanels $
*/
/*
--- 8,15 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/Highlight.c,v $
! * $Id: Highlight.c,v 1.3 1991/07/09 07:16:44 jik Exp $
! * $Author: jik $
*/
/*
***************
*** 19,28 ****
* have to muck with the private state of the widget.
*/
#include <X11/Xlib.h>
#include <Xm/ListP.h>
-
- #include "global.h"
/************************************************************************
* *
--- 19,28 ----
* have to muck with the private state of the widget.
*/
+ #include "global.h"
+
#include <X11/Xlib.h>
#include <Xm/ListP.h>
/************************************************************************
* *
*** 1.4 1991/02/28 14:51:54
--- MuMenu.c 1991/07/09 20:58:04
***************
*** 8,15 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/MuMenu.c,v $
! * $Id: MuMenu.c,v 1.4 1991/02/28 14:51:54 lwvanels Exp $
! * $Author: lwvanels $
*/
#include "global.h"
--- 8,15 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/MuMenu.c,v $
! * $Id: MuMenu.c,v 1.5 1991/07/09 20:57:37 jik Exp $
! * $Author: jik $
*/
#include "global.h"
***************
*** 112,129 ****
--- 112,136 ----
0, /* num_get_resources */
NULL, /* get_constraint_resources */
0, /* num_get_constraint_resources */
+ (XmParentProcessProc)0,
NULL, /* extension */
},
{ /* row column class record */
NULL, /* proc to position a menu */
+ #if 0
NULL, /* proc to set cascadeBtn field */
+ #endif
NULL, /* proc to arm&activate menu */
+ #if 0
NULL, /* proc to popdown menu */
NULL, /* proc to arm menu */
NULL, /* proc to change traversal */
NULL, /* proc to disarm menu */
+ #endif
NULL, /* traversal handler */
+ #if 0
NULL, /* cleans up PM menubar traversal mode */
+ #endif
NULL, /* extension */
},
{ /* muMenu fields */
***************
*** 198,212 ****
--- 205,225 ----
/* got to fix up inheritance myself, since RowColumn won't do it for me */
#define inherit(field) muMenuClassRec.row_column_class.field = superclass->row_column_class.field
+ #if 0
inherit(position);
inherit(setCascade);
+ #endif
inherit(armAndActivate);
+ #if 0
inherit(menuPopdown);
inherit(menuArm);
inherit(setMenuTraversal);
inherit(menuDisarm);
+ #endif
inherit(traversalHandler);
+ #if 0
inherit(menuBarCleanup);
+ #endif
#undef inherit
}
*** 1.1 1991/07/10 02:14:50
--- XmListUtils.c 1991/07/10 02:16:38
***************
*** 1,3 ****
--- 1,5 ----
+ #include <X11/Intrinsic.h>
+ #include <Xm/VaSimple.h>
#include <Xm/Xm.h>
#include <Xm/ListP.h> /* we need to get inside the list. this is illegal */
*** 1.9 1991/06/30 18:29:19
--- global.h 1991/07/09 07:07:49
***************
*** 9,16 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/global.h,v $
! * $Id: global.h,v 1.9 1991/06/30 18:29:19 lwvanels Exp $
! * $Author: lwvanels $
*/
#ifndef _GLOBAL_
--- 9,16 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/global.h,v $
! * $Id: global.h,v 1.10 1991/07/09 07:07:25 jik Exp $
! * $Author: jik $
*/
#ifndef _GLOBAL_
***************
*** 18,23 ****
--- 18,25 ----
#include <stdio.h>
+ #include <X11/Intrinsic.h>
+ #include <Xm/VaSimple.h>
#include <Xm/Xm.h>
#include <Xm/ListP.h>
*** 1.2 1991/04/23 12:34:34
--- help.c 1991/07/09 20:58:54
***************
*** 8,23 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/help.c,v $
! * $Id: help.c,v 1.2 1991/04/23 12:34:34 lwvanels Exp $
! * $Author: lwvanels $
*/
#include <ctype.h>
#include <sys/param.h>
#include <Xm/Mu.h>
- #include "global.h"
#include "widget_num.h"
struct brec {
--- 8,24 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/help.c,v $
! * $Id: help.c,v 1.3 1991/07/09 20:58:40 jik Exp $
! * $Author: jik $
*/
#include <ctype.h>
#include <sys/param.h>
+ #include "global.h"
+
#include <Xm/Mu.h>
#include "widget_num.h"
struct brec {
*** 1.8 1991/05/06 12:28:39
--- invoke.c 1991/07/09 21:01:18
***************
*** 9,16 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/invoke.c,v $
! * $Id: invoke.c,v 1.8 1991/05/06 12:28:39 lwvanels Exp $
! * $Author: lwvanels $
*/
#include <sys/errno.h>
--- 9,16 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/invoke.c,v $
! * $Id: invoke.c,v 1.10 1991/07/09 21:01:02 jik Exp $
! * $Author: jik $
*/
#include <sys/errno.h>
***************
*** 19,29 ****
#include <sys/types.h>
#include <sys/stat.h>
#include <Xm/PushB.h>
#include <Xm/Text.h>
#include <Xm/Mu.h>
- #include "global.h"
#include "widget_num.h"
#include "Cursor.h"
#include "menu_et.h"
--- 19,30 ----
#include <sys/types.h>
#include <sys/stat.h>
+ #include "global.h"
+
#include <Xm/PushB.h>
#include <Xm/Text.h>
#include <Xm/Mu.h>
#include "widget_num.h"
#include "Cursor.h"
#include "menu_et.h"
***************
*** 32,37 ****
--- 33,42 ----
#define is_plain_text(e) (!strcmp("plain_text", field_value((e), FILE_FORMAT))\
|| !strcmp("", field_value((e), FILE_FORMAT)))
+
+ #ifdef NEEDS_ERRNO_DEFS
+ extern int errno;
+ #endif
void
view(num)
*** 1.13 1991/06/30 20:21:08
--- keywords.c 1991/07/09 07:14:15
***************
*** 9,24 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/keywords.c,v $
! * $Id: keywords.c,v 1.13 1991/06/30 20:21:08 lwvanels Exp $
! * $Author: lwvanels $
*/
! #include <Xm/Xm.h>
#include <Xm/PushB.h>
#include <Xm/RowColumn.h>
#include <Xm/Text.h>
- #include "global.h"
#include "widget_num.h"
#include "Cursor.h"
#include "menu.h"
--- 9,24 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/keywords.c,v $
! * $Id: keywords.c,v 1.14 1991/07/09 07:14:00 jik Exp $
! * $Author: jik $
*/
! #include "global.h"
!
#include <Xm/PushB.h>
#include <Xm/RowColumn.h>
#include <Xm/Text.h>
#include "widget_num.h"
#include "Cursor.h"
#include "menu.h"
*** 1.13 1991/06/30 18:29:33
--- main.c 1991/07/09 07:11:55
***************
*** 8,15 ****
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/main.c,v $
! * $Id: main.c,v 1.13 1991/06/30 18:29:33 lwvanels Exp $
! * $Author: lwvanels $
*/
#include <stdio.h>
--- 8,15 ----
* For copying and distribution information, see the file "mit-copyright.h".
*
* $Source: /sysdev/source/athena/athena/athena.bin/olh/motif/RCS/main.c,v $
! * $Id: main.c,v 1.15 1991/07/09 07:11:32 jik Exp $
! * $Author: jik $
*/
#include <stdio.h>
***************
*** 16,26 ****
#include <varargs.h>
#include <X11/StringDefs.h>
! #include <Xm/Xm.h>
! #include <Xm/PushB.h>
#include "Xm/Mu.h"
- #include "global.h"
#include "widget_num.h"
#include "menu.h"
--- 16,25 ----
#include <varargs.h>
#include <X11/StringDefs.h>
! #include "global.h"
+ #include <Xm/PushB.h>
#include "Xm/Mu.h"
#include "widget_num.h"
#include "menu.h"
I had to make the following changes to athena/athena.bin/olc/libMu:
*** 1.1 1991/07/09 05:22:18
--- Imakefile 1991/07/09 06:07:30
***************
*** 1,7 ****
# Imakefile for `libMu'.
#
! # $Id: Imakefile,v 1.1 1991/07/09 05:22:18 jik Exp $
! # $Source: /sysdev/source/athena/athena/athena.bin/olc/libMu/RCS/Imakefile,v $
#
# For copying and distribution information,
# please see the file <mit-copyright.h>.
--- 1,7 ----
# Imakefile for `libMu'.
#
! # $Id: Imakefile,v 1.3 1991/07/09 06:05:28 jik Exp $
! # $Source: /sysdev/source/athena/athena/athena.bin/olc/libMu/Imakefile,v $
#
# For copying and distribution information,
# please see the file <mit-copyright.h>.
***************
*** 62,67 ****
lint::
! DependSrcs()
!
! AllTarget(libMu.a TestMu document)
--- 62,76 ----
lint::
! /* Can't use this, because it does :, and we need :: */
! /* DependSrcs() */
! depend:: Makefile
! $(DEPEND) -s "# DO NOT DELETE" -- $(ALLDEFINES) *.[ch]
!
! INCLUDES= Mu.h MuP.h XmListUtils.h
!
! depend:: $(INCLUDES)
! -mkdir $(TOP)/include/Xm
! for i in $(INCLUDES); do \
! cp $$i $(TOP)/include/Xm/$$i; \
! done
*** 1.1 1991/07/09 07:19:57
--- XmListUtils.c 1991/07/30 22:17:56
***************
*** 1,3 ****
--- 1,5 ----
+ #include <X11/Intrinsic.h>
+ #include <Xm/VaSimple.h>
#include <Xm/Xm.h>
#include <Xm/ListP.h> /* we need to get inside the list. this is illegal */
