Index: head/math/xgraph/files/patch-dialog.c =================================================================== --- head/math/xgraph/files/patch-dialog.c (nonexistent) +++ head/math/xgraph/files/patch-dialog.c (revision 415142) @@ -0,0 +1,20 @@ +--- dialog.c.orig 2000-08-03 16:40:44 UTC ++++ dialog.c +@@ -702,7 +702,7 @@ xtb_frame *frame; /* Returned frame */ + new_info->lines = (Window *) malloc((unsigned) (sizeof(Window) * E_LINES)); + + lineptr = text; +- while (getline(&lineptr, line)) { ++ while (get_line(&lineptr, line)) { + if (new_info->num_lines >= new_info->alloc_lines) { + new_info->alloc_lines *= 2; + new_info->lines = (Window *) realloc((char *) new_info->lines, +@@ -800,7 +800,7 @@ char *err_text; + + + +-int getline(tptr, lptr) ++int get_line(tptr, lptr) + char **tptr; + char *lptr; + /* Property changes on: head/math/xgraph/files/patch-dialog.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/xgraph/files/patch-hpgl.c =================================================================== --- head/math/xgraph/files/patch-hpgl.c (revision 415141) +++ head/math/xgraph/files/patch-hpgl.c (revision 415142) @@ -1,13 +1,13 @@ ---- hpgl.c.orig Thu Aug 3 03:31:56 2000 -+++ hpgl.c Sun Aug 6 23:45:06 2000 +--- hpgl.c.orig 2000-08-02 18:31:56 UTC ++++ hpgl.c @@ -13,9 +13,8 @@ #include "xgout.h" #include "plotter.h" #include +#include #include -#define MAX(a,b) ( ((a)>(b)) ? (a) : (b) ) -#define MIN(a,b) ( ((a)<(b)) ? (a) : (b) ) /* char *malloc(); */ static void hpglText(); Index: head/math/xgraph/files/patch-ps.c =================================================================== --- head/math/xgraph/files/patch-ps.c (revision 415141) +++ head/math/xgraph/files/patch-ps.c (revision 415142) @@ -1,10 +1,10 @@ ---- ps.c.orig Thu Jul 17 03:40:40 1997 -+++ ps.c Fri Dec 10 03:11:36 1999 -@@ -57,7 +57,6 @@ +--- ps.c.orig 2000-08-02 21:17:34 UTC ++++ ps.c +@@ -59,7 +59,6 @@ #define PS(str) OUT(psFile, str) #define PSU(str) OUT(ui->psFile, str) #define IY(val) (ui->height_devs - val) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) /* * Globals Index: head/math/xgraph/files/patch-xgraph.c =================================================================== --- head/math/xgraph/files/patch-xgraph.c (revision 415141) +++ head/math/xgraph/files/patch-xgraph.c (revision 415142) @@ -1,84 +1,84 @@ ---- xgraph.c 2000-09-10 07:05:47.000000000 -0700 -+++ xgraph.c 2014-12-15 22:32:58.000000000 -0800 -@@ -74,8 +74,6 @@ +--- xgraph.c.orig 2000-09-10 14:05:47 UTC ++++ xgraph.c +@@ -74,8 +74,6 @@ #define BTNPAD 1 #define BTNINTER 3 -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ZERO_THRES 1.0E-07 -@@ -333,6 +331,7 @@ +@@ -333,6 +331,7 @@ char *argv[]; if (!strm) { (void) fprintf(stderr, "Warning: cannot open file `%s'\n", inFileNames[idx]); + errs++; } else { if ((maxitems = ReadData(strm, inFileNames[idx])) < 0) { errs++; -@@ -403,6 +402,7 @@ +@@ -403,6 +402,7 @@ char *argv[]; fg_color = PM_COLOR("Foreground"); bg_color = PM_COLOR("Background"); XRecolorCursor(disp, zoomCursor, &fg_color, &bg_color); + init_X(win_info->dev_info.user_state); Num_Windows = 1; while (Num_Windows > 0) { -@@ -415,6 +415,12 @@ +@@ -415,6 +415,12 @@ char *argv[]; continue; } switch (theEvent.type) { + case ConfigureNotify: + win_info->dev_info.area_w = theEvent.xconfigure.width; + win_info->dev_info.area_h = theEvent.xconfigure.height; + XClearArea(disp, theEvent.xany.window, 1, 1, win_info->dev_info.area_w, win_info->dev_info.area_h, 0); + DrawWindow(win_info); + break; case Expose: if (theEvent.xexpose.count <= 0) { XWindowAttributes win_attr; -@@ -422,7 +428,7 @@ +@@ -422,7 +428,7 @@ char *argv[]; XGetWindowAttributes(disp, theEvent.xany.window, &win_attr); win_info->dev_info.area_w = win_attr.width; win_info->dev_info.area_h = win_attr.height; - init_X(win_info->dev_info.user_state); + XClearArea(disp, theEvent.xany.window, 1, 1, win_info->dev_info.area_w, win_info->dev_info.area_h, 0); DrawWindow(win_info); } break; -@@ -715,7 +721,7 @@ +@@ -715,7 +721,7 @@ int primary; /* Is this the primary wi if (sizehints.x<0) sizehints.x = 0; sizehints.y += 25; } -#endif +#else /* Aspect ratio computation */ if (asp < 1.0) { -@@ -723,6 +729,7 @@ +@@ -723,6 +729,7 @@ int primary; /* Is this the primary wi } else { height = ((int) (((double) NORMSIZE) / asp)); } +#endif height = MAX(MINDIM, height); width = MAX(MINDIM, width); -@@ -789,7 +796,7 @@ +@@ -789,7 +796,7 @@ int primary; /* Is this the primary wi new_info->flags = 0; XSelectInput(disp, new_window, - ExposureMask|KeyPressMask|ButtonPressMask); + ExposureMask|KeyPressMask|ButtonPressMask|StructureNotifyMask); if (!theCursor) { theCursor = XCreateFontCursor(disp, XC_top_left_arrow); fg_color = PM_COLOR("Foreground"); -@@ -1478,6 +1485,8 @@ +@@ -1478,6 +1485,8 @@ LineInfo *result; /* Returned result */ while (*line && (*line != '\n') && (*line != '"')) line++; if (*line) *line = '\0'; } else { + /* treat comma's as white space */ + for (first=line; *first; ++first) if (*first == ',') *first = ' '; first = line; while (*line && !isspace(*line)) line++; if (*line) { Index: head/math/xgraph/files/patch-xgraph.h =================================================================== --- head/math/xgraph/files/patch-xgraph.h (revision 415141) +++ head/math/xgraph/files/patch-xgraph.h (revision 415142) @@ -1,39 +1,39 @@ ---- xgraph.h.orig Thu Jul 17 03:40:41 1997 -+++ xgraph.h Fri Dec 10 03:10:48 1999 +--- xgraph.h.orig 1997-07-16 18:40:41 UTC ++++ xgraph.h @@ -5,7 +5,12 @@ #ifndef _XGRAPH_H_ #define _XGRAPH_H_ +#include +#include +#include #include +#undef index +#undef rindex #include #include #include -@@ -33,20 +38,9 @@ +@@ -33,20 +38,9 @@ extern void do_hardcopy(); /* Carries ou extern void ho_dialog(); /* Hardcopy dialog */ extern void set_X(); /* Initializes X device */ -#if 0 -/* To make lint happy */ -extern char *malloc(); -extern char *realloc(); -extern char *sprintf(); -extern char *strcpy(); -extern char *strcat(); -extern char *rindex(); -extern char *index(); -extern void exit(); -extern void free(); -extern double atof(); +#ifndef MAX +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -- --extern void abort(); +-extern void abort(); +- #endif /* _XGRAPH_H_ */ Index: head/math/xgraph/files/patch-xtb.c =================================================================== --- head/math/xgraph/files/patch-xtb.c (revision 415141) +++ head/math/xgraph/files/patch-xtb.c (revision 415142) @@ -1,11 +1,11 @@ ---- xtb.c.orig Thu Jul 17 04:26:41 1997 -+++ xtb.c Fri Dec 10 03:06:26 1999 -@@ -196,7 +196,7 @@ +--- xtb.c.orig 2000-08-02 18:33:01 UTC ++++ xtb.c +@@ -198,7 +198,7 @@ Window win; { xtb_data data; - if (!XFindContext(t_disp, win, h_context, &data)) { + if (!XFindContext(t_disp, win, h_context, (XPointer*)&data)) { return ((struct h_info *) data)->info; } else { return (xtb_data) 0;