X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctextbox.C;h=d377a448a0039398ee493a8ce2ced415b8bf05b3;hp=e8cb09ced1fc35afb853cea90382e99766229cd8;hb=b78e8ac7987fbf35a4ba60534c4a3d2b290562b9;hpb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e

diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C
index e8cb09ce..d377a448 100644
--- a/cinelerra-5.1/guicast/bctextbox.C
+++ b/cinelerra-5.1/guicast/bctextbox.C
@@ -133,7 +133,6 @@ BC_TextBox::~BC_TextBox()
 	delete suggestions_popup;
 	suggestions->remove_all_objects();
 	delete suggestions;
-	delete [] positions;
 	delete [] wtext;
 	if( size > 0 )
 		delete [] text;
@@ -171,11 +170,10 @@ int BC_TextBox::reset_parameters(int rows, int has_border, int font, int size)
 	wtext = 0;
 	wsize = 0;
 	wlen = 0;
-	positions = 0;
-	plen = 0;
 	keypress_draw = 1;
 	last_keypress = 0;
 	separators = 0;
+	xscroll = 0;
 	yscroll = 0;
 	dirty = 1;
 	return 0;
@@ -226,12 +224,6 @@ int BC_TextBox::wtext_update()
 			wchar_t *ntext = new wchar_t[nsize+1];
 			memcpy(ntext, wtext, wsize*sizeof(wtext[0]));
 			delete [] wtext;  wtext = ntext;  wsize = nsize;
-			int *npositions = new int[nsize+1];
-			if( plen > 0 )
-				memcpy(npositions, positions, (plen+1)*sizeof(positions[0]));
-			else
-				npositions[0] = 0;
-			delete [] positions;  positions = npositions;  plen = nsize;
 		}
 		wlen = BC_Resources::encode(src_enc, dst_enc, text, strlen(text),
 			(char*)wtext, wsize*sizeof(wchar_t)) / sizeof(wchar_t);
@@ -406,7 +398,6 @@ void BC_TextBox::set_suggestions(ArrayList<char*> *suggestions, int column)
 			if( col < 0 ) col = 0;
 			char *cur = current_suggestion + col;
 			tstrcat(cur);
-			draw(0);  // update positions
 			highlight_letter2 = wtext_update();
 //printf("BC_TextBox::set_suggestions %d %d\n", __LINE__, suggestion_column);
 
@@ -513,10 +504,11 @@ void BC_TextBox::enable()
 	}
 }
 
-int BC_TextBox::get_enabled()
-{
-	return enabled;
-}
+int BC_TextBox::get_enabled() { return enabled; }
+int BC_TextBox::get_text_x() { return text_x; }
+int BC_TextBox::get_text_y() { return text_y; }
+void BC_TextBox::set_text_x(int v) { text_x = v; }
+void BC_TextBox::set_text_y(int v) { text_y = v; }
 
 int BC_TextBox::pixels_to_rows(BC_WindowBase *window, int font, int pixels)
 {
@@ -687,13 +679,13 @@ void BC_TextBox::draw(int flush)
 				set_color(color);
 				if(highlight_letter1 >= row_begin &&
 					highlight_letter1 <= row_end)
-					highlight_x1 = positions[highlight_letter1];
+					highlight_x1 = get_x_position(highlight_letter1, row_begin);
 				else
 					highlight_x1 = 0;
 
 				if(highlight_letter2 > row_begin &&
 					highlight_letter2 <= row_end)
-					highlight_x2 = positions[highlight_letter2];
+					highlight_x2 = get_x_position(highlight_letter2, row_begin);
 				else
 					highlight_x2 = get_w();
 
@@ -705,17 +697,14 @@ void BC_TextBox::draw(int flush)
 			int len = row_end - row_begin;
 			if( len > 0 ) {
 				set_color(enabled ? resources->text_default : DMGREY);
-				draw_wtext(text_x, k + text_ascent, wtext_row, len,
-					0, &positions[wtext_row - wtext]);
+				draw_single_text(1, font, text_x, k + text_ascent, wtext_row, len);
 			}
-			else
-				positions[wtext_row - wtext] = 0;
 
 // Get ibeam location
 			if(ibeam_letter >= row_begin && ibeam_letter <= row_end) {
 				need_ibeam = 0;
 				ibeam_y = k - text_y;
-				ibeam_x = positions[ibeam_letter];
+				ibeam_x = get_x_position(ibeam_letter, row_begin);
 			}
 		}
 	}
