X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctextbox.C;h=8de77f4f01d755a50f6404d92b4c485ab526cf0f;hp=0bcf9f464440069c1b517eac99987d0064a6fd61;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=b0adaf11e855fd84af935d879848467a957d6c67 diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C index 0bcf9f46..8de77f4f 100644 --- a/cinelerra-5.1/guicast/bctextbox.C +++ b/cinelerra-5.1/guicast/bctextbox.C @@ -24,11 +24,12 @@ #include "bcsignals.h" #include "bctextbox.h" #include "clip.h" -#include "colors.h" +#include "bccolors.h" #include #include "cursors.h" #include "filesystem.h" #include "keys.h" +#include "language.h" #include #include "bctimer.h" #include "vframe.h" @@ -133,7 +134,7 @@ BC_TextBox::~BC_TextBox() delete suggestions_popup; suggestions->remove_all_objects(); delete suggestions; - delete [] positions; + delete menu; delete [] wtext; if( size > 0 ) delete [] text; @@ -161,22 +162,26 @@ int BC_TextBox::reset_parameters(int rows, int has_border, int font, int size) text_selected = 0; word_selected = 0; line_selected = 0; + unicode_active = -1; text_x = 0; enabled = 1; highlighted = 0; + back_color = -1; + high_color = -1; precision = 4; if (!skip_cursor) skip_cursor = new Timer; wtext = 0; wsize = 0; wlen = 0; - positions = 0; - plen = 0; keypress_draw = 1; last_keypress = 0; separators = 0; + xscroll = 0; yscroll = 0; + menu = 0; dirty = 1; + selection_active = 0; return 0; } @@ -188,8 +193,9 @@ int BC_TextBox::tstrlen() int BC_TextBox::tstrcmp(const char *cp) { - if( !tsize ) return strcmp(text, cp); - return strncmp(text, cp, tsize); + const char *tp = get_text(); + if( !tsize ) return strcmp(tp, cp); + return strncmp(tp, cp, tsize); } char *BC_TextBox::tstrcpy(const char *cp) @@ -225,12 +231,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); @@ -253,6 +253,7 @@ int BC_TextBox::text_update(const wchar_t *wcp, int wsz, char *tcp, int tsz) int BC_TextBox::initialize() { + if (!skip_cursor) skip_cursor = new Timer; skip_cursor->update(); @@ -282,18 +283,22 @@ int BC_TextBox::initialize() BC_Resources *resources = get_resources(); if(has_border) { - back_color = resources->text_background; - high_color = resources->text_background_hi; + if( back_color < 0 ) back_color = resources->text_background; + if( high_color < 0 ) high_color = resources->text_background_hi; } else { - high_color = resources->text_background_noborder_hi; - back_color = bg_color; + if( back_color < 0 ) back_color = bg_color; + if( high_color < 0 ) high_color = resources->text_background_noborder_hi; } draw(0); set_cursor(IBEAM_CURSOR, 0, 0); show_window(0); + + add_subwindow(menu = new BC_TextMenu(this)); + menu->create_objects(); + return 0; } @@ -313,147 +318,95 @@ void BC_TextBox::set_precision(int precision) } // Compute suggestions for a path -int BC_TextBox::calculate_suggestions(ArrayList *entries) +int BC_TextBox::calculate_suggestions(ArrayList *entries, const char *filter) { // Let user delete suggestion - if(get_last_keypress() != BACKSPACE) - { - + if(get_last_keypress() != BACKSPACE) { // Compute suggestions FileSystem fs; ArrayList suggestions; const char *current_text = get_text(); - + int suggestion_column = 0; + char dirname[BCTEXTLEN]; dirname[0] = 0; + if( current_text[0] == '/' || current_text[0] == '~' ) + strncpy(dirname, current_text, sizeof(dirname)); + else if( !entries ) + getcwd(dirname, sizeof(dirname)); // If directory, tabulate it - if(current_text[0] == '/' || - current_text[0] == '~') - { -//printf("BC_TextBox::calculate_suggestions %d\n", __LINE__); - char string[BCTEXTLEN]; - strncpy(string, current_text, sizeof(string)); - char *ptr = strrchr(string, '/'); - if(!ptr) ptr = strrchr(string, '~'); - -//printf("BC_TextBox::calculate_suggestions %d\n", __LINE__); - *(ptr + 1) = 0; - int suggestion_column = ptr + 1 - string; - - fs.set_filter(get_resources()->filebox_filter); -// fs.set_sort_order(filebox->sort_order); -// fs.set_sort_field(filebox->column_type[filebox->sort_column]); - - -//printf("BC_TextBox::calculate_suggestions %d %c %s\n", __LINE__, *ptr, string); - if(current_text[0] == '~' && *ptr != '/') - { - fs.update("/home"); - } - else - { - fs.parse_tildas(string); - fs.update(string); + if( dirname[0] ) { + if( filter ) fs.set_filter(filter); + char *prefix, *cp; + strncpy(dirname, current_text, sizeof(dirname)); + if( (cp=strrchr(dirname, '/')) || + (cp=strrchr(dirname, '~')) ) *++cp = 0; + fs.parse_tildas(dirname); + fs.update(dirname); + cp = (char *)current_text; + if( (prefix=strrchr(cp, '/')) || + (prefix=strrchr(cp, '~')) ) ++prefix; + suggestion_column = !prefix ? 0 : prefix - cp; + int prefix_len = prefix ? strlen(prefix) : 0; +// only include items where the filename matches the basename prefix + for(int i = 0; i < fs.total_files(); i++) { + char *current_name = fs.get_entry(i)->name; + if( prefix_len>0 && strncmp(prefix, current_name, prefix_len) ) continue; + suggestions.append(current_name); } -//printf("BC_TextBox::calculate_suggestions %d %d\n", __LINE__, fs.total_files()); - - -// Accept only entries with matching trailing characters - ptr = strrchr((char*)current_text, '/'); - if(!ptr) ptr = strrchr((char*)current_text, '~'); - if(ptr) ptr++; -//printf("BC_TextBox::calculate_suggestions %d %s %p\n", __LINE__, current_text, ptr); - - - if(ptr && *ptr) - { - for(int i = 0; i < fs.total_files(); i++) - { - char *current_name = fs.get_entry(i)->name; - if(!strncmp(ptr, current_name, strlen(ptr))) - { - suggestions.append(current_name); - //printf("BC_TextBox::calculate_suggestions %d %s\n", __LINE__, current_name); - } - } - } - else - // Accept all entries - for(int i = 0; i < fs.total_files(); i++) - { - //printf("BC_TextBox::calculate_suggestions %d %s\n", __LINE__, fs.get_entry(i)->name); - suggestions.append(fs.get_entry(i)->name); - } -//printf("BC_TextBox::calculate_suggestions %d\n", __LINE__); - -// Add 1 to column to keep / - set_suggestions(&suggestions, suggestion_column); -//printf("BC_TextBox::calculate_suggestions %d\n", __LINE__); } - else -// Get entries from current listbox with matching trailing characters - if(entries) - { -// printf("BC_TextBox::calculate_suggestions %d %d\n", -// __LINE__, -// entries->size()); - for(int i = 0; i < entries->size(); i++) - { + else if(entries) { + char *prefix = (char *)current_text; + int prefix_len = strlen(prefix); + for(int i = 0; i < entries->size(); i++) { char *current_name = entries->get(i)->get_text(); - -//printf("BC_TextBox::calculate_suggestions %d %s %s\n", __LINE__, current_text, current_name); - if(!strncmp(current_text, current_name, strlen(current_text))) - { - suggestions.append(current_name); - } + if( prefix_len>0 && strncmp(prefix, current_name, prefix_len) ) continue; + suggestions.append(current_name); } - - set_suggestions(&suggestions, 0); } + set_suggestions(&suggestions, suggestion_column); } return 1; } +void BC_TextBox::no_suggestions() +{ + if( suggestions_popup ) { + delete suggestions_popup; + suggestions_popup = 0; + activate(); + } +} + void BC_TextBox::set_suggestions(ArrayList *suggestions, int column) { // Copy the array this->suggestions->remove_all_objects(); this->suggestion_column = column; - if(suggestions) - { - for(int i = 0; i < suggestions->size(); i++) - { + if(suggestions) { + for(int i = 0; i < suggestions->size(); i++) { this->suggestions->append(new BC_ListBoxItem(suggestions->get(i))); } // Show the popup without taking focus - if(suggestions->size() > 1) - { - if(!suggestions_popup) - { - - get_parent()->add_subwindow(suggestions_popup = - new BC_TextBoxSuggestions(this, x, y)); + if( suggestions->size() > 1 ) { + if( !suggestions_popup ) { + suggestions_popup = new BC_TextBoxSuggestions(this, x, y); + get_parent()->add_subwindow(suggestions_popup); suggestions_popup->set_is_suggestions(1); - suggestions_popup->activate(0); } - else - { - suggestions_popup->update(this->suggestions, - 0, - 0, - 1); - suggestions_popup->activate(0); + else { + suggestions_popup->update(this->suggestions, 0, 0, 1); } + suggestions_popup->activate(0); } else // Show the highlighted text - if(suggestions->size() == 1) - { + if( suggestions->size() == 1 ) { highlight_letter1 = wtext_update(); - text_update(wtext,wlen, text,tsize); + int len = text_update(wtext,wlen, text,tsize); char *current_suggestion = suggestions->get(0); - int col = highlight_letter1 - suggestion_column; + int col = len - suggestion_column; if( col < 0 ) col = 0; char *cur = current_suggestion + col; tstrcat(cur); @@ -461,18 +414,13 @@ void BC_TextBox::set_suggestions(ArrayList *suggestions, int column) //printf("BC_TextBox::set_suggestions %d %d\n", __LINE__, suggestion_column); draw(1); - - delete suggestions_popup; - suggestions_popup = 0; + no_suggestions(); } } // Clear the popup - if(!suggestions || !this->suggestions->size()) - { - delete suggestions_popup; - suggestions_popup = 0; - } + if( !suggestions || !this->suggestions->size() ) + no_suggestions(); } void BC_TextBox::wset_selection(int char1, int char2, int ibeam) @@ -510,7 +458,8 @@ int BC_TextBox::update(const char *text) { //printf("BC_TextBox::update 1 %d %s %s\n", tstrcmp(text), text, this->text); // Don't update if contents are the same - if(!tstrcmp(text)) return 0; + int bg_color = has_border || !highlighted ? back_color : high_color; + if( bg_color == background_color && !tstrcmp(text)) return 0; tstrcpy(text); int wtext_len = wtext_update(); if(highlight_letter1 > wtext_len) highlight_letter1 = wtext_len; @@ -553,10 +502,8 @@ void BC_TextBox::disable() { if(enabled) { enabled = 0; - if(top_level) { - if(active) top_level->deactivate(); - draw(1); - } + deactivate(); + draw(1); } } @@ -570,10 +517,13 @@ 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::get_back_color() { return back_color; } +void BC_TextBox::set_back_color(int v) { back_color = v; } int BC_TextBox::pixels_to_rows(BC_WindowBase *window, int font, int pixels) { @@ -710,12 +660,7 @@ void BC_TextBox::draw(int flush) //printf("BC_TextBox::draw %d %s\n", __LINE__, text); // Background - if(has_border) - background_color = resources->text_background; - else if(highlighted) - background_color = high_color; - else - background_color = back_color; + background_color = has_border || !highlighted ? back_color : high_color; set_color(background_color); draw_box(0, 0, w, h); @@ -733,23 +678,26 @@ void BC_TextBox::draw(int flush) if(k > top_margin-text_height && k < get_h()-bottom_margin) { // Draw highlighted region of row - if(highlight_letter2 > highlight_letter1 && - highlight_letter2 > row_begin && - highlight_letter1 <= row_end) { - if(active && enabled && get_has_focus()) - set_color(resources->text_highlight); - else - set_color(resources->text_inactive_highlight); - + if( highlight_letter2 > highlight_letter1 && + highlight_letter2 > row_begin && + highlight_letter1 <= row_end ) { + int color = active && enabled && get_has_focus() ? + resources->text_highlight : + selection_active ? + resources->text_selected_highlight : + resources->text_inactive_highlight; + if( unicode_active >= 0 ) + color ^= LTBLUE; + 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(); @@ -761,29 +709,22 @@ 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); } // 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); } } } //printf("BC_TextBox::draw 3 %d\n", ibeam_y); if(need_ibeam) { - if( wtext_len == 0 ) { - ibeam_x = 0; - ibeam_y = 0; - } - else { - ibeam_x = -1; - ibeam_y = -1; - } +// ibeam_x = ibeam_y = !wtext_len ? 0 : -1; + ibeam_x = 0; ibeam_y = k - text_y; } //printf("BC_TextBox::draw 4 %d\n", ibeam_y); @@ -810,10 +751,13 @@ int BC_TextBox::focus_out_event() int BC_TextBox::cursor_enter_event() { - if(top_level->event_win == win && enabled) + 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(); + } if(!highlighted) { highlighted = 1; @@ -829,10 +773,13 @@ int BC_TextBox::cursor_leave_event() if(highlighted) { highlighted = 0; - draw_border(); hide_tooltip(); + draw_border(); flash(1); } + if( !suggestions_popup && !get_button_down() && + !(top_level->get_resources()->textbox_focus_policy & CLICK_DEACTIVATE) ) + deactivate(); return 0; } @@ -841,12 +788,10 @@ int BC_TextBox::button_press_event() const int debug = 0; if(!enabled) return 0; - if(get_buttonpress() != WHEEL_UP && - get_buttonpress() != WHEEL_DOWN && - get_buttonpress() != LEFT_BUTTON && - get_buttonpress() != MIDDLE_BUTTON) return 0; - - +// if(get_buttonpress() != WHEEL_UP && +// get_buttonpress() != WHEEL_DOWN && +// get_buttonpress() != LEFT_BUTTON && +// get_buttonpress() != MIDDLE_BUTTON) return 0; if(debug) printf("BC_TextBox::button_press_event %d\n", __LINE__); @@ -884,6 +829,11 @@ int BC_TextBox::button_press_event() update_scroll = 1; } else + if(get_buttonpress() == RIGHT_BUTTON) + { + menu->activate_menu(); + } + else { cursor_letter = get_cursor_letter(top_level->cursor_x, top_level->cursor_y); @@ -950,28 +900,15 @@ int BC_TextBox::button_press_event() return 1; } else - if(active && (!yscroll || !yscroll->is_event_win())) - { -//printf("BC_TextBox::button_press_event %d\n", __LINE__); -// Suggestion popup is not active but must be deactivated. - if(suggestions_popup) - { - return 0; -// printf("BC_TextBox::button_press_event %d\n", __LINE__); -// // Pass event to suggestions popup -// if(!suggestions_popup->button_press_event()) -// { -// printf("BC_TextBox::button_press_event %d\n", __LINE__); -// top_level->deactivate(); -// } - } - else - { - top_level->deactivate(); + if( active ) { + if( suggestions_popup && (!yscroll || !yscroll->is_event_win())) { + if( suggestions_popup->button_press_event() ) + return suggestions_popup->handle_event(); } + else if( (top_level->get_resources()->textbox_focus_policy & CLICK_DEACTIVATE) ) + deactivate(); } - return 0; } @@ -1049,27 +986,23 @@ int BC_TextBox::cursor_motion_event() int BC_TextBox::activate() { - top_level->active_subwindow = this; - active = 1; + if( !active ) { + active = 1; + top_level->set_active_subwindow(this); + top_level->set_repeat(top_level->get_resources()->blink_rate); + } draw(1); - top_level->set_repeat(top_level->get_resources()->blink_rate); return 0; } int BC_TextBox::deactivate() { -//printf("BC_TextBox::deactivate %d suggestions_popup=%p\n", __LINE__, suggestions_popup); - active = 0; - top_level->unset_repeat(top_level->get_resources()->blink_rate); - if(suggestions_popup) - { -// Must deactivate instead of delete since this is called from BC_ListBox::button_press_event -// suggestions_popup->deactivate(); - - delete suggestions_popup; - suggestions_popup = 0; + if( active ) { + active = 0; + text_selected = word_selected = line_selected = 0; + top_level->set_active_subwindow(0); + top_level->unset_repeat(top_level->get_resources()->blink_rate); } - draw(1); return 0; } @@ -1084,7 +1017,6 @@ int BC_TextBox::repeat_event(int64_t duration) tooltip_text && tooltip_text[0] != 0 && highlighted) { show_tooltip(); - tooltip_done = 1; result = 1; } @@ -1195,21 +1127,29 @@ int BC_TextBox::repeat_event(int64_t duration) void BC_TextBox::default_keypress(int &dispatch_event, int &result) { - if((top_level->get_keypress() == RETURN) || - (top_level->get_keypress() > 30 && top_level->get_keypress() <= 255)) - { - int len; - wchar_t *temp_string = top_level->get_wkeystring(&len); - if(top_level->get_keypress() == RETURN) { - temp_string[0] = '\n'; temp_string[1] = 0; - len = 1; - } - insert_text(temp_string, len); - find_ibeam(1); - draw(1); - dispatch_event = 1; - result = 1; + int key = top_level->get_keypress(), len; + wchar_t *wkeys = top_level->get_wkeystring(&len); + switch( key ) { + case KPENTER: key = '\n'; goto kpchr; + case KPMINUS: key = '-'; goto kpchr; + case KPPLUS: key = '+'; goto kpchr; + case KPDEL: key = '.'; goto kpchr; + case RETURN: key = '\n'; goto kpchr; + case KPINS: key = '0'; goto kpchr; + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + key = key - KP1 + '1'; goto kpchr; + default: + if( key < 32 || key > 255 ) return; + kpchr: { + wkeys[0] = key; wkeys[1] = 0; len = 1; + break; } } + insert_text(wkeys, len); + find_ibeam(1); + draw(1); + dispatch_event = 1; + result = 1; } int BC_TextBox::keypress_event() @@ -1224,99 +1164,144 @@ int BC_TextBox::keypress_event() int wtext_len = wtext_update(); last_keypress = get_keypress(); + + if( unicode_active >= 0 ) { + wchar_t wch = 0; + int wlen = -1; + switch( last_keypress ) { +//unicode active acitons + case RETURN: { + for( int i=highlight_letter1+1; i 0) { + delete_selection(ibeam_letter - 1, ibeam_letter, wtext_len); + highlight_letter2 = --ibeam_letter; + if( highlight_letter1 >= highlight_letter2 ) + unicode_active = -1; + } + result = 1; + wlen = 0; + break; } + case KPINS: last_keypress = KP1-'1'+'0'; // fall thru + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + last_keypress = last_keypress-KP1 + '1'; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': { + int n = nib(last_keypress); + wch = n < 10 ? '0'+n : 'A'+n-10; + result = 1; + wlen = 1; + break; } +//normal actions + case TAB: + case LEFTTAB: + break; +//ignored actions + default: + result = 1; + break; + } + if( wlen >= 0 ) { + insert_text(&wch, wlen); + find_ibeam(1); + if( unicode_active >= 0 ) + highlight_letter2 = ibeam_letter; + else + highlight_letter1 = highlight_letter2 = 0; + draw(1); + } + } + + if( !result ) { //printf("BC_TextBox::keypress_event %d %x\n", __LINE__, last_keypress) - switch(last_keypress) - { - case ESC: + switch(last_keypress) { + case ESC: { // Deactivate the suggestions - if(suggestions && suggestions_popup) - { - delete suggestions_popup; - suggestions_popup = 0; + if( suggestions_popup ) { + no_suggestions(); result = 1; } - else - { + else { top_level->deactivate(); result = 0; } - break; - - - + break; } - - case RETURN: - if(rows == 1) - { + case RETURN: { + if( rows == 1 ) { + highlight_letter1 = highlight_letter2 = 0; + ibeam_letter = wtext_update(); top_level->deactivate(); dispatch_event = 1; result = 0; } - else - { + else { default_keypress(dispatch_event, result); } - break; - - + break; } // Handle like a default keypress - case TAB: + case TAB: { top_level->cycle_textboxes(1); result = 1; - break; - + break; } - - case LEFTTAB: + case LEFTTAB: { top_level->cycle_textboxes(-1); result = 1; - break; + break; } - case LEFT: - if(ibeam_letter > 0) - { + case LEFT: { + if(ibeam_letter > 0) { int old_ibeam_letter = ibeam_letter; // Single character - if(!ctrl_down()) - { + if(!ctrl_down()) { ibeam_letter--; } - else + else { // Word - { ibeam_letter--; while(ibeam_letter > 0 && isalnum(wtext[ibeam_letter - 1])) ibeam_letter--; } - // Extend selection - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter1 = ibeam_letter; highlight_letter2 = old_ibeam_letter; } - else + else if(highlight_letter1 == old_ibeam_letter) { // Extend left highlight - if(highlight_letter1 == old_ibeam_letter) - { highlight_letter1 = ibeam_letter; } - else + else if(highlight_letter2 == old_ibeam_letter) { // Shrink right highlight - if(highlight_letter2 == old_ibeam_letter) - { highlight_letter2 = ibeam_letter; } } - else - { + else { highlight_letter1 = highlight_letter2 = ibeam_letter; } @@ -1325,50 +1310,39 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); } result = 1; - break; + break; } - case RIGHT: - if(ibeam_letter < wtext_len) - { + case RIGHT: { + if(ibeam_letter < wtext_len) { int old_ibeam_letter = ibeam_letter; // Single character - if(!ctrl_down()) - { + if(!ctrl_down()) { ibeam_letter++; } - else + else { // Word - { - while(ibeam_letter < wtext_len && isalnum(wtext[ibeam_letter++])) - ; + while(ibeam_letter < wtext_len && isalnum(wtext[ibeam_letter++])); } // Extend selection - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter1 = old_ibeam_letter; highlight_letter2 = ibeam_letter; } - else + else if(highlight_letter1 == old_ibeam_letter) { // Shrink left highlight - if(highlight_letter1 == old_ibeam_letter) - { highlight_letter1 = ibeam_letter; } - else + else if(highlight_letter2 == old_ibeam_letter) { // Expand right highlight - if(highlight_letter2 == old_ibeam_letter) - { highlight_letter2 = ibeam_letter; } } - else - { + else { highlight_letter1 = highlight_letter2 = ibeam_letter; } @@ -1376,52 +1350,42 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); } result = 1; - break; + break; } - case UP: - if(suggestions && suggestions_popup) - { + case UP: { + if( suggestions && suggestions_popup ) { // Pass to suggestions popup //printf("BC_TextBox::keypress_event %d\n", __LINE__); suggestions_popup->activate(1); suggestions_popup->keypress_event(); result = 1; } - else - if(ibeam_letter > 0) - { + else if(ibeam_letter > 0) { //printf("BC_TextBox::keypress_event 1 %d %d %d\n", ibeam_x, ibeam_y, ibeam_letter); int new_letter = get_cursor_letter2(ibeam_x + text_x, ibeam_y + text_y - text_height); //printf("BC_TextBox::keypress_event 2 %d %d %d\n", ibeam_x, ibeam_y, new_letter); // Extend selection - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter1 = new_letter; highlight_letter2 = ibeam_letter; } - else + else if(highlight_letter1 == ibeam_letter) { // Expand left highlight - if(highlight_letter1 == ibeam_letter) - { highlight_letter1 = new_letter; } - else + else if(highlight_letter2 == ibeam_letter) { // Shrink right highlight - if(highlight_letter2 == ibeam_letter) - { highlight_letter2 = new_letter; } } else highlight_letter1 = highlight_letter2 = new_letter; - if(highlight_letter1 > highlight_letter2) - { + if(highlight_letter1 > highlight_letter2) { int temp = highlight_letter1; highlight_letter1 = highlight_letter2; highlight_letter2 = temp; @@ -1432,41 +1396,33 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); } result = 1; - break; + break; } - case PGUP: - if(ibeam_letter > 0) - { + case PGUP: { + if(ibeam_letter > 0) { int new_letter = get_cursor_letter2(ibeam_x + text_x, ibeam_y + text_y - get_h()); // Extend selection - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter1 = new_letter; highlight_letter2 = ibeam_letter; } - else + else if(highlight_letter1 == ibeam_letter) { // Expand left highlight - if(highlight_letter1 == ibeam_letter) - { highlight_letter1 = new_letter; } - else + else if(highlight_letter2 == ibeam_letter) { // Shrink right highlight - if(highlight_letter2 == ibeam_letter) - { highlight_letter2 = new_letter; } } else highlight_letter1 = highlight_letter2 = new_letter; - if(highlight_letter1 > highlight_letter2) - { + if(highlight_letter1 > highlight_letter2) { int temp = highlight_letter1; highlight_letter1 = highlight_letter2; highlight_letter2 = temp; @@ -1477,15 +1433,14 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); } result = 1; - break; + break; } - case DOWN: + case DOWN: { // printf("BC_TextBox::keypress_event %d %p %p\n", // __LINE__, // suggestions, // suggestions_popup); - if(suggestions && suggestions_popup) - { + if( suggestions && suggestions_popup ) { // Pass to suggestions popup suggestions_popup->activate(1); suggestions_popup->keypress_event(); @@ -1499,32 +1454,25 @@ int BC_TextBox::keypress_event() ibeam_y + text_y + text_height); //printf("BC_TextBox::keypress_event 10 %d\n", new_letter); - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter1 = new_letter; highlight_letter2 = ibeam_letter; } - else + else if(highlight_letter1 == ibeam_letter) { // Shrink left highlight - if(highlight_letter1 == ibeam_letter) - { highlight_letter1 = new_letter; } - else + else if(highlight_letter2 == ibeam_letter) { // Expand right highlight - if(highlight_letter2 == ibeam_letter) - { highlight_letter2 = new_letter; } } else highlight_letter1 = highlight_letter2 = new_letter; - if(highlight_letter1 > highlight_letter2) - { + if(highlight_letter1 > highlight_letter2) { int temp = highlight_letter1; highlight_letter1 = highlight_letter2; highlight_letter2 = temp; @@ -1537,84 +1485,67 @@ int BC_TextBox::keypress_event() //printf("BC_TextBox::keypress_event 20 %d\n", ibeam_letter); } result = 1; - break; + break; } - case PGDN: - { + case PGDN: { // Extend selection - int new_letter = get_cursor_letter2(ibeam_x + text_x, - ibeam_y + text_y + get_h()); + int new_letter = get_cursor_letter2(ibeam_x + text_x, + ibeam_y + text_y + get_h()); //printf("BC_TextBox::keypress_event 10 %d\n", new_letter); - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Initialize highlighting - if(highlight_letter1 == highlight_letter2) - { - highlight_letter1 = new_letter; - highlight_letter2 = ibeam_letter; - } - else + if(highlight_letter1 == highlight_letter2) { + highlight_letter1 = new_letter; + highlight_letter2 = ibeam_letter; + } + else if(highlight_letter1 == ibeam_letter) { // Shrink left highlight - if(highlight_letter1 == ibeam_letter) - { - highlight_letter1 = new_letter; - } - else + highlight_letter1 = new_letter; + } + else if(highlight_letter2 == ibeam_letter) { // Expand right highlight - if(highlight_letter2 == ibeam_letter) - { - highlight_letter2 = new_letter; - } + highlight_letter2 = new_letter; } - else - highlight_letter1 = highlight_letter2 = new_letter; + } + else + highlight_letter1 = highlight_letter2 = new_letter; - if(highlight_letter1 > highlight_letter2) - { - int temp = highlight_letter1; - highlight_letter1 = highlight_letter2; - highlight_letter2 = temp; - } - ibeam_letter = new_letter; + if(highlight_letter1 > highlight_letter2) { + int temp = highlight_letter1; + highlight_letter1 = highlight_letter2; + highlight_letter2 = temp; + } + ibeam_letter = new_letter; - find_ibeam(1); - if(keypress_draw) draw(1); + find_ibeam(1); + if(keypress_draw) draw(1); //printf("BC_TextBox::keypress_event 20 %d\n", ibeam_letter); - } result = 1; - break; + break; } - case END: - { - delete suggestions_popup; - suggestions_popup = 0; + case END: { + no_suggestions(); int old_ibeam_letter = ibeam_letter; while(ibeam_letter < wtext_len && wtext[ibeam_letter] != '\n') ibeam_letter++; - if(top_level->shift_down()) - { + if(top_level->shift_down()) { // Begin selection - if(highlight_letter1 == highlight_letter2) - { + if(highlight_letter1 == highlight_letter2) { highlight_letter2 = ibeam_letter; highlight_letter1 = old_ibeam_letter; } - else + else if(highlight_letter1 == old_ibeam_letter) { // Shrink selection - if(highlight_letter1 == old_ibeam_letter) - { highlight_letter1 = highlight_letter2; highlight_letter2 = ibeam_letter; } - else + else if(highlight_letter2 == old_ibeam_letter) { // Extend selection - if(highlight_letter2 == old_ibeam_letter) - { highlight_letter2 = ibeam_letter; } } @@ -1624,13 +1555,10 @@ int BC_TextBox::keypress_event() find_ibeam(1); if(keypress_draw) draw(1); result = 1; - break; - } + break; } - case HOME: - { - delete suggestions_popup; - suggestions_popup = 0; + case HOME: { + no_suggestions(); int old_ibeam_letter = ibeam_letter; @@ -1665,26 +1593,18 @@ int BC_TextBox::keypress_event() find_ibeam(1); if(keypress_draw) draw(1); result = 1; - break; - } + break; } - case BACKSPACE: - if(suggestions_popup) - { - delete suggestions_popup; - suggestions_popup = 0; - } + case BACKSPACE: { + no_suggestions(); - if(highlight_letter1 == highlight_letter2) - { - if(ibeam_letter > 0) - { + if(highlight_letter1 == highlight_letter2) { + if(ibeam_letter > 0) { delete_selection(ibeam_letter - 1, ibeam_letter, wtext_len); ibeam_letter--; } } - else - { + else { delete_selection(highlight_letter1, highlight_letter2, wtext_len); highlight_letter2 = ibeam_letter = highlight_letter1; } @@ -1693,19 +1613,16 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); dispatch_event = 1; result = 1; - break; + break; } - case DELETE: + case DELETE: { //printf("BC_TextBox::keypress_event %d\n", __LINE__); - if(highlight_letter1 == highlight_letter2) - { - if(ibeam_letter < wtext_len) - { + if(highlight_letter1 == highlight_letter2) { + if(ibeam_letter < wtext_len) { delete_selection(ibeam_letter, ibeam_letter + 1, wtext_len); } } - else - { + else { delete_selection(highlight_letter1, highlight_letter2, wtext_len); highlight_letter2 = ibeam_letter = highlight_letter1; } @@ -1714,60 +1631,97 @@ int BC_TextBox::keypress_event() if(keypress_draw) draw(1); dispatch_event = 1; result = 1; - break; - - - - default: - if(ctrl_down()) - { - if(get_keypress() == 'c' || get_keypress() == 'C') - { - if(highlight_letter1 != highlight_letter2) - { - copy_selection(SECONDARY_SELECTION); - result = 1; - } - } - else - if(get_keypress() == 'v' || get_keypress() == 'V') - { - paste_selection(SECONDARY_SELECTION); - find_ibeam(1); - if(keypress_draw) draw(1); + break; } + + default: { + if( ctrl_down() ) { + switch( last_keypress ) { + case 'c': case 'C': { + result = copy(0); + break; } + case 'v': case 'V': { + result = paste(0); dispatch_event = 1; - result = 1; - } - else - if(get_keypress() == 'x' || get_keypress() == 'X') - { - if(highlight_letter1 != highlight_letter2) - { - copy_selection(SECONDARY_SELECTION); - delete_selection(highlight_letter1, highlight_letter2, wtext_len); - highlight_letter2 = ibeam_letter = highlight_letter1; - } - - find_ibeam(1); - if(keypress_draw) draw(1); + break; } + case 'x': case 'X': { + result = cut(0); dispatch_event = 1; - result = 1; + break; } + case 'u': case 'U': { + if( shift_down() ) { + unicode_active = ibeam_letter; + wchar_t wkey = 'U'; + insert_text(&wkey, 1); + find_ibeam(1); + highlight_letter1 = unicode_active; + highlight_letter2 = ibeam_letter; + draw(1); + result = 1; + } + break; } } - break; } default_keypress(dispatch_event, result); - break; + break; } + } } if(result) skip_cursor->update(); if(dispatch_event && handle_event()) result = 1; + return result; } +int BC_TextBox::cut(int do_update) +{ + if( highlight_letter1 != highlight_letter2 ) { + int wtext_len = wtext_update(); + copy_selection(SECONDARY_SELECTION); + delete_selection(highlight_letter1, highlight_letter2, wtext_len); + highlight_letter2 = ibeam_letter = highlight_letter1; + } + + find_ibeam(1); + if( keypress_draw ) + draw(1); + + if( do_update ) { + skip_cursor->update(); + handle_event(); + } + return 1; +} + +int BC_TextBox::copy(int do_update) +{ + int result = 0; + if( highlight_letter1 != highlight_letter2 ) { + copy_selection(SECONDARY_SELECTION); + result = 1; + if( do_update ) { + skip_cursor->update(); + } + } + return result; +} + +int BC_TextBox::paste(int do_update) +{ + paste_selection(SECONDARY_SELECTION); + find_ibeam(1); + if( keypress_draw ) + draw(1); + if( do_update ) { + skip_cursor->update(); + handle_event(); + } + return 1; +} + int BC_TextBox::uses_text() { @@ -1791,14 +1745,12 @@ void BC_TextBox::insert_text(const wchar_t *wcp, int len) { if( len < 0 ) len = wcslen(wcp); int wtext_len = wtext_update(); - if(highlight_letter1 < highlight_letter2) - { + if( unicode_active < 0 && highlight_letter1 < highlight_letter2 ) { delete_selection(highlight_letter1, highlight_letter2, wtext_len); highlight_letter2 = ibeam_letter = highlight_letter1; wtext_len = wtext_update(); } - int i, j; for(i=wtext_len-1, j=wtext_len+len-1; i>=ibeam_letter; i--, j--) { if( j >= wsize ) continue; @@ -1869,20 +1821,24 @@ 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; int wtext_len = wtext_update(); + x = y = 0; - y = 0; - x = 0; for( i=0; i= 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; } @@ -1975,15 +1931,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 +1952,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 +1976,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 +2021,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 +2035,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 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; ito_clipboard(ctext, clip_len, clipboard_num); + char ctext[4*clip_len+4]; + clip_len = text_update(&wtext[highlight_letter1],clip_len, ctext,4*clip_len+4); + to_clipboard(ctext, clip_len, clipboard_num); + selection_active = 1; } +int BC_TextBox::selection_clear_event() +{ + if( !is_event_win() ) return 0; + selection_active = 0; + draw(1); + return 1; +} void BC_TextBox::paste_selection(int clipboard_num) { - int len = get_clipboard()->clipboard_len(clipboard_num); + int len = 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]; + 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); + last_keypress = 0; } } @@ -2195,20 +2139,9 @@ int BC_TextBox::get_rows() -BC_TextBoxSuggestions::BC_TextBoxSuggestions(BC_TextBox *text_box, - int x, - int y) - : BC_ListBox(x, - y, - text_box->get_w(), - 200, - LISTBOX_TEXT, - text_box->suggestions, - 0, - 0, - 1, - 0, - 1) +BC_TextBoxSuggestions::BC_TextBoxSuggestions(BC_TextBox *text_box, int x, int y) + : BC_ListBox(x, y, text_box->get_w(), 200, LISTBOX_TEXT, + text_box->suggestions, 0, 0, 1, 0, 1) { this->text_box = text_box; set_use_button(0); @@ -2219,35 +2152,6 @@ BC_TextBoxSuggestions::~BC_TextBoxSuggestions() { } -int BC_TextBoxSuggestions::selection_changed() -{ -#if 0 -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); - BC_ListBoxItem *item = get_selection(0, 0); -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); - - if(item) - { - char *current_suggestion = item->get_text(); -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); -// int text_box_len = strlen(text_box->text); -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); - strcpy(text_box->text + text_box->suggestion_column, current_suggestion); -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); - *(text_box->text + text_box->suggestion_column + strlen(current_suggestion)) = 0; - -//printf("BC_TextBoxSuggestions::selection_changed %d\n", __LINE__); - text_box->draw(1); - text_box->handle_event(); - } - - return 1; -#else - return 0; -#endif -} - - int BC_TextBoxSuggestions::handle_event() { char *current_suggestion = 0; @@ -2268,8 +2172,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); @@ -2288,6 +2192,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; @@ -2302,6 +2207,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; @@ -2309,6 +2215,7 @@ BC_ScrollTextBox::BC_ScrollTextBox(BC_WindowBase *parent_window, BC_ScrollTextBox::~BC_ScrollTextBox() { + delete xscroll; delete yscroll; if(text) { text->gui = 0; @@ -2322,85 +2229,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; - -} - -int BC_ScrollTextBox::handle_event() -{ - return 1; -} - -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 this->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(); + set_text_row(0); } 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) @@ -2409,36 +2263,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(); } - -void BC_ScrollTextBox::wset_selection(int char1, int char2, int ibeam) +int BC_ScrollTextBox::button_release_event() { - this->text->wset_selection(char1, char2, ibeam); + 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) +{ + 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 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, @@ -2465,36 +2330,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; } @@ -2511,13 +2451,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) { @@ -2559,6 +2492,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; @@ -2607,14 +2541,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 *data) { - listbox->update(data, - 0, - 0, - 1); + listbox->update(data, 0, 0, 1); } @@ -2653,6 +2585,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; @@ -2686,23 +2628,15 @@ void BC_PopupTextBox::reposition_window(int x, int y) BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup, - int64_t default_value, - int64_t min, - int64_t max, - int x, - int y) + int64_t default_value, int x, int y) : BC_TextBox(x, y, popup->text_w, 1, default_value) { this->popup = popup; } BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup, - float default_value, - float min, - float max, - 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; } @@ -2727,19 +2661,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; @@ -2854,39 +2779,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, - min_f, - max_f, - x, - y)); - textbox->set_precision(precision); - } - else - parent_window->add_subwindow(textbox = new BC_TumbleTextBoxText(this, - default_value, - min, - max, - 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; } @@ -2909,18 +2812,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; } @@ -2945,17 +2851,23 @@ int BC_TumbleTextBox::get_h() return textbox->get_h(); } -void BC_TumbleTextBox::disable() +void BC_TumbleTextBox::disable(int hide_text) { + if( hide_text && !textbox->is_hidden() ) + textbox->hide_window(0); + if( !tumbler->is_hidden() ) + tumbler->hide_window(0); if( !get_enabled() ) return; - tumbler->hide_window(0); return textbox->disable(); } void BC_TumbleTextBox::enable() { + if( textbox->is_hidden() ) + textbox->show_window(0); + if( tumbler->is_hidden() ) + tumbler->show_window(0); if( get_enabled() ) return; - tumbler->show_window(0); return textbox->enable(); } @@ -2993,3 +2905,69 @@ void BC_TumbleTextBox::set_boundaries(float min, float max) { tumbler->set_boundaries(min, max); } + + + +BC_TextMenu::BC_TextMenu(BC_TextBox *textbox) + : BC_PopupMenu(0, 0, 0, "", 0) +{ + this->textbox = textbox; +} + +BC_TextMenu::~BC_TextMenu() +{ +} + +void BC_TextMenu::create_objects() +{ + add_item(new BC_TextMenuCut(this)); + add_item(new BC_TextMenuCopy(this)); + add_item(new BC_TextMenuPaste(this)); +} + + +BC_TextMenuCut::BC_TextMenuCut(BC_TextMenu *menu) + : BC_MenuItem(_("Cut")) +{ + this->menu = menu; +} + +int BC_TextMenuCut::handle_event() +{ + menu->textbox->cut(1); + + return 0; +} + + +BC_TextMenuCopy::BC_TextMenuCopy(BC_TextMenu *menu) + : BC_MenuItem(_("Copy")) +{ + this->menu = menu; +} + +int BC_TextMenuCopy::handle_event() +{ + menu->textbox->copy(1); + return 0; +} + + +BC_TextMenuPaste::BC_TextMenuPaste(BC_TextMenu *menu) + : BC_MenuItem(_("Paste")) +{ + this->menu = menu; +} + +int BC_TextMenuPaste::handle_event() +{ + menu->textbox->paste(1); + return 0; +} + + +void BC_TumbleTextBox::set_tooltip(const char *text) +{ + textbox->set_tooltip(text); +} +