FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving all the X11-specific "fgDisplay" structure fields into their substructure. I can't see how the X11 build succeeded before this.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1046 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-02-04 14:35:46 +00:00
parent e9d4340061
commit 2aa1b9aa83
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freeglut/freeglut/src/Common/freeglut_gamemode.c
View File

@ -80,7 +80,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
XRRFreeScreenConfigInfo(xrr_config); XRRFreeScreenConfigInfo(xrr_config);
} }
if(!(xrr_config = XRRGetScreenInfo(fgDisplay.pDisplay.Display, fgDisplay.RootWindow))) { if(!(xrr_config = XRRGetScreenInfo(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow))) {
fgWarning("XRRGetScreenInfo failed"); fgWarning("XRRGetScreenInfo failed");
break; break;
} }
@ -622,7 +622,7 @@ int FGAPIENTRY glutEnterGameMode( void )
Window child; Window child;
/* Change to viewport to the window topleft edge: */ /* Change to viewport to the window topleft edge: */
if( !XF86VidModeSetViewPort( fgDisplay.pDisplay.Display, fgDisplay.Screen, 0, 0 ) ) if( !XF86VidModeSetViewPort( fgDisplay.pDisplay.Display, fgDisplay.pDisplay.Screen, 0, 0 ) )
fgWarning( "XF86VidModeSetViewPort failed" ); fgWarning( "XF86VidModeSetViewPort failed" );
/* /*

2
freeglut/freeglut/src/Common/freeglut_state.c
View File

@ -155,7 +155,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
XTranslateCoordinates( XTranslateCoordinates(
fgDisplay.pDisplay.Display, fgDisplay.pDisplay.Display,
fgStructure.CurrentWindow->Window.Handle, fgStructure.CurrentWindow->Window.Handle,
fgDisplay.RootWindow, fgDisplay.pDisplay.RootWindow,
0, 0, &x, &y, &w); 0, 0, &x, &y, &w);
switch ( eWhat ) switch ( eWhat )

8
freeglut/freeglut/src/Common/freeglut_window.c
View File

@ -306,7 +306,7 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
ATTRIB( None ); ATTRIB( None );
fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display, fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,
fgDisplay.Screen, fgDisplay.pDisplay.Screen,
attributes, attributes,
&fbconfigArraySize ); &fbconfigArraySize );
} }
@ -477,16 +477,16 @@ static int fghEwmhFullscrToggle(void)
XEvent xev; XEvent xev;
long evmask = SubstructureRedirectMask | SubstructureNotifyMask; long evmask = SubstructureRedirectMask | SubstructureNotifyMask;
if(!fgDisplay.State || !fgDisplay.StateFullScreen) { if(!fgDisplay.pDisplay.State || !fgDisplay.pDisplay.StateFullScreen) {
return -1; return -1;
} }
xev.type = ClientMessage; xev.type = ClientMessage;
xev.xclient.window = fgStructure.CurrentWindow->Window.Handle; xev.xclient.window = fgStructure.CurrentWindow->Window.Handle;
xev.xclient.message_type = fgDisplay.State; xev.xclient.message_type = fgDisplay.pDisplay.State;
xev.xclient.format = 32; xev.xclient.format = 32;
xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE; xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
xev.xclient.data.l[1] = fgDisplay.StateFullScreen; xev.xclient.data.l[1] = fgDisplay.pDisplay.StateFullScreen;
xev.xclient.data.l[2] = 0; /* no second property to toggle */ xev.xclient.data.l[2] = 0; /* no second property to toggle */
xev.xclient.data.l[3] = 1; /* source indication: application */ xev.xclient.data.l[3] = 1; /* source indication: application */
xev.xclient.data.l[4] = 0; /* unused */ xev.xclient.data.l[4] = 0; /* unused */