subtitle upgrades, textbox fixes/upgrades

diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C
index 57b75a9997f75bef65c48d605799486f064ed2a4..97b9144d716c462e5a60cafce00339fc7aa002a9 100644 (file)
--- a/cinelerra-5.1/cinelerra/swindow.C
+++ b/cinelerra-5.1/cinelerra/swindow.C
@@ -114,9 +114,14 @@ SWindowLoadFile::~SWindowLoadFile()
 
 int SWindowLoadFile::handle_event()
 {
-       sw_gui->load_path->set_suggestions(0,0);
-       sw_gui->load_script();
-       sw_gui->set_script_pos(0);
+       if( sw_gui->script_path[0] ) {
+               sw_gui->load_path->set_suggestions(0,0);
+               sw_gui->load_script();
+               sw_gui->set_script_pos(0);
+       }
+       else {
+               eprintf(_("script text file path required"));
+       }
        return 1;
 }
 
@@ -132,7 +137,12 @@ SWindowSaveFile::~SWindowSaveFile()
 
 int SWindowSaveFile::handle_event()
 {
-       sw_gui->save_spumux_data();
+       if( sw_gui->script_path[0] ) {
+               sw_gui->save_spumux_data();
+       }
+       else {
+               eprintf(_("script microdvd file path required"));
+       }
        return 1;
 }
 
@@ -183,11 +193,16 @@ void SWindowGUI::create_objects()
        x1 = x + pad;
        blank_line = new char[2];
        blank_line[0] = ' ';  blank_line[1] = 0;
-       int rows = (ok_y - y - 4*pad) / text_rowsz - 3;
-       int w1 = get_w()-x1-pad;
+       add_subwindow(script_title = new BC_Title(x1, y, _("Script Text:")));
+       y += script_title->get_h() + pad;
+       int rows = (ok_y - y - BC_Title::calculate_h(this,_("Line Text:")) -
+               4*pad) / text_rowsz - 3;
+       int w1 = get_w() - x1 - pad;
        script_entry = new ScriptEntry(this, x1, y, w1, rows, blank_line);
        script_entry->create_objects();
        y += script_entry->get_h() + pad;
+       add_subwindow(line_title = new BC_Title(x1, y, _("Line Text:")));
+       y += line_title->get_h() + pad;
        line_entry = new ScriptEntry(this, x1, y, w1, 3);
        line_entry->create_objects();
        ok = new SWindowOK(this, ok_x, ok_y);
@@ -315,10 +330,14 @@ int SWindowGUI::resize_event(int w, int h)
        int w1 = w - x1 - pad;
        script_scroll->reposition_window(x1, y, w1);
        y += hh + 2*pad;
+       script_title->reposition_window(x, y);
+       y += script_title->get_h() + pad;
        w1 = w - x - pad;
-       int rows = (ok_y - y - 4*pad) / text_rowsz - 3;
+       int rows = (ok_y - y - line_title->get_h() - 4*pad) / text_rowsz - 3;
        script_entry->reposition_window(x, y, w1, rows);
-       y += script_entry->get_h() + pad;
+       y += script_entry->get_h() + 2*pad;
+       line_title->reposition_window(x, y);
+       y += line_title->get_h() + pad;
        line_entry->reposition_window(x, y, w1, 3);
        return 0;
 }
@@ -728,11 +747,26 @@ ScriptEntry::~ScriptEntry()
 void ScriptEntry::set_text(char *text, int isz)
 {
        if( !text || !*text ) return;
-       if( isz < 0 ) isz = strlen(text);
+       if( isz < 0 ) isz = strlen(text)+1;
        BC_ScrollTextBox::set_text(text, isz);
        ttext = text;
 }
 
