restore runtest_fullscreen_sizes

direct/src/showbase/showBase.cxx

@@ -71,37 +71,39 @@ get_config_showbase() {
 }
 
 // klunky interface since we cant pass array from python->C++ to use verify_window_sizes directly
-static unsigned int num_fullscreen_testsizes=0;
+static int num_fullscreen_testsizes = 0;
 #define MAX_FULLSCREEN_TESTS 10
-static unsigned int fullscreen_testsizes[MAX_FULLSCREEN_TESTS*2];
-
-void add_fullscreen_testsize(unsigned int xsize,unsigned int ysize) {
-    if((xsize==0) && (ysize==0)) {
-        num_fullscreen_testsizes=0;
-        return;
-    }
-
-    // silently fail if maxtests exceeded
-    if(num_fullscreen_testsizes<MAX_FULLSCREEN_TESTS) {
-        fullscreen_testsizes[num_fullscreen_testsizes*2]=xsize;
-        fullscreen_testsizes[num_fullscreen_testsizes*2+1]=ysize;
-        num_fullscreen_testsizes++;
-    }
+static int fullscreen_testsizes[MAX_FULLSCREEN_TESTS * 2];
+
+void
+add_fullscreen_testsize(int xsize, int ysize) {
+  if ((xsize == 0) && (ysize == 0)) {
+    num_fullscreen_testsizes = 0;
+    return;
+  }
+
+  // silently fail if maxtests exceeded
+  if (num_fullscreen_testsizes < MAX_FULLSCREEN_TESTS) {
+    fullscreen_testsizes[num_fullscreen_testsizes * 2] = xsize;
+    fullscreen_testsizes[num_fullscreen_testsizes * 2 + 1] = ysize;
+    num_fullscreen_testsizes++;
+  }
 }
 
-void runtest_fullscreen_sizes(GraphicsWindow *win) {
-  // TODO.
-  //  win->verify_window_sizes(num_fullscreen_testsizes,fullscreen_testsizes);
+void
+runtest_fullscreen_sizes(GraphicsWindow *win) {
+  win->verify_window_sizes(num_fullscreen_testsizes, fullscreen_testsizes);
 }
 
-bool query_fullscreen_testresult(unsigned int xsize,unsigned int ysize) {
-    // stupid linear search that works ok as long as total tests are small
-    unsigned int i;
-    for(i=0;i<num_fullscreen_testsizes;i++) {
-        if((fullscreen_testsizes[i*2]==xsize) &&
-           (fullscreen_testsizes[i*2+1]==ysize))
-          return true;
-    }
-    return false;
+bool
+query_fullscreen_testresult(int xsize, int ysize) {
+  // stupid linear search that works ok as long as total tests are small
+  int i;
+  for (i=0; i < num_fullscreen_testsizes; i++) {
+    if((fullscreen_testsizes[i * 2] == xsize) &&
+       (fullscreen_testsizes[i * 2 + 1] == ysize))
+      return true;
+  }
+  return false;
 }
 

direct/src/showbase/showBase.h

@@ -50,9 +50,9 @@ EXPCL_DIRECT ConfigShowbase &get_config_showbase();
 
 
 // klunky interface since we cant pass array from python->C++
-EXPCL_DIRECT void add_fullscreen_testsize(unsigned int xsize,unsigned int ysize);
+EXPCL_DIRECT void add_fullscreen_testsize(int xsize, int ysize);
 EXPCL_DIRECT void runtest_fullscreen_sizes(GraphicsWindow *win);
-EXPCL_DIRECT bool query_fullscreen_testresult(unsigned int xsize,unsigned int ysize);
+EXPCL_DIRECT bool query_fullscreen_testresult(int xsize, int ysize);
 
 END_PUBLISH