X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=94c1b07e670b9eecce86a9ac8319fd7345a12ef4;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hp=ddaac1daf9a5464165b5371a4b68edc88da6dc8e;hpb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;p=xscreensaver

diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c
index ddaac1da..94c1b07e 100644
--- a/hacks/xmatrix.c
+++ b/hacks/xmatrix.c
@@ -43,7 +43,7 @@
  *         And keep in mind that this program emulates the
  *         behavior of the computer screens that were visible
  *         in the movies -- not the behavior of the effects in
- *         the title sequences.
+ *         the title sequences.  "GLMatrix" does that.
  *
  *     ==========================================================
  *
@@ -502,6 +502,19 @@ init_spinners (m_state *state)
 }
 
 
+static void
+clear_spinners (m_state *state)
+{
+  int i;
+  for (i = 0; i < state->grid_width * state->grid_height; i++)
+    if (state->cells[i].spinner)
+      {
+        state->cells[i].spinner = 0;
+        state->cells[i].changed = 1;
+      }
+}
+
+
 static void set_mode (m_state *, m_mode);
 
 
@@ -563,12 +576,7 @@ init_drain (m_state *state)
     }
 
   /* Turn off all the spinners, else they never go away. */
-  for (i = 0; i < state->grid_width * state->grid_height; i++)
-    if (state->cells[i].spinner)
-      {
-        state->cells[i].spinner = 0;
-        state->cells[i].changed = 1;
-      }
+  clear_spinners (state);
 }
 
 static Bool
@@ -1176,6 +1184,7 @@ hack_text (m_state *state)
         {
         case TRACE_TEXT_A:
         case TRACE_TEXT_B:
+          clear_spinners (state);
           if (state->mode == TRACE_TEXT_A)
             {
               if (state->grid_width >= 52)
@@ -1250,6 +1259,7 @@ hack_text (m_state *state)
 
         case KNOCK:
           {
+            clear_spinners (state);
             state->typing = ("\001Wake up, Neo...\n"
                              "\001The Matrix has you...\n"
                              "\001Follow the white rabbit.\n"
@@ -1275,6 +1285,7 @@ hack_text (m_state *state)
                lot like Cisco IOS to me.  (IOS is a descendant of VMS.)
             */
 
+            clear_spinners (state);
             state->typing =
 # ifdef __GNUC__
             __extension__  /* don't warn about "string length is greater than
@@ -1284,14 +1295,14 @@ hack_text (m_state *state)
 # endif
               ("# "
                "\010\010\010\010"
-               "\001nmap 10.2.2.2\n"
+               "\001nmap -v -sS -O 10.2.2.2\n"
                "Starting nmap V. 2.54BETA25\n"
                "\010\010\010\010\010\010\010\010\010\010"
                "Insufficient responses for TCP sequencing (3), OS detection"
                " may be less accurate\n"
                "Interesting ports on 10.2.2.2:\n"
-               "(The 1538 ports scanned but not shown below are in state:"
-               " filtered)\n"
+               "(The 1539 ports scanned but not shown below are in state:"
+               " closed)\n"
                "Port       state       service\n"
                "22/tcp     open        ssh\n"
                "\n"
@@ -1564,7 +1575,7 @@ hack_matrix (m_state *state)
 
       if (state->mode == TRACE_A || state->mode == TRACE_B)
         bottom_feeder_p = True;
-      if (state->insert_top_p && state->insert_bottom_p)
+      else if (state->insert_top_p && state->insert_bottom_p)
         bottom_feeder_p = (random() & 1);
       else
         bottom_feeder_p = state->insert_bottom_p;
@@ -1849,6 +1860,7 @@ xmatrix_free (Display *dpy, Window window, void *closure)
 static const char *xmatrix_defaults [] = {
   ".background:		   black",
   ".foreground:		   #00AA00",
+  "*fpsSolid:		   true",
   "*matrixFont:		   large",
   "*delay:		   10000",
   "*insert:		   both",