X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxmatrix.c;h=decddaa7bd7c8aaaf64b376452775dbd762d6ada;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=4ae544547e49a7fc1133fdc0ad4bb43ef90c9ebc;hpb=ff35d056d723c9a5ffe728dbba5f1c25e141be04;p=xscreensaver diff --git a/hacks/xmatrix.c b/hacks/xmatrix.c index 4ae54454..decddaa7 100644 --- a/hacks/xmatrix.c +++ b/hacks/xmatrix.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1999-2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 1999-2018 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 @@ -55,33 +55,18 @@ #include "screenhack.h" #include "textclient.h" -#include "xpm-pixmap.h" +#include "ximage-loader.h" #include #include -#ifdef HAVE_COCOA -# define HAVE_XPM -#else -# define DO_XBM /* only do mono bitmaps under real X11 */ -#endif - -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ # include #endif -#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) -# include "images/matrix1.xpm" -# include "images/matrix2.xpm" -# include "images/matrix1b.xpm" -# include "images/matrix2b.xpm" -#endif - -#ifdef DO_XBM -# include "images/matrix1.xbm" -# include "images/matrix2.xbm" -# include "images/matrix1b.xbm" -# include "images/matrix2b.xbm" -#endif /* DO_XBM */ +#include "images/gen/matrix1_png.h" +#include "images/gen/matrix2_png.h" +#include "images/gen/matrix1b_png.h" +#include "images/gen/matrix2b_png.h" #define CHAR_COLS 16 #define CHAR_ROWS 13 @@ -234,39 +219,25 @@ typedef struct { static void load_images_1 (Display *dpy, m_state *state, int which) { -#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) - if (!get_boolean_resource (dpy, "mono", "Boolean") && - state->xgwa.depth > 1) + const unsigned char *png = 0; + unsigned long size = 0; + if (which == 1) { - char **bits = - (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); + if (state->small_p) + png = matrix1b_png, size = sizeof(matrix1b_png); + else + png = matrix1_png, size = sizeof(matrix1_png); } else -#endif /* !HAVE_XPM && !HAVE_GDK_PIXBUF */ { -#ifdef DO_XBM - unsigned long fg, bg; - state->image_width = (state->small_p ? matrix1b_width :matrix1_width); - state->image_height = (state->small_p ? matrix1b_height:matrix1_height); - fg = get_pixel_resource(state->dpy, state->xgwa.colormap, - "foreground", "Foreground"); - bg = get_pixel_resource(state->dpy, state->xgwa.colormap, - "background", "Background"); - state->images[which] = - XCreatePixmapFromBitmapData (state->dpy, state->window, (char *) - (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); -#else /* !DO_XBM */ - abort(); -#endif /* !DO_XBM */ + if (state->small_p) + png = matrix2b_png, size = sizeof(matrix2b_png); + else + png = matrix2_png, size = sizeof(matrix2_png); } + state->images[which] = + image_data_to_pixmap (state->dpy, state->window, png, size, + &state->image_width, &state->image_height, 0); } @@ -342,6 +313,7 @@ fill_input (m_state *s) s->buf [s->buf_pos] = (char) c; } + if (n > 0) { s->do_fill_buff = False; @@ -460,25 +432,22 @@ static void init_trace (m_state *state) { char *s = get_string_resource (state->dpy, "tracePhone", "TracePhone"); - char *s2, *s3; - int i; + const char *s2; + signed char *s3; if (!s) goto FAIL; state->tracing = (signed char *) malloc (strlen (s) + 1); - s3 = (char *) state->tracing; + s3 = state->tracing; for (s2 = s; *s2; s2++) if (*s2 >= '0' && *s2 <= '9') - *s3++ = *s2; + *s3++ = -*s2; *s3 = 0; - if (s3 == (char *) state->tracing) + if (s3 == state->tracing) goto FAIL; - for (i = 0; i < strlen((char *) state->tracing); i++) - state->tracing[i] = -state->tracing[i]; - state->glyph_map = decimal_encoding; state->nglyphs = countof(decimal_encoding); @@ -1333,6 +1302,33 @@ hack_text (m_state *state) state->typing_delay = state->typing_char_delay; if (state->typing_cursor_p) set_cursor (state, True); + +# ifdef USE_IPHONE + /* Stupid iPhone X bezel. + #### This is the worst of all possible ways to do this! But how else? + */ + if (state->xgwa.width == 2436 || state->xgwa.height == 2436) + switch (state->mode) + { + case TRACE_TEXT_A: + case TRACE_TEXT_B: + case KNOCK: + case NMAP: + { + int off = 5 * (state->small_p ? 2 : 1); + if (state->xgwa.width > state->xgwa.height) + { + state->typing_left_margin += off; + state->cursor_x += off; + } + else + { + state->cursor_y += off; + } + } + default: break; + } +# endif } else { @@ -1343,7 +1339,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 @@ -1711,7 +1707,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 +1778,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; } @@ -1805,6 +1808,7 @@ xmatrix_free (Display *dpy, Window window, void *closure) static const char *xmatrix_defaults [] = { ".background: black", ".foreground: #00AA00", + ".lowrez: true", /* Small font is unreadable at 5120x2880 */ "*fpsSolid: true", "*matrixFont: large", "*delay: 10000", @@ -1817,8 +1821,8 @@ static const char *xmatrix_defaults [] = { "*knockKnock: True", "*usePipe: False", "*usePty: False", - "*program: xscreensaver-text", - "*geometry: 800x600", + "*program: xscreensaver-text --latin1", + "*geometry: 960x720", 0 };