From a32453e68093718f88cf6f17a165e4b8fe2a784f Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Sun, 5 Mar 2000 06:51:07 +0000 Subject: Moved FL_LEFT_MOUSE, FL_MIDDLE_MOUSE, and FL_RIGHT_MOUSE from forms.h to Enumerations.H so they are available to any fltk programs. More fixes to the fake-overlay code in Fl_Gl_Window (it did not work on Win32 when there were 2 different-sized windows) Fix to Fl_compose to not quote the Delete key fixed to allow the right- control key to still be the compose prefix and to allow it to quote control characters. OSF1 used the same parameters for scandir as SGI and unlike Linux and apparently most other Unix's fl_ask, message, etc windows are resizable, which is useful if you use them to display arbitrary output from a program. On Win32 non_modal (but not modal) windows have close and size boxes, as per popular demand at Digital Domain. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1028 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_compose.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/Fl_compose.cxx') diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index 44526ce8c..ada731a22 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_compose.cxx,v 1.1.2.2 2000/02/29 21:54:55 mike Exp $" +// "$Id: Fl_compose.cxx,v 1.1.2.3 2000/03/05 06:51:05 bill Exp $" // // Character compose processing for the Fast Light Tool Kit (FLTK). // @@ -64,9 +64,6 @@ int Fl::compose(int& del) { del = 0; char ascii = e_text[0]; - // The Delete and other special keys should not be composed... - if (ascii < 32 || ascii == 127) return 0; - // Alt+letters are reserved for shortcuts. But alt+foreign letters // has to be allowed, because some key layouts require alt to be held // down in order to type them... @@ -132,7 +129,7 @@ int Fl::compose(int& del) { #endif // Only insert non-control characters: - if (e_length && (ascii&~31)) {compose_state = 0; return 1;} + if (e_length && (ascii & ~31 && ascii!=127)) {compose_state = 0; return 1;} return 0; } -- cgit v1.2.3