CCF_100/ncsa-mosaic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CCF_100:8532c448622d6fd623f2e6c5ceebf092c323ec49
Branches Tags
CCF_100:master
..
compare: CCF_100:8baf5f2e62fa318abc960b2241b6c251dc16d6ad
Branches Tags
CCF_100:master

No commits in common. "8532c448622d6fd623f2e6c5ceebf092c323ec49" and "8baf5f2e62fa318abc960b2241b6c251dc16d6ad" have entirely different histories.
8532c44862 ... 8baf5f2e62

78 changed files with 462 additions and 3373 deletions
Show Stats Expand all files Collapse all files

159
Makefile
View File

@ -13,16 +13,23 @@ help: dev_
dev_::
@echo "You must specify one of the following or set the environment variable"
@echo "[DEV_ARCH] to one of the following:"
@echo " freebsd -- x86 running freebsd DYNAMIC"
@echo " freebsd-static -- x86 running freebsd ALL STATIC"
@echo " freebsd-static-motif -- x86 running freebsd STATIC MOTIF"
@echo " netbsd -- x86 running netbsd DYNAMIC"
@echo " netbsd-static -- x86 running netbsd ALL STATIC"
@echo " netbsd-static-motif -- x86 running netbsd STATIC MOTIF"
@echo " alpha -- DEC Alpha AXP running OSF/1"
@echo " bsdi -- x86 running BSDI BSD/OS 2.1"
@echo " dec -- DEC 2100 running Ultrix 4.3"
@echo " hp -- HP 9000/735 running HP-UX A.09.01"
@echo " ibm -- IBM RS6000 running AIX 4.4 BSD"
@echo " indy -- SGI Indy running IRIX 5.3"
@echo " linux -- x86 running Linux 1.2.13 DYNAMIC"
@echo " linux-static -- x86 running Linux 1.2.13 ALL STATIC"
@echo " linux-static-motif -- x86 running Linux 1.2.13 STATIC MOTIF"
@echo " unicos -- Cray PVP running UNICOS (tested with 10.0 and MOTIF)"
@echo " sco -- x86 running SCO System V 3.2"
@echo " sgi -- SGI Iris running IRIS 4.0.2"
@echo " solaris-23 -- SPARCstation 20 running Solaris 2.3"
@echo " solaris-24 -- SPARCstation 20 running Solaris 2.4"
@echo " solaris-24-x86 -- x86 running Solaris 2.4 for x86"
@echo " sun -- SPARCserver 690MP running SunOS 4.1.3"
@echo " sun-lresolv -- SPARCserver 690MP running SunOS 4.1.3"
@echo " "
@echo "To make a Purify or Quantify version of Mosaic, put a 'p_' or"
@echo " 'q_' in front of the platform."
@ -41,53 +48,53 @@ rm_and_touch:
@rm -f config.h
@touch config.h
dev_freebsd: rm_and_touch freebsd
freebsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd DEV_ARCH=freebsd
p_freebsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd purifyd DEV_ARCH=freebsd
q_freebsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd quantifyd DEV_ARCH=freebsd
dev_alpha: rm_and_touch alpha
alpha: rm_and_touch
$(MAKE) -f makefiles/Makefile.alpha DEV_ARCH=alpha
p_alpha: rm_and_touch
$(MAKE) -f makefiles/Makefile.alpha purifyd DEV_ARCH=alpha
q_alpha: rm_and_touch
$(MAKE) -f makefiles/Makefile.alpha quantifyd DEV_ARCH=alpha
dev_freebsd_static: rm_and_touch freebsd_static
freebsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd staticd DEV_ARCH=freebsd
p_freebsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd p_staticd DEV_ARCH=freebsd
q_freebsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd q_staticd DEV_ARCH=freebsd
dev_bsdi: rm_and_touch bsdi
bsdi: rm_and_touch
$(MAKE) -f makefiles/Makefile.bsdi DEV_ARCH=bsdi
p_bsdi: rm_and_touch
$(MAKE) -f makefiles/Makefile.bsdi purifyd DEV_ARCH=bsdi
q_bsdi: rm_and_touch
$(MAKE) -f makefiles/Makefile.bsdi quantifyd DEV_ARCH=bsdi
dev_freebsd_static_motif: rm_and_touch freebsd_static_motif
freebsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd static_motifd DEV_ARCH=freebsd
p_freebsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd p_static_motifd DEV_ARCH=freebsd
q_freebsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.freebsd q_static_motifd DEV_ARCH=freebsd
dev_dec: rm_and_touch dec
dec: rm_and_touch
$(MAKE) -f makefiles/Makefile.dec DEV_ARCH=dec
p_dec: rm_and_touch
$(MAKE) -f makefiles/Makefile.dec purifyd DEV_ARCH=dec
q_dec: rm_and_touch
$(MAKE) -f makefiles/Makefile.dec quantifyd DEV_ARCH=dec
dev_netbsd: rm_and_touch netbsd
netbsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd DEV_ARCH=netbsd
p_netbsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd purifyd DEV_ARCH=netbsd
q_netbsd: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd quantifyd DEV_ARCH=netbsd
dev_hp: rm_and_touch hp
hp: rm_and_touch
$(MAKE) -f makefiles/Makefile.hp DEV_ARCH=hp
p_hp: rm_and_touch
$(MAKE) -f makefiles/Makefile.hp purifyd DEV_ARCH=hp
q_hp: rm_and_touch
$(MAKE) -f makefiles/Makefile.hp quantifyd DEV_ARCH=hp
dev_netbsd_static: rm_and_touch netbsd_static
netbsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd staticd DEV_ARCH=netbsd
p_netbsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd p_staticd DEV_ARCH=netbsd
q_netbsd_static: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd q_staticd DEV_ARCH=netbsd
dev_ibm: rm_and_touch ibm
ibm: rm_and_touch
$(MAKE) -f makefiles/Makefile.ibm DEV_ARCH=ibm
p_ibm: rm_and_touch
$(MAKE) -f makefiles/Makefile.ibm purifyd DEV_ARCH=ibm
q_ibm: rm_and_touch
$(MAKE) -f makefiles/Makefile.ibm quantifyd DEV_ARCH=ibm
dev_netbsd_static_motif: rm_and_touch netbsd_static_motif
netbsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd static_motifd DEV_ARCH=netbsd
p_netbsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd p_static_motifd DEV_ARCH=netbsd
q_netbsd_static_motif: rm_and_touch
$(MAKE) -f makefiles/Makefile.netbsd q_static_motifd DEV_ARCH=netbsd
dev_indy: rm_and_touch indy
indy: rm_and_touch
$(MAKE) -f makefiles/Makefile.indy DEV_ARCH=indy
p_indy: rm_and_touch
$(MAKE) -f makefiles/Makefile.indy purifyd DEV_ARCH=indy
q_indy: rm_and_touch
$(MAKE) -f makefiles/Makefile.indy quantifyd DEV_ARCH=indy
dev_linux: rm_and_touch linux
linux: rm_and_touch
@ -121,6 +128,62 @@ p_unicos: rm_and_touch
q_unicos: rm_and_touch
$(MAKE) -f makefiles/Makefile.unicos q_static_motifd DEV_ARCH=unicos
dev_sco: rm_and_touch sco
sco: rm_and_touch
$(MAKE) -f makefiles/Makefile.sco DEV_ARCH=sco
p_sco: rm_and_touch
$(MAKE) -f makefiles/Makefile.sco purifyd DEV_ARCH=sco
q_sco: rm_and_touch
$(MAKE) -f makefiles/Makefile.sco quantifyd DEV_ARCH=sco
dev_sgi: rm_and_touch sgi
sgi: rm_and_touch
$(MAKE) -f makefiles/Makefile.sgi DEV_ARCH=sgi
p_sgi: rm_and_touch
$(MAKE) -f makefiles/Makefile.sgi purifyd DEV_ARCH=sgi
q_sgi: rm_and_touch
$(MAKE) -f makefiles/Makefile.sgi quantifyd DEV_ARCH=sgi
dev_solaris-23: rm_and_touch solaris-23
solaris-23: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-23 DEV_ARCH=solaris-23
p_solaris-23: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-23 purifyd DEV_ARCH=solaris-23
q_solaris-23: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-23 quantifyd DEV_ARCH=solaris-23
dev_solaris-24: rm_and_touch solaris-24
solaris-24: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24 DEV_ARCH=solaris-24
p_solaris-24: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24 purifyd DEV_ARCH=solaris-24
q_solaris-24: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24 quantifyd DEV_ARCH=solaris-24
dev_solaris-24-x86: rm_and_touch solaris-24-x86
solaris-24-x86: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24-x86 DEV_ARCH=solaris-24-x86
p_solaris-24-x86: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24-x86 purifyd DEV_ARCH=solaris-24-x86
q_solaris-24-x86: rm_and_touch
$(MAKE) -f makefiles/Makefile.solaris-24-x86 quantifyd DEV_ARCH=solaris-24-x86
dev_sun: rm_and_touch sun
sun: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun DEV_ARCH=sun
p_sun: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun purifyd DEV_ARCH=sun
q_sun: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun quantifyd DEV_ARCH=sun
dev_sun-lresolv: rm_and_touch sun-lresolv
sun-lresolv: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun-lresolv DEV_ARCH=sun-lresolv
p_sun-lresolv: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun-lresolv purifyd DEV_ARCH=sun-lresolv
q_sun-lresolv: rm_and_touch
$(MAKE) -f makefiles/Makefile.sun-lresolv quantifyd DEV_ARCH=sun-lresolv
clean:
cd libXmx; $(MAKE) clean
cd libdtm; $(MAKE) clean

10
Mosaic.ad
View File

