From bcb7c6347355c83b30218386425c784db28230e8 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sat, 30 Jan 2010 00:00:24 -0600 Subject: [PATCH] Ignore events with modifiers in Timeline::handle() to avoid eating keyboard event for global rec enable. --- Timeline/Timeline.C | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C index 20587f3..ab88e2a 100644 --- a/Timeline/Timeline.C +++ b/Timeline/Timeline.C @@ -1188,6 +1188,10 @@ Timeline::handle ( int m ) case FL_LEAVE: return 1; case FL_KEYDOWN: + if ( Fl::event_state() & ( FL_ALT | FL_CTRL | FL_SHIFT ) ) + /* we don't want any keys with modifiers... */ + return 0; + if ( Fl::event_key() == 'r' ) { range = true; @@ -1200,6 +1204,10 @@ Timeline::handle ( int m ) } return 0; case FL_KEYUP: + if ( Fl::event_state() & ( FL_ALT | FL_CTRL | FL_SHIFT ) ) + /* we don't want any keys with modifiers... */ + return 0; + if ( Fl::event_key() == 'r' ) { range = false;