X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=04e96fb0d90c5f8562b8da1beedf668b22b9d599;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=4f88d8d895ef4e95407ff2a765e1a3b3dc73b225;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;p=xscreensaver

diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c
index 4f88d8d8..04e96fb0 100644
--- a/hacks/xmatrix.c
+++ b/hacks/xmatrix.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1999-2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1999-2014 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
@@ -342,6 +342,7 @@ fill_input (m_state *s)
       s->buf [s->buf_pos] = (char) c;
     }
 
+
   if (n > 0)
     {
         s->do_fill_buff = False;
@@ -1711,7 +1712,8 @@ xmatrix_reshape (Display *dpy, Window window, void *closure,
                         state->xgwa.width,
                         state->xgwa.height,
                         state->grid_width  - 2,
-                        state->grid_height - 1);
+                        state->grid_height - 1,
+                        0);
 }
 
 static Bool
@@ -1781,10 +1783,16 @@ xmatrix_event (Display *dpy, Window window, void *closure, XEvent *event)
          return True;
 
        default:
-         return False;
+         break;
        }
    }
 
+ if (screenhack_event_helper (dpy, window, event))
+   {
+     set_mode (state, DRAIN_MATRIX);
+     return True;
+   }
+
   return False;
 }
 
@@ -1817,8 +1825,8 @@ static const char *xmatrix_defaults [] = {
   "*knockKnock:		   True",
   "*usePipe:		   False",
   "*usePty:                False",
-  "*program:		   xscreensaver-text",
-  "*geometry:		   800x600",
+  "*program:		   xscreensaver-text --latin1",
+  "*geometry:		   960x720",
   0
 };