+int ScriptEntry::handle_event()
+{
+       if( sw_gui->get_button_down() &&
+           sw_gui->get_buttonpress() == 1 &&
+           sw_gui->get_triple_click() ) {
+               int ibeam = get_ibeam_letter(), row = 0;
+               const char *tp = ttext;
+               while( *tp && tp-ttext < ibeam ) {
+                       if( *tp++ == '\n' ) ++row;
+               }
+               int pos = sw_gui->script_entry_no;
+               sw_gui->load_selection(pos, row);
+       }
+       return 1;
+}
 
 int SWindowGUI::load_script_line(FILE *fp)
 {

diff --git a/cinelerra-5.1/cinelerra/swindow.h b/cinelerra-5.1/cinelerra/swindow.h
index 149f3c19623feecf61ab70dcd1a2f468baba1d77..8ba4e7447c51c88c95880ac56b269e4c77d9f644 100644 (file)
--- a/cinelerra-5.1/cinelerra/swindow.h
+++ b/cinelerra-5.1/cinelerra/swindow.h
@@ -133,6 +133,7 @@ public:
 
        char *ttext;
        void set_text(char *text, int isz=-1);
+       int handle_event();
 
        ScriptEntry(SWindowGUI *gui, int x, int y, int w, int rows, char *text);
        ScriptEntry(SWindowGUI *gui, int x, int y, int w, int rows);
@@ -193,6 +194,8 @@ public:
        BC_Title *script_lines;
        BC_Title *script_entries;
        BC_Title *script_texts;
+       BC_Title *script_title;
+       BC_Title *line_title;
        ScriptPrev *prev_script;
        ScriptNext *next_script;
        ScriptPaste *paste_script;

diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C
index cecd249294da015d75bae7a3209d6ca782fc629a..15ece1c5aef641ab0c92ce7cd9f160b1917dcedb 100644 (file)
--- a/cinelerra-5.1/guicast/bctextbox.C
+++ b/cinelerra-5.1/guicast/bctextbox.C
@@ -2085,11 +2085,8 @@ void BC_TextBox::select_word(int &letter1, int &letter2, int ibeam_letter)
        if( letter1 > wtext_len ) letter1 = wtext_len;
        if( letter2 > wtext_len ) letter2 = wtext_len;
        if( !wtext_len ) return;
-
-       while( letter1 > 0 && iswalnum(wtext[letter1]) ) --letter1;
-       if( letter1 < wtext_len && iswspace(wtext[letter1]) ) ++letter1;
-
-       while( letter2 < wtext_len && iswalnum(wtext[letter2]) ) ++letter2;
+       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;
 }
 
@@ -2097,26 +2094,14 @@ void BC_TextBox::select_word(int &letter1, int &letter2, int ibeam_letter)
 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)
@@ -2428,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();
+}
+
 
 
 

diff --git a/cinelerra-5.1/guicast/bctextbox.h b/cinelerra-5.1/guicast/bctextbox.h
index 8ad635bc517c03d7cd7733c479bdcf681b43d615..0f3f23ed75592c588485e1db03c6abf4f0802ca3 100644 (file)
--- a/cinelerra-5.1/guicast/bctextbox.h
+++ b/cinelerra-5.1/guicast/bctextbox.h
@@ -93,7 +93,6 @@ public:
        int deactivate();
        const char* get_text();
        const wchar_t* get_wtext();
-       const char* get_utf8text();
        void set_text(char *text, int isz);
        int get_text_rows();
 // Set top left of text view
@@ -102,9 +101,6 @@ public:
 
        int reposition_window(int x, int y, int w = -1, int rows = -1);
        int uses_text();
-#ifdef X_HAVE_UTF8_STRING
-       int utf8seek(int i, int reverse);
-#endif
        static int calculate_h(BC_WindowBase *gui, int font, int has_border, int rows);
        static int calculate_row_h(int rows, BC_WindowBase *parent_window, int has_border = 1, int font = MEDIUMFONT);
        static int pixels_to_rows(BC_WindowBase *window, int font, int pixels);
@@ -254,6 +250,7 @@ public:
        int get_h();
 // Visible rows for resizing
        int get_rows();
+       int get_ibeam_letter();
 
        friend class BC_ScrollTextBoxText;
        friend class BC_ScrollTextBoxYScroll;