#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
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)
{
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_glx_context (dpy, &ctx, &visual_info);
+
+ window = util_x11_init_window (dpy, visual_info);
+
+ common_make_current (dpy, ctx, window);
+
+ common_handle_events (dpy, dpy, window);
+
+ util_x11_fini_window (dpy, window);
- util_fini_display_window (dpy, window);
+ util_x11_fini_display (dpy);
return 0;
}