X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.C;h=9bd8cfe7ee45ec5d4bd6700bfa9342dea87b5551;hb=47462c7a88ed4f844fa4eaf32a84533aa847b7d5;hp=9adf4e262931182aece1eaee60efffc286da6f6c;hpb=586cb6f963c4ccc80e79606cf0bbdf9c35171ddc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C
index 9adf4e26..9bd8cfe7 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.C
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.C
@@ -32,7 +32,9 @@
 #include "edlsession.h"
 #include "keys.h"
 #include "language.h"
+#include "mainerror.h"
 #include "mwindow.h"
+#include "mwindowgui.h"
 #include "plugin.h"
 #include "pluginserver.h"
 #include "theme.h"
@@ -255,10 +257,13 @@ void TitleWindow::create_objects()
 	int w1 = italic->get_w();
 	add_tool(bold = new TitleBold(client, this, x, y + 50));
 	if( bold->get_w() > w1 ) w1 = bold->get_w();
+
 	add_tool(drag = new TitleDrag(client, this, x, y + 80));
 	if( drag->get_w() > w1 ) w1 = drag->get_w();
-	if( client->config.drag )
-		grab(client->server->mwindow->cwindow->gui);
+	if( client->config.drag ) {
+		if( !grab(client->server->mwindow->cwindow->gui) )
+			eprintf("drag enabled, but compositor already grabbed\n");
+	}
 
 	x += w1 + margin;
 	add_tool(justify_title = new BC_Title(x, y, _("Justify:")));
@@ -465,6 +470,25 @@ int TitleWindow::resize_event(int w, int h)
 
 int TitleWindow::grab_event(XEvent *event)
 {
+	switch( event->type ) {
+	case ButtonPress: break;
+	case ButtonRelease: break;
+	case MotionNotify: break;
+	default: return 0;
+	}
+
+	MWindow *mwindow = client->server->mwindow;
+	CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
+	CWindowCanvas *canvas = cwindow_gui->canvas;
+	int cx, cy;  cwindow_gui->get_relative_cursor_xy(cx, cy);
+	cx -= mwindow->theme->ccanvas_x;
+	cy -= mwindow->theme->ccanvas_y;
+
+	if( !dragging ) {
+		if( cx < 0 || cx >= mwindow->theme->ccanvas_w ) return 0;
+		if( cy < 0 || cy >= mwindow->theme->ccanvas_h ) return 0;
+	}
+
 	switch( event->type ) {
 	case ButtonPress:
 		if( !dragging ) break;
@@ -474,15 +498,13 @@ int TitleWindow::grab_event(XEvent *event)
 		dragging = 0;
 		return 1;
 	case MotionNotify:
-		if( dragging ) break;
+		if( !dragging ) return 0;
+		break;
 	default:
 		return 0;
 	}
-	MWindow *mwindow = client->server->mwindow;
-	CWindowGUI *cwindow_gui = mwindow->cwindow->gui;
-	CWindowCanvas *canvas = cwindow_gui->canvas;
-	float cursor_x = canvas->get_canvas()->get_relative_cursor_x();
-	float cursor_y = canvas->get_canvas()->get_relative_cursor_y();
+
+	float cursor_x = cx, cursor_y = cy;
 	canvas->canvas_to_output(mwindow->edl, 0, cursor_x, cursor_y);
 	int64_t position = client->get_source_position();
 	float projector_x, projector_y, projector_z;
@@ -504,7 +526,7 @@ int TitleWindow::grab_event(XEvent *event)
 	int y0 = title_y, y1 = title_y+(title_h+1)/2, y2 = title_y+title_h;
 	int drag_dx = 0, drag_dy = 0;
 	if( !dragging ) {  // clockwise
-		     if( abs(drag_dx = cursor_x-x0) < r &&       // x0,y0
+		     if( abs(drag_dx = cursor_x-x0) < r &&  // x0,y0
 			 abs(drag_dy = cursor_y-y0) < r ) dragging = 1;
 		else if( abs(drag_dx = cursor_x-x1) < r &&  // x1,y0
 			 abs(drag_dy = cursor_y-y0) < r ) dragging = 2;
@@ -1069,11 +1091,11 @@ int TitleText::handle_event()
 	if( text_len >= avail ) { // back off last utf8 char
 		char text[2*sizeof(client->config.wtext)];
 		strcpy(text, get_text());
-                text_len = avail;
-                while( text_len > 0 && (text[text_len-1] & 0xc0) == 0x80 )
-                        text[--text_len] = 0;
-                if( text_len > 0 )
-                        text[--text_len] = 0;
+		text_len = avail;
+		while( text_len > 0 && (text[text_len-1] & 0xc0) == 0x80 )
+			text[--text_len] = 0;
+		if( text_len > 0 )
+			text[--text_len] = 0;
 		update(text);
 	}
 	int len =  sizeof(client->config.wtext) / sizeof(wchar_t);
@@ -1362,11 +1384,16 @@ TitleDrag::TitleDrag(TitleMain *client, TitleWindow *window, int x, int y)
 int TitleDrag::handle_event()
 {
 	int value = get_value();
-	client->config.drag = value;
-	if( value )
-		window->grab(client->server->mwindow->cwindow->gui);
+	CWindowGUI *cwindow_gui = client->server->mwindow->cwindow->gui;
+	if( value ) {
+		if( !window->grab(cwindow_gui) ) {
+			update(value = 0);
+			flicker(10,50);
+		}
+	}
 	else
-		window->ungrab(client->server->mwindow->cwindow->gui);
+		window->ungrab(cwindow_gui);
+	client->config.drag = value;
 	client->send_configure_change();
 	return 1;
 }
@@ -1423,7 +1450,7 @@ int TitleCurPopup::handle_event()
 	return 1;
 }
 
-void TitleCurSubMenu::add_subitem(int popup_type, va_list ap, const char *fmt)
+void TitleCurSubMenu::add_subitemx(int popup_type, va_list ap, const char *fmt)
 {
 	char item[BCSTRLEN];
 	vsnprintf(item, sizeof(item)-1, fmt, ap);
@@ -1648,13 +1675,12 @@ void TitlePngPopup::handle_done_event(int result)
 
 BC_Window *TitlePngPopup::new_gui()
 {
-        BC_DisplayInfo display_info;
-        int x = display_info.get_abs_cursor_x();
-        int y = display_info.get_abs_cursor_y();
+	MWindow *mwindow = client->server->mwindow;
+	int x, y;  mwindow->gui->get_abs_cursor_xy(x, y);
 
-	BC_Window *gui = new BrowseButtonWindow(client->server->mwindow->theme,
+	BC_Window *gui = new BrowseButtonWindow(mwindow->theme,
 		x-25, y-100, window, "", _("Png file"), _("Png path"), 0);
-        gui->create_objects();
+	gui->create_objects();
 	return gui;
 }