*/\r
\r
extern int fgPlatformGlutGet ( GLenum eWhat );\r
+extern int fgPlatformGlutDeviceGet ( GLenum eWhat );\r
+extern int fgPlatformGlutLayerGet ( GLenum eWhat );\r
+\r
+/* A helper function to check if a display mode is possible to use */\r
+#if TARGET_HOST_POSIX_X11\r
+GLXFBConfig* fgChooseFBConfig( int* numcfgs );\r
+#endif\r
+\r
\r
/* -- LOCAL DEFINITIONS ---------------------------------------------------- */\r
\r
int result; /* Not checked */\r
\r
if( fgStructure.CurrentWindow )\r
- result = glXGetFBConfigAttrib( fgDisplay.Display,\r
- *(fgStructure.CurrentWindow->Window.FBConfig),\r
+ result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,\r
+ *(fgStructure.CurrentWindow->Window.pContext.FBConfig),\r
attribute,\r
&returnValue );\r
\r
return returnValue;\r
}\r
\r
-static int fgPlatformGlutGet ( GLenum eWhat )\r
+int fgPlatformGlutGet ( GLenum eWhat )\r
{\r
int nsamples = 0;\r
\r
else\r
{\r
const GLXFBConfig * fbconfig =\r
- fgStructure.CurrentWindow->Window.FBConfig;\r
+ fgStructure.CurrentWindow->Window.pContext.FBConfig;\r
\r
XVisualInfo * visualInfo =\r
- glXGetVisualFromFBConfig( fgDisplay.Display, *fbconfig );\r
+ glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, *fbconfig );\r
\r
const int result = visualInfo->visual->map_entries;\r
\r
return 0;\r
\r
XTranslateCoordinates(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\r
fgStructure.CurrentWindow->Window.Handle,\r
fgDisplay.RootWindow,\r
0, 0, &x, &y, &w);\r
if ( w == 0 )\r
return 0;\r
XTranslateCoordinates(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\r
fgStructure.CurrentWindow->Window.Handle,\r
w, 0, 0, &x, &y, &w);\r
\r
if( fgStructure.CurrentWindow == NULL )\r
return 0;\r
XGetWindowAttributes(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\r
fgStructure.CurrentWindow->Window.Handle,\r
&winAttributes\r
);\r
break;\r
}\r
}\r
+\r
+\r
+int fgPlatformGlutDeviceGet ( GLenum eWhat )\r
+{\r
+ switch( eWhat )\r
+ {\r
+ case GLUT_HAS_KEYBOARD:\r
+ /*\r
+ * X11 has a core keyboard by definition, although it can\r
+ * be present as a virtual/dummy keyboard. For now, there\r
+ * is no reliable way to tell if a real keyboard is present.\r
+ */\r
+ return 1;\r
+\r
+ /* X11 has a mouse by definition */\r
+ case GLUT_HAS_MOUSE:\r
+ return 1 ;\r
+\r
+ case GLUT_NUM_MOUSE_BUTTONS:\r
+ /* We should be able to pass NULL when the last argument is zero,\r
+ * but at least one X server has a bug where this causes a segfault.\r
+ *\r
+ * In XFree86/Xorg servers, a mouse wheel is seen as two buttons\r
+ * rather than an Axis; "freeglut_main.c" expects this when\r
+ * checking for a wheel event.\r
+ */\r
+ {\r
+ unsigned char map;\r
+ int nbuttons = XGetPointerMapping(fgDisplay.pDisplay.Display, &map,0);\r
+ return nbuttons;\r
+ }\r
+\r
+ default:\r
+ fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );\r
+ break;\r
+ }\r
+\r
+ /* And now -- the failure. */\r
+ return -1;\r
+}\r
+\r
+int fgPlatformGlutLayerGet( GLenum eWhat )\r
+{\r
+ /*\r
+ * This is easy as layers are not implemented ;-)\r
+ *\r
+ * XXX Can we merge the UNIX/X11 and WIN32 sections? Or\r
+ * XXX is overlay support planned?\r
+ */\r
+ switch( eWhat )\r
+ {\r
+ case GLUT_OVERLAY_POSSIBLE:\r
+ return 0;\r
+\r
+ case GLUT_LAYER_IN_USE:\r
+ return GLUT_NORMAL;\r
+\r
+ case GLUT_HAS_OVERLAY:\r
+ return 0;\r
+\r
+ case GLUT_TRANSPARENT_INDEX:\r
+ /*\r
+ * Return just anything, which is always defined as zero\r
+ *\r
+ * XXX HUH?\r
+ */\r
+ return 0;\r
+\r
+ case GLUT_NORMAL_DAMAGED:\r
+ /* XXX Actually I do not know. Maybe. */\r
+ return 0;\r
+\r
+ case GLUT_OVERLAY_DAMAGED:\r
+ return -1;\r
+\r
+ default:\r
+ fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );\r
+ break;\r
+ }\r
+\r
+ /* And fail. That's good. Programs do love failing. */\r
+ return -1;\r
+}\r
+\r
+\r
+\r
#endif\r
\r
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */\r
/* XXX WARNING: we are mostly lying in this function. */\r
switch( eWhat )\r
{\r
- case GLUT_HAS_KEYBOARD:\r
- /*\r
- * Win32 is assumed a keyboard, and this cannot be queried,\r
- * except for WindowsCE.\r
- *\r
- * X11 has a core keyboard by definition, although it can\r
- * be present as a virtual/dummy keyboard. For now, there\r
- * is no reliable way to tell if a real keyboard is present.\r
- */\r
-#if defined(_WIN32_CE)\r
- return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0;\r
-# if FREEGLUT_LIB_PRAGMAS\r
-# pragma comment (lib,"Kbdui.lib")\r
-# endif\r
-\r
-#else\r
- return 1;\r
-#endif\r
-\r
-#if TARGET_HOST_POSIX_X11\r
-\r
- /* X11 has a mouse by definition */\r
- case GLUT_HAS_MOUSE:\r
- return 1 ;\r
-\r
- case GLUT_NUM_MOUSE_BUTTONS:\r
- /* We should be able to pass NULL when the last argument is zero,\r
- * but at least one X server has a bug where this causes a segfault.\r
- *\r
- * In XFree86/Xorg servers, a mouse wheel is seen as two buttons\r
- * rather than an Axis; "freeglut_main.c" expects this when\r
- * checking for a wheel event.\r
- */\r
- {\r
- unsigned char map;\r
- int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);\r
- return nbuttons;\r
- }\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
- case GLUT_HAS_MOUSE:\r
- /*\r
- * MS Windows can be booted without a mouse.\r
- */\r
- return GetSystemMetrics( SM_MOUSEPRESENT );\r
-\r
- case GLUT_NUM_MOUSE_BUTTONS:\r
-# if defined(_WIN32_WCE)\r
- return 1;\r
-# else\r
- return GetSystemMetrics( SM_CMOUSEBUTTONS );\r
-# endif\r
-#endif\r
-\r
case GLUT_HAS_JOYSTICK:\r
return fgJoystickDetect ();\r
\r
return fgState.KeyRepeat;\r
\r
default:\r
- fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );\r
- break;\r
+ return fgPlatformGlutDeviceGet ( eWhat );\r
}\r
\r
/* And now -- the failure. */\r
switch( eWhat )\r
{\r
\r
-#if TARGET_HOST_POSIX_X11\r
-\r
- case GLUT_OVERLAY_POSSIBLE:\r
- return 0;\r
-\r
- case GLUT_LAYER_IN_USE:\r
- return GLUT_NORMAL;\r
-\r
- case GLUT_HAS_OVERLAY:\r
- return 0;\r
-\r
- case GLUT_TRANSPARENT_INDEX:\r
- /*\r
- * Return just anything, which is always defined as zero\r
- *\r
- * XXX HUH?\r
- */\r
- return 0;\r
-\r
- case GLUT_NORMAL_DAMAGED:\r
- /* XXX Actually I do not know. Maybe. */\r
- return 0;\r
-\r
- case GLUT_OVERLAY_DAMAGED:\r
- return -1;\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
- case GLUT_OVERLAY_POSSIBLE:\r
-/* return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,\r
- PFD_OVERLAY_PLANE ); */\r
- return 0 ;\r
-\r
- case GLUT_LAYER_IN_USE:\r
- return GLUT_NORMAL;\r
-\r
- case GLUT_HAS_OVERLAY:\r
- return 0;\r
-\r
- case GLUT_TRANSPARENT_INDEX:\r
- /*\r
- * Return just anything, which is always defined as zero\r
- *\r
- * XXX HUH?\r
- */\r
- return 0;\r
-\r
- case GLUT_NORMAL_DAMAGED:\r
- /* XXX Actually I do not know. Maybe. */\r
- return 0;\r
-\r
- case GLUT_OVERLAY_DAMAGED:\r
- return -1;\r
-#endif\r
-\r
default:\r
- fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );\r
- break;\r
+ return fgPlatformGlutLayerGet( eWhat );\r
}\r
\r
/* And fail. That's good. Programs do love failing. */\r
break;\r
}\r
\r
- fbconfigArray = glXChooseFBConfig(fgDisplay.Display,\r
- fgDisplay.Screen,\r
+ fbconfigArray = glXChooseFBConfig(fgDisplay.pDisplay.Display,\r
+ fgDisplay.pDisplay.Screen,\r
attributes,\r
&fbconfigArraySize);\r
\r
{\r
int value;\r
\r
- result = glXGetFBConfigAttrib(fgDisplay.Display,\r
+ result = glXGetFBConfigAttrib(fgDisplay.pDisplay.Display,\r
fbconfigArray[i],\r
attribute_name,\r
&value);\r