X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxlockmore.c;h=29e1eb6d8c897b7116a5e79adbf18196db247448;hp=00994ac878d93763e22f2a28f69e00e473afda34;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c diff --git a/hacks/xlockmore.c b/hacks/xlockmore.c index 00994ac8..29e1eb6d 100644 --- a/hacks/xlockmore.c +++ b/hacks/xlockmore.c @@ -1,5 +1,5 @@ /* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules. - * xscreensaver, Copyright (c) 1997-2014 Jamie Zawinski + * xscreensaver, Copyright (c) 1997-2017 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,9 @@ # include #endif /* !HAVE_JWXYZ */ +#include +#include + #define countof(x) (sizeof((x))/sizeof(*(x))) #define MAX_COLORS (1L<<13) @@ -235,6 +238,44 @@ xlockmore_setup (struct xscreensaver_function_table *xsft, void *arg) } +static void +xlockmore_free_screens (ModeInfo *mi) +{ + struct xlockmore_function_table *xlmft = mi->xlmft; + + /* Optimization: xlockmore_read_resources calls this lots on first start. */ + if (!xlmft->got_init) + return; + + /* Order is important here: */ + + /* 1. Call free_## for all screens. */ + if (xlmft->hack_free_state) { + int old_screen = mi->screen_number; + for (mi->screen_number = 0; mi->screen_number < XLOCKMORE_NUM_SCREENS; + ++mi->screen_number) { + xlmft->hack_free_state (mi); + } + mi->screen_number = old_screen; + } + + /* 2. Call release_##, if it exists. */ + if (xlmft->hack_release) + xlmft->hack_release (mi); + + /* 3. Free the state array. */ + if (xlmft->state_array) { + free(*xlmft->state_array); + *xlmft->state_array = NULL; + xlmft->state_array = NULL; + } + + /* 4. Pretend FreeAllGL(mi) gets called here. */ + + mi->xlmft->got_init = 0; +} + + static void xlockmore_read_resources (ModeInfo *mi) { @@ -249,31 +290,77 @@ xlockmore_read_resources (ModeInfo *mi) int *var_i = (int *) var; float *var_f = (float *) var; + /* If any of the options changed, stop this hack's other instances. */ switch (xlockmore_opts->vars[i].type) - { - case t_String: - *var_c = get_string_resource (dpy, xlockmore_opts->vars[i].name, - xlockmore_opts->vars[i].classname); - break; - case t_Float: - *var_f = get_float_resource (dpy, xlockmore_opts->vars[i].name, - xlockmore_opts->vars[i].classname); - break; - case t_Int: - *var_i = get_integer_resource (dpy, xlockmore_opts->vars[i].name, - xlockmore_opts->vars[i].classname); - break; - case t_Bool: - *var_b = get_boolean_resource (dpy, xlockmore_opts->vars[i].name, - xlockmore_opts->vars[i].classname); - break; - default: - abort (); - } + { + case t_String: + { + char *c = get_string_resource (dpy, xlockmore_opts->vars[i].name, + xlockmore_opts->vars[i].classname); + if ((!c && !*var_c) || (c && *var_c && !strcmp(c, *var_c))) { + free (c); + } else { + xlockmore_free_screens (mi); + free (*var_c); + *var_c = c; + } + } + break; + case t_Float: + { + float f = get_float_resource (dpy, xlockmore_opts->vars[i].name, + xlockmore_opts->vars[i].classname); + float frac = fabsf(*var_f) * (1.0f / (1l << (FLT_MANT_DIG - 4))); + if (f < *var_f - frac || f > *var_f + frac) { + xlockmore_free_screens (mi); + *var_f = f; + } + } + break; + case t_Int: + { + int ii = get_integer_resource (dpy, xlockmore_opts->vars[i].name, + xlockmore_opts->vars[i].classname); + if (ii != *var_i) { + xlockmore_free_screens (mi); + *var_i = ii; + } + } + break; + case t_Bool: + { + Bool b = get_boolean_resource (dpy, xlockmore_opts->vars[i].name, + xlockmore_opts->vars[i].classname); + if (b != *var_b) { + xlockmore_free_screens (mi); + *var_b = b; + } + } + break; + default: + abort (); + } } } +/* We keep a list of all of the screen numbers that are in use and not + yet freed so that they can have sensible screen numbers. If three + displays are created (0, 1, 2) and then #1 is closed, then the fourth + display will be given the now-unused display number 1. (Everything in + here assumes a 1:1 Display/Screen mapping.) + + XLOCKMORE_NUM_SCREENS is the most number of live displays at one time. So + if it's 64, then we'll blow up if the system has 64 monitors and also has + System Preferences open (the small preview window). + + Note that xlockmore-style savers tend to allocate big structures, so + setting XLOCKMORE_NUM_SCREENS to 1000 will waste a few megabytes. Also + most (all?) of them assume that the number of screens never changes, so + dynamically expanding this array won't work. + */ + + static void * xlockmore_init (Display *dpy, Window window, struct xlockmore_function_table *xlmft) @@ -292,53 +379,43 @@ xlockmore_init (Display *dpy, Window window, mi->window = window; XGetWindowAttributes (dpy, window, &mi->xgwa); -#ifdef HAVE_JWXYZ - -# if 0 - /* In Cocoa and Android-based xscreensaver, all hacks run in the - same address space, so each one needs to get its own screen - number. Believe what jwxyz says about screen counts and numbers. - */ - mi->num_screens = ScreenCount (dpy); - mi->screen_number = XScreenNumberOfScreen (mi->xgwa.screen); -# else - /* No, that doesn't work. - The xlockmore docs/HACKERS.GUIDE says that xlock modes are supposed to - support repeated calls to init_*() for the same screen in the same - session, but in practice, a number of them blow up if you do that. - So instead we're stuck with a world where on OSX/iOS, we have to - increment the screen number every time the hack is run. Arrgh. - */ - mi->num_screens = 40; - mi->screen_number = xlmft->screen_count; - if (mi->screen_number >= mi->num_screens) abort(); - xlmft->screen_count++; -# endif - root_p = True; + /* In Cocoa and Android-based xscreensaver, as well as with DEBUG_PAIR, + hacks run in the same address space, so each one needs to get its own + screen number. -#else /* real Xlib */ - - /* In Xlib-based xscreensaver, each hack runs in its own address space, - so each one only needs to be aware of one screen. + Find the first empty slot in live_displays and plug us in. */ - mi->num_screens = 1; - mi->screen_number = 0; - - { /* kludge for DEBUG_PAIR */ - static int screen_tick = 0; - mi->num_screens++; - if (screen_tick) - mi->screen_number++; - screen_tick++; + { + const int size = XLOCKMORE_NUM_SCREENS; + int i; + for (i = 0; i < size; i++) { + if (! (xlmft->live_displays & (1 << i))) + break; + } + if (i >= size) abort(); + xlmft->live_displays |= 1ul << i; + xlmft->got_init &= ~(1ul << i); + mi->screen_number = i; } root_p = (window == RootWindowOfScreen (mi->xgwa.screen)); +#ifndef HAVE_JWXYZ + /* Everybody gets motion events, just in case. */ XSelectInput (dpy, window, (mi->xgwa.your_event_mask | PointerMotionMask)); #endif /* !HAVE_JWXYZ */ - + + if (mi->xlmft->hack_release) { +/* + fprintf ( + stderr, + "%s: WARNING: hack_release is not usually recommended; see MI_INIT.\n", + progname); +*/ + } + color.flags = DoRed|DoGreen|DoBlue; color.red = color.green = color.blue = 0; if (!XAllocColor(dpy, mi->xgwa.colormap, &color)) @@ -441,9 +518,6 @@ xlockmore_init (Display *dpy, Window window, mi->wireframe_p = get_boolean_resource (dpy, "wireframe", "Boolean"); mi->root_p = root_p; -#ifdef HAVE_XSHM_EXTENSION - mi->use_shm = get_boolean_resource (dpy, "useSHM", "Boolean"); -#endif /* !HAVE_XSHM_EXTENSION */ mi->fps_p = get_boolean_resource (dpy, "doFPS", "DoFPS"); mi->recursion_depth = -1; /* see fps.c */ @@ -478,24 +552,30 @@ xlockmore_init (Display *dpy, Window window, free (name); } } - + xlockmore_read_resources (mi); - XClearWindow (dpy, window); - - mi->xlmft->hack_init (mi); - return mi; } +static void xlockmore_do_init (ModeInfo *mi) +{ + if (! (mi->xlmft->got_init & (1 << mi->screen_number))) { + mi->xlmft->got_init |= 1 << mi->screen_number; + XClearWindow (mi->dpy, mi->window); + mi->xlmft->hack_init (mi); + } +} + + static unsigned long xlockmore_draw (Display *dpy, Window window, void *closure) { ModeInfo *mi = (ModeInfo *) closure; - unsigned long orig_pause = mi->pause; unsigned long this_pause; + xlockmore_do_init (mi); mi->xlmft->hack_draw (mi); this_pause = mi->pause; @@ -512,6 +592,7 @@ xlockmore_reshape (Display *dpy, Window window, void *closure, if (mi && mi->xlmft->hack_reshape) { XGetWindowAttributes (dpy, window, &mi->xgwa); + xlockmore_do_init (mi); mi->xlmft->hack_reshape (mi, mi->xgwa.width, mi->xgwa.height); } } @@ -520,10 +601,12 @@ static Bool xlockmore_event (Display *dpy, Window window, void *closure, XEvent *event) { ModeInfo *mi = (ModeInfo *) closure; - if (mi && mi->xlmft->hack_handle_events) + if (mi && mi->xlmft->hack_handle_events) { + xlockmore_do_init (mi); return mi->xlmft->hack_handle_events (mi, event); - else + } else { return False; + } } void @@ -538,22 +621,61 @@ xlockmore_do_fps (Display *dpy, Window w, fps_state *fpst, void *closure) static void xlockmore_free (Display *dpy, Window window, void *closure) { - /* Most of the xlockmore/GL hacks don't have `free' functions, and of - those that do have them, they're incomplete or buggy. So, fuck it. - Under X11, we're about to exit anyway, and it doesn't matter. - On OSX, we'll leak a little. Beats crashing. - */ -#if 0 ModeInfo *mi = (ModeInfo *) closure; - if (mi->xlmft->hack_free) - mi->xlmft->hack_free (mi); + + /* Find us in live_displays and clear that slot. */ + assert (mi->xlmft->live_displays & (1ul << mi->screen_number)); + mi->xlmft->live_displays &= ~(1ul << mi->screen_number); + if (!mi->xlmft->live_displays) + xlockmore_free_screens (mi); XFreeGC (dpy, mi->gc); - free_colors (dpy, mi->xgwa.colormap, mi->colors, mi->npixels); + free_colors (mi->xgwa.screen, mi->xgwa.colormap, mi->colors, mi->npixels); free (mi->colors); free (mi->pixels); free (mi); -#endif } + +void +xlockmore_mi_init (ModeInfo *mi, size_t state_size, void **state_array, + void (*hack_free_state) (ModeInfo *)) +{ + struct xlockmore_function_table *xlmft = mi->xlmft; + + /* Steal the state_array for safe keeping. + Only necessary when the screenhack isn't a once per process deal. + (i.e. macOS, iOS, Android) + */ + assert ((!xlmft->state_array && !*state_array) || + xlmft->state_array == state_array); + xlmft->state_array = state_array; + assert (!xlmft->state_size || xlmft->state_size == state_size); + xlmft->state_size = state_size; + assert (!xlmft->hack_free_state || + xlmft->hack_free_state == hack_free_state); + xlmft->hack_free_state = hack_free_state; + + if (!*xlmft->state_array) { + *xlmft->state_array = calloc (XLOCKMORE_NUM_SCREENS, state_size); + + if (!*xlmft->state_array) { +#ifdef HAVE_JWXYZ + /* Throws an exception instead of exiting the process. */ + jwxyz_abort ("%s: out of memory", progname); +#else + fprintf (stderr, "%s: out of memory\n", progname); + exit (1); +#endif + } + } + + /* Find the appropriate state object, clear it, and we're done. */ + { + if (xlmft->hack_free_state) + xlmft->hack_free_state (mi); + memset ((char *)(*xlmft->state_array) + mi->screen_number * state_size, 0, + state_size); + } +}