cfg/atari-xex.cfg: fix typo in comment

[cc65] / samples / mandelbrot.c

diff --git a/samples/mandelbrot.c b/samples/mandelbrot.c
index 507eb99dcded9df8d14315af2ddd83b7a52eaed8..d7291c5b5701f78fb0d4f18be03571991aa5d159 100644 (file)
--- a/samples/mandelbrot.c
+++ b/samples/mandelbrot.c
@@ -1,8 +1,8 @@
-/*****************************************************************************
- * mandelbrot sample program for cc65.                                       *
- *                                                                           *
- * (w)2002 by groepaz/hitmen, TGI support by Stefan Haubenthal               *
- *****************************************************************************/
+/*****************************************************************************\
+** mandelbrot sample program for cc65.                                       **
+**                                                                           **
+** (w) 2002 by groepaz/hitmen, TGI support by Stefan Haubenthal              **
+\*****************************************************************************/
 
 
 
@@ -10,18 +10,14 @@
 #include <time.h>
 #include <conio.h>
 #include <tgi.h>
+#include <cc65.h>
 
 
 
 /* Graphics definitions */
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
-#  define GRAPHMODE    TGI_MODE_280_192_6
-#else
-#  define GRAPHMODE    TGI_MODE_320_200_2
-#endif
-#define SCREEN_X        (tgi_getmaxx()+1)
-#define SCREEN_Y        (tgi_getmaxy()+1)
-#define MAXCOL          (tgi_getmaxcolor()+1)
+#define SCREEN_X        (tgi_getxres())
+#define SCREEN_Y        (tgi_getyres())
+#define MAXCOL          (tgi_getcolorcount())
 
 #define maxiterations   32
 #define fpshift         (10)
@@ -33,56 +29,62 @@
 #define divfp(_a,_b)    ((((signed long)_a)<<fpshift)/(_b))
 
 /* Workaround missing clock stuff */
-#if defined(__APPLE2__) || defined(__APPLE2ENH__)
-#  define clock()      0
-#  define CLK_TCK      1
+#ifdef __APPLE2__
+#  define clock()       0
+#  define CLK_TCK       1
+#endif
+
+/* Use dynamically loaded driver by default */
+#ifndef DYN_DRV
+#  define DYN_DRV       1
 #endif
 
 /* Use static local variables for speed */
-#pragma staticlocals (1);
+#pragma static-locals (1);
 
 
 
 void mandelbrot (signed short x1, signed short y1, signed short x2,
-                signed short y2)
+                 signed short y2)
 {
     register unsigned char count;
     register signed short r, r1, i;
     register signed short xs, ys, xx, yy;
     register signed short x, y;
 
-    /* calc stepwidth */
+    /* Calc stepwidth */
     xs = ((x2 - x1) / (SCREEN_X));
     ys = ((y2 - y1) / (SCREEN_Y));
 
     yy = y1;
     for (y = 0; y < (SCREEN_Y); y++) {
-       yy += ys;
-       xx = x1;
-       for (x = 0; x < (SCREEN_X); x++) {
-           xx += xs;
-           /* do iterations */
-           r = 0;
-           i = 0;
-           for (count = 0; (count < maxiterations) &&
-                (fpabs (r) < tofp (2)) && (fpabs (i) < tofp (2));
-                ++count) {
-               r1 = (mulfp (r, r) - mulfp (i, i)) + xx;
-               /* i = (mulfp(mulfp(r,i),tofp(2)))+yy; */
-               i = (((signed long) r * i) >> (fpshift - 1)) + yy;
-               r = r1;
-           }
-           if (count == maxiterations) {
-               tgi_setcolor (0);
-           } else {
-               if (MAXCOL == 2)
-                   tgi_setcolor (1);
-               else
-                   tgi_setcolor (count % MAXCOL);
-           }
-           /* set pixel */
-           tgi_setpixel (x, y);
-       }
+        yy += ys;
+        xx = x1;
+        for (x = 0; x < (SCREEN_X); x++) {
+            xx += xs;
+            /* Do iterations */
+            r = 0;
+            i = 0;
+            for (count = 0; (count < maxiterations) &&
+                 (fpabs (r) < tofp (2)) && (fpabs (i) < tofp (2));
+                 ++count) {
+                r1 = (mulfp (r, r) - mulfp (i, i)) + xx;
+                /* i = (mulfp(mulfp(r,i),tofp(2)))+yy; */
+                i = (((signed long) r * i) >> (fpshift - 1)) + yy;
+                r = r1;
+            }
+            if (count == maxiterations) {
+                tgi_setcolor (0);
+            } else {
+                if (MAXCOL == 2) {
+                    tgi_setcolor (1);
+                } else {
+                    tgi_setcolor (count % MAXCOL);
+                }
+            }
+            /* Set pixel */
+            tgi_setpixel (x, y);
+        }
     }
 }
 
@@ -95,14 +97,22 @@ int main (void)
 
     clrscr ();
 
-    /* Load the graphics driver */                       
+#if DYN_DRV
+    /* Load the graphics driver */
     cprintf ("initializing... mompls\r\n");
-    tgi_load (GRAPHMODE);
+    tgi_load_driver (tgi_stddrv);
+#else
+    /* Install the graphics driver */
+    tgi_install (tgi_static_stddrv);
+#endif
     err = tgi_geterror ();
     if (err  != TGI_ERR_OK) {
-       cprintf ("Error #%d initializing graphics.\r\n%s\r\n",
-                err, tgi_geterrormsg (err));
-       exit (EXIT_FAILURE);
+        cprintf ("Error #%d initializing graphics.\r\n%s\r\n",
+                 err, tgi_geterrormsg (err));
+        if (doesclrscrafterexit ()) {
+            cgetc ();
+        }
+        exit (EXIT_FAILURE);
     };
     cprintf ("ok.\n\r");
 
@@ -112,15 +122,15 @@ int main (void)
 
     t = clock ();
 
-    /* calc mandelbrot set */
+    /* Calc mandelbrot set */
     mandelbrot (tofp (-2), tofp (-2), tofp (2), tofp (2));
 
     t = clock () - t;
 
     /* Fetch the character from the keyboard buffer and discard it */
-    (void) cgetc ();
+    cgetc ();
 
-    /* shut down gfx mode and return to textmode */
+    /* Shut down gfx mode and return to textmode */
     tgi_done ();
 
     /* Calculate stats */
@@ -131,11 +141,12 @@ int main (void)
     /* Output stats */
     cprintf ("time  : %lu.%us\n\r", sec, sec10);
 
-    /* Wait for a key, then end */
-    cputs ("Press any key when done...\n\r");
-    (void) cgetc ();
+    if (doesclrscrafterexit ()) {
+        /* Wait for a key, then end */
+        cputs ("Press any key when done...\n\r");
+        cgetc ();
+    }
 
     /* Done */
     return EXIT_SUCCESS;
-
 }