X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=b827113a52a4c55cd42b120767b559c592de21ac;hb=20dab381c3f5c0c0bd48cd7014ab67857eb80155;hp=823d81aa609b18099724ca341cd2d24d2e876dfd;hpb=72a6abf751403bd91464e77ff2cece01c9756a6b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 823d81aa..b827113a 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -302,7 +302,6 @@ int BC_WindowBase::initialize()
 	force_tooltip = 0;
 //	next_repeat_id = 0;
 	tooltip_popup = 0;
-	tooltip_done = 0;
 	current_font = MEDIUMFONT;
 	current_color = BLACK;
 	current_cursor = ARROW_CURSOR;
@@ -1771,69 +1770,54 @@ int BC_WindowBase::dispatch_drag_motion()
 }
 
 
-
-
-
-int BC_WindowBase::show_tooltip(int w, int h)
+int BC_WindowBase::show_tooltip(const char *text, int x, int y, int w, int h)
 {
-	Window tempwin;
-
-	if(tooltip_text && !tooltip_on &&
-		(force_tooltip || get_resources()->tooltips_enabled))
-	{
-		int x, y;
+// default text
+	int forced = !text ? force_tooltip : 1;
+	if( !text ) text = tooltip_text;
+	if( !text || (!forced && !get_resources()->tooltips_enabled) ) {
 		top_level->hide_tooltip();
-
+		return 1;
+	}
+// default w,h
+	if(w < 0) w = get_text_width(MEDIUMFONT, text)  + TOOLTIP_MARGIN * 2;
+	if(h < 0) h = get_text_height(MEDIUMFONT, text) + TOOLTIP_MARGIN * 2;
+// default x,y (win relative)
+	if( x < 0 ) x = get_w();
+	if( y < 0 ) y = get_h();
+	int wx, wy;
+	get_root_coordinates(x, y, &wx, &wy);
+// keep the tip inside the window/display
+	int x0 = top_level->get_x(), x1 = x0 + top_level->get_w();
+	int x2 = top_level->get_screen_x(0, -1) + top_level->get_screen_w(0, -1);
+	if( x1 > x2 ) x1 = x2;
+	if( wx < x0 ) wx = x0;
+	if( wx >= (x1-=w) ) wx = x1;
+	int y0 = top_level->get_y(), y1 = y0 + top_level->get_h();
+	int y2 = top_level->get_root_h(0);
+	if( y1 > y2 ) y1 = y2;
+	if( wy < y0 ) wy = y0;
+	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);
+	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;
+		else
+			wy = abs_y+1;
+	}
+	if( !tooltip_on ) {
 		tooltip_on = 1;
-		if(w < 0)
-			w = get_text_width(MEDIUMFONT, tooltip_text);
-
-		if(h < 0)
-			h = get_text_height(MEDIUMFONT, tooltip_text);
-
-		w += TOOLTIP_MARGIN * 2;
-		h += TOOLTIP_MARGIN * 2;
-
-		XTranslateCoordinates(top_level->display, win,
-				top_level->rootwin, get_w(), get_h(),
-				&x, &y, &tempwin);
-		// keep the tip inside the window/display
-		int top_x = top_level->get_x();
-		if( x < top_x ) x = top_x;
-		int top_w = top_x + top_level->get_w();
-		int lmt_w = top_level->get_screen_x(0, -1) + top_level->get_screen_w(0, -1);
-		if( top_w < lmt_w ) lmt_w = top_w;
-		if( x+w > lmt_w ) x = lmt_w-w;
-		if( x < 0 ) x = 0;
-		int top_y = top_level->get_y();
-		if( y < top_y ) y = top_y;
-		int top_h = top_y + top_level->get_h();
-		int lmt_h = top_level->get_root_h(0);
-		if( top_h < lmt_h ) lmt_h = top_h;
-		if( y+h > lmt_h ) y = lmt_h-h;
-		if( y < 0 ) y = 0;
-		int abs_x, abs_y, win_x, win_y;
-		unsigned int temp_mask;
-		Window temp_win;
-		XQueryPointer(top_level->display, top_level->win,
-			&temp_win, &temp_win, &abs_x, &abs_y,
-			&win_x, &win_y, &temp_mask);
-		// check for cursor inside popup
-		if( x < abs_x && abs_x < x+w && y < abs_y && abs_y < y+h )
-		{
-			if( x-abs_x < y-abs_y )
-				x = abs_x+1;
-			else
-				y = abs_y+1;
-		}
-		tooltip_popup = new BC_Popup(top_level, x, y, w, h,
-					get_resources()->tooltip_bg_color);
-
-		draw_tooltip();
-		tooltip_popup->set_font(MEDIUMFONT);
-		tooltip_popup->flash();
-		tooltip_popup->flush();
+		tooltip_popup = new BC_Popup(top_level, wx, wy, w, h,
+				get_resources()->tooltip_bg_color);
 	}
