-/* xscreensaver, Copyright (c) 1992-2010 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2012 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
"*mono: false",
"*installColormap: false",
"*doFPS: false",
+ "*multiSample: false",
"*visualID: default",
"*windowID: ",
"*desktopGrabber: xscreensaver-getimage %s",
ft->reshape_cb (dpy, window, closure,
event.xconfigure.width, event.xconfigure.height);
#ifdef DEBUG_PAIR
- if (event.xany.window == window2)
+ if (window2 && event.xany.window == window2)
ft->reshape_cb (dpy, window2, closure2,
event.xconfigure.width, event.xconfigure.height);
#endif
(! (event.xany.window == window
? ft->event_cb (dpy, window, closure, &event)
#ifdef DEBUG_PAIR
- : event.xany.window == window2
+ : (window2 && event.xany.window == window2)
? ft->event_cb (dpy, window2, closure2, &event)
#endif
: 0)))
static void
screenhack_do_fps (Display *dpy, Window w, fps_state *fpst, void *closure)
{
- fps_compute (fpst, 0);
+ fps_compute (fpst, 0, -1);
fps_draw (fpst);
}
#ifdef DEBUG_PAIR
if (window2) ft->free_cb (dpy, window2, closure2);
- if (window2) fps_free (fpst2);
+ if (fpst2) fps_free (fpst2);
#endif
}