X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fphosphor.c;h=2e57b8617603eed56d83876354175f89fe411590;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=a8469b0a58ac830d1ce1043233005a9c7bcaaf1e;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;p=xscreensaver diff --git a/hacks/phosphor.c b/hacks/phosphor.c index a8469b0a..2e57b861 100644 --- a/hacks/phosphor.c +++ b/hacks/phosphor.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1999-2016 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 @@ -23,6 +23,7 @@ #include "screenhack.h" #include "textclient.h" +#include "ximage-loader.h" #include "utf8wc.h" #define FUZZY_BORDER @@ -43,7 +44,7 @@ #define BUILTIN_FONT #ifdef BUILTIN_FONT -# include "images/6x10font.xbm" +# include "images/gen/6x10font_png.h" #endif /* BUILTIN_FONT */ typedef struct { @@ -70,6 +71,7 @@ typedef struct { const char *program; int grid_width, grid_height; int char_width, char_height; + int xmargin, ymargin; int saved_x, saved_y; int scale; int ticks; @@ -148,6 +150,9 @@ static unsigned short scale_color_channel (unsigned short ch1, unsigned short ch return (ch1 * 100 + ch2 * 156) >> 8; } +#define FONT6x10_WIDTH (256*7) +#define FONT6x10_HEIGHT 10 + static void * phosphor_init (Display *dpy, Window window) { @@ -171,23 +176,13 @@ phosphor_init (Display *dpy, Window window) { #ifndef BUILTIN_FONT fprintf (stderr, "%s: no builtin font\n", progname); - state->font = XLoadQueryFont (dpy, "fixed"); + state->font = load_font_retry (dpy, "fixed"); #endif /* !BUILTIN_FONT */ } else { - state->font = XLoadQueryFont (dpy, fontname); - - if (!state->font) - { - fprintf(stderr, "couldn't load font \"%s\"\n", fontname); - state->font = XLoadQueryFont (dpy, "fixed"); - } - if (!state->font) - { - fprintf(stderr, "couldn't load font \"fixed\""); - exit(1); - } + state->font = load_font_retry (dpy, fontname); + if (!state->font) abort(); } font = state->font; @@ -195,14 +190,15 @@ phosphor_init (Display *dpy, Window window) state->ticks = STATE_MAX + get_integer_resource (dpy, "ticks", "Integer"); state->escstate = 0; + if (state->xgwa.width > 2560) state->scale *= 2; /* Retina displays */ state->cursor_blink = get_integer_resource (dpy, "cursor", "Time"); # ifdef BUILTIN_FONT if (! font) { - state->char_width = (font6x10_width / 256) - 1; - state->char_height = font6x10_height; + state->char_width = (FONT6x10_WIDTH / 256) - 1; + state->char_height = FONT6x10_HEIGHT; } else # endif /* BUILTIN_FONT */ @@ -211,8 +207,20 @@ phosphor_init (Display *dpy, Window window) state->char_height = font->max_bounds.ascent + font->max_bounds.descent; } - state->grid_width = state->xgwa.width / (state->char_width * state->scale); - state->grid_height = state->xgwa.height /(state->char_height * state->scale); +# 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) { + state->xmargin = 96; + state->ymargin = state->xmargin; + } +# endif + + state->grid_width = ((state->xgwa.width - state->xmargin * 2) / + (state->char_width * state->scale)); + state->grid_height = ((state->xgwa.height - state->ymargin * 2) / + (state->char_height * state->scale)); state->cells = (p_cell *) calloc (sizeof(p_cell), state->grid_width * state->grid_height); state->chars = (p_char **) calloc (sizeof(p_char *), 256); @@ -324,8 +332,8 @@ phosphor_init (Display *dpy, Window window) state->tc = textclient_open (dpy); textclient_reshape (state->tc, - state->xgwa.width, - state->xgwa.height, + state->xgwa.width - state->xmargin * 2, + state->xgwa.height - state->ymargin * 2, state->grid_width - 1, state->grid_height - 1, 0); @@ -346,8 +354,17 @@ resize_grid (p_state *state) XGetWindowAttributes (state->dpy, state->window, &state->xgwa); - state->grid_width = state->xgwa.width /(state->char_width * state->scale); - state->grid_height = state->xgwa.height /(state->char_height * state->scale); + /* Would like to ensure here that + state->char_height * state->scale <= state->xgwa.height + but changing scale requires regenerating the bitmaps. */ + + state->grid_width = ((state->xgwa.width - state->xmargin * 2) / + (state->char_width * state->scale)); + state->grid_height = ((state->xgwa.height - state->ymargin * 2) / + (state->char_height * state->scale)); + + if (state->grid_width < 2) state->grid_width = 2; + if (state->grid_height < 2) state->grid_height = 2; if (ow == state->grid_width && oh == state->grid_height) @@ -393,11 +410,54 @@ capture_font_bits (p_state *state) { safe_width = state->char_width + 1; height = state->char_height; - p2 = XCreatePixmapFromBitmapData (state->dpy, state->window, - (char *) font6x10_bits, - font6x10_width, - font6x10_height, - 1, 0, 1); + + int pix_w, pix_h; + XWindowAttributes xgwa; + Pixmap m = 0; + Pixmap p = image_data_to_pixmap (state->dpy, state->window, + _6x10font_png, sizeof(_6x10font_png), + &pix_w, &pix_h, &m); + XImage *im = XGetImage (state->dpy, p, 0, 0, pix_w, pix_h, ~0L, ZPixmap); + XImage *mm = XGetImage (state->dpy, m, 0, 0, pix_w, pix_h, 1, XYPixmap); + XImage *im2; + int x, y; + XGCValues gcv; + GC gc; + unsigned long black = + BlackPixelOfScreen (DefaultScreenOfDisplay (state->dpy)); + + XFreePixmap (state->dpy, p); + XFreePixmap (state->dpy, m); + if (pix_w != 256*7) abort(); + if (pix_h != 10) abort(); + if (pix_w != FONT6x10_WIDTH) abort(); + if (pix_h != FONT6x10_HEIGHT) abort(); + + XGetWindowAttributes (state->dpy, state->window, &xgwa); + im2 = XCreateImage (state->dpy, xgwa.visual, 1, XYBitmap, 0, 0, + pix_w, pix_h, 8, 0); + im2->data = malloc (im2->bytes_per_line * im2->height); + + /* Convert deep image to 1 bit */ + for (y = 0; y < pix_h; y++) + for (x = 0; x < pix_w; x++) + XPutPixel (im2, x, y, + (XGetPixel (mm, x, y) + ? (XGetPixel (im, x, y) == black) + : 0)); + + XDestroyImage (im); + XDestroyImage (mm); + im = 0; + + p2 = XCreatePixmap (state->dpy, state->window, + im2->width, im2->height, im2->depth); + gcv.foreground = 1; + gcv.background = 0; + gc = XCreateGC (state->dpy, p2, GCForeground|GCBackground, &gcv); + XPutImage (state->dpy, p2, gc, im2, 0, 0, 0, 0, im2->width, im2->height); + XFreeGC (state->dpy, gc); + XDestroyImage (im2); } else # endif /* BUILTIN_FONT */ @@ -452,7 +512,7 @@ capture_font_bits (p_state *state) if (p2) { XCopyPlane (state->dpy, p2, p, state->gc1, - 0, 0, font6x10_width, font6x10_height, + 0, 0, FONT6x10_WIDTH, FONT6x10_HEIGHT, 0, 0, 1); XFreePixmap (state->dpy, p2); } @@ -1238,10 +1298,10 @@ update_display (p_state *state, Bool changed_only) if (changed_only && !cell->changed) continue; - width = state->char_width * state->scale; + width = state->char_width * state->scale; height = state->char_height * state->scale; - tx = x * width; - ty = y * height; + tx = x * width + state->xmargin; + ty = y * height + state->ymargin; if (cell->state == BLANK || cell->p_char->blank_p) { @@ -1307,7 +1367,9 @@ phosphor_reshape (Display *dpy, Window window, void *closure, if (! changed_p) return; - textclient_reshape (state->tc, w, h, + textclient_reshape (state->tc, + w - state->xmargin * 2, + h - state->ymargin * 2, state->grid_width - 1, state->grid_height - 1, 0); @@ -1343,6 +1405,7 @@ phosphor_free (Display *dpy, Window window, void *closure) static const char *phosphor_defaults [] = { +/* ".lowrez: true",*/ ".background: Black", ".foreground: #00FF00", "*fpsSolid: true",