X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=d8c60421006f0b87eecc6521ab8b2fd703d3895d;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=ec7507683bf04eef3136f014b3e88f169b4564b1;hpb=b5c58822be78c8820692c916e296a2230bb2b9e2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index ec750768..d8c60421 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -36,7 +36,7 @@
 #include "bcwindowbase.h"
 #include "bcwindowevents.h"
 #include "bccmodels.h"
-#include "colors.h"
+#include "bccolors.h"
 #include "condition.h"
 #include "cursors.h"
 #include "bchash.h"
@@ -177,6 +177,7 @@ BC_WindowBase::~BC_WindowBase()
 			 &BC_WindowBase::mediumfont,
 			 &BC_WindowBase::largefont,
 			 &BC_WindowBase::bigfont,
+			 &BC_WindowBase::clockfont,
 		};
 		for( int i=sizeof(xfont)/sizeof(xfont[0]); --i>=0; )
 			XFreeFont(display, this->*xfont[i]);
@@ -193,6 +194,7 @@ BC_WindowBase::~BC_WindowBase()
 			 &BC_WindowBase::bold_smallfont_xft,
 			 &BC_WindowBase::bold_mediumfont_xft,
 			 &BC_WindowBase::bold_largefont_xft,
+			 &BC_WindowBase::clockfont_xft,
 		};
 		for( int i=sizeof(xft_font)/sizeof(xft_font[0]); --i>=0; ) {
 			XftFont *xft = (XftFont *)(this->*xft_font[i]);
@@ -223,7 +225,12 @@ BC_WindowBase::~BC_WindowBase()
 		}
 		else
 #endif
+		{
+// _XftDisplayInfo needs a lock.
+			get_resources()->create_window_lock->lock("BC_WindowBase::~BC_WindowBase");
 			XCloseDisplay(display);
+			get_resources()->create_window_lock->unlock();
+		}
 // clipboard uses a different display connection
 		clipboard->stop_clipboard();
 		delete clipboard;
@@ -326,16 +333,24 @@ int BC_WindowBase::initialize()
 #ifdef HAVE_LIBXXF86VM
 	vm_switched = 0;
 #endif
-	smallfont_xft = 0;
-	bold_largefont_xft = 0;
-	bold_mediumfont_xft = 0;
-	bold_smallfont_xft = 0;
 	input_method = 0;
 	input_context = 0;
 
+	smallfont = 0;
+	mediumfont = 0;
+	largefont = 0;
+	bigfont = 0;
+	clockfont = 0;
+
+	smallfont_xft = 0;
 	mediumfont_xft = 0;
 	largefont_xft = 0;
 	bigfont_xft = 0;
+	clockfont_xft = 0;
+
+	bold_smallfont_xft = 0;
+	bold_mediumfont_xft = 0;
+	bold_largefont_xft = 0;
 #ifdef SINGLE_THREAD
 	completion_lock = new Condition(0, "BC_WindowBase::completion_lock");
 #else
@@ -372,22 +387,10 @@ int BC_WindowBase::initialize()
 			FocusChangeMask
 
 
