aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp
index d14e3b5..75ae2a0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,15 +31,14 @@
// Modified by: DEC05EBA
-extern "C" {
+#include <GL/glew.h>
#include "../include/window_texture.h"
+extern "C" {
#include "../include/window_manager.h"
}
#include <SDL.h>
-#include <GL/glew.h>
#include <SDL_opengl.h>
-#include <GL/glu.h>
#include <openvr.h>
#define GLX_GLXEXT_PROTOTYPES
#include <GL/glx.h>
@@ -48,9 +47,7 @@ extern "C" {
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <X11/Xlib.h>
-#include <X11/Xproto.h>
#include <X11/extensions/Xfixes.h>
-#include <GL/glxproto.h>
#include <stdio.h>
#include <string>
@@ -590,7 +587,7 @@ static XErrorHandler xerrorxlib;
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit. */
static int xerror(Display *dpy, XErrorEvent *ee) {
- if (ee->error_code == BadWindow
+ /*if (ee->error_code == BadWindow
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
@@ -600,9 +597,9 @@ static int xerror(Display *dpy, XErrorEvent *ee) {
|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)
|| (ee->request_code == X_GLXCreatePixmap && ee->error_code == BadMatch))
- return 0;
- fprintf(stderr, "vrwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ return 0;*/
+ //fprintf(stderr, "vrwm: fatal error: request code=%d, error code=%d\n",
+ // ee->request_code, ee->error_code);
return 0; /* may call exit */ /* TODO: xerrorxlib(dpy, ee); */
}