diff -c ./Imakefile ../new/Imakefile *** ./Imakefile Thu Dec 1 13:08:40 1994 --- ../new/Imakefile Sun Aug 3 22:46:49 1997 *************** *** 9,14 **** --- 9,27 ---- XCOMM or add -Dbcopy=mybcopy to the DEFINES list below. XCOMM + XCOMM Motif scrollbar + XCOMM muquit@fccc.edu, Aug-03-1997 + XCOMM undef the following if you do not have motif + #define HAVE_MOTIF + + #ifdef HAVE_MOTIF + MOTIF_DEFINES= -DMOTIF + XAWLIB = -lXm -lXaw + #else + MOTIF_DEFINES= + #endif + + /* * add -DWTMP and -DLASTLOG if you want them; make sure that bcopy can * handle overlapping copies before using it. *************** *** 33,54 **** MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) \ -DOSMAJORVERSION=$(OSMAJORVERSION) \ -DOSMINORVERSION=$(OSMINORVERSION) MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ SRCS1 = button.c charproc.c cursor.c data.c input.c \ main.c menu.c misc.c screen.c scrollbar.c tabs.c \ TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c $(EXTRASRC) ! OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \ screen.o scrollbar.o button.o Tekproc.o misc.o \ VTPrsTbl.o TekPrsTbl.o data.o menu.o $(EXTRAOBJ) SRCS2 = resize.c OBJS2 = resize.o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) ! PROGRAMS = resize ansi_xterm DEPLIBS1 = XawClientDepLibs DEPLIBS2 = ! PROGRAMS = ansi_xterm resize #ifndef TermcapLibrary #if SystemV && !defined(MacIIArchitecture) --- 46,68 ---- MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) \ -DOSMAJORVERSION=$(OSMAJORVERSION) \ -DOSMINORVERSION=$(OSMINORVERSION) + MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ SRCS1 = button.c charproc.c cursor.c data.c input.c \ main.c menu.c misc.c screen.c scrollbar.c tabs.c \ TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c $(EXTRASRC) ! OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o\ screen.o scrollbar.o button.o Tekproc.o misc.o \ VTPrsTbl.o TekPrsTbl.o data.o menu.o $(EXTRAOBJ) SRCS2 = resize.c OBJS2 = resize.o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) ! PROGRAMS = resize mansi_xterm DEPLIBS1 = XawClientDepLibs DEPLIBS2 = ! PROGRAMS = mansi_xterm resize #ifndef TermcapLibrary #if SystemV && !defined(MacIIArchitecture) *************** *** 67,85 **** AllTarget($(PROGRAMS)) SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES)) SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES)) SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES)) #if defined(LinuxArchitecture) ! EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY -DWTMP -DLASTLOG EXTRA_INCLUDES = -I/usr/include/bsd EXTRA_LIBRARIES = -lbsd #endif #if InstallXtermSetUID ! SetUIDProgramTarget(ansi_xterm,$(OBJS1),$(DEPLIBS1),XawClientLibs,$(TERMCAPLIB) $(PTYLIB)) #else ! NormalProgramTarget(ansi_xterm,$(OBJS1),$(DEPLIBS1),XawClientLibs,$(TERMCAPLIB) $(PTYLIB)) #endif #if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries && OSMajorVersion < 5 --- 81,102 ---- AllTarget($(PROGRAMS)) SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES)) + SpecialCObjectRule(scrollbar,$(_NOOP_),$(MAIN_DEFINES)) SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES)) SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES)) #if defined(LinuxArchitecture) ! XCOMM EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY -DWTMP -DLASTLOG ! EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY $(MOTIF_DEFINES) EXTRA_INCLUDES = -I/usr/include/bsd EXTRA_LIBRARIES = -lbsd #endif #if InstallXtermSetUID ! SetUIDProgramTarget(mansi_xterm,$(OBJS1),$(DEPLIBS1),XawClientLibs,$(TERMCAPLIB) $(PTYLIB)) #else ! XOCMM NormalProgramTarget(mansi_xterm,$(OBJS1),$(DEPLIBS1),XawClientLibs,$(TERMCAPLIB) $(PTYLIB)) ! NormalProgramTarget(mansi_xterm,$(OBJS1),$(DEPLIBS1),XmClientLibs,$(TERMCAPLIB) $(PTYLIB)) #endif #if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries && OSMajorVersion < 5 *************** *** 95,111 **** #endif #endif #endif ! install:: ansi_xterm MakeDir($(DESTDIR)$(BINDIR)) RemoveFile(xterm.inst) ! LinkRule(xterm.inst,$(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS),$(OBJS1),$(LDOVERRIDE) XawClientLibs $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB)) ! $(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) xterm.inst $(DESTDIR)$(BINDIR)/ansi_xterm RemoveFile(xterm.inst) #else #if InstallXtermSetUID ! InstallProgramWithFlags(ansi_xterm,$(BINDIR),$(INSTUIDFLAGS)) #else ! InstallProgramWithFlags(ansi_xterm,$(BINDIR),NullParameter) #endif #endif --- 112,128 ---- #endif #endif #endif ! install:: mansi_xterm MakeDir($(DESTDIR)$(BINDIR)) RemoveFile(xterm.inst) ! LinkRule(xterm.inst,$(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS),$(OBJS1),$(LDOVERRIDE) XmClientLibs $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB)) ! $(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) xterm.inst $(DESTDIR)$(BINDIR)/mansi_xterm RemoveFile(xterm.inst) #else #if InstallXtermSetUID ! InstallProgramWithFlags(mansi_xterm,$(BINDIR),$(INSTUIDFLAGS)) #else ! InstallProgramWithFlags(mansi_xterm,$(BINDIR),NullParameter) #endif #endif *************** *** 113,118 **** InstallProgramWithFlags(resize,$(BINDIR),NullParameter) InstallAppDefaults(XTerm-ansi) ! InstallManPage(ansi_xterm,$(MANDIR)) InstallManPage(resize,$(MANDIR)) DependTarget() --- 130,135 ---- InstallProgramWithFlags(resize,$(BINDIR),NullParameter) InstallAppDefaults(XTerm-ansi) ! InstallManPage(mansi_xterm,$(MANDIR)) InstallManPage(resize,$(MANDIR)) DependTarget() diff -c ./Makefile ../new/Makefile *** ./Makefile Thu Dec 1 13:10:43 1994 --- ../new/Makefile Sun Aug 3 22:46:49 1997 *************** *** 1,94 **** # Makefile generated by imake - do not edit! ! # $XConsortium: imake.c,v 1.89 94/08/12 00:45:51 gildea Exp $ ! # ----------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and ! # $XConsortium: Imake.tmpl,v 1.220 94/08/30 17:25:36 matt Exp $ ! # $XFree86: xc/config/cf/Imake.tmpl,v 3.4 1994/09/24 15:09:46 dawes Exp $ # .SUFFIXES: .i ! # $XConsortium: Imake.cf,v 1.12 94/03/29 15:42:08 gildea Exp $ ! # $XFree86: xc/config/cf/Imake.cf,v 3.5 1994/09/24 15:09:40 dawes Exp $ # ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before # the platform-specific parameters - edit site.def to change ! # site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $ ! # site: $XFree86: xc/config/cf/site.def,v 3.4 1994/05/29 02:01:47 dawes Exp $ ! ! # $XFree86: xc/config/cf/xf86site.def,v 3.16 1994/09/25 12:20:24 dawes Exp $ ! # ----------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change ! # platform: $XConsortium: linux.cf,v 1.4 94/04/07 15:46:42 rws Exp $ ! # platform: $XFree86: xc/config/cf/linux.cf,v 3.11 1994/09/19 13:36:22 dawes Exp $ ! ! # $XConsortium: lnxLib.rules,v 1.2 94/03/31 11:37:29 gildea Exp $ ! # $XFree86: xc/config/cf/lnxLib.rules,v 3.5 1994/09/11 06:53:26 dawes Exp $ ! ! # $XConsortium: xfree86.cf,v 1.2 94/03/31 11:37:26 gildea Exp $ ! # $XFree86: xc/config/cf/xfree86.cf,v 3.24 1994/09/25 12:20:27 dawes Exp $ ! LINKKITDIR = $(USRLIBDIR)/Server ! ! XF86SRC = $(SERVERSRC)/hw/xfree86 ! XF86ACCELSRC = $(XF86SRC)/accel ! XF86COMSRC = $(XF86SRC)/common ! XF86CONFIGSRC = $(XF86COMSRC) ! XF86HWSRC = $(XF86SRC)/common_hw ! XF86OSSRC = $(XF86SRC)/os-support ! VGADRIVERSRC = $(XF86SRC)/vga256/drivers ! VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers ! VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers ! MONODRIVERSRC = $(XF86SRC)/mono/drivers ! S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers ! ! XF86INIT = $(XF86COMSRC)/xf86Init.o ! XF86MINIT = $(XF86COMSRC)/xf86Init_m.o ! XF86CONFIG = $(XF86CONFIGSRC)/xf86_Option.o ! XF86COMLIB = $(XF86COMSRC)/libxf86.a ! XF86OSLIB = $(XF86OSSRC)/libxf86_os.a ! XF86HWLIB = $(XF86HWSRC)/libxf86_hw.a ! XF86LIBS = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB) ! XF86MLIBS = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB) $(XF86OSLIB) ! # $XConsortium: xf86.rules,v 1.1 94/03/29 15:34:48 gildea Exp $ ! # $XFree86: xc/config/cf/xf86.rules,v 3.1 1994/05/30 08:17:53 dawes Exp $ ! ! # ----------------------------------------------------------------------- # site-specific configuration parameters that go after # the platform-specific parameters - edit site.def to change ! # site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $ ! # site: $XFree86: xc/config/cf/site.def,v 3.4 1994/05/29 02:01:47 dawes Exp $ ! # ----------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files ! # rules: $XConsortium: Imake.rules,v 1.194 94/08/30 17:25:36 matt Exp $ ! # rules: $XFree86: xc/config/cf/Imake.rules,v 3.5 1994/09/24 15:09:43 dawes Exp $ _NULLCMD_ = @ echo -n PATHSEP = / ! SHELL = /bin/sh TOP = . CURRENT_DIR = . IMAKE = imake DEPEND = makedepend ! MKDIRHIER = mkdirhier CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/makedepend - IXXSRC = $(UNSUPPORTEDSRC)/programs/ixx - IXX = ixx - IXXFLAGS = -s BaseObject -m TypeObj -r RequestObj -p Xf - IXXINCLUDES = -i '' INCROOT = /usr/X11R6/include USRLIBDIR = /usr/X11R6/lib --- 1,52 ---- # Makefile generated by imake - do not edit! ! # $XConsortium: imake.c /main/88 1995/12/08 16:33:13 gildea $ ! # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and ! # $XConsortium: Imake.tmpl /main/r61_main/3 1996/02/02 18:57:32 gildea $ # .SUFFIXES: .i ! # $XConsortium: Imake.cf /main/22 1995/12/05 16:39:53 mor $ # ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before # the platform-specific parameters - edit site.def to change ! # site: $XConsortium: site.sample /main/19 1995/12/14 13:03:29 matt $ ! # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change ! # platform: $XConsortium: linux.cf /main/18 1996/02/02 18:59:31 gildea $ ! # $XConsortium: lnxLib.rules /main/12 1996/01/03 14:51:18 kaleb $ ! # ---------------------------------------------------------------------- # site-specific configuration parameters that go after # the platform-specific parameters - edit site.def to change ! # site: $XConsortium: site.sample /main/19 1995/12/14 13:03:29 matt $ ! # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files ! # rules: $XConsortium: Imake.rules /main/208 1996/01/17 11:08:27 kaleb $ _NULLCMD_ = @ echo -n PATHSEP = / ! SHELL = /bin/sh TOP = . CURRENT_DIR = . IMAKE = imake DEPEND = makedepend ! MKDIRHIER = mkdir -p CONFIGSRC = $(TOP)/config IMAKESRC = $(CONFIGSRC)/imake DEPENDSRC = $(CONFIGSRC)/makedepend INCROOT = /usr/X11R6/include USRLIBDIR = /usr/X11R6/lib *************** *** 96,133 **** LINTLIBDIR = $(USRLIBDIR)/lint MANPATH = /usr/X11R6/man MANSOURCEPATH = $(MANPATH)/man ! MANDIR = $(MANSOURCEPATH)1 LIBMANDIR = $(MANSOURCEPATH)3 FILEMANDIR = $(MANSOURCEPATH)5 AR = ar clq BOOTSTRAPCFLAGS = ! CC = gcc AS = as .SUFFIXES: .cxx ! CXX = g++ ! CXXDEBUGFLAGS = -O2 -m486 CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = ! CXXIDL_INCLUDES = -I$(TOP)/include ! CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE CXXOPTIONS = ! CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) $(CXXIDL_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) COMPRESS = compress ! CPP = /lib/cpp $(STD_CPP_DEFINES) ! PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) INSTALL = install INSTALLFLAGS = -c LD = ld ! LEX = flex -l ! LEXLIB = -lfl ! YACC = bison -y ! CCYACC = bison -y LINT = lint LINTLIBFLAG = -C LINTOPTS = -axz --- 54,90 ---- LINTLIBDIR = $(USRLIBDIR)/lint MANPATH = /usr/X11R6/man MANSOURCEPATH = $(MANPATH)/man ! MANDIR = $(MANSOURCEPATH)1 LIBMANDIR = $(MANSOURCEPATH)3 FILEMANDIR = $(MANSOURCEPATH)5 AR = ar clq BOOTSTRAPCFLAGS = ! CC = gcc AS = as .SUFFIXES: .cxx ! CXX = g++ -fno-for-scope ! CXXDEBUGFLAGS = -O CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = ! CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -DX_INTL -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -DAIX_ILS CXXOPTIONS = ! CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) COMPRESS = compress ! CPP = /lib/cpp $(STD_CPP_DEFINES) ! PREPROCESSCMD = /lib/cpp $(STD_CPP_DEFINES) INSTALL = install INSTALLFLAGS = -c LD = ld ! LEX = flex -l ! LEXLIB = -lfl ! YACC = bison -y ! CCYACC = bison -y LINT = lint LINTLIBFLAG = -C LINTOPTS = -axz *************** *** 144,157 **** LIBMANSUFFIX = 3x FILEMANSUFFIX = 5x TROFF = psroff MSMACROS = -ms TBL = tbl EQN = eqn STD_INCLUDES = ! STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE ! STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE ! EXTRA_LOAD_FLAGS = EXTRA_LDOPTIONS = EXTRA_LIBRARIES = TAGS = ctags --- 101,121 ---- LIBMANSUFFIX = 3x FILEMANSUFFIX = 5x TROFF = psroff + NROFF = nroff MSMACROS = -ms + MANMACROS = -man TBL = tbl EQN = eqn + NEQN = neqn + COL = col + + DVIPS = dvips + LATEX = latex STD_INCLUDES = ! STD_CPP_DEFINES = -traditional -$$ -P -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -DX_INTL -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -DAIX_ILS ! STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -DX_INTL -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -DAIX_ILS ! EXTRA_LOAD_FLAGS = -Wl,-rpath,$(USRLIBDIR) EXTRA_LDOPTIONS = EXTRA_LIBRARIES = TAGS = ctags *************** *** 159,188 **** SHAREDCODEDEF = SHLIBDEF = ! SHLIBLDFLAGS = ! PICFLAGS = -B/usr/bin/jump ! CXXPICFLAGS = -B/usr/bin/jump PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO INSTPGMFLAGS = -s INSTBINFLAGS = -m 0755 ! INSTUIDFLAGS = -m 4755 INSTLIBFLAGS = -m 0644 INSTINCFLAGS = -m 0444 INSTMANFLAGS = -m 0444 INSTDATFLAGS = -m 0444 ! INSTKMEMFLAGS = -m 4755 PROJECTROOT = /usr/X11R6 TOP_INCLUDES = -I$(INCROOT) ! CDEBUGFLAGS = -O2 -m486 ! CCOPTIONS = -ansi -DNO_ASM ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) --- 123,152 ---- SHAREDCODEDEF = SHLIBDEF = ! SHLIBLDFLAGS = -shared ! PICFLAGS = -fPIC ! CXXPICFLAGS = -fPIC PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO INSTPGMFLAGS = -s INSTBINFLAGS = -m 0755 ! INSTUIDFLAGS = -s -m 4711 INSTLIBFLAGS = -m 0644 INSTINCFLAGS = -m 0444 INSTMANFLAGS = -m 0444 INSTDATFLAGS = -m 0444 ! INSTKMEMFLAGS = -s -m 4711 PROJECTROOT = /usr/X11R6 TOP_INCLUDES = -I$(INCROOT) ! CDEBUGFLAGS = -O ! CCOPTIONS = -pipe ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) *************** *** 200,206 **** CXXLINK = $(CXX) LDSTRIPFLAGS = -x ! LDCOMBINEFLAGS = -r DEPENDFLAGS = MACROFILE = linux.cf --- 164,170 ---- CXXLINK = $(CXX) LDSTRIPFLAGS = -x ! LDCOMBINEFLAGS = -r DEPENDFLAGS = MACROFILE = linux.cf *************** *** 211,222 **** IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) ! ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(EXTRA_ICONFIGFILES) ! # ----------------------------------------------------------------------- # X Window System Build Parameters and Rules ! # $XConsortium: Project.tmpl,v 1.244 94/08/17 18:57:34 matt Exp $ ! # $XFree86: xc/config/cf/Project.tmpl,v 3.5 1994/09/17 13:38:29 dawes Exp $ # ----------------------------------------------------------------------- # X Window System make variables; these need to be coordinated with rules --- 175,187 ---- IRULESRC = $(CONFIGDIR) IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) ! ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) ! # $RCSfile: Motif.rules,v $ $Revision: 1.2 $ $Date: 1994/12/28 23:33:47 $ ! ! # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules ! # $XConsortium: Project.tmpl /main/r61_main/6 1996/01/15 12:26:59 gildea $ # ----------------------------------------------------------------------- # X Window System make variables; these need to be coordinated with rules *************** *** 268,282 **** TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) ! # $XConsortium: lnxLib.tmpl,v 1.1 94/03/29 15:34:47 gildea Exp $ ! # $XFree86: xc/config/cf/lnxLib.tmpl,v 3.1 1994/07/16 10:18:41 dawes Exp $ ! ! SHLIBLDFLAGS = ! PICFLAGS = -B/usr/bin/jump XLIBSRC = $(LIBSRC)/X11 ! SOXLIBREV = 6.0 DEPXONLYLIB = XONLYLIB = -lX11 --- 233,243 ---- TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) ! # $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $ XLIBSRC = $(LIBSRC)/X11 ! SOXLIBREV = 6.1 DEPXONLYLIB = XONLYLIB = -lX11 *************** *** 285,318 **** XLIBONLY = $(XONLYLIB) XEXTLIBSRC = $(LIBSRC)/Xext - LBXXEXTLIBSRC = $(TOP)/workInProgress/lbx/lib/Xext - - XEXEXTLIBSRC = $(LIBSRC)/XExExt - - SOXEXTREV = 6.0 - DEPXEXTLIB = - XEXTLIB = -lXext - - LINTXEXT = $(LINTLIBDIR)/llib-lXext.ln ! SOXEXTREV = 6.0 ! DEPLBXXEXTLIB = ! LBXXEXTLIB = -llbxXext ! LINTLBXXEXT = $(LINTLIBDIR)/llib-llbxXext.ln ! DEPXEXEXTLIB = $(USRLIBDIR)/libXExExt.a ! XEXEXTLIB = -lXExExt ! ! LINTXEXEXT = $(LINTLIBDIR)/llib-lXExExt.ln ! ! EXTENSIONLIB = $(XEXEXTLIB) $(XEXTLIB) ! DEPEXTENSIONLIB = $(DEPXEXEXTLIB) $(DEPXEXTLIB) ! LINTEXTENSION = $(LINTXEXEXT) $(LINTXEXT) ! ! LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) XLIB = $(EXTENSIONLIB) $(XONLYLIB) LINTXLIB = $(LINTXONLYLIB) XAUTHSRC = $(LIBSRC)/Xau --- 246,263 ---- XLIBONLY = $(XONLYLIB) XEXTLIBSRC = $(LIBSRC)/Xext ! SOXEXTREV = 6.1 ! DEPEXTENSIONLIB = ! EXTENSIONLIB = -lXext ! LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln ! LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) + XLIB = $(EXTENSIONLIB) $(XONLYLIB) + LINTXLIB = $(LINTXONLYLIB) XAUTHSRC = $(LIBSRC)/Xau *************** *** 354,385 **** DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) LINTXTOOLLIB = $(LINTXTOOLONLYLIB) AWIDGETSRC = $(LIBSRC)/Xaw ! SOXAWREV = 6.0 DEPXAWLIB = XAWLIB = -lXaw LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln - XTFSRC = $(TOP)/workInProgress/Xtf - - SOXTFREV = 0.7 - DEPXTFLIB = - XTFLIB = -lXtf - - LINTXTF = $(LINTLIBDIR)/llib-lXtf.ln - - FRESCOSRC = $(TOP)/workInProgress/Fresco - - SOFRESCOREV = 0.7 - DEPFRESCOLIB = - FRESCOLIB = -lFresco - - LINTFRESCO = $(LINTLIBDIR)/llib-lFresco.ln - XILIBSRC = $(LIBSRC)/Xi SOXINPUTREV = 6.0 --- 299,315 ---- DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) + LINTXTOOLLIB = $(LINTXTOOLONLYLIB) AWIDGETSRC = $(LIBSRC)/Xaw ! SOXAWREV = 6.1 DEPXAWLIB = XAWLIB = -lXaw LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln XILIBSRC = $(LIBSRC)/Xi SOXINPUTREV = 6.0 *************** *** 390,396 **** XTESTLIBSRC = $(LIBSRC)/Xtst ! SOXTESTREV = 6.0 DEPXTESTLIB = XTESTLIB = -lXtst --- 320,326 ---- XTESTLIBSRC = $(LIBSRC)/Xtst ! SOXTESTREV = 6.1 DEPXTESTLIB = XTESTLIB = -lXtst *************** *** 414,420 **** PHIGSLIBSRC = $(LIBSRC)/PHIGS ! DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a PHIGSLIB = -lphigs LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln --- 344,351 ---- PHIGSLIBSRC = $(LIBSRC)/PHIGS ! SOPHIGSREV = 6.0 ! DEPPHIGSLIB = PHIGSLIB = -lphigs LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln *************** *** 454,468 **** LINTFONT = $(LINTLIBDIR)/llib-lfont.ln DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS1 = $(DEPLIBS) DEPLIBS2 = $(DEPLIBS) DEPLIBS3 = $(DEPLIBS) CONFIGDIR = $(LIBDIR)/config ! # ----------------------------------------------------------------------- # start of Imakefile # $XConsortium: Imakefile,v 1.62 94/04/10 16:02:56 rws Exp $ --- 385,535 ---- LINTFONT = $(LINTLIBDIR)/llib-lfont.ln + XINTLLIBSRC = $(LIBSRC)/Xintl + + SOXINTLREV = 6.1 + DEPXINTLLIB = + XINTLLIB = -lXintl + + LINTXINTL = $(LINTLIBDIR)/llib-lXintl.ln + + XKBFILELIBSRC = $(LIBSRC)/xkbfile + + DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a + XKBFILELIB = -lxkbfile + + LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln + DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS1 = $(DEPLIBS) DEPLIBS2 = $(DEPLIBS) DEPLIBS3 = $(DEPLIBS) + # $RCSfile: Motif.tmpl,v $ $Revision: 1.7 $ $Date: 1995/11/14 00:22:49 $ + + XTOP = $(TOP) + MTOP = $(TOP) + XBUILDINCROOT = $(XTOP) + XBUILDINCDIR = $(XBUILDINCROOT)/X11 + + CLIENTSRC = $(XTOP)/clients + DEMOSRC = $(XTOP)/demos + LIBSRC = $(XTOP)/lib + FONTSRC = $(XTOP)/fonts + INCLUDESRC = $(XTOP)/X11 + SERVERSRC = $(XTOP)/server + UTILSRC = $(XTOP)/util + EXAMPLESRC = $(XTOP)/examples + DOCSRC = $(XTOP)/doc + RGBSRC = $(XTOP)/rgb + EXTENSIONSRC = $(XTOP)/extensions + + TOP_INCLUDES = -I$(INCROOT) + + UIL_INCLUDES = -I$(USRINCDIR)/uil + + XPM_DEFINES = -DUSE_LOCAL_XPM + XPM_INCLUDES = + XPM_LIBS = + + USRINCDIR = /usr/X11R6/include + UIDDIR = $(LIBDIR)/uid + TESTSRC = $(MTOP)/tests + TESTLIB = $(TESTSRC)/lib + GENERALSRCLIB = $(TESTSRC)/General/lib + GENERALSRCBIN = $(TESTSRC)/General/bin + MANUALSRCLIB = $(TESTSRC)/Manual/lib + MANUALSRCBIN = $(TESTSRC)/Manual/bin + AUTOSRCLIB = $(TESTSRC)/Auto/lib + AUTOSRCBIN = $(TESTSRC)/Auto/bin + COMMONPP = $(GENERALSRCBIN)/Commonpp + GENRUN = $(GENERALSRCBIN)/Genrun + MANRUN = $(GENERALSRCBIN)/Manrun + + TESTCOMSRC = $(MANUALSRCLIB)/Common + + MTOOLKITSRC = $(TOOLKITSRC) + MINCLUDESRC = $(MTOP)/X11 + MLIBSRC = $(MTOP)/lib + MCLIENTSRC = $(MTOP)/clients + MDEMOSRC = $(MTOP)/demos + MWIDGETSRC = $(MLIBSRC)/Xm + MRESOURCESRC = $(MLIBSRC)/Mrm + UILSRC = $(MCLIENTSRC)/uil + + UIL = uil + DEPUIL = $(BINDIR)/uil + + XMEXTRA_LIBS = + + SOXMREV = 1.2 + DEPXMONLYLIB = + XMONLYLIB = -lXm + + LINTXMONLY = $(LINTLIBDIR)/llib-lXm.ln + + XMLIBONLY = $(XMONLYLIB) + XMLIB = $(XMONLYLIB) $(XPM_LIBS) + DEPXMLIB = $(DEPXMONLYLIB) + + SOMRMREV = 1.2 + DEPMRESOURCELIB = + MRESOURCELIB = -lMrm + + LINTMRESOURCE = $(LINTLIBDIR)/llib-lMrm.ln + + DEPUILLIB = $(USRLIBDIR)/libUil.a + UILLIB = -lUil + + LINTUIL = $(LINTLIBDIR)/llib-lUil.ln + + SOMCOMMONREV = 1.2 + DEPTESTCOMLIB = + TESTCOMLIB = -lCommon + + LINTTESTCOM = $(LINTLIBDIR)/llib-lCommon.ln + + TESTUILCOMLIB = $(TESTCOMSRC)/libCommonUil.a + + LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a + LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln + LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln + LINTUILLIB = $(UILSRC)/llib-lUil.ln + + YACCFLAGS = + UILFLAGS = + + RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.core *.O *.Dat + + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -DX_INTL -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -DAIX_ILS -DX_INTL -DNO_MESSAGE_CATALOG + + DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) + + DEPLIBS1 = $(DEPLIBS) + DEPLIBS2 = $(DEPLIBS) + DEPLIBS3 = $(DEPLIBS) + + .SUFFIXES: .o .c .cc .C .cxx + + CPLUSPLUSCOM = $(CXX) + CPLUSPLUSLINKCOM = $(CXXLINK) + + STD_CPLUSPLUS_INCLUDES = $(STD_INCLUDES) + + ALLCPLUSPLUSINCLUDES = $(CXXINCLUDES) + STD_CPLUSPLUS_DEFINES = $(CXXSTD_DEFINES) + ALLCPLUSPLUSDEFINES = $(CXXDEFINES) + CPLUSPLUSFLAGS = $(CXXFLAGS) + + CPLUSPLUSLIBS = + + XMULIBONLY = -lXmu + XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + CONFIGDIR = $(LIBDIR)/config ! # ---------------------------------------------------------------------- # start of Imakefile # $XConsortium: Imakefile,v 1.62 94/04/10 16:02:56 rws Exp $ *************** *** 476,483 **** # or add -Dbcopy=mybcopy to the DEFINES list below. # ! OSMAJORVERSION = 1 ! OSMINORVERSION = 0 UTMPDEF = -DUTMP --- 543,559 ---- # or add -Dbcopy=mybcopy to the DEFINES list below. # ! # Motif scrollbar ! # muquit@fccc.edu, Aug-03-1997 ! # undef the following if you do not have motif ! ! MOTIF_DEFINES= -DMOTIF ! XAWLIB = -lXm -lXaw ! ! TTYGROUPDEF = -DUSE_TTY_GROUP ! ! OSMAJORVERSION = 1 ! OSMINORVERSION = 2 UTMPDEF = -DUTMP *************** *** 487,502 **** SRCS1 = button.c charproc.c cursor.c data.c input.c main.c menu.c misc.c screen.c scrollbar.c tabs.c TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c $(EXTRASRC) ! OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o screen.o scrollbar.o button.o Tekproc.o misc.o VTPrsTbl.o TekPrsTbl.o data.o menu.o $(EXTRAOBJ) SRCS2 = resize.c OBJS2 = resize.o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) ! PROGRAMS = resize ansi_xterm DEPLIBS1 = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS2 = ! PROGRAMS = ansi_xterm resize TERMCAPLIB = -ltermcap --- 563,578 ---- SRCS1 = button.c charproc.c cursor.c data.c input.c main.c menu.c misc.c screen.c scrollbar.c tabs.c TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c $(EXTRASRC) ! OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o screen.o scrollbar.o button.o Tekproc.o misc.o VTPrsTbl.o TekPrsTbl.o data.o menu.o $(EXTRAOBJ) SRCS2 = resize.c OBJS2 = resize.o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) ! PROGRAMS = resize mansi_xterm DEPLIBS1 = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS2 = ! PROGRAMS = mansi_xterm resize TERMCAPLIB = -ltermcap *************** *** 504,546 **** main.o: main.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MAIN_DEFINES) $*.c main.i: main.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MAIN_DEFINES) main.c > $@ misc.o: misc.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MISC_DEFINES) $*.c misc.i: misc.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MISC_DEFINES) misc.c > $@ charproc.o: charproc.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MISC_DEFINES) $*.c charproc.i: charproc.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MISC_DEFINES) charproc.c > $@ ! EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY -DWTMP -DLASTLOG EXTRA_INCLUDES = -I/usr/include/bsd EXTRA_LIBRARIES = -lbsd ! ansi_xterm: $(OBJS1) $(DEPLIBS1) $(RM) $@ ! $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS1) $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB) $(EXTRA_LOAD_FLAGS) clean:: ! $(RM) ansi_xterm ! install:: ansi_xterm @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi ! $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(INSTUIDFLAGS) ansi_xterm $(DESTDIR)$(BINDIR)/ansi_xterm resize: $(OBJS2) $(DEPLIBS2) $(RM) $@ --- 580,631 ---- main.o: main.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MAIN_DEFINES) $*.c main.i: main.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MAIN_DEFINES) main.c > $@ ! ! scrollbar.o: scrollbar.c $(_NOOP_) ! $(RM) $@ ! $(CC) -c $(CFLAGS) $(MAIN_DEFINES) $*.c ! ! scrollbar.i: scrollbar.c $(_NOOP_) ! $(RM) $@ ! $(CC) -E $(CFLAGS) $(MAIN_DEFINES) scrollbar.c > $@ misc.o: misc.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MISC_DEFINES) $*.c misc.i: misc.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MISC_DEFINES) misc.c > $@ charproc.o: charproc.c $(_NOOP_) $(RM) $@ ! $(CC) -c $(CFLAGS) $(MISC_DEFINES) $*.c charproc.i: charproc.c $(_NOOP_) $(RM) $@ ! $(CC) -E $(CFLAGS) $(MISC_DEFINES) charproc.c > $@ ! # EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY -DWTMP -DLASTLOG ! EXTRA_DEFINES = -DANSI -DALLOWLOGGING -DSANE_TTY $(MOTIF_DEFINES) EXTRA_INCLUDES = -I/usr/include/bsd EXTRA_LIBRARIES = -lbsd ! mansi_xterm: $(OBJS1) $(DEPLIBS1) $(RM) $@ ! $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS1) $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB) $(EXTRA_LOAD_FLAGS) clean:: ! $(RM) mansi_xterm ! install:: mansi_xterm @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi ! $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) $(INSTUIDFLAGS) mansi_xterm $(DESTDIR)$(BINDIR)/mansi_xterm resize: $(OBJS2) $(DEPLIBS2) $(RM) $@ *************** *** 559,568 **** else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XTerm-ansi.ad $(DESTDIR)$(XAPPLOADDIR)/XTerm-ansi ! install.man:: ansi_xterm.man @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi ! $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) ansi_xterm.man $(DESTDIR)$(MANDIR)/ansi_xterm.$(MANSUFFIX) install.man:: resize.man @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ --- 644,653 ---- else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XTerm-ansi.ad $(DESTDIR)$(XAPPLOADDIR)/XTerm-ansi ! install.man:: mansi_xterm.man @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi ! $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) mansi_xterm.man $(DESTDIR)$(MANDIR)/mansi_xterm.$(MANSUFFIX) install.man:: resize.man @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ *************** *** 572,588 **** depend:: $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) ! # ----------------------------------------------------------------------- # common rules for all Makefiles - do not edit .c.i: $(RM) $@ ! $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ emptyrule:: clean:: ! $(RM_CMD) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ --- 657,673 ---- depend:: $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) ! # ---------------------------------------------------------------------- # common rules for all Makefiles - do not edit .c.i: $(RM) $@ ! $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ emptyrule:: clean:: ! $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.core *.O "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ *************** *** 594,600 **** $(TAGS) -w *.[ch] $(TAGS) -xw *.[ch] > TAGS ! # ----------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit install:: --- 679,687 ---- $(TAGS) -w *.[ch] $(TAGS) -xw *.[ch] > TAGS ! man_keywords:: ! ! # ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit install:: *************** *** 603,617 **** install.man:: @echo "install.man in $(CURRENT_DIR) done" - install.linkkit:: - @echo "install.linkkit in $(CURRENT_DIR) done" - Makefiles:: includes:: depend:: ! # ----------------------------------------------------------------------- # dependencies generated by makedepend --- 690,701 ---- install.man:: @echo "install.man in $(CURRENT_DIR) done" Makefiles:: includes:: depend:: ! # ---------------------------------------------------------------------- # dependencies generated by makedepend Only in ../new: README.motif Only in .: ansi_xterm diff -c ./main.c ../new/main.c *** ./main.c Thu Nov 17 15:47:57 1994 --- ../new/main.c Sun Aug 3 22:46:49 1997 *************** *** 432,437 **** --- 432,447 ---- extern char *strindex (); extern void HandlePopupMenu(); + #ifdef MOTIF /* muquit */ + + char *g_scb_bgcolor=(char *) NULL; + /* + Boolean g_scb_on_left=False; + */ + + #endif + + int switchfb[] = {0, 2, 1, 3}; static SIGNAL_T reapchild (); *************** *** 673,685 **** static char *fallback_resources[] = { #ifdef ANSI "XTerm-ansi*SimpleMenu*menuLabel.vertSpace: 100", "XTerm-ansi*SimpleMenu*HorizontalMargins: 16", "XTerm-ansi*SimpleMenu*Sme.height: 16", "XTerm-ansi*SimpleMenu*Cursor: left_ptr", "XTerm-ansi*VT100*color0: Black", "XTerm-ansi*VT100*color1: #B20000", ! "XTerm-ansi*VT100*color2: #00B200", "XTerm-ansi*VT100*color3: #B25400", "XTerm-ansi*VT100*color4: #0000B2", "XTerm-ansi*VT100*color5: #B200B2", --- 683,700 ---- static char *fallback_resources[] = { #ifdef ANSI + "XTerm-ansi*background: white", /* muquit */ + "XTerm-ansi*foreground: blue", /* muquit */ + "XTerm-ansi*VT100*font: fixed", /* muquit */ + "XTerm-ansi*scrollBar: true", /* muquit */ + "XTerm-ansi*cursorColor: red", /* muquit */ "XTerm-ansi*SimpleMenu*menuLabel.vertSpace: 100", "XTerm-ansi*SimpleMenu*HorizontalMargins: 16", "XTerm-ansi*SimpleMenu*Sme.height: 16", "XTerm-ansi*SimpleMenu*Cursor: left_ptr", "XTerm-ansi*VT100*color0: Black", "XTerm-ansi*VT100*color1: #B20000", ! "XTerm-ansi*VT100*color2: #006500", "XTerm-ansi*VT100*color3: #B25400", "XTerm-ansi*VT100*color4: #0000B2", "XTerm-ansi*VT100*color5: #B200B2", *************** *** 712,717 **** --- 727,759 ---- NULL }; + #ifdef MOTIF /* muquit */ + + typedef struct + { + String + scrollbar_bg, + scrollbar_placement; /* "left" or "right" */ + } MAppResources, *MAppResourcesP; + + #define MOffset(x) XtOffset(MAppResourcesP,x) + + static XtResource mresources[]= + { + {"ScrollbarBg", "ScrollbarBg", XtRString, sizeof(String), + MOffset(scrollbar_bg), XtRString, "#b2c0dd"}, + /* + {"ScrollbarPlacement", "ScrollbarPlacement", XtRString, sizeof(String), + MOffset(scrollbar_placement), XtRString,"right"}, + */ + + }; + + static void GetResources(Widget toplevelW); + + #endif + + /* Command line options table. Only resources are entered here...there is a pass over the remaining options after XrmParseCommand is let loose. */ *************** *** 1229,1234 **** --- 1271,1282 ---- application_resources, XtNumber(application_resources), NULL, 0); + #ifdef MOTIF /* muquit */ + /* get the scrollbar color for X resources */ + GetResources(toplevel); + + #endif + waiting_for_initial_map = resource.wait_for_map; /* *************** *** 3829,3831 **** --- 3877,3940 ---- ttysendsig(sig); #endif /* AMOEBA */ } + + #ifdef MOTIF + + /* + * GetResources() - check if any X resources is set + * + * RCS + * $Revision$ + * $Date$ + * Return Values: + * none + * + * Parameters: + * Widget toplevelW + * + * Side Effects: + * none + * + * Limitations and Comments: + * none + * + * Development History: + * who when why + * ma_muquit@fccc.edu Aug-03-1997 first cut + */ + + static void GetResources(Widget toplevelW) + { + MAppResources + app_resources; + + /* + char + *scb_placement; + */ + + XtGetApplicationResources(toplevelW,(XtPointer) &app_resources, + mresources, XtNumber(mresources), NULL, 0); + + g_scb_bgcolor=XtNewString(app_resources.scrollbar_bg); + + /* + scb_placement=XtNewString(app_resources.scrollbar_placement); + if (strcasecmp(scb_placement,"left") == 0) + g_scb_on_left=True; + else if (strcasecmp(scb_placement,"right") == 0) + g_scb_on_left=False; + */ + + /* + (void) fprintf(stderr,"scrollbar color=%s\n",g_scb_bgcolor); + */ + + /* + (void) fprintf(stderr,"scrollbar on left=%s\n",scb_placement); + (void) fprintf(stderr,"scollbar left=%d\n",g_scb_on_left); + XtFree(scb_placement); + */ + + } + #endif /* MOTIF */ Only in .: motif.patch diff -c ./ptyx.h ../new/ptyx.h *** ./ptyx.h Thu Nov 17 01:05:01 1994 --- ../new/ptyx.h Sun Aug 3 22:46:49 1997 *************** *** 597,602 **** --- 597,603 ---- #define CursorX(screen,col) ((col) * FontWidth(screen) + screen->border \ + screen->scrollbar) + #define CursorY(screen,row) ((((row) - screen->topline) * FontHeight(screen)) \ + screen->border) Only in .: resize diff -c ./screen.c ../new/screen.c *** ./screen.c Thu Nov 17 01:08:37 1994 --- ../new/screen.c Sun Aug 3 22:46:49 1997 *************** *** 678,687 **** } 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; ResizeSelection (screen, rows, cols); --- 678,701 ---- } else if(FullHeight(screen) == height && FullWidth(screen) == width) return(0); /* nothing has changed at all */ ! #ifdef MOITF ! if (g_scb_on_left == False) /* scrollbar on right */ ! { ! if(screen->scrollWidget) ! ResizeScrollBar(screen->scrollWidget, width - ! screen->scrollWidget->core.width - ! screen->scrollWidget->core.border_width, 0, height -1); ! } ! else ! { ! if(screen->scrollWidget) ! ResizeScrollBar(screen->scrollWidget, -1, -1, height); ! } ! #else if(screen->scrollWidget) ResizeScrollBar(screen->scrollWidget, -1, -1, height); ! #endif /* MOTIF */ ! screen->fullVwin.fullheight = height; screen->fullVwin.fullwidth = width; ResizeSelection (screen, rows, cols); diff -c ./scrollbar.c ../new/scrollbar.c *** ./scrollbar.c Wed Nov 2 23:46:57 1994 --- ../new/scrollbar.c Sun Aug 3 22:46:49 1997 *************** *** 1,5 **** /* ! * $XConsortium: scrollbar.c,v 1.44 94/04/02 12:42:01 gildea Exp $ */ /* --- 1,5 ---- /* ! * $XConsortium: scrollbar.c,v 1.41 91/05/22 15:20:07 gildea Exp $ */ /* *************** *** 27,32 **** --- 27,36 ---- #include "ptyx.h" /* gets Xt headers, too */ + #ifdef MOTIF + #include /* for varargs*/ + #endif /* MOITF */ + #include #include #include *************** *** 34,40 **** --- 38,49 ---- #include #include + #ifdef MOTIF + #include + #include + #else #include + #endif /* MOTIF */ #include "data.h" #include "error.h" *************** *** 45,50 **** --- 54,73 ---- static void ScrollTextTo(); static void ScrollTextUpDownBy(); + #ifdef MOTIF + + #ifndef Mmin + #define Mmin(x,y) (((x) < (y)) ? (x) : (y)) + #endif + + static unsigned long MallocateNamedColor(Display *display,Colormap colormap, + char *name); + static void SetScrollbarColors(Widget vsbW, Widget hsbW); + static void MWarning(char *format,...); + + #endif /* MOTIF */ + + /* resize the text window for a terminal screen, modifying the * appropriate WM_SIZE_HINTS and taking advantage of bit gravity. *************** *** 170,177 **** --- 193,231 ---- XtermWidget xw; int x, y, height; { + Pixel + bg; /* scrollbar bg , muquit, 5/18/96 */ + + Widget scrollWidget; + #ifdef MOTIF + static Arg argList[] = { + {XmNx, (XtArgVal) 0}, + {XmNy, (XtArgVal) 0}, + {XmNheight, (XtArgVal) 0}, + /* motif widget doesn't have reverse video garbage */ + {XmNorientation, (XtArgVal) XmVERTICAL}, + {XmNborderWidth, (XtArgVal) 1}, + }; + + argList[0].value = (XtArgVal) x; + argList[1].value = (XtArgVal) y; + argList[2].value = (XtArgVal) height; + + scrollWidget = XtCreateWidget("scrollbar", xmScrollBarWidgetClass, + (Widget) xw, argList, XtNumber(argList)); + XtAddCallback (scrollWidget, XmNvalueChangedCallback, ScrollTextTo, 0); + XtAddCallback (scrollWidget, XmNdragCallback, ScrollTextTo, 0); + + /* + ** now set the scrollbar color. the color name is obtained from + ** the X resources file XTerm-ansi if specified or use the one from + ** fallback_resources + ** ma_muquit@fccc.edu, Aug-03-1997 + */ + SetScrollbarColors(scrollWidget,(Widget) NULL); + #else static Arg argList[] = { {XtNx, (XtArgVal) 0}, {XtNy, (XtArgVal) 0}, *************** *** 190,195 **** --- 244,251 ---- (Widget)xw, argList, XtNumber(argList)); XtAddCallback (scrollWidget, XtNscrollProc, ScrollTextUpDownBy, 0); XtAddCallback (scrollWidget, XtNjumpProc, ScrollTextTo, 0); + #endif /* MOTIF */ + return (scrollWidget); } *************** *** 197,209 **** Widget sbw; TScreen *screen; { ! XtRealizeWidget (sbw); } ScrollBarReverseVideo(scrollWidget) register Widget scrollWidget; { Arg args[4]; int nargs = XtNumber(args); unsigned long bg, fg, bdr; --- 253,277 ---- Widget sbw; TScreen *screen; { ! #ifdef MOTIF ! Cursor arrowCursor; ! ! XtRealizeWidget (sbw); ! ! /* define pointer cursor for it */ ! arrowCursor = XCreateFontCursor(XtDisplay(sbw), XC_left_ptr); ! XDefineCursor(XtDisplay(sbw), XtWindow(sbw), arrowCursor); ! XFreeCursor(XtDisplay(sbw), arrowCursor); ! #else ! XtRealizeWidget (sbw); ! #endif /* MOTIF */ } ScrollBarReverseVideo(scrollWidget) register Widget scrollWidget; { + #ifndef MOTIF Arg args[4]; int nargs = XtNumber(args); unsigned long bg, fg, bdr; *************** *** 223,228 **** --- 291,297 ---- nargs--; /* don't set border pixel */ } XtSetValues (scrollWidget, args, nargs); + #endif /* MOTIF */ } *************** *** 236,246 **** thumbTop = screen->topline + screen->savedlines; thumbHeight = screen->max_row + 1; totalHeight = thumbHeight + screen->savedlines; ! XawScrollbarSetThumb(scrollWidget, ((float)thumbTop) / totalHeight, ((float)thumbHeight) / totalHeight); ! } ResizeScrollBar(scrollWidget, x, y, height) --- 305,330 ---- thumbTop = screen->topline + screen->savedlines; thumbHeight = screen->max_row + 1; totalHeight = thumbHeight + screen->savedlines; ! #ifdef MOTIF ! { ! /* muquit */ ! /* ! register Arg wargs[4]; ! */ ! ! Arg wargs[4]; ! register int n = 0; ! XtSetArg(wargs[n], XmNmaximum, totalHeight); n++; ! XtSetArg(wargs[n], XmNsliderSize, thumbHeight); n++; ! XtSetArg(wargs[n], XmNvalue, thumbTop); n++; ! XtSetArg(wargs[n], XmNpageIncrement, thumbHeight); n++; ! XtSetValues(scrollWidget, wargs, n); ! } ! #else XawScrollbarSetThumb(scrollWidget, ((float)thumbTop) / totalHeight, ((float)thumbHeight) / totalHeight); ! #endif /* MOTIF */ } ResizeScrollBar(scrollWidget, x, y, height) *************** *** 250,255 **** --- 334,340 ---- { XtConfigureWidget(scrollWidget, x, y, scrollWidget->core.width, height, scrollWidget->core.border_width); + ScrollBarDrawThumb(scrollWidget); } *************** *** 270,275 **** --- 355,362 ---- return; } + ScrollSelection(screen, i); + if(screen->cursor_state) HideCursor(); lines = i > 0 ? i : -i; *************** *** 285,293 **** x = screen->scrollbar + screen->border; scrolling_copy_area(screen, scrolltop, scrollheight, -i); screen->topline = top; - - ScrollSelection(screen, i); - XClearArea( screen->display, TextWindow(screen), --- 372,377 ---- *************** *** 337,359 **** if (doalloc && screen->allbuf) { if((screen->allbuf = (ScrnBuf) realloc((char *) screen->buf, ! (unsigned) ATTR_BYTES*(screen->max_row + 2 + screen->savelines) * sizeof(char *))) == NULL) Error (ERROR_SBRALLOC); ! screen->buf = &screen->allbuf[ATTR_BYTES * screen->savelines]; ! memmove( (char *)screen->buf, (char *)screen->allbuf, ! ATTR_BYTES * (screen->max_row + 2) * sizeof (char *)); ! for(i = ATTR_BYTES * screen->savelines - 1 ; i >= 0 ; i--) if((screen->allbuf[i] = calloc((unsigned) screen->max_col + 1, sizeof(char))) == NULL) Error (ERROR_SBRALLOC2); } - ResizeScrollBar (screen->scrollWidget, -1, -1, Height (screen) + border); RealizeScrollBar (screen->scrollWidget, screen); screen->scrollbar = screen->scrollWidget->core.width + screen->scrollWidget->core.border_width; --- 421,443 ---- if (doalloc && screen->allbuf) { if((screen->allbuf = (ScrnBuf) realloc((char *) screen->buf, ! (unsigned) 4*(screen->max_row + 2 + screen->savelines) * sizeof(char *))) == NULL) Error (ERROR_SBRALLOC); ! screen->buf = &screen->allbuf[4 * screen->savelines]; ! bcopy ((char *)screen->allbuf, (char *)screen->buf, ! 4 * (screen->max_row + 2) * sizeof (char *)); ! for(i = 4 * screen->savelines - 1 ; i >= 0 ; i--) if((screen->allbuf[i] = calloc((unsigned) screen->max_col + 1, sizeof(char))) == NULL) Error (ERROR_SBRALLOC2); } ResizeScrollBar (screen->scrollWidget, -1, -1, Height (screen) + border); + RealizeScrollBar (screen->scrollWidget, screen); screen->scrollbar = screen->scrollWidget->core.width + screen->scrollWidget->core.border_width; *************** *** 383,395 **** } } /*ARGSUSED*/ ! static void ScrollTextTo(scrollbarWidget, client_data, call_data) Widget scrollbarWidget; ! XtPointer client_data; ! XtPointer call_data; { - float *topPercent = (float *) call_data; register TScreen *screen = &term->screen; int thumbTop; /* relative to first saved line */ int newTopLine; --- 467,486 ---- } } + #ifdef MOTIF + /*ARGSUSED*/ + static void ScrollTextTo(scrollbarWidget, closure, call_data) + Widget scrollbarWidget; + caddr_t closure; + XmScrollBarCallbackStruct *call_data; + #else /*ARGSUSED*/ ! static void ScrollTextTo(scrollbarWidget, closure, topPercent) Widget scrollbarWidget; ! caddr_t closure; ! float *topPercent; ! #endif /* MOTIF */ { register TScreen *screen = &term->screen; int thumbTop; /* relative to first saved line */ int newTopLine; *************** *** 400,418 **** screen->topline : -Number of lines above the last screen->max_row+1 lines */ thumbTop = *topPercent * (screen->savedlines + screen->max_row+1); newTopLine = thumbTop - screen->savedlines; WindowScroll(screen, newTopLine); } /*ARGSUSED*/ ! static void ScrollTextUpDownBy(scrollbarWidget, client_data, call_data) Widget scrollbarWidget; ! XtPointer client_data; ! XtPointer call_data; { - int pixels = (int) call_data; - register TScreen *screen = &term->screen; register int rowOnScreen, newTopLine; --- 491,511 ---- screen->topline : -Number of lines above the last screen->max_row+1 lines */ + #ifdef MOTIF + thumbTop = call_data->value; + #else thumbTop = *topPercent * (screen->savedlines + screen->max_row+1); + #endif /* MOTIF */ newTopLine = thumbTop - screen->savedlines; WindowScroll(screen, newTopLine); } /*ARGSUSED*/ ! static void ScrollTextUpDownBy(scrollbarWidget, closure, pixels) Widget scrollbarWidget; ! Opaque closure; ! int pixels; { register TScreen *screen = &term->screen; register int rowOnScreen, newTopLine; *************** *** 499,506 **** XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; ! ScrollTextUpDownBy (gw, (XtPointer) NULL, ! (XtPointer)params_to_pixels (screen, params, (int) *nparams)); return; } --- 592,599 ---- XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; ! ScrollTextUpDownBy (gw, (Opaque) NULL, ! params_to_pixels (screen, params, (int) *nparams)); return; } *************** *** 515,521 **** XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; ! ScrollTextUpDownBy (gw, (XtPointer) NULL, ! (XtPointer)-params_to_pixels (screen, params, (int) *nparams)); return; } --- 608,1051 ---- XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; ! ScrollTextUpDownBy (gw, (Opaque) NULL, ! -params_to_pixels (screen, params, (int) *nparams)); return; } + + + #ifdef MOTIF + + static int MbestPixel(Display *display, Colormap colormap, XColor *colors, + unsigned int number_colors,XColor *color); + + /* + * MallocateColor() - Allocates color and returns Pixel Value + * + * RCS: + * $Revision$ + * $Date$ + * + * Security: + * Unclassified + * + * Description: + * This function allocates color and returns the pixel index of the + * colormap. If the requested color is not available, it will try + * to determine the closest possible color. + * + * Input Parameters: + * type identifier description + * + * Display *display + * Colormap colormap + * int R, G, B + * + * Output Parameters: + * type identifier description + * + * text + * + * Return Values: + * value description + * + * returns the pixel value + * + * Side Effects: + * text + * + * Limitations and Comments: + * text + * + * Development History: + * when who why + * 11/2/93 mm first_cut + * 06/1/94 mm returns the best pixel if colormap is full + */ + unsigned long MallocateColor(Display *display, Colormap colormap, + int R,int G, int B) + { + XColor + color; + + int + status; + int + screen; + + int + rc; + + rc=300; + screen=XDefaultScreen(display); + /* + ** detemine the intensities from the R, G, abd B values + */ + + color.red = R<<8; + color.green = G<<8; + color.blue = B<<8; + color.flags = DoRed | DoGreen | DoBlue; + + status = XAllocColor (display, colormap, &color); + + if (status == 0) + { + /* + ** Colormap is FULL, Now find the closest possible color + */ + + rc=MbestPixel (display, colormap, (XColor *) NULL, + (unsigned int) Mmin(DisplayCells(display,screen),256), + &color); + } + + if (rc == 300) + return (color.pixel); + else + { + return (BlackPixel(display,screen)); + } + } + + + /* + * MbestPixel() - Returns the best pixel + * + * RCS: + * $Revision$ + * $Date$ + * + * Security: + * Unclassified + * + * Description: + * This function returns the closes possible color rquested. + * It simply determines the closest point in the RGB space of the + * requested R, G, B values. + * + * Adapted from Imagemagick 3.0.0 + * + * Input Parameters: + * type identifier description + * + * Display *display; + * Colormap colormap; + * XColor *colors; + * unsigned int number_colors; + * XColor *color; + * + * Output Parameters: + * type identifier description + * + * XColor *color; + * + * Return Values: + * value description + * 300 on success + * 301 on failure + * + * Side Effects: + * text + * + * Limitations and Comments: + * text + * + * Development History: + * when who why + * 6/3/94 mm ???? + */ + static int MbestPixel(Display *display, Colormap colormap, XColor *colors, + unsigned int number_colors,XColor *color) + { + int + ii, + m_colors; + + register int + blue_distance, + green_distance, + i, + red_distance; + + unsigned long + distance, + min_distance; + + m_colors = colors == (XColor *) NULL; + + if (m_colors) + { + colors = (XColor *) malloc(number_colors*sizeof(XColor)); + if (colors == (XColor *) NULL) + { + MWarning ("Unable to get X Server Color,Memory allocation failed"); + return (301); + } + + for (i=0; i < number_colors; i++) + { + colors[i].pixel = (unsigned long) i; + } + + if (number_colors > 256) + { + number_colors = 256; + } + + XQueryColors(display,colormap,colors,number_colors); + } + + color->pixel=0; + min_distance=(unsigned long) (~0); /* just a big number */ + ii=0; + + for (i=0; i < number_colors; i++) + { + red_distance=(int) (colors[i].red >> 8)-(int) (color->red >> 8); + green_distance=(int) (colors[i].green >> 8)-(int) (color->green >> 8); + blue_distance=(int) (colors[i].blue >> 8)-(int) (color->blue >> 8); + + /* + ** distance is distance, the co-ordinates values do not make any + ** diffetence, i.e., negative co-ordinate value will give the same + ** distance, because the points are squired. We do not care about + ** taking square root of the distance, because, we just need to find + ** the point closest to the requested point. distance is not important + */ + + distance=red_distance*red_distance+green_distance*green_distance+ + blue_distance*blue_distance; + + if (distance < min_distance) + { + min_distance=distance; + color->pixel=colors[i].pixel; + ii=i; + } + } + + /* + ** this is the closest pixel. So, share it, allocate as Read only + */ + + (void) XAllocColor(display,colormap,&colors[ii]); + if (m_colors) + { + (void) free((char *) colors); + } + + return (300); + } + + + /* + * MallocateNamedColor - allocates color from it's name + * + * RCS: + * $Revision$ + * $Date$ + * + * Security: + * Unclassified + * + * Description: + * text + * + * Input Parameters: + * type identifier description + * + * text + * + * Output Parameters: + * type identifier description + * + * text + * + * Return Values: + * value description + * pixel value if succeeds + * 257 if failes + * + * Side Effects: + * text + * + * Limitations and Comments: + * text + * + * Development History: + * when who why + * 9/23/93 mm first cut + * 6/8/94 mm returns best pixel if colormap is full + */ + + static unsigned long MallocateNamedColor(Display *display,Colormap colormap, + char *name) + { + XColor + def; + int + status; + + int + screen=XDefaultScreen(display); + if (XParseColor (display,colormap,name,&def )) + { + status = XAllocColor (display,colormap,&def); + if (status == 0) + { + /* + ** colormap is full, so find the closest color + */ + + (void) MbestPixel (display, colormap, (XColor *) NULL, + (unsigned int) Mmin(DisplayCells(display,screen),256), + &def); + } + } + else + { + MWarning("Could not Parse Color: %s", name); + return(257); + } + + return(def.pixel); + } + + /* writes a warning message to stderr */ + static void MWarning(char *format,...) + { + va_list + args; + + va_start(args,format); + + (void) fprintf(stderr,"Warning: "); + (void) vfprintf(stderr,format,args); + (void) fprintf(stderr,"\n"); + } + + /* + * SetScrollbarColors() - set scrollbar colors + * + * RCS: + * $Revision: 1.1 $ + * $Date: 1995/05/07 19:34:10 $ + * + * Security: + * Unclassified + * + * Description: + * This function determines the best color for the vertical scrollbar + * based on the color which will be it's background color. + * We have to do this way, because we did not create the scrollbar, we + * got it from scrolled window + * + * Input Parameters: + * type identifier description + * + * text + * + * Output Parameters: + * type identifier description + * + * text + * + * Return Values: + * value description + * + * None + * + * Side Effects: + * text + * + * Limitations and Comments: + * passed backgroung color is already allocated in the called routine + * + * Development History: + * when who why + * 08/22/94 muquit first cut + */ + + static void SetScrollbarColors(Widget vsbW, Widget hsbW) + { + Colormap + colormap; + + Pixel + scb_bg, + scb_topshadow, + scb_bottomshadow, + scb_select, + scb_border; + + extern char + *g_scb_bgcolor; + + /* + ** get the colormap + */ + + + XtVaGetValues (vsbW, + XmNcolormap, &colormap, + NULL); + + scb_bg=(Pixel)MallocateNamedColor(XtDisplay(vsbW),colormap,g_scb_bgcolor); + /* + ** let motif calculate the new colors based on the bg color + */ + + if (vsbW != (Widget ) NULL) + { + XtVaSetValues (vsbW, + XmNbackground,scb_bg, + NULL); + } + + if (hsbW != (Widget) NULL) + { + XtVaSetValues(hsbW, + XmNbackground,scb_bg, + NULL); + } + + + XmGetColors (XtScreen(vsbW), + colormap, scb_bg, + &scb_border, + &scb_topshadow, + &scb_bottomshadow, + &scb_select); /* trough color, selec_color will be for toggle b*/ + + /* + ** set the colors + */ + + if (vsbW != (Widget) NULL) + { + XtVaSetValues (vsbW, + XmNbackground, scb_bg, + XmNtopShadowColor, scb_topshadow, + XmNbottomShadowColor, scb_bottomshadow, + XmNtroughColor, scb_select, + XmNarmColor, scb_select, + XmNborderColor, scb_border, + NULL); + } + + + if (hsbW != (Widget) NULL) + { + XtVaSetValues (hsbW, + XmNbackground, scb_bg, + XmNtopShadowColor, scb_topshadow, + XmNbottomShadowColor, scb_bottomshadow, + XmNtroughColor, scb_select, + XmNarmColor, scb_select, + XmNborderColor, scb_border, + NULL); + } + } + #endif /* MOTIF */ + Common subdirectories: ./tektests and ../new/tektests