]> 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 d09e3d42ed0767a8d5986c971618804574a4041e..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
 *
@@ -36,14 +36,14 @@ namespace {
 GC createGC()
 {
        XGCValues val;
-       val.foreground = BlackPixel(fl_get_display(), 
+       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_get_display(), RootWindow(fl_get_display(), 0), 
+       return XCreateGC(fl_get_display(), RootWindow(fl_get_display(), 0),
                         GCForeground | GCFunction | GCGraphicsExposures
                         | GCLineWidth | GCLineStyle , &val);
 }
@@ -73,13 +73,13 @@ LyXScreen::~LyXScreen()
        XFreeGC(fl_get_display(), gc_copy);
 }
 
-void LyXScreen::setCursorColor() 
+
+void LyXScreen::setCursorColor()
 {
        if (!lyxColorHandler.get()) return;
 
        GC gc = lyxColorHandler->getGCForeground(LColor::cursor);
-       
+
        XGCValues val;
        XGetGCValues(fl_get_display(),
                     gc, GCForeground, &val);
@@ -89,11 +89,11 @@ void LyXScreen::setCursorColor()
 
 void LyXScreen::redraw(LyXText * text, BufferView * bv)
 {
-       drawFromTo(text, bv, 0, owner.height());
+       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(text, bv);
+               bv->showCursor();
        }
 }
 
@@ -112,25 +112,32 @@ void LyXScreen::expose(int x, int y, int exp_width, int exp_height)
 
 
 void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
-                          int y1, int y2, int y_offset, int x_offset)
+                          int y1, int y2, int y_offset, int x_offset,
+                          bool internal)
 {
-       int y_text = text->first + y1;
-   
-       // get the first needed row 
+       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;
+
+       int y = y_text - text->first_y;
        // y1 is now the real beginning of row on the screen
-       
+
        while (row != 0 && y < y2) {
-               LyXText::text_status st = bv->text->status();
-               do {
-                       bv->text->status(bv, st);
+               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);
-               } while (bv->text->status() == LyXText::CHANGED_IN_DRAW);
-               bv->text->status(bv, st);
+                                           x_offset, row, y + text->first_y);
+               }
                y += row->height();
                row = row->next();
        }
@@ -149,37 +156,45 @@ void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
 void LyXScreen::drawOneRow(LyXText * text, BufferView * bv, Row * row,
                           int y_text, int y_offset, int x_offset)
 {
-       int const y = y_text - text->first + y_offset;
+       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);
-               } while (bv->text->status() == LyXText::CHANGED_IN_DRAW);
+                                           y + text->first_y);
+               } while (!text->inset_owner &&
+                        text->status() == LyXText::CHANGED_IN_DRAW);
                bv->text->status(bv, st);
+#else
+               text->getVisibleRow(bv, y, x_offset, row, y + text->first_y);
+#endif
        }
        force_clear = false;
 }
 
 
 /* draws the screen, starting with textposition y. uses as much already
-* printed pixels as possible */
+ * printed pixels as possible */
 void LyXScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
 {
        if (cursor_visible) hideCursor();
 
-       int const old_first = text->first;
-       text->first = y;
+       int const old_first = text->first_y;
+       bool internal = (text == bv->text);
+       text->first_y = y;
 
        // is any optimiziation possible?
        if ((y - old_first) < owner.height()
-           && (old_first - y) < owner.height()) {
-               if (text->first < old_first) {
-                       drawFromTo(text, bv, 0, old_first - text->first);
+           && (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(),
@@ -187,35 +202,35 @@ void LyXScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
                                   owner.xpos(),
                                   owner.ypos(),
                                   owner.workWidth(),
-                                  owner.height() - old_first + text->first,
+                                  owner.height() - old_first + text->first_y,
                                   owner.xpos(),
-                                  owner.ypos() + old_first - text->first
+                                  owner.ypos() + old_first - text->first_y
                                );
                        // expose the area drawn
                        expose(0, 0,
                               owner.workWidth(),
-                              old_first - text->first);
+                              old_first - text->first_y);
                } else  {
                        drawFromTo(text, bv,
-                                  owner.height() + old_first - text->first,
-                                  owner.height());
+                                  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() + text->first - old_first,
+                                  owner.ypos() + text->first_y - old_first,
                                   owner.workWidth(),
-                                  owner.height() + old_first - text->first,
+                                  owner.height() + old_first - text->first_y,
                                   owner.xpos(),
                                   owner.ypos());
                        // expose the area drawn
-                       expose(0, owner.height() + old_first - text->first,
-                              owner.workWidth(), text->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(text, bv, 0, owner.height());
+               // make a dumb new-draw
+               drawFromTo(text, bv, 0, owner.height(), 0, 0, internal);
                expose(0, 0, owner.workWidth(), owner.height());
        }
 }
@@ -239,24 +254,24 @@ void LyXScreen::showCursor(LyXText const * text, BufferView const * bv)
 }
 
 
