Fixed: X extensions list is truncated

This commit is contained in:
kervala 2011-06-04 13:49:41 +02:00
parent 5d87c7e823
commit aac3d77f90

View file

@ -374,18 +374,25 @@ bool CDriverGL::init (uint windowIcon, emptyProc exitFunc)
} }
#endif // HAVE_XRENDER #endif // HAVE_XRENDER
nldebug("3D: Available X Extensions:");
if (DebugLog)
{
// list all supported extensions // list all supported extensions
sint nextensions = 0; sint nextensions = 0;
char **extensions = XListExtensions(_dpy, &nextensions); char **extensions = XListExtensions(_dpy, &nextensions);
std::string exts;
for(sint i = 0; i < nextensions; ++i) for(sint i = 0; i < nextensions; ++i)
exts += NLMISC::toString(" %s", extensions[i]); {
if(i%5==0) DebugLog->displayRaw("3D: ");
DebugLog->displayRaw(NLMISC::toString("%s ", extensions[i]).c_str());
if(i%5==4) DebugLog->displayRaw("\n");
}
DebugLog->displayRaw("\n");
XFreeExtensionList(extensions); XFreeExtensionList(extensions);
}
nlinfo("X Extensions:%s", exts.c_str());
// set default X errors handler // set default X errors handler
XSetErrorHandler(nelXErrorsHandler); XSetErrorHandler(nelXErrorsHandler);
@ -906,7 +913,6 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
_hRC=wglCreateContext(_hDC); _hRC=wglCreateContext(_hDC);
wglMakeCurrent(_hDC,_hRC); wglMakeCurrent(_hDC,_hRC);
} }
/// release old emitter /// release old emitter
@ -1577,7 +1583,7 @@ bool CDriverGL::destroyWindow()
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
if(_DestroyWindow) if (_DestroyWindow)
{ {
[[containerView() window] release]; [[containerView() window] release];
[containerView() release]; [containerView() release];
@ -2297,7 +2303,7 @@ emptyProc CDriverGL::getWindowProc()
// -------------------------------------------------- // --------------------------------------------------
bool CDriverGL::activate() bool CDriverGL::activate()
{ {
H_AUTO_OGL(CDriverGL_activate) H_AUTO_OGL(CDriverGL_activate);
if (_win == EmptyWindow) if (_win == EmptyWindow)
return false; return false;