projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
[projects/chimara/chimara.git]
/
libchimara
/
gestalt.c
diff --git
a/libchimara/gestalt.c
b/libchimara/gestalt.c
index 22683df91d7a8d0237a5aa2c8d43434a52f80cec..1dad9d94bf8c173b62f6ff906691f159e565ee70 100644
(file)
--- a/
libchimara/gestalt.c
+++ b/
libchimara/gestalt.c
@@
-1,11
+1,12
@@
#include <stddef.h> /* Surprisingly, the only symbol needed is NULL */
#include <config.h>
#include "glk.h"
#include <stddef.h> /* Surprisingly, the only symbol needed is NULL */
#include <config.h>
#include "glk.h"
+#include "input.h"
/* Version of the Glk specification implemented by this library */
#define MAJOR_VERSION 0
#define MINOR_VERSION 7
/* Version of the Glk specification implemented by this library */
#define MAJOR_VERSION 0
#define MINOR_VERSION 7
-#define SUB_VERSION
2
+#define SUB_VERSION
4
/**
* glk_gestalt:
/**
* glk_gestalt:
@@
-108,6
+109,10
@@
glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
case gestalt_DrawImage:
return val == wintype_Graphics || val == wintype_TextBuffer;
case gestalt_DrawImage:
return val == wintype_Graphics || val == wintype_TextBuffer;
+ /* Which keycodes can be used as line terminators */
+ case gestalt_LineTerminatorKey:
+ return is_valid_line_terminator(val)? 1 : 0;
+
/* Capabilities that are simply supported */
case gestalt_Unicode:
case gestalt_Timer:
/* Capabilities that are simply supported */
case gestalt_Unicode:
case gestalt_Timer:
@@
-117,6
+122,8
@@
glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
case gestalt_DateTime:
case gestalt_UnicodeNorm:
case gestalt_LineInputEcho:
case gestalt_DateTime:
case gestalt_UnicodeNorm:
case gestalt_LineInputEcho:
+ case gestalt_LineTerminators:
+ case gestalt_ResourceStream:
return 1;
/* Capabilities supported if compiled with GStreamer */
return 1;
/* Capabilities supported if compiled with GStreamer */
@@
-124,6
+131,7
@@
glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
case gestalt_SoundVolume:
case gestalt_SoundNotify:
case gestalt_SoundMusic:
case gestalt_SoundVolume:
case gestalt_SoundNotify:
case gestalt_SoundMusic:
+ case gestalt_Sound2:
#ifdef GSTREAMER_SOUND
return 1;
#else
#ifdef GSTREAMER_SOUND
return 1;
#else
@@
-131,8
+139,8
@@
glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
#endif
/* Unsupported capabilities */
#endif
/* Unsupported capabilities */
- case gestalt_LineTerminatorKey:
- case gestalt_LineTerminators:
+ /* None! */
+
/* Selector not supported */
default:
return 0;
/* Selector not supported */
default:
return 0;