]> git.lyx.org Git - lyx.git/blobdiff - src/screen.C
fix typo that put too many include paths for most people
[lyx.git] / src / screen.C
index c376a15a13469608f6fa8549990e8d2e81c3540d..66df051f80cfdf48e1d93db51512269a8203a9cd 100644 (file)
@@ -1,8 +1,8 @@
 /* This file is part of
-* ====================================================== 
-* 
+* ======================================================
+*
 *           LyX, The Document Processor
-*       
+*
 *          Copyright 1995 Matthias Ettrich
 *           Copyright 1995-1998 The LyX Team
 *
 #include "Painter.h"
 #include "WorkArea.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "font.h"
+#include "insets/insettext.h"
+#include "ColorHandler.h"
+#include "language.h"
 
 using std::max;
 using std::min;
 
-static
+namespace {
+
 GC createGC()
 {
        XGCValues val;
-       val.foreground = BlackPixel(fl_display, 
-                                   DefaultScreen(fl_display));
-       
-       val.function=GXcopy;
+       val.foreground = BlackPixel(fl_get_display(),
+                                   DefaultScreen(fl_get_display()));
+
+       val.function = GXcopy;
        val.graphics_exposures = false;
        val.line_style = LineSolid;
        val.line_width = 0;
-       return XCreateGC(fl_display, RootWindow(fl_display, 0), 
+       return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0),
                         GCForeground | GCFunction | GCGraphicsExposures
                         | GCLineWidth | GCLineStyle , &val);
 }
 
+} // namespace anon
+
 
 // Constructor
-LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
-       : owner(o), text(text_ptr)
+LyXScreen::LyXScreen(WorkArea & o)
+       : owner(o), force_clear(true)
 {
-       first = 0;
-   
-       /* the cursor isnt yet visible */ 
+       // the cursor isnt yet visible
        cursor_visible = false;
-#if 0
-       screen_refresh_y = -1;
-#endif
        cursor_pixmap = 0;
        cursor_pixmap_x = 0;
        cursor_pixmap_y = 0;
@@ -66,23 +68,39 @@ LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
 }
 
 
