/* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002, 2004, 2006
- * Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997-2013 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
/* Add extra args, if they're mentioned in the defaults... */
{
char *args[] = { "-count", "-cycles", "-delay", "-ncolors",
- "-size", "-font", "-wireframe", "-use3d", "-useSHM",
- "-showFPS" };
+ "-size", "-font", "-wireframe", "-use3d", "-useSHM" };
for (j = 0; j < countof(args); j++)
if (strstr(xlockmore_defaults, args[j]+1))
{
new->argKind = XrmoptionNoArg;
new->value = "False";
}
- else if (!strcmp(new->option, "-showFPS"))
- {
- new->option = "-fps";
- new->argKind = XrmoptionNoArg;
- new->value = "True";
- new = &new_options[i++];
- new->option = "-no-fps";
- new->specifier = new_options[i-2].specifier;
- new->argKind = XrmoptionNoArg;
- new->value = "False";
- }
else
{
new->argKind = XrmoptionSepArg;
*/
i = 0;
- new_defaults = (char **) calloc (1, xlockmore_opts->numvarsdesc * 10 + 100);
+ new_defaults = (char **) calloc (1, xlockmore_opts->numvarsdesc * 10 + 1000);
/* Put on the PROGCLASS.background/foreground resources. */
s = (char *) malloc(50);
XGCValues gcv;
XColor color;
int i;
- int orig_pause;
Bool root_p;
if (! xlmft)
switch (mi->xlmft->desired_color_scheme)
{
case color_scheme_uniform:
- make_uniform_colormap (dpy, mi->xgwa.visual, mi->xgwa.colormap,
+ make_uniform_colormap (mi->xgwa.screen, mi->xgwa.visual,
+ mi->xgwa.colormap,
mi->colors, &mi->npixels,
True, &mi->writable_p, True);
break;
case color_scheme_smooth:
- make_smooth_colormap (dpy, mi->xgwa.visual, mi->xgwa.colormap,
+ make_smooth_colormap (mi->xgwa.screen, mi->xgwa.visual,
+ mi->xgwa.colormap,
mi->colors, &mi->npixels,
True, &mi->writable_p, True);
break;
case color_scheme_bright:
case color_scheme_default:
- make_random_colormap (dpy, mi->xgwa.visual, mi->xgwa.colormap,
+ make_random_colormap (mi->xgwa.screen, mi->xgwa.visual,
+ mi->xgwa.colormap,
mi->colors, &mi->npixels,
(mi->xlmft->desired_color_scheme ==
color_scheme_bright),
mi->wireframe_p = get_boolean_resource (dpy, "wireframe", "Boolean");
mi->root_p = root_p;
- mi->fps_p = get_boolean_resource (dpy, "showFPS", "Boolean");
#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 */
if (mi->pause < 0)
mi->pause = 0;
else if (mi->pause > 100000000)
mi->pause = 100000000;
- orig_pause = mi->pause;
/* If this hack uses fonts (meaning, mentioned "font" in DEFAULTS)
then load it. */
if (name)
{
XFontStruct *f = XLoadQueryFont (dpy, name);
- const char *def1 = "-*-times-bold-r-normal-*-180-*";
+ const char *def1 = "-*-helvetica-bold-r-normal-*-180-*";
const char *def2 = "fixed";
if (!f)
{
unsigned int w, unsigned int h)
{
ModeInfo *mi = (ModeInfo *) closure;
- if (mi->xlmft->hack_reshape)
+ if (mi && mi->xlmft->hack_reshape)
{
XGetWindowAttributes (dpy, window, &mi->xgwa);
mi->xlmft->hack_reshape (mi, mi->xgwa.width, mi->xgwa.height);
xlockmore_event (Display *dpy, Window window, void *closure, XEvent *event)
{
ModeInfo *mi = (ModeInfo *) closure;
- if (mi->xlmft->hack_handle_events)
- {
- mi->xlmft->hack_handle_events (mi, event);
- /* Since xlockmore hacks don't tell us whether they handled the
- event, assume they handled buttons (so we don't beep) but that
- they didn't handle anything else (so that "q" still quits).
- */
- return (event->xany.type == ButtonPress);
- }
+ if (mi && mi->xlmft->hack_handle_events)
+ return mi->xlmft->hack_handle_events (mi, event);
else
return False;
}
+void
+xlockmore_do_fps (Display *dpy, Window w, fps_state *fpst, void *closure)
+{
+ ModeInfo *mi = (ModeInfo *) closure;
+ fps_compute (fpst, 0, mi ? mi->recursion_depth : -1);
+ fps_draw (fpst);
+}
+
+
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);
-#ifdef USE_GL
-/* ####
- if (mi->fps_state)
- fps_free (mi);
- */
-#endif /* USE_GL */
XFreeGC (dpy, mi->gc);
free_colors (dpy, mi->xgwa.colormap, mi->colors, mi->npixels);
free (mi->pixels);
free (mi);
+#endif
}
projects / xscreensaver / blobdiff