-int BC_WindowBase::create_window(BC_WindowBase *parent_window,
-				const char *title,
-				int x,
-				int y,
-				int w,
-				int h,
-				int minw,
-				int minh,
-				int allow_resize,
-				int private_color,
-				int hide,
-				int bg_color,
-				const char *display_name,
-				int window_type,
-				BC_Pixmap *bg_pixmap,
-				int group_it)
+int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title,
+		int x, int y, int w, int h, int minw, int minh, int allow_resize,
+		int private_color, int hide, int bg_color, const char *display_name,
+		int window_type, BC_Pixmap *bg_pixmap, int group_it)
 {
 	XSetWindowAttributes attr;
 	unsigned long mask;
@@ -1030,6 +1033,10 @@ locking_message = event->xclient.message_type;
 		break;
 
 	case ButtonPress:
+		if(motion_events)
+		{
+			dispatch_motion_event();
+		}
 		get_key_masks(event->xbutton.state);
 		cursor_x = event->xbutton.x;
 		cursor_y = event->xbutton.y;
@@ -1074,6 +1081,10 @@ locking_message = event->xclient.message_type;
 		break;
 
 	case ButtonRelease:
+		if(motion_events)
+		{
+			dispatch_motion_event();
+		}
 		get_key_masks(event->xbutton.state);
 		button_number = event->xbutton.button;
 		event_win = event->xany.window;
@@ -1811,7 +1822,7 @@ int BC_WindowBase::show_tooltip(const char *text, int x, int y, int w, int h)
 	if( wy >= (y1-=h) ) wy = y1;
 // avoid tip under cursor (flickers)
 	int abs_x, abs_y;
-	get_abs_cursor_xy(abs_x,abs_y, 0);
+	get_abs_cursor(abs_x,abs_y, 0);
 	if( wx < abs_x && abs_x < wx+w && wy < abs_y && abs_y < wy+h ) {
 		if( wx-abs_x < wy-abs_y )
 			wx = abs_x+1;
@@ -2298,6 +2309,10 @@ int BC_WindowBase::init_fonts()
 		if( !(bigfont = XLoadQueryFont(display, _(resources.big_font2))) )
 			bigfont = XLoadQueryFont(display, "fixed");
 
+	if((clockfont = XLoadQueryFont(display, _(resources.clock_font))) == NULL)
+		if((clockfont = XLoadQueryFont(display, _(resources.clock_font2))) == NULL)
+			clockfont = XLoadQueryFont(display, "fixed");
+
 	init_xft();
 	if(get_resources()->use_fontset)
 	{
@@ -2316,8 +2331,11 @@ int BC_WindowBase::init_fonts()
 			largefontset = XCreateFontSet(display, "fixed,*", &m, &n, &d);
 		bigfontset = XCreateFontSet(display, resources.big_fontset, &m, &n, &d);
 		if( !bigfontset )
-			largefontset = XCreateFontSet(display, "fixed,*", &m, &n, &d);
-		if(bigfontset && largefontset && mediumfontset && smallfontset) {
+			bigfontset = XCreateFontSet(display, "fixed,*", &m, &n, &d);
+		clockfontset = XCreateFontSet(display, resources.clock_fontset, &m, &n, &d);
+		if( !clockfontset )
+			clockfontset = XCreateFontSet(display, "fixed,*", &m, &n, &d);
+		if(clockfontset && bigfontset && largefontset && mediumfontset && smallfontset) {
 			curr_fontset = mediumfontset;
 			get_resources()->use_fontset = 1;
 		}
@@ -2362,6 +2380,12 @@ void BC_WindowBase::init_xft()
 		if(!(bigfont_xft =
 			XftFontOpenXlfd(display, screen, resources.big_font_xft2)))
 			bigfont_xft = XftFontOpenXlfd(display, screen, "fixed");
+	if(!(clockfont_xft =
+		(resources.clock_font_xft[0] == '-' ?
+			XftFontOpenXlfd(display, screen, resources.clock_font_xft) :
+			XftFontOpenName(display, screen, resources.clock_font_xft))) )
+		clockfont_xft = XftFontOpenXlfd(display, screen, "fixed");
+
 
 	if(!(bold_smallfont_xft =
 		(resources.small_b_font_xft[0] == '-' ?
@@ -2379,21 +2403,24 @@ void BC_WindowBase::init_xft()
 			XftFontOpenName(display, screen, resources.large_b_font_xft))) )
 		bold_largefont_xft = XftFontOpenXlfd(display, screen, "fixed");
 
-// Extension failed to locate fonts
 	if( !smallfont_xft || !mediumfont_xft || !largefont_xft || !bigfont_xft ||
-	    !bold_largefont_xft || !bold_mediumfont_xft || !bold_largefont_xft ) {
+	    !bold_largefont_xft || !bold_mediumfont_xft || !bold_largefont_xft ||
+	    !clockfont_xft ) {
 		printf("BC_WindowBase::init_fonts: no xft fonts found:"
-			" %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n",
+			" %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n %s=%p\n",
 			resources.small_font_xft, smallfont_xft,
 			resources.medium_font_xft, mediumfont_xft,
 			resources.large_font_xft, largefont_xft,
 			resources.big_font_xft, bigfont_xft,
+			resources.clock_font_xft, clockfont_xft,
 			resources.small_b_font_xft, bold_smallfont_xft,
 			resources.medium_b_font_xft, bold_mediumfont_xft,
 			resources.large_b_font_xft, bold_largefont_xft);
 		get_resources()->use_xft = 0;
 		exit(1);
 	}
+// _XftDisplayInfo needs a lock.
+	XftDefaultHasRender(display);
 #endif // HAVE_XFT
 }
 
@@ -2744,6 +2771,7 @@ XFontStruct* BC_WindowBase::get_font_struct(int font)
 		case MEDIUMFONT: return top_level->mediumfont; break;
 		case LARGEFONT:  return top_level->largefont;  break;
 		case BIGFONT:    return top_level->bigfont;    break;
+		case CLOCKFONT:  return top_level->clockfont;  break;
 	}
 	return 0;
 }
@@ -2759,6 +2787,7 @@ XFontSet BC_WindowBase::get_fontset(int font)
 			case MEDIUMFONT: fs = top_level->mediumfontset; break;
 			case LARGEFONT:  fs = top_level->largefontset; break;
 			case BIGFONT:    fs = top_level->bigfontset;   break;
+			case CLOCKFONT: fs = top_level->clockfontset; break;
 		}
 	}
 
@@ -2773,6 +2802,7 @@ XftFont* BC_WindowBase::get_xft_struct(int font)
 		case MEDIUMFONT:   return (XftFont*)top_level->mediumfont_xft;
 		case LARGEFONT:    return (XftFont*)top_level->largefont_xft;
 		case BIGFONT:      return (XftFont*)top_level->bigfont_xft;
+		case CLOCKFONT:    return (XftFont*)top_level->clockfont_xft;
 		case MEDIUMFONT_3D: return (XftFont*)top_level->bold_mediumfont_xft;
 		case SMALLFONT_3D:  return (XftFont*)top_level->bold_smallfont_xft;
 		case LARGEFONT_3D:  return (XftFont*)top_level->bold_largefont_xft;