-/* returns true if first has changed, otherwise false */ 
+/* returns true if first has changed, otherwise false */
 bool LyXScreen::fitManualCursor(LyXText * text, BufferView * bv,
                                int /*x*/, int y, int asc, int desc)
 {
-       int newtop = text->first;
-  
-       if (y + desc - text->first >= static_cast<int>(owner.height()))
+       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 < static_cast<int>(text->first)
-               && text->first > 0) {
+       else if (y - asc < text->first_y
+               && text->first_y > 0) {
                newtop = y - owner.height() / 4;
        }
 
        newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
-  
-       if (newtop != static_cast<int>(text->first)) {
+
+       if (newtop != text->first_y) {
                draw(text, bv, newtop);
-               text->first = newtop;
+               text->first_y = newtop;
                return true;
        }
        return false;
@@ -268,15 +283,15 @@ void LyXScreen::showManualCursor(LyXText const * text, int x, int y,
 {
        // Update the cursor color.
        setCursorColor();
-       
-       int const y1 = max(y - text->first - asc, 0);
-       int const y_tmp = min(y - text->first + desc,
+
+       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
        int const y2 = max(y_tmp, y1);
-       
-       if (cursor_pixmap){
+
+       if (cursor_pixmap) {
                XFreePixmap(fl_get_display(), cursor_pixmap);
                cursor_pixmap = 0;
        }
@@ -300,7 +315,7 @@ void LyXScreen::showManualCursor(LyXText const * text, int x, int y,
                        break;
                }
 
-               cursor_pixmap = 
+               cursor_pixmap =
                        XCreatePixmap (fl_get_display(),
                                       fl_root,
                                       cursor_pixmap_w,
@@ -346,12 +361,12 @@ void LyXScreen::hideCursor()
 {
        if (!cursor_visible) return;
 
-       if (cursor_pixmap){
-               XCopyArea (fl_get_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());
@@ -360,41 +375,48 @@ void LyXScreen::hideCursor()
 }
 
 
-void LyXScreen::cursorToggle(LyXText const * text, BufferView const * bv)
+void LyXScreen::cursorToggle(BufferView * bv) const
 {
        if (cursor_visible)
-               hideCursor();
+               bv->hideCursor();
        else
-               showCursor(text, bv);
+               bv->showCursor();
 }
 
 
-/* returns a new top so that the cursor is visible */ 
+/* returns a new top so that the cursor is visible */
 unsigned int LyXScreen::topCursorVisible(LyXText const * text)
 {
-       int newtop = text->first;
-
-       if (text->cursor.y()
-           - text->cursor.row()->baseline()
-           + text->cursor.row()->height()
-           - text->first >= owner.height()) {
-               if (text->cursor.row()->height() < owner.height()
-                   && text->cursor.row()->height() > owner.height() / 4)
+       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()
-                               + text->cursor.row()->height()
-                               - text->cursor.row()->baseline() - owner.height();
-               else
+                               + row->height()
+                               - row->baseline() - owner.height();
+               } else {
+                       // scroll down
                        newtop = text->cursor.y()
-                               - 3 * owner.height() / 4;   /* the scroll region must be so big!! */
-       } else if (static_cast<int>((text->cursor.y()) - text->cursor.row()->baseline()) <
-                  text->first && text->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;
-                       newtop = min(newtop, int(text->first));
+                               - 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);
                }
        }
 
@@ -405,28 +427,31 @@ unsigned int LyXScreen::topCursorVisible(LyXText const * text)
 
 
 /* scrolls the screen so that the cursor is visible, if necessary.
-* returns true if a change was made, otherwise false */ 
+* returns true if a change was made, otherwise false */
 bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
 {
        // Is a change necessary?
        int const newtop = topCursorVisible(text);
-       bool const result = (newtop != text->first);
+       bool const result = (newtop != text->first_y);
        if (result)
                draw(text, bv, newtop);
        return result;
 }
 
-   
+
 void LyXScreen::update(LyXText * text, BufferView * bv,
                       int y_offset, int x_offset)
 {
        switch (text->status()) {
        case LyXText::NEED_MORE_REFRESH:
        {
-               int const y = max(int(text->refresh_y - text->first), 0);
+               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(bv, LyXText::UNCHANGED);
+               // 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;
@@ -435,9 +460,16 @@ void LyXScreen::update(LyXText * text, BufferView * bv,
                // ok I will update the current cursor row
                drawOneRow(text, bv, text->refresh_row, text->refresh_y,
                           y_offset, x_offset);
-               text->status(bv, LyXText::UNCHANGED);
-               expose(0, text->refresh_y - text->first + y_offset,
-                      owner.workWidth(), text->refresh_row->height());
+               // 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
@@ -459,44 +491,46 @@ void LyXScreen::toggleSelection(LyXText * text, BufferView * bv,
                max(static_cast<int>(text->selection.end.y()
                                     - text->selection.end.row()->baseline()
                                     + text->selection.end.row()->height()),
-                   text->first),
-               static_cast<int>(text->first + owner.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),
-               static_cast<int>(text->first + owner.height()));
+                   text->first_y),
+               static_cast<int>(text->first_y + owner.height()));
 
        if (kill_selection)
                text->selection.set(false);
-       drawFromTo(text, bv, top - text->first, bottom - text->first,
+       drawFromTo(text, bv, top - text->first_y, bottom - text->first_y,
                   y_offset, x_offset);
-       expose(0, top - text->first,
+       expose(0, top - text->first_y,
               owner.workWidth(),
-              bottom - text->first - (top - text->first));
+              bottom - text->first_y - (top - text->first_y));
 }
-  
-   
+
+
 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())
                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()->baseline()
                + text->toggle_end_cursor.row()->height();
-       
-       int const bottom = min(max(bottom_tmp, text->first),
-                    static_cast<int>(text->first + owner.height()));
-       int const top = min(max(top_tmp, text->first),
-                 static_cast<int>(text->first + owner.height()));
 
-       drawFromTo(text, bv, top - text->first, bottom - text->first, y_offset,
+       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;
+       
+       drawFromTo(text, bv, top - text->first_y,
+                  bottom - text->first_y, y_offset,
                   x_offset);
-       expose(0, top - text->first, owner.workWidth(),
-              bottom - text->first - (top - text->first));
+       expose(0, top - text->first_y, owner.workWidth(),
+              bottom - text->first_y - (top - text->first_y));
 }