X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctextbox.C;h=5c79fdc665ed889d6a2989cf206d19aac39bb033;hb=79ab99f7d6cc503f9d8a9a9618129c9e4d3842c1;hp=0bcf9f464440069c1b517eac99987d0064a6fd61;hpb=b0adaf11e855fd84af935d879848467a957d6c67;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C
index 0bcf9f46..5c79fdc6 100644
--- a/cinelerra-5.1/guicast/bctextbox.C
+++ b/cinelerra-5.1/guicast/bctextbox.C
@@ -1975,15 +1975,15 @@ int BC_TextBox::get_cursor_letter(int cursor_x, int cursor_y)
 			first_visible_row = 1;
 			got_visible_row = 1;
 		}
-		
-		if( (k+text_height >= get_h() - bottom_margin || 
-			(row_end >= wtext_len && k < get_h() - bottom_margin && 
+
+		if( (k+text_height >= get_h() - bottom_margin ||
+			(row_end >= wtext_len && k < get_h() - bottom_margin &&
 				k + text_height > 0)) )
 			last_visible_row = 1;
 
 // Cursor is inside vertical range of row
-		if((cursor_y >= top_margin && 
-			cursor_y < get_h() - bottom_margin && 
+		if((cursor_y >= top_margin &&
+			cursor_y < get_h() - bottom_margin &&
 			cursor_y >= k && cursor_y < k + text_height) ||
 // Cursor is above 1st row
 			(cursor_y < k + text_height && first_visible_row) ||
@@ -1996,7 +1996,7 @@ int BC_TextBox::get_cursor_letter(int cursor_x, int cursor_y)
 				if((column2 + column1) / 2 >= cursor_x) {
 					result = j - 1;
 					done = 1;
-// printf("BC_TextBox::get_cursor_letter %d %d %d %d\n", 
+// printf("BC_TextBox::get_cursor_letter %d %d %d %d\n",
 // __LINE__, result, first_visible_row, last_visible_row);
 				}
 				column1 = column2;
@@ -2020,7 +2020,7 @@ int BC_TextBox::get_cursor_letter(int cursor_x, int cursor_y)
 	}
 
 
-// printf("BC_TextBox::get_cursor_letter %d cursor_y=%d k=%d h=%d %d %d\n", 
+// printf("BC_TextBox::get_cursor_letter %d cursor_y=%d k=%d h=%d %d %d\n",
 //  __LINE__, cursor_y, k, get_h(), first_visible_row, last_visible_row);
 	if(result < 0) result = 0;
 	if(result > wtext_len) {
@@ -2065,7 +2065,7 @@ int BC_TextBox::get_cursor_letter2(int cursor_x, int cursor_y)
 			}
 		}
 		if(wtext[i] == '\n') i++;
-		
+
 		if(i >= wtext_len && !done) {
 			result = wtext_len;
 		}
@@ -2079,50 +2079,29 @@ 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( letter2 < wtext_len && wtext[letter2] == ' ') 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( 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;
+	for( int i=letter1; i>=0 && iswalnum(wtext[i]); --i ) letter1 = i;
+	for( int i=letter2; i<wtext_len && iswalnum(wtext[i]); ) letter2 = ++i;
+	if( letter2 < wtext_len && wtext[letter2] == ' ' ) ++letter2;
 }
 
+
 void BC_TextBox::select_line(int &letter1, int &letter2, int ibeam_letter)
 {
 	int wtext_len = wtext_update();
-	if(!wtext_len) return;
-
 	letter1 = letter2 = ibeam_letter;
-
-// Rewind to previous linefeed
-	do {
-		if( wtext[letter1] != '\n' ) letter1--;
-	} while( letter1 > 0 && wtext[letter1] != '\n' );
-	if( wtext[letter1] == '\n' ) letter1++;
-
-// Advance to next linefeed
-	do {
-		if( wtext[letter2] != '\n' ) letter2++;
-	} while( letter2 < wtext_len && wtext[letter2] != '\n' );
-	if( letter2 < wtext_len && wtext[letter2] == '\n') 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( 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;
+	for( int i=letter1; i>=0 && wtext[i]!='\n'; --i ) letter1 = i;
+	for( int i=letter2; i<wtext_len && wtext[i]!='\n'; ) letter2 = ++i;
 }
 
 void BC_TextBox::copy_selection(int clipboard_num)
@@ -2134,9 +2113,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);
 }
 
@@ -2146,11 +2125,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);
 	}
 }
@@ -2268,8 +2247,8 @@ int BC_TextBoxSuggestions::handle_event()
 
 
 //printf("BC_TextBoxSuggestions::handle_event %d\n", __LINE__);
-	text_box->highlight_letter1 = 
-		text_box->highlight_letter2 = 
+	text_box->highlight_letter1 =
+		text_box->highlight_letter2 =
 		text_box->ibeam_letter = text_box->tstrlen();
 	text_box->wtext_update();
 	text_box->draw(1);
@@ -2434,6 +2413,11 @@ void BC_ScrollTextBox::wset_selection(int char1, int char2, int ibeam)
 	this->text->wset_selection(char1, char2, ibeam);
 }
 
+int BC_ScrollTextBox::get_ibeam_letter()
+{
+	return this->text->get_ibeam_letter();
+}
+