summaryrefslogtreecommitdiff
path: root/src/Fl_compose.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-05-05 14:09:50 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-05-05 14:09:50 +0000
commit48c8932fd57707ac26e46eb48450584fac14bf98 (patch)
tree13142ed2bbcbec031569f3e522ced3af77be0b83 /src/Fl_compose.cxx
parent8e37fbafc852e7baa4fe0278e9a01cf3d137ec3a (diff)
Some minor improvements for the Mac keyboard mapping: accent-space would under some cicumstances add an extra space; tilde-space would add a 'funny' tilde from far up un the MacRoman font, not the ASCII tilde as expected.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5084 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_compose.cxx')
-rw-r--r--src/Fl_compose.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx
index e0a0d97a5..40ad74ec1 100644
--- a/src/Fl_compose.cxx
+++ b/src/Fl_compose.cxx
@@ -46,7 +46,7 @@ static const char* const compose_pairs =
"? ! !!v-f ~~Dt<<>>.. `A~A~OOEoe"
"- --''``\"'\"`:-^V:y:Y//E=< > fifl"
"++..,,_\"%%^A^E'A:E`E'I^I:I`I'O^O"
-"mc`O'U^U`U||^ ~ _ u . * , ~ ; v ";
+"mc`O'U^U`U||^ ~^_ u . * , ~-; v ";
#else
@@ -142,6 +142,11 @@ int Fl::compose(int& del) {
e_text[0] = 0xf6;
return 1;
}
+ if (ascii==' ') {
+ del = 0;
+ compose_state = 0;
+ return 0;
+ }
#endif
// now search for the pair in either order:
for (const char *p = compose_pairs; *p; p += 2) {