projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied Christian's change to drop unnecessary dependency to X11 libraries we
[freeglut]
/
src
/
fg_state.c
diff --git
a/src/fg_state.c
b/src/fg_state.c
index
bb2e8f7
..
4165daa
100644
(file)
--- a/
src/fg_state.c
+++ b/
src/fg_state.c
@@
-1,5
+1,5
@@
/*
/*
- * freeglut_state.c
+ * fg_state.c
*
* Freeglut state query methods.
*
*
* Freeglut state query methods.
*
@@
-110,16
+110,20
@@
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
break;
case GLUT_SKIP_STALE_MOTION_EVENTS:
break;
case GLUT_SKIP_STALE_MOTION_EVENTS:
- fgState.SkipStaleMotion = value;
+ fgState.SkipStaleMotion = !!value;
break;
case GLUT_GEOMETRY_VISUALIZE_NORMALS:
if( fgStructure.CurrentWindow != NULL )
break;
case GLUT_GEOMETRY_VISUALIZE_NORMALS:
if( fgStructure.CurrentWindow != NULL )
- fgStructure.CurrentWindow->State.VisualizeNormals = value;
+ fgStructure.CurrentWindow->State.VisualizeNormals = !!value;
break;
case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
break;
case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
- fgState.StrokeFontDrawJoinDots = value;
+ fgState.StrokeFontDrawJoinDots = !!value;
+ break;
+
+ case GLUT_ALLOW_NEGATIVE_WINDOW_POSITION:
+ fgState.AllowNegativeWindowPosition = !!value;
break;
default:
break;
default:
@@
-225,11
+229,13
@@
int FGAPIENTRY glutGet( GLenum eWhat )
case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
return fgState.StrokeFontDrawJoinDots;
case GLUT_STROKE_FONT_DRAW_JOIN_DOTS:
return fgState.StrokeFontDrawJoinDots;
+ case GLUT_ALLOW_NEGATIVE_WINDOW_POSITION:
+ return fgState.AllowNegativeWindowPosition;
+
default:
return fgPlatformGlutGet ( eWhat );
break;
}
default:
return fgPlatformGlutGet ( eWhat );
break;
}
- return -1;
}
/*
}
/*
@@
-264,7
+270,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
case GLUT_NUM_DIALS:
if ( fgState.InputDevsInitialised ) return 8;
return 0;
case GLUT_NUM_DIALS:
if ( fgState.InputDevsInitialised ) return 8;
return 0;
-
+
case GLUT_NUM_BUTTON_BOX_BUTTONS:
return 0;
case GLUT_NUM_BUTTON_BOX_BUTTONS:
return 0;
@@
-287,11
+293,8
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return fgState.KeyRepeat;
default:
return fgState.KeyRepeat;
default:
- return fgPlatformGlutDeviceGet ( eWhat );
+ return fgPlatformGlutDeviceGet ( eWhat );
}
}
-
- /* And now -- the failure. */
- return -1;
}
/*
}
/*