Fix Qt crash

[lyx.git] / src / frontends / screen.C

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 2e65048011e3e529e3fcf914e2cfd408ee832c37..93f7064ef7503bda204930f8f543919b14e28052 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -10,9 +10,6 @@
  * Splash screen code added by Angus Leeming
  */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <config.h>
 
@@ -27,6 +24,7 @@
 #include "font_metrics.h"
 #include "language.h"
 #include "debug.h"
+#include "rowpainter.h"
 
 // Splash screen-specific stuff
 #include "lyxfont.h"
@@ -57,6 +55,15 @@ public:
        string const & text() const { return text_; }
        ///
        LyXFont const & font() const { return font_; }
+       ///
+       void connect(grfx::Loader::slot_type const & slot) const {
+               loader_.connect(slot);
+       }
+       ///
+       void startLoading() const {
+               if (loader_.status() == grfx::WaitingToLoad)
+                       loader_.startLoading();
+       }
 
 private:
        /** Make the c-tor private so we can control how many objects
@@ -86,7 +93,7 @@ SplashScreen::SplashScreen()
        if (!lyxrc.show_banner)
                return;
 
-       string const file = LibFileSearch("images", "banner", "xpm");
+       string const file = LibFileSearch("images", "banner", "ppm");
        if (file.empty())
                return;
 
@@ -98,22 +105,20 @@ SplashScreen::SplashScreen()
 
        // Load up the graphics file
        loader_.reset(file);
-       // We aren't interested here in when the image is loaded.
-       // If it isn't ready when we want it, then we ignore it.
-//     loader_->statusChanged.connect(
-//                     boost::bind(&SplashScreen::statusChanged, this));
-       if (loader_.status() == grfx::WaitingToLoad)
-               loader_.startLoading();
 }
 
 } // namespace anon
 
 
 LyXScreen::LyXScreen()
-       : force_clear_(true), cursor_visible_(false)
+       : cursor_visible_(false), force_clear_(true), greyed_out_(true)
 {
        // Start loading the pixmap as soon as possible
-       SplashScreen::get();
+       if (lyxrc.show_banner) {
+               SplashScreen const & splash = SplashScreen::get();
+               splash.connect(boost::bind(&LyXScreen::greyOut, this));
+               splash.startLoading();
+       }
 }
 
 
@@ -354,15 +359,15 @@ void LyXScreen::toggleToggle(LyXText * text, BufferView * bv,
 
 void LyXScreen::redraw(LyXText * text, BufferView * bv)
 {
-       workarea().getPainter().start();
+       greyed_out_ = !text;
 
-       if (!text) {
+       if (greyed_out_) {
                greyOut();
-               expose(0, 0, workarea().workWidth(), workarea().workHeight());
-               workarea().getPainter().end();
                return;
        }
 
+       workarea().getPainter().start();
+
        drawFromTo(text, bv, 0, workarea().workHeight(), 0, 0, text == bv->text);
        expose(0, 0, workarea().workWidth(), workarea().workHeight());
 
@@ -377,6 +382,11 @@ void LyXScreen::redraw(LyXText * text, BufferView * bv)
 
 void LyXScreen::greyOut()
 {
+       if (!greyed_out_)
+               return;
+
+       workarea().getPainter().start();
+
        workarea().getPainter().fillRectangle(0, 0,
                workarea().workWidth(),
                workarea().workHeight(),
@@ -402,6 +412,8 @@ void LyXScreen::greyOut()
 
                workarea().getPainter().text(x, y, splash_text, splash_font);
        }
+       expose(0, 0, workarea().workWidth(), workarea().workHeight());
+       workarea().getPainter().end();
 }
 
 
@@ -422,16 +434,23 @@ void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
 
        while (row != 0 && y < y2) {
                LyXText::text_status st = text->status();
-               text->getVisibleRow(bv, y + yo,
-                                   xo, row, y + text->first_y);
+               // we need this here as the row pointer may be illegal
+               // at a later time (Jug20020502)
+               Row * prev = row->previous();
+               RowPainter rp(*bv, *text, *row);
+               if (rp.paint(y + yo, xo, y + text->first_y))
+                       text->markChangeInDraw(bv, row, prev);
+
                internal = internal && (st != LyXText::CHANGED_IN_DRAW);
                while (internal && text->status() == LyXText::CHANGED_IN_DRAW) {
                        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 + yo,
-                                           xo, row, y + text->first_y);
+                       Row * prev = row->previous();
+                       RowPainter rp(*bv, *text, *row);
+                       if (rp.paint(y + yo, xo, y + text->first_y))
+                               text->markChangeInDraw(bv, row, prev);
                }
                y += row->height();
                row = row->next();
@@ -439,7 +458,7 @@ void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
        force_clear_ = false;
 
        // maybe we have to clear the screen at the bottom
-       if ((y < y2) && text->bv_owner) {
+       if ((y < y2) && text->isTopLevel()) {
                workarea().getPainter().fillRectangle(0, y,
                        workarea().workWidth(), y2 - y,
                        LColor::bottomarea);
@@ -454,7 +473,10 @@ void LyXScreen::drawOneRow(LyXText * text, BufferView * bv, Row * row,
 
        if (((y + row->height()) > 0) &&
            ((y - row->height()) <= static_cast<int>(workarea().workHeight()))) {
-               text->getVisibleRow(bv, y, xo, row, y + text->first_y);
+               Row * prev = row->previous();
+               RowPainter rp(*bv, *text, *row);
+               if (rp.paint(y, xo, y + text->first_y))
+                       text->markChangeInDraw(bv, row, prev);
        }
        force_clear_ = false;
 }