#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
Display *dpy;
Window window;
- util_init_display_window (&dpy, &window);
+ util_x11_init_display (&dpy);
+
+ util_x11_init_window (dpy, &window);
resolve_symbols ();
handle_events (dpy, window);
- util_fini_display_window (dpy, window);
+ util_x11_fini_window (dpy, window);
+
+ util_x11_fini_display (dpy);
return 0;
}