+	else
+		tooltip_popup->reposition_window(wx, wy, w, h);
+
+	draw_tooltip(text);
+	tooltip_popup->flash();
+	tooltip_popup->flush();
 	return 0;
 }
 
@@ -1871,11 +1855,6 @@ int BC_WindowBase::set_tooltip(const char *text)
 	}
 	return 0;
 }
-void BC_WindowBase::set_tooltip_done(int v)
-{
-	tooltip_done = v;
-}
-
 // signal the event handler to repeat
 int BC_WindowBase::set_repeat(int64_t duration)
 {
@@ -2030,7 +2009,7 @@ void BC_WindowBase::init_cursors()
 	downleft_resize_cursor = XCreateFontCursor(display, XC_bottom_left_corner);
 	downright_resize_cursor = XCreateFontCursor(display, XC_bottom_right_corner);
 	hourglass_cursor = XCreateFontCursor(display, XC_watch);
-
+	grabbed_cursor = create_grab_cursor();
 
 	static char cursor_data[] = { 0,0,0,0, 0,0,0,0 };
 	Colormap colormap = DefaultColormap(display, screen);
@@ -2042,49 +2021,6 @@ void BC_WindowBase::init_cursors()
 		pixmap_bottom, pixmap_bottom, &black, &black, 0, 0);
 //	XDefineCursor(display, win, transparent_cursor);
 	XFreePixmap(display, pixmap_bottom);
-
-	int iw = 23, iw1 = iw-1, iw2 = iw/2;
-	int ih = 23, ih1 = ih-1, ih2 = ih/2;
-	VFrame grab(iw,ih,BC_RGB888);
-	grab.clear_frame();
-	grab.set_pixel_color(RED);   // fg
-	grab.draw_smooth(iw2,0,   iw1,0,   iw1,ih2);
-	grab.draw_smooth(iw1,ih2, iw1,ih1, iw2,ih1);
-	grab.draw_smooth(iw2,ih1, 0,ih1,   0,ih2);
-	grab.draw_smooth(0,ih2,   0,0,     iw2,0);
-	grab.set_pixel_color(WHITE); // bg
-	grab.draw_line(0,ih2,     iw2-2,ih2);
-	grab.draw_line(iw2+2,ih2, iw1,ih2);
-	grab.draw_line(iw2,0,     iw2,ih2-2);
-	grab.draw_line(iw2,ih2+2, iw2,ih1);
-
-	int bpl = (iw+7)/8, isz = bpl * ih;
-	char img[isz];  memset(img, 0, isz);
-	char msk[isz];  memset(msk, 0, isz);
-	unsigned char **rows = grab.get_rows();
-	for( int iy=0; iy<ih; ++iy ) {
-		char *op = img + iy*bpl;
-		char *mp = msk + iy*bpl;
-		unsigned char *ip = rows[iy];
-		for( int ix=0; ix<iw; ++ix,ip+=3 ) {
-			if( ip[0] ) mp[ix>>3] |= (1<<(ix&7));
-			if( !ip[1] ) op[ix>>3] |= (1<<(ix&7));
-		}
-	}
-	unsigned long white_pix = WhitePixel(display, screen);
-	unsigned long black_pix = BlackPixel(display, screen);
-	Pixmap img_xpm = XCreatePixmapFromBitmapData(display, rootwin,
-		img, iw,ih, white_pix,black_pix, 1);
-	Pixmap msk_xpm = XCreatePixmapFromBitmapData(display, rootwin,
-		msk, iw,ih, white_pix,black_pix, 1);
-
-	XColor fc, bc;
-	fc.flags = bc.flags = DoRed | DoGreen | DoBlue;
-	fc.red = 0xffff; fc.green = fc.blue = 0;  // fg
-	bc.red = bc.green = bc.blue = 0x0000;     // bg
-	grabbed_cursor = XCreatePixmapCursor(display, img_xpm,msk_xpm, &fc,&bc, iw2,ih2);
-	XFreePixmap(display, img_xpm);
-	XFreePixmap(display, msk_xpm);
 }
 
 int BC_WindowBase::evaluate_color_model(int client_byte_order, int server_byte_order, int depth)
