Expanded glutDeviceGet() support. Now reports the key repeat settings I added a few days ago.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37786 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -20,6 +20,7 @@ MergeObject <opengl>glut.o :
|
||||
glutCursor.cpp
|
||||
glutMenu.cpp
|
||||
glutDstr.cpp
|
||||
glutGameMode.cpp
|
||||
beos_x11.cpp
|
||||
|
||||
# C sources
|
||||
|
||||
@@ -172,12 +172,16 @@ int glutDeviceGet(GLenum info) {
|
||||
return 1;
|
||||
|
||||
case GLUT_HAS_SPACEBALL:
|
||||
case GLUT_HAS_DIAL_AND_BUTTON_BOX:
|
||||
case GLUT_HAS_TABLET:
|
||||
case GLUT_NUM_SPACEBALL_BUTTONS:
|
||||
case GLUT_NUM_BUTTON_BOX_BUTTONS:
|
||||
case GLUT_HAS_DIAL_AND_BUTTON_BOX:
|
||||
case GLUT_NUM_DIALS:
|
||||
case GLUT_NUM_BUTTON_BOX_BUTTONS:
|
||||
case GLUT_HAS_TABLET:
|
||||
case GLUT_NUM_TABLET_BUTTONS:
|
||||
case GLUT_HAS_JOYSTICK:
|
||||
case GLUT_JOYSTICK_POLL_RATE:
|
||||
case GLUT_JOYSTICK_BUTTONS:
|
||||
case GLUT_JOYSTICK_AXES:
|
||||
return 0;
|
||||
|
||||
case GLUT_NUM_MOUSE_BUTTONS:
|
||||
@@ -189,6 +193,14 @@ int glutDeviceGet(GLenum info) {
|
||||
return mouseButtons;
|
||||
}
|
||||
|
||||
case GLUT_DEVICE_IGNORE_KEY_REPEAT:
|
||||
if (gState.currentWindow)
|
||||
return gState.currentWindow->ignoreKeyRepeat;
|
||||
return 0;
|
||||
|
||||
case GLUT_DEVICE_KEY_REPEAT:
|
||||
return GLUT_KEY_REPEAT_DEFAULT;
|
||||
|
||||
default:
|
||||
__glutWarning("invalid glutDeviceGet parameter: %d", info);
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user