projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding a multitouch patch from Eero Pajarre per e-mail dated 6/8/2011 1:14 AM
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
a763d27
..
1cabb9d
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-68,23
+68,9
@@
static int fghGetConfig( int attribute )
static int fghCheckFullScreen(void)
{
#if TARGET_HOST_POSIX_X11
static int fghCheckFullScreen(void)
{
#if TARGET_HOST_POSIX_X11
-
- int result;
-
- result = 0;
- if (fgDisplay.StateFullScreen != None)
- {
- result = fgHintPresent(fgStructure.CurrentWindow->Window.Handle,
- fgDisplay.State,
- fgDisplay.StateFullScreen);
- }
-
- return result;
-
+ return fgStructure.CurrentWindow->State.IsFullscreen;
#else
#else
-
- return 0;
-
+ return 0;
#endif
}
#endif
}
@@
-334,7
+320,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
GLXFBConfig * fbconfig;
int isPossible;
GLXFBConfig * fbconfig;
int isPossible;
- fbconfig = fgChooseFBConfig();
+ fbconfig = fgChooseFBConfig(NULL);
if (fbconfig == NULL)
{
if (fbconfig == NULL)
{
@@
-482,7
+468,8
@@
int FGAPIENTRY glutGet( GLenum eWhat )
#if !defined(_WIN32_WCE)
if ( ( fgStructure.GameModeWindow != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) &&
#if !defined(_WIN32_WCE)
if ( ( fgStructure.GameModeWindow != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) &&
- ( ! fgStructure.CurrentWindow->IsMenu ) )
+ ( ! fgStructure.CurrentWindow->IsMenu ) &&
+ !( fgState.DisplayMode & GLUT_BORDERLESS ))
{
winRect.left += GetSystemMetrics( SM_CXSIZEFRAME );
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
{
winRect.left += GetSystemMetrics( SM_CXSIZEFRAME );
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
@@
-505,6
+492,8
@@
int FGAPIENTRY glutGet( GLenum eWhat )
#if defined(_WIN32_WCE)
return 0;
#else
#if defined(_WIN32_WCE)
return 0;
#else
+ if ( fgState.DisplayMode & GLUT_BORDERLESS )
+ return 0;
return GetSystemMetrics( SM_CXSIZEFRAME );
#endif /* !defined(_WIN32_WCE) */
return GetSystemMetrics( SM_CXSIZEFRAME );
#endif /* !defined(_WIN32_WCE) */
@@
-512,6
+501,8
@@
int FGAPIENTRY glutGet( GLenum eWhat )
#if defined(_WIN32_WCE)
return 0;
#else
#if defined(_WIN32_WCE)
return 0;
#else
+ if ( fgState.DisplayMode & GLUT_BORDERLESS )
+ return 0;
return GetSystemMetrics( SM_CYCAPTION );
#endif /* defined(_WIN32_WCE) */
return GetSystemMetrics( SM_CYCAPTION );
#endif /* defined(_WIN32_WCE) */