Use consistent integer types for view positions and sizes

Actual window sizes and positions fit easily in a 16-bit integer.  So, we use
that in "representation contexts" like events.  This makes structures smaller,
and allows the values to be converted to float, double, or integer without
casting (since any int16_t or uint16_t value can fit in them without loss).

Setter APIs use native integers for convenience, to avoid casting hassles when
doing arithmetic.  Ranges are checked at runtime.

2 files changed, 24 insertions, 21 deletions

diff --git a/test/test_size.c b/test/test_size.c
index 048bfa5..9597a08 100644
--- a/test/test_size.c
+++ b/test/test_size.c
@@ -27,7 +27,7 @@ typedef struct {
   PuglView*       view;
   PuglTestOptions opts;
   State           state;
-  PuglRect        configuredRect;
+  PuglRect        configuredFrame;
 } PuglTest;
 
 static PuglStatus
@@ -48,10 +48,10 @@ onEvent(PuglView* view, const PuglEvent* event)
     if (test->state == CREATED) {
       test->state = CONFIGURED;
     }
-    test->configuredRect.x      = event->configure.x;
-    test->configuredRect.y      = event->configure.y;
-    test->configuredRect.width  = event->configure.width;
-    test->configuredRect.height = event->configure.height;
+    test->configuredFrame.x      = event->configure.x;
+    test->configuredFrame.y      = event->configure.y;
+    test->configuredFrame.width  = event->configure.width;
+    test->configuredFrame.height = event->configure.height;
     break;
   case PUGL_MAP:
     test->state = MAPPED;
@@ -77,7 +77,7 @@ main(int argc, char** argv)
                    NULL,
                    puglParseTestOptions(&argc, &argv),
                    START,
-                   {0.0, 0.0, 0.0, 0.0}};
+                   {0, 0, 0u, 0u}};
 
   // Set up view with size bounds and an aspect ratio
   test.view = puglNewView(test.world);
@@ -102,10 +102,10 @@ main(int argc, char** argv)
 
   // Check that the frame matches the last configure event
   const PuglRect frame = puglGetFrame(test.view);
-  assert(frame.x == test.configuredRect.x);
-  assert(frame.y == test.configuredRect.y);
-  assert(frame.width == test.configuredRect.width);
-  assert(frame.height == test.configuredRect.height);
+  assert(frame.x == test.configuredFrame.x);
+  assert(frame.y == test.configuredFrame.y);
+  assert(frame.width == test.configuredFrame.width);
+  assert(frame.height == test.configuredFrame.height);
 
 #if defined(_WIN32) || defined(__APPLE__)
   /* Some window managers on Linux (particularly tiling ones) just disregard
diff --git a/test/test_utils.h b/test/test_utils.h
index 0108435..2597537 100644
--- a/test/test_utils.h
+++ b/test/test_utils.h
@@ -92,8 +92,10 @@ scrollDirectionString(const PuglScrollDirection direction)
 static inline int
 printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
 {
-#define FFMT "%6.1f"
-#define PFMT FFMT " " FFMT
+#define PFFMT "%6.1f %6.1f"
+#define PIFMT "%5d %5d"
+#define PUFMT "%5u %5u"
+
 #define PRINT(fmt, ...) fprintf(stderr, fmt, __VA_ARGS__)
 
   switch (event->type) {
@@ -125,7 +127,7 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
                  event->text.string);
   case PUGL_BUTTON_PRESS:
   case PUGL_BUTTON_RELEASE:
-    return (PRINT("%sMouse %u %s at " PFMT " ",
+    return (PRINT("%sMouse %u %s at " PFFMT " ",
                   prefix,
                   event->button.button,
                   (event->type == PUGL_BUTTON_PRESS) ? "down" : "up  ",
@@ -133,7 +135,7 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
                   event->button.y) +
             printModifiers(event->scroll.state));
   case PUGL_SCROLL:
-    return (PRINT("%sScroll %5.1f %5.1f (%s) at " PFMT " ",
+    return (PRINT("%sScroll %5.1f %5.1f (%s) at " PFFMT " ",
                   prefix,
                   event->scroll.dx,
                   event->scroll.dy,
@@ -142,13 +144,13 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
                   event->scroll.y) +
             printModifiers(event->scroll.state));
   case PUGL_POINTER_IN:
-    return PRINT("%sMouse enter  at " PFMT " (%s)\n",
+    return PRINT("%sMouse enter  at " PFFMT " (%s)\n",
                  prefix,
                  event->crossing.x,
                  event->crossing.y,
                  crossingModeString(event->crossing.mode));
   case PUGL_POINTER_OUT:
-    return PRINT("%sMouse leave  at " PFMT " (%s)\n",
+    return PRINT("%sMouse leave  at " PFFMT " (%s)\n",
                  prefix,
                  event->crossing.x,
                  event->crossing.y,
@@ -177,14 +179,14 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
     case PUGL_UPDATE:
       return fprintf(stderr, "%sUpdate\n", prefix);
     case PUGL_CONFIGURE:
-      return PRINT("%sConfigure " PFMT " " PFMT "\n",
+      return PRINT("%sConfigure " PIFMT " " PUFMT "\n",
                    prefix,
                    event->configure.x,
                    event->configure.y,
                    event->configure.width,
                    event->configure.height);
     case PUGL_EXPOSE:
-      return PRINT("%sExpose    " PFMT " " PFMT "\n",
+      return PRINT("%sExpose    " PIFMT " " PUFMT "\n",
                    prefix,
                    event->expose.x,
                    event->expose.y,
@@ -193,7 +195,7 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
     case PUGL_CLOSE:
       return PRINT("%sClose\n", prefix);
     case PUGL_MOTION:
-      return PRINT("%sMouse motion at " PFMT "\n",
+      return PRINT("%sMouse motion at " PFFMT "\n",
                    prefix,
                    event->motion.x,
                    event->motion.y);
@@ -205,8 +207,9 @@ printEvent(const PuglEvent* event, const char* prefix, const bool verbose)
   }
 
 #undef PRINT
-#undef PFMT
-#undef FFMT
+#undef PUFMT
+#undef PIFMT
+#undef PFFMT
 
   return 0;
 }