test: Rename handle-events.c to common.c

[fips] / test / glx-link-gpaa.c

diff --git a/test/glx-link-gpaa.c b/test/glx-link-gpaa.c
index 2bf73be7c4a16d157e312197b31bad53424938fd..d25d295800443653ddf440ad36d884a362e553a8 100644 (file)
--- a/test/glx-link-gpaa.c
+++ b/test/glx-link-gpaa.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 /* The OpenGL header files give typedefs for the types of all
  * functions provided by etensisons. Here, though, we're using
@@ -72,8 +72,8 @@ FIPS_GLXMAKECURRENT_FN my_glXMakeCurrent;
 typedef void (*FIPS_GLXSWAPBUFFERS_FN)(Display *, GLXDrawable);
 FIPS_GLXSWAPBUFFERS_FN my_glXSwapBuffers;
 
-#define HANDLE_EVENTS_GL_PREFIX my_
-#include "handle-events.c"
+#define COMMON_GL_PREFIX my_
+#include "common.c"
 
 static void
 resolve_symbols (void)
@@ -150,14 +150,22 @@ main (void)
 {
         Display *dpy;
         Window window;
-
-       util_init_display_window (&dpy, &window);
+       GLXContext ctx;
+       XVisualInfo *visual_info;
 
        resolve_symbols ();
 
-        handle_events (dpy, window);
+       dpy = util_x11_init_display ();
+
+       common_create_context (dpy, &ctx, &visual_info);
+
+       window = util_x11_init_window (dpy, visual_info);
+
+        common_handle_events (dpy, ctx, window);
+
+       util_x11_fini_window (dpy, window);
 
-       util_fini_display_window (dpy, window);
+       util_x11_fini_display (dpy);
 
         return 0;
 }