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

GregMiscellaneous: zzogl: Fix fullscreen setting & remove useless library 

Major issue left: widescreen.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3734 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2010-09-05 22:08:55 +00:00
parent 65b985698e
commit dc49a995d6
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/SearchForStuff.cmake
View File

@ -23,9 +23,6 @@ if(Linux)
endif(GTK2_FOUND) endif(GTK2_FOUND)
find_package(X11) find_package(X11)
# Manually find Xxf86vm because it is not done in the module...
FIND_LIBRARY(X11_Xxf86vm_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
MARK_AS_ADVANCED(X11_Xxf86vm_LIB)
endif(Linux) endif(Linux)
## Use cmake package to find module ## Use cmake package to find module

3
plugins/zzogl-pg/opengl/CMakeLists.txt
View File

@ -155,9 +155,6 @@ target_link_libraries(${Output} ${OPENGL_LIBRARIES})
# link target with X11 # link target with X11
target_link_libraries(${Output} ${X11_LIBRARIES}) target_link_libraries(${Output} ${X11_LIBRARIES})
# link target with X11 videomod
target_link_libraries(${Output} ${X11_Xxf86vm_LIB})
# User flags options # User flags options
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")

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

@ -179,8 +179,10 @@ void GLWindow::ToggleFullscreen()
XLockDisplay(glDisplay); XLockDisplay(glDisplay);
if (!XSendEvent(glDisplay, RootWindow(glDisplay, vi->screen), False, mask, (XEvent*)(&cme))) if (!XSendEvent(glDisplay, RootWindow(glDisplay, vi->screen), False, mask, (XEvent*)(&cme)))
ZZLog::Error_Log("Failed to send event: toggle fullscreen"); ZZLog::Error_Log("Failed to send event: toggle fullscreen");
else else {
fullScreen = (!fullScreen); fullScreen = (!fullScreen);
conf.setFullscreen(fullScreen);
}
XUnlockDisplay(glDisplay); XUnlockDisplay(glDisplay);
// Apply the change // Apply the change
@ -204,7 +206,6 @@ bool GLWindow::DisplayWindow(int _width, int _height)
x = conf.x; x = conf.x;
y = conf.y; y = conf.y;
fullScreen = (conf.fullscreen());
if (!CreateVisual()) return false; if (!CreateVisual()) return false;
@ -247,7 +248,9 @@ bool GLWindow::DisplayWindow(int _width, int _height)
else else
ZZLog::Error_Log("No Direct Rendering possible!"); ZZLog::Error_Log("No Direct Rendering possible!");
if (fullScreen) { // init fullscreen to 0. ToggleFullscreen will update it
fullScreen = 0;
if (conf.fullscreen()) {
ToggleFullscreen(); ToggleFullscreen();
} else { } else {
// Restore the window position // Restore the window position