#include <stdlib.h>
#include <dlfcn.h>
-#include "util.h"
+#include "util-x11.h"
void* (*my_glXGetProcAddressARB) (char *);
void (*my_glClear) (GLbitfield);
void (*my_glClearColor) (GLclampf, GLclampf, GLclampf, GLclampf);
-void (*my_glLoadIdentity) (void);
-void (*my_glMatrixMode) (GLenum);
-void (*my_glOrtho) (GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
void (*my_glViewport) (GLint, GLint, GLsizei, GLsizei);
XVisualInfo * (*my_glXChooseVisual) (Display *, int, int *);
GLXContext (*my_glXCreateContext) (Display *, XVisualInfo *, GLXContext, Bool);
Bool (*my_glXMakeCurrent) (Display *, GLXDrawable, GLXContext);
void (*my_glXSwapBuffers) (Display *, GLXDrawable);
-#define HANDLE_EVENTS_GL_PREFIX my_
-#include "handle-events.c"
+#define COMMON_GL_PREFIX my_
+#include "common.c"
static void
resolve_symbols (void)
exit (1);
}
- my_glLoadIdentity = my_glXGetProcAddressARB ("glLoadIdentity");
- if (my_glLoadIdentity == NULL) {
- fprintf (stderr, "Failed to glXGetProcAddressARB glLoadIdentity\n");
- exit (1);
- }
-
- my_glMatrixMode = my_glXGetProcAddressARB ("glMatrixMode");
- if (my_glMatrixMode == NULL) {
- fprintf (stderr, "Failed to glXGetProcAddressARB glMatrixMode\n");
- exit (1);
- }
-
- my_glOrtho = my_glXGetProcAddressARB ("glOrtho");
- if (my_glOrtho == NULL) {
- fprintf (stderr, "Failed to glXGetProcAddressARB glOrtho\n");
- exit (1);
- }
-
my_glViewport = my_glXGetProcAddressARB ("glViewport");
if (my_glViewport == NULL) {
fprintf (stderr, "Failed to glXGetProcAddressARB glViewport\n");
{
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;
}