Fixed crashes and compilation problems on some X11/Linux systems.

Author: mrmcsoftware

Makefile.64

@@ -9,14 +9,16 @@ LFLAGS = -lX11 -lXpm -lXm -lXt
 #LFLAGS = -lX11 -lXm -lXt
 #LFLAGS = -lX11 -lXpm -lSDL2 -lXm -lXt
 AFLAGS = -f elf64
+#   If you get an error saying "recompile with -fPIE", uncomment the following
+#NOPIE = -no-pie
 
 all: fractald fractalf
 
 fractald: fractald.o routinesd.o
-	$(LD) fractald.o routinesd.o -o fractald $(LFLAGS)
+	$(LD) fractald.o routinesd.o -o fractald $(LFLAGS) $(NOPIE)
 
 fractalf: fractalf.o routinesf.o
-	$(LD) fractalf.o routinesf.o -o fractalf $(LFLAGS)
+	$(LD) fractalf.o routinesf.o -o fractalf $(LFLAGS) $(NOPIE)
 
 routinesd.o: routinesd.asm
 	$(AS) $(AFLAGS) routinesd.asm

README.md

@@ -31,7 +31,7 @@ what I mean).
 ## Running
 
 Start from either command line or icon.
-Once started, press 'h' to see the various keyboard controls.  Or press
+*Once started, press 'h' to see the various keyboard controls.*  Or press
 '0' through '9', '-', or 'a' to go to preset areas of the fractals.  To zoom,
 press either 'z' for zoom by opposing corners or 'x' for zoom by center to
 corner.  Then click (and hold) left mouse button to select first point and
@@ -78,6 +78,10 @@ for the 64-bit version.
 
 These will make both the double and float versions of the fractal program.
 
+While compiling, if you get an error message saying "... recompile with -fPIE",
+uncomment the *NOPIE = -no-pie* line in the Makefile.64 file.  This might be
+necessary due to changes in newer versions of gcc.
+
 ## Special Linux Version Notes
 
 I had wanted to make this program as simple as possible, so at first, I didn't
@@ -111,7 +115,7 @@ why it has to be horrendous, but I don't like it.
 <tr><td>Makefile</td><td>Makefile for 32-bit version</td></tr>
 <tr><td>Makefile.64</td><td>Makefile for 64-bit version</td></tr>
 <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>fractalb.asm</td><td>My original fractal program for my CPU design</td></tr>
+<tr><td>fractalb_not_x86.asm</td><td>My original fractal program for my CPU design</td></tr>
 <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>fractald</td><td>ELF 32-bit Linux executable (double version)</td></tr>
 <tr><td>fractalf</td><td>ELF 32-bit Linux executable (float version)</td></tr>

bin/fractald

@@ -75,7 +75,7 @@ double xres1 = 512.0, yres1 = 512.0, xres = 512.0, yres = 512.0;
 double xres2 = 256.0, yres2 = 256.0;
 double one = 1.0, two = 2.0, converge = 4.0, popped;
 double m, n, xgap, ygap, ac, bc, az, bz, sizev, temp, tempb;
-double aedge, bedge, xdelta, ydelta;
+double aedge = -2.0, bedge = -1.25, xdelta = 3.0, ydelta = 2.5;
 int numpixels = 512*512*4, numpixels1 = 512*512*4, numpixels2 = 512*256*4;
 int off = 0, ncols = 255, count, limit = 1023;
 int pixel, cyinc = 2, cydir = 1;
