diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Text_Buffer.cxx | 10 | ||||
| -rw-r--r-- | src/Fl_Text_Display.cxx | 52 |
2 files changed, 45 insertions, 17 deletions
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 0865e87b6..86d8e3398 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -669,6 +669,11 @@ void Fl_Text_Buffer::secondary_select_rectangular( int start, int end, redisplay_selection( &oldSelection, &mSecondary ); } +int Fl_Text_Buffer::secondary_selection_position( int *start, int *end + ) { + return mSecondary.position( start, end ); +} + int Fl_Text_Buffer::secondary_selection_position( int *start, int *end, int *isRect, int *rectStart, int *rectEnd ) { return mSecondary.position( start, end, isRect, rectStart, @@ -709,6 +714,11 @@ void Fl_Text_Buffer::highlight_rectangular( int start, int end, redisplay_selection( &oldSelection, &mHighlight ); } +int Fl_Text_Buffer::highlight_position( int *start, int *end + ) { + return mHighlight.position( start, end ); +} + int Fl_Text_Buffer::highlight_position( int *start, int *end, int *isRect, int *rectStart, int *rectEnd ) { return mHighlight.position( start, end, isRect, rectStart, diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index d7b312ed7..2fa424711 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1662,16 +1662,22 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, font = styleRec->font; fsize = styleRec->size; - if (style & (HIGHLIGHT_MASK | PRIMARY_MASK)) { + if (style & PRIMARY_MASK) { if (Fl::focus() == this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.5f); + } else if (style & HIGHLIGHT_MASK) { + if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.8f); + else background = fl_color_average(color(), selection_color(), 0.9f); } else background = color(); - foreground = fl_contrast(styleRec->color, background); - } else if (style & (HIGHLIGHT_MASK | PRIMARY_MASK)) { + } else if (style & PRIMARY_MASK) { if (Fl::focus() == this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.5f); foreground = fl_contrast(textcolor(), background); + } else if (style & HIGHLIGHT_MASK) { + if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.8f); + else background = fl_color_average(color(), selection_color(), 0.9f); + foreground = fl_contrast(textcolor(), background); } else { foreground = textcolor(); background = color(); @@ -1707,6 +1713,7 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, */ } + /* ** Clear a rectangle with the appropriate background color for "style" */ @@ -1716,27 +1723,25 @@ void Fl_Text_Display::clear_rect( int style, int X, int Y, if ( width == 0 ) return; - if ( Fl::focus() != this ) { - if (style & (HIGHLIGHT_MASK | PRIMARY_MASK)) { + if (style & PRIMARY_MASK) { + if (Fl::focus()==this) { + fl_color(selection_color()); + } else { fl_color(fl_color_average(color(), selection_color(), 0.5f)); + } + } else if (style & HIGHLIGHT_MASK) { + if (Fl::focus()==this) { + fl_color(fl_color_average(color(), selection_color(), 0.8f)); } else { - fl_color( color() ); + fl_color(fl_color_average(color(), selection_color(), 0.9f)); } - fl_rectf( X, Y, width, height ); - } else if ( style & HIGHLIGHT_MASK ) { - fl_color( fl_contrast(textcolor(), color()) ); - fl_rectf( X, Y, width, height ); - } else if ( style & PRIMARY_MASK ) { - fl_color( selection_color() ); - fl_rectf( X, Y, width, height ); } else { fl_color( color() ); - fl_rectf( X, Y, width, height ); } + fl_rectf( X, Y, width, height ); } - /* ** Draw a cursor with top center at X, y. */ @@ -3219,8 +3224,21 @@ int Fl_Text_Display::handle(int event) { case FL_UNFOCUS: if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT); case FL_FOCUS: - if (buffer()->selected()) redraw(); - + if (buffer()->selected()) { + int start, end; + if (buffer()->selection_position(&start, &end)) + redisplay_range(start, end); + } + if (buffer()->secondary_selected()) { + int start, end; + if (buffer()->secondary_selection_position(&start, &end)) + redisplay_range(start, end); + } + if (buffer()->highlight()) { + int start, end; + if (buffer()->highlight_position(&start, &end)) + redisplay_range(start, end); + } return 1; case FL_KEYBOARD: |