X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=4f88d8d895ef4e95407ff2a765e1a3b3dc73b225;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hp=ddaac1daf9a5464165b5371a4b68edc88da6dc8e;hpb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;p=xscreensaver diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c index ddaac1da..4f88d8d8 100644 --- a/hacks/xmatrix.c +++ b/hacks/xmatrix.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1999, 2001 Jamie Zawinski +/* xscreensaver, Copyright (c) 1999-2013 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -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. * * ========================================================== * @@ -54,6 +54,7 @@ #endif #include "screenhack.h" +#include "textclient.h" #include "xpm-pixmap.h" #include #include @@ -64,6 +65,10 @@ # define DO_XBM /* only do mono bitmaps under real X11 */ #endif +#ifndef HAVE_COCOA +# include +#endif + #if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) # include "images/matrix1.xpm" # include "images/matrix2.xpm" @@ -78,21 +83,6 @@ # include "images/matrix2b.xbm" #endif /* DO_XBM */ -#ifndef HAVE_COCOA -# include -# include -#endif - -#ifdef HAVE_FORKPTY -# include -# ifdef HAVE_PTY_H -# include -# endif -# ifdef HAVE_UTIL_H -# include -# endif -#endif /* HAVE_FORKPTY */ - #define CHAR_COLS 16 #define CHAR_ROWS 13 #define CHAR_MAPS 3 @@ -201,13 +191,8 @@ typedef struct { m_mode mode; m_mode def_mode; /* Mode to return to after trace etc. */ - pid_t pid; - FILE *pipe; - XtInputId pipe_id; - Bool input_available_p; - Time subproc_relaunch_delay; + text_data *tc; char buf [BUF_SIZE*2+1]; /* ring buffer */ - Bool do_fill_buff; int buf_done; int buf_pos; @@ -331,52 +316,13 @@ flip_images (m_state *state, Bool flipped_p) } } -static void -subproc_cb (XtPointer closure, int *source, XtInputId *id) -{ - m_state *state = (m_state *) closure; - state->input_available_p = True; -} - -static void -launch_text_generator (m_state *state) -{ - XtAppContext app = XtDisplayToApplicationContext (state->dpy); - char *oprogram = get_string_resource (state->dpy, "program", "Program"); - char *program = (char *) malloc (strlen (oprogram) + 10); - strcpy (program, "( "); - strcat (program, oprogram); - strcat (program, " ) 2>&1"); - - if ((state->pipe = popen (program, "r"))) - { - state->pipe_id = - XtAppAddInput (app, fileno (state->pipe), - (XtPointer) (XtInputReadMask | XtInputExceptMask), - subproc_cb, (XtPointer) state); - } - else - { - perror (program); - } -} - - -static void -relaunch_generator_timer (XtPointer closure, XtIntervalId *id) -{ - m_state *state = (m_state *) closure; - launch_text_generator (state); -} /* When the subprocess has generated some output, this reads as much as it can into s->buf at s->buf_tail. */ - static void fill_input (m_state *s) { - XtAppContext app = XtDisplayToApplicationContext (s->dpy); int n = 0; int loadBytes; if(s->buf_done > s->buf_pos){ @@ -385,15 +331,17 @@ fill_input (m_state *s) else{ loadBytes = ((BUF_SIZE - s->buf_pos) + s->buf_done) - 1; } - if (! s->pipe) return; - if (! s->input_available_p) return; - s->input_available_p = False; - - if (loadBytes > 0){ - n = read (fileno (s->pipe), - (void *) (s->buf+s->buf_pos), - loadBytes); - } + + if (!s->tc) + return; + + if (loadBytes > 0) + { + int c = textclient_getc (s->tc); + n = (c > 0 ? 1 : -1); + s->buf [s->buf_pos] = (char) c; + } + if (n > 0) { s->do_fill_buff = False; @@ -410,20 +358,10 @@ fill_input (m_state *s) /* Couldn't read anything from the buffer */ /* Assume EOF has been reached, so start again */ s->do_fill_buff = True; - XtRemoveInput (s->pipe_id); - s->pipe_id = 0; - pclose (s->pipe); - s->pipe = 0; - - /* Set up a timer to re-launch the subproc in a bit. */ - XtAppAddTimeOut (app, s->subproc_relaunch_delay, - relaunch_generator_timer, - (XtPointer) s); } } - static void cursor_on_timer (XtPointer closure, XtIntervalId *id); static void cursor_off_timer (XtPointer closure, XtIntervalId *id); @@ -502,6 +440,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 +514,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 @@ -807,7 +753,7 @@ xmatrix_init (Display *dpy, Window window) set_mode (state, ASCII); state->def_mode = ASCII; state->use_pipe_p = True; - launch_text_generator (state); + state->tc = textclient_open (dpy); } else if (!mode || !*mode || !strcasecmp(mode, "matrix")) set_mode (state, MATRIX); @@ -1176,6 +1122,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 +1197,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 +1223,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 +1233,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" @@ -1394,7 +1343,7 @@ hack_text (m_state *state) AGAIN: c = ((unsigned char *) state->typing)[0]; - c1 = ((unsigned char *) state->typing)[1]; + c1 = c ? ((unsigned char *) state->typing)[1] : 0; state->typing_delay = (!c || c1 == '\n' ? state->typing_line_delay @@ -1564,7 +1513,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; @@ -1757,6 +1706,12 @@ xmatrix_reshape (Display *dpy, Window window, void *closure, free (state->feeders); state->feeders = nfeeders; } + if (state->tc) + textclient_reshape (state->tc, + state->xgwa.width, + state->xgwa.height, + state->grid_width - 2, + state->grid_height - 1); } static Bool @@ -1837,7 +1792,8 @@ static void xmatrix_free (Display *dpy, Window window, void *closure) { m_state *state = (m_state *) closure; - + if (state->tc) + textclient_close (state->tc); if (state->cursor_timer) XtRemoveTimeOut (state->cursor_timer); @@ -1849,6 +1805,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", @@ -1859,6 +1816,7 @@ static const char *xmatrix_defaults [] = { "*trace: True", "*knockKnock: True", "*usePipe: False", + "*usePty: False", "*program: xscreensaver-text", "*geometry: 800x600", 0