@@ -2783,13 +2813,6 @@ XftFont* BC_WindowBase::get_xft_struct(int font)
 #endif
 
 
-
-
-
-
-
-
-
 int BC_WindowBase::get_current_font()
 {
 	return top_level->current_font;
@@ -2825,6 +2848,7 @@ void BC_WindowBase::set_fontset(int font)
 			case MEDIUMFONT: fs = top_level->mediumfontset; break;
 			case LARGEFONT:  fs = top_level->largefontset; break;
 			case BIGFONT:    fs = top_level->bigfontset;   break;
+			case CLOCKFONT:  fs = top_level->clockfontset; break;
 		}
 	}
 
@@ -3726,13 +3750,13 @@ int BC_WindowBase::dispatch_selection_clear()
 }
 
 
-void BC_WindowBase::get_relative_cursor_xy(int &x, int &y, int lock_window)
+void BC_WindowBase::get_relative_cursor(int &x, int &y, int lock_window)
 {
 	int abs_x, abs_y, win_x, win_y;
 	unsigned int temp_mask;
 	Window temp_win;
 
-	if(lock_window) this->lock_window("BC_WindowBase::get_relative_cursor_xy");
+	if(lock_window) this->lock_window("BC_WindowBase::get_relative_cursor");
 	XQueryPointer(top_level->display, top_level->win,
 	   &temp_win, &temp_win, &abs_x, &abs_y, &win_x, &win_y,
 	   &temp_mask);
@@ -3744,23 +3768,23 @@ void BC_WindowBase::get_relative_cursor_xy(int &x, int &y, int lock_window)
 int BC_WindowBase::get_relative_cursor_x(int lock_window)
 {
 	int x, y;
-	get_relative_cursor_xy(x, y, lock_window);
+	get_relative_cursor(x, y, lock_window);
 	return x;
 }
 int BC_WindowBase::get_relative_cursor_y(int lock_window)
 {
 	int x, y;
-	get_relative_cursor_xy(x, y, lock_window);
+	get_relative_cursor(x, y, lock_window);
 	return y;
 }
 
-void BC_WindowBase::get_abs_cursor_xy(int &abs_x, int &abs_y, int lock_window)
+void BC_WindowBase::get_abs_cursor(int &abs_x, int &abs_y, int lock_window)
 {
 	int win_x, win_y;
 	unsigned int temp_mask;
 	Window temp_win;
 
-	if(lock_window) this->lock_window("BC_WindowBase::get_abs_cursor_xy");
+	if(lock_window) this->lock_window("BC_WindowBase::get_abs_cursor");
 	XQueryPointer(top_level->display, top_level->win,
 		&temp_win, &temp_win, &abs_x, &abs_y, &win_x, &win_y,
 		&temp_mask);
@@ -3769,20 +3793,20 @@ void BC_WindowBase::get_abs_cursor_xy(int &abs_x, int &abs_y, int lock_window)
 int BC_WindowBase::get_abs_cursor_x(int lock_window)
 {
 	int abs_x, abs_y;
-	get_abs_cursor_xy(abs_x, abs_y, lock_window);
+	get_abs_cursor(abs_x, abs_y, lock_window);
 	return abs_x;
 }
 int BC_WindowBase::get_abs_cursor_y(int lock_window)
 {
 	int abs_x, abs_y;
-	get_abs_cursor_xy(abs_x, abs_y, lock_window);
+	get_abs_cursor(abs_x, abs_y, lock_window);
 	return abs_y;
 }
 
-void BC_WindowBase::get_pop_cursor_xy(int &px, int &py, int lock_window)
+void BC_WindowBase::get_pop_cursor(int &px, int &py, int lock_window)
 {
 	int margin = 100;
-	get_abs_cursor_xy(px, py, lock_window);
+	get_abs_cursor(px, py, lock_window);
 	if( px < margin ) px = margin;
 	if( py < margin ) py = margin;
 	int wd = get_screen_w(lock_window,-1) - margin;
@@ -3793,13 +3817,13 @@ void BC_WindowBase::get_pop_cursor_xy(int &px, int &py, int lock_window)
 int BC_WindowBase::get_pop_cursor_x(int lock_window)
 {
 	int px, py;
-	get_pop_cursor_xy(px, py, lock_window);
+	get_pop_cursor(px, py, lock_window);
 	return px;
 }
 int BC_WindowBase::get_pop_cursor_y(int lock_window)
 {
 	int px, py;
-	get_pop_cursor_xy(px, py, lock_window);
+	get_pop_cursor(px, py, lock_window);
 	return py;
 }
 
@@ -3837,7 +3861,7 @@ int BC_WindowBase::get_cursor_over_window()
 int BC_WindowBase::cursor_above()
 {
 	int rx, ry;
-	get_relative_cursor_xy(rx, ry);
+	get_relative_cursor(rx, ry);
 	return rx < 0 || rx >= get_w() ||
 		ry < 0 || ry >= get_h() ? 0 : 1;
 }