-void LyXScreen::Redraw()
+LyXScreen::~LyXScreen()
 {
-       DrawFromTo(0, owner.height());
-#if 0
-       screen_refresh_y = -1;
-#endif
+       XFreeGC(fl_get_display(), gc_copy);
+}
+
+
+void LyXScreen::setCursorColor()
+{
+       if (!lyxColorHandler.get()) return;
+
+       GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
+
+       XGCValues val;
+       XGetGCValues(fl_get_display(),
+                    gc, GCForeground, &val);
+       XChangeGC(fl_get_display(), gc_copy, GCForeground, &val);
+}
+
+
+void LyXScreen::redraw(LyXText * text, BufferView * bv)
+{
+       drawFromTo(text, bv, 0, owner.height(), 0, 0, text == bv->text);
        expose(0, 0, owner.workWidth(), owner.height());
        if (cursor_visible) {
                cursor_visible = false;
-               ShowCursor();
+               bv->showCursor();
        }
 }
 
 
 void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 {
-       XCopyArea(fl_display,
+       XCopyArea(fl_get_display(),
                  owner.getPixmap(),
                  owner.getWin(),
                  gc_copy,
@@ -93,25 +111,40 @@ void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 }
 
 
-void LyXScreen::DrawFromTo(int y1, int y2)
+void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
+                          int y1, int y2, int y_offset, int x_offset,
+                          bool internal)
 {
-       long y_text = first + y1;
-   
-       /* get the first needed row */ 
-       Row * row = text->GetRowNearY(y_text);
-       /* y_text is now the real beginning of the row */
-   
-       long y = y_text - first;
-       /* y1 is now the real beginning of row on the screen */
-       
+       int y_text = text->first_y + y1;
+
+       // get the first needed row
+       Row * row = text->getRowNearY(y_text);
+       // y_text is now the real beginning of the row
+
+       int y = y_text - text->first_y;
+       // y1 is now the real beginning of row on the screen
+
        while (row != 0 && y < y2) {
-               text->GetVisibleRow(y, row, y + first);
-               y += row->height;
-               row = row->next;
+               LyXText::text_status st = text->status();
+               text->getVisibleRow(bv, y + y_offset,
+                                   x_offset, row, y + text->first_y);
+               internal = internal && (st != LyXText::CHANGED_IN_DRAW);
+               while (internal && text->status() == LyXText::CHANGED_IN_DRAW) {
+                       if (text->fullRebreak(bv)) {
+                               st = LyXText::NEED_MORE_REFRESH;
+                               text->setCursor(bv, text->cursor.par(), text->cursor.pos());
+                       }
+                       text->status(bv, st);
+                       text->getVisibleRow(bv, y + y_offset,
+                                           x_offset, row, y + text->first_y);
+               }
+               y += row->height();
+               row = row->next();
        }
-   
-       /* maybe we have to clear the screen at the bottom */ 
-       if (y < y2) {
+       force_clear = false;
+
+       // maybe we have to clear the screen at the bottom
+       if ((y < y2) && text->bv_owner) {
                owner.getPainter().fillRectangle(0, y,
                                                 owner.workWidth(),
                                                 y2 - y,
@@ -120,97 +153,100 @@ void LyXScreen::DrawFromTo(int y1, int y2)
 }
 
 
-#if 1
-void LyXScreen::DrawOneRow(Row * row, long y_text)
+void LyXScreen::drawOneRow(LyXText * text, BufferView * bv, Row * row,
+                          int y_text, int y_offset, int x_offset)
 {
-       long y = y_text - first;
-      
-       if (y + row->height > 0 && y - row->height <= long(owner.height())) {
-               /* ok there is something visible */
-               text->GetVisibleRow(y, row, y + first);
-       }
-}
+       int const y = y_text - text->first_y + y_offset;
+
+       if (((y + row->height()) > 0) &&
+           ((y - row->height()) <= static_cast<int>(owner.height()))) {
+               // ok there is something visible
+#if 0
+               LyXText::text_status st = bv->text->status();
+               do {
+                       bv->text->status(bv, st);
+                       text->getVisibleRow(bv, y, x_offset, row,
+                                           y + text->first_y);
+               } while (!text->inset_owner &&
+                        text->status() == LyXText::CHANGED_IN_DRAW);
+               bv->text->status(bv, st);
 #else
-void LyXScreen::DrawOneRow(Row * row, long & y_text)
-{
-       long y = y_text - first;
-      
-       if (y + row->height > 0 && y - row->height <= long(owner.height())) {
-               /* ok there is something visible */
-               text->GetVisibleRow(y, row, y + first);
+               text->getVisibleRow(bv, y, x_offset, row, y + text->first_y);
+#endif
        }
-       y_text += row->height;
+       force_clear = false;
 }
-#endif
 
 
 /* draws the screen, starting with textposition y. uses as much already
-* printed pixels as possible */
-void LyXScreen::Draw(unsigned long y)
+ * printed pixels as possible */
+void LyXScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
 {
-       if (cursor_visible) HideCursor();
+       if (cursor_visible) hideCursor();
 
-       //if (y < 0) y = 0;
-       unsigned long old_first = first;
-       first = y;
+       int const old_first = text->first_y;
+       bool internal = (text == bv->text);
+       text->first_y = y;
 
-       /* is any optimiziation possible? */ 
+       // is any optimiziation possible?
        if ((y - old_first) < owner.height()
-           && (old_first - y) < owner.height()) {
-               if (first < old_first) {
-                       DrawFromTo(0, old_first - first);
-                       XCopyArea (fl_display,
+           && (old_first - y) < owner.height())
+       {
+               if (text->first_y < old_first) {
+                       drawFromTo(text, bv, 0,
+                                  old_first - text->first_y, 0, 0, internal);
+                       XCopyArea (fl_get_display(),
                                   owner.getWin(),
                                   owner.getWin(),
                                   gc_copy,
                                   owner.xpos(),
                                   owner.ypos(),
                                   owner.workWidth(),
-                                  owner.height() - old_first + first,
+                                  owner.height() - old_first + text->first_y,
                                   owner.xpos(),
-                                  owner.ypos() + old_first - first
+                                  owner.ypos() + old_first - text->first_y
                                );
                        // expose the area drawn
                        expose(0, 0,
                               owner.workWidth(),
-                              old_first - first);
+                              old_first - text->first_y);
                } else  {
-                       DrawFromTo(
-                               owner.height() + old_first - first,
-                                  owner.height());
-                       XCopyArea (fl_display,
+                       drawFromTo(text, bv,
+                                  owner.height() + old_first - text->first_y,
+                                  owner.height(), 0, 0, internal);
+                       XCopyArea (fl_get_display(),
                                   owner.getWin(),
                                   owner.getWin(),
                                   gc_copy,
                                   owner.xpos(),
-                                  owner.ypos() + first - old_first,
+                                  owner.ypos() + text->first_y - old_first,
                                   owner.workWidth(),
-                                  owner.height() + old_first - first,
+                                  owner.height() + old_first - text->first_y,
                                   owner.xpos(),
                                   owner.ypos());
                        // expose the area drawn
-                       expose(0, owner.height() + old_first - first,
-                              owner.workWidth(), first - old_first);
+                       expose(0, owner.height() + old_first - text->first_y,
+                              owner.workWidth(), text->first_y - old_first);
                }
        } else {
-               /* make a dumb new-draw */ 
-               DrawFromTo(0, owner.height());
+               // make a dumb new-draw
+               drawFromTo(text, bv, 0, owner.height(), 0, 0, internal);
                expose(0, 0, owner.workWidth(), owner.height());
        }
 }
 
 
-void LyXScreen::ShowCursor()
+void LyXScreen::showCursor(LyXText const * text, BufferView const * bv)
 {
        if (!cursor_visible) {
                Cursor_Shape shape = BAR_SHAPE;
                if (text->real_current_font.language() !=
-                   text->buffer->params.language_info
+                   bv->buffer()->params.language
                    || text->real_current_font.isVisibleRightToLeft()
-                   != text->buffer->params.language_info->RightToLeft)
+                   != bv->buffer()->params.language->RightToLeft())
                        shape = (text->real_current_font.isVisibleRightToLeft())
                                ? REVERSED_L_SHAPE : L_SHAPE;
-               ShowManualCursor(text->cursor.x, text->cursor.y,
+               showManualCursor(text, text->cursor.x(), text->cursor.y(),
                                 lyxfont::maxAscent(text->real_current_font),
                                 lyxfont::maxDescent(text->real_current_font),
                                 shape);
@@ -218,51 +254,53 @@ void LyXScreen::ShowCursor()
 }
 
 
-/* returns true if first has changed, otherwise false */ 
-bool LyXScreen::FitManualCursor(long /*x*/, long y, int asc, int desc)
+/* returns true if first has changed, otherwise false */
+bool LyXScreen::fitManualCursor(LyXText * text, BufferView * bv,
+                               int /*x*/, int y, int asc, int desc)
 {
-       long newtop = first;
-  
-       if (y + desc - first >= owner.height())
-               newtop = y - 3 * owner.height() / 4;   /* the scroll region must be so big!! */
-       else if (y - asc < long(first)
-               && first > 0) {
+       int newtop = text->first_y;
+
+       if (y + desc - text->first_y >= static_cast<int>(owner.height()))
+               newtop = y - 3 * owner.height() / 4;  // the scroll region must be so big!!
+       else if (y - asc < text->first_y
+               && text->first_y > 0) {
                newtop = y - owner.height() / 4;
        }
-       //if (newtop < 0)
-       newtop = max(newtop, 0L); // can newtop ever be < 0? (Lgb)
-  
-       if (newtop != long(first)) {
-               Draw(newtop);
-               first = newtop;
+
+       newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
+
+       if (newtop != text->first_y) {
+               draw(text, bv, newtop);
+               text->first_y = newtop;
                return true;
        }
        return false;
 }
 
 
-void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
-                                 Cursor_Shape shape)
+void LyXScreen::showManualCursor(LyXText const * text, int x, int y,
+                                int asc, int desc, Cursor_Shape shape)
 {
-       unsigned long y1 = max(y - first - asc, 0UL);
-       typedef unsigned long ulong;
-       
-       unsigned long y2 = min(y - first + desc, ulong(owner.height()));
+       // Update the cursor color.
+       setCursorColor();
+
+       int const y1 = max(y - text->first_y - asc, 0);
+       int const y_tmp = min(y - text->first_y + desc,
+                             static_cast<int>(owner.height()));
 
        // Secure against very strange situations
-       //if (y2 < y1) y2 = y1;
-       y2 = max(y2, y1);
-       
-       if (cursor_pixmap){
-               XFreePixmap(fl_display, cursor_pixmap);
+       int const y2 = max(y_tmp, y1);
+
+       if (cursor_pixmap) {
+               XFreePixmap(fl_get_display(), cursor_pixmap);
                cursor_pixmap = 0;
        }
 
-       if (y2 > 0 && y1 < owner.height()) {
+       if (y2 > 0 && y1 < int(owner.height())) {
                cursor_pixmap_h = y2 - y1 + 1;
                cursor_pixmap_y = y1;
 
-               switch(shape) {
+               switch (shape) {
                case BAR_SHAPE:
                        cursor_pixmap_w = 1;
                        cursor_pixmap_x = x;
@@ -277,13 +315,13 @@ void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
                        break;
                }
 
-               cursor_pixmap = 
-                       XCreatePixmap (fl_display,
+               cursor_pixmap =
+                       XCreatePixmap (fl_get_display(),
                                       fl_root,
                                       cursor_pixmap_w,
                                       cursor_pixmap_h,
                                       fl_get_visual_depth());
-               XCopyArea (fl_display,
+               XCopyArea (fl_get_display(),
                           owner.getWin(),
                           cursor_pixmap,
                           gc_copy,
@@ -292,20 +330,20 @@ void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
                           cursor_pixmap_w,
                           cursor_pixmap_h,
                           0, 0);
-               XDrawLine(fl_display,
+               XDrawLine(fl_get_display(),
                          owner.getWin(),
                          gc_copy,
                          x + owner.xpos(),
                          y1 + owner.ypos(),
                          x + owner.xpos(),
                          y2 + owner.ypos());
-               switch(shape) {
+               switch (shape) {
                case BAR_SHAPE:
                        break;
                case L_SHAPE:
                case REVERSED_L_SHAPE:
-                       int rectangle_h = (cursor_pixmap_h+10)/20;
-                       XFillRectangle(fl_display,
+                       int const rectangle_h = (cursor_pixmap_h + 10) / 20;
+                       XFillRectangle(fl_get_display(),
                                       owner.getWin(),
                                       gc_copy,
                                       cursor_pixmap_x + owner.xpos(),
@@ -319,16 +357,16 @@ void LyXScreen::ShowManualCursor(long x, long y, int asc, int desc,
 }
 
 
-void LyXScreen::HideCursor()
+void LyXScreen::hideCursor()
 {
        if (!cursor_visible) return;
 
-       if (cursor_pixmap){
-               XCopyArea (fl_display, 
+       if (cursor_pixmap) {
+               XCopyArea (fl_get_display(),
                           cursor_pixmap,
                           owner.getWin(),
                           gc_copy,
-                          0, 0, 
+                          0, 0,
                           cursor_pixmap_w, cursor_pixmap_h,
                           cursor_pixmap_x + owner.xpos(),
                           cursor_pixmap_y + owner.ypos());
@@ -337,220 +375,162 @@ void LyXScreen::HideCursor()
 }
 
 
-void LyXScreen::CursorToggle()
+void LyXScreen::cursorToggle(BufferView * bv) const
 {
        if (cursor_visible)
-               HideCursor();
+               bv->hideCursor();
        else
-               ShowCursor();
+               bv->showCursor();
 }
 
 
-/* returns a new top so that the cursor is visible */ 
-unsigned long LyXScreen::TopCursorVisible()
+/* returns a new top so that the cursor is visible */
+unsigned int LyXScreen::topCursorVisible(LyXText const * text)
 {
-       long newtop = first;
-
-       if (text->cursor.y
-           - text->cursor.row->baseline
-           + text->cursor.row->height
-           - first >= owner.height()) {
-               if (text->cursor.row->height < owner.height()
-                   && text->cursor.row->height > owner.height() / 4)
-                       newtop = text->cursor.y
-                               + text->cursor.row->height
-                               - text->cursor.row->baseline - owner.height();
-               else
-                       newtop = text->cursor.y
-                               - 3 * owner.height() / 4;   /* the scroll region must be so big!! */
-       } else if (text->cursor.y - text->cursor.row->baseline < first
-                  && first > 0) {
-               if (text->cursor.row->height < owner.height()
-                   && text->cursor.row->height > owner.height() / 4)
-                       newtop = text->cursor.y - text->cursor.row->baseline;
-               else {
-                       newtop = text->cursor.y - owner.height() / 4;
-                       //if (newtop > long(first))
-                       newtop = min(newtop, long(first));
+       int newtop = text->first_y;
+
+       Row * row = text->cursor.row();
+
+       // Is this a hack? Yes, probably... (Lgb)
+       if (!row)
+               return max(newtop, 0);
+
+       if (text->cursor.y() - row->baseline() + row->height()
+           - text->first_y >= owner.height()) {
+               if (row->height() < owner.height()
+                   && row->height() > owner.height() / 4) {
+                       newtop = text->cursor.y()
+                               + row->height()
+                               - row->baseline() - owner.height();
+               } else {
+                       // scroll down
+                       newtop = text->cursor.y()
+                               - owner.height() / 2;   /* the scroll region must be so big!! */
+               }
+
+       } else if (static_cast<int>((text->cursor.y()) - row->baseline()) <
+                  text->first_y && text->first_y > 0) {
+               if (row->height() < owner.height()
+                   && row->height() > owner.height() / 4) {
+                       newtop = text->cursor.y() - row->baseline();
+               } else {
+                       // scroll up
+                       newtop = text->cursor.y() - owner.height() / 2;
+                       newtop = min(newtop, text->first_y);
                }
        }
-       //if (newtop < 0)
-       //      newtop = 0;
-       newtop = max(newtop, 0L);
+
+       newtop = max(newtop, 0);
 
        return newtop;
 }
 
 
 /* scrolls the screen so that the cursor is visible, if necessary.
-* returns true if a change was made, otherwise false */ 
-bool LyXScreen::FitCursor()
+* returns true if a change was made, otherwise false */
+bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
 {
        // Is a change necessary?
-       unsigned long newtop = TopCursorVisible();
-       bool result = (newtop != first);
+       int const newtop = topCursorVisible(text);
+       bool const result = (newtop != text->first_y);
        if (result)
-               Draw(newtop);
+               draw(text, bv, newtop);
        return result;
 }
 
-   
-void LyXScreen::Update()
+
+void LyXScreen::update(LyXText * text, BufferView * bv,
+                      int y_offset, int x_offset)
 {
-#if 1
-       switch(text->status) {
+       switch (text->status()) {
        case LyXText::NEED_MORE_REFRESH:
        {
-               long y = max(text->refresh_y - long(first), 0L);
-               
-               DrawFromTo(y, owner.height());
+               int const y = max(int(text->refresh_y - text->first_y), 0);
+               drawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
                text->refresh_y = 0;
-               text->status = LyXText::UNCHANGED;
-               expose(0, y,
-                      owner.workWidth(), owner.height() - y);
+               // otherwise this is called ONLY from BufferView_pimpl(update)
+               // or we should see to set this flag accordingly
+               if (text != bv->text)
+                       text->status(bv, LyXText::UNCHANGED);
+               expose(0, y, owner.workWidth(), owner.height() - y);
        }
        break;
        case LyXText::NEED_VERY_LITTLE_REFRESH:
        {
-               /* ok I will update the current cursor row */
-               DrawOneRow(text->refresh_row, text->refresh_y);
-               text->status = LyXText::UNCHANGED;
-               expose(0, text->refresh_y - first,
-                      owner.workWidth(), text->refresh_row->height);
+               // ok I will update the current cursor row
+               drawOneRow(text, bv, text->refresh_row, text->refresh_y,
+                          y_offset, x_offset);
+               // this because if we had a major update the refresh_row could
+               // have been set to 0!
+               if (text->refresh_row) {
+                       // otherwise this is called ONLY from BufferView_pimpl(update)
+                       // or we should see to set this flag accordingly
+                       if (text != bv->text)
+                               text->status(bv, LyXText::UNCHANGED);
+                       expose(0, text->refresh_y - text->first_y + y_offset,
+                                  owner.workWidth(), text->refresh_row->height());
+               }
        }
        break;
+       case LyXText::CHANGED_IN_DRAW: // just to remove the warning
        case LyXText::UNCHANGED:
                // Nothing needs done
                break;
        }
-#else
-       if (text->status == LyXText::NEED_MORE_REFRESH
-           || screen_refresh_y > -1 ) {
-               long y = 0;
-               if (screen_refresh_y > -1
-                   && screen_refresh_y < text->refresh_y)
-                       y = screen_refresh_y;
-               else
-                       y = text->refresh_y;
-               
-               //if (y < first) y = first;
-               y = max(y, long(first));
-               
-               DrawFromTo(y - first, owner.height());
-               text->refresh_y = 0;
-               text->status = LyXText::UNCHANGED;
-               screen_refresh_y = -1;
-               expose(0, y - first,
-                      owner.workWidth(), owner.height() - (y - first));
-       } else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-               /* ok I will update the current cursor row */
-               long y = text->refresh_y;
-               DrawOneRow(text->refresh_row, y);
-               text->status = LyXText::UNCHANGED;
-               expose(0, text->refresh_y - first,
-                      owner.workWidth(), text->refresh_row->height);
-       }
-#endif
 }
 
 
-#if 0
-void LyXScreen::SmallUpdate()
+void LyXScreen::toggleSelection(LyXText * text, BufferView * bv,
+                               bool kill_selection,
+                               int y_offset, int x_offset)
 {
-#if 1
-       Update();
-#else
-       if (text->status == LyXText::NEED_MORE_REFRESH) {
-               /* ok I will update till the current cursor row */
-               Row * row = text->refresh_row;
-               long y = text->refresh_y;
-               long y2 = y;
-      
-               if (y > long(text->cursor.y)) {
-                       Update();
-                       return;
-               }
-        
-               while (row
-                      && row != text->cursor.row
-                      && y < long(first + owner.height())) {
-                       DrawOneRow(row, y);
-                       row = row->next;
-               }
-      
-               DrawOneRow(row, y);
-               screen_refresh_y = y;
-               screen_refresh_row = row->next;
-               text->status = LyXText::UNCHANGED;
-               // Is the right regin exposed?
-               expose(0, y2 - first,
-                      owner.workWidth(), y - y2);
-       } else if (text->status == LyXText::NEED_VERY_LITTLE_REFRESH) {
-               /* ok I will update the current cursor row */
-               long y = text->refresh_y;
-               DrawOneRow(text->refresh_row, y);
-               text->status = LyXText::UNCHANGED;
-               expose(0, text->refresh_y - first,
-                      owner.workWidth(), text->refresh_row->height);
-       }
-#endif
-}
-#endif
-
-
-void LyXScreen::ToggleSelection(bool kill_selection)
-{
-       /* only if there is a selection */ 
-       if (!text->selection) return;
-
-       //long top = text->sel_start_cursor.y
-       //      - text->sel_start_cursor.row->baseline;
-       //long bottom = text->sel_end_cursor.y
-       //      - text->sel_end_cursor.row->baseline 
-       //      + text->sel_end_cursor.row->height;
-
-       //top = max(top, first);
-       //bottom = max(bottom, first);
-       
-       //bottom = min(max(bottom, first), first + owner.height());
-       //top = min(max(top, first), first + owner.height());
-       long bottom = min(max(text->sel_end_cursor.y
-                             - text->sel_end_cursor.row->baseline
-                             + text->sel_end_cursor.row->height, first),
-                         first + owner.height());
-       long top = min(max(text->sel_start_cursor.y
-                          - text->sel_start_cursor.row->baseline, first),
-                      first + owner.height());
+       // only if there is a selection
+       if (!text->selection.set()) return;
+
+       int const bottom = min(
+               max(static_cast<int>(text->selection.end.y()
+                                    - text->selection.end.row()->baseline()
+                                    + text->selection.end.row()->height()),
+                   text->first_y),
+               static_cast<int>(text->first_y + owner.height()));
+       int const top = min(
+               max(static_cast<int>(text->selection.start.y() -
+                                    text->selection.start.row()->baseline()),
+                   text->first_y),
+               static_cast<int>(text->first_y + owner.height()));
 
        if (kill_selection)
-               text->selection = 0;
-       DrawFromTo(top - first, bottom - first);
-       expose(0, top - first,
+               text->selection.set(false);
+       drawFromTo(text, bv, top - text->first_y, bottom - text->first_y,
+                  y_offset, x_offset);
+       expose(0, top - text->first_y,
               owner.workWidth(),
-              bottom - first - (top - first));
+              bottom - text->first_y - (top - text->first_y));
 }
-  
-   
-void LyXScreen::ToggleToggle()
+
+
+void LyXScreen::toggleToggle(LyXText * text, BufferView * bv,
+                            int y_offset, int x_offset)
 {
-       if (text->toggle_cursor.par == text->toggle_end_cursor.par
-           && text->toggle_cursor.pos == text->toggle_end_cursor.pos)
+       if (text->toggle_cursor.par() == text->toggle_end_cursor.par()
+           && text->toggle_cursor.pos() == text->toggle_end_cursor.pos())
                return;
+
+       int const top_tmp = text->toggle_cursor.y()
+               - text->toggle_cursor.row()->baseline();
+       int const bottom_tmp = text->toggle_end_cursor.y()
+               - text->toggle_end_cursor.row()->baseline()
+               + text->toggle_end_cursor.row()->height();
+
+       int const offset = y_offset < 0 ? y_offset : 0;
+       int const bottom = min(max(bottom_tmp, text->first_y),
+                    static_cast<int>(text->first_y + owner.height()))-offset;
+       int const top = min(max(top_tmp, text->first_y),
+                 static_cast<int>(text->first_y + owner.height()))-offset;
        
-       long top = text->toggle_cursor.y
-               - text->toggle_cursor.row->baseline;
-       long bottom = text->toggle_end_cursor.y
-               - text->toggle_end_cursor.row->baseline 
-               + text->toggle_end_cursor.row->height;
-       
-       //top = max(top, first);
-       //bottom = max(bottom, first);
-       typedef unsigned long ulong;
-       
-       bottom = min(max(ulong(bottom), first), first + owner.height());
-       top = min(max(ulong(top), first), first + owner.height());
-       
-       DrawFromTo(top - first, bottom - first);
-       expose(0, top - first, owner.workWidth(),
-              bottom - first - (top - first));
+       drawFromTo(text, bv, top - text->first_y,
+                  bottom - text->first_y, y_offset,
+                  x_offset);
+       expose(0, top - text->first_y, owner.workWidth(),
+              bottom - text->first_y - (top - text->first_y));
 }