ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GregMiscellaneous: Minor clean 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3737 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-09-06 12:23:45 +00:00
parent 3dcb931a49
commit ddb33652ab
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/zzogl-pg/opengl/GLWin.h
View File

@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef GLWIN_H_INCLUDED
#define GLWIN_H_INCLUDED
#ifndef GLWIN_H_INCLUDED
#define GLWIN_H_INCLUDED
#ifdef _WIN32
#define GL_WIN32_WINDOW
@ -29,10 +29,6 @@
#undef CreateWindow // Undo Windows.h global namespace pollution
#ifdef GL_X11_WINDOW
#include <X11/extensions/xf86vmode.h>
#endif
class GLWindow
{
private:
@ -45,9 +41,6 @@ class GLWindow
Window glWindow;
XSetWindowAttributes attr;
// Original desktop video mode
XF86VidModeModeInfo deskMode;
bool CreateVisual();
void GetGLXVersion();
void GetWindowSize();
@ -73,6 +66,6 @@ class GLWindow
};
extern GLWindow GLWin;
#endif // GLWIN_H_INCLUDED
extern GLWindow GLWin;
#endif // GLWIN_H_INCLUDED

10
plugins/zzogl-pg/opengl/GLWinX11.cpp
View File

@ -217,8 +217,9 @@ bool GLWindow::DisplayWindow(int _width, int _height)
GetGLXVersion();
// Create a window at the last position/size
glWindow = XCreateWindow(glDisplay, RootWindow(glDisplay, vi->screen),
0, 0, _width, _height, 0, vi->depth, InputOutput, vi->visual,
conf.x , conf.y , _width, _height, 0, vi->depth, InputOutput, vi->visual,
CWBorderPixel | CWColormap | CWEventMask,
&attr);
@ -243,13 +244,10 @@ bool GLWindow::DisplayWindow(int _width, int _height)
// init fullscreen to 0. ToggleFullscreen will update it
fullScreen = 0;
if (conf.fullscreen()) {
if (conf.fullscreen())
ToggleFullscreen();
} else {
// Restore the window position
XMoveWindow(glDisplay, glWindow, conf.x, conf.y);
else
GetWindowSize();
}
return true;
}