Changed Fixed some apple stuff glGenTextures is still generating a bus error because we don't have a gl context yet.
This commit is contained in:
190
src/window.cpp
190
src/window.cpp
@@ -9,6 +9,15 @@ void OpenArena::Window::SwapBuffers()
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
void OpenArena::Window::SwapBuffers()
|
||||
{
|
||||
if(doubleBuffered)
|
||||
{
|
||||
glXSwapBuffers(display, window);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef WIN32
|
||||
void OpenArena::Window::SwapBuffers()
|
||||
{
|
||||
@@ -37,6 +46,27 @@ void OpenArena::Window::Close()
|
||||
XCloseDisplay(display);
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
void OpenArena::Window::Close()
|
||||
{
|
||||
if(hRC)
|
||||
{
|
||||
if(!glXMakeCurrent(display, None, NULL))
|
||||
{
|
||||
printf("Could not release drawing context.\n");
|
||||
}
|
||||
glXDestroyContext(display, hRC);
|
||||
hRC = NULL;
|
||||
}
|
||||
|
||||
if(_fullscreen)
|
||||
{
|
||||
XF86VidModeSwitchToMode(display, screen, &vidMode);
|
||||
XF86VidModeSetViewPort(display, screen, 0, 0);
|
||||
}
|
||||
XCloseDisplay(display);
|
||||
}
|
||||
#endif
|
||||
#ifdef WIN32
|
||||
void OpenArena::Window::Close()
|
||||
{
|
||||
@@ -111,6 +141,110 @@ bool OpenArena::Window::Open()
|
||||
}
|
||||
}
|
||||
|
||||
vi = glXChooseVisual(display, screen, attrListDbl);
|
||||
if(vi == NULL)
|
||||
vi = glXChooseVisual(display, screen, attrListSgl);
|
||||
doubleBuffered = false;
|
||||
printf("Only Singlebuffered Visual!\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
doubleBuffered = true;
|
||||
printf("Got Doublebuffered Visual!\n");
|
||||
}
|
||||
|
||||
glXQueryVersion(display, &glxMajorVersion, & glxMinorVersion);
|
||||
printf("glX-Version %d.%d\n", glxMajorVersion, glxMinorVersion);
|
||||
|
||||
hRC = glXCreateContext(display, vi, 0, GL_TRUE);
|
||||
cmap = XCreateColormap(display, RootWindow(display, vi->screen), vi->visual, AllocNone);
|
||||
attributes.colormap = cmap;
|
||||
attributes.border_pixel = 0;
|
||||
|
||||
attributes.event_mask = ExposureMask |
|
||||
KeyPressMask | KeyReleaseMask |
|
||||
ButtonPressMask | ButtonReleaseMask |
|
||||
// PointerMotionMask | ButtonMotionMask |
|
||||
StructureNotifyMask;
|
||||
|
||||
if(_fullscreen)
|
||||
{
|
||||
XF86VidModeSwitchToMode(display, screen, modes[bestMode]);
|
||||
XF86VidModeSetViewPort(display, screen, 0, 0);
|
||||
XFree(modes);
|
||||
|
||||
attributes.override_redirect = true;
|
||||
window = XCreateWindow(display, RootWindow(display, vi->screen), 0, 0, _width, _height, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap | CWEventMask | CWOverrideRedirect, &attributes);
|
||||
XWarpPointer(display, None, window, 0, 0, 0, 0, 0, 0);
|
||||
XMapRaised(display, window);
|
||||
XGrabKeyboard(display, window, true, GrabModeAsync, GrabModeAsync, CurrentTime);
|
||||
XGrabPointer(display, window, true, ButtonPressMask, GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
|
||||
XDefineCursor(display, window, CreateFullscreenCursor());
|
||||
}
|
||||
else
|
||||
{
|
||||
window = XCreateWindow(display, RootWindow(display, vi->screen), 0, 0, _width, _height, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap | CWEventMask, &attributes);
|
||||
wmDelete = XInternAtom(display, "WM_DELETE_WINDOW", true);
|
||||
XSetWMProtocols(display, window, &wmDelete, 1);
|
||||
XSetStandardProperties(display, window, GetName(), GetName(), None, NULL, 0, NULL);
|
||||
XMapRaised(display, window);
|
||||
XDefineCursor(display, window, CreateWindowedCursor());
|
||||
}
|
||||
|
||||
glXMakeCurrent(display, window, hRC);
|
||||
unsigned int twidth, theight, depth;
|
||||
XGetGeometry(display, window, &winDummy, &x, &y, &twidth, &theight, &borderDummy, &depth);
|
||||
_colorDepth = (char)depth;
|
||||
_height = (short)twidth;
|
||||
_width = (short)theight;
|
||||
printf("Resolution %dx%d\n", twidth, theight);
|
||||
printf("Depth %d\n", depth);
|
||||
if(glXIsDirect(display, hRC))
|
||||
{
|
||||
printf("Congrats, you have Direct Rendering!\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Sorry, no Direct Rendering possible!\n");
|
||||
}
|
||||
_initializer->Initialize();
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
bool OpenArena::Window::Open()
|
||||
{
|
||||
XVisualInfo* vi;
|
||||
Colormap cmap;
|
||||
int bestMode = 0;
|
||||
int vidModeMajorVersion;
|
||||
int vidModeMinorVersion;
|
||||
int glxMajorVersion;
|
||||
int glxMinorVersion;
|
||||
int modeNum;
|
||||
XF86VidModeModeInfo** modes;
|
||||
Atom wmDelete;
|
||||
::Window winDummy;
|
||||
unsigned int borderDummy;
|
||||
|
||||
display = XOpenDisplay(0);
|
||||
screen = DefaultScreen(display);
|
||||
XF86VidModeQueryVersion(display, &vidModeMajorVersion, &vidModeMinorVersion);
|
||||
printf("XF86VidModeExtension-Version %d.%d\n", vidModeMajorVersion, vidModeMinorVersion);
|
||||
|
||||
XF86VidModeGetAllModeLines(display, screen, &modeNum, &modes);
|
||||
vidMode = *modes[0];
|
||||
|
||||
int i;
|
||||
for(i=0; i<modeNum; i++)
|
||||
{
|
||||
//Add a check for colordepth here
|
||||
if((modes[i]->hdisplay == _width) && (modes[i]->vdisplay == _height))
|
||||
{
|
||||
bestMode = i;
|
||||
}
|
||||
}
|
||||
|
||||
vi = glXChooseVisual(display, screen, attrListDbl);
|
||||
if(vi == NULL)
|
||||
{
|
||||
@@ -178,7 +312,7 @@ bool OpenArena::Window::Open()
|
||||
{
|
||||
printf("Sorry, no Direct Rendering possible!\n");
|
||||
}
|
||||
OnInit();
|
||||
_initializer->Initialize();
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
@@ -301,7 +435,7 @@ bool OpenArena::Window::Open()
|
||||
SetFocus(window);
|
||||
OnResize(_width, _height);
|
||||
|
||||
if (!OnInit())
|
||||
if (!_initializer->Initialize())
|
||||
{
|
||||
Close();
|
||||
MessageBox(NULL,"Initialization Failed.","ERROR",MB_OK|MB_ICONEXCLAMATION);
|
||||
@@ -385,6 +519,13 @@ Display* OpenArena::Window::GetDisplay()
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
Display* OpenArena::Window::GetDisplay()
|
||||
{
|
||||
return display;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __linux
|
||||
Vec2i OpenArena::Window::GetMousePosition()
|
||||
{
|
||||
@@ -405,6 +546,26 @@ Vec2i OpenArena::Window::GetMousePosition()
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
OpenArena::Vec2i OpenArena::Window::GetMousePosition()
|
||||
{
|
||||
::Window rootWindow;
|
||||
::Window childWindow;
|
||||
int rootX;
|
||||
int rootY;
|
||||
int mouseX;
|
||||
int mouseY;
|
||||
unsigned int mask;
|
||||
if(!XQueryPointer(display, window, &rootWindow, &childWindow, &rootX, &rootY, &mouseX, &mouseY, &mask))
|
||||
{
|
||||
return Vec2i(-1,-1);
|
||||
}
|
||||
else
|
||||
{
|
||||
return Vec2i(mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef WIN32
|
||||
OpenArena::Vec2i OpenArena::Window::GetMousePosition()
|
||||
{
|
||||
@@ -421,6 +582,13 @@ void OpenArena::Window::SetMousePosition(Vec2i pos)
|
||||
XWarpPointer(display, None, window, 0, 0, 0, 0, middle.x, middle.y);
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
void OpenArena::Window::SetMousePosition(Vec2i pos)
|
||||
{
|
||||
Vec2i middle = Vec2i(_width, _height)/2;
|
||||
XWarpPointer(display, None, window, 0, 0, 0, 0, middle.x, middle.y);
|
||||
}
|
||||
#endif
|
||||
#ifdef WIN32
|
||||
void OpenArena::Window::SetMousePosition(Vec2i pos)
|
||||
{
|
||||
@@ -446,4 +614,22 @@ Cursor OpenArena::Window::CreateFullscreenCursor()
|
||||
return cur;
|
||||
}
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
Cursor OpenArena::Window::CreateWindowedCursor()
|
||||
{
|
||||
return CreateFullscreenCursor();
|
||||
}
|
||||
|
||||
Cursor OpenArena::Window::CreateFullscreenCursor()
|
||||
{
|
||||
Pixmap pixmap = XCreatePixmap(display, window, 1, 1, 1);
|
||||
XColor color;
|
||||
color.pixel = 0;
|
||||
color.red = 0;
|
||||
color.flags = DoRed;
|
||||
Cursor cur = XCreatePixmapCursor(display, pixmap, pixmap, &color, &color, 0, 0);
|
||||
XFreePixmap(display, pixmap);
|
||||
return cur;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user