@@ -753,7 +742,6 @@ int BC_TextBox::cursor_enter_event()
 	if( top_level->event_win == win && enabled &&
 	    !(top_level->get_resources()->textbox_focus_policy & CLICK_ACTIVATE) )
 	{
-		tooltip_done = 0;
 		if( !active ) {
 			top_level->deactivate();
 			activate();
@@ -777,7 +765,7 @@ int BC_TextBox::cursor_leave_event()
 		draw_border();
 		flash(1);
 	}
-	if( !suggestions_popup &&
+	if( !suggestions_popup && !get_button_down() &&
 	    !(top_level->get_resources()->textbox_focus_policy & CLICK_DEACTIVATE) )
 		deactivate();
 	return 0;
@@ -1014,7 +1002,6 @@ int BC_TextBox::repeat_event(int64_t duration)
 		tooltip_text && tooltip_text[0] != 0 && highlighted)
 	{
 		show_tooltip();
-		tooltip_done = 1;
 		result = 1;
 	}
 
@@ -1769,6 +1756,11 @@ void BC_TextBox::do_separators(int ibeam_left)
 	}
 }
 
+int BC_TextBox::get_x_position(int i, int start)
+{
+	return get_text_width(font, &wtext[start], i - start);
+}
+
 void BC_TextBox::get_ibeam_position(int &x, int &y)
 {
 	int i, row_begin, row_end;
@@ -1781,7 +1773,7 @@ void BC_TextBox::get_ibeam_position(int &x, int &y)
 		row_end = i;
 
 		if( ibeam_letter >= row_begin && ibeam_letter <= row_end ) {
-			x = get_text_width(font,  &wtext[row_begin], ibeam_letter - row_begin);
+			x = get_x_position(ibeam_letter, row_begin);
 //printf("BC_TextBox::get_ibeam_position %d %d %d %d %d\n", ibeam_letter, row_begin, row_end, x, y);
 			return;
 		}
@@ -2126,6 +2118,7 @@ BC_ScrollTextBox::BC_ScrollTextBox(BC_WindowBase *parent_window,
 	this->y = y;
 	this->w = w;
 	this->rows = rows;
+	xscroll = 0;  yscroll = 0;
 	this->default_text = default_text;
 	this->default_wtext = 0;
 	this->default_size = default_size;
@@ -2140,6 +2133,7 @@ BC_ScrollTextBox::BC_ScrollTextBox(BC_WindowBase *parent_window,
 	this->y = y;
 	this->w = w;
 	this->rows = rows;
+	xscroll = 0;  yscroll = 0;
 	this->default_text = 0;
 	this->default_wtext = default_wtext;
 	this->default_size = default_size;
@@ -2147,6 +2141,7 @@ BC_ScrollTextBox::BC_ScrollTextBox(BC_WindowBase *parent_window,
 
 BC_ScrollTextBox::~BC_ScrollTextBox()
 {
+	delete xscroll;
 	delete yscroll;
 	if(text) {
 		text->gui = 0;
@@ -2160,57 +2155,32 @@ void BC_ScrollTextBox::create_objects()
 	parent_window->add_subwindow(text = default_wtext ?
  		new BC_ScrollTextBoxText(this, default_wtext) :
 		new BC_ScrollTextBoxText(this, default_text));
-	parent_window->add_subwindow(yscroll = new BC_ScrollTextBoxYScroll(this));
-	text->yscroll = yscroll;
-	yscroll->bound_to = text;
 	set_text_row(0);
 }
 
-int BC_ScrollTextBox::handle_event() { return 1; }
-int BC_ScrollTextBox::button_press_event() { return text->BC_TextBox::button_press_event(); }
-int BC_ScrollTextBox::button_release_event() { return text->BC_TextBox::button_release_event(); }
-int BC_ScrollTextBox::get_buttonpress() { return text->BC_TextBox::get_buttonpress(); };
-int BC_ScrollTextBox::get_x() { return x; }
-int BC_ScrollTextBox::get_y() { return y; }
-int BC_ScrollTextBox::get_w() { return w; }
-int BC_ScrollTextBox::get_h() { return text->get_h(); }
-int BC_ScrollTextBox::get_rows() { return rows; }
-
-const char* BC_ScrollTextBox::get_text() { return text->get_text(); }
-const wchar_t* BC_ScrollTextBox::get_wtext() { return text->get_wtext(); }
-
 void BC_ScrollTextBox::set_text(char *text, int isz)
 {
 	this->text->set_text(text, isz);
-	yscroll->update_length(this->text->get_text_rows(),
-		this->text->get_text_row(),
-		yscroll->get_handlelength(),
-		1);
+	update_scrollbars();
 }
 
 int BC_ScrollTextBox::set_text_row(int n)
 {
 	text->set_text_row(n);
-	yscroll->update_value(n);
+	update_scrollbars();
 	return 1;
 }
 
 void BC_ScrollTextBox::update(const char *text)
 {
 	this->text->update(text);
-	yscroll->update_length(this->text->get_text_rows(),
-		this->text->get_text_row(),
-		yscroll->get_handlelength(),
-		1);
+	update_scrollbars();
 }
 
 void BC_ScrollTextBox::update(const wchar_t *wtext)
 {
 	this->text->update(wtext);
-	yscroll->update_length(this->text->get_text_rows(),
-		this->text->get_text_row(),
-		yscroll->get_handlelength(),
-		1);
+	update_scrollbars();
 }
 
 void BC_ScrollTextBox::reposition_window(int x, int y, int w, int rows)
@@ -2219,41 +2189,47 @@ void BC_ScrollTextBox::reposition_window(int x, int y, int w, int rows)
 	this->y = y;
 	this->w = w;
 	this->rows = rows;
-
-	text->reposition_window(x,
-		y,
-		w - yscroll->get_span(),
-		rows);
-	yscroll->reposition_window(x + w - yscroll->get_span(),
-		y,
-		BC_TextBox::calculate_row_h(rows,
-			parent_window));
-	yscroll->update_length(text->get_text_rows(),
-		text->get_text_row(),
-		rows,
-		0);
+	update_scrollbars();
 }
 
-void BC_ScrollTextBox::set_selection(int char1, int char2, int ibeam)
+int BC_ScrollTextBox::button_press_event()
 {
-	this->text->set_selection(char1, char2, ibeam);
+	return text->BC_TextBox::button_press_event();
 }
+int BC_ScrollTextBox::button_release_event()
+{
+	return text->BC_TextBox::button_release_event();
+}
+
+int BC_ScrollTextBox::get_h() { return text->get_h(); }
+const char *BC_ScrollTextBox::get_text() { return text->get_text(); }
+const wchar_t *BC_ScrollTextBox::get_wtext() { return text->get_wtext(); }
 
+int BC_ScrollTextBox::get_buttonpress()
+{
+	return text->BC_TextBox::get_buttonpress();
+}
 void BC_ScrollTextBox::wset_selection(int char1, int char2, int ibeam)
 {
-	this->text->wset_selection(char1, char2, ibeam);
+	text->wset_selection(char1, char2, ibeam);
+}
+void BC_ScrollTextBox::set_selection(int char1, int char2, int ibeam)
+{
+	text->set_selection(char1, char2, ibeam);
 }
-
 int BC_ScrollTextBox::get_ibeam_letter()
 {
-	return this->text->get_ibeam_letter();
+	return text->get_ibeam_letter();
+}
+int BC_ScrollTextBox::get_x_pos()
+{
+	return text->left_margin - text->get_text_x();
+}
+void BC_ScrollTextBox::set_x_pos(int x)
+{
+	text->set_text_x(text->left_margin - x);
+	text->draw(1);
 }
-
-
-
-
-
-
 
 BC_ScrollTextBoxText::BC_ScrollTextBoxText(BC_ScrollTextBox *gui, const char *text)
  : BC_TextBox(gui->x, gui->y,
@@ -2280,35 +2256,111 @@ BC_ScrollTextBoxText::~BC_ScrollTextBoxText()
 	}
 }
 
+void BC_ScrollTextBox::update_scrollbars()
+{
+	int view_w = w, view_rows = rows;
+	int view_h = BC_TextBox::calculate_row_h(view_rows, parent_window);
+	int text_rows = text->get_text_rows();
+	int text_width = parent_window->get_text_width(text->font, text->get_wtext());
+	BC_Resources *resources = parent_window->get_resources();
+	int need_xscroll = 0, need_yscroll = 0;
+
+// Create scrollbars as needed
+	int resize = 1;
+	while( resize ) {
+		resize = 0;
+		if( !need_xscroll && (text->get_text_x() != text->left_margin ||
+		      text_width >= view_w - text->left_margin - text->right_margin) ) {
+			resize = need_xscroll = 1;
+			view_h -= resources->hscroll_data[SCROLL_HANDLE_UP]->get_h();
+			view_rows = BC_TextBox::pixels_to_rows(parent_window, text->font, view_h);
+		}
+		if( !need_yscroll && (text->get_text_y() != text->top_margin ||
+		      text_rows > view_rows) ) {
+			resize = need_yscroll = 1;
+			view_w -= resources->vscroll_data[SCROLL_HANDLE_UP]->get_w();
+		}
+	}
+
+	if( !need_xscroll && xscroll ) {
+		text->yscroll = 0;
+		delete xscroll;  xscroll = 0;
+	}
+	if( !need_yscroll && yscroll ) {
+		text->yscroll = 0;
+		delete yscroll;  yscroll = 0;
+	}
+
+	if( view_rows != text->get_rows() || view_w != text->get_w() ) {
+		text->reposition_window(x, y, view_w, view_rows);
+	}
+	if( need_xscroll && !xscroll ) {
+		xscroll = new BC_ScrollTextBoxXScroll(this);
+		parent_window->add_subwindow(xscroll);
+		text->xscroll = xscroll;
+		xscroll->bound_to = text;
+		xscroll->show_window();
+	}
+	if( need_yscroll && !yscroll ) {
+		yscroll = new BC_ScrollTextBoxYScroll(this);
+		parent_window->add_subwindow(yscroll);
+		text->yscroll = yscroll;
+		yscroll->bound_to = text;
+		yscroll->show_window();
+	}
+	if( xscroll ) {
+		xscroll->reposition_window(x, y + text->get_h(), view_w);
+		int xpos = get_x_pos();
+		if( xpos != xscroll->get_value() )
+			xscroll->update_value(xpos);
+		if( text_width != xscroll->get_length() ||
+		    view_w != xscroll->get_handlelength() )
+			xscroll->update_length(text_width, xpos, view_w, 0);
+	}
+	if( yscroll ) {
+		yscroll->reposition_window(x + w - yscroll->get_span(), y, text->get_h());
+		int text_row = text->get_text_row();
+		if( text_row != yscroll->get_value() )
+			yscroll->update_value(text_row);
+		if( text_rows != yscroll->get_length() ||
+		    view_rows != yscroll->get_handlelength() )
+			yscroll->update_length(text_rows, text_row, view_rows, 0);
+	}
+}
+
 int BC_ScrollTextBoxText::handle_event()
 {
-	gui->yscroll->update_length(get_text_rows(),
-		get_text_row(),
-		gui->yscroll->get_handlelength(),
-		1);
+	gui->update_scrollbars();
 	return gui->handle_event();
 }
 
 int BC_ScrollTextBoxText::motion_event()
 {
-	gui->yscroll->update_length(get_text_rows(),
-		get_text_row(),
-		gui->yscroll->get_handlelength(),
-		1);
+	gui->update_scrollbars();
+	return 1;
+}
+
+BC_ScrollTextBoxXScroll::BC_ScrollTextBoxXScroll(BC_ScrollTextBox *gui)
+ : BC_ScrollBar(gui->x, gui->y + gui->text->get_h(), SCROLL_HORIZ + SCROLL_STRETCH,
+	gui->text->get_w(), gui->text->get_text_width(MEDIUMFONT, gui->get_wtext()),
+	0, gui->w)
+{
+	this->gui = gui;
+}
+
+BC_ScrollTextBoxXScroll::~BC_ScrollTextBoxXScroll()
+{
+}
+
+int BC_ScrollTextBoxXScroll::handle_event()
+{
+	gui->set_x_pos(get_position());
 	return 1;
 }
 
 BC_ScrollTextBoxYScroll::BC_ScrollTextBoxYScroll(BC_ScrollTextBox *gui)
- : BC_ScrollBar(gui->x +
- 			gui->w -
-			get_resources()->vscroll_data[SCROLL_HANDLE_UP]->get_w(),
-		gui->y,
-		SCROLL_VERT,
-		BC_TextBox::calculate_row_h(gui->rows,
-			gui->parent_window),
-		gui->text->get_text_rows(),
-		0,
-		gui->rows)
+ : BC_ScrollBar(gui->x + gui->text->get_w(), gui->y, SCROLL_VERT,
+	gui->text->get_h(), gui->text->get_text_rows(), 0, gui->rows)
 {
 	this->gui = gui;
 }
@@ -2325,13 +2377,6 @@ int BC_ScrollTextBoxYScroll::handle_event()
 
 
 
-
-
-
-
-
-
-
 BC_PopupTextBoxText::BC_PopupTextBoxText(BC_PopupTextBox *popup, int x, int y, const char *text)
  : BC_TextBox(x, y, popup->text_w, 1, text, BCTEXTLEN)
 {
@@ -2373,6 +2418,7 @@ int BC_PopupTextBoxList::handle_event()
 	if(item)
 	{
 		popup->textbox->update(item->get_text());
+		popup->textbox->set_text_row(0);
 		popup->handle_event();
 	}
 	return 1;
@@ -2421,14 +2467,12 @@ int BC_PopupTextBox::create_objects()
 void BC_PopupTextBox::update(const char *text)
 {
 	textbox->update(text);
+	textbox->set_text_row(0);
 }
 
 void BC_PopupTextBox::update_list(ArrayList<BC_ListBoxItem*> *data)
 {
-	listbox->update(data,
-		0,
-		0,
-		1);
+	listbox->update(data, 0, 0, 1);
 }
 
 
@@ -2467,6 +2511,16 @@ int BC_PopupTextBox::get_h()
 	return textbox->get_h();
 }
 
+int BC_PopupTextBox::get_show_query()
+{
+	return listbox->get_show_query();
+}
+
+void BC_PopupTextBox::set_show_query(int v)
+{
+	listbox->set_show_query(v);
+}
+
 int BC_PopupTextBox::handle_event()
 {
 	return 1;
@@ -2507,8 +2561,8 @@ BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
 }
 
 BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
-	float default_value, int x, int y)
- : BC_TextBox(x, y, popup->text_w, 1, default_value)
+	float default_value, int x, int y, int precision)
+ : BC_TextBox(x, y, popup->text_w, 1, default_value, 1, MEDIUMFONT, precision)
 {
 	this->popup = popup;
 }
@@ -2533,19 +2587,10 @@ int BC_TumbleTextBoxText::handle_event()
 
 int BC_TumbleTextBoxText::button_press_event()
 {
-	if(is_event_win())
-	{
-		if(get_buttonpress() < 4) return BC_TextBox::button_press_event();
-
-		if(get_buttonpress() == 4)
-		{
-			popup->tumbler->handle_up_event();
-		}
-		else
-		if(get_buttonpress() == 5)
-		{
-			popup->tumbler->handle_down_event();
-		}
+	if( get_enabled() && is_event_win() ) {
+		if( get_buttonpress() < 4 ) return BC_TextBox::button_press_event();
+		if( get_buttonpress() == 4 )      popup->tumbler->handle_up_event();
+		else if( get_buttonpress() == 5 ) popup->tumbler->handle_down_event();
 		return 1;
 	}
 	return 0;
@@ -2660,31 +2705,17 @@ int BC_TumbleTextBox::create_objects()
 {
 	int x = this->x, y = this->y;
 
-	if(use_float)
-	{
-		parent_window->add_subwindow(textbox = new BC_TumbleTextBoxText(this,
-			default_value_f, x, y));
-		textbox->set_precision(precision);
-	}
-	else
-		parent_window->add_subwindow(textbox = new BC_TumbleTextBoxText(this,
-			default_value, x, y));
+	textbox = use_float ?
+		new BC_TumbleTextBoxText(this, default_value_f, x, y, precision) :
+		new BC_TumbleTextBoxText(this, default_value, x, y);
 
+	parent_window->add_subwindow(textbox);
 	x += textbox->get_w();
 
-	if(use_float)
-		parent_window->add_subwindow(tumbler = new BC_FTumbler(textbox,
- 			min_f,
-			max_f,
-			x,
-			y));
-	else
-		parent_window->add_subwindow(tumbler = new BC_ITumbler(textbox,
- 			min,
-			max,
-			x,
-			y));
-
+	tumbler = use_float ?
+		(BC_Tumbler *)new BC_FTumbler(textbox, min_f, max_f, x, y) :
+		(BC_Tumbler *)new BC_ITumbler(textbox, min, max, x, y);
+	parent_window->add_subwindow(tumbler);
 	tumbler->set_increment(increment);
 	return 0;
 }
@@ -2707,18 +2738,21 @@ BC_TextBox* BC_TumbleTextBox::get_textbox()
 int BC_TumbleTextBox::update(const char *value)
 {
 	textbox->update(value);
+	textbox->set_text_row(0);
 	return 0;
 }
 
 int BC_TumbleTextBox::update(int64_t value)
 {
 	textbox->update(value);
+	textbox->set_text_row(0);
 	return 0;
 }
 
 int BC_TumbleTextBox::update(float value)
 {
 	textbox->update(value);
+	textbox->set_text_row(0);
 	return 0;
 }
 
@@ -2797,3 +2831,9 @@ void BC_TumbleTextBox::set_boundaries(float min, float max)
 {
 	tumbler->set_boundaries(min, max);
 }
+
+void BC_TumbleTextBox::set_tooltip(const char *text)
+{
+	textbox->set_tooltip(text);
+}
+