X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ffps.c;h=2ba56d40e62e57564e2b3cdd5f88585e8bd56968;hb=13dbc569cdc6e29019722c0ef9b932a925efbcad;hp=7da5123b7da09eea6d468fc643d875174bb1558c;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28;p=xscreensaver

diff --git a/hacks/glx/fps.c b/hacks/glx/fps.c
index 7da5123b..2ba56d40 100644
--- a/hacks/glx/fps.c
+++ b/hacks/glx/fps.c
@@ -71,8 +71,14 @@ fps_init (ModeInfo *mi)
 static void
 fps_print_string (ModeInfo *mi, GLfloat x, GLfloat y, const char *string)
 {
+  const char *L2 = strchr (string, '\n');
+
   if (y < 0)
-    y = mi->xgwa.height + y;
+    {
+      y = mi->xgwa.height + y;
+      if (L2)
+        y -= (fps_ascent + fps_descent);
+    }
 
 # ifdef DEBUG
   clear_gl_error ();
@@ -130,17 +136,29 @@ fps_print_string (ModeInfo *mi, GLfloat x, GLfloat y, const char *string)
         /* clear the background */
         if (fps_clear_p)
           {
+            int lines = L2 ? 2 : 1;
             glColor3f (0, 0, 0);
             glRecti (x / 2, y - fps_descent,
                      mi->xgwa.width - x,
-                     y + fps_ascent + fps_descent);
+                     y + lines * (fps_ascent + fps_descent));
           }
 
         /* draw the text */
         glColor3f (1, 1, 1);
         glRasterPos2f (x, y);
         glListBase (font_dlist);
-        glCallLists (strlen(string), GL_UNSIGNED_BYTE, string);
+
+        if (L2)
+          {
+            L2++;
+            glCallLists (strlen(L2), GL_UNSIGNED_BYTE, L2);
+            glRasterPos2f (x, y + (fps_ascent + fps_descent));
+            glCallLists (L2 - string - 1, GL_UNSIGNED_BYTE, string);
+          }
+        else
+          {
+            glCallLists (strlen(string), GL_UNSIGNED_BYTE, string);
+          }
 
 # ifdef DEBUG
         check_gl_error ("fps_print_string");
@@ -219,6 +237,26 @@ do_fps (ModeInfo *mi)
           sprintf(msg + strlen(msg), " (including %s sec/frame delay)",
                   buf);
         }
+
+      if (mi->polygon_count > 0)
+        {
+          unsigned long p = mi->polygon_count;
+          const char *s = "";
+# if 0
+          if      (p >= (1024 * 1024)) p >>= 20, s = "M";
+          else if (p >= 2048)          p >>= 10, s = "K";
+# endif
+
+          strcat (msg, "\nPolys: ");
+          if (p >= 1000000)
+            sprintf (msg + strlen(msg), "%lu,%03lu,%03lu%s",
+                     (p / 1000000), ((p / 1000) % 1000), (p % 1000), s);
+          else if (p >= 1000)
+            sprintf (msg + strlen(msg), "%lu,%03lu%s",
+                     (p / 1000), (p % 1000), s);
+          else
+            sprintf (msg + strlen(msg), "%lu%s", p, s);
+        }
     }
 
   /* Print the string every frame (or else nothing will show up.)