Corrected errors I made during last commit. Paolo

src/circuit/ptfuncs.c

@@ -27,32 +27,38 @@ double PTfudge_factor;
 
 #define	MODULUS(NUM,LIMIT)	((NUM) - ((int) ((NUM) / (LIMIT))) * (LIMIT))
 
-double PTabs(double arg)
+double
+PTabs(double arg)
 {
     return arg >= 0.0 ? arg : -arg;
 }
 
-double PTsgn(double arg)
+double
+PTsgn(double arg)
 {
     return arg > 0.0 ? 1.0 : arg < 0.0 ? -1.0 : 0.0;
 }
 
-double PTplus(double arg1, double arg2)
+double
+PTplus(double arg1, double arg2)
 {
     return (arg1 + arg2);
 }
 
-double PTminus(double arg1, double arg2)
+double
+PTminus(double arg1, double arg2)
 {
     return (arg1 - arg2);
 }
 
-double PTtimes(double arg1, double arg2)
+double
+PTtimes(double arg1, double arg2)
 {
     return (arg1 * arg2);
 }
 
-double PTdivide(double arg1, double arg2)
+double 
+PTdivide(double arg1, double arg2)
 {
     if (arg2 >= 0.0)
 	arg2 += PTfudge_factor;
@@ -65,7 +71,8 @@ double PTdivide(double arg1, double arg2)
     return (arg1 / arg2);
 }
 
-double PTpower(double arg1, double arg2)
+double
+PTpower(double arg1, double arg2)
 {
     if (arg1 < 0.0) {
 	if (fabs(arg2 - ((int) arg2)) / (arg2 + 0.001) < 0.000001) {
@@ -77,12 +84,14 @@ double PTpower(double arg1, double arg2)
     return (pow(arg1, arg2));
 }
 
-double PTacos(double arg)
+double
+PTacos(double arg)
 {
     return (acos(arg));
 }
 
-double PTacosh(double arg)
+double
+PTacosh(double arg)
 {
 #ifdef HAVE_ACOSH
     return (acosh(arg));
@@ -93,12 +102,14 @@ double PTacosh(double arg)
 #endif 
 }
 
-double PTasin(double arg)
+double
+PTasin(double arg)
 {
     return (asin(arg));
 }
 
-double PTasinh(double arg)
+double
+PTasinh(double arg)
 {
 #ifdef HAVE_ASINH
     return (asinh(arg));
@@ -107,12 +118,14 @@ double PTasinh(double arg)
 #endif 
 }
 
-double PTatan(double arg)
+double
+PTatan(double arg)
 {
     return (atan(arg));
 }
 
-double PTatanh(double arg)
+double
+PTatanh(double arg)
 {
 #ifdef HAVE_ATANH
     return (atanh(arg));
@@ -125,7 +138,8 @@ double PTatanh(double arg)
 #endif 
 }
 
-double PTustep(double arg)
+double
+PTustep(double arg)
 {
     if (arg < 0.0)
 	return 0.0;
@@ -135,7 +149,22 @@ double PTustep(double arg)
 	return 0.5; /* Ick! */
 }
 
-double PTuramp(double arg)
+/* MW. PTcif is like "C" if - 0 for (arg<=0), 1 elsewhere */
+
+double
+PTustep2(double arg)
+{
+    if (arg <= 0.0) 
+	return 0.0;
+    else if (arg <= 1.0)
+	return arg;
+    else //if (arg > 1.0)
+	return 1.0;
+}
+
+
+double
+PTuramp(double arg)
 {
     if (arg < 0.0)
 	return 0.0;
@@ -143,75 +172,75 @@ double PTuramp(double arg)
 	return arg;
 }
 
-double PTcos(double arg)
+double
+PTcos(double arg)
 {
     return (cos(MODULUS(arg, 2 * M_PI)));
 }
 
-double PTcosh(double arg)
+double
+PTcosh(double arg)
 {
     return (cosh(arg));
 }
 
-double PTexp(double arg)
+double
+PTexp(double arg)
 {
     return (exp(arg));
 }
 
-double PTln(double arg)
+double
+PTln(double arg)
 {
     if (arg < 0.0)
-#ifdef EXPERIMENTAL_CODE
         return (HUGE);
-#else
-	arg = -arg;
-#endif
     return (log(arg));
 }
 
-double PTlog(double arg)
+double
+PTlog(double arg)
 {
     if (arg <= 0.0)
-#ifdef EXPERIMENTAL_CODE
         return (HUGE);
-#else
-	arg = -arg;
-#endif
     return (log10(arg));
 }
 
-double PTsin(double arg)
+double
+PTsin(double arg)
 {
     return (sin(MODULUS(arg, 2 * M_PI)));
 }
 
-double PTsinh(double arg)
+double
+PTsinh(double arg)
 {
     return (sinh(arg));
 }
 
-double PTsqrt(double arg)
+double
+PTsqrt(double arg)
 {
     if (arg < 0.0)
-#ifdef EXPERIMENTAL_CODE
         return (HUGE);
-#else
-	arg = -arg;
-#endif
     return (sqrt(arg));
 }
 
-double PTtan(double arg)
+double
+PTtan(double arg)
 {
     return (tan(MODULUS(arg, M_PI)));
 }
 
-double PTtanh(double arg)
+double
+PTtanh(double arg)
 {
     return (tanh(arg));
 }
 
-double PTuminus(double arg)
+double
+PTuminus(double arg)
 {
     return (- arg);
 }
+

src/frontend/plotting/x11.c

@@ -290,20 +290,6 @@ handlekeypressed(Widget w, caddr_t clientdata, caddr_t calldata)
 
 }
 
-#  ifdef notdef
-void
-keyhandler(clientdata, source, id)
-caddr_t clientdata;
-int *source;
-XtInputId id;
-{
-
-#    ifdef notdef
-	KEYwaiting = TRUE;
-#  endif
-
-}
-#  endif
 
 void
 handlebuttonev(Widget w, caddr_t clientdata, caddr_t calldata)
@@ -322,17 +308,6 @@ handlebuttonev(Widget w, caddr_t clientdata, caddr_t calldata)
 
 }
 
