ms_minutes_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
ms_seconds_ebox.signal_scroll_event().connect (bind (mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
+ hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Hours));
+ minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Minutes));
+ seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Seconds));
+ frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), SMPTE_Frames));
+ audio_frames_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
+ bars_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Bars));
+ beats_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Beats));
+ ticks_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
+ ms_hours_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
+ ms_minutes_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
+ ms_seconds_ebox.signal_key_press_event().connect (bind (mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
+
hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
ms_seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
+
+ clock_base.signal_focus_in_event().connect (mem_fun (*this, &AudioClock::drop_focus_handler));
+}
+
+bool
+AudioClock::drop_focus_handler (GdkEventFocus* ignored)
+{
+ Keyboard::magic_widget_drop_focus ();
+ return false;
}
void
}
void
-AudioClock::set (nframes_t when, bool force, nframes_t offset, int which)
+AudioClock::set (nframes_t when, bool force, nframes_t offset, char which)
{
if ((!force && !is_visible()) || session == 0) {
bool pdelta = Config->get_primary_clock_delta_edit_cursor();
bool sdelta = Config->get_secondary_clock_delta_edit_cursor();
- if (offset && which == 1 && pdelta) {
+ if (offset && which == 'p' && pdelta) {
when = (when > offset) ? when - offset : offset - when;
- } else if (offset && which == 2 && sdelta) {
+ } else if (offset && which == 's' && sdelta) {
when = (when > offset) ? when - offset : offset - when;
}
- if (which == 1 && pdelta && !last_pdelta) {
- cout << "set_widget_name() called" << endl;
+ if (which == 'p' && pdelta && !last_pdelta) {
set_widget_name("TransportClockDisplayDelta");
last_pdelta = true;
- } else if (which == 1 && !pdelta && last_pdelta) {
+ } else if (which == 'p' && !pdelta && last_pdelta) {
set_widget_name("TransportClockDisplay");
last_pdelta = false;
- } else if (which == 2 && sdelta && !last_sdelta) {
+ } else if (which == 's' && sdelta && !last_sdelta) {
set_widget_name("SecondaryClockDisplayDelta");
last_sdelta = true;
- } else if (which == 2 && !sdelta && last_sdelta) {
+ } else if (which == 's' && !sdelta && last_sdelta) {
set_widget_name("SecondaryClockDisplay");
last_sdelta = false;
}
}
}
+bool
+AudioClock::field_key_press_event (GdkEventKey *ev, Field field)
+{
+ /* all key activity is handled on key release */
+ return true;
+}
+
bool
AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
{
label = &ticks_label;
break;
default:
- return FALSE;
+ return false;
}
switch (ev->keyval) {
if (_mode == MinSec && field == MS_Seconds) {
new_char = '.';
} else {
- return FALSE;
+ return false;
}
break;
- case GDK_Return:
- case GDK_KP_Enter:
case GDK_Tab:
move_on = true;
break;
case GDK_Escape:
+ case GDK_Return:
+ case GDK_KP_Enter:
clock_base.grab_focus ();
- return TRUE;
+ return true;
default:
- return FALSE;
+ return false;
}
if (!move_on) {
}
- return TRUE;
+ return true;
}
bool
{
key_entry_state = 0;
+ Keyboard::magic_widget_grab_focus ();
+
switch (field) {
case SMPTE_Hours:
hours_ebox.set_flags (Gtk::HAS_FOCUS);
break;
}
- return FALSE;
+ return false;
}
bool
break;
}
- return FALSE;
+ Keyboard::magic_widget_drop_focus ();
+
+ return false;
}
bool
AudioClock::field_button_release_event (GdkEventButton *ev, Field field)
{
-
-
if (dragging) {
- gdk_pointer_ungrab(GDK_CURRENT_TIME);
+ gdk_pointer_ungrab (GDK_CURRENT_TIME);
dragging = false;
if (ev->y > drag_start_y+1 || ev->y < drag_start_y-1 || Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)){
- // we actually dragged so return without setting editing focus, or we shift clicked
-
- return TRUE;
+ // we actually dragged so return without setting editing focus, or we shift clicked
+ return true;
}
}
build_ops_menu ();
}
ops_menu->popup (1, ev->time);
- return TRUE;
+ return true;
}
if (Keyboard::is_context_menu_event (ev)) {
build_ops_menu ();
}
ops_menu->popup (1, ev->time);
- return TRUE;
+ return true;
}
switch (ev->button) {
break;
}
- return TRUE;
+ return true;
}
bool
AudioClock::field_button_press_event (GdkEventButton *ev, Field field)
{
- if (session == 0) return FALSE;
+ if (session == 0) return false;
nframes_t frames = 0;
}
/* make absolutely sure that the pointer is grabbed */
- gdk_pointer_grab(ev->window,FALSE ,
+ gdk_pointer_grab(ev->window,false ,
GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK),
NULL,NULL,ev->time);
dragging = true;
case 3:
/* used for context sensitive menu */
- return FALSE;
+ return false;
break;
default:
- return FALSE;
+ return false;
break;
}
- return TRUE;
+ return true;
}
bool
AudioClock::field_button_scroll_event (GdkEventScroll *ev, Field field)
{
- if (session == 0) return FALSE;
+ if (session == 0) {
+ return false;
+ }
nframes_t frames = 0;
break;
default:
- return FALSE;
+ return false;
break;
}
- return TRUE;
+ return true;
}
bool
AudioClock::field_motion_notify_event (GdkEventMotion *ev, Field field)
{
if (session == 0 || !dragging) {
- return FALSE;
+ return false;
}
float pixel_frame_scale_factor = 0.2f;
}
- return TRUE;
+ return true;
}
nframes_t
ops_menu = new Menu;
MenuList& ops_items = ops_menu->items();
ops_menu->set_name ("ArdourContextMenu");
-
- Menu *mode_menu = manage (new Menu);
- MenuList& mode_items = mode_menu->items();
- mode_menu->set_name ("ArdourContextMenu");
- mode_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
- mode_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
- mode_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
- mode_items.push_back (MenuElem (_("Audio Frames"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
- mode_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this, &AudioClock::set_mode), Off)));
-
- ops_items.push_back (MenuElem (_("Mode"), *mode_menu));
+ ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
+ ops_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
+ ops_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
+ ops_items.push_back (MenuElem (_("Audio Frames"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
+ ops_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this, &AudioClock::set_mode), Off)));
}
void