X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=1cd608010aef21d777cdf90b9a7352a79ddead7b;hb=13dbc569cdc6e29019722c0ef9b932a925efbcad;hp=11ff592b2f4ded2fd0060e343710d1c86c0b3551;hpb=c596d1306f5f92f7eab76224d3b049980a14adcb;p=xscreensaver diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c index 11ff592b..1cd60801 100644 --- a/hacks/xmatrix.c +++ b/hacks/xmatrix.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1999 Jamie Zawinski +/* xscreensaver, Copyright (c) 1999, 2001 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 @@ -15,30 +15,63 @@ * Windows/Mac version at http://www.whatisthematrix.com/) doesn't match my * memory of what the screens in the movie looked like, so my `xmatrix' * does things differently. + * + * + * ========================================================== + * + * NOTE: + * + * People just love to hack on this one. I get sent + * patches to this all the time saying, ``here, I made + * it better!'' Mostly this hasn't been true. + * + * If you've made changes to xmatrix, when you send me + * your patch, please explain, in English, both *what* + * your changes are, and *why* you think those changes + * make this screensaver behave more like the displays + * in the movie did. I'd rather not have to read your + * diffs to try and figure that out for myself... + * + * In particular, note that the characters in the movie + * were, in fact, low resolution and somewhat blurry/ + * washed out. They also definitely scrolled a + * character at a time, not a pixel at a time. + * + * ========================================================== + * */ #include "screenhack.h" +#include "xpm-pixmap.h" #include #include -#ifdef HAVE_XPM -# include -# include "images/matrix.xpm" +#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) +# include "images/matrix0.xpm" +# include "images/matrix1.xpm" # include "images/matrix2.xpm" +# include "images/matrix0b.xpm" +# include "images/matrix1b.xpm" +# include "images/matrix2b.xpm" #endif -#include "images/matrix.xbm" +#include "images/matrix0.xbm" +#include "images/matrix1.xbm" #include "images/matrix2.xbm" +#include "images/matrix0b.xbm" +#include "images/matrix1b.xbm" +#include "images/matrix2b.xbm" -#define CHAR_ROWS 27 -#define CHAR_COLS 3 -#define FADE_COL 0 -#define PLAIN_COL 1 -#define GLOW_COL 2 +#define CHAR_COLS 16 +#define CHAR_ROWS 13 +#define CHAR_MAPS 3 +#define FADE_MAP 0 +#define PLAIN_MAP 1 +#define GLOW_MAP 2 typedef struct { - unsigned int glyph : 8; int glow : 8; + unsigned int glyph : 9; /* note: 9 bit characters! */ unsigned int changed : 1; unsigned int spinner : 1; } m_cell; @@ -49,6 +82,42 @@ typedef struct { int y; } m_feeder; +#define countof(x) (sizeof(x)/sizeof(*(x))) + +static int matrix_encoding[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207 }; +static int decimal_encoding[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 }; +static int hex_encoding[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 33, 34, 35, 36, 37, 38 }; +static int binary_encoding[] = { 16, 17 }; +static int dna_encoding[] = { 33, 35, 39, 52 }; +static unsigned char char_map[256] = { + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 0 */ + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 16 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 32 */ + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* 48 */ + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, /* 64 */ + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, /* 80 */ + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, /* 96 */ + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, /* 112 */ + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 128 */ + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 144 */ + 96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111, /* 160 */ + 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, /* 176 */ + 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, /* 192 */ + 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, /* 208 */ + 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, /* 224 */ + 176,177,178,195,180,181,182,183,184,185,186,187,188,189,190,191 /* 240 */ +}; + +#define CURSOR_GLYPH 97 + +typedef enum { TRACE0, TRACE1, TRACE2, + KNOCK0, KNOCK1, KNOCK2, KNOCK3, + KNOCK4, KNOCK5, KNOCK6, KNOCK7, + MATRIX, DNA, BINARY, HEX } m_mode; + typedef struct { Display *dpy; Window window; @@ -57,86 +126,110 @@ typedef struct { int grid_width, grid_height; int char_width, char_height; m_cell *cells; + m_cell *cursor; m_feeder *feeders; + int nspinners; Bool small_p; Bool insert_top_p, insert_bottom_p; + m_mode mode; + signed char *tracing; int density; - Pixmap images; + Pixmap images[CHAR_MAPS]; int image_width, image_height; + int nglyphs; + int *glyph_map; } m_state; static void -load_images (m_state *state) +load_images_1 (m_state *state, int which) { -#ifdef HAVE_XPM +#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) if (!get_boolean_resource ("mono", "Boolean") && state->xgwa.depth > 1) { - XpmAttributes xpmattrs; - int result; - xpmattrs.valuemask = 0; - -# ifdef XpmCloseness - xpmattrs.valuemask |= XpmCloseness; - xpmattrs.closeness = 40000; -# endif -# ifdef XpmVisual - xpmattrs.valuemask |= XpmVisual; - xpmattrs.visual = state->xgwa.visual; -# endif -# ifdef XpmDepth - xpmattrs.valuemask |= XpmDepth; - xpmattrs.depth = state->xgwa.depth; -# endif -# ifdef XpmColormap - xpmattrs.valuemask |= XpmColormap; - xpmattrs.colormap = state->xgwa.colormap; -# endif - - result = XpmCreatePixmapFromData (state->dpy, state->window, - (state->small_p - ? matrix2_xpm - : matrix_xpm), - &state->images, 0 /* mask */, - &xpmattrs); - if (!state->images || (result != XpmSuccess && result != XpmColorError)) - state->images = 0; - - state->image_width = xpmattrs.width; - state->image_height = xpmattrs.height; - state->nglyphs = CHAR_ROWS; + char **bits = + (which == 0 ? (state->small_p ? matrix0b_xpm : matrix0_xpm) : + which == 1 ? (state->small_p ? matrix1b_xpm : matrix1_xpm) : + (state->small_p ? matrix2b_xpm : matrix2_xpm)); + + state->images[which] = + xpm_data_to_pixmap (state->dpy, state->window, bits, + &state->image_width, &state->image_height, 0); } else -#endif /* !HAVE_XPM */ +#endif /* !HAVE_XPM && !HAVE_GDK_PIXBUF */ { unsigned long fg, bg; - state->image_width = (state->small_p ? matrix2_width : matrix_width); - state->image_height = (state->small_p ? matrix2_height : matrix_height); - state->nglyphs = CHAR_ROWS; - + state->image_width = (state->small_p ? matrix0b_width :matrix0_width); + state->image_height = (state->small_p ? matrix0b_height:matrix0_height); fg = get_pixel_resource("foreground", "Foreground", state->dpy, state->xgwa.colormap); bg = get_pixel_resource("background", "Background", state->dpy, state->xgwa.colormap); - state->images = - XCreatePixmapFromBitmapData (state->dpy, state->window, - (state->small_p - ? (char *) matrix2_bits - : (char *) matrix_bits), + state->images[which] = + XCreatePixmapFromBitmapData (state->dpy, state->window, (char *) + (which == 0 ? (state->small_p ? matrix0b_bits :matrix0_bits) : + which == 1 ? (state->small_p ? matrix1b_bits :matrix1_bits) : + (state->small_p ? matrix2b_bits :matrix2_bits)), state->image_width, state->image_height, bg, fg, state->xgwa.depth); } } +static void +load_images (m_state *state) +{ + load_images_1 (state, 0); + load_images_1 (state, 1); + load_images_1 (state, 2); +} + + +static void +flip_images_1 (m_state *state, int which) +{ + XImage *im = XGetImage (state->dpy, state->images[which], 0, 0, + state->image_width, state->image_height, + ~0L, (state->xgwa.depth > 1 ? ZPixmap : XYPixmap)); + int x, y, xx; + int ww = state->char_width; + unsigned long *row = (unsigned long *) malloc (sizeof(*row) * ww); + + for (y = 0; y < state->image_height; y++) + { + for (x = 0; x < CHAR_COLS; x++) + { + for (xx = 0; xx < ww; xx++) + row[xx] = XGetPixel (im, (x * ww) + xx, y); + for (xx = 0; xx < ww; xx++) + XPutPixel (im, (x * ww) + xx, y, row[ww - xx - 1]); + } + } + + XPutImage (state->dpy, state->images[which], state->draw_gc, im, 0, 0, 0, 0, + state->image_width, state->image_height); + XDestroyImage (im); + free (row); +} + +static void +flip_images (m_state *state) +{ + flip_images_1 (state, 0); + flip_images_1 (state, 1); + flip_images_1 (state, 2); +} + + static void init_spinners (m_state *state) { - int i = get_integer_resource ("spinners", "Integer"); + int i = state->nspinners; int x, y; m_cell *cell; @@ -157,18 +250,65 @@ init_spinners (m_state *state) } +static void +init_trace (m_state *state) +{ + char *s = get_string_resource ("tracePhone", "TracePhone"); + char *s2, *s3; + int i; + if (!s) + goto FAIL; + + state->tracing = (char *) malloc (strlen (s) + 1); + s3 = state->tracing; + + for (s2 = s; *s2; s2++) + if (*s2 >= '0' && *s2 <= '9') + *s3++ = *s2; + *s3 = 0; + + if (s3 == (char *) state->tracing) + goto FAIL; + + for (i = 0; i < strlen(state->tracing); i++) + state->tracing[i] = -state->tracing[i]; + + state->glyph_map = decimal_encoding; + state->nglyphs = countof(decimal_encoding); + + return; + + FAIL: + fprintf (stderr, "%s: bad phone number: \"%s\".\n", + progname, s ? s : "(null)"); + + if (s) free (s); + if (state->tracing) free (state->tracing); + state->tracing = 0; + state->mode = MATRIX; +} + + static m_state * init_matrix (Display *dpy, Window window) { XGCValues gcv; - char *insert; + char *insert, *mode; m_state *state = (m_state *) calloc (sizeof(*state), 1); + state->dpy = dpy; state->window = window; XGetWindowAttributes (dpy, window, &state->xgwa); - state->small_p = get_boolean_resource ("small", "Boolean"); + { + const char *s = get_string_resource ("small", "Boolean"); + if (s && *s) + state->small_p = get_boolean_resource ("small", "Boolean"); + else + state->small_p = (state->xgwa.width < 300); + } + load_images (state); gcv.foreground = get_pixel_resource("foreground", "Foreground", @@ -189,8 +329,12 @@ init_matrix (Display *dpy, Window window) state->grid_width++; state->grid_height++; + state->glyph_map = matrix_encoding; + state->nglyphs = countof(matrix_encoding); + state->cells = (m_cell *) calloc (sizeof(m_cell), state->grid_width * state->grid_height); + state->cursor = NULL; state->feeders = (m_feeder *) calloc (sizeof(m_feeder), state->grid_width); state->density = get_integer_resource ("density", "Integer"); @@ -221,10 +365,58 @@ init_matrix (Display *dpy, Window window) state->insert_bottom_p = True; } + state->nspinners = get_integer_resource ("spinners", "Integer"); + if (insert) free (insert); - init_spinners (state); + mode = get_string_resource ("mode", "Mode"); + if (mode && !strcasecmp(mode, "trace")) + state->mode = TRACE0; + else if (mode && !strcasecmp(mode, "dna")) + state->mode = DNA; + else if (mode && !strcasecmp(mode, "binary")) + state->mode = BINARY; + else if (mode && (!strcasecmp(mode, "hex") || + !strcasecmp(mode, "hexadecimal"))) + state->mode = HEX; + else if (!mode || !*mode || !strcasecmp(mode, "matrix")) + state->mode = MATRIX; + else + { + fprintf (stderr, + "%s: `mode' must be matrix, trace, dna, binary, or hex: not `%s'\n", + progname, mode); + state->mode = MATRIX; + } + + if (state->mode == DNA) + { + state->glyph_map = dna_encoding; + state->nglyphs = countof(dna_encoding); + } + else if (state->mode == BINARY) + { + state->glyph_map = binary_encoding; + state->nglyphs = countof(binary_encoding); + } + else if (state->mode == HEX) + { + state->glyph_map = hex_encoding; + state->nglyphs = countof(hex_encoding); + } + else if (state->mode == HEX) + { + state->glyph_map = hex_encoding; + state->nglyphs = countof(hex_encoding); + } + else if (state->mode == TRACE0) + init_trace (state); + else + { + flip_images (state); + init_spinners (state); + } return state; } @@ -273,6 +465,14 @@ feed_matrix (m_state *state) { int x; + switch (state->mode) + { + case TRACE2: case MATRIX: case DNA: case BINARY: case HEX: + break; + default: + return; + } + /* Update according to current feeders. */ for (x = 0; x < state->grid_width; x++) { @@ -284,7 +484,7 @@ feed_matrix (m_state *state) } else if (f->remaining > 0) /* how many items are in the pipe */ { - int g = (random() % state->nglyphs) + 1; + int g = state->glyph_map[(random() % state->nglyphs)] + 1; insert_glyph (state, g, x, f->y); f->remaining--; if (f->y >= 0) /* bottom_feeder_p */ @@ -304,6 +504,97 @@ feed_matrix (m_state *state) } } + +static void +redraw_cells (m_state *state, Bool active) +{ + int x, y; + int count = 0; + + for (y = 0; y < state->grid_height; y++) + for (x = 0; x < state->grid_width; x++) + { + m_cell *cell = &state->cells[state->grid_width * y + x]; + + if (cell->glyph) + count++; + + if (state->mode == TRACE2 && active) + { + int xx = x % strlen(state->tracing); + Bool dead_p = state->tracing[xx] > 0; + + if (y == 0 && x == xx) + cell->glyph = (dead_p + ? state->glyph_map[state->tracing[xx]-'0'] + 1 + : 0); + else if (y == 0) + cell->glyph = 0; + else + cell->glyph = (dead_p ? 0 : + (state->glyph_map[(random()%state->nglyphs)] + + 1)); + + cell->changed = 1; + } + + if (!cell->changed) + continue; + + if (cell->glyph == 0 && cell != state->cursor) + XFillRectangle (state->dpy, state->window, state->erase_gc, + x * state->char_width, + y * state->char_height, + state->char_width, + state->char_height); + else + { + int g = (cell == state->cursor ? CURSOR_GLYPH : cell->glyph); + int cx = (g - 1) % CHAR_COLS; + int cy = (g - 1) / CHAR_COLS; + int map = ((cell->glow > 0 || cell->spinner) ? GLOW_MAP : + (cell->glow < 0) ? FADE_MAP : + PLAIN_MAP); + + XCopyArea (state->dpy, state->images[map], + state->window, state->draw_gc, + cx * state->char_width, + cy * state->char_height, + state->char_width, + state->char_height, + x * state->char_width, + y * state->char_height); + } + + cell->changed = 0; + + if (cell->glow > 0) + { + cell->glow--; + cell->changed = 1; + } + else if (cell->glow < 0) + { + cell->glow++; + if (cell->glow == 0) + cell->glyph = 0; + cell->changed = 1; + } + + if (cell->spinner && active) + { + cell->glyph = (state->glyph_map[(random()%state->nglyphs)] + 1); + cell->changed = 1; + } + } + + if (state->cursor) + { + state->cursor->changed = 1; + } +} + + static int densitizer (m_state *state) { @@ -326,11 +617,230 @@ densitizer (m_state *state) } +static void +hack_text (m_state *state) +{ + int i; + int x = 0; + const char *s; + Bool typing_delay = False; + Bool transmit_delay = False; + Bool visible_cursor = False; + switch (state->mode) + { + case TRACE0: if (state->grid_width >= 52) + s = "Call trans opt: received. 2-19-98 13:24:18 REC:Log>"; + else + s = "Call trans opt: received.\n2-19-98 13:24:18 REC:Log>"; + transmit_delay = True; + visible_cursor = True; + break; + case TRACE1: s = "Trace program: running"; + transmit_delay = True; + visible_cursor = True; + break; + case KNOCK0: s = "Wake up, Neo..."; break; + case KNOCK1: s = ""; break; + case KNOCK2: s = "The Matrix has you..."; typing_delay = True; break; + case KNOCK3: s = ""; break; + case KNOCK4: s = "Follow the white rabbit."; typing_delay = True; break; + case KNOCK5: s = ""; break; + case KNOCK6: s = "Knock, knock, Neo."; break; + case KNOCK7: s = ""; break; + + default: abort(); break; + } + + for (i = 0; i < state->grid_height * state->grid_width; i++) + { + m_cell *cell = &state->cells[i]; + cell->changed = (cell->glyph != 0); + cell->glyph = 0; + } + + if (state->mode == TRACE0 || state->mode == TRACE1) + i = 0; + else + { + int y; + x = ((int)state->grid_width - (int)strlen(s)) / 2; + y = (state->grid_height / 2) - 1; + if (y < 0) y = 0; + if (x < 0) x = 0; + i = (y * state->grid_width) + x; + } + + while (*s) + { + if (*s == '\n') + { + i = ((i / state->grid_width) + 1) * state->grid_width; + x = 0; + } + else + { + m_cell *cell = &state->cells[i]; + if (x < state->grid_width-1) + { + cell->glyph = char_map[(unsigned char) *s] + 1; + if (*s == ' ' || *s == '\t') cell->glyph = 0; + cell->changed = 1; + if (visible_cursor) + { + m_cell *next = &state->cells[i + 1]; + next->changed = 1; + state->cursor = next; + } + i++; + } + x++; + } + s++; + if (typing_delay || transmit_delay) + { + redraw_cells (state, False); + XSync (state->dpy, False); + screenhack_handle_events (state->dpy); + if (typing_delay) + { + usleep (50000); + if (typing_delay && 0 == random() % 3) + usleep (0xFFFFFF & ((random() % 250000) + 1)); + } + else + usleep (20000); + } + } +} + +static void +roll_state (m_state *state) +{ + int delay = 0; + switch (state->mode) + { + case TRACE0: + delay = 3; + state->mode = TRACE1; + break; + + case TRACE1: + delay = 2; + state->mode = TRACE2; + break; + + case TRACE2: + { + Bool any = False; + int i; + for (i = 0; i < strlen(state->tracing); i++) + if (state->tracing[i] < 0) any = True; + + if (!any) + { + XSync (state->dpy, False); + sleep (3); + state->mode = MATRIX; + state->glyph_map = matrix_encoding; + state->nglyphs = countof(matrix_encoding); + flip_images (state); + free (state->tracing); + state->tracing = 0; + } + else if ((random() % 10) == 0) + { + int x = random() % strlen(state->tracing); + if (state->tracing[x] < 0) + state->tracing[x] = -state->tracing[x]; + } + break; + } + + case KNOCK0: delay = 1; state->mode++; break; /* wake */ + case KNOCK1: delay = 4; state->mode++; break; + case KNOCK2: delay = 2; state->mode++; break; /* has */ + case KNOCK3: delay = 4; state->mode++; break; + case KNOCK4: delay = 2; state->mode++; break; /* rabbit */ + case KNOCK5: delay = 4; state->mode++; break; + case KNOCK6: delay = 4; state->mode++; break; /* knock */ + case KNOCK7: + state->mode = MATRIX; + state->glyph_map = matrix_encoding; + state->nglyphs = countof(matrix_encoding); + flip_images (state); + break; + + case MATRIX: + if (! (random() % 5000)) + { + state->mode = KNOCK0; + flip_images (state); + } + break; + + case DNA: case BINARY: case HEX: + break; + + default: + abort(); + break; + } + + if (delay) + { + if (state->cursor) + { + int blink_delay = 333000; + int tot_delay = 0; + m_cell *cursor = state->cursor; + while (tot_delay < delay * 1000000) + { + if (state->cursor) + { + usleep (blink_delay * 2); + tot_delay += (2 * blink_delay); + state->cursor = NULL; + } + else + { + usleep (blink_delay); + tot_delay += blink_delay; + state->cursor = cursor; + } + cursor->changed = 1; + redraw_cells (state, False); + XSync (state->dpy, False); + screenhack_handle_events (state->dpy); + } + } + else + { + XSync (state->dpy, False); + sleep (delay); + } + } + state->cursor = NULL; +} + + static void hack_matrix (m_state *state) { int x; + switch (state->mode) + { + case TRACE0: case TRACE1: + case KNOCK0: case KNOCK1: case KNOCK2: case KNOCK3: + case KNOCK4: case KNOCK5: case KNOCK6: case KNOCK7: + hack_text (state); + return; + case TRACE2: case MATRIX: case DNA: case BINARY: case HEX: + break; + default: + abort(); break; + } + /* Glow some characters. */ if (!state->insert_bottom_p) { @@ -366,6 +876,8 @@ hack_matrix (m_state *state) if ((random() % 4) != 0) f->remaining = 0; + if (state->mode == TRACE2) + bottom_feeder_p = True; if (state->insert_top_p && state->insert_bottom_p) bottom_feeder_p = (random() & 1); else @@ -377,7 +889,8 @@ hack_matrix (m_state *state) f->y = -1; } - if (! (random() % 500)) + if (!state->mode == TRACE2 && + ! (random() % 500)) init_spinners (state); } @@ -385,62 +898,10 @@ hack_matrix (m_state *state) static void draw_matrix (m_state *state) { - int x, y; - int count = 0; - feed_matrix (state); hack_matrix (state); - - for (y = 0; y < state->grid_height; y++) - for (x = 0; x < state->grid_width; x++) - { - m_cell *cell = &state->cells[state->grid_width * y + x]; - - if (cell->glyph) - count++; - - if (!cell->changed) - continue; - - if (cell->glyph == 0) - XFillRectangle (state->dpy, state->window, state->erase_gc, - x * state->char_width, - y * state->char_height, - state->char_width, - state->char_height); - else - XCopyArea (state->dpy, state->images, state->window, state->draw_gc, - ((cell->glow > 0 || cell->spinner) - ? (state->char_width * GLOW_COL) - : (cell->glow == 0 - ? (state->char_width * PLAIN_COL) - : (state->char_width * FADE_COL))), - (cell->glyph - 1) * state->char_height, - state->char_width, state->char_height, - x * state->char_width, - y * state->char_height); - - cell->changed = 0; - - if (cell->glow > 0) - { - cell->glow--; - cell->changed = 1; - } - else if (cell->glow < 0) - { - cell->glow++; - if (cell->glow == 0) - cell->glyph = 0; - cell->changed = 1; - } - - if (cell->spinner) - { - cell->glyph = random() % CHAR_ROWS; - cell->changed = 1; - } - } + redraw_cells (state, True); + roll_state (state); #if 0 { @@ -468,10 +929,12 @@ char *progclass = "XMatrix"; char *defaults [] = { ".background: black", - ".foreground: green", - "*small: False", + ".foreground: #00AA00", + "*small: ", "*delay: 10000", "*insert: both", + "*mode: Matrix", + "*tracePhone: (212) 555-0690", "*spinners: 5", "*density: 75", 0 @@ -485,6 +948,11 @@ XrmOptionDescRec options [] = { { "-bottom", ".insert", XrmoptionNoArg, "bottom" }, { "-both", ".insert", XrmoptionNoArg, "both" }, { "-density", ".density", XrmoptionSepArg, 0 }, + { "-trace", ".mode", XrmoptionNoArg, "trace" }, + { "-phone", ".tracePhone", XrmoptionSepArg, 0 }, + { "-dna", ".mode", XrmoptionNoArg, "DNA" }, + { "-binary", ".mode", XrmoptionNoArg, "binary" }, + { "-hexadecimal", ".mode", XrmoptionNoArg, "hexadecimal"}, { 0, 0, 0, 0 } };