dana@THUMPER.BELLCORE.COM (Dana A. Chee) (03/01/88)
Hi, Below are the changes needed to make Menus work with version 11 of XWindows. The next mail message will contain the file x11menu.c Dana Chee Bellcore MRE 2Q-250 (201) 829-4488 dana@dino.bellcore.com *** ymakefile Mon Feb 29 07:56:42 1988 --- /tmp/ymakefile Mon Feb 29 15:43:29 1988 *************** *** 143,160 **** #ifdef HAVE_X_WINDOWS #ifdef X11 - #ifdef HAVE_X_MENU - XOBJ = x11term.o x11fns.o x11menu.o - LIBX = -lXMenu11 /usr/X11/lib/oldX/liboldX.a -lX11 - #else /* HAVE_X_MENU */ XOBJ = x11term.o x11fns.o LIBX = -lX11 ! #endif /* HAVE_X_MENU */ ! #else /* X11 */ #ifdef HAVE_X_MENU XOBJ= xterm.o xfns.o xmenu.o LIBX= -lXMenu -lX ! #else /* HAVE_X_MENU */ XOBJ= xterm.o xfns.o LIBX= -lX #endif /* not HAVE_X_MENU */ --- 143,155 ---- #ifdef HAVE_X_WINDOWS #ifdef X11 XOBJ = x11term.o x11fns.o LIBX = -lX11 ! #else #ifdef HAVE_X_MENU XOBJ= xterm.o xfns.o xmenu.o LIBX= -lXMenu -lX ! #else XOBJ= xterm.o xfns.o LIBX= -lX #endif /* not HAVE_X_MENU */ *** config.h-dist Wed Feb 17 10:34:26 1988 --- /tmp/config.h-dist Mon Feb 29 15:43:30 1988 *************** *** 47,56 **** /* #define HAVE_X_WINDOWS */ - /* define X11 if you wish to use the X11 server instead of the X10 one */ - - /* #define X11 */ - /* define HAVE_X_MENU if you want to use the X window menu system. This appears to work on some machines that support X and not on others. */ --- 47,52 ---- *** x11term.h Mon Feb 29 12:36:09 1988 --- /tmp/x11term.h Mon Feb 29 15:43:29 1988 *************** *** 1,9 **** ! #include <X11/Xlib.h> ! #include <X11/Xatom.h> ! #include <X11/keysym.h> ! #include <X11/cursorfont.h> ! #include <X11/Xutil.h> ! #include <X11/X10.h> #ifndef X11 #define X11 --- 1,9 ---- ! #include <X/Xlib.h> ! #include <X/Xatom.h> ! #include <X/keysym.h> ! #include <X/cursorfont.h> ! #include <X/Xutil.h> ! #include <X/X10.h> #ifndef X11 #define X11 *************** *** 14,30 **** #ifndef sigmask #define sigmask(no) (1L << ((no) - 1)) #endif - - #ifdef SIGIO - - #define BLOCK_INPUT_DECLARE() int BLOCK_INPUT_mask; - #define BLOCK_INPUT() BLOCK_INPUT_mask = sigblock (sigmask (SIGIO)) - #define UNBLOCK_INPUT() sigsetmask (BLOCK_INPUT_mask) - - #else /* SIGIO undefined */ - - #define BLOCK_INPUT_DECLARE() - #define BLOCK_INPUT() - #define UNBLOCK_INPUT() - - #endif /* SIGIO */ --- 14,16 ----