X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fbctextbox.C;h=cecd249294da015d75bae7a3209d6ca782fc629a;hb=318256a48938064b695268d03396977739ef4724;hp=7a06046cff6c634ee988908d87ac032e8e5736f3;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C
index 7a06046c..cecd2492 100644
--- a/cinelerra-5.1/guicast/bctextbox.C
+++ b/cinelerra-5.1/guicast/bctextbox.C
@@ -475,7 +475,7 @@ void BC_TextBox::set_suggestions(ArrayList<char*> *suggestions, int column)
 	}
 }
 
-void BC_TextBox::set_selection(int char1, int char2, int ibeam)
+void BC_TextBox::wset_selection(int char1, int char2, int ibeam)
 {
 	highlight_letter1 = char1;
 	highlight_letter2 = char2;
@@ -483,6 +483,29 @@ void BC_TextBox::set_selection(int char1, int char2, int ibeam)
 	draw(1);
 }
 
+// count utf8 chars in text which occur before cp
+int BC_TextBox::wcpos(const char *text, const char *cp)
+{
+	int len = 0;
+	const unsigned char *bp = (const unsigned char *)text;
+	const unsigned char *ep = (const unsigned char *)cp;
+	while( bp < ep && *bp != 0 ) {
+		++len;
+		int ch = *bp++;
+		if( ch < 0x80 ) continue;
+		int i = ch - 0x0c0;
+		int n = i<0? 0 : i<32? 1 : i<48? 2 : i<56? 3 : i<60? 4 : 5;
+		for( i=n; bp < ep && --i>=0 && (*bp&0xc0) == 0x80; ++bp );
+	}
+	return len;
+}
+
+void BC_TextBox::set_selection(int char1, int char2, int ibeam)
+{
+	const char *cp = get_text();
+	wset_selection(wcpos(cp, cp+char1), wcpos(cp, cp+char2), wcpos(cp, cp+ibeam));
+}
+
 int BC_TextBox::update(const char *text)
 {
 //printf("BC_TextBox::update 1 %d %s %s\n", tstrcmp(text), text, this->text);
@@ -2056,27 +2079,21 @@ int BC_TextBox::get_cursor_letter2(int cursor_x, int cursor_y)
 void BC_TextBox::select_word(int &letter1, int &letter2, int ibeam_letter)
 {
 	int wtext_len = wtext_update();
-	if(!wtext_len) return;
-
 	letter1 = letter2 = ibeam_letter;
-	do {
-		if(iswalnum(wtext[letter1])) letter1--;
-	} while(letter1 > 0 && iswalnum(wtext[letter1]));
-
-	if( !iswalnum(wtext[letter1]) ) letter1++;
-
-	do {
-		if( iswalnum(wtext[letter2]) ) letter2++;
-	} while( letter2 < wtext_len && isalnum(wtext[letter2]) );
+	if( letter1 < 0 ) letter1 = 0;
+	if( letter2 < 0 ) letter2 = 0;
+	if( letter1 > wtext_len ) letter1 = wtext_len;
+	if( letter2 > wtext_len ) letter2 = wtext_len;
+	if( !wtext_len ) return;
 
-	if( letter2 < wtext_len && wtext[letter2] == ' ') letter2++;
+	while( letter1 > 0 && iswalnum(wtext[letter1]) ) --letter1;
+	if( letter1 < wtext_len && iswspace(wtext[letter1]) ) ++letter1;
 
-	if(letter1 < 0) letter1 = 0;
-	if(letter2 < 0) letter2 = 0;
-	if(letter1 > wtext_len) letter1 = wtext_len;
-	if(letter2 > wtext_len) letter2 = wtext_len;
+	while( letter2 < wtext_len && iswalnum(wtext[letter2]) ) ++letter2;
+	if( letter2 < wtext_len && wtext[letter2] == ' ' ) ++letter2;
 }
 
+
 void BC_TextBox::select_line(int &letter1, int &letter2, int ibeam_letter)
 {
 	int wtext_len = wtext_update();
@@ -2111,9 +2128,9 @@ void BC_TextBox::copy_selection(int clipboard_num)
 		highlight_letter1 < 0 || highlight_letter2 < 0 ||
 		highlight_letter2 - highlight_letter1 <= 0) return;
 	int clip_len = highlight_letter2 - highlight_letter1;
-	char ctext[clip_len+1];
 //printf(" BC_TextBox::copy_selection %d %d %d\n",highlight_letter1, highlight_letter2, clip_len);
-	text_update(&wtext[highlight_letter1],clip_len, ctext,clip_len+1);
+	char ctext[4*clip_len+4];
+	clip_len = text_update(&wtext[highlight_letter1],clip_len, ctext,4*clip_len+4);
 	get_clipboard()->to_clipboard(ctext, clip_len, clipboard_num);
 }
 
@@ -2123,11 +2140,11 @@ void BC_TextBox::paste_selection(int clipboard_num)
 	int len = get_clipboard()->clipboard_len(clipboard_num);
 	if( len > 0 )
 	{
-		char cstring[len];  wchar_t wstring[len];  --len;
-		get_clipboard()->from_clipboard(cstring, len, clipboard_num);
+		char cstring[len];  wchar_t wstring[len];
+		get_clipboard()->from_clipboard(cstring, len, clipboard_num);  --len;
 //printf("BC_TextBox::paste_selection %d '%*.*s'\n",len,len,len,cstring);
-		BC_Resources::encode(BC_Resources::encoding, BC_Resources::wide_encoding,
-			cstring,(len+1), (char *)wstring,(len+1)*sizeof(wchar_t));
+		len = BC_Resources::encode(BC_Resources::encoding, BC_Resources::wide_encoding,
+			cstring,len, (char *)wstring,(len+1)*sizeof(wchar_t)) / sizeof(wchar_t);
 		insert_text(wstring, len);
 	}
 }
@@ -2256,12 +2273,6 @@ int BC_TextBoxSuggestions::handle_event()
 }
 
 
-
-
-
-
-
-
 BC_ScrollTextBox::BC_ScrollTextBox(BC_WindowBase *parent_window,
 	int x, int y, int w, int rows,
 	const char *default_text, int default_size)
@@ -2412,6 +2423,11 @@ void BC_ScrollTextBox::set_selection(int char1, int char2, int ibeam)
 	this->text->set_selection(char1, char2, ibeam);
 }
 
+void BC_ScrollTextBox::wset_selection(int char1, int char2, int ibeam)
+{
+	this->text->wset_selection(char1, char2, ibeam);
+}
+