aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-15 06:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-11-21 23:31:15 +01:00
parent bf9cbcff48
commit 2420244915
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -1358,7 +1358,7 @@ bool CDriverGL::setScreenMode(const GfxMode &mode)
if (size > -1) if (size > -1)
{ {
if (XRRSetScreenConfig(_dpy, screen_config, root, size, saved_rotation, CurrentTime) == RRSetConfigSuccess)) if (XRRSetScreenConfig(_dpy, screen_config, root, size, saved_rotation, CurrentTime) == RRSetConfigSuccess)
{ {
nlinfo("3D: Switching to XRandR mode %d: %dx%d", size, sizes[size].width, sizes[size].height); nlinfo("3D: Switching to XRandR mode %d: %dx%d", size, sizes[size].width, sizes[size].height);
found = true; found = true;
@ -2045,7 +2045,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode);
mode.Windowed = _CurrentMode.Windowed; mode.Windowed = _CurrentMode.Windowed;
mode.OffScreen = _CurrentMode.OffScreen; mode.OffScreen = false;
mode.Depth = (uint8)devmode.dmBitsPerPel; mode.Depth = (uint8)devmode.dmBitsPerPel;
mode.Frequency = devmode.dmDisplayFrequency; mode.Frequency = devmode.dmDisplayFrequency;
mode.Width = (uint16)devmode.dmPelsWidth; mode.Width = (uint16)devmode.dmPelsWidth;
@ -2099,7 +2099,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
Rotation cur_rotation; Rotation cur_rotation;
SizeID size = XRRConfigCurrentConfiguration(screen_config, &cur_rotation); SizeID size = XRRConfigCurrentConfiguration(screen_config, &cur_rotation);
mode.Windowed = !_FullScreen; mode.Windowed = _CurrentMode.Windowed;
mode.OffScreen = false; mode.OffScreen = false;
mode.Depth = (uint) DefaultDepth(_dpy, screen); mode.Depth = (uint) DefaultDepth(_dpy, screen);
mode.Frequency = 0; mode.Frequency = 0;
@ -2134,7 +2134,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
if (XF86VidModeGetModeLine(_dpy, screen, &pixelClock, &xmode)) if (XF86VidModeGetModeLine(_dpy, screen, &pixelClock, &xmode))
{ {
mode.Windowed = !_FullScreen; mode.Windowed = _CurrentMode.Windowed;
mode.OffScreen = false; mode.OffScreen = false;
mode.Depth = (uint) DefaultDepth(_dpy, screen); mode.Depth = (uint) DefaultDepth(_dpy, screen);
mode.Frequency = 1000 * pixelClock / (xmode.htotal * xmode.vtotal) ; mode.Frequency = 1000 * pixelClock / (xmode.htotal * xmode.vtotal) ;
@ -2154,7 +2154,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
if (!found) if (!found)
{ {
mode.Windowed = !_FullScreen; mode.Windowed = _CurrentMode.Windowed;
mode.OffScreen = _CurrentMode.OffScreen; mode.OffScreen = _CurrentMode.OffScreen;
mode.Depth = (uint) DefaultDepth(_dpy, screen); mode.Depth = (uint) DefaultDepth(_dpy, screen);
mode.Frequency = 0; mode.Frequency = 0;
@ -2231,7 +2231,7 @@ void CDriverGL::setWindowPos(sint32 x, sint32 y)
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
if (!_FullScreen) if (_CurrentMode.Windowed)
{ {
// first time requesting decoration sizes // first time requesting decoration sizes
if (_WindowX && _WindowY && !_DecorationWidth && !_DecorationHeight && _WndActive) if (_WindowX && _WindowY && !_DecorationWidth && !_DecorationHeight && _WndActive)
@ -2480,7 +2480,7 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
} }
else else
{ {
XSetWMNormalHints(_dpy, _win, StdHints); // XSetWMNormalHints(_dpy, _win, StdHints);
} }
if (width != _CurrentMode.Width || height != _CurrentMode.Height) if (width != _CurrentMode.Width || height != _CurrentMode.Height)

2
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -54,7 +54,7 @@ void CUnixEventEmitter::init(Display *dpy, Window win, NL3D::IDriver *driver)
_win = win; _win = win;
_driver = driver; _driver = driver;
XSelectInput (_dpy, _win, KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask|ExposureMask|EnterWindowMask|LeaveWindowMask|FocusChangeMask) XSelectInput (_dpy, _win, KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask|ExposureMask|EnterWindowMask|LeaveWindowMask|FocusChangeMask);
// define Atoms used by clipboard // define Atoms used by clipboard
XA_CLIPBOARD = XInternAtom(dpy, "CLIPBOARD", False); XA_CLIPBOARD = XInternAtom(dpy, "CLIPBOARD", False);