summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/ui/x11/ui.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/main/ui/x11/ui.c b/src/main/ui/x11/ui.c
index 9018250..5199eea 100644
--- a/src/main/ui/x11/ui.c
+++ b/src/main/ui/x11/ui.c
@@ -22,6 +22,7 @@
#include <GL/gl.h>
#include <GL/glx.h>
#include <X11/Xlib.h>
+#include "../../util.h"
static Display *display;
static Window window;
@@ -29,21 +30,28 @@ static GLXContext gl_context;
void cleanup(void);
-void
-ui_init()
+static Display *
+ui_open_display(void)
{
- display = XOpenDisplay(NULL);
+ Display *display = XOpenDisplay(NULL);
if (!display) {
- fprintf(stderr, "Error: Can't open X11 display\n");
+ log_error("Can't open X11 display");
exit(1);
}
+ return display;
+}
+
+void
+ui_init()
+{
+ display = ui_open_display();
+
int screen = DefaultScreen(display);
Window root = RootWindow(display, screen);
GLint attribs[] = { GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None };
XVisualInfo *vi = glXChooseVisual(display, screen, attribs);
-
if (!vi) {
fprintf(stderr, "Error: No compatible Visual found\n");
exit(1);