@@ -347,7 +347,7 @@ unsigned char Colors[256*3] = {
 double aedgeUndo, bedgeUndo, xdeltaUndo, ydeltaUndo;	/* zoom undo vars */
 int zoomgetpoint = 0, zoomtype, keepitsquare = 1;		/* zoom vars */
 int speed = 0, dspeed = 10, pauseit = 0, cycle = 0;		/* color cycle vars */
-int fractaltype;
+int fractaltype = MANDELBROT;
 
 int graphinit(), graphterm(), ProcessEvents();
 void SaveImage();
@@ -668,39 +668,41 @@ sprintf(str2, "ls -al %s", name); system(str2);
 int main(int argc, char *argv[])
 {
 int i, l;
-char str[8];
+char str[8], cmd[256];
 XEvent event;
 XKeyEvent kev;
 
 graphinit();
-if (argc == 1) { Choice1(); } // start with first location
+if (argc == 1) { _Mandelbrot(); } // compute 1st location if no commandline args
 // Wait for window to popup
-do { XNextEvent(dpy, &event); } while (event.type != Expose);
+//  Some X11 systems will crash if the window hasn't been mapped yet, so wait
+//  for MapNotify event rather than Expose
+do { XNextEvent(dpy, &event); } while (event.type != MapNotify);
+//do { XNextEvent(dpy, &event); } while (event.type != Expose);
 // fake keypresses so user can initialize the way they want
-if (argc > 1)
+if (argc > 1) { strcpy(cmd, argv[1]); }
+else { strcpy(cmd, "i"); } // just show computed image if no commandline args
+kev.display = dpy;
+kev.window = win;
+kev.state = 0;
+str[1] = '\0';
+l = strlen(cmd);
+for (i=0; i<l; i++)
 	{
-	kev.display = dpy;
-	kev.window = win;
-	str[1] = '\0';
-	l = strlen(argv[1]); // putting strlen in "for" didn't work
-	for (i=0; i<l; i++)
+	kev.type = KeyPress;
+	str[0] = cmd[i];
+	// handle cases that don't work with Keysym/Keycode
+	switch (str[0])
 		{
-		kev.type = KeyPress;
-		str[0] = argv[1][i];
-		// handle cases that don't work with Keysym/Keycode
-		switch (str[0])
-			{
-			case '-': kev.keycode = 20; break;
-			case '.': kev.keycode = 60; break;
-			case ',': kev.keycode = 59; break;
-			default: kev.keycode = XKeysymToKeycode(dpy, XStringToKeysym(str));
-			}
-		XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
-		kev.type = KeyRelease;
-		XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
+		case '-': kev.keycode = 20; break;
+		case '.': kev.keycode = 60; break;
+		case ',': kev.keycode = 59; break;
+		default: kev.keycode = XKeysymToKeycode(dpy, XStringToKeysym(str));
 		}
+	XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
+	kev.type = KeyRelease;
+	XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
 	}
-else { XPutImage(dpy, win, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); }
 XFlush(dpy);
 while (1)
 	{
@@ -863,6 +865,7 @@ if (XCheckTypedWindowEvent(dpy, win, KeyPress, &event))
 		case 'k': keepitsquare = !keepitsquare; break;
 		case 'p': parameters(); break;
 		case 'r': if (fractaltype == MANDELBROT) { Mandelbrot(); } else { Julia(); } break;
+		case 'i': XPutImage(dpy, win, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); break;
 		case 's': SaveImage(NULL); break;
 		case 'h':
 #ifdef HAVE_SDL2

bin/fractald64

@@ -75,7 +75,7 @@ float xres1 = 512.0, yres1 = 512.0, xres = 512.0, yres = 512.0;
 float xres2 = 256.0, yres2 = 256.0;
 float one = 1.0, two = 2.0, converge = 4.0, popped;
 float m, n, xgap, ygap, ac, bc, az, bz, sizev, temp, tempb;
-float aedge, bedge, xdelta, ydelta;
+float aedge = -2.0, bedge = -1.25, xdelta = 3.0, ydelta = 2.5;
 int numpixels = 512*512*4, numpixels1 = 512*512*4, numpixels2 = 512*256*4;
 int off = 0, ncols = 255, count, limit = 1023;
 int pixel, cyinc = 2, cydir = 1;
@@ -347,7 +347,7 @@ unsigned char Colors[256*3] = {
 float aedgeUndo, bedgeUndo, xdeltaUndo, ydeltaUndo;	/* zoom undo vars */
 int zoomgetpoint = 0, zoomtype, keepitsquare = 1;		/* zoom vars */
 int speed = 0, dspeed = 10, pauseit = 0, cycle = 0;		/* color cycle vars */
-int fractaltype;
+int fractaltype = MANDELBROT;
 
 int graphinit(), graphterm(), ProcessEvents();
 void SaveImage();
@@ -668,39 +668,41 @@ sprintf(str2, "ls -al %s", name); system(str2);
 int main(int argc, char *argv[])
 {
 int i, l;
-char str[8];
+char str[8], cmd[256];
 XEvent event;
 XKeyEvent kev;
 
 graphinit();
-if (argc == 1) { Choice1(); } // start with first location
+if (argc == 1) { _Mandelbrot(); } // compute 1st location if no commandline args
 // Wait for window to popup
-do { XNextEvent(dpy, &event); } while (event.type != Expose);
+//  Some X11 systems will crash if the window hasn't been mapped yet, so wait
+//  for MapNotify event rather than Expose
+do { XNextEvent(dpy, &event); } while (event.type != MapNotify);
+//do { XNextEvent(dpy, &event); } while (event.type != Expose);
 // fake keypresses so user can initialize the way they want
-if (argc > 1)
+if (argc > 1) { strcpy(cmd, argv[1]); }
+else { strcpy(cmd, "i"); } // just show computed image if no commandline args
+kev.display = dpy;
+kev.window = win;
+kev.state = 0;
+str[1] = '\0';
+l = strlen(cmd);
+for (i=0; i<l; i++)
 	{
-	kev.display = dpy;
-	kev.window = win;
-	str[1] = '\0';
-	l = strlen(argv[1]); // putting strlen in "for" didn't work
-	for (i=0; i<l; i++)
+	kev.type = KeyPress;
+	str[0] = cmd[i];
+	// handle cases that don't work with Keysym/Keycode
+	switch (str[0])
 		{
-		kev.type = KeyPress;
-		str[0] = argv[1][i];
-		// handle cases that don't work with Keysym/Keycode
-		switch (str[0])
-			{
-			case '-': kev.keycode = 20; break;
-			case '.': kev.keycode = 60; break;
-			case ',': kev.keycode = 59; break;
-			default: kev.keycode = XKeysymToKeycode(dpy, XStringToKeysym(str));
-			}
-		XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
-		kev.type = KeyRelease;
-		XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
+		case '-': kev.keycode = 20; break;
+		case '.': kev.keycode = 60; break;
+		case ',': kev.keycode = 59; break;
+		default: kev.keycode = XKeysymToKeycode(dpy, XStringToKeysym(str));
 		}
+	XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
+	kev.type = KeyRelease;
+	XSendEvent(dpy, win, True, KeyPressMask, (XEvent *)&kev);
 	}
-else { XPutImage(dpy, win, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); }
 XFlush(dpy);
 while (1)
 	{
@@ -863,6 +865,7 @@ if (XCheckTypedWindowEvent(dpy, win, KeyPress, &event))
 		case 'k': keepitsquare = !keepitsquare; break;
 		case 'p': parameters(); break;
 		case 'r': if (fractaltype == MANDELBROT) { Mandelbrot(); } else { Julia(); } break;
+		case 'i': XPutImage(dpy, win, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); break;
 		case 's': SaveImage(NULL); break;
 		case 'h':
 #ifdef HAVE_SDL2