diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-02-29 22:16:11 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-02-29 22:16:11 +0000 |
| commit | 6d84fa98b7fd806e69ba8860315d7e6083542963 (patch) | |
| tree | bd617b77717119c3d4aa5c59d0f5f6f3e90fbee9 /src | |
| parent | 61f63af5edd72d4183d6e5eafc74d4443e6bde4f (diff) | |
Fix CTRL+something "-" - wasn't tracking the proper CTRL key
state (STR #264)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_x.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 968e9b336..d999d6de4 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.31 2004/02/26 03:06:41 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.32 2004/02/29 22:16:11 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -756,7 +756,9 @@ int fl_handle(const XEvent& thisevent) // easier to program shortcuts and is Windoze-compatable: keysym = XKeycodeToKeysym(fl_display, keycode, 0); } - if (Fl::event_state(FL_CTRL) && keysym == '-') buffer[0] = 0x1f; // ^_ + // MRS: Can't use Fl::event_state(FL_CTRL) since the state is not + // set until set_event_xy() is called later... + if ((xevent.xkey.state & ControlMask) && keysym == '-') buffer[0] = 0x1f; // ^_ buffer[len] = 0; Fl::e_text = buffer; Fl::e_length = len; @@ -1268,5 +1270,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.31 2004/02/26 03:06:41 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.32 2004/02/29 22:16:11 easysw Exp $". // |