mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix keyboard handling in Fl_Glut_Window::handle().

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-09-19 02:53:00 +00:00
parent e252f907f8
commit e27f09e5ec
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,5 +1,9 @@
CHANGES IN FLTK 1.1.0rc7
- Fl_Glut_Window now takes keyboard focus and handles
shortcut events.
- The MacOS X implementation of fl_ready() now checks
the event queue for events.
- Fl_PNM_Image now supports the XV/GIMP thumbnail format
(P7).
- Fl_Preferences would not find groups inside the root

8
src/glut_compatability.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: glut_compatability.cxx,v 1.4.2.5.2.3 2002/08/09 03:17:30 easysw Exp $"
// "$Id: glut_compatability.cxx,v 1.4.2.5.2.4 2002/09/19 02:53:00 easysw Exp $"
//
// GLUT emulation routines for the Fast Light Tool Kit (FLTK).
//
@ -83,6 +83,7 @@ int Fl_Glut_Window::handle(int event) {
switch (event) {
case FL_PUSH:
if (keyboard || special) Fl::focus(this);
button = Fl::event_button()-1;
if (button<0) button = 0;
if (button>2) button = 2;
@ -121,6 +122,9 @@ int Fl_Glut_Window::handle(int event) {
if (keyboard || special) return 1;
break;
case FL_SHORTCUT:
if (!keyboard && !special) break;
case FL_KEYBOARD:
if (Fl::event_text()[0]) {
if (keyboard) {keyboard(Fl::event_text()[0],ex,ey); return 1;}
@ -402,5 +406,5 @@ int glutLayerGet(GLenum type) {
#endif
//
// End of "$Id: glut_compatability.cxx,v 1.4.2.5.2.3 2002/08/09 03:17:30 easysw Exp $".
// End of "$Id: glut_compatability.cxx,v 1.4.2.5.2.4 2002/09/19 02:53:00 easysw Exp $".
//