@@ -2236,6 +2172,53 @@ int BC_WindowBase::create_shared_colors()
 	return 0;
 }
 
+Cursor BC_WindowBase::create_grab_cursor()
+{
+	int iw = 23, iw1 = iw-1, iw2 = iw/2;
+	int ih = 23, ih1 = ih-1, ih2 = ih/2;
+	VFrame grab(iw,ih,BC_RGB888);
+	grab.clear_frame();
+	grab.set_pixel_color(RED);   // fg
+	grab.draw_smooth(iw2,0,   iw1,0,   iw1,ih2);
+	grab.draw_smooth(iw1,ih2, iw1,ih1, iw2,ih1);
+	grab.draw_smooth(iw2,ih1, 0,ih1,   0,ih2);
+	grab.draw_smooth(0,ih2,   0,0,     iw2,0);
+	grab.set_pixel_color(WHITE); // bg
+	grab.draw_line(0,ih2,     iw2-2,ih2);
+	grab.draw_line(iw2+2,ih2, iw1,ih2);
+	grab.draw_line(iw2,0,     iw2,ih2-2);
+	grab.draw_line(iw2,ih2+2, iw2,ih1);
+
+	int bpl = (iw+7)/8, isz = bpl * ih;
+	char img[isz];  memset(img, 0, isz);
+	char msk[isz];  memset(msk, 0, isz);
+	unsigned char **rows = grab.get_rows();
+	for( int iy=0; iy<ih; ++iy ) {
+		char *op = img + iy*bpl;
+		char *mp = msk + iy*bpl;
+		unsigned char *ip = rows[iy];
+		for( int ix=0; ix<iw; ++ix,ip+=3 ) {
+			if( ip[0] ) mp[ix>>3] |= (1<<(ix&7));
+			if( !ip[1] ) op[ix>>3] |= (1<<(ix&7));
+		}
+	}
+	unsigned long white_pix = WhitePixel(display, screen);
+	unsigned long black_pix = BlackPixel(display, screen);
+	Pixmap img_xpm = XCreatePixmapFromBitmapData(display, rootwin,
+		img, iw,ih, white_pix,black_pix, 1);
+	Pixmap msk_xpm = XCreatePixmapFromBitmapData(display, rootwin,
+		msk, iw,ih, white_pix,black_pix, 1);
+
+	XColor fc, bc;
+	fc.flags = bc.flags = DoRed | DoGreen | DoBlue;
+	fc.red = 0xffff; fc.green = fc.blue = 0;  // fg
+	bc.red = bc.green = bc.blue = 0x0000;     // bg
+	Cursor cursor = XCreatePixmapCursor(display, img_xpm,msk_xpm, &fc,&bc, iw2,ih2);
+	XFreePixmap(display, img_xpm);
+	XFreePixmap(display, msk_xpm);
+	return cursor;
+}
+
 int BC_WindowBase::allocate_color_table()
 {
 	int red, green, blue, color;
@@ -2631,21 +2614,22 @@ Cursor BC_WindowBase::get_cursor_struct(int cursor)
 {
 	switch(cursor)
 	{
-		case ARROW_CURSOR:  	   return top_level->arrow_cursor;  	    	   break;
+		case ARROW_CURSOR:         return top_level->arrow_cursor;
 		case CROSS_CURSOR:         return top_level->cross_cursor;
-		case IBEAM_CURSOR:  	   return top_level->ibeam_cursor;  	    	   break;
-		case VSEPARATE_CURSOR:     return top_level->vseparate_cursor;      	   break;
-		case HSEPARATE_CURSOR:     return top_level->hseparate_cursor;      	   break;
-		case MOVE_CURSOR:  	       return top_level->move_cursor;          	       break;
-		case LEFT_CURSOR:   	   return top_level->left_cursor;   	    	   break;
-		case RIGHT_CURSOR:         return top_level->right_cursor;  	    	   break;
-		case UPRIGHT_ARROW_CURSOR: return top_level->upright_arrow_cursor;  	   break;
-		case UPLEFT_RESIZE:        return top_level->upleft_resize_cursor;     	   break;
-		case UPRIGHT_RESIZE:       return top_level->upright_resize_cursor;    	   break;
-		case DOWNLEFT_RESIZE:      return top_level->downleft_resize_cursor;   	   break;
-		case DOWNRIGHT_RESIZE:     return top_level->downright_resize_cursor;  	   break;
-		case HOURGLASS_CURSOR:     return top_level->hourglass_cursor;  	       break;
-		case TRANSPARENT_CURSOR:   return top_level->transparent_cursor;  	       break;
+		case IBEAM_CURSOR:         return top_level->ibeam_cursor;
+		case VSEPARATE_CURSOR:     return top_level->vseparate_cursor;
+		case HSEPARATE_CURSOR:     return top_level->hseparate_cursor;
+		case MOVE_CURSOR:          return top_level->move_cursor;
+		case LEFT_CURSOR:          return top_level->left_cursor;
+		case RIGHT_CURSOR:         return top_level->right_cursor;
+		case UPRIGHT_ARROW_CURSOR: return top_level->upright_arrow_cursor;
+		case UPLEFT_RESIZE:        return top_level->upleft_resize_cursor;
+		case UPRIGHT_RESIZE:       return top_level->upright_resize_cursor;
+		case DOWNLEFT_RESIZE:      return top_level->downleft_resize_cursor;
+		case DOWNRIGHT_RESIZE:     return top_level->downright_resize_cursor;
+		case HOURGLASS_CURSOR:     return top_level->hourglass_cursor;
+		case TRANSPARENT_CURSOR:   return top_level->transparent_cursor;
+		case GRABBED_CURSOR:       return top_level->grabbed_cursor;
 	}
 	return 0;
 }
@@ -3377,7 +3361,7 @@ int BC_WindowBase::grab_buttons()
 	XSync(top_level->display, False);
 	if( XGrabButton(top_level->display, AnyButton, AnyModifier,
 			top_level->rootwin, True, ButtonPressMask | ButtonReleaseMask,
-			GrabModeAsync, GrabModeSync, None, grabbed_cursor) == GrabSuccess ) {
+			GrabModeAsync, GrabModeSync, None, None) == GrabSuccess ) {
 		set_active_subwindow(this);
 		return 0;
 	}
@@ -3391,31 +3375,14 @@ void BC_WindowBase::ungrab_buttons()
 }
 void BC_WindowBase::grab_cursor()
 {
-	XDefineCursor(top_level->display, top_level->rootwin, grabbed_cursor);
+	Cursor cursor_grab = get_cursor_struct(GRABBED_CURSOR);
+	XGrabPointer(top_level->display, top_level->rootwin, True,
+		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
+		GrabModeAsync, GrabModeAsync, None, cursor_grab, CurrentTime);
 }
 void BC_WindowBase::ungrab_cursor()
 {
-	XUndefineCursor(top_level->display, top_level->rootwin);
-}
-
-int BC_WindowBase::get_w()
-{
-	return w;
-}
-
-int BC_WindowBase::get_h()
-{
-	return h;
-}
-
-int BC_WindowBase::get_x()
-{
-	return x;
-}
-
-int BC_WindowBase::get_y()
-{
-	return y;
+       XUngrabPointer(top_level->display, CurrentTime);
 }
 
 // for get_root_w/h