*/\r
\r
#include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
\r
\r
/* The following include file is available from SGI but is not standard:\r
return;\r
}\r
\r
- wglMakeCurrent( window->Window.Device, window->Window.Context );\r
+ wglMakeCurrent( window->Window.pContext.Device, window->Window.Context );\r
\r
- if ( !fghIsExtensionSupported( window->Window.Device, "WGL_ARB_create_context" ) )\r
+ if ( !fghIsExtensionSupported( window->Window.pContext.Device, "WGL_ARB_create_context" ) )\r
{\r
return;\r
}\r
fgError( "wglCreateContextAttribsARB not found" );\r
}\r
\r
- context = wglCreateContextAttribsARB( window->Window.Device, 0, attributes );\r
+ context = wglCreateContextAttribsARB( window->Window.pContext.Device, 0, attributes );\r
if ( context == NULL )\r
{\r
fghContextCreationError();\r
if (checkOnly)\r
current_hDC = CreateDC(TEXT("DISPLAY"), NULL ,NULL ,NULL);\r
else\r
- current_hDC = window->Window.Device;\r
+ current_hDC = window->Window.pContext.Device;\r
\r
fghFillPFD( ppfd, current_hDC, layer_type );\r
pixelformat = ChoosePixelFormat( current_hDC, ppfd );\r
/* create a dummy window */\r
ZeroMemory(&wndCls, sizeof(wndCls));\r
wndCls.lpfnWndProc = DefWindowProc;\r
- wndCls.hInstance = fgDisplay.Instance;\r
+ wndCls.hInstance = fgDisplay.pDisplay.Instance;\r
wndCls.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;\r
wndCls.lpszClassName = _T("FREEGLUT_dummy");\r
RegisterClass( &wndCls );\r
\r
- hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.Instance, 0 );\r
+ hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.pDisplay.Instance, 0 );\r
hDC=GetDC(hWnd);\r
SetPixelFormat( hDC, pixelformat, ppfd );\r
\r
wglDeleteContext(rc);\r
ReleaseDC(hWnd, hDC);\r
DestroyWindow(hWnd);\r
- UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);\r
+ UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.pDisplay.Instance);\r
}\r
\r
success = ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( current_hDC, pixelformat, ppfd ) );\r
{\r
if( fgStructure.CurrentWindow )\r
ReleaseDC( fgStructure.CurrentWindow->Window.Handle,\r
- fgStructure.CurrentWindow->Window.Device );\r
+ fgStructure.CurrentWindow->Window.pContext.Device );\r
\r
if ( window )\r
{\r
- window->Window.Device = GetDC( window->Window.Handle );\r
+ window->Window.pContext.Device = GetDC( window->Window.Handle );\r
wglMakeCurrent(\r
- window->Window.Device,\r
+ window->Window.pContext.Device,\r
window->Window.Context\r
);\r
}\r
\r
/* \r
* this function returns the origin of the screen identified by\r
- * fgDisplay.DisplayName, and 0 otherwise.\r
+ * fgDisplay.pDisplay.DisplayName, and 0 otherwise.\r
* This is used in fgOpenWindow to open the gamemode window on the screen\r
* identified by the -display command line argument. The function should\r
* not be called otherwise.\r
*xp = 0;\r
*yp = 0;\r
\r
- if( fgDisplay.DisplayName )\r
+ if( fgDisplay.pDisplay.DisplayName )\r
{\r
m_proc_t st;\r
st.x=xp;\r
st.y=yp;\r
- st.name=fgDisplay.DisplayName;\r
+ st.name=fgDisplay.pDisplay.DisplayName;\r
EnumDisplayMonitors(0,0,m_proc,(LPARAM)&st);\r
}\r
}\r
*xp = 0;\r
*yp = 0;\r
\r
- if( fgDisplay.DisplayName )\r
+ if( fgDisplay.pDisplay.DisplayName )\r
{\r
fgWarning( "for working -display support FreeGLUT must be compiled with WINVER >= 0x0500");\r
}\r
ATOM atom;\r
\r
/* Grab the window class we have registered on glutInit(): */\r
- atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );\r
+ atom = GetClassInfo( fgDisplay.pDisplay.Instance, _T("FREEGLUT"), &wc );\r
FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Info Not Found",\r
"fgOpenWindow" );\r
\r
0,0, 240,320,\r
NULL,\r
NULL,\r
- fgDisplay.Instance,\r
+ fgDisplay.pDisplay.Instance,\r
(LPVOID) window\r
);\r
\r
x, y, w, h,\r
(HWND) window->Parent == NULL ? NULL : window->Parent->Window.Handle,\r
(HMENU) NULL,\r
- fgDisplay.Instance,\r
+ fgDisplay.pDisplay.Instance,\r
(LPVOID) window\r
);\r
#endif /* defined(_WIN32_WCE) */\r