#include <stdlib.h>
#include <dlfcn.h>
-#include "util.h"
+#include "util-x11.h"
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);
-static void
-set_2d_projection (int width, int height)
-{
- my_glMatrixMode (GL_PROJECTION);
- my_glLoadIdentity ();
- my_glOrtho (0, width, height, 0, 0, 1);
- my_glMatrixMode (GL_MODELVIEW);
-}
-
-static void
-paint_rgb_using_clear (double r, double g, double b)
-{
- my_glClearColor(r, g, b, 1.0);
- my_glClear(GL_COLOR_BUFFER_BIT);
-}
-
-static void
-draw (Display *dpy, Window window, int width, int height)
-{
- int i;
- int visual_attr[] = {
- GLX_RGBA,
- GLX_RED_SIZE, 8,
- GLX_GREEN_SIZE, 8,
- GLX_BLUE_SIZE, 8,
- GLX_ALPHA_SIZE, 8,
- GLX_DOUBLEBUFFER,
- GLX_DEPTH_SIZE, 24,
- GLX_STENCIL_SIZE, 8,
- GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR,
- None
- };
-
- /* Window and context setup. */
- XVisualInfo *visual_info = my_glXChooseVisual(dpy, 0, visual_attr);
- GLXContext ctx = my_glXCreateContext(dpy, visual_info, NULL, True);
- my_glXMakeCurrent(dpy, window, ctx);
-
- my_glViewport(0, 0, width, height);
-
- set_2d_projection (width, height);
-
-/* Simply count through some colors, frame by frame. */
-#define RGB(frame) (((frame+1)/4) % 2), (((frame+1)/2) % 2), ((frame+1) % 2)
-
- int frame = 0;
- for (i = 0; i < 2; i++) {
- /* Frame: Draw a solid (magenta) frame */
- paint_rgb_using_clear (RGB(frame));
- my_glXSwapBuffers (dpy, window);
- frame++;
-
- /* Frame: Draw a solid (yellow) frame */
- paint_rgb_using_clear (RGB(frame));
- my_glXSwapBuffers (dpy, window);
- frame++;
-
- /* Frame: Draw a solid (cyan) frame */
- paint_rgb_using_clear (RGB(frame));
- my_glXSwapBuffers (dpy, window);
- frame++;
- }
-
- /* Cleanup */
- my_glXDestroyContext (dpy, ctx);
-}
-
-static void
-handle_events(Display *dpy, Window window)
-{
- XEvent xev;
- int width = 0;
- int height = 0;
-
- XNextEvent (dpy, &xev);
-
- while (1) {
- XNextEvent (dpy, &xev);
- switch (xev.type) {
- case ConfigureNotify:
- width = xev.xconfigure.width;
- height = xev.xconfigure.height;
- break;
- case Expose:
- if (xev.xexpose.count == 0) {
- draw (dpy, window, width, height);
- return;
- }
- break;
- }
- }
-}
+#define COMMON_GL_PREFIX my_
+#include "common.c"
static void
resolve_symbols (void)
exit (1);
}
- my_glLoadIdentity = dlsym (gl_handle, "glLoadIdentity");
- error = dlerror ();
- if (error) {
- fprintf (stderr, "Failed to dlsym glLoadIdentity: %s\n", error);
- exit (1);
- }
-
- my_glMatrixMode = dlsym (gl_handle, "glMatrixMode");
- error = dlerror ();
- if (error) {
- fprintf (stderr, "Failed to dlsym glMatrixMode: %s\n", error);
- exit (1);
- }
-
- my_glOrtho = dlsym (gl_handle, "glOrtho");
- error = dlerror ();
- if (error) {
- fprintf (stderr, "Failed to dlsym glOrtho: %s\n", error);
- exit (1);
- }
-
my_glViewport = dlsym (gl_handle, "glViewport");
error = dlerror ();
if (error) {
{
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;
}