[cig-commits] r4040 - seismo/1D/syndat/trunk/gfs
leif at geodynamics.org
leif at geodynamics.org
Thu Jul 20 13:50:08 PDT 2006
Author: leif
Date: 2006-07-20 13:50:08 -0700 (Thu, 20 Jul 2006)
New Revision: 4040
Modified:
seismo/1D/syndat/trunk/gfs/leodraw.c
seismo/1D/syndat/trunk/gfs/leoinp.c
seismo/1D/syndat/trunk/gfs/leolib.c
seismo/1D/syndat/trunk/gfs/leotext.c
Log:
Use F77_FUNC in 'leolib' files.
Modified: seismo/1D/syndat/trunk/gfs/leodraw.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/leodraw.c 2006-07-20 14:33:13 UTC (rev 4039)
+++ seismo/1D/syndat/trunk/gfs/leodraw.c 2006-07-20 20:50:08 UTC (rev 4040)
@@ -2,14 +2,14 @@
These have the drawing primitive routines in them. */
-void lclearwindow_()
+void F77_FUNC(lclearwindow,LCLEARWINDOW)()
/* Clears the Window. */
{
XFillRectangle(display,draw,erasegc,0,0,window_width,window_height);
} /* lclearwindow_ */
-void lclearpartwindow_(x, y, width, height)
+void F77_FUNC(lclearpartwindow,LCLEARPARTWINDOW)(x, y, width, height)
long *x, *y, *width, *height;
/* Clears part of the Window, in a rectangle, from
x to x+width, and y to y+height. */
@@ -19,7 +19,7 @@
} /* lclearpartwindow_ */
-void llinestyle_(width, dash, join, cap)
+void F77_FUNC(llinestyle,LLINESTYLE)(width, dash, join, cap)
/* Selects a linewidth, cap, and a line join, and whether or not to dash.
Width: 0: fast & sloppy
>= 1: that many pixels wide
@@ -61,7 +61,7 @@
} /* llinestyle_ */
-void ldrawhollowbox_(x,y,width,height)
+void F77_FUNC(ldrawhollowbox,LDRAWHOLLOWBOX)(x,y,width,height)
long *x, *y, *width, *height;
/* Draws the outline of a rectangle. */
{
@@ -70,7 +70,7 @@
} /* ldrawhollowbox_ */
-void ldrawfilledbox_(x,y,width,height)
+void F77_FUNC(ldrawfilledbox,LDRAWFILLEDBOX)(x,y,width,height)
long *x, *y, *width, *height;
/* Draws and fills in the rectangle. */
{
@@ -79,7 +79,7 @@
} /* ldrawfilledbox_ */
-void ldrawhollowcircle_(x,y,radius)
+void F77_FUNC(ldrawhollowcircle,LDRAWHOLLOWCIRCLE)(x,y,radius)
long *x, *y, *radius;
{
XDrawArc(display,draw,usergc, (int)(*x-*radius), (int)(*y-*radius),
@@ -89,7 +89,7 @@
-void ldrawfilledcircle_(x,y,radius)
+void F77_FUNC(ldrawfilledcircle,LDRAWFILLEDCIRCLE)(x,y,radius)
/* radius is the radius*sqrt(2) */
long *x, *y, *radius;
{
@@ -100,7 +100,7 @@
long CPx=0, CPy=0; /* The current position of the pointer. */
-void lmoveto_(x,y)
+void F77_FUNC(lmoveto,LMOVETO)(x,y)
long *x, *y;
/* Moves the CP to a new place -- doesn't draw anything. */
{
@@ -109,7 +109,7 @@
} /* lmoveto_ */
-void llineto_(x,y)
+void F77_FUNC(llineto,LLINETO)(x,y)
long *x, *y;
/* Draws a line from the CP to the specified point. */
{
@@ -120,7 +120,7 @@
} /* llineto_ */
-void lline_(x1, y1, x2, y2)
+void F77_FUNC(lline,LLINE)(x1, y1, x2, y2)
/* Note, this doesn't move the CP. */
long *x1, *y1, *x2, *y2;
{
@@ -132,7 +132,7 @@
long maxlines=0; /* The maximum number of lines drawable
at once. */
-void llines_(x,y,num)
+void F77_FUNC(llines,LLINES)(x,y,num)
/* Draws many lines. x, and y are arrays of values,
and n says how big the array is. Maximum n: 32767.
*/
@@ -181,7 +181,7 @@
} /* llines_ */
-void lbitblt_(x1,y1,width,height,x2,y2)
+void F77_FUNC(lbitblt,LBITBLT)(x1,y1,width,height,x2,y2)
/* Copies the contents of the box specified by
x1,y1,width,height to x2,y2. Note: it uses the
user's choice of a raster operation. */
@@ -193,7 +193,7 @@
} /* lbitblt_ */
-void lclipbox_(x,y,width,height)
+void F77_FUNC(lclipbox,LCLIPBOX)(x,y,width,height)
/* Sets this as the current clipping box, and turns
clipping on. */
long *x, *y, *width, *height;
@@ -208,14 +208,14 @@
} /* lclipbox_ */
-void lnoclip_()
+void F77_FUNC(lnoclip,LNOCLIP)()
/* Turns off clipping. */
{
XSetClipMask(display,usergc,None);
} /* lnoclip_ */
-void lsetrasterops_(code)
+void F77_FUNC(lsetrasterops,LSETRASTEROPS)(code)
long *code;
/* For RasterOps Codes, see page 140 of XLib Programming Manual (Vol.1)
or page 689 of Volume 2.
@@ -312,7 +312,7 @@
} /* get_colors */
-void lsetcolor_(index)
+void F77_FUNC(lsetcolor,LSETCOLOR)(index)
/* Selects color number c as the current foreground drawing color. */
long *index;
{
Modified: seismo/1D/syndat/trunk/gfs/leoinp.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/leoinp.c 2006-07-20 14:33:13 UTC (rev 4039)
+++ seismo/1D/syndat/trunk/gfs/leoinp.c 2006-07-20 20:50:08 UTC (rev 4040)
@@ -5,7 +5,7 @@
XQueryPointer -- find out present location. (Why?)
*/
-void lwaitforbutton_(but, x, y, mod)
+void F77_FUNC(lwaitforbutton,LWAITFORBUTTON)(but, x, y, mod)
/* Responds to either button presses or releases.
Returns the position where the
button was pressed within the window, and which
@@ -41,7 +41,7 @@
} /* lwaitforbutton_ */
-void lwaitforbuttonup_(but, x, y, mod)
+void F77_FUNC(lwaitforbuttonup,LWAITFORBUTTONUP)(but, x, y, mod)
/* Same as lwaitforbutton_ but only responds to button releases. */
long *but, *x, *y, *mod;
{
@@ -52,7 +52,7 @@
} /* lwaitforbuttonup_ */
-void lwaitforbuttondown_(but, x, y, mod)
+void F77_FUNC(lwaitforbuttondown,LWAITFORBUTTONDOWN)(but, x, y, mod)
/* Same as lwaitforbutton_ but only responds to button presses. */
long *but, *x, *y, *mod;
{
@@ -62,7 +62,7 @@
} /* lwaitforbuttondown_ */
-void lmodmasks_(shift,lock,control, mod1,mod2,mod3,mod4,mod5,
+void F77_FUNC(lmodmasks,LMODMASKS)(shift,lock,control, mod1,mod2,mod3,mod4,mod5,
but1,but2,but3,but4,but5)
/* Returns the bitmask values for each of these things. These
give the bit positions for the mod field of lwaitforbutton_ */
@@ -85,7 +85,7 @@
} /* lmodmasks_ */
-void lwarp_(x,y)
+void F77_FUNC(lwarp,LWARP)(x,y)
long *x, *y;
/* Suddenly moves the mouse pointer to the point x,y within our window.
Warning: This is very confusing to the user. Never use. */
@@ -97,7 +97,7 @@
int silly_cursor_exists=0;
Cursor silly;
-void lcursor_(which)
+void F77_FUNC(lcursor,LCURSOR)(which)
/* Picks which cursor symbol should be put on the screen.
0 gives the default cursor.
1 Gives the "silly cursor" which is a single black pixel.
@@ -154,7 +154,7 @@
/* getbit */
-void leventtypeon_(which)
+void F77_FUNC(leventtypeon,LEVENTTYPEON)(which)
/* Causes these event types to be received by leventwait_ */
long *which;
{
@@ -162,7 +162,7 @@
} /* leventtypeon_ */
-void leventtypeoff_(which)
+void F77_FUNC(leventtypeoff,LEVENTTYPEOFF)(which)
/* Causes these event types to be ignored by leventwait_ */
long *which;
{
@@ -173,7 +173,7 @@
} /* leventtypeoff_ */
-void leventwait_(main, x, y, mod, typ)
+void F77_FUNC(leventwait,LEVENTWAIT)(main, x, y, mod, typ)
/* Waits for an event of the selected types, and then returns
information about it. Main is the main thingy returned. x, and y are
the position of the pointer when the button is pressed. mod is the
@@ -248,7 +248,7 @@
} while( !done );
} /* leventwait_ */
-void lwherecursor_(x,y,mod)
+void F77_FUNC(lwherecursor,LWHERECURSOR)(x,y,mod)
/* Queries the pointer's location. */
long *x, *y, *mod;
{
Modified: seismo/1D/syndat/trunk/gfs/leolib.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/leolib.c 2006-07-20 14:33:13 UTC (rev 4039)
+++ seismo/1D/syndat/trunk/gfs/leolib.c 2006-07-20 20:50:08 UTC (rev 4040)
@@ -11,6 +11,8 @@
#include <stdio.h>
+#include "config.h"
+
#define NOTDEBUGGING
#ifdef DEBUGGING
@@ -42,7 +44,7 @@
#ifdef DEBUGGING
-void lnum_(x)
+void F77_FUNC(lnum,LNUM)(x)
long *x;
{
printf("x: %ld\n",*x);
@@ -50,7 +52,7 @@
#endif
-void lfastmode_()
+void F77_FUNC(lfastmode,LFASTMODE)()
/* Sets fast drawing mode, in which drawing calls are made directly
to the screen, with no backup in case of covering. */
{
@@ -58,7 +60,7 @@
} /* lfastmode_ */
-void lslowmode_()
+void F77_FUNC(lslowmode,LSLOWMODE)()
/* Sets the slow drawing mode, where drawing calls are done to the
Background Pixmap, which is updated with an output buffer flush. */
{
@@ -108,7 +110,7 @@
} /* connect_to_display */
-void linitfancywindow_(fwidth,fheight,origx,origy,fwindow_name,ficon_name,wlen,ilen)
+void F77_FUNC(linitfancywindow,LINITFANCYWINDOW)(fwidth,fheight,origx,origy,fwindow_name,ficon_name,wlen,ilen)
/* Here, we blindly assume that the window manager will give us a window
of the size we demanded. (We specify minimum, maximum, and suggested size of
the window all to be the size we want it.) This works under openwindows.
@@ -258,7 +260,7 @@
} /* linitfancywindow_ */
-void linitializewindow_(fwidth, fheight)
+void F77_FUNC(linitializewindow,LINITIALIZEWINDOW)(fwidth, fheight)
/* Calls linitfancy window, with some default settings. */
long *fwidth, *fheight;
{
@@ -273,7 +275,7 @@
-void lscreentype_(width,height,color,planes)
+void F77_FUNC(lscreentype,LSCREENTYPE)(width,height,color,planes)
/* Determines what type of display is available -- how big, is it color, how
many bit-planes */
long *width, *height, *color, *planes;
@@ -311,7 +313,7 @@
-void lreset_()
+void F77_FUNC(lreset,LRESET)()
/* Reset's the drawing mode to something sensible */
{
long l1=1, l0=0;
@@ -326,7 +328,7 @@
} /* lreset_ */
-void ldie_()
+void F77_FUNC(ldie,LDIE)()
/* Kills the window and unloads all the loaded stuff. */
{
XFreePixmap(display,background);
@@ -338,7 +340,7 @@
} /* ldie_ */
-void ldoit_()
+void F77_FUNC(ldoit,LDOIT)()
/* Flushes the output buffer. */
{
if( draw == background ) /* i.e. we're in slow mode. */
@@ -347,7 +349,7 @@
} /* ldoit */
-void lfastscreendump_(fname, len)
+void F77_FUNC(lfastscreendump,LFASTSCREENDUMP)(fname, len)
/* Dumps the screen contents to the specified file.
Uses Images to run faster, but doesn't always work. */
char *fname;
@@ -444,7 +446,7 @@
} /* lscreendump_() */
-void lscreendump_(fname, len)
+void F77_FUNC(lscreendump,LSCREENDUMP)(fname, len)
/* Dumps the screen contents to the specified file. */
char *fname;
long len;
Modified: seismo/1D/syndat/trunk/gfs/leotext.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/leotext.c 2006-07-20 14:33:13 UTC (rev 4039)
+++ seismo/1D/syndat/trunk/gfs/leotext.c 2006-07-20 20:50:08 UTC (rev 4040)
@@ -22,7 +22,7 @@
int nowfont=0;
-void lsetfont_(which)
+void F77_FUNC(lsetfont,LSETFONT)(which)
/* Picks which font to use for text. */
long *which;
{
@@ -37,7 +37,7 @@
-void lloadfont_(num,fname,len)
+void F77_FUNC(lloadfont,LLOADFONT)(num,fname,len)
/* Loads the font of the specified name. num returns how many
fonts are laoded after having laoded this one, which also
gives the font index of the request font. */
@@ -81,7 +81,7 @@
int lalign=BLEFT;
-void laligntext_(code)
+void F77_FUNC(laligntext,LALIGNTEXT)(code)
/* Picks how the CP will determine text positioning.
Codes are same as for EZLORG */
long *code;
@@ -104,7 +104,7 @@
float langle=0;
-void ltextangle_(ang)
+void F77_FUNC(ltextangle,LTEXTANGLE)(ang)
/* Sets the text drawing angle. ang=0 is normal left to
right. ang=90 draws up. All angles are allowed. Must be passed
as fortran type "REAL" */
@@ -114,7 +114,7 @@
} /* ltextangle_ */
-void lprint_(text, len)
+void F77_FUNC(lprint,LPRINT)(text, len)
/* Places the text on the screen at the CP.
Note: len does not need to be passed from fortran.
(Does not move the CP). Use lmoveto_, laligntext_ and ltextangle_
More information about the cig-commits
mailing list