-#  ifdef notdef
-handlemotionev(w, clientdata, calldata)
-Widget w;
-caddr_t clientdata, calldata;
-{
-
-	XMotionEvent *motionev = (XMotionEvent *) calldata;
-
-	switch
-}
-#  endif
 
 /* Recover from bad NewViewPort call. */
 #define RECOVERNEWVIEWPORT()    free((char *) graph);\
@@ -525,15 +500,6 @@ X11_Arc(int x0, int y0, int radius, double theta1, double theta2)
 		x0 - radius,
 		currentgraph->absolute.height - radius - y0,
 		2 * radius, 2 * radius, t1, t2);		
-#  ifdef notdef
-	printf("at %d, %d, %g %g x %d :: (%d, %d)\n",
-		x0, y0, theta1, theta2, radius, t1, t2);
-		printf("skip\n");
-	XSync(display, 0);
-	printf("XDrawArc(%d, %d, %d, %d, %d, %d)\n", x0 - radius,
-		currentgraph->absolute.height - radius - y0,
-		2 * radius, 2 * radius, t1, t2);
-#  endif		
     }
 }
 
@@ -578,19 +544,6 @@ X11_SetLinestyle(int linestyleid)
 
 	if (currentgraph->linestyle != linestyleid) {
 
-#  ifdef notdef
-	  switch (linestyleid %3) {
-	  case 0:
-	    values.line_style = LineSolid;
-		break;
-	  case 1:
-	    values.line_style = LineOnOffDash;
-		break;
-	  case 2:
-	    values.line_style = LineDoubleDash;
-		break;
-	  }
-#  endif
 	  if ((linestyleid == 0 || numdispplanes > 1) && linestyleid != 1) {
 	    /* solid if linestyle 0 or if has color, allow only one
 	     * dashed linestyle */
@@ -878,14 +831,7 @@ redraw(Widget w, caddr_t client_data, caddr_t call_data)
 	int n = 1;
 
 	DEVDEP(graph).isopen = 1;
-#  ifdef notdef
-	/* if there is a resize, let the resize routine handle the exposures */
-	if (XCheckWindowEvent(display, DEVDEP(graph).window,
-	 (long) StructureNotifyMask, &ev)) {
-	  resize(w, client_data, &ev);
-	  return;
-	}
-#  endif
+
 
 	rects[0].x = pev->x;
 	rects[0].y = pev->y;
@@ -935,37 +881,7 @@ resize(Widget w, caddr_t client_data, caddr_t call_data)
 
 }
 
-#  ifdef notdef
-/* stolen from CP/lexical.c */
 
-/* A special 'getc' so that we can deal with ^D properly. There is no way for
- * stdio to know if we have typed a ^D after some other characters, so
- * don't use buffering at all...
- */
-static int inchar(fp)
-    FILE *fp;
-{
-
-	char c;
-	int i;
-	extern int errno;
-
-#    ifdef HAS_TERMREAD
-	if (cp_interactive && !cp_nocc) {
-	  i = read((int) fileno(fp), &c, 1);
-	  if (i == 0)
-	    return (EOF);
-	  else if (i == -1) {
-	    perror("read");
-	    return (EOF);
-	  } else
-	    return ((int) c);
-	}
-#    endif
-	c = getc(fp);
-	return ((int) c);
-}
-#  endif
 
 void
 X11_Input(REQUEST *request, RESPONSE *response)