Add Meson build system
This will make the build system more modern and it will let us build with multiple cores.
This commit is contained in:
parent
a7f06bb8ca
commit
3fcf1f5156
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,3 +1,5 @@
|
|||
*.o
|
||||
*.a
|
||||
/src/Mosaic
|
||||
.cache
|
||||
/build
|
||||
|
|
9
libXmx/meson.build
Normal file
9
libXmx/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
|||
sources = ['Xmx.c', 'Xmx2.c']
|
||||
|
||||
libXmx_inc = include_directories('.')
|
||||
|
||||
libXmx_static = static_library(
|
||||
'Xmx',
|
||||
sources,
|
||||
include_directories: libXmx_inc
|
||||
)
|
117
libcompactstring/compactstring.c
Normal file
117
libcompactstring/compactstring.c
Normal file
|
@ -0,0 +1,117 @@
|
|||
#include "compactstring.h"
|
||||
|
||||
int compact_string(char *main_string, char *ellipsis_string,
|
||||
int num_chars, int mode, int eLength) {
|
||||
|
||||
int string_len;
|
||||
int feem, puff, i;
|
||||
|
||||
num_chars--;
|
||||
|
||||
string_len = strlen(main_string);
|
||||
if(string_len <= num_chars) {
|
||||
strcpy(ellipsis_string, main_string);
|
||||
return(1);
|
||||
}
|
||||
|
||||
switch(mode) {
|
||||
|
||||
case 1: {
|
||||
|
||||
puff = num_chars - eLength;
|
||||
feem = string_len - puff;
|
||||
|
||||
strcpy(ellipsis_string,".");
|
||||
/*
|
||||
i=1;
|
||||
while (i<eLength) {
|
||||
strcat(ellipsis_string, ".");
|
||||
i++;
|
||||
}
|
||||
*/
|
||||
|
||||
for (i = 0; i < eLength; i++) {
|
||||
ellipsis_string [i] = '.';
|
||||
}
|
||||
ellipsis_string [i] = '\0';
|
||||
|
||||
strncat(ellipsis_string, main_string + feem, puff);
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
case 2: {
|
||||
|
||||
int right_side, left_side;
|
||||
|
||||
/*
|
||||
puff = num_chars - eLength;
|
||||
right_side = puff >> 1;
|
||||
left_side = puff - right_side;
|
||||
|
||||
strncpy(ellipsis_string, main_string, right_side);
|
||||
ellipsis_string[right_side]='\0';
|
||||
i=0;
|
||||
while (i<eLength) {
|
||||
strcat(ellipsis_string, ".");
|
||||
i++;
|
||||
}
|
||||
strncat(ellipsis_string, main_string+(string_len-left_side), left_side);
|
||||
*/
|
||||
|
||||
puff = num_chars - eLength;
|
||||
left_side = puff >> 1;
|
||||
right_side = puff - left_side;
|
||||
|
||||
strncpy (ellipsis_string, main_string, left_side);
|
||||
for (i = left_side; i < num_chars-right_side; i++) {
|
||||
ellipsis_string [i] = '.';
|
||||
}
|
||||
ellipsis_string [num_chars - right_side] = '\0';
|
||||
strncat (ellipsis_string,
|
||||
main_string + (string_len - right_side),
|
||||
right_side);
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
case 3: {
|
||||
|
||||
puff = num_chars - eLength;
|
||||
feem = string_len - puff;
|
||||
|
||||
strncpy(ellipsis_string, main_string, puff);
|
||||
/*
|
||||
ellipsis_string[puff]='\0';
|
||||
i=0;
|
||||
while (i<eLength) {
|
||||
strcat(ellipsis_string, ".");
|
||||
i++;
|
||||
}
|
||||
*/
|
||||
|
||||
for (i = puff; i < num_chars; i++) {
|
||||
ellipsis_string [i] = '.';
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
default: {
|
||||
#ifdef ELLIPSIS_TEST
|
||||
usage_statement();
|
||||
exit(0);
|
||||
#else
|
||||
return(-1);
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ellipsis_string[num_chars]='\0';
|
||||
|
||||
return(1);
|
||||
}
|
2
libcompactstring/compactstring.h
Normal file
2
libcompactstring/compactstring.h
Normal file
|
@ -0,0 +1,2 @@
|
|||
int compact_string(char *main_string, char *ellipsis_string,
|
||||
int num_chars, int mode, int eLength);
|
9
libcompactstring/meson.build
Normal file
9
libcompactstring/meson.build
Normal file
|
@ -0,0 +1,9 @@
|
|||
sources = ['compactstring.c']
|
||||
|
||||
libcompactstring_inc = include_directories('.')
|
||||
|
||||
libcompactstring_static = static_library(
|
||||
'compactstring',
|
||||
sources,
|
||||
include_directories: libcompactstring_inc
|
||||
)
|
|
@ -791,10 +791,10 @@ static Inport * new_in_port( pp, fd )
|
|||
}
|
||||
|
||||
#ifdef DTM_PROTOTYPES
|
||||
void dtm_handle_in( caddr_t client_data, int * fd, void * id)
|
||||
void dtm_handle_in( void * client_data, int * fd, void * id)
|
||||
#else
|
||||
void dtm_handle_in( client_data, fd, id )
|
||||
caddr_t client_data;
|
||||
void * client_data;
|
||||
int * fd;
|
||||
void * id;
|
||||
#endif
|
||||
|
@ -836,7 +836,7 @@ void dtm_set_Xcallback( pp, inp )
|
|||
int p; for ( p = 0; p < DTMptCount ; p++ ) if ( pp == DTMpt[p] ) break;
|
||||
if ( pp->porttype == INPORTTYPE && pp->XaddInput ) {
|
||||
inp->XinputId = pp->XaddInput( inp->fd, XtInputReadMask,
|
||||
dtm_handle_in, (caddr_t) p);
|
||||
dtm_handle_in, (void *) p);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -309,10 +309,10 @@ extern int DTMgetConnectionCount DTM_PROTO(( int port, int * n_connects ));
|
|||
typedef (*DTMfuncPtr)();
|
||||
#ifdef _XtIntrinsic_h
|
||||
extern int DTMaddInput DTM_PROTO(( int port, long condition,
|
||||
XtInputCallbackProc proc, caddr_t client_data));
|
||||
XtInputCallbackProc proc, void * client_data));
|
||||
#else
|
||||
extern int DTMaddInput DTM_PROTO(( int port, long condition,
|
||||
DTMfuncPtr proc, caddr_t client_data));
|
||||
DTMfuncPtr proc, void * client_data));
|
||||
#endif
|
||||
|
||||
extern DTMerr DTMerrno;
|
||||
|
|
|
@ -463,10 +463,10 @@ extern char * dtm_find_tag DTM_PROTO(( char *, char *));
|
|||
extern int dtm_accept_read_connections DTM_PROTO(( DTMPORT *pp,int fWait ));
|
||||
extern void dtm_set_Xcallback DTM_PROTO(( DTMPORT *pp, Inport * inp ));
|
||||
#ifdef _XtIntrinsic_h
|
||||
extern void dtm_handle_in DTM_PROTO(( caddr_t client_data,
|
||||
extern void dtm_handle_in DTM_PROTO(( void * client_data,
|
||||
int * fd, XtInputId * in ));
|
||||
#else
|
||||
extern void dtm_handle_in DTM_PROTO(( caddr_t client_data,
|
||||
extern void dtm_handle_in DTM_PROTO(( void * client_data,
|
||||
int * fd, void * in ));
|
||||
#endif
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <sys/types.h>
|
||||
|
||||
struct iovec {
|
||||
caddr_t iov_base;
|
||||
void * iov_base;
|
||||
long int iov_len;
|
||||
};
|
||||
|
||||
|
@ -39,11 +39,11 @@ struct uio {
|
|||
};
|
||||
|
||||
struct msghdr {
|
||||
caddr_t msg_name; /* optional address */
|
||||
void * msg_name; /* optional address */
|
||||
long int msg_namelen; /* size of address */
|
||||
struct iovec *msg_iov; /* scatter/gather array */
|
||||
long int msg_iovlen; /* # elements in msg_iov */
|
||||
caddr_t msg_accrights; /* access rights sent/received */
|
||||
void * msg_accrights; /* access rights sent/received */
|
||||
long int msg_accrightslen;
|
||||
};
|
||||
|
||||
|
|
|
@ -665,7 +665,7 @@ int dtm_writev_buffer( fd, iov, iovlen, iovsize, addr, addrlen )
|
|||
|
||||
DBGINT("# dtm_writev_buffer called, fd %d.\n", fd );
|
||||
|
||||
msgbuf.msg_name = (caddr_t)addr ;
|
||||
msgbuf.msg_name = (void *)addr ;
|
||||
msgbuf.msg_namelen = addrlen ;
|
||||
msgbuf.msg_iov = iov ;
|
||||
msgbuf.msg_iovlen = iovlen ;
|
||||
|
|
|
@ -45,10 +45,10 @@
|
|||
|
||||
#include <sys\types.h>
|
||||
|
||||
typedef char far *caddr_t;
|
||||
typedef char far *void *;
|
||||
|
||||
struct iovec {
|
||||
caddr_t iov_base;
|
||||
void * iov_base;
|
||||
long int iov_len;
|
||||
};
|
||||
|
||||
|
@ -62,11 +62,11 @@ struct uio {
|
|||
};
|
||||
|
||||
struct msghdr {
|
||||
caddr_t msg_name; /* optional address */
|
||||
void * msg_name; /* optional address */
|
||||
long int msg_namelen; /* size of address */
|
||||
struct iovec *msg_iov; /* scatter/gather array */
|
||||
long int msg_iovlen; /* # elements in msg_iov */
|
||||
caddr_t msg_accrights; /* access rights sent/received */
|
||||
void * msg_accrights; /* access rights sent/received */
|
||||
long int msg_accrightslen;
|
||||
};
|
||||
|
||||
|
|
22
libdtm/x.c
22
libdtm/x.c
|
@ -67,10 +67,10 @@
|
|||
#endif
|
||||
|
||||
#ifdef DTM_PROTOTYPES
|
||||
void dtm_handle_new_in( caddr_t client_data, int * fd, XtInputId * id)
|
||||
void dtm_handle_new_in( void * client_data, int * fd, XtInputId * id)
|
||||
#else
|
||||
void dtm_handle_new_in( client_data, fd, id )
|
||||
caddr_t client_data;
|
||||
void * client_data;
|
||||
int * fd;
|
||||
XtInputId * id;
|
||||
#endif
|
||||
|
@ -82,10 +82,10 @@ void dtm_handle_new_in( client_data, fd, id )
|
|||
}
|
||||
|
||||
#ifdef DTM_PROTOTYPES
|
||||
void dtm_handle_new_out( caddr_t client_data, int * fd, XtInputId * id)
|
||||
void dtm_handle_new_out( void * client_data, int * fd, XtInputId * id)
|
||||
#else
|
||||
void dtm_handle_new_out( client_data, fd, id )
|
||||
caddr_t client_data;
|
||||
void * client_data;
|
||||
int * fd;
|
||||
XtInputId * id;
|
||||
#endif
|
||||
|
@ -121,14 +121,14 @@ void dtm_handle_new_out( client_data, fd, id )
|
|||
automatically handled.
|
||||
*/
|
||||
#ifdef DTM_PROTOTYPES
|
||||
int DTMaddInput( int p_ext, caddr_t condition,
|
||||
XtInputCallbackProc proc, caddr_t client_data )
|
||||
int DTMaddInput( int p_ext, void * condition,
|
||||
XtInputCallbackProc proc, void * client_data )
|
||||
#else
|
||||
int DTMaddInput( p_ext, condition, proc, client_data )
|
||||
int p_ext;
|
||||
caddr_t condition;
|
||||
void * condition;
|
||||
XtInputCallbackProc proc;
|
||||
caddr_t client_data;
|
||||
void * client_data;
|
||||
#endif
|
||||
{
|
||||
reg DTMPORT *pp;
|
||||
|
@ -149,14 +149,14 @@ int DTMaddInput( p_ext, condition, proc, client_data )
|
|||
Set up callback for new connections
|
||||
*/
|
||||
XtAddInput( pp->sockfd, XtInputReadMask, dtm_handle_new_in,
|
||||
(caddr_t) p );
|
||||
(void *) p );
|
||||
FOR_EACH_IN_PORT( inp, pp ) {
|
||||
inp->XinputId = XtAddInput( inp->fd, XtInputReadMask,
|
||||
dtm_handle_in, (caddr_t) p );
|
||||
dtm_handle_in, (void *) p );
|
||||
}
|
||||
} else {
|
||||
XtAddInput( pp->sockfd, XtInputReadMask, dtm_handle_new_out,
|
||||
(caddr_t) p );
|
||||
(void *) p );
|
||||
}
|
||||
return DTM_OK;
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Sun Sep 12 20:03:49 GMT 1993 Gustaf Neumann
|
||||
*/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#ifndef MOTIF
|
||||
|
||||
#include <X11/IntrinsicP.h>
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
* * printing of tables and forms fields (and any new features that appear)
|
||||
*
|
||||
*/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <string.h>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "HTMLP.h"
|
||||
|
@ -290,31 +290,31 @@ static XtResource resources[] =
|
|||
{ WbNmarginWidth,
|
||||
WbCMarginWidth, XtRDimension, sizeof (Dimension),
|
||||
XtOffset (HTMLWidget, html.margin_width),
|
||||
XtRImmediate, (caddr_t) MARGIN_DEFAULT
|
||||
XtRImmediate, (void *) MARGIN_DEFAULT
|
||||
},
|
||||
|
||||
{ WbNmarginHeight,
|
||||
WbCMarginHeight, XtRDimension, sizeof (Dimension),
|
||||
XtOffset (HTMLWidget, html.margin_height),
|
||||
XtRImmediate, (caddr_t) MARGIN_DEFAULT
|
||||
XtRImmediate, (void *) MARGIN_DEFAULT
|
||||
},
|
||||
|
||||
{ WbNanchorCallback,
|
||||
XtCCallback, XtRCallback, sizeof (XtCallbackList),
|
||||
XtOffset (HTMLWidget, html.anchor_callback),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{ WbNlinkCallback,
|
||||
XtCCallback, XtRCallback, sizeof (XtCallbackList),
|
||||
XtOffset (HTMLWidget, html.link_callback),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{ WbNsubmitFormCallback,
|
||||
XtCCallback, XtRCallback, sizeof (XtCallbackList),
|
||||
XtOffset (HTMLWidget, html.form_callback),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{ WbNtext,
|
||||
|
@ -597,21 +597,21 @@ static XtResource resources[] =
|
|||
WbCPreviouslyVisitedTestFunction, XtRPointer,
|
||||
sizeof (XtPointer),
|
||||
XtOffset (HTMLWidget, html.previously_visited_test),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{ WbNresolveImageFunction,
|
||||
WbCResolveImageFunction, XtRPointer,
|
||||
sizeof (XtPointer),
|
||||
XtOffset (HTMLWidget, html.resolveImage),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{ WbNresolveDelayedImage,
|
||||
WbCResolveDelayedImage, XtRPointer,
|
||||
sizeof (XtPointer),
|
||||
XtOffset (HTMLWidget, html.resolveDelayedImage),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
{
|
||||
|
@ -619,7 +619,7 @@ static XtResource resources[] =
|
|||
WbCPointerMotionCallback, XtRPointer,
|
||||
sizeof (XtPointer),
|
||||
XtOffset (HTMLWidget, html.pointer_motion_callback),
|
||||
XtRImmediate, (caddr_t) NULL
|
||||
XtRImmediate, (void *) NULL
|
||||
},
|
||||
|
||||
};
|
||||
|
@ -958,7 +958,7 @@ XGCValues values;
|
|||
static void
|
||||
DrawExpose(w, data, event)
|
||||
Widget w;
|
||||
caddr_t data;
|
||||
void * data;
|
||||
XEvent *event;
|
||||
{
|
||||
|
||||
|
@ -1466,8 +1466,8 @@ ScrollToPos(w, hw, value)
|
|||
void
|
||||
ScrollMove(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
#ifdef MOTIF
|
||||
XmScrollBarCallbackStruct *sc = (XmScrollBarCallbackStruct *)call_data;
|
||||
|
@ -1505,8 +1505,8 @@ ScrollMove(w, client_data, call_data)
|
|||
void
|
||||
JumpMove(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
HTMLWidget hw = (HTMLWidget)client_data;
|
||||
int value = (int)(*(float *)call_data *
|
||||
|
@ -1561,7 +1561,7 @@ CreateScrollbars(
|
|||
*/
|
||||
XtAddEventHandler((Widget)hw->html.view,
|
||||
ExposureMask|VisibilityChangeMask, True,
|
||||
(XtEventHandler)DrawExpose, (caddr_t)hw);
|
||||
(XtEventHandler)DrawExpose, (void *)hw);
|
||||
hw->html.obscured=0;
|
||||
|
||||
/*
|
||||
|
@ -1600,16 +1600,16 @@ CreateScrollbars(
|
|||
*/
|
||||
#ifdef MOTIF
|
||||
XtAddCallback(hw->html.vbar, XmNvalueChangedCallback,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
|
||||
XtAddCallback(hw->html.vbar, XmNdragCallback,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
|
||||
#else
|
||||
XtAddCallback(hw->html.vbar, XtNjumpProc,
|
||||
(XtCallbackProc)JumpMove, (caddr_t)hw);
|
||||
(XtCallbackProc)JumpMove, (void *)hw);
|
||||
XtAddCallback(hw->html.vbar, XtNscrollProc,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -1637,14 +1637,14 @@ CreateScrollbars(
|
|||
*/
|
||||
#ifdef MOTIF
|
||||
XtAddCallback(hw->html.hbar, XmNvalueChangedCallback,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
XtAddCallback(hw->html.hbar, XmNdragCallback,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
#else
|
||||
XtAddCallback(hw->html.hbar, XtNjumpProc,
|
||||
(XtCallbackProc)JumpMove, (caddr_t)hw);
|
||||
(XtCallbackProc)JumpMove, (void *)hw);
|
||||
XtAddCallback(hw->html.hbar, XtNscrollProc,
|
||||
(XtCallbackProc)ScrollMove, (caddr_t)hw);
|
||||
(XtCallbackProc)ScrollMove, (void *)hw);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -4744,7 +4744,7 @@ static Boolean
|
|||
ConvertSelection(w, selection, target, type, value, length, format)
|
||||
Widget w;
|
||||
Atom *selection, *target, *type;
|
||||
caddr_t *value;
|
||||
void * *value;
|
||||
unsigned long *length;
|
||||
int *format;
|
||||
{
|
||||
|
@ -4763,11 +4763,11 @@ ConvertSelection(w, selection, target, type, value, length, format)
|
|||
Atom *std_targets;
|
||||
unsigned long std_length;
|
||||
XmuConvertStandardSelection( w, hw->html.selection_time,
|
||||
selection, target, type, (caddr_t*)&std_targets,
|
||||
selection, target, type, (void **)&std_targets,
|
||||
&std_length, format);
|
||||
|
||||
*length = std_length + 5;
|
||||
*value = (caddr_t)XtMalloc(sizeof(Atom)*(*length));
|
||||
*value = (void *)XtMalloc(sizeof(Atom)*(*length));
|
||||
targetP = *(Atom**)value;
|
||||
*targetP++ = XA_STRING;
|
||||
*targetP++ = XA_TEXT(d);
|
||||
|
|
|
@ -52,6 +52,8 @@
|
|||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifndef HTML_H
|
||||
#define HTML_H
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#ifndef VMS
|
||||
#include <sys/time.h>
|
||||
struct timeval Tv;
|
||||
|
|
|
@ -51,14 +51,14 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include "HTMLP.h"
|
||||
#include "NoImage.xbm"
|
||||
#include "DelayedImage.xbm"
|
||||
#include "AnchoredImage.xbm"
|
||||
#include "NoImage.c"
|
||||
#include "DelayedImage.c"
|
||||
#include "AnchoredImage.c"
|
||||
|
||||
/* SWP -- Now use eptr->bwidth -- 02/08/96
|
||||
#define IMAGE_BORDER 2 */
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#ifdef MOTIF
|
||||
|
||||
/*
|
||||
|
@ -82,9 +82,9 @@
|
|||
#endif /* DEC C V5.2 socket.h conflicts with SOCKETSHR types.h, GEC */
|
||||
#include <socket.h>
|
||||
#ifdef __SOCKET_TYPEDEFS
|
||||
#define CADDR_T
|
||||
#define __CADDR_T
|
||||
#endif /* Different CADDR_T defs in VMS include files, BSN OK for OVMS 1.5? */
|
||||
#define void *
|
||||
#define __void *
|
||||
#endif /* Different void * defs in VMS include files, BSN OK for OVMS 1.5? */
|
||||
#include <in.h>
|
||||
#include <netdb.h>
|
||||
#ifdef SOCKETSHR /* BGT */
|
||||
|
@ -108,7 +108,7 @@
|
|||
#endif /* MULTINET - UCX, BSN */
|
||||
#endif /* VMS, BSN */
|
||||
|
||||
#ifdef VMS /* moved here to preclude warning message about caddr_t */
|
||||
#ifdef VMS /* moved here to preclude warning message about void * */
|
||||
#ifdef __DECC
|
||||
#define _POSIX_C_SOURCE
|
||||
#endif /* DEC C, GEC */
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "HTML.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
* Comments and questions are welcome and can be sent to *
|
||||
* mosaic-x@ncsa.uiuc.edu. *
|
||||
****************************************************************************/
|
||||
#include "../config.h"
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
@ -179,8 +179,8 @@ setTextSize(w, columns, lines)
|
|||
void
|
||||
CBListDestroy(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
char **string_list=NULL, **p;
|
||||
int item_count;
|
||||
|
@ -203,8 +203,8 @@ CBListDestroy(w, client_data, call_data)
|
|||
void
|
||||
CBTextDestroy(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
char *txt = (char *)client_data;
|
||||
free(txt);
|
||||
|
@ -214,8 +214,8 @@ CBTextDestroy(w, client_data, call_data)
|
|||
void
|
||||
CBoption(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
Widget menuButton = (Widget)client_data;
|
||||
char *label;
|
||||
|
@ -662,8 +662,8 @@ ImageSubmitForm(fptr, event, name, x, y)
|
|||
void
|
||||
CBSubmitForm(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
FormInfo *fptr = (FormInfo *)client_data;
|
||||
HTMLWidget hw = (HTMLWidget)(fptr->hw);
|
||||
|
@ -701,8 +701,8 @@ CBSubmitForm(w, client_data, call_data)
|
|||
void
|
||||
CBChangeRadio(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
FormInfo *fptr = (FormInfo *)client_data;
|
||||
HTMLWidget hw = (HTMLWidget)(fptr->hw);
|
||||
|
@ -850,8 +850,8 @@ CBChangeRadio(w, client_data, call_data)
|
|||
void
|
||||
CBPasswordModify(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
FormInfo *fptr = (FormInfo *)client_data;
|
||||
XmTextVerifyCallbackStruct *tv =(XmTextVerifyCallbackStruct *)call_data;
|
||||
|
@ -1039,8 +1039,8 @@ CBPasswordModify(w, client_data, call_data)
|
|||
void
|
||||
CBActivateField(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
FormInfo *fptr = (FormInfo *)client_data;
|
||||
HTMLWidget hw = (HTMLWidget)(fptr->hw);
|
||||
|
@ -1116,8 +1116,8 @@ CBActivateField(w, client_data, call_data)
|
|||
void
|
||||
CBResetForm(w, client_data, call_data)
|
||||
Widget w;
|
||||
caddr_t client_data;
|
||||
caddr_t call_data;
|
||||
void * client_data;
|
||||
void * call_data;
|
||||
{
|
||||
FormInfo *fptr = (FormInfo *)client_data;
|
||||
HTMLWidget hw = (HTMLWidget)(fptr->hw);
|
||||
|
@ -1480,10 +1480,10 @@ PrepareFormEnd(hw, w, fptr)
|
|||
{
|
||||
#ifdef MOTIF
|
||||
XtAddCallback(w, XmNactivateCallback,
|
||||
(XtCallbackProc)CBSubmitForm, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBSubmitForm, (void *)fptr);
|
||||
#else
|
||||
XtAddCallback(w, XtNcallback,
|
||||
(XtCallbackProc)CBSubmitForm, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBSubmitForm, (void *)fptr);
|
||||
#endif /* MOTIF */
|
||||
}
|
||||
|
||||
|
@ -1496,10 +1496,10 @@ PrepareFormReset(hw, w, fptr)
|
|||
{
|
||||
#ifdef MOTIF
|
||||
XtAddCallback(w, XmNactivateCallback,
|
||||
(XtCallbackProc)CBResetForm, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBResetForm, (void *)fptr);
|
||||
#else
|
||||
XtAddCallback(w, XtNcallback,
|
||||
(XtCallbackProc)CBResetForm, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBResetForm, (void *)fptr);
|
||||
#endif /* MOTIF */
|
||||
}
|
||||
|
||||
|
@ -2331,7 +2331,7 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
XtSetMappedWhenManaged(w, False);
|
||||
XtManageChild(w);
|
||||
XtAddCallback(w, XmNvalueChangedCallback,
|
||||
(XtCallbackProc)CBChangeRadio, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBChangeRadio, (void *)fptr);
|
||||
|
||||
XmStringFree(label);
|
||||
}
|
||||
|
@ -2922,9 +2922,9 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
XtSetMappedWhenManaged(w, False);
|
||||
#endif /* MOTIF1_2 */
|
||||
XtAddCallback(w, XmNactivateCallback,
|
||||
(XtCallbackProc)CBActivateField, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBActivateField, (void *)fptr);
|
||||
XtAddCallback(w, XmNmodifyVerifyCallback,
|
||||
(XtCallbackProc)CBPasswordModify, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBPasswordModify, (void *)fptr);
|
||||
}
|
||||
else if ((type_str != NULL)&&(my_strcasecmp(type_str, "textarea") ==0))
|
||||
{
|
||||
|
@ -3185,7 +3185,7 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
if (type == W_TEXTFIELD)
|
||||
{
|
||||
XtAddCallback(w, XmNactivateCallback,
|
||||
(XtCallbackProc)CBActivateField, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBActivateField, (void *)fptr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3388,7 +3388,7 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
XtSetMappedWhenManaged(w, False);
|
||||
XtManageChild(w);
|
||||
XtAddCallback(w, XtNcallback,
|
||||
(XtCallbackProc)CBChangeRadio, (caddr_t)fptr);
|
||||
(XtCallbackProc)CBChangeRadio, (void *)fptr);
|
||||
}
|
||||
else if ((type_str != NULL)&&(my_strcasecmp(type_str, "submit") == 0))
|
||||
{
|
||||
|
@ -3823,7 +3823,7 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
{
|
||||
XtAddCallback(w, XtNdestroyCallback,
|
||||
(XtCallbackProc)CBTextDestroy,
|
||||
(caddr_t)txt);
|
||||
(void *)txt);
|
||||
}
|
||||
|
||||
XtOverrideTranslations(w,
|
||||
|
@ -4023,7 +4023,7 @@ MakeWidget(hw, text, x, y, id, fptr)
|
|||
if (maxlength > 0)
|
||||
{
|
||||
XtAddCallback(w, XtNdestroyCallback,
|
||||
CBTextDestroy, (caddr_t)txt);
|
||||
CBTextDestroy, (void *)txt);
|
||||
}
|
||||
|
||||
XtOverrideTranslations(w,
|
||||
|
|
4
libhtmlw/config.h
Normal file
4
libhtmlw/config.h
Normal file
|
@ -0,0 +1,4 @@
|
|||
#define MOTIF1_2
|
||||
#define LINUX
|
||||
#define MOTIF
|
||||
#define XMOSAIC
|
27
libhtmlw/meson.build
Normal file
27
libhtmlw/meson.build
Normal file
|
@ -0,0 +1,27 @@
|
|||
sources = [
|
||||
'DrawingArea.c',
|
||||
'HTML-PSformat.c',
|
||||
'HTML.c',
|
||||
'HTMLformat.c',
|
||||
'HTMLimages.c',
|
||||
'HTMLjot.c',
|
||||
'HTMLlists.c',
|
||||
'HTMLparse.c',
|
||||
'HTMLtable.c',
|
||||
'HTMLwidgets.c',
|
||||
'list.c',
|
||||
'AnchoredImage.c',
|
||||
'DelayedImage.c',
|
||||
'NoImage.c'
|
||||
]
|
||||
|
||||
|
||||
libhtmlw_inc = include_directories('.')
|
||||
|
||||
libhtmlw_static = static_library(
|
||||
'htmlw',
|
||||
sources,
|
||||
dependencies: [openmotif, xmu],
|
||||
include_directories: libhtmlw_inc
|
||||
)
|
||||
|
62
libnet/net.c
62
libnet/net.c
|
@ -113,11 +113,11 @@ static char rcs_id[] = "$Id: net.c,v 1.4 1995/10/15 18:48:57 spowers Exp $";
|
|||
typedef struct { /* Data Object Call Back */
|
||||
char *moduleName;
|
||||
void (*newCB)();
|
||||
caddr_t newData;
|
||||
void * newData;
|
||||
void (*changeCB)();
|
||||
caddr_t changeData;
|
||||
void * changeData;
|
||||
void (*destroyCB)();
|
||||
caddr_t destroyData;
|
||||
void * destroyData;
|
||||
} DOCB;
|
||||
|
||||
typedef struct { /* Send Queue */
|
||||
|
@ -128,17 +128,17 @@ typedef struct { /* Send Queue */
|
|||
DTMTYPE type;
|
||||
int numTries; /* number of attempted sends */
|
||||
void (*cb)(); /* called on succes cb(data,cbData) */
|
||||
caddr_t cbData; /* call back data */
|
||||
void * cbData; /* call back data */
|
||||
void (*failCB)(); /* called on failure failCB(data,failCBData) */
|
||||
caddr_t failCBData; /* fail call back data */
|
||||
void * failCBData; /* fail call back data */
|
||||
} SQueue;
|
||||
|
||||
typedef struct {
|
||||
caddr_t internal;
|
||||
void * internal;
|
||||
void (*cb)();
|
||||
caddr_t cbData;
|
||||
void * cbData;
|
||||
void (*failCB)();
|
||||
caddr_t failCBData;
|
||||
void * failCBData;
|
||||
} ExecCBData;
|
||||
|
||||
|
||||
|
@ -366,11 +366,11 @@ int NetRegisterModule(name,netType,new,newData,change,changeData,
|
|||
char *name; /* module Name */
|
||||
NetType netType; /* DTM class */
|
||||
void (*new)(); /* New data Object callback */
|
||||
caddr_t newData;
|
||||
void * newData;
|
||||
void (*change)(); /* Data object has changed callback */
|
||||
caddr_t changeData;
|
||||
void * changeData;
|
||||
void (*destroy)(); /* Data object destroyed callback */
|
||||
caddr_t destroyData;
|
||||
void * destroyData;
|
||||
{
|
||||
DOCB *docb;
|
||||
char itsNew;
|
||||
|
@ -2487,10 +2487,10 @@ char *header AND
|
|||
GenericPtr data AND
|
||||
long num AND
|
||||
DTMTYPE type AND
|
||||
void (*cb) PARAMS((GenericPtr data, caddr_t cbData)) AND
|
||||
caddr_t cbData AND
|
||||
void (*failCB) PARAMS((GenericPtr data, caddr_t failCBData)) AND
|
||||
caddr_t failCBData AND
|
||||
void (*cb) PARAMS((GenericPtr data, void * cbData)) AND
|
||||
void * cbData AND
|
||||
void (*failCB) PARAMS((GenericPtr data, void * failCBData)) AND
|
||||
void * failCBData AND
|
||||
int doQueue) /* TRUE -> Save and resend; FALSE -> let client resend*/
|
||||
|
||||
{
|
||||
|
@ -2747,7 +2747,7 @@ static void
|
|||
DEFUN(NetFreeDataCB,(p, client_data),
|
||||
/* Free space after it has been sent */
|
||||
GenericPtr p AND
|
||||
caddr_t client_data)
|
||||
void * client_data)
|
||||
{
|
||||
FREE(p);
|
||||
}
|
||||
|
@ -2814,7 +2814,7 @@ register long i;
|
|||
|
||||
if (status == -1)
|
||||
{
|
||||
NetFreeDataCB(a, (caddr_t)NULL);
|
||||
NetFreeDataCB(a, (void *)NULL);
|
||||
}
|
||||
|
||||
return(status);
|
||||
|
@ -3723,16 +3723,16 @@ char *retAddress;
|
|||
int argc;
|
||||
char **argv;
|
||||
void (*cb)();
|
||||
caddr_t cbData;
|
||||
void * cbData;
|
||||
void (*failCB)();
|
||||
caddr_t failCBData;
|
||||
void * failCBData;
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
static NetExecCB(data,client_data)
|
||||
caddr_t data;
|
||||
caddr_t client_data;
|
||||
void * data;
|
||||
void * client_data;
|
||||
{
|
||||
ExecCBData *ecbd;
|
||||
|
||||
|
@ -3746,8 +3746,8 @@ ExecCBData *ecbd;
|
|||
}
|
||||
|
||||
static NetExecFailCB(data,client_data)
|
||||
caddr_t data;
|
||||
caddr_t client_data;
|
||||
void * data;
|
||||
void * client_data;
|
||||
{
|
||||
ExecCBData *ecbd;
|
||||
|
||||
|
@ -3764,9 +3764,9 @@ int NetSendHostStatusRequest(outPortAddr,retAddress,cb,cbData,failCB,failCBData)
|
|||
char *outPortAddr;
|
||||
char *retAddress;
|
||||
void (*cb)();
|
||||
caddr_t cbData;
|
||||
void * cbData;
|
||||
void (*failCB)();
|
||||
caddr_t failCBData;
|
||||
void * failCBData;
|
||||
{
|
||||
char header[DTM_MAX_HEADER];
|
||||
NetPort *netPort;
|
||||
|
@ -3781,7 +3781,7 @@ time_t now;
|
|||
ErrMesg("Out of Memory\n");
|
||||
return(-1);
|
||||
}
|
||||
ecbd->internal = (caddr_t) netPort;
|
||||
ecbd->internal = (void *) netPort;
|
||||
ecbd->cb = cb;
|
||||
ecbd->cbData = cbData;
|
||||
ecbd->failCB = failCB;
|
||||
|
@ -3818,9 +3818,9 @@ char *timeStamp;
|
|||
float load1,load5,load15;
|
||||
int numUsers;
|
||||
void (*cb)();
|
||||
caddr_t cbData;
|
||||
void * cbData;
|
||||
void (*failCB)();
|
||||
caddr_t failCBData;
|
||||
void * failCBData;
|
||||
{
|
||||
char header[DTM_MAX_HEADER];
|
||||
NetPort *netPort;
|
||||
|
@ -3834,7 +3834,7 @@ ExecCBData *ecbd;
|
|||
ErrMesg("Out of Memory\n");
|
||||
return(-1);
|
||||
}
|
||||
ecbd->internal = (caddr_t) netPort;
|
||||
ecbd->internal = (void *) netPort;
|
||||
ecbd->cb = cb;
|
||||
ecbd->cbData = cbData;
|
||||
ecbd->failCB = failCB;
|
||||
|
@ -3873,9 +3873,9 @@ int NetSendMessage(netPort,message,cb,cbData,failCB,failCBData)
|
|||
NetPort *netPort;
|
||||
char *message;
|
||||
void (*cb)();
|
||||
caddr_t cbData;
|
||||
void * cbData;
|
||||
void (*failCB)();
|
||||
caddr_t failCBData;
|
||||
void * failCBData;
|
||||
{
|
||||
char header[DTM_MAX_HEADER];
|
||||
char tmp[DTM_STRING_SIZE];
|
||||
|
|
10
libnet/net.h
10
libnet/net.h
|
@ -100,9 +100,9 @@ typedef struct {
|
|||
|
||||
extern void NetSetASync PARAMS((int set));
|
||||
extern int NetRegisterModule
|
||||
PARAMS((char *name, NetType netType, void (*new)(), caddr_t newData,
|
||||
void (*change)(), caddr_t changeData, void (*destroy)(),
|
||||
caddr_t destroyData));
|
||||
PARAMS((char *name, NetType netType, void (*new)(), void * newData,
|
||||
void (*change)(), void * changeData, void (*destroy)(),
|
||||
void * destroyData));
|
||||
extern void NetDestroyPort PARAMS((NetPort *netPort));
|
||||
extern NetPort *NetCreateInPort PARAMS((char *inPortAddr));
|
||||
extern NetPort *NetCreateOutPort PARAMS((char *outPortAddr));
|
||||
|
@ -172,8 +172,8 @@ extern int NetSendCommand
|
|||
void (*failCB)()));
|
||||
extern int NetGetListOfUsers PARAMS((int max, char **users));
|
||||
extern int NetSendMessage
|
||||
PARAMS((NetPort *netPort, char *message, void (*cb)(), caddr_t cbData,
|
||||
void (*failCB)(), caddr_t failCBData));
|
||||
PARAMS((NetPort *netPort, char *message, void (*cb)(), void * cbData,
|
||||
void (*failCB)(), void * failCBData));
|
||||
extern void NetSetTimeOut
|
||||
PARAMS((int seconds));
|
||||
extern int NetGetTimeOut PARAMS((void));
|
||||
|
|
|
@ -38,4 +38,4 @@ typedef struct {
|
|||
} Exec;
|
||||
/****************************/
|
||||
|
||||
static void NetFreeDataCB PARAMS((GenericPtr data, caddr_t cbData));
|
||||
static void NetFreeDataCB PARAMS((GenericPtr data, void * cbData));
|
||||
|
|
11
libnut/meson.build
Normal file
11
libnut/meson.build
Normal file
|
@ -0,0 +1,11 @@
|
|||
sources = [
|
||||
'mm.c', 'str-tools.c', 'system.c', 'url-utils.c'
|
||||
]
|
||||
|
||||
libnut_inc = include_directories('.')
|
||||
|
||||
libnut_static = static_library(
|
||||
'nut',
|
||||
sources,
|
||||
include_directories: libnut_inc
|
||||
)
|
49
libwww2/meson.build
Normal file
49
libwww2/meson.build
Normal file
|
@ -0,0 +1,49 @@
|
|||
sources = [
|
||||
'CUkerb.c',
|
||||
'HTAccess.c',
|
||||
'HTAlert.c',
|
||||
'HTAnchor.c',
|
||||
'HTAtom.c',
|
||||
'HTSort.c',
|
||||
'HTChunk.c',
|
||||
'HTFTP.c',
|
||||
'HTFWriter.c',
|
||||
'HTFile.c',
|
||||
'HTFormat.c',
|
||||
'HTGopher.c',
|
||||
'HTInit.c',
|
||||
'HTList.c',
|
||||
'HTMIME.c',
|
||||
'HTML.c',
|
||||
'HTMLDTD.c',
|
||||
'HTMLGen.c',
|
||||
'HTNews.c',
|
||||
'HTParse.c',
|
||||
'HTPlain.c',
|
||||
'HTMosaicHTML.c',
|
||||
'HTString.c',
|
||||
'HTTCP.c',
|
||||
'HTTP.c',
|
||||
'HTTelnet.c',
|
||||
'HTWSRC.c',
|
||||
'HTWriter.c',
|
||||
'SGML.c',
|
||||
'HTWAIS.c',
|
||||
'HTIcon.c',
|
||||
'HTCompressed.c',
|
||||
'HTAAUtil.c',
|
||||
'HTAssoc.c',
|
||||
'HTUU.c',
|
||||
'HTAABrow.c',
|
||||
'HTMailto.c'
|
||||
]
|
||||
|
||||
libwww2_inc = include_directories('.')
|
||||
|
||||
libwww2_static = static_library(
|
||||
'www2',
|
||||
sources,
|
||||
dependencies: compactstring,
|
||||
include_directories: libwww2_inc
|
||||
)
|
||||
|
26
meson.build
Normal file
26
meson.build
Normal file
|
@ -0,0 +1,26 @@
|
|||
project(
|
||||
'ncsa-mosaic',
|
||||
'c',
|
||||
version: '2.7b6-flatpak2'
|
||||
)
|
||||
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
openmotif = cc.find_library('Xm', required: true)
|
||||
xmu = dependency('xmu')
|
||||
|
||||
include_dir = include_directories('.')
|
||||
|
||||
subdir('libnut')
|
||||
subdir('libcompactstring')
|
||||
compactstring = declare_dependency(link_with: libcompactstring_static, include_directories: include_dir)
|
||||
subdir('libwww2')
|
||||
subdir('libXmx')
|
||||
subdir('libhtmlw')
|
||||
|
||||
nut = declare_dependency(link_with: libnut_static, include_directories: include_dir)
|
||||
www2 = declare_dependency(link_with: libwww2_static, include_directories: include_dir)
|
||||
Xmx = declare_dependency(link_with: libXmx_static, include_directories: include_dir)
|
||||
htmlw = declare_dependency(link_with: libhtmlw_static, include_directories: include_dir)
|
||||
|
||||
subdir('src')
|
10
src/bla.c
10
src/bla.c
|
@ -62,11 +62,11 @@
|
|||
#include "list.h"
|
||||
#include "memStuffForPipSqueeks.h"
|
||||
|
||||
#include "HTPlain.h"
|
||||
#include "HTUtils.h"
|
||||
#include "HText.h"
|
||||
#include "HTFile.h"
|
||||
#include "HTCompressed.h"
|
||||
#include "libwww2/HTPlain.h"
|
||||
#include "libwww2/HTUtils.h"
|
||||
#include "libwww2/HText.h"
|
||||
#include "libwww2/HTFile.h"
|
||||
#include "libwww2/HTCompressed.h"
|
||||
|
||||
extern void MoCCISendOutputToClient();
|
||||
extern void HTCompressedFileToFile (char *fnam, int compressed);
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
#include "list.h"
|
||||
#include "memStuffForPipSqueeks.h"
|
||||
|
||||
#include "HTFormat.h"
|
||||
#include "libwww2/HTFormat.h"
|
||||
|
||||
static Boolean cciAccepting = 0;
|
||||
static int listenPortNumber=0;
|
||||
|
|
|
@ -58,7 +58,7 @@ extern int srcTrace;
|
|||
|
||||
#include "mfhdf.h"
|
||||
#include "mosaic.h"
|
||||
#include "libhtmlw/HTML.h" /* for ImageInfo */
|
||||
#include "HTML.h" /* for ImageInfo */
|
||||
#ifdef HAVE_DTM
|
||||
#include "netdata.h"
|
||||
#endif
|
||||
|
|
55
src/meson.build
Normal file
55
src/meson.build
Normal file
|
@ -0,0 +1,55 @@
|
|||
sources = [
|
||||
'main.c',
|
||||
'gui.c',
|
||||
'gui-dialogs.c',
|
||||
'gui-menubar.c',
|
||||
'gui-documents.c',
|
||||
'gui-news.c',
|
||||
'newsrc.c',
|
||||
'gui-extras.c',
|
||||
'mo-www.c',
|
||||
'mo-dtm.c',
|
||||
'hotlist.c',
|
||||
'history.c',
|
||||
'annotate.c',
|
||||
'pan.c',
|
||||
'grpan.c',
|
||||
'grpan-www.c',
|
||||
'audan.c',
|
||||
'globalhist.c',
|
||||
'img.c',
|
||||
'picread.c',
|
||||
'xpmhash.c',
|
||||
'xpmread.c',
|
||||
'gifread.c',
|
||||
'pixmaps.c',
|
||||
'medcut.c',
|
||||
'mo-hdf.c',
|
||||
'hotfile.c',
|
||||
'child.c',
|
||||
'mailto.c',
|
||||
'readJPEG.c',
|
||||
'readPNG.c',
|
||||
'accept.c',
|
||||
'cciServer.c',
|
||||
'cciBindings.c',
|
||||
'cciBindings2.c',
|
||||
'support.c',
|
||||
'bla.c',
|
||||
'kcms.c',
|
||||
'md5.c',
|
||||
'proxy-dialogs.c',
|
||||
'proxy-misc.c',
|
||||
'gui-popup.c',
|
||||
'gui-ftp.c',
|
||||
'prefs.c',
|
||||
'hdf-browse.c'
|
||||
]
|
||||
|
||||
exe = executable('Mosaic', sources, dependencies: [
|
||||
www2,
|
||||
Xmx,
|
||||
htmlw,
|
||||
nut,
|
||||
openmotif
|
||||
])
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
#include "net.h"
|
||||
#include "netdata.h"
|
||||
#include "libhtmlw/HTML.h" /* for ImageInfo */
|
||||
#include "HTML.h" /* for ImageInfo */
|
||||
|
||||
/* Creation of an input port implies done_init and done_register
|
||||
as well as done_inport. Creation of an output port implies
|
||||
|
@ -89,9 +89,9 @@ mo_status mo_dtm_in (char *path)
|
|||
#if 0
|
||||
NetRegisterModule
|
||||
("Mosaic", NETCOM,
|
||||
mo_receive_com, (caddr_t) state,
|
||||
NULL, (caddr_t) 0,
|
||||
NULL, (caddr_t) 0);
|
||||
mo_receive_com, (void *) state,
|
||||
NULL, (void *) 0,
|
||||
NULL, (void *) 0);
|
||||
#endif
|
||||
done_register = 1;
|
||||
}
|
||||
|
|
20
src/mo-www.c
20
src/mo-www.c
|
@ -96,16 +96,16 @@ char *saveFileName=NULL;
|
|||
#endif
|
||||
|
||||
/* libwww includes */
|
||||
#include "HTUtils.h"
|
||||
#include "HTString.h"
|
||||
#include "tcp.h"
|
||||
#include "HTTCP.h"
|
||||
#include "HTParse.h"
|
||||
#include "HTAccess.h"
|
||||
#include "HTML.h"
|
||||
#include "HText.h"
|
||||
#include "HTList.h"
|
||||
#include "HTInit.h"
|
||||
#include "libwww2/HTUtils.h"
|
||||
#include "libwww2/HTString.h"
|
||||
#include "libwww2/tcp.h"
|
||||
#include "libwww2/HTTCP.h"
|
||||
#include "libwww2/HTParse.h"
|
||||
#include "libwww2/HTAccess.h"
|
||||
#include "libwww2/HTML.h"
|
||||
#include "libwww2/HText.h"
|
||||
#include "libwww2/HTList.h"
|
||||
#include "libwww2/HTInit.h"
|
||||
#include "libnut/system.h"
|
||||
#include "libhtmlw/HTML.h"
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ typedef enum
|
|||
/* -------------------------------- MACROS -------------------------------- */
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
#define MO_VERSION_STRING "2.7b6~flatpak1" // SAM
|
||||
#define MO_VERSION_STRING "2.7b6~flatpak2" // SAM
|
||||
#define MO_GO_NCSA_COUNT 3 /* Go to the NCSA home page thrice*/
|
||||
#define MO_HELP_ON_VERSION_DOCUMENT \
|
||||
mo_assemble_help_url ("help-on-version-2.7b5.html")
|
||||
|
@ -128,7 +128,7 @@ typedef enum
|
|||
|
||||
#ifndef DOCS_DIRECTORY_DEFAULT
|
||||
#define DOCS_DIRECTORY_DEFAULT \
|
||||
"http://www.ncsa.uiuc.edu/SDG/Software/XMosaic"
|
||||
"http://web.archive.org/web/19970323041027/http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/"
|
||||
#endif
|
||||
|
||||
#ifndef HOME_PAGE_DEFAULT
|
||||
|
@ -140,7 +140,7 @@ typedef enum
|
|||
|
||||
#ifndef WHATSNEW_PAGE_DEFAULT
|
||||
#define WHATSNEW_PAGE_DEFAULT \
|
||||
"http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/Docs/whats-new.html"
|
||||
"http://web.archive.org/web/19970405230605/http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/Docs/whats-new.html"
|
||||
#endif /* not WHATSNEW_PAGE_DEFAULT */
|
||||
|
||||
#ifndef DEMO_PAGE_DEFAULT
|
||||
|
|
Reference in a new issue