X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.C;h=74a4aadf883bf968396c6ec6c8620137612dbbbf;hp=a38da02a2b41b7faccc49040b9f7423b574002f2;hb=58d99c74e65066486dbebf7e1cb3087e7de1c92b;hpb=efa5246e9610548448a6e4d505fdc6bdb5da84eb

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C
index a38da02a..74a4aadf 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.C
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.C
@@ -101,6 +101,8 @@ TitleWindow::TitleWindow(TitleMain *client)
 	fade_out = 0;
 	text_title = 0;
 	text = 0;
+	text_chars = 0;
+	text_bfrsz = 0;
 	justify_title = 0;
 	left = 0;  center = 0;  right = 0;
 	top = 0;   mid = 0;     bottom = 0;
@@ -383,6 +385,12 @@ void TitleWindow::create_objects()
 
 	x = 10;
 	add_tool(text_title = new BC_Title(x, y, _("Text:")));
+	x += text_title->get_w() + 20;
+	int wid = BC_Title::calculate_w(this,"0")*10;
+	add_tool(text_chars = new TitleTextChars(x,y,wid));
+	x += text_chars->get_w() + 20;
+	add_tool(text_bfrsz = new TitleTextBfrSz(x,y,wid));
+
 	y += text_title->get_h() + margin;
 	x = margin;
 	text = new TitleText(client, this, x, y, get_w()-margin - x, get_h() - y - 10);
@@ -670,6 +678,14 @@ void TitleWindow::update_justification()
 	bottom->update(client->config.vjustification == JUSTIFY_BOTTOM);
 }
 
+void TitleWindow::update_stats()
+{
+	text_chars->update(client->config.wlen);
+	int len = MESSAGESIZE - BCTEXTLEN - strlen(text->get_text()) - 1;
+	if( len < 0 ) len = 0;
+	text_bfrsz->update(len);
+}
+
 void TitleWindow::update()
 {
 	title_x->update((int64_t)client->config.title_x);
@@ -707,6 +723,7 @@ void TitleWindow::update()
 		}
 	}
 	update_justification();
+	update_stats();
 	update_color();
 }
 
@@ -1047,13 +1064,53 @@ int TitleText::button_press_event()
 int TitleText::handle_event()
 {
 	window->fonts_popup->deactivate();
+	int text_len = strlen(get_text());
+	int avail = MESSAGESIZE - BCTEXTLEN;
+	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;
+		update(text);
+	}
 	int len =  sizeof(client->config.wtext) / sizeof(wchar_t);
 	wcsncpy(client->config.wtext, get_wtext(), len);
 	client->config.wtext[len-1] = 0;
 	client->config.wlen = wcslen(client->config.wtext);
+	window->update_stats();
 	client->send_configure_change();
 	return 1;
 }
+TitleTextChars::TitleTextChars(int x, int y, int w)
+ : BC_Title(x, y, "", MEDIUMFONT, -1, 0, w)
+{
+}
+TitleTextChars::~TitleTextChars()
+{
+}
+int TitleTextChars::update(int n)
+{
+	char text[BCSTRLEN];
+	sprintf(text, _("chars: %d  "),n);
+	return BC_Title::update(text, 0);
+}
+
+TitleTextBfrSz::TitleTextBfrSz(int x, int y, int w)
+ : BC_Title(x, y, "", MEDIUMFONT, -1, 0, w)
+{
+}
+TitleTextBfrSz::~TitleTextBfrSz()
+{
+}
+int TitleTextBfrSz::update(int n)
+{
+	char text[BCSTRLEN];
+	sprintf(text, _("bfrsz: %d  "),n);
+	return BC_Title::update(text, 0);
+}
 
 
 TitleDropShadow::TitleDropShadow(TitleMain *client, TitleWindow *window, int x, int y)
@@ -1268,7 +1325,7 @@ int TitleBottom::handle_event()
 
 
 TitleColorThread::TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline)
- : ColorThread(1, is_outline? _("Outline Color") : _("Text Color"))
+ : ColorPicker(1, is_outline? _("Outline Color") : _("Text Color"))
 {
 	this->client = client;
 	this->window = window;
@@ -1366,7 +1423,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);
@@ -1385,7 +1442,7 @@ void TitleCurPopup::create_objects()
 	sub_menu->add_subitem("/%s",item);
 	add_item(cur_item = new TitleCurItem(this, item = KW_COLOR));
 	cur_item->add_submenu(sub_menu = new TitleCurSubMenu(cur_item));
-	sub_menu->add_subitem(POPUP_COLOR,"%s #",item);
+	sub_menu->add_subitem(POPUP_COLOR,"%s %s",item,_("#"));
 	sub_menu->add_subitem("%s ",item);
 	sub_menu->add_subitem("/%s",item);
 	add_item(cur_item = new TitleCurItem(this, item = KW_ALPHA));
@@ -1542,7 +1599,7 @@ int TitleFontsPopup::handle_event()
 }
 
 TitleColorPopup::TitleColorPopup(TitleMain *client, TitleWindow *window)
- : ColorThread(0, _("Color"))
+ : ColorPicker(0, _("Color"))
 {
 	this->client = client;
 	this->window = window;