X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fphosphor.c;h=8298cf2551ee67f265563eee839493923b346fbc;hb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183;hp=1188f2e60696504e35889b621005504dcebb0558;hpb=14627f4038ada5d11456f3770090f3c39740d70f;p=xscreensaver

diff --git a/hacks/phosphor.c b/hacks/phosphor.c
index 1188f2e6..8298cf25 100644
--- a/hacks/phosphor.c
+++ b/hacks/phosphor.c
@@ -567,6 +567,8 @@ scroll (p_state *state)
 static void
 print_char (p_state *state, int c)
 {
+  static char last_c = 0;
+
   p_cell *cell = &state->cells[state->grid_width * state->cursor_y
                               + state->cursor_x];
 
@@ -581,11 +583,16 @@ print_char (p_state *state, int c)
 
   if (c == '\r' || c == '\n')
     {
-      state->cursor_x = 0;
-      if (state->cursor_y == state->grid_height - 1)
-        scroll (state);
+      if (c == '\n' && last_c == '\r')
+        ;   /* CRLF -- do nothing */
       else
-        state->cursor_y++;
+        {
+          state->cursor_x = 0;
+          if (state->cursor_y == state->grid_height - 1)
+            scroll (state);
+          else
+            state->cursor_y++;
+        }
     }
   else if (c == '\014')
     {
@@ -611,6 +618,8 @@ print_char (p_state *state, int c)
         }
     }
   set_cursor (state, True);
+
+  last_c = c;
 }
 
 
@@ -770,7 +779,7 @@ char *defaults [] = {
   "*ticks:		   20",
   "*delay:		   50000",
   "*cursor:		   333",
-  "*program:		 " ZIPPY_PROGRAM,
+  "*program:		 " FORTUNE_PROGRAM,
   "*relaunch:		   5",
   0
 };