X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fapple2.c;h=1918a5c03f45595970c93c57846ae5e264107c8c;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=da5a6b899320f5e2038e835d14050d8deadcb10b;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/apple2.c b/hacks/apple2.c
index da5a6b89..1918a5c0 100644
--- a/hacks/apple2.c
+++ b/hacks/apple2.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1998-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2010 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -15,13 +15,12 @@
 #include <math.h>
 #include "screenhackI.h"
 #include "apple2.h"
+#include "ximage-loader.h"
 
 #ifdef HAVE_XSHM_EXTENSION
 #include "xshm.h"
 #endif
 
-#define DEBUG
-
 /*
  * Implementation notes
  *
@@ -151,7 +150,7 @@ void
 a2_goto(apple2_state_t *st, int r, int c)
 {
   if (r > 23) r = 23;
-  if (c > 39) r = 39;
+  if (c > 39) c = 39;
   st->textlines[st->cursy][st->cursx] |= 0xc0; /* turn off blink */
   st->cursy=r;
   st->cursx=c;
@@ -391,25 +390,47 @@ a2_init_memory_active(apple2_sim_t *sim)
 }
 
 
-#if 1  /* jwz: since MacOS doesn't have "6x10", I dumped this font to an XBM...
+#if 1  /* jwz: since MacOS doesn't have "6x10", I dumped this font to a PNG...
         */
 
-#include "images/apple2font.xbm"
+#include "images/gen/apple2font_png.h"
 
 static void
 a2_make_font(apple2_sim_t *sim)
 {
-  Pixmap text_pm = XCreatePixmapFromBitmapData (sim->dpy, sim->window,
-                                                (char *) apple2_font_bits,
-                                                apple2_font_width,
-                                                apple2_font_height,
-                                                1, 0, 1);
-  if (apple2_font_width != 64*7) abort();
-  if (apple2_font_height != 8) abort();
-  sim->text_im = XGetImage(sim->dpy, text_pm, 0, 0, 
-                           apple2_font_width, apple2_font_height,
-                           ~0L, ZPixmap);
-  XFreePixmap(sim->dpy, text_pm);
+  int pix_w, pix_h;
+  XWindowAttributes xgwa;
+  Pixmap m = 0;
+  Pixmap p = image_data_to_pixmap (sim->dpy, sim->window,
+                                   apple2font_png, sizeof(apple2font_png),
+                                   &pix_w, &pix_h, &m);
+  XImage *im = XGetImage (sim->dpy, p, 0, 0, pix_w, pix_h, ~0L, ZPixmap);
+  XImage *mm = XGetImage (sim->dpy, m, 0, 0, pix_w, pix_h, 1, XYPixmap);
+  unsigned long black =
+    BlackPixelOfScreen (DefaultScreenOfDisplay (sim->dpy));
+  int x, y;
+
+  XFreePixmap (sim->dpy, p);
+  XFreePixmap (sim->dpy, m);
+  if (pix_w != 64*7) abort();
+  if (pix_h != 8) abort();
+
+  XGetWindowAttributes (sim->dpy, sim->window, &xgwa);
+  sim->text_im = XCreateImage (sim->dpy, xgwa.visual, 1, XYBitmap, 0, 0,
+                               pix_w, pix_h, 8, 0);
+  sim->text_im->data = malloc (sim->text_im->bytes_per_line *
+                               sim->text_im->height);
+
+  /* Convert deep image to 1 bit */
+  for (y = 0; y < pix_h; y++)
+    for (x = 0; x < pix_w; x++)
+      XPutPixel (sim->text_im, x, y,
+                 (XGetPixel (mm, x, y)
+                  ? XGetPixel (im, x, y) == black
+                  : 0));
+
+  XDestroyImage (im);
+  XDestroyImage (mm);
 }
 
 #else /* 0 */
@@ -482,7 +503,7 @@ a2_make_font(apple2_sim_t *sim)
   GC gc;
   XGCValues gcv;
 
-  font = XLoadQueryFont (sim->dpy, def_font);
+  font = load_font_retry (sim->dpy, def_font);
   if (!font) {
     fprintf(stderr, "%s: can't load font %s\n", progname, def_font);
     abort();
@@ -671,11 +692,12 @@ apple2_one_frame (apple2_sim_t *sim)
         int c;
         /* If we're in the midst of typing a string, emit a character with
            random timing. */
-        c =*sim->typing++;
+        c =*sim->typing;
         if (c==0) {
           sim->typing=NULL;
         }
         else {
+          sim->typing++;
           a2_printc(sim->st, c);
           if (c=='\r' || c=='\n') {
             sim->next_actiontime = sim->curtime;
@@ -699,10 +721,24 @@ apple2_one_frame (apple2_sim_t *sim)
         DONE:
           sim->stepno=A2CONTROLLER_FREE;
           sim->controller (sim, &sim->stepno, &sim->next_actiontime);
+          /* if stepno is changed, return 1 */
+          if (sim->stepno != A2CONTROLLER_FREE)
+            return 1;
 
           XClearWindow(sim->dpy, sim->window);
 
-          /* #### free sim? */
+          /* free sim */
+          /* This is from a2_make_font */
+          free(sim->text_im->data);
+          sim->text_im->data = 0;
+          XDestroyImage(sim->text_im);
+
+          /* And free else */
+          analogtv_release(sim->dec);
+          free(sim->st);
+          free(sim->inp);
+          free(sim);
+
           return 0;
         }
 
@@ -792,10 +828,11 @@ apple2_one_frame (apple2_sim_t *sim)
         }
       }
     }
-    analogtv_init_signal(sim->dec, 0.02);
     analogtv_reception_update(&sim->reception);
-    analogtv_add_signal(sim->dec, &sim->reception);
-    analogtv_draw(sim->dec);
+    {
+      const analogtv_reception *rec = &sim->reception;
+      analogtv_draw(sim->dec, 0.02, &rec, 1);
+    }
  
     return 1;
 }