diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-09-19 02:53:00 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-09-19 02:53:00 +0000 |
| commit | e27f09e5ec6119502fa7f88f5e69b6b4ae4e49b8 (patch) | |
| tree | b80e05a71dca93044c6d2162f176be1785590554 /src | |
| parent | e252f907f807cbf8a0baf0fca29e194f5aed0801 (diff) | |
Fix keyboard handling in Fl_Glut_Window::handle().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rwxr-xr-x | src/glut_compatability.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index 4ee8c0745..6065fd37d 100755 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -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 $". // |