smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

RTA: fix modal grab

Browse source 
`gtk_add_grab()` is preferred to `gdk_pointer_grab()`, since
GTK releases the modal grab when a popup window is presented
(f.i. engine disconnected) or other grab breaking events occur.

`gdk_pointer_grab()` can lock the user out, in such events.
This commit is contained in:
Robin Gareus 2025-04-10 15:08:25 +02:00
parent 7cb8140b3a
commit 11bc7a651b
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

43
gtk2_ardour/rta_window.cc
View file

@ -61,8 +61,10 @@ RTAWindow::RTAWindow ()
_darea.signal_button_press_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_button_press_event));
_darea.signal_button_release_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_button_release_event));
_darea.signal_motion_notify_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_motion_notify_event));
_darea.signal_scroll_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_scroll_event), false);
_darea.signal_leave_notify_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_leave_notify_event), false);
_darea.signal_scroll_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_scroll_event));
_darea.signal_leave_notify_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_leave_notify_event), true);
_darea.signal_grab_broken_event ().connect (sigc::mem_fun (*this, &RTAWindow::darea_grab_broken_event), true);
_darea.signal_grab_notify ().connect (sigc::mem_fun (*this, &RTAWindow::darea_grab_notify), true);
_speed_strings.push_back (_("Rapid"));
_speed_strings.push_back (_("Fast"));
@ -308,7 +310,8 @@ RTAWindow::darea_button_press_event (GdkEventButton* ev)
}
_dragstart_y = ev->y;
gdk_pointer_grab (ev->window, false, GdkEventMask (Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK), NULL, NULL, ev->time);
_darea.add_modal_grab ();
_darea.queue_draw ();
return true;
}
@ -320,13 +323,20 @@ RTAWindow::darea_button_release_event (GdkEventButton* ev)
return false;
}
bool changed = false;
if (_dragging_dB != DragNone) {
_dragging_dB = DragNone;
gdk_pointer_ungrab (ev->time);
changed = true;
_darea.remove_modal_grab ();
}
if (_hovering_dB) {
_hovering_dB = false;
changed = true;
}
if (changed) {
_darea.queue_draw ();
}
@ -337,7 +347,6 @@ bool
RTAWindow::darea_leave_notify_event (GdkEventCrossing*)
{
if (_hovering_dB) {
_dragging_dB = DragNone;
_hovering_dB = false;
_darea.queue_draw ();
} else if (_cursor_x >= 0 || _cursor_y >= 0) {
@ -348,6 +357,28 @@ RTAWindow::darea_leave_notify_event (GdkEventCrossing*)
return false;
}
bool
RTAWindow::darea_grab_broken_event (GdkEventGrabBroken*)
{
if (_dragging_dB != DragNone) {
_darea.remove_modal_grab ();
_dragging_dB = DragNone;
_darea.queue_draw ();
return true;
}
return false;
}
void
RTAWindow::darea_grab_notify (bool was_grabbed)
{
if (!was_grabbed) {
_darea.remove_modal_grab ();
_dragging_dB = DragNone;
_darea.queue_draw ();
}
}
bool
RTAWindow::darea_motion_notify_event (GdkEventMotion* ev)
{
@ -712,7 +743,7 @@ RTAWindow::darea_expose_event (GdkEventExpose* ev)
cr->restore ();
if (_hovering_dB) {
if (_hovering_dB || _dragging_dB != DragNone) {
float m2 = _margin / 2.0;
float m4 = _margin / 4.0;
float m8 = _margin / 8.0;

2
gtk2_ardour/rta_window.h
View file

@ -58,6 +58,8 @@ private:
bool darea_motion_notify_event (GdkEventMotion*);
bool darea_scroll_event (GdkEventScroll*);
bool darea_leave_notify_event (GdkEventCrossing*);
bool darea_grab_broken_event (GdkEventGrabBroken*);
void darea_grab_notify (bool);
void set_rta_speed (ARDOUR::DSP::PerceptualAnalyzer::Speed);
void set_rta_warp (ARDOUR::DSP::PerceptualAnalyzer::Warp);