X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FfpsI.h;h=552de9c9f19a63d748a06b610739db3e8edd97ae;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=e656362b0abc4ee3341324c4ff4e61787d2a913a;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/fpsI.h b/hacks/fpsI.h index e656362b..552de9c9 100644 --- a/hacks/fpsI.h +++ b/hacks/fpsI.h @@ -1,4 +1,4 @@ -/* fps, Copyright (c) 2001-2008 Jamie Zawinski +/* fps, Copyright (c) 2001-2014 Jamie Zawinski * Draw a frames-per-second display (Xlib and OpenGL). * * Permission to use, copy, modify, distribute, and sell this software and its @@ -14,16 +14,20 @@ # define __XSCREENSAVER_FPSI_H__ #include "fps.h" +#undef HAVE_GLBITMAP + struct fps_state { Display *dpy; Window window; int x, y; XFontStruct *font; - unsigned long font_dlist; /* for glx/fps-gl.c */ Bool clear_p; char string[1024]; + /* for glx/fps-gl.c */ + void *gl_fps_data; + GC draw_gc, erase_gc; int last_ifps;