@ -1,10 +0,0 @@
!Mosaic*rendertable.fontType: FONT_IS_FONT
!Mosaic*rendertable.fontName: AS_IS
!Mosaic*rendertable.underlineType: NO_LINE
! Two very readable fonts with accented characters
!Mosaic*Font: -bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-iso10646-1
! Mosaic*Font: -b&h-lucidatypewriter-medium-r-normal-sans-17-120-100-100-m-100-iso10646-1
! Better font to display Greek or Cyrillic but small (12 points)
!Mosaic*Font: -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1
!
Mosaic*Font: -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1

BIN
libXmx/Xmx.o
View File

Binary file not shown.

BIN
libXmx/Xmx2.o
View File

Binary file not shown.

BIN
libXmx/libXmx.a
View File

Binary file not shown.

BIN
libhtmlw/DrawingArea.o
View File

Binary file not shown.

BIN
libhtmlw/HTML-PSformat.o
View File

Binary file not shown.

2
libhtmlw/HTML.c
View File

@ -499,7 +499,7 @@ static XtResource resources[] =
{ WbNtoolbarFont,
WbCToolbarFont, XtRFontStruct, sizeof (XFontStruct *),
XtOffset (HTMLWidget, html.toolbar_font),
XtRString, "-adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1"
XtRString, "-adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1"
},
{ WbNfixedFont,

6
libhtmlw/HTML.h
View File

@ -440,8 +440,6 @@ struct delay_rec {
#define M_MAP 58 /* swp - client side ismap */
#define M_AREA 59 /* swp - client side ismap */
#define M_CENTER 60
#define M_SCRIPT 61
#define M_STYLE 62
/* syntax of Mark types */
#define MT_TITLE "title"
@ -504,10 +502,6 @@ struct delay_rec {
#define MT_AREA "area" /* swp - client side ismap */
#define MT_CENTER "center"
/* tags from THE FUTURE! we will ignore their contents. */
#define MT_SCRIPT "script"
#define MT_STYLE "style"
/* anchor tags */
#define AT_NAME "name"
#define AT_HREF "href"

BIN
libhtmlw/HTML.o
View File

Binary file not shown.

2350
libhtmlw/HTMLamp.h
View File

File diff suppressed because it is too large Load Diff

58
libhtmlw/HTMLformat.c
View File

@ -3504,7 +3504,7 @@ int *x, *y;
* Let OPTION through so we can hit the OPTIONs.
* Let TEXTAREA through so we can hit the TEXTAREAs.
*/
if ((Ignore)&&(!InDocHead)&&(type != M_TITLE)&&(type != M_NONE)&&(type != M_COMMENT)&&
if ((Ignore)&&(!InDocHead)&&(type != M_TITLE)&&(type != M_NONE)&&
(type != M_SELECT)&&(type != M_OPTION)&&
(type != M_TEXTAREA)&&(type != M_DOC_HEAD))
{
@ -4831,9 +4831,6 @@ int *x, *y;
TablePlace(hw, mptr, x, y, Width);
}
break;
case M_COMMENT:
Ignore = !mark->is_end;
break;
default:
break;
}
@ -5253,9 +5250,7 @@ PartialRefresh(hw, eptr, start_pos, end_pos, fg, bg)
int partial, descent;
unsigned long valuemask;
XGCValues values;
XmString ttd;
XmFontList tftd;
XSetFont(XtDisplay(hw), hw->html.drawGC, eptr->font->fid);
ascent = eptr->font->max_bounds.ascent;
width = -1;
@ -5378,24 +5373,13 @@ PartialRefresh(hw, eptr, start_pos, end_pos, fg, bg)
XSetForeground(XtDisplay(hw), hw->html.drawGC, fg);
XSetBackground(XtDisplay(hw), hw->html.drawGC, bg);
tftd=XmFontListCreate(eptr->font,XmSTRING_DEFAULT_CHARSET);
ttd=XmStringCreateLocalized(tdata);
XmStringDraw(XtDisplay(hw),
XtWindow(hw->html.view),
tftd,
ttd,
hw->html.drawGC,
x,
y,
XmStringWidth(tftd,ttd),
XmALIGNMENT_BEGINNING,
XmSTRING_DIRECTION_L_TO_R,
NULL);
XmStringFree(ttd);
XmFontListFree(tftd);
XDrawString(XtDisplay(hw),
XtWindow(hw->html.view),
hw->html.drawGC,
x,
y + ascent,
(char *)tdata,
tlen);
}
else {
XSetForeground(XtDisplay(hw), hw->html.drawGC, bg);
@ -5425,24 +5409,14 @@ PartialRefresh(hw, eptr, start_pos, end_pos, fg, bg)
(y<0 ?
(ascent+eptr->font->descent+y) :
(ascent+eptr->font->descent)));
tftd=XmFontListCreate(eptr->font,XmSTRING_DEFAULT_CHARSET);
ttd=XmStringCreateLocalized(tdata);
XmStringDraw(XtDisplay(hw),
XtWindow(hw->html.view),
tftd,
ttd,
hw->html.drawGC,
x,
y,
XmStringWidth(tftd,ttd),
XmALIGNMENT_BEGINNING,
XmSTRING_DIRECTION_L_TO_R,
NULL);
XmStringFree(ttd);
XmFontListFree(tftd);
XDrawString(XtDisplay(hw),
XtWindow(hw->html.view),
hw->html.drawGC,
x,
y + ascent,
(char *)tdata,
tlen);
}

BIN
libhtmlw/HTMLformat.o
View File

Binary file not shown.

BIN
libhtmlw/HTMLimages.o
View File

Binary file not shown.

BIN
libhtmlw/HTMLjot.o
View File

Binary file not shown.

BIN
libhtmlw/HTMLlists.o
View File

Binary file not shown.

107
libhtmlw/HTMLparse.c
View File

@ -111,45 +111,7 @@ unsigned char map_table[256]={
#define TOLOWER(x) (map_table[x])
#endif /* NOT_ASCII */
/* Converts an UCS code < 65536 into a UTF-8 string. Returns the string length */
int ucs2utf8(unsigned int ucs,char code[4])
{
unsigned int x,y,z;
if (ucs<128)
{
code[0]=(char)ucs;
code[1]='\0';
return(1);
}
else if (ucs<2048)
{
x=ucs/64;
y=ucs-64*x;
code[0]=(char)(192+x);
code[1]=(char)(128+y);
code[2]='\0';
return(2);
}
else if (ucs<65536)
{
x=ucs/4096;
y=(ucs-4096*x)/64;
z=ucs-4096*x-64*y;
code[0]=(char)(224+x);
code[1]=(char)(128+y);
code[2]=(char)(128+z);
code[3]='\0';
return(3);
}
else
{
/* Not implemented yet */
code[0]='\0';
return(0);
}
}
/*
* Check if two strings are equal, ignoring case.
* The strings must be of the same length to be equal.
@ -309,8 +271,8 @@ clean_white_space(txt)
/*
* parse an amperstand escape, and return the length of the UTF-8 sequence encoding the character, or
* 0 on error. val contains the UTF-8 sequence.
* parse an amperstand escape, and return the appropriate character, or
* '\0' on error.
* we should really only use caseless_equal_prefix for unterminated, and use
* caseless_equal otherwise, but since there are so many escapes, and I
* don't want to type everything twice, I always use caseless_equal_prefix
@ -320,16 +282,14 @@ clean_white_space(txt)
* 1: unterminated
* 2: terminated with whitespace
*/
int
ExpandEscapes(esc, endp, termination,val)
char
ExpandEscapes(esc, endp, termination)
char *esc;
char **endp;
int termination;
char val[4];
{
int cnt;
unsigned int ucs,lng=0;
int jj;
char val;
int unterminated;
unterminated = (termination & 0x01);
@ -349,26 +309,14 @@ int
}
tchar = *tptr;
*tptr = '\0';
ucs = atoi((esc + 1));
lng=ucs2utf8(ucs, val);
#ifndef DISABLE_TRACE
if (htmlwTrace) {
fprintf(stderr,"&#%ud character: %s\n",ucs,val);
}
#endif
val = (char)atoi((esc + 1));
*tptr = tchar;
*endp = tptr;
}
else
{
ucs=atoi((esc + 1));
lng=ucs2utf8(ucs, val);
val = (char)atoi((esc + 1));
*endp = (char *)(esc + strlen(esc));
#ifndef DISABLE_TRACE
if (htmlwTrace) {
fprintf(stderr,"&#%ud character: %s\n",ucs,val);
}
#endif
}
}
else
@ -381,13 +329,7 @@ int
ampLen = strlen(AmpEscapes[cnt].tag);
if ((escLen == ampLen) && (strncmp(esc, AmpEscapes[cnt].tag, ampLen) == 0))
{
ucs = AmpEscapes[cnt].value;
lng=ucs2utf8(ucs, val);
#ifndef DISABLE_TRACE
if (htmlwTrace) {
fprintf(stderr,"&%s; character:%s\n",esc,val);
}
#endif
val = AmpEscapes[cnt].value;
*endp = (char *)(esc +
strlen(AmpEscapes[cnt].tag));
break;
@ -401,13 +343,12 @@ int
fprintf(stderr, "Error bad & string\n");
}
#endif
val[0] = '\0';
lng=0;
val = '\0';
*endp = (char *)NULL;
}
}
return(lng);
return(val);
}
@ -434,9 +375,7 @@ clean_text(txt)
char *text;
char *tend;
char tchar;
char val[4];
int lng;
int jj;
char val;
if (txt == NULL)
{
@ -521,9 +460,9 @@ clean_text(txt)
/*
* Replace escape sequence with appropriate character
*/
lng = ExpandEscapes(text, &tend,
((space_terminated << 1) + unterminated), val);
if (lng>0)
val = ExpandEscapes(text, &tend,
((space_terminated << 1) + unterminated));
if (val != '\0')
{
if (unterminated)
{
@ -536,11 +475,7 @@ clean_text(txt)
{
ptr--;
}
for (jj=0; jj<=lng-1; jj++)
{
*ptr2 = val[jj];
ptr2++;
}
*ptr2 = val;
unterminated = 0;
space_terminated = 0;
}
@ -563,7 +498,7 @@ clean_text(txt)
* Copy forward remaining text until you find the next
* escape sequence
*/
ptr2++;
ptr++;
while (*ptr != '\0')
{
@ -1472,14 +1407,6 @@ ParseMarkType(str)
{
type = M_CENTER;
}
else if (caseless_equal(str, MT_SCRIPT))
{
type = M_COMMENT;
}
else if (caseless_equal(str, MT_STYLE))
{
type = M_COMMENT;
}
else
{
#ifndef DISABLE_TRACE

BIN
libhtmlw/HTMLparse.o
View File

Binary file not shown.

20
libhtmlw/HTMLtable.c
View File

@ -1121,22 +1121,10 @@ int yy;
XSetBackground(XtDisplay(hw), hw->html.drawGC, eptr->bg);
XSetForeground(XtDisplay(hw), hw->html.drawGC, eptr->fg);
XSetFont(XtDisplay(hw), hw->html.drawGC, field->font->fid);
XmString ttd=XmStringCreateLocalized(field->formattedText[yy]);
XmFontList tftd=XmFontListCreate(field->font,XmSTRING_DEFAULT_CHARSET);
XmStringDraw(XtDisplay(hw),
XtWindow(hw->html.view),
tftd,
ttd,
hw->html.drawGC,
placeX,
placeY+baseLine,
XmStringWidth(tftd,ttd),
XmALIGNMENT_BEGINNING,
XmSTRING_DIRECTION_L_TO_R,
NULL);
XmStringFree(ttd);
XmFontListFree(tftd);
XDrawString(XtDisplay(hw), XtWindow(hw->html.view),
hw->html.drawGC, placeX, placeY+baseLine,
field->formattedText[yy],
strlen(field->formattedText[yy]));
placeY += lineHeight;
}

BIN
libhtmlw/HTMLtable.o
View File

Binary file not shown.

24
libhtmlw/HTMLwidgets.c
View File

@ -450,7 +450,7 @@ CollectSubmitInfo(fptr, name_list, value_list)
= wptr->name;
#ifdef MOTIF
XmStringGetLtoR(str_list[j],
XmFONTLIST_DEFAULT_TAG,
XmSTRING_DEFAULT_CHARSET,
&val);
#else
val = str_list[j];
@ -486,7 +486,7 @@ CollectSubmitInfo(fptr, name_list, value_list)
argcnt++;
XtGetValues(child, arg, argcnt);
val = NULL;
XmStringGetLtoR(label, XmFONTLIST_DEFAULT_TAG,
XmStringGetLtoR(label, XmSTRING_DEFAULT_CHARSET,
&val);
#else
XtVaGetValues(wptr->w, XtNlabel, &val, NULL);
@ -1337,7 +1337,7 @@ CBResetForm(w, client_data, call_data)
for (i=0; i<vlist_cnt; i++)
{
val_list[i] =
XmStringCreateLocalized(vlist[i]);
XmStringCreateSimple(vlist[i]);
}
#else
XawListUnhighlight(child);
@ -2237,7 +2237,7 @@ MakeWidget(hw, text, x, y, id, fptr)
tptr = ParseMarkTag(text, MT_INPUT, "CHECKED");
/* We want no text on our toggles */
label = XmStringCreateLocalized("");
label = XmStringCreateSimple("");
argcnt = 0;
XtSetArg(arg[argcnt], XmNlabelString, label); argcnt++;
@ -2304,7 +2304,7 @@ MakeWidget(hw, text, x, y, id, fptr)
}
/* We want no text on our toggles */
label = XmStringCreateLocalized("");
label = XmStringCreateSimple("");
argcnt = 0;
XtSetArg(arg[argcnt], XmNlabelString, label); argcnt++;
@ -2355,7 +2355,7 @@ MakeWidget(hw, text, x, y, id, fptr)
argcnt++;*/
if (value != NULL)
{
label = XmStringCreateLocalized(value);
label = XmStringCreateSimple(value);
XtSetArg(arg[argcnt], XmNlabelString, label);
argcnt++;
}
@ -2393,7 +2393,7 @@ MakeWidget(hw, text, x, y, id, fptr)
argcnt++;*/
if (value != NULL)
{
label = XmStringCreateLocalized(value);
label = XmStringCreateSimple(value);
XtSetArg(arg[argcnt], XmNlabelString, label);
argcnt++;
}
@ -2425,7 +2425,7 @@ MakeWidget(hw, text, x, y, id, fptr)
argcnt++; */
if (value != NULL)
{
label = XmStringCreateLocalized(value);
label = XmStringCreateSimple(value);
XtSetArg(arg[argcnt], XmNlabelString, label);
argcnt++;
}
@ -2645,7 +2645,7 @@ MakeWidget(hw, text, x, y, id, fptr)
char bname[30];
sprintf(bname, "Button%d", (i + 1));
label = XmStringCreateLocalized(list[i]);
label = XmStringCreateSimple(list[i]);
argcnt = 0;
XtSetArg(arg[argcnt], XmNlabelString,
label);
@ -2722,7 +2722,7 @@ MakeWidget(hw, text, x, y, id, fptr)
argcnt = 0;
xmstr = XmStringCreateLocalized ("");
xmstr = XmStringCreateSimple ("");
XtSetArg(arg[argcnt], XmNlabelString,
(XtArgVal)xmstr);
argcnt++;
@ -2763,12 +2763,12 @@ MakeWidget(hw, text, x, y, id, fptr)
for (i=0; i<list_cnt; i++)
{
string_list[i] =
XmStringCreateLocalized(list[i]);
XmStringCreateSimple(list[i]);
}
for (i=0; i<vlist_cnt; i++)
{
val_list[i] =
XmStringCreateLocalized(vlist[i]);
XmStringCreateSimple(vlist[i]);
}
FreeCommaList(list, list_cnt);

BIN
libhtmlw/HTMLwidgets.o
View File

Binary file not shown.

BIN
libhtmlw/libhtmlw.a
View File

Binary file not shown.

BIN
libhtmlw/list.o
View File

Binary file not shown.

BIN
libnut/libnut.a
View File

Binary file not shown.

BIN
libnut/objs/ellipsis.o
View File

Binary file not shown.

BIN
libnut/objs/mm.o
View File

Binary file not shown.

BIN
libnut/objs/str-tools.o
View File

Binary file not shown.

BIN
libnut/objs/system.o
View File

Binary file not shown.

BIN
libnut/objs/url-utils.o
View File

Binary file not shown.

BIN
libwww2/CUkerb.o
View File

Binary file not shown.

BIN
libwww2/HTAABrow.o
View File

Binary file not shown.

BIN
libwww2/HTAAUtil.o
View File

Binary file not shown.

BIN
libwww2/HTAccess.o
View File

Binary file not shown.

BIN
libwww2/HTAlert.o
View File

Binary file not shown.

BIN
libwww2/HTAnchor.o
View File

Binary file not shown.

BIN
libwww2/HTAssoc.o
View File

Binary file not shown.

BIN
libwww2/HTAtom.o
View File

Binary file not shown.

BIN
libwww2/HTChunk.o
View File

Binary file not shown.

BIN
libwww2/HTCompressed.o
View File

Binary file not shown.

BIN
libwww2/HTFTP.o
View File

Binary file not shown.

BIN
libwww2/HTFWriter.o
View File

Binary file not shown.

BIN
libwww2/HTFile.o
View File

Binary file not shown.

BIN
libwww2/HTFormat.o
View File

Binary file not shown.

BIN
libwww2/HTGopher.o
View File

Binary file not shown.

BIN
libwww2/HTIcon.o
View File

Binary file not shown.

BIN
libwww2/HTInit.o
View File

Binary file not shown.

BIN
libwww2/HTList.o
View File

Binary file not shown.

BIN
libwww2/HTMIME.o
View File

Binary file not shown.

BIN
libwww2/HTML.o
View File

Binary file not shown.

BIN
libwww2/HTMLDTD.o
View File

Binary file not shown.

BIN
libwww2/HTMLGen.o
View File

Binary file not shown.

BIN
libwww2/HTMailto.o
View File

Binary file not shown.

BIN
libwww2/HTMosaicHTML.o
View File

Binary file not shown.

BIN
libwww2/HTNews.o
View File

Binary file not shown.

BIN
libwww2/HTParse.o
View File

Binary file not shown.

BIN
libwww2/HTPlain.o
View File

Binary file not shown.

BIN
libwww2/HTSort.o
View File

Binary file not shown.

BIN
libwww2/HTString.o
View File

Binary file not shown.

BIN
libwww2/HTTCP.o
View File

Binary file not shown.

BIN
libwww2/HTTP.o
View File

Binary file not shown.

BIN
libwww2/HTTelnet.o
View File

Binary file not shown.

BIN
libwww2/HTUU.o
View File

Binary file not shown.

BIN
libwww2/HTWAIS.o
View File

Binary file not shown.

BIN
libwww2/HTWSRC.o
View File

Binary file not shown.

BIN
libwww2/HTWriter.o
View File

Binary file not shown.

BIN
libwww2/SGML.o
View File

Binary file not shown.

BIN
libwww2/libwww.a
View File

Binary file not shown.

4
libwww2/tcp.h
View File

@ -72,10 +72,6 @@ typedef struct sockaddr_in SockA; /* See netinet/in.h */
#define USE_DIRENT
#endif
#ifdef __FreeBSD__
#define USE_DIRENT
#endif
#ifdef _IBMR2
#define USE_DIRENT /* sys V style directory open */
#endif

353
makefiles/Makefile.freebsd
View File

@ -1,353 +0,0 @@
# Toplevel Makefile for NCSA Mosaic.
# You shouldn't need to touch any of the Makefiles in the various
# subdirectories if you configure this Makefile correctly.
# If you need to make serious changes to get Mosaic to compile on your
# platform, send context diffs to mosaic-x@ncsa.uiuc.edu.
# -------------------------- CUSTOMIZABLE OPTIONS ----------------------------
#prereleaseflags = -DPRERELEASE
prereleaseflags = -DPRERELEASE
#RANLIB = /bin/true
#### On non-SGI's, this should be ranlib.
RANLIB = ranlib
#CC = cc
#### On Sun's, this should be gcc (ANSI required).
CC = cc
#### Linker Flags
ldflags =
#### For a few files in the source, some compilers may need to be kicked
#### in K&R mode. E.g., on SGI's, -cckr does this.
#knrflag = -cckr
#### On most systems, no flag is needed.
knrflag =
#### Random system configuration flags.
#### --> *** For Motif 1.2 ON ANY PLATFORM, do -DMOTIF1_2 *** <--
#### For IBM AIX 3.2, do -D_BSD
#### For NeXT, do -DNEXT
#### For HP/UX, do -Aa -D_HPUX_SOURCE
#### For Dell SVR4, do -DSVR4
#### For Solaris, do -DSVR4
#### For Esix 4.0.4 and Solaris x86 2.1, do -DSVR4
#### For Convex whatever, do -DCONVEX
#### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
#### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
sysconfigflags = -DMOTIF1_2 -DLINUX
#### System libraries.
# syslibs = -lPW -lsun -lmalloc
#### For AIX 3.2
# syslibs = -lPW -lbsd
#### For most other Motif platforms:
# syslibs = -lPW
#### For Sun's and Ultrix and HP and BSD/386:
# syslibs =
#### For Sun's with no DNS:
# syslibs = -lresolv
#### For SCO ODT:
# syslibs = -lPW -lsocket -lmalloc
#### For Dell SVR4:
# syslibs = -lnsl -lsocket -lc -lucb
#### For Solaris (?)
# syslibs = -lnsl -lsocket -lgen
#### For Motorola SVR4:
# syslibs = -lnsl -lsocket -lgen
syslibs = -lc
#### X include file locations -- if your platform puts the X include
#### files in a strange place, set this variable appropriately. Else
#### don't worry about it.
#### HP X11R4 version:
# xinc = -I/usr/include/Motif1.1 -I/usr/include/X11R4
#### HP X11R5 version:
# xinc = -I/usr/include/Motif1.2 -I/usr/local/X11R5/include
#### NeXT version:
# xinc = -I/usr/include/X11
#### BSD/386
# xinc = -I/usr/X11/include
#xinc = -I/usr/X11R6/include
xinc = -I/usr/local/include
#### X library locations.
# xlibs = -lXm_s -lXmu -lXt_s -lX11_s
#### For Sun's (at least running stock X/Motif as installed on our machines):
# xlibs = /usr/lib/libXm.a /usr/lib/libXmu.a /usr/lib/libXt.a /usr/lib/libXext.a /usr/lib/libX11.a -lm #### For HP-UX 8.00:
# xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11
#### For HP-UX 9.01: The X11R5 libraries are here on our systems
# xlibs = -L/usr/lib/Motif1.2 -lXm -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lXmu -lXt -lX11
#### For NeXT:
# xlibs = -L/usr/lib/X11 -lXm -lXmu -lXt -lX11
#### For Dell SVR4:
# xlibs = -L/usr/X5/lib -lXm -lXmu -lXt -lXext -lX11
#### For Solaris (?)
# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
#### For SCO ODT 3.0 (I'm told that -lXtXm_s is *not* a typo :-):
# xlibs = -lXtXm_s -lXmu -lX11_s
#### For nearly everyone else:
# xlibs = -lXm -lXmu -lXt -lX11
#### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to
#### your X libs, or some may not be found by the loader. Check the
#### loader with "ldd Mosaic" after you build.
#xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
xlibs = -L/usr/local/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
static_motif_xlibs = -L/usr/X11R6/lib -lXext -lXpm /usr/X11R6/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
static_xlibs = /usr/X11R6/lib/libXpm.a /usr/X11R6/lib/libXm.a /usr/X11R6/lib/libXmu.a /usr/X11R6/lib/libXt.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a
#### For BSD/386:
# xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11
#### For Motorola SVR4:
# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
#### DTM AND HDF SUPPORT; READ CAREFULLY
#### If you want to compile with DTM and HDF support, you should leave
#### the following lines uncommented and make sure you have a copy of
#### HDF 3.3 (r1 or later) installed and ready. You can find HDF on
#### ftp.ncsa.uiuc.edu in /HDF.
#### If you do not want to compile with DTM and HDF support, comment
#### the following lines out. (If you are compiling from source for
#### the first time, you should probably not bother with HDF and DTM
#### support.)
#### dtmmachtype needs to be set to one of the following:
#### sun, sgi, dec, ibm, next, cray, convex
#### If your platform is not one of the above, then either do not compile
#### with HDF/DTM support or try hacking libdtm/makefile.
#dtmmachtype = sun
#dtmdirs = libdtm libnet
#dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a
#dtmflags = -DHAVE_DTM -I.. -I../libnet
#hdfdir = /hdf2/install/linux
#hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a
#hdfflags = -DHAVE_HDF -I$(hdfdir)/include
#### PNG SUPPORT
#### For inline PNG support, the following should be defined:
#### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
# SAM pngdir = /xdev/mosaic/libpng/linux
# SAM pnglibdir = $(pngdir)/lib
# SAM pngincludedir = $(pngdir)/include
# SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a
# SAM pngflags = -I$(pngincludedir) -DHAVE_PNG
pnglibs = -lpng -lz -lm
pngflags = -DHAVE_PNG
#### JPEG SUPPORT
#### For inline JPEG support, the following should be defined:
#### The library used is Independent JPEG Group (IJG's) 5.0a.
# SAM jpegdir = /xdev/mosaic/libjpeg/linux
# SAM jpeglibs = $(jpegdir)/lib/libjpeg.a
#SAM jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
jpeglibs = -ljpeg
jpegflags = -DHAVE_JPEG
#### KERBEROS SUPPORT
####
#### If you want Mosaic to support Kerberos authentication, set the
#### following flags appropriately. You can support Kerberos V4 and/or V5,
#### although it's most likely that your realm supports one or the other.
#### To enable DES-encryption of HTTP messages via Kerberos key exchange,
#### define the KRB-ENCRYPT flag.
##krb4dir = /usr/athena
#krb4dir = /xdev/mosaic/libkrb4/linux
#krb4libs = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a
#krb4flags = -DKRB4 -I$(krb4dir)/include
##krb5dir = /krb5
#krb5dir = /xdev/mosaic/libkrb5/linux
#krb5libs = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a
#krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5
#Do not comment out.
krbflags = $(krb4flags) $(krb5flags)
krblibs = $(krb4libs) $(krb5libs)
#### DIRECT WAIS SUPPORT
#### If you want to have Mosaic be able to communicate directly with
#### WAIS servers, do set the following flags appropriately. We
#### recommend linking with CNIDR's freeWAIS 0.5 distribution; other
#### WAIS distributions may work but we have not tested them with
#### Mosaic. freeWAIS 0.5 can currently (Sept.1995) be found at
#### ftp://sunsite.unc.edu/pub/wais/servers/freeWAIS
#### If you do not wish to link to the WAIS libraries, then comment
#### the following lines out. Mosaic will then communicate with WAIS
#### servers via a HTTP gateway.
#### -lm is required for freeWAIS 0.5, as ceil() is used.
#waisroot = /xdev/mosaic/freeWAIS/linux
#waisflags = -DDIRECT_WAIS -I$(waisroot)/include
#waislibdir = $(waisroot)/bin
#waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm
#### Customization flags:
#### . If you want Mosaic to come up with monochrome colors by default,
#### use -DMONO_DEFAULT
#### . If you want to define the default Mosaic home page, set
#### -DHOME_PAGE_DEFAULT=\\\"url\\\"
#### . If you want to define the default Mosaic documentation directory
#### (should be a URL), set -DDOCS_DIRECTORY_DEFAULT=\\\"url\\\"
#### . Other things you can define are spelled out in src/mosaic.h.
customflags =
########
########
#### NOTE! If you get errors because of the following line, it means
#### you are NOT using GNUs Make program. The following line is basically
#### for the developers at NCSA to customize the build process without
#### modifying the Makefiles, so you may comment it out without harm.
########
########
-include local-defines/$(DEV_ARCH)
# ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
# Disable certain warnings as we don't care for them
CWARNINGS = -Wall \
-Wno-parentheses \
-Wno-switch -Wno-switch-enum \
-Wno-char-subscripts \
-Wno-unused-result
CFLAGS = -fcommon -g $(sysconfigflags) $(prereleaseflags) $(CWARNINGS) $(customflags)
# Don't worry about these -- for development purposes only.
PURIFY = purify
QUANTIFY = quantify
default: $(dtmdirs) libwww2 libXmx libhtmlw libnut src
@echo \*\*\* Welcome to NCSA Mosaic.
purifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic.
quantifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic.
staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static
@echo \*\*\* Welcome to NCSA Mosaic linked static.
static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif
@echo \*\*\* Welcome to NCSA Mosaic linked static for motif.
p_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static.
p_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static for motif.
q_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static.
q_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static for motif.
libXmx::
@echo --- Building libXmx
cd libXmx; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(xinc)"
libhtmlw::
@echo --- Building libhtmlw
cd libhtmlw; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(xinc) -DMOTIF -DXMOSAIC"
libwww2::
@echo --- Building libwww2
cd libwww2; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(waisflags) $(krbflags) $(xinc)"
libnut::
@echo --- Building libnut
cd libnut; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag)"
src::
@echo --- Building src
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-purifyd::
@echo --- Building Purify'd src
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-quantifyd::
@echo --- Building Quantify'd src
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
src-static::
@echo --- Building src-static
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-static-motif::
@echo --- Building src-static-motif
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-static-purifyd::
@echo --- Building src-static-purifyd
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-static-motif-purifyd::
@echo --- Building src-static-motif-purifyd
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-static-quantifyd::
@echo --- Building src-static-quantifyd
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
src-static-motif-quantifyd::
@echo --- Building src-static-motif-quantifyd
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
libnet::
@echo --- Building libnet
cd libnet; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
libdtm::
@echo --- Building libdtm
cd libdtm; $(MAKE) $(dtmmachtype) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
clean:
cd libXmx; $(MAKE) $@
cd libhtmlw; $(MAKE) $@
cd libwww2; $(MAKE) $@
cd src; $(MAKE) MOSAIC="Mosaic" $@
cd libnet; $(MAKE) $@
cd libdtm; $(MAKE) $@
cd libnut; $(MAKE) $@
wclean:
cd libhtmlw; $(MAKE) $@
cd src; $(MAKE) MOSAIC="Mosaic" $@
commit:
cvs commit
update:
cvs update
countlines:
wc libdtm/*.[ch] libnet/*.[ch] libXmx/*.[ch] libhtmlw/*.[ch] libwww2/*.[ch] src/*.[ch]
replicate:
cp Makefile Makefile.sun
cp Makefile Makefile.ibm
cp Makefile Makefile.dec
cp Makefile Makefile.alpha
cp Makefile Makefile.hp
prune:
mv Makefile.sun Makefile.sun.old
mv Makefile.ibm Makefile.ibm.old
mv Makefile.dec Makefile.dec.old
mv Makefile.alpha Makefile.alpha.old
mv Makefile.hp Makefile.hp.old

2
makefiles/Makefile.linux
View File

@ -232,7 +232,7 @@ CWARNINGS = -Wall \
-Wno-char-subscripts \
-Wno-unused-result
CFLAGS = -fcommon -g $(sysconfigflags) $(prereleaseflags) $(CWARNINGS) $(customflags)
CFLAGS = -g $(sysconfigflags) $(prereleaseflags) $(CWARNINGS) $(customflags)
# Don't worry about these -- for development purposes only.
PURIFY = purify

353
makefiles/Makefile.netbsd
View File

@ -1,353 +0,0 @@
# Toplevel Makefile for NCSA Mosaic.
# You shouldn't need to touch any of the Makefiles in the various
# subdirectories if you configure this Makefile correctly.
# If you need to make serious changes to get Mosaic to compile on your
# platform, send context diffs to mosaic-x@ncsa.uiuc.edu.
# -------------------------- CUSTOMIZABLE OPTIONS ----------------------------
#prereleaseflags = -DPRERELEASE
prereleaseflags = -DPRERELEASE
#RANLIB = /bin/true
#### On non-SGI's, this should be ranlib.
RANLIB = ranlib
#CC = cc
#### On Sun's, this should be gcc (ANSI required).
CC = cc
#### Linker Flags
ldflags = -R/usr/X11R7/lib -R/usr/pkg/lib -L/usr/pkg/lib -L/usr/X11R7/lib
#### For a few files in the source, some compilers may need to be kicked
#### in K&R mode. E.g., on SGI's, -cckr does this.
#knrflag = -cckr
#### On most systems, no flag is needed.
knrflag =
#### Random system configuration flags.
#### --> *** For Motif 1.2 ON ANY PLATFORM, do -DMOTIF1_2 *** <--
#### For IBM AIX 3.2, do -D_BSD
#### For NeXT, do -DNEXT
#### For HP/UX, do -Aa -D_HPUX_SOURCE
#### For Dell SVR4, do -DSVR4
#### For Solaris, do -DSVR4
#### For Esix 4.0.4 and Solaris x86 2.1, do -DSVR4
#### For Convex whatever, do -DCONVEX
#### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
#### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
sysconfigflags = -DMOTIF1_2 -DLINUX
#### System libraries.
# syslibs = -lPW -lsun -lmalloc
#### For AIX 3.2
# syslibs = -lPW -lbsd
#### For most other Motif platforms:
# syslibs = -lPW
#### For Sun's and Ultrix and HP and BSD/386:
# syslibs =
#### For Sun's with no DNS:
# syslibs = -lresolv
#### For SCO ODT:
# syslibs = -lPW -lsocket -lmalloc
#### For Dell SVR4:
# syslibs = -lnsl -lsocket -lc -lucb
#### For Solaris (?)
# syslibs = -lnsl -lsocket -lgen
#### For Motorola SVR4:
# syslibs = -lnsl -lsocket -lgen
syslibs = -lc
#### X include file locations -- if your platform puts the X include
#### files in a strange place, set this variable appropriately. Else
#### don't worry about it.
#### HP X11R4 version:
# xinc = -I/usr/include/Motif1.1 -I/usr/include/X11R4
#### HP X11R5 version:
# xinc = -I/usr/include/Motif1.2 -I/usr/local/X11R5/include
#### NeXT version:
# xinc = -I/usr/include/X11
#### BSD/386
# xinc = -I/usr/X11/include
#xinc = -I/usr/X11R7/include
xinc = -I/usr/X11R7/include
#### X library locations.
# xlibs = -lXm_s -lXmu -lXt_s -lX11_s
#### For Sun's (at least running stock X/Motif as installed on our machines):
# xlibs = /usr/lib/libXm.a /usr/lib/libXmu.a /usr/lib/libXt.a /usr/lib/libXext.a /usr/lib/libX11.a -lm #### For HP-UX 8.00:
# xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11
#### For HP-UX 9.01: The X11R5 libraries are here on our systems
# xlibs = -L/usr/lib/Motif1.2 -lXm -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lXmu -lXt -lX11
#### For NeXT:
# xlibs = -L/usr/lib/X11 -lXm -lXmu -lXt -lX11
#### For Dell SVR4:
# xlibs = -L/usr/X5/lib -lXm -lXmu -lXt -lXext -lX11
#### For Solaris (?)
# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
#### For SCO ODT 3.0 (I'm told that -lXtXm_s is *not* a typo :-):
# xlibs = -lXtXm_s -lXmu -lX11_s
#### For nearly everyone else:
# xlibs = -lXm -lXmu -lXt -lX11
#### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to
#### your X libs, or some may not be found by the loader. Check the
#### loader with "ldd Mosaic" after you build.
#xlibs = -L/usr/X11R7/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
xlibs = -L/usr/X11R7/lib -L/usr/pkg/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
static_motif_xlibs = -L/usr/X11R7/lib -lXext -lXpm -lXft /usr/pkg/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
static_xlibs = /usr/X11R7/lib/libXpm.a /usr/pkg/lib/libXm.a /usr/X11R7/lib/libXmu.a /usr/X11R7/lib/libXt.a /usr/X11R7/lib/libXext.a /usr/X11R7/lib/libX11.a /usr/X11R7/lib/libSM.a /usr/X11R7/lib/libICE.a /usr/X11R7/lib/libxcb.a /usr/X11R7/lib/libXfont.a /usr/X11R7/lib/libXau.a /usr/X11R7/lib/libXdmcp.a /usr/X11R7/lib/libXft.a /usr/X11R7/lib/libfontconfig.a /usr/X11R7/lib/libXrender.a /usr/X11R7/lib/libfreetype.a /usr/lib/libexpat.a /usr/X11R7/lib/libX11.a
#### For BSD/386:
# xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11
#### For Motorola SVR4:
# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
#### DTM AND HDF SUPPORT; READ CAREFULLY
#### If you want to compile with DTM and HDF support, you should leave
#### the following lines uncommented and make sure you have a copy of
#### HDF 3.3 (r1 or later) installed and ready. You can find HDF on
#### ftp.ncsa.uiuc.edu in /HDF.
#### If you do not want to compile with DTM and HDF support, comment
#### the following lines out. (If you are compiling from source for
#### the first time, you should probably not bother with HDF and DTM
#### support.)
#### dtmmachtype needs to be set to one of the following:
#### sun, sgi, dec, ibm, next, cray, convex
#### If your platform is not one of the above, then either do not compile
#### with HDF/DTM support or try hacking libdtm/makefile.
#dtmmachtype = sun
#dtmdirs = libdtm libnet
#dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a
#dtmflags = -DHAVE_DTM -I.. -I../libnet
#hdfdir = /hdf2/install/linux
#hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a
#hdfflags = -DHAVE_HDF -I$(hdfdir)/include
#### PNG SUPPORT
#### For inline PNG support, the following should be defined:
#### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
# SAM pngdir = /xdev/mosaic/libpng/linux
# SAM pnglibdir = $(pngdir)/lib
# SAM pngincludedir = $(pngdir)/include
# SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a
# SAM pngflags = -I$(pngincludedir) -DHAVE_PNG
pnglibs = -lpng16 -lz -lm
pngflags = -DHAVE_PNG
#### JPEG SUPPORT
#### For inline JPEG support, the following should be defined:
#### The library used is Independent JPEG Group (IJG's) 5.0a.
# SAM jpegdir = /xdev/mosaic/libjpeg/linux
# SAM jpeglibs = $(jpegdir)/lib/libjpeg.a
#SAM jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
jpeglibs = -ljpeg
jpegflags = -DHAVE_JPEG
#### KERBEROS SUPPORT
####
#### If you want Mosaic to support Kerberos authentication, set the
#### following flags appropriately. You can support Kerberos V4 and/or V5,
#### although it's most likely that your realm supports one or the other.
#### To enable DES-encryption of HTTP messages via Kerberos key exchange,
#### define the KRB-ENCRYPT flag.
##krb4dir = /usr/athena
#krb4dir = /xdev/mosaic/libkrb4/linux
#krb4libs = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a
#krb4flags = -DKRB4 -I$(krb4dir)/include
##krb5dir = /krb5
#krb5dir = /xdev/mosaic/libkrb5/linux
#krb5libs = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a
#krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5
#Do not comment out.
krbflags = $(krb4flags) $(krb5flags)
krblibs = $(krb4libs) $(krb5libs)
#### DIRECT WAIS SUPPORT
#### If you want to have Mosaic be able to communicate directly with
#### WAIS servers, do set the following flags appropriately. We
#### recommend linking with CNIDR's freeWAIS 0.5 distribution; other
#### WAIS distributions may work but we have not tested them with
#### Mosaic. freeWAIS 0.5 can currently (Sept.1995) be found at
#### ftp://sunsite.unc.edu/pub/wais/servers/freeWAIS
#### If you do not wish to link to the WAIS libraries, then comment
#### the following lines out. Mosaic will then communicate with WAIS
#### servers via a HTTP gateway.
#### -lm is required for freeWAIS 0.5, as ceil() is used.
#waisroot = /xdev/mosaic/freeWAIS/linux
#waisflags = -DDIRECT_WAIS -I$(waisroot)/include
#waislibdir = $(waisroot)/bin
#waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm
#### Customization flags:
#### . If you want Mosaic to come up with monochrome colors by default,
#### use -DMONO_DEFAULT
#### . If you want to define the default Mosaic home page, set
#### -DHOME_PAGE_DEFAULT=\\\"url\\\"
#### . If you want to define the default Mosaic documentation directory
#### (should be a URL), set -DDOCS_DIRECTORY_DEFAULT=\\\"url\\\"
#### . Other things you can define are spelled out in src/mosaic.h.
customflags =
########
########
#### NOTE! If you get errors because of the following line, it means
#### you are NOT using GNUs Make program. The following line is basically
#### for the developers at NCSA to customize the build process without
#### modifying the Makefiles, so you may comment it out without harm.
########
########
-include local-defines/$(DEV_ARCH)
# ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
# Disable certain warnings as we don't care for them
CWARNINGS = -Wall \
-Wno-parentheses \
-Wno-switch -Wno-switch-enum \
-Wno-char-subscripts \
-Wno-unused-result
CFLAGS = -fcommon -g $(sysconfigflags) $(prereleaseflags) $(CWARNINGS) $(customflags) -I/usr/X11R7/include -I/usr/pkg/include
# Don't worry about these -- for development purposes only.
PURIFY = purify
QUANTIFY = quantify
default: $(dtmdirs) libwww2 libXmx libhtmlw libnut src
@echo \*\*\* Welcome to NCSA Mosaic.
purifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic.
quantifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic.
staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static
@echo \*\*\* Welcome to NCSA Mosaic linked static.
static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif
@echo \*\*\* Welcome to NCSA Mosaic linked static for motif.
p_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static.
p_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-purifyd
@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static for motif.
q_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static.
q_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-quantifyd
@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static for motif.
libXmx::
@echo --- Building libXmx
cd libXmx; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(xinc)"
libhtmlw::
@echo --- Building libhtmlw
cd libhtmlw; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(xinc) -DMOTIF -DXMOSAIC"
libwww2::
@echo --- Building libwww2
cd libwww2; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(waisflags) $(krbflags) $(xinc)"
libnut::
@echo --- Building libnut
cd libnut; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag)"
src::
@echo --- Building src
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-purifyd::
@echo --- Building Purify'd src
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-quantifyd::
@echo --- Building Quantify'd src
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
src-static::
@echo --- Building src-static
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-static-motif::
@echo --- Building src-static-motif
cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
src-static-purifyd::
@echo --- Building src-static-purifyd
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-static-motif-purifyd::
@echo --- Building src-static-motif-purifyd
cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
src-static-quantifyd::
@echo --- Building src-static-quantifyd
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
src-static-motif-quantifyd::
@echo --- Building src-static-motif-quantifyd
cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
libnet::
@echo --- Building libnet
cd libnet; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
libdtm::
@echo --- Building libdtm
cd libdtm; $(MAKE) $(dtmmachtype) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
clean:
cd libXmx; $(MAKE) $@
cd libhtmlw; $(MAKE) $@
cd libwww2; $(MAKE) $@
cd src; $(MAKE) MOSAIC="Mosaic" $@
cd libnet; $(MAKE) $@
cd libdtm; $(MAKE) $@
cd libnut; $(MAKE) $@
wclean:
cd libhtmlw; $(MAKE) $@
cd src; $(MAKE) MOSAIC="Mosaic" $@
commit:
cvs commit
update:
cvs update
countlines:
wc libdtm/*.[ch] libnet/*.[ch] libXmx/*.[ch] libhtmlw/*.[ch] libwww2/*.[ch] src/*.[ch]
replicate:
cp Makefile Makefile.sun
cp Makefile Makefile.ibm
cp Makefile Makefile.dec
cp Makefile Makefile.alpha
cp Makefile Makefile.hp
prune:
mv Makefile.sun Makefile.sun.old
mv Makefile.ibm Makefile.ibm.old
mv Makefile.dec Makefile.dec.old
mv Makefile.alpha Makefile.alpha.old
mv Makefile.hp Makefile.hp.old

30
platform-configs/config.unicos
View File

@ -1,30 +0,0 @@
#! /bin/sh
# A script to store configuration variables for Mosaic's external
# software packages
#
# In all cases configure will check the dir you supply for all libs and
# header files as well the lib and include subdirectories of that directory.
# So if you do things right and install everything in a place like
# /usr/local/include and /usr/local/lib
# you can just enter /usr/local (the default) for every field.
#
# Where to find jpeg stuff
jpegdir=/xdev/mosaic/libjpeg/linux
# Where to find libz (don't need any headers)
zdir=/xdev/mosaic/libpng/linux
# Where to find png stuff
pngdir=/xdev/mosaic/libpng/linux
# Where to find wais stuff
waisdir=/xdev/mosaic/freeWAIS/linux
# Where to find hdf stuff
hdfdir=
# Use DTM? (yes or no)
with_dtm=no
echo ./configure --with-jpegdir=$jpegdir --with-zdir=${zdir} --with-pngdir=$pngdir --with-wais=$waisdir --with-hdfdir=$hdfdir --enable-dtm=$with_dtm $*
./configure --with-jpegdir=$jpegdir --with-zdir=${zdir} --with-pngdir=$pngdir --with-wais=$waisdir --with-hdfdir=$hdfdir --enable-dtm=$with_dtm $*

21
src/gui-dialogs.c
View File

@ -367,7 +367,7 @@ static XmxCallback (save_win_cb)
XtUnmanageChild (win->save_win);
XmStringGetLtoR (((XmFileSelectionBoxCallbackStruct *)call_data)->value,
XmFONTLIST_DEFAULT_TAG,
XmSTRING_DEFAULT_CHARSET,
&fname);
pathEval (efname, fname);
@ -585,7 +585,7 @@ char fileBuf[2048],*fileBoxFileName;
XtVaGetValues(win->save_win,
XmNdirSpec, &fbfn,
NULL);
if (!XmStringGetLtoR(fbfn,XmFONTLIST_DEFAULT_TAG,&fileBoxFileName)) {
if (!XmStringGetLtoR(fbfn,XmSTRING_DEFAULT_CHARSET,&fileBoxFileName)) {
#ifndef DISABLE_TRACE
if (srcTrace) {
fprintf(stderr,"Internal Error In Save As... PLEASE REPORT THIS!\n");
@ -597,7 +597,7 @@ char fileBuf[2048],*fileBoxFileName;
if (*fileBoxFileName && win && win->current_node && win->current_node->url && *(win->current_node->url)) {
/*no need to check on NULL from getFileName as we know url exists*/
sprintf(fileBuf,"%s%s",fileBoxFileName,getFileName(win->current_node->url));
sfn=XmStringCreateLtoR(fileBuf,XmFONTLIST_DEFAULT_TAG);
sfn=XmStringCreateLtoR(fileBuf,XmSTRING_DEFAULT_CHARSET);
XtVaSetValues(win->save_win,
XmNdirSpec, sfn,
NULL);
@ -676,7 +676,7 @@ static XmxCallback (savebinary_win_cb)
XtUnmanageChild (win->savebinary_win);
XmStringGetLtoR (((XmFileSelectionBoxCallbackStruct *)call_data)->value,
XmFONTLIST_DEFAULT_TAG,
XmSTRING_DEFAULT_CHARSET,
&fname);
pathEval (efname, fname);
@ -729,7 +729,7 @@ char fileBuf[2048],*fileBoxFileName;
XtVaGetValues(win->savebinary_win,
XmNdirSpec, &fbfn,
NULL);
if (!XmStringGetLtoR(fbfn,XmFONTLIST_DEFAULT_TAG,&fileBoxFileName)) {
if (!XmStringGetLtoR(fbfn,XmSTRING_DEFAULT_CHARSET,&fileBoxFileName)) {
#ifndef DISABLE_TRACE
if (srcTrace) {
fprintf(stderr,"Internal Error In Save Binary... PLEASE REPORT THIS!\n");
@ -749,7 +749,7 @@ char fileBuf[2048],*fileBoxFileName;
}
}
sprintf(fileBuf,"%s%s",fileBoxFileName,sptr);
sfn=XmStringCreateLtoR(fileBuf,XmFONTLIST_DEFAULT_TAG);
sfn=XmStringCreateLtoR(fileBuf,XmSTRING_DEFAULT_CHARSET);
XtVaSetValues(win->savebinary_win,
XmNdirSpec, sfn,
NULL);
@ -778,7 +778,7 @@ static XmxCallback (open_local_win_cb)
XtUnmanageChild (win->open_local_win);
XmStringGetLtoR (((XmFileSelectionBoxCallbackStruct *)call_data)->value,
XmFONTLIST_DEFAULT_TAG,
XmSTRING_DEFAULT_CHARSET,
&fname);
pathEval (efname, fname);
@ -2705,7 +2705,6 @@ mo_status mo_edit_source(mo_window *win)
{
char *sourceFileName;
FILE *fp;
int fd;
int length;
char *editorName;
char execString[1024];
@ -2749,10 +2748,10 @@ extern void AddChildProcessHandler(int, void (*)(), void *);
/* write out source to tmp file with .html extension */
sourceFileName = malloc(255);
strncpy(sourceFileName, "mosaic-XXXXXX.html\0", 19);
fd = mkstemps(sourceFileName, 5);
strcpy(sourceFileName, tmpnam(NULL));
strcat(sourceFileName, ".html");
if (!(fp = fdopen(fd, "w")))
if (!(fp = fopen(sourceFileName,"w")))
{
char *buf, *final, tmpbuf[80];
int final_len;

8
src/gui.c
View File

@ -1218,7 +1218,7 @@ static void pointer_motion_callback (Widget w, char *href)
} else
href = " ";
xmstr = XmStringCreateLocalized (href);
xmstr = XmStringCreateSimple (href);
XtVaSetValues
(win->tracker_label,
XmNlabelString, (XtArgVal)xmstr,
@ -1433,7 +1433,7 @@ void mo_gui_notify_progress (char *msg)
if (!msg)
msg = " ";
xmstr = XmStringCreateLocalized (msg);
xmstr = XmStringCreateSimple (msg);
XtVaSetValues
(win->tracker_label,
XmNlabelString, (XtArgVal)xmstr,
@ -2580,11 +2580,11 @@ Widget mo_fill_toolbar(mo_window *win, Widget top, int w, int h)
&tmpFont,
NULL);
if (!tmpFont) {
fprintf(stderr,"Toolbar Font: Could not load! The X Resource is Mosaic*ToolbarFont\nDefault font is: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1\nExiting Mosaic.");
fprintf(stderr,"Toolbar Font: Could not load! The X Resource is Mosaic*ToolbarFont\nDefault font is: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1\nExiting Mosaic.");
exit(1);
}
tmpFontList = XmFontListCreate(tmpFont,XmFONTLIST_DEFAULT_TAG);
tmpFontList = XmFontListCreate(tmpFont,XmSTRING_DEFAULT_CHARSET);
}
/* Which tools to show */

2
src/proxy.h
View File

@ -51,7 +51,7 @@
* Comments and questions are welcome and can be sent to *
* mosaic-x@ncsa.uiuc.edu. *
****************************************************************************/
#define FONTNAME "-adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso10646-1"
#define FONTNAME "-adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso8859-1"
#define TRANS_HTTP 0
#define TRANS_CCI 1

158
src/readPNG.c
View File

@ -78,7 +78,6 @@
#include <setjmp.h>
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
#define PNG_BYTES_TO_CHECK 4
#ifndef DISABLE_TRACE
extern int srcTrace;
@ -97,39 +96,49 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
double screen_gamma;
png_byte *png_pixels=NULL, **row_pointers[*height];
int i, j, bit_depth, color_type, num_palette, interlace_type;
png_byte *png_pixels=NULL, **row_pointers=NULL;
int i, j;
unsigned int packets;
png_color std_color_cube[216];
png_colorp palette;
/* first check to see if its a valid PNG file. If not, return. */
/* we assume that infile is a valid filepointer */
/* first check to see if its a valid PNG file. If not, return. */
/* we assume that infile is a valid filepointer */
{
png_byte buf[PNG_BYTES_TO_CHECK];
int ret;
png_byte buf[8];
if (fread(buf, 1, PNG_BYTES_TO_CHECK, infile) != PNG_BYTES_TO_CHECK)
ret = fread(buf, 1, 8, infile);
if(ret != 8)
return 0;
return(!png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK));
ret = png_sig_cmp(buf, 0, 8);
if(ret)
return(0);
}
/* allocate the structures */
/* OK, it is a valid PNG file, so let's rewind it, and start
decoding it */
rewind(infile);
/* allocate the structures */
/*png_ptr = (png_struct *)malloc(sizeof(png_struct));*/
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if(!png_ptr)
fclose(infile);
return 0;
/* initialize the structures */
info_ptr = png_create_info_struct(png_ptr);
if(!info_ptr) {
fclose(infile);
png_destroy_read_struct(png_ptr, NULL, NULL);
/*free(png_ptr);*/
return 0;
}
/* Establish the setjmp return context for png_error to use. */
/* Establish the setjmp return context for png_error to use. */
if (setjmp(png_jmpbuf(png_ptr))) {
#ifndef DISABLE_TRACE
@ -138,15 +147,17 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
}
#endif
png_destroy_read_struct(png_ptr, info_ptr, NULL);
fclose(infile);
/*png_read_destroy(png_ptr, info_ptr, (png_info *)0); */
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
if(png_pixels != NULL)
free((char *)png_pixels);
if(row_pointers != NULL)
free((png_byte **)row_pointers);
/*free((char *)png_ptr);*/
free((char *)info_ptr);
return 0;
}
@ -165,22 +176,20 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* setup other stuff using the fields of png_info. */
png_get_IHDR(png_ptr, info_ptr, width, height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
*width = (int)png_ptr->width;
*height = (int)png_ptr->height;
#ifndef DISABLE_TRACE
if (srcTrace) {
fprintf(stderr,"\n\nBEFORE\nwidth = %ls\n", width);
fprintf(stderr,"height = %ls\n", height);
fprintf(stderr,"bit depth = %d\n", bit_depth);
fprintf(stderr,"color type = %d\n", color_type);
fprintf(stderr,"interlace type = %d\n", interlace_type);
/*
fprintf(stderr,"\n\nBEFORE\nheight = %d\n", (int)png_ptr->width);
fprintf(stderr,"width = %d\n", (int)png_ptr->height);
fprintf(stderr,"bit depth = %d\n", info_ptr->bit_depth);
fprintf(stderr,"color type = %d\n", info_ptr->color_type);
fprintf(stderr,"compression type = %d\n", info_ptr->compression_type);
fprintf(stderr,"filter type = %d\n", info_ptr->filter_type);
fprintf(stderr,"interlace type = %d\n", info_ptr->interlace_type);
fprintf(stderr,"num colors = %d\n",info_ptr->num_palette);
fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes);
*/
}
#endif
@ -191,28 +200,28 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* its #if'ed out for now cause I don't have anything to
test it with */
{
png_color_16 my_background, *image_background;
png_color_16 my_background;
if (PNG_INFO_bKGD(png_ptr, info_ptr, &image_background) != 0)
png_set_background(png_ptr, image_background,
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
if (info_ptr->valid & PNG_INFO_bKGD)
png_set_background(png_ptr, &(info_ptr->background),
PNG_GAMMA_FILE, 1, 1.0);
else
png_set_background(png_ptr, &my_background,
PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
PNG_GAMMA_SCREEN, 0, 1.0);
}
#endif
/* strip pixels in 16-bit images down to 8 bits */
if (bit_depth == 16)
if (info_ptr->bit_depth == 16)
png_set_strip_16(png_ptr);
/* If it is a color image then check if it has a palette. If not
then dither the image to 256 colors, and make up a palette */
if (color_type==PNG_COLOR_TYPE_RGB ||
color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
if (info_ptr->color_type==PNG_COLOR_TYPE_RGB ||
info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) != 0) {
if(! (info_ptr->valid & PNG_INFO_PLTE)) {
#ifndef DISABLE_TRACE
if (srcTrace) {
@ -230,7 +239,7 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* this should probably be dithering to
Rdata.colors_per_inlined_image colors */
png_set_quantize(png_ptr, std_color_cube,
png_set_dither(png_ptr, std_color_cube,
216,
216, NULL, 1);
@ -241,12 +250,10 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
}
#endif
png_uint_16p histogram = NULL;
png_get_hIST(png_ptr, info_ptr, &histogram);
png_set_quantize(png_ptr, palette,
num_palette,
png_set_dither(png_ptr, info_ptr->palette,
info_ptr->num_palette,
get_pref_int(eCOLORS_PER_INLINED_IMAGE),
histogram, 1);
info_ptr->hist, 1);
}
}
@ -255,14 +262,14 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
small as they can. This expands pixels to 1 pixel per byte, and
if a transparency value is supplied, an alpha channel is
built.*/
if (bit_depth < 8)
if (info_ptr->bit_depth < 8)
png_set_packing(png_ptr);
/* have libpng handle the gamma conversion */
if (get_pref_boolean(eUSE_SCREEN_GAMMA)) { /*SWP*/
if (bit_depth != 16) { /* temporary .. glennrp */
if (info_ptr->bit_depth != 16) { /* temporary .. glennrp */
screen_gamma=(double)(get_pref_float(eSCREEN_GAMMA));
#ifndef DISABLE_TRACE
@ -270,56 +277,53 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
fprintf(stderr,"screen gamma=%f\n",screen_gamma);
}
#endif
double image_gamma;
if (png_get_gAMA(png_ptr, info_ptr, &image_gamma) != 0) {
if (info_ptr->valid & PNG_INFO_gAMA) {
#ifndef DISABLE_TRACE
if (srcTrace) {
printf("setting gamma=%f\n", image_gamma);
printf("setting gamma=%f\n",info_ptr->gamma);
}
#endif
png_set_gamma(png_ptr, screen_gamma, image_gamma);
png_set_gamma(png_ptr, screen_gamma, (double)info_ptr->gamma);
}
else {
#ifndef DISABLE_TRACE
if (srcTrace) {
fprintf(stderr,"setting gamma=%f\n",0.45455);
fprintf(stderr,"setting gamma=%f\n",0.45);
}
#endif
png_set_gamma(png_ptr, screen_gamma, 0.45455);
png_set_gamma(png_ptr, screen_gamma, (double)0.45);
}
}
}
if (interlace_type)
if (info_ptr->interlace_type)
png_set_interlace_handling(png_ptr);
png_read_update_info(png_ptr, info_ptr);
#ifndef DISABLE_TRACE
if (srcTrace) {
fprintf(stderr,"\n\nAFTER\nwidth = %ls\n", width);
fprintf(stderr,"height = %ls\n", height);
fprintf(stderr,"bit depth = %d\n", bit_depth);
fprintf(stderr,"color type = %d\n", color_type);
fprintf(stderr,"interlace type = %d\n", interlace_type);
/*
fprintf(stderr,"\n\nAFTER\nheight = %d\n", (int)png_ptr->width);
fprintf(stderr,"width = %d\n", (int)png_ptr->height);
fprintf(stderr,"bit depth = %d\n", info_ptr->bit_depth);
fprintf(stderr,"color type = %d\n", info_ptr->color_type);
fprintf(stderr,"compression type = %d\n", info_ptr->compression_type);
fprintf(stderr,"filter type = %d\n", info_ptr->filter_type);
fprintf(stderr,"interlace type = %d\n", info_ptr->interlace_type);
fprintf(stderr,"num colors = %d\n",info_ptr->num_palette);
fprintf(stderr,"rowbytes = %d\n", info_ptr->rowbytes);
*/
}
#endif
/* allocate the pixel grid which we will need to send to
png_read_image(). */
int rowbytes = png_get_rowbytes(png_ptr, info_ptr);
png_pixels = (png_byte *)malloc(rowbytes *
png_pixels = (png_byte *)malloc(info_ptr->rowbytes *
(*height) * sizeof(png_byte));
row_pointers = (png_byte **) malloc((*height) * sizeof(png_byte *));
for (i=0; i < *height; i++)
row_pointers[i]=png_malloc(png_ptr, rowbytes);
row_pointers[i]=png_pixels+(info_ptr->rowbytes*i);
/* FINALLY - read the darn thing. */
@ -328,13 +332,13 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* now that we have the (transformed to 8-bit RGB) image, we have
to copy the resulting palette to our colormap. */
if (color_type & PNG_COLOR_MASK_COLOR) {
if (png_get_PLTE(png_ptr, info_ptr, palette, num_palette) != 0) {
if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) {
if (info_ptr->valid & PNG_INFO_PLTE) {
for (i=0; i < num_palette; i++) {
colrs[i].red = palette[i].red << 8;
colrs[i].green = palette[i].green << 8;
colrs[i].blue = palette[i].blue << 8;
for (i=0; i < info_ptr->num_palette; i++) {
colrs[i].red = info_ptr->palette[i].red << 8;
colrs[i].green = info_ptr->palette[i].green << 8;
colrs[i].blue = info_ptr->palette[i].blue << 8;
colrs[i].pixel = i;
colrs[i].flags = DoRed|DoGreen|DoBlue;
}
@ -369,7 +373,7 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
/* if there is an alpha channel, we have to get rid of it in the
pixmap, since I don't do anything with it yet */
if (color_type & PNG_COLOR_MASK_ALPHA) {
if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) {
#ifndef DISABLE_TRACE
if (srcTrace) {
@ -383,6 +387,8 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
q++; /* skip the alpha pixel */
}
}
free((char *)png_pixels);
}
else {
@ -398,13 +404,21 @@ ReadPNG(FILE *infile,int *width, int *height, XColor *colrs)
*p++ = *q++; /*palette index*/
}
}
free((char *)png_pixels);
}
free((char *)png_pixels);
free((png_byte **)row_pointers);
/* clean up after the read, and free any memory allocated */
png_destroy_read_struct(png_ptr, info_ptr, NULL);
/* clean up after the read, and free any memory allocated */
/*png_read_destroy(png_ptr, info_ptr, (png_info *)0);*/
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
/* free the structures */
/*free((char *)png_ptr);*/
free((char *)info_ptr);
return pixmap;
}

168
src/xresources.h
View File

@ -588,32 +588,32 @@ static XrmOptionDescRec options[] = {
};
static String color_resources[] = {
"*XmLabel*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmScale*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmBulletinBoard*labelFontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*optionmenu.XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmPushButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmPushButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmToggleButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmToggleButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*optionmenu*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmIconGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmBulletinBoard*buttonFontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*menubar*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmPushButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmLabelGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmPushButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmToggleButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmToggleButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*pulldownmenu*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmList*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmText.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso10646-1",
"*XmTextField.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso10646-1",
"*XmLabel*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmScale*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmBulletinBoard*labelFontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*optionmenu.XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmPushButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmPushButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmToggleButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmToggleButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*optionmenu*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmIconGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmBulletinBoard*buttonFontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*menubar*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmPushButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmLabelGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmPushButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmToggleButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmToggleButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*pulldownmenu*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmList*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmText.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1",
"*XmTextField.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1",
"*optionmenu*marginHeight: 0",
"*optionmenu*marginTop: 5",
@ -655,23 +655,23 @@ static String color_resources[] = {
/* "*geometry: +400+200", */
/* "*keyboardFocusPolicy: pointer",*/
"*TitleFont: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso10646-1",
"*Font: -adobe-times-medium-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*ItalicFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso10646-1",
"*BoldFont: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*FixedFont: -adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*Header1Font: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso10646-1",
"*Header2Font: -adobe-times-bold-r-normal-*-18-*-*-*-*-*-iso10646-1",
"*Header3Font: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*Header4Font: -adobe-times-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*Header5Font: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*Header6Font: -adobe-times-bold-r-normal-*-10-*-*-*-*-*-iso10646-1",
"*AddressFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso10646-1",
"*PlainFont: -adobe-courier-medium-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*ListingFont: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*SupSubFont: -adobe-times-medium-r-normal-*-10-*-*-*-*-*-iso10646-1",
"*TitleFont: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso8859-1",
"*Font: -adobe-times-medium-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*ItalicFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso8859-1",
"*BoldFont: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*FixedFont: -adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*Header1Font: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso8859-1",
"*Header2Font: -adobe-times-bold-r-normal-*-18-*-*-*-*-*-iso8859-1",
"*Header3Font: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*Header4Font: -adobe-times-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*Header5Font: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*Header6Font: -adobe-times-bold-r-normal-*-10-*-*-*-*-*-iso8859-1",
"*AddressFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso8859-1",
"*PlainFont: -adobe-courier-medium-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*ListingFont: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*SupSubFont: -adobe-times-medium-r-normal-*-10-*-*-*-*-*-iso8859-1",
"*MeterFont: -adobe-courier-bold-r-normal-*-14-*-*-*-*-*-*-*",
"*ToolbarFont: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*ToolbarFont: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*AnchorUnderlines: 1",
"*VisitedAnchorUnderlines: 1",
"*DashedVisitedAnchorUnderlines: True",
@ -746,32 +746,32 @@ static String color_resources[] = {
};
static String mono_resources[] = {
"*XmLabel*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmScale*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmBulletinBoard*labelFontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*optionmenu.XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*XmPushButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmPushButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmToggleButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmToggleButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*optionmenu*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmIconGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmBulletinBoard*buttonFontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*menubar*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmPushButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmLabelGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmPushButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmToggleButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmMenuShell*XmToggleButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*pulldownmenu*fontList: -*-helvetica-bold-o-normal-*-14-*-iso10646-1",
"*XmList*fontList: -*-helvetica-medium-r-normal-*-14-*-iso10646-1",
"*XmText.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso10646-1",
"*XmTextField.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso10646-1",
"*XmLabel*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmScale*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmBulletinBoard*labelFontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*optionmenu.XmLabelGadget*fontList: -*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*XmPushButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmPushButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmToggleButton*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmToggleButtonGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*optionmenu*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmIconGadget*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmBulletinBoard*buttonFontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*menubar*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmPushButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmLabelGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmPushButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmCascadeButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmCascadeButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmToggleButton*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmMenuShell*XmToggleButtonGadget*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*pulldownmenu*fontList: -*-helvetica-bold-o-normal-*-14-*-iso8859-1",
"*XmList*fontList: -*-helvetica-medium-r-normal-*-14-*-iso8859-1",
"*XmText.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1",
"*XmTextField.fontList: -*-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1",
"*optionmenu*marginHeight: 0",
"*optionmenu*marginTop: 5",
@ -813,23 +813,23 @@ static String mono_resources[] = {
/* "*geometry: +400+200", */
/* "*keyboardFocusPolicy: pointer", */
"*TitleFont: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso10646-1",
"*Font: -adobe-times-medium-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*ItalicFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso10646-1",
"*BoldFont: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*FixedFont: -adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*Header1Font: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso10646-1",
"*Header2Font: -adobe-times-bold-r-normal-*-18-*-*-*-*-*-iso10646-1",
"*Header3Font: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso10646-1",
"*Header4Font: -adobe-times-bold-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*Header5Font: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*Header6Font: -adobe-times-bold-r-normal-*-10-*-*-*-*-*-iso10646-1",
"*AddressFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso10646-1",
"*PlainFont: -adobe-courier-medium-r-normal-*-14-*-*-*-*-*-iso10646-1",
"*ListingFont: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*SupSubFont: -adobe-courier-medium-r-normal-*-10-*-*-*-*-*-iso10646-1",
"*TitleFont: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso8859-1",
"*Font: -adobe-times-medium-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*ItalicFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso8859-1",
"*BoldFont: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*FixedFont: -adobe-courier-medium-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*Header1Font: -adobe-times-bold-r-normal-*-24-*-*-*-*-*-iso8859-1",
"*Header2Font: -adobe-times-bold-r-normal-*-18-*-*-*-*-*-iso8859-1",
"*Header3Font: -adobe-times-bold-r-normal-*-17-*-*-*-*-*-iso8859-1",
"*Header4Font: -adobe-times-bold-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*Header5Font: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*Header6Font: -adobe-times-bold-r-normal-*-10-*-*-*-*-*-iso8859-1",
"*AddressFont: -adobe-times-medium-i-normal-*-17-*-*-*-*-*-iso8859-1",
"*PlainFont: -adobe-courier-medium-r-normal-*-14-*-*-*-*-*-iso8859-1",
"*ListingFont: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*SupSubFont: -adobe-courier-medium-r-normal-*-10-*-*-*-*-*-iso8859-1",
"*MeterFont: -adobe-courier-bold-r-normal-*-14-*-*-*-*-*-*-*",
"*ToolbarFont: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso10646-1",
"*ToolbarFont: -adobe-times-bold-r-normal-*-12-*-*-*-*-*-iso8859-1",
"*Foreground: black",
"*Background: white",