X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=9f3e2123c843c7e0f336ae1d4c53105b03b04a71;hb=81fc9cd689dd964a4736fa1f8986a64db6b4a937;hp=a35645ad05d707ecac9c1d2b68b33d8c86530a3e;hpb=9e3d90a964c0fbe97c0b58235336a47111932d5d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index a35645ad..9f3e2123 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -224,6 +224,7 @@ BC_WindowBase::~BC_WindowBase()
 	}
 
 	resize_history.remove_all_objects();
+	delete grab_lock;
 
 #ifndef SINGLE_THREAD
 	common_events.remove_all_objects();
@@ -346,6 +347,7 @@ int BC_WindowBase::initialize()
 	event_condition = new Condition(0, "BC_WindowBase::event_condition");
 	init_lock = new Condition(0, "BC_WindowBase::init_lock");
 #endif
+	grab_lock = new Mutex("BC_WindowBase::grab_lock");
 
 	cursor_timer = new Timer;
 	event_thread = 0;
@@ -959,10 +961,15 @@ if( debug && event->type != ClientMessage ) {
 }
 
 	if( active_grab ) {
+		grab_lock->lock("BC_WindowBase::dispatch_event 3");
 		unlock_window();
-		active_grab->lock_window("BC_WindowBase::dispatch_event 3");
-		result = active_grab->grab_event(event);
-		active_grab->unlock_window();
+		result = 0;
+		if( active_grab ) {
+			active_grab->lock_window("BC_WindowBase::dispatch_event 3");
+			result = active_grab->grab_event(event);
+			active_grab->unlock_window();
+		}
+		grab_lock->unlock();
 		if( result ) return result;
 		lock_window("BC_WindowBase::dispatch_event 4");
 	}
@@ -1022,8 +1029,8 @@ if( debug && event->type != ClientMessage ) {
 
 //printf("BC_WindowBase::dispatch_event %d %d\n", __LINE__, button_number);
 		event_win = event->xany.window;
-		if (button_number < 6) {
-			if(button_number < 4)
+		if( button_number < 6 ) {
+			if( button_number < 4 )
 				button_down = 1;
 			button_pressed = event->xbutton.button;
 			button_time1 = button_time2;
@@ -1036,23 +1043,20 @@ if( debug && event->type != ClientMessage ) {
 			drag_x2 = cursor_x + get_resources()->drag_radius;
 			drag_y1 = cursor_y - get_resources()->drag_radius;
 			drag_y2 = cursor_y + get_resources()->drag_radius;
-
-			if((long)(button_time3 - button_time1) < resources->double_click * 2)
-			{
-				triple_click = 1;
-				button_time3 = button_time2 = button_time1 = 0;
-			}
-			if((long)(button_time3 - button_time2) < resources->double_click)
-			{
-				double_click = 1;
-//				button_time3 = button_time2 = button_time1 = 0;
-			}
-			else
-			{
-				triple_click = 0;
-				double_click = 0;
+			if( button_number < 4 ) {
+				if((long)(button_time3 - button_time1) < resources->double_click * 2) {
+					triple_click = 1;
+					button_time3 = button_time2 = button_time1 = 0;
+				}
+				if((long)(button_time3 - button_time2) < resources->double_click) {
+					double_click = 1;
+//					button_time3 = button_time2 = button_time1 = 0;
+				}
+				else {
+					triple_click = 0;
+					double_click = 0;
+				}
 			}
-
 			dispatch_button_press();
 		}
 		break;
@@ -3418,17 +3422,36 @@ void BC_WindowBase::close(int return_value)
 
 int BC_WindowBase::grab(BC_WindowBase *window)
 {
-	if( window->active_grab && this != window->active_grab ) return 0;
-	window->active_grab = this;
-	this->grab_active = window;
-	return 1;
+	int ret = 0;
+	BC_WindowBase *grab_window = window->active_grab;
+	if( grab_window ) {
+		int locked = get_window_lock();
+		if( locked ) unlock_window();
+		grab_window->lock_window("BC_WindowBase::grab(BC_WindowBase");
+		grab_window->handle_ungrab();
+		grab_window->unlock_window();
+		if( locked ) lock_window("BC_WindowBase::grab(BC_WindowBase");
+	}
+	window->grab_lock->lock("BC_WindowBase::grab");
+	if( !window->active_grab ) {
+		window->active_grab = this;
+		this->grab_active = window;
+		ret = 1;
+	}
+	window->grab_lock->unlock();
+	return ret;
 }
 int BC_WindowBase::ungrab(BC_WindowBase *window)
 {
-	if( window->active_grab && this != window->active_grab ) return 0;
-	window->active_grab = 0;
-	this->grab_active = 0;
-	return 1;
+	int ret = 0;
+	window->grab_lock->lock("BC_WindowBase::ungrab");
+	if( this == window->active_grab ) {
+		window->active_grab = 0;
+		this->grab_active = 0;
+		ret = 1;
+	}
+	window->grab_lock->unlock();
+	return ret;
 }
 int BC_WindowBase::grab_event_count()
 {
@@ -3910,9 +3933,9 @@ void BC_WindowBase::get_pop_cursor(int &px, int &py, int lock_window)
 	get_abs_cursor(px, py, lock_window);
 	if( px < xmargin ) px = xmargin;
 	if( py < ymargin ) py = ymargin;
-	int wd = get_screen_w(lock_window,-1) - xmargin;
+	int wd = get_screen_x(lock_window,-1) + get_screen_w(lock_window,-1) - xmargin;
 	if( px > wd ) px = wd;
-	int ht = get_screen_h(lock_window,-1) - ymargin;
+	int ht = get_screen_y(lock_window,-1) + get_screen_h(lock_window,-1) - ymargin;
 	if( py > ht ) py = ht;
 }
 int BC_WindowBase::get_pop_cursor_x(int lock_window)
@@ -4360,6 +4383,10 @@ void BC_WindowBase::init_resources(float scale)
 		int wx, wy, ww, wh;
 		int cins = info.xinerama_big_screen();
 		if( !info.xinerama_geometry(cins, wx, wy, ww, wh) ) {
+			int sh = ww * 9 / 16;
+			int sw = wh * 16 / 9;
+			if( sw < ww ) ww = sw;
+			if( sh < wh ) wh = sh;
 			if( (x_scale = ww/1920.) < 1 ) x_scale = 1;
 			if( (y_scale = wh/1080.) < 1 ) y_scale = 1;
 		}