Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / qscreen.C

diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C
index 3e9dbc32be7741505aa88ba403674b2942a747d5..ab6fb8c24bbff3d7bcfffb8b125096c31afec8cf 100644 (file)
--- a/src/frontends/qt2/qscreen.C
+++ b/src/frontends/qt2/qscreen.C
@@ -1,9 +1,11 @@
 /**
  * \file qscreen.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -13,9 +15,9 @@
 #endif
 
 #include <algorithm>
-#include <iostream> 
+#include <iostream>
 
-#include "LColor.h" 
+#include "LColor.h"
 #include "QWorkArea.h"
 #include "qscreen.h"
 #include "lyxtext.h"
@@ -24,6 +26,8 @@
 #include "insets/insettext.h"
 #include "debug.h"
 
+#include <qapplication.h>
+
 using std::endl;
 using std::max;
 using std::min;
@@ -33,15 +37,12 @@ namespace {
 /// copy some horizontal regions about inside a pixmap
 void copyInPixmap(QPixmap * p, int dest_y, int src_y, int src_w, int src_h)
 {
-       bitBlt(p,
-               0, dest_y,   // dest x,y
-               p, 0, src_y, // source x, y
-               src_w, src_h // source w, h
-               );
+       // bitBlt(dest, dest_x, dest_y, source, src_x, src_y, src_w, src_h)
+       bitBlt(p, 0, dest_y, p, 0, src_y, src_w, src_h);
 }
- 
+
 } // namespace anon
- 
+
 
 QScreen::QScreen(QWorkArea & o)
        : LyXScreen(), owner_(o)
@@ -53,17 +54,20 @@ QScreen::~QScreen()
 {
 }
 
- 
+
 void QScreen::showManualCursor(LyXText const * text, int x, int y,
                                 int asc, int desc, Cursor_Shape shape)
 {
+       if (!qApp->focusWidget())
+               return;
+
        int const y1 = max(y - text->first_y - asc, 0);
        int const y_tmp = min(y - text->first_y + desc, owner_.height());
 
        // secure against very strange situations
-       // which would be when .... ? 
+       // which would be when .... ?
        int const y2 = max(y_tmp, y1);
-       
+
        if (y2 > 0 && y1 < owner_.height()) {
                cursor_h_ = y2 - y1 + 1;
                cursor_y_ = y1;
@@ -83,19 +87,19 @@ void QScreen::showManualCursor(LyXText const * text, int x, int y,
                        break;
                }
 
-               if (!nocursor_pixmap_.get() 
+               if (!nocursor_pixmap_.get()
                        || cursor_w_ != nocursor_pixmap_->width()
                        || cursor_h_ != nocursor_pixmap_->height()) {
                        nocursor_pixmap_.reset(new QPixmap(cursor_w_, cursor_h_));
                }
- 
+
                owner_.getPainter().start();
 
-               // save old area 
+               // save old area
                bitBlt(nocursor_pixmap_.get(), 0, 0, owner_.getPixmap(),
                        cursor_x_, cursor_y_, cursor_w_, cursor_h_);
- 
-               owner_.getPainter().line(x, y1, x, y2);
+
+               owner_.getPainter().line(x, y1, x, y2, LColor::cursor);
                switch (shape) {
                case BAR_SHAPE:
                        break;
@@ -107,12 +111,12 @@ void QScreen::showManualCursor(LyXText const * text, int x, int y,
                                cursor_w_ - 1, rectangle_h, LColor::cursor);
                        break;
                }
- 
+
                owner_.getPainter().end();
- 
+
                owner_.getContent()->repaint(
                        cursor_x_, cursor_y_,
-                       cursor_w_, cursor_h_); 
+                       cursor_w_, cursor_h_);
 
        }
        cursor_visible_ = true;
@@ -121,43 +125,54 @@ void QScreen::showManualCursor(LyXText const * text, int x, int y,
 
 void QScreen::hideCursor()
 {
-       if (!cursor_visible_) 
+       if (!cursor_visible_)
                return;
 
-       bitBlt(owner_.getPixmap(), cursor_x_, cursor_y_, 
+       bitBlt(owner_.getPixmap(), cursor_x_, cursor_y_,
                nocursor_pixmap_.get(), 0, 0, cursor_w_, cursor_h_);
- 
+
        owner_.getContent()->repaint(
                cursor_x_, cursor_y_,
-               cursor_w_, cursor_h_); 
- 
+               cursor_w_, cursor_h_);
+
        cursor_visible_ = false;
 }
 
- 
-void QScreen::expose(int x, int y, int exp_width, int exp_height)
+
+void QScreen::repaint()
+{
+       QWidget * content(owner_.getContent());
+       content->repaint(0, 0, content->width(), content->height());
+}
+
+
+void QScreen::expose(int x, int y, int w, int h)
 {
-       lyxerr[Debug::GUI] << "expose " << exp_width << "x" << exp_height
-               << "+" << x << "+" << y << endl;
-       owner_.getContent()->update(x, y, exp_width, exp_height);
+       lyxerr[Debug::GUI] << "expose " << w << 'x' << h
+               << '+' << x << '+' << y << endl;
+
+       owner_.getContent()->update(x, y, w, h);
 }
 
 
 void QScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
 {
        QPixmap * p(owner_.getPixmap());
- 
+
        owner_.getPainter().start();
- 
+
        if (cursor_visible_) hideCursor();
 
        int const old_first = text->first_y;
        bool const internal = (text == bv->text);
        text->first_y = y;
 
+       // If you want to fix the warning below, fix it so it
+       // actually scrolls properly. Hint: a cast won't do.
+
        // is any optimization possible?
-       if ((y - old_first) < owner_.workHeight()
-           && (old_first - y) < owner_.workHeight()) {
+       if (y - old_first < owner_.workHeight()
+           && old_first - y < owner_.workHeight()) {
                if (text->first_y < old_first) {
                        int const dest_y = old_first - text->first_y;
                        drawFromTo(text, bv, 0, dest_y, 0, 0, internal);
@@ -170,10 +185,10 @@ void QScreen::draw(LyXText * text, BufferView * bv, unsigned int y)
                        expose(0, owner_.height() - src_y, owner_.workWidth(), src_y);
                }
        } else {
-               // make a dumb redraw
+               lyxerr[Debug::GUI] << "dumb full redraw" << endl;
                drawFromTo(text, bv, 0, owner_.height(), 0, 0, internal);
-               expose(0, 0, owner_.workWidth(), owner_.height());
+               repaint();
        }
- 
+
        owner_.getPainter().end();
 }