piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Xquartz doesn't support XF86VidMode, nor does it support fullscreen mode

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1447 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
bushing
2008-12-08 09:58:02 +00:00
parent d26dabd3b9
commit d5c9afd449
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -376,6 +376,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLWin.attr.colormap = cmap; GLWin.attr.colormap = cmap;
GLWin.attr.border_pixel = 0; GLWin.attr.border_pixel = 0;
#ifndef __APPLE__
// get a connection // get a connection
XF86VidModeQueryVersion(GLWin.dpy, &vidModeMajorVersion, &vidModeMinorVersion); XF86VidModeQueryVersion(GLWin.dpy, &vidModeMajorVersion, &vidModeMinorVersion);
@ -428,7 +429,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLWin.fs = 0; GLWin.fs = 0;
} }
} }
#endif
if (!GLWin.fs) { if (!GLWin.fs) {
@ -709,6 +710,7 @@ void OpenGL_Shutdown()
XCloseDisplay(GLWin.dpy); XCloseDisplay(GLWin.dpy);
GLWin.ctx = NULL; GLWin.ctx = NULL;
} }
#ifndef __APPLE__
/* switch back to original desktop resolution if we were in fs */ /* switch back to original desktop resolution if we were in fs */
if (GLWin.dpy != NULL) { if (GLWin.dpy != NULL) {
if (GLWin.fs) { if (GLWin.fs) {
@ -717,4 +719,5 @@ void OpenGL_Shutdown()
} }
} }
#endif #endif
#endif
} }

4
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -94,7 +94,9 @@ inline unsigned long timeGetTime()
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#ifndef __APPLE__
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#endif
//#include <gtk/gtk.h> //#include <gtk/gtk.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
@ -112,7 +114,9 @@ typedef struct {
XSetWindowAttributes attr; XSetWindowAttributes attr;
Bool fs; Bool fs;
Bool doubleBuffered; Bool doubleBuffered;
#ifndef __APPLE__
XF86VidModeModeInfo deskMode; XF86VidModeModeInfo deskMode;
#endif
#endif #endif
int x, y; int x, y;
unsigned int width, height; unsigned int width, height;