#include "QLyXKeySym.h"
#include "qt_helpers.h"
+#include "gettext.h"
#include "LyXView.h"
#include "BufferView.h"
#include "support/filetools.h" // LibFileSearch
#include "support/os.h"
+#include "support/convert.h"
#include "graphics/GraphicsImage.h"
#include "graphics/GraphicsLoader.h"
#include <QMimeData>
#include <QUrl>
#include <QDragEnterEvent>
-#include <QPixmap>
#include <QPainter>
#include <QScrollBar>
#include <boost/bind.hpp>
#include <boost/current_function.hpp>
-// Abdel (26/06/2006):
-// On windows-XP the UserGuide PageDown scroll test is faster without event pruning (16 s)
-// than with it (23 s).
#ifdef Q_WS_WIN
- #define USE_EVENT_PRUNING 0
+int const CursorWidth = 2;
#else
- #define USE_EVENT_PRUNING 0
+int const CursorWidth = 1;
#endif
namespace lyx {
+using support::FileName;
+
/// return the LyX key state from Qt's
static key_modifier::state q_key_state(Qt::KeyboardModifiers state)
{
/// return the LyX mouse button state from Qt's
-mouse_button::state q_motion_state(Qt::MouseButton state)
+mouse_button::state q_motion_state(Qt::MouseButtons state)
{
mouse_button::state b = mouse_button::none;
if (state & Qt::LeftButton)
namespace frontend {
-class CursorWidget : public QWidget {
+class CursorWidget {
public:
- CursorWidget(QWidget * parent)
- : QWidget(parent)
+ CursorWidget() {}
+
+ void draw(QPainter & painter)
{
- resize(2, 20);
+ // FIXME: do something depending on the cursor shape.
+ if (show_ && rect_.isValid())
+ painter.fillRect(rect_, color_);
}
- void paintEvent(QPaintEvent *)
+ void update(int x, int y, int h, CursorShape shape)
{
- QColor const & col = guiApp->colorCache().get(LColor::cursor);
+ color_ = guiApp->colorCache().get(LColor::cursor);
+ rect_ = QRect(x, y, CursorWidth, h);
+ shape_ = shape;
+ }
-/*
- int cursor_w_;
- int cursor_h_;
+ void show(bool set_show = true) { show_ = set_show; }
+ void hide() { show_ = false; }
- switch (cursor_shape_) {
- case BAR_SHAPE:
- // FIXME the cursor width shouldn't be hard-coded!
- cursor_w_ = 2;
- lshape_cursor_ = false;
- break;
- case L_SHAPE:
- cursor_w_ = cursor_h_ / 3;
- lshape_cursor_ = true;
- break;
- case REVERSED_L_SHAPE:
- cursor_w_ = cursor_h_ / 3;
- //cursor_x_ -= cursor_w_ - 1;
- lshape_cursor_ = true;
- break;
- }
-*/
-
- // We cache two pixmaps:
- // 1 the vertical line of the cursor.
- // 2 the horizontal line of the L-shaped cursor (if necessary).
-
- // Draw the new (vertical) cursor.
- QPainter pain(this);
- pain.fillRect(rect(), col);
-/*
- // Draw the new (horizontal) cursor if necessary.
- if (lshape_cursor_) {
- hcursor_ = QPixmap(cursor_w_, 1);
- hcursor_.fill(col);
- show_hcursor_ = true;
- }
-*/
- }
- /// shown?
- bool on_;
+ QRect const & rect() { return rect_; }
+
+private:
///
CursorShape shape_;
+ ///
+ bool show_;
+ ///
+ QColor color_;
+ ///
+ QRect rect_;
};
GuiWorkArea::GuiWorkArea(int w, int h, int id, LyXView & lyx_view)
: WorkArea(id, lyx_view)
{
- cursor_ = new frontend::CursorWidget(this);
+ cursor_ = new frontend::CursorWidget();
cursor_->hide();
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setAcceptDrops(true);
+ setMouseTracking(true);
setMinimumSize(100, 70);
- //viewport()->setAutoFillBackground(false);
- //viewport()->setAttribute(Qt::WA_OpaquePaintEvent);
+ viewport()->setAutoFillBackground(false);
+ // We don't need double-buffering nor SystemBackground on
+ // the viewport because we have our own backing pixmap.
+ viewport()->setAttribute(Qt::WA_NoSystemBackground);
+
setFocusPolicy(Qt::WheelFocus);
viewport()->setCursor(Qt::IBeamCursor);
<< "\n viewport height\t" << viewport()->height()
<< endl;
- if (USE_EVENT_PRUNING) {
- // This is the keyboard buffering stuff...
- // I don't see any need for this under windows. The keyboard is reactive
- // enough...
-
- if ( !QObject::connect(&step_timer_, SIGNAL(timeout()),
- this, SLOT(keyeventTimeout())) )
- lyxerr[Debug::GUI] << "ERROR: keyeventTimeout cannot connect!" << endl;
-
- // Start the timer, one-shot.
- step_timer_.setSingleShot(true);
- step_timer_.start(50);
- }
-
// Enables input methods for asian languages.
// Must be set when creating custom text editing widgets.
setAttribute(Qt::WA_InputMethodEnabled, true);
void GuiWorkArea::setScrollbarParams(int h, int scroll_pos, int scroll_line_step)
{
+ if (verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOn)
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+
verticalScrollBar()->setTracking(false);
// do what cursor movement does (some grey)
void GuiWorkArea::focusInEvent(QFocusEvent * /*event*/)
{
+ // No need to do anything if we didn't change views...
+// if (theApp() == 0 || &lyx_view_ == theApp()->currentView())
+// return;
+
+ theApp()->setCurrentView(lyx_view_);
+
+ // FIXME: it would be better to send a signal "newBuffer()"
+ // in BufferList that could be connected to the different tabbars.
+ lyx_view_.updateTab();
+
startBlinkingCursor();
}
void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
{
FuncRequest cmd(LFUN_MOUSE_MOTION, e->x(), e->y(),
- q_motion_state(e->button()));
+ q_motion_state(e->buttons()));
// If we're above or below the work area...
if (e->y() <= 20 || e->y() >= viewport()->height() - 20) {
<< " key=" << e->key()
<< endl;
- if (USE_EVENT_PRUNING) {
- keyeventQueue_.push(boost::shared_ptr<QKeyEvent>(new QKeyEvent(*e)));
- }
- else {
- boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
- sym->set(e);
- processKeySym(sym, q_key_state(e->modifiers()));
- }
-}
-
-
-// This is used only if USE_EVENT_PRUNING is defined...
-void GuiWorkArea::keyeventTimeout()
-{
- bool handle_autos = true;
-
- while (!keyeventQueue_.empty()) {
- boost::shared_ptr<QKeyEvent> ev = keyeventQueue_.front();
-
- // We never handle more than one auto repeated
- // char in a list of queued up events.
- if (!handle_autos && ev->isAutoRepeat()) {
- keyeventQueue_.pop();
- continue;
- }
-
- boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
- sym->set(ev.get());
-
- lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
- << " count=" << ev->count()
- << " text=" << fromqstr(ev->text())
- << " isAutoRepeat=" << ev->isAutoRepeat()
- << " key=" << ev->key()
- << endl;
-
- processKeySym(sym, q_key_state(ev->modifiers()));
- keyeventQueue_.pop();
-
- handle_autos = false;
- }
-
- // Restart the timer.
- step_timer_.setSingleShot(true);
- step_timer_.start(25);
+ boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
+ sym->set(e);
+ processKeySym(sym, q_key_state(e->modifiers()));
}
void GuiWorkArea::resizeEvent(QResizeEvent * ev)
{
- cursor_->hide();
+ stopBlinkingCursor();
+ screen_ = QPixmap(ev->size().width(), ev->size().height());
verticalScrollBar()->setPageStep(viewport()->height());
- //paint_device_ = QPixmap(viewport()->width(), viewport()->height());
QAbstractScrollArea::resizeEvent(ev);
resizeBufferView();
+ startBlinkingCursor();
}
void GuiWorkArea::update(int x, int y, int w, int h)
{
- viewport()->update(x, y, w, h);
+ viewport()->repaint(x, y, w, h);
}
void GuiWorkArea::doGreyOut(QLPainter & pain)
{
- greyed_out_ = true;
+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
pain.fillRectangle(0, 0, width(), height(),
LColor::bottomarea);
//if (!lyxrc.show_banner)
// return;
- lyxerr << "show banner: " << lyxrc.show_banner << endl;
+ lyxerr[Debug::GUI] << "show banner: " << lyxrc.show_banner << endl;
/// The text to be written on top of the pixmap
- string const text = lyx_version ? lyx_version : "unknown";
- string const file = support::libFileSearch("images", "banner", "ppm");
+ QString const text = lyx_version ? QString(lyx_version) : qt_("unknown version");
+ FileName const file = support::libFileSearch("images", "banner", "ppm");
if (file.empty())
return;
- QPixmap pm(toqstr(file));
+ QPixmap pm(toqstr(file.absFilename()));
if (!pm) {
lyxerr << "could not load splash screen: '" << file << "'" << endl;
return;
// The font used to display the version info
font.setStyleHint(QFont::SansSerif);
font.setWeight(QFont::Bold);
- font.setPointSize(LyXFont::SIZE_NORMAL);
+ font.setPointSize(convert<int>(lyxrc.font_sizes[LyXFont::SIZE_LARGE]));
int const w = pm.width();
int const h = pm.height();
pain.drawPixmap(x, y, pm);
- x += 260;
+ x += 300;
y += 265;
pain.setPen(QColor(255, 255, 0));
pain.setFont(font);
- pain.drawText(x, y, toqstr(text));
+ pain.drawText(x, y, text);
}
void GuiWorkArea::paintEvent(QPaintEvent * ev)
{
+ QRect const rc = ev->rect();
/*
- lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
- << "\n QWidget width\t" << this->width()
- << "\n QWidget height\t" << this->height()
- << "\n viewport width\t" << viewport()->width()
- << "\n viewport height\t" << viewport()->height()
- << "\n pixmap width\t" << pixmap_->width()
- << "\n pixmap height\t" << pixmap_->height()
- << "\n QPaintEvent x\t" << e->rect().x()
- << "\n QPaintEvent y\t" << e->rect().y()
- << "\n QPaintEvent w\t" << e->rect().width()
- << "\n QPaintEvent h\t" << e->rect().height()
- << endl;
+ lyxerr[Debug::PAINTING] << "paintEvent begin: x: " << rc.x()
+ << " y: " << rc.y()
+ << " w: " << rc.width()
+ << " h: " << rc.height() << endl;
*/
- QRect const rc = ev->rect();
- //lyxerr << "paintEvent begin: x: " << rc.x()
- // << " y: " << rc.y()
- // << " w: " << rc.width()
- // << " h: " << rc.height() << endl;
-
- if (!buffer_view_) {
- lyxerr << "no bufferview" << endl;
- return;
- }
+ QPainter pain(viewport());
+ pain.drawPixmap(rc, screen_, rc);
+ cursor_->draw(pain);
+}
- if (rc.width() == 3) { // FIXME HACK
- // Assume splash screen drawing is requested when
- // width == 3
- lyxerr << "splash screen requested" << endl;
- QLPainter pain(viewport());
- doGreyOut(pain);
- return;
- }
+void GuiWorkArea::expose(int x, int y, int w, int h)
+{
+ QLPainter pain(&screen_);
- if (!buffer_view_->buffer()) {
- lyxerr << "no buffer: " << endl;
- QLPainter pain(viewport());
+ if (greyed_out_) {
+ lyxerr[Debug::GUI] << "splash screen requested" << endl;
doGreyOut(pain);
- updateScrollbar();
+ verticalScrollBar()->hide();
+ update(0, 0, width(), height());
return;
}
- //lyxerr << "real drawing" << endl;
- QLPainter pain(viewport());
- ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
- paintText(*buffer_view_, vi, pain);
-}
-
-
-
-void GuiWorkArea::expose(int x, int y, int w, int h)
-{
+ verticalScrollBar()->show();
+ paintText(*buffer_view_, pain);
update(x, y, w, h);
}
void GuiWorkArea::showCursor(int x, int y, int h, CursorShape shape)
{
- cursor_->setGeometry(x, y, 2, h);
- cursor_->shape_ = shape;
- cursor_->on_ = true;
+ cursor_->update(x, y, h, shape);
cursor_->show();
+ viewport()->update(cursor_->rect());
}
void GuiWorkArea::removeCursor()
{
- if (!qApp->focusWidget())
- return;
cursor_->hide();
+ //if (!qApp->focusWidget())
+ viewport()->update(cursor_->rect());
}
projects / lyx.git / blobdiff