X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=07539b04d8f465e0487d04337b23316d89ed9a8f;hb=1b9a554a58e5595d9512540df60a3d681dc784a9;hp=5a2f081bc6a15aff7d9e62b7bcd923ec51183616;hpb=f2afa8e09dc46f89642a9cbbbc19250554c7ec5f;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 5a2f081..07539b0 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -52,10 +52,13 @@ static int fghGetConfig( int attribute ) { int returnValue = 0; + int result; /* Not checked */ if( fgStructure.CurrentWindow ) - glXGetConfig( fgDisplay.Display, fgStructure.CurrentWindow->Window.VisualInfo, - attribute, &returnValue ); + result = glXGetFBConfigAttrib( fgDisplay.Display, + *(fgStructure.CurrentWindow->Window.FBConfig), + attribute, + &returnValue ); return returnValue; } @@ -120,7 +123,6 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) } #if TARGET_HOST_MS_WINDOWS -/* WRONG-- FIXME */ /* The following include file is available from SGI but is not standard: * #include * So we copy the necessary parts out of it to support the multisampling query @@ -160,10 +162,14 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_SCREEN_HEIGHT: return fgDisplay.ScreenHeight ; case GLUT_SCREEN_WIDTH_MM: return fgDisplay.ScreenWidthMM ; case GLUT_SCREEN_HEIGHT_MM: return fgDisplay.ScreenHeightMM; - case GLUT_INIT_WINDOW_X: return fgState.Position.X ; - case GLUT_INIT_WINDOW_Y: return fgState.Position.Y ; - case GLUT_INIT_WINDOW_WIDTH: return fgState.Size.X ; - case GLUT_INIT_WINDOW_HEIGHT: return fgState.Size.Y ; + case GLUT_INIT_WINDOW_X: return fgState.Position.Use ? + fgState.Position.X : -1 ; + case GLUT_INIT_WINDOW_Y: return fgState.Position.Use ? + fgState.Position.Y : -1 ; + case GLUT_INIT_WINDOW_WIDTH: return fgState.Size.Use ? + fgState.Size.X : -1 ; + case GLUT_INIT_WINDOW_HEIGHT: return fgState.Size.Use ? + fgState.Size.Y : -1 ; case GLUT_INIT_DISPLAY_MODE: return fgState.DisplayMode ; #if TARGET_HOST_POSIX_X11 @@ -210,7 +216,20 @@ int FGAPIENTRY glutGet( GLenum eWhat ) */ return 0; } - return fgStructure.CurrentWindow->Window.VisualInfo->visual->map_entries; + else + { + const GLXFBConfig * fbconfig = + fgStructure.CurrentWindow->Window.FBConfig; + + XVisualInfo * visualInfo = + glXGetVisualFromFBConfig( fgDisplay.Display, *fbconfig ); + + const int result = visualInfo->visual->map_entries; + + XFree(visualInfo); + + return result; + } /* * Those calls are somewhat similiar, as they use XGetWindowAttributes() @@ -275,13 +294,23 @@ int FGAPIENTRY glutGet( GLenum eWhat ) /* I do not know yet if there will be a fgChooseVisual() function for Win32 */ case GLUT_DISPLAY_MODE_POSSIBLE: { - XVisualInfo* visualInfo = fgChooseVisual(); - if ( visualInfo == NULL ) { - return 0; - } else { - XFree( visualInfo ); - return 1; + /* We should not have to call fgChooseFBConfig again here. */ + GLXFBConfig * fbconfig; + int isPossible; + + fbconfig = fgChooseFBConfig(); + + if (fbconfig == NULL) + { + isPossible = 0; + } + else + { + isPossible = 1; + XFree(fbconfig); } + + return isPossible; } /* This is system-dependant */ @@ -289,7 +318,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) if( fgStructure.CurrentWindow == NULL ) return 0; - return fgStructure.CurrentWindow->Window.VisualInfo->visualid; + return fghGetConfig( GLX_VISUAL_ID ); #elif TARGET_HOST_MS_WINDOWS @@ -424,7 +453,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_DISPLAY_MODE_POSSIBLE: #if defined(_WIN32_WCE) - return GL_FALSE; + return 0; #else return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, PFD_MAIN_PLANE ); @@ -494,60 +523,57 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) { case GLUT_HAS_KEYBOARD: /* - * We always have a keyboard present on PC machines... + * Win32 is assumed a keyboard, and this cannot be queried, + * except for WindowsCE. * - * XXX I think that some of my PCs will boot without a keyboard. - * XXX Also, who says that we are running on a PC? UNIX/X11 - * XXX is much more generic, and X11 can go over a network. - * XXX Though in actuality, we can probably assume BOTH a - * XXX mouse and keyboard for most/all of our users. + * X11 has a core keyboard by definition, although it can + * be present as a virtual/dummy keyboard. For now, there + * is no reliable way to tell if a real keyboard is present. */ - return TRUE ; +#if defined(_WIN32_CE) + return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0; +# if FREEGLUT_LIB_PRAGMAS +# pragma comment (lib,"Kbdui.lib") +# endif + +#else + return 1; +#endif #if TARGET_HOST_POSIX_X11 + /* X11 has a mouse by definition */ case GLUT_HAS_MOUSE: - return TRUE ; + return 1 ; case GLUT_NUM_MOUSE_BUTTONS: - /* - * Return the number of mouse buttons available. This is a big guess. + /* We should be able to pass NULL when the last argument is zero, + * but at least one X server has a bug where this causes a segfault. * - * XXX We can probe /var/run/dmesg.boot which is world-readable. - * XXX This would be somewhat system-dependant, but is doable. - * XXX E.g., on NetBSD, my USB mouse registers: - * XXX ums0 at uhidev0: 3 buttons and Z dir. - * XXX We can also probe /var/log/XFree86\..*\.log to get - * XXX lines such as: - * XXX (**) Option "Buttons" "5" - * XXX (**) Option "ZAxisMapping" "4 5" - * XXX (**) Mouse0: ZAxisMapping: buttons 4 and 5 - * XXX (**) Mouse0: Buttons: 5 - * XXX ...which tells us even more, and is a bit less - * XXX system-dependant. (Other than MS-WINDOWS, all - * XXX target hosts with actual users are probably running - * XXX XFree86...) It is at least worth taking a look at - * XXX this file. + * In XFree86/Xorg servers, a mouse wheel is seen as two buttons + * rather than an Axis; "freeglut_main.c" expects this when + * checking for a wheel event. */ - return 3 ; + { + unsigned char map; + int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0); + return nbuttons; + } #elif TARGET_HOST_MS_WINDOWS case GLUT_HAS_MOUSE: /* - * The Windows can be booted without a mouse. - * It would be nice to have this reported. + * MS Windows can be booted without a mouse. */ return GetSystemMetrics( SM_MOUSEPRESENT ); case GLUT_NUM_MOUSE_BUTTONS: - /* We are much more fortunate under Win32 about this... */ -#if defined(_WIN32_WCE) +# if defined(_WIN32_WCE) return 1; -#else +# else return GetSystemMetrics( SM_CMOUSEBUTTONS ); -#endif /* defined(_WIN32_WCE) */ - +# endif #endif case GLUT_HAS_JOYSTICK: @@ -578,7 +604,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) case GLUT_HAS_SPACEBALL: case GLUT_HAS_TABLET: - return FALSE; + return 0; case GLUT_NUM_SPACEBALL_BUTTONS: case GLUT_NUM_TABLET_BUTTONS: @@ -633,13 +659,13 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) #if TARGET_HOST_POSIX_X11 case GLUT_OVERLAY_POSSIBLE: - return FALSE; + return 0; case GLUT_LAYER_IN_USE: return GLUT_NORMAL; case GLUT_HAS_OVERLAY: - return FALSE; + return 0; case GLUT_TRANSPARENT_INDEX: /* @@ -651,7 +677,7 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) case GLUT_NORMAL_DAMAGED: /* XXX Actually I do not know. Maybe. */ - return FALSE; + return 0; case GLUT_OVERLAY_DAMAGED: return -1; @@ -661,13 +687,13 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) case GLUT_OVERLAY_POSSIBLE: /* return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, PFD_OVERLAY_PLANE ); */ - return FALSE ; + return 0 ; case GLUT_LAYER_IN_USE: return GLUT_NORMAL; case GLUT_HAS_OVERLAY: - return FALSE; + return 0; case GLUT_TRANSPARENT_INDEX: /* @@ -679,7 +705,7 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) case GLUT_NORMAL_DAMAGED: /* XXX Actually I do not know. Maybe. */ - return FALSE; + return 0; case GLUT_OVERLAY_DAMAGED: return -1;