X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=85ed51e72cf5f438c9e4ec24a05a3e0820cbb967;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=6ac91a1a793fde87e75d049a595419052875d42b;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c index 6ac91a1a..85ed51e7 100644 --- a/hacks/xmatrix.c +++ b/hacks/xmatrix.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1999, 2001 Jamie Zawinski +/* xscreensaver, Copyright (c) 1999-2014 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); @@ -815,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); @@ -1405,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 @@ -1768,6 +1706,13 @@ 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, + 0); } static Bool @@ -1837,10 +1782,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; } @@ -1848,7 +1799,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); @@ -1871,8 +1823,9 @@ static const char *xmatrix_defaults [] = { "*trace: True", "*knockKnock: True", "*usePipe: False", + "*usePty: False", "*program: xscreensaver-text", - "*geometry: 800x600", + "*geometry: 960x720", 0 };