X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fscreenhack.c;h=addc960ebbfa938c4e3e97a957577fa279d25a26;hp=4850911db59bb5415c966d692e7905d17a846f90;hb=39809ded547bdbb08207d3e514950425215b4410;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba diff --git a/hacks/screenhack.c b/hacks/screenhack.c index 4850911d..addc960e 100644 --- a/hacks/screenhack.c +++ b/hacks/screenhack.c @@ -555,10 +555,12 @@ run_screenhack_table (Display *dpy, void *closure = init_cb (dpy, window, ft->setup_arg); fps_state *fpst = fps_init (dpy, window); + unsigned long delay = 0; #ifdef DEBUG_PAIR void *closure2 = 0; fps_state *fpst2 = 0; + unsigned long delay2 = 0; if (window2) closure2 = init_cb (dpy, window2, ft->setup_arg); if (window2) fpst2 = fps_init (dpy, window2); #endif @@ -570,17 +572,6 @@ run_screenhack_table (Display *dpy, while (1) { - unsigned long delay = ft->draw_cb (dpy, window, closure); -#ifdef DEBUG_PAIR - unsigned long delay2 = 0; - if (window2) delay2 = ft->draw_cb (dpy, window2, closure2); -#endif - - if (fpst) fps_cb (dpy, window, fpst, closure); -#ifdef DEBUG_PAIR - if (fpst2) fps_cb (dpy, window2, fpst2, closure2); -#endif - if (! usleep_and_process_events (dpy, ft, window, fpst, closure, delay #ifdef DEBUG_PAIR @@ -591,6 +582,17 @@ run_screenhack_table (Display *dpy, #endif )) break; + + delay = ft->draw_cb (dpy, window, closure); +#ifdef DEBUG_PAIR + delay2 = 0; + if (window2) delay2 = ft->draw_cb (dpy, window2, closure2); +#endif + + if (fpst) fps_cb (dpy, window, fpst, closure); +#ifdef DEBUG_PAIR + if (fpst2) fps_cb (dpy, window2, fpst2, closure2); +#endif } #ifdef HAVE_RECORD_ANIM