X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_window.c;h=9b28940776113866096d29569c448c9fffbc7593;hb=814beaa77f437cf4cf6cac9f748235488f6478a1;hp=69aba28ba0a3e203901c51bee75bd0dbeecfb149;hpb=6c3c78f5fe46f0126e26dcae456ebdec502913f5;p=freeglut diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c index 69aba28..9b28940 100644 --- a/src/Common/freeglut_window.c +++ b/src/Common/freeglut_window.c @@ -306,7 +306,7 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs ) ATTRIB( None ); fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display, - fgDisplay.Screen, + fgDisplay.pDisplay.Screen, attributes, &fbconfigArraySize ); } @@ -477,16 +477,16 @@ static int fghEwmhFullscrToggle(void) XEvent xev; long evmask = SubstructureRedirectMask | SubstructureNotifyMask; - if(!fgDisplay.State || !fgDisplay.StateFullScreen) { + if(!fgDisplay.pDisplay.State || !fgDisplay.pDisplay.StateFullScreen) { return -1; } xev.type = ClientMessage; 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.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[3] = 1; /* source indication: application */ xev.xclient.data.l[4] = 0; /* unused */