-/* fps, Copyright (c) 2001-2011 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2017 Jamie Zawinski <jwz@jwz.org>
* Draw a frames-per-second display (Xlib and OpenGL).
*
* Permission to use, copy, modify, distribute, and sell this software and its
# include "config.h"
#endif /* HAVE_CONFIG_H */
+#include <time.h>
#include "screenhackI.h"
#include "fpsI.h"
fps_state *st;
const char *font;
XFontStruct *f;
+ Bool top_p;
+ XWindowAttributes xgwa;
if (! get_boolean_resource (dpy, "doFPS", "DoFPS"))
return 0;
+ if (!strcasecmp (progname, "BSOD")) return 0; /* Never worked right */
+
+ top_p = get_boolean_resource (dpy, "fpsTop", "FPSTop");
+
st = (fps_state *) calloc (1, sizeof(*st));
st->dpy = dpy;
font = get_string_resource (dpy, "fpsFont", "Font");
- if (!font) font = "-*-courier-bold-r-normal-*-180-*";
+ if (!font)
+ font = "-*-courier-bold-r-normal-*-*-180-*-*-*-*-*-*"; /* also texfont.c */
f = XLoadQueryFont (dpy, font);
if (!f) f = XLoadQueryFont (dpy, "fixed");
{
- XWindowAttributes xgwa;
XGCValues gcv;
XGetWindowAttributes (dpy, window, &xgwa);
gcv.font = f->fid;
st->font = f;
st->x = 10;
st->y = 10;
- if (get_boolean_resource (dpy, "fpsTop", "FPSTop"))
- /* don't leave a blank line in GL top-fps. */
- st->y = - (/*st->font->ascent +*/ st->font->descent + 10);
+ if (top_p)
+ st->y = - (st->font->ascent + st->font->descent + 10);
+
+# ifdef USE_IPHONE
+ /* Don't hide the FPS display under the iPhone X bezel.
+ #### This is the worst of all possible ways to do this! But how else?
+ */
+ if (xgwa.width == 2436 || xgwa.height == 2436)
+ {
+ st->x += 48;
+ st->y += 48 * (top_p ? -1 : 1);
+ }
+# endif
strcpy (st->string, "FPS: ... ");
if (depth >= 0.0)
{
- int L = strlen (st->string);
+ unsigned long L = strlen (st->string);
char *s = st->string + L;
strcat (s, "\nDepth: ");
sprintf (s + strlen(s), "%.1f", depth);
s = strchr (string, '\n');
if (! s) s = string + strlen(string);
XDrawString (st->dpy, st->window, st->draw_gc,
- x, y, string, s - string);
+ x, y, string, (int) (s - string));
string = s;
string++;
lines--;