#include "WorkArea.h"
#include "font_metrics.h"
+#include "funcrequest.h"
#include "lyx_gui.h"
+#include "lyxfunc.h"
#include "Painter.h"
#include "BufferView.h"
#include "lyxrc.h"
#include "lyxrow.h"
#include "lyxtext.h"
+#include "LyXView.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "rowpainter.h"
#include "graphics/GraphicsImage.h"
#include "graphics/GraphicsLoader.h"
+#include "gettext.h"
#include "support/filetools.h" // LibFileSearch
#include "support/forkedcontr.h"
#include <boost/utility.hpp>
#include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
+#include <boost/current_function.hpp>
using lyx::support::libFileSearch;
using lyx::support::ForkedcallsController;
using std::string;
-namespace {
-
-// All the below connection objects are needed because of a bug in some
-// versions of GCC (<=2.96 are on the suspects list.) By having and assigning
-// to these connections we avoid a segfault upon startup, and also at exit.
-// (Lgb)
-
-boost::signals::connection timecon;
-
-} // anon namespace
-
namespace lyx {
namespace frontend {
+// FIXME: The SplashScreen should be transfered to the
+// LyXView and create a WorkArea only when a new buffer exists. This
+// will allow to call WorkArea::redraw() in the constructor.
class SplashScreen : boost::noncopyable, boost::signals::trackable {
public:
/// This is a singleton class. Get the instance.
loader_.reset(file);
}
-WorkArea::WorkArea(BufferView * buffer_view)
- : buffer_view_(buffer_view), greyed_out_(true),
- cursor_visible_(false), cursor_timeout_(400)
+namespace {
+
+// All the below connection objects are needed because of a bug in some
+// versions of GCC (<=2.96 are on the suspects list.) By having and assigning
+// to these connections we avoid a segfault upon startup, and also at exit.
+// (Lgb)
+
+boost::signals::connection timecon;
+
+} // anon namespace
+
+WorkArea::WorkArea(LyXView & lyx_view)
+ : buffer_view_(0), lyx_view_(lyx_view), greyed_out_(true),
+ cursor_visible_(false), cursor_timeout_(400)
{
// Start loading the pixmap as soon as possible
if (lyxrc.show_banner) {
void WorkArea::setBufferView(BufferView * buffer_view)
{
+ if (buffer_view_) {
+ message_connection_.disconnect();
+ lyx_view_.disconnectBufferView();
+ }
+
+ theApp->setBufferView(buffer_view);
+
+ hideCursor();
buffer_view_ = buffer_view;
+ toggleCursor();
+
+ message_connection_ = buffer_view_->message.connect(
+ boost::bind(&WorkArea::displayMessage, this, _1));
+
+ lyx_view_.connectBufferView(*buffer_view);
}
void WorkArea::redraw()
{
- BOOST_ASSERT(buffer_view_);
+ if (!buffer_view_)
+ return;
if (!buffer_view_->buffer()) {
greyOut();
+ updateScrollbar();
return;
}
- if (!buffer_view_->needsRedraw())
- return;
-
- greyed_out_ = false;
- ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
+ buffer_view_->updateMetrics(false);
- Painter & pain = getPainter();
+ updateScrollbar();
- pain.start();
- paintText(*buffer_view_, vi, pain);
+ ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
+ greyed_out_ = false;
+ getPainter().start();
+ paintText(*buffer_view_, vi, getPainter());
lyxerr[Debug::DEBUG] << "Redraw screen" << endl;
int const ymin = std::max(vi.y1, 0);
int const ymax =
( vi.p2 < vi.size - 1 ? vi.y2 : height() );
expose(0, ymin, width(), ymax - ymin);
- pain.end();
- //theCoords.doneUpdating();
- buffer_view_->needsRedraw(false);
-
- if (lyxerr.debugging(Debug::DEBUG)) {
- lyxerr[Debug::DEBUG]
- << " ymin = " << ymin << " width() = " << width()
- << " ymax-ymin = " << ymax-ymin << std::endl;
- }
+ getPainter().end();
+
+ lyxerr[Debug::DEBUG]
+ << " ymin = " << ymin << " width() = " << width()
+ << " ymax-ymin = " << ymax-ymin << std::endl;
}
-void WorkArea::processKeySym(LyXKeySymPtr key, key_modifier::state state)
+void WorkArea::processKeySym(LyXKeySymPtr key,
+ key_modifier::state state)
{
hideCursor();
+ lyx_view_.getLyXFunc().processKeySym(key, state);
- buffer_view_->workAreaKeyPress(key, state);
/* This is perhaps a bit of a hack. When we move
* around, or type, it's nice to be able to see
* the cursor immediately after the keypress. So
* of the cursor. Note we cannot do this inside
* dispatch() itself, because that's called recursively.
*/
- // if (buffer_view_->available())
+// if (buffer_view_->buffer())
toggleCursor();
+
+ // uneeded "redraw()" call commented out for now.
+ // When/if the call to LyXView::redrawWorkArea() in "lyxfunc.C:1610"
+ // is not needed anymore, this line should be uncommented out
+ //redraw();
+}
+
+
+void WorkArea::dispatch(FuncRequest const & cmd0)
+{
+ // Handle drag&drop
+ if (cmd0.action == LFUN_FILE_OPEN) {
+ lyx_view_.dispatch(cmd0);
+ return;
+ }
+
+ buffer_view_->workAreaDispatch(cmd0);
+
+ // Skip these when selecting
+ if (cmd0.action != LFUN_MOUSE_MOTION) {
+ lyx_view_.updateLayoutChoice();
+ lyx_view_.updateMenubar();
+ lyx_view_.updateToolbars();
+ }
+
+ // Slight hack: this is only called currently when we
+ // clicked somewhere, so we force through the display
+ // of the new status here.
+ lyx_view_.clearMessage();
+
+ redraw();
+}
+
+void WorkArea::resizeBufferView()
+{
+ lyx_view_.busy(true);
+ lyx_view_.message(_("Formatting document..."));
+ buffer_view_->workAreaResize(width(), height());
+ lyx_view_.updateLayoutChoice();
+ redraw();
+ lyx_view_.busy(false);
+ lyx_view_.clearMessage();
+}
+
+
+void WorkArea::updateScrollbar()
+{
+ buffer_view_->updateScrollbar();
+ ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
+ setScrollbarParams(scroll_.height, scroll_.position,
+ scroll_.lineScrollHeight);
+}
+
+
+void WorkArea::scrollBufferView(int position)
+{
+ buffer_view_->scrollDocView(position);
+ redraw();
+ hideCursor();
+ if (lyxrc.cursor_follows_scrollbar) {
+ buffer_view_->setCursorFromScrollbar();
+ lyx_view_.updateLayoutChoice();
+ }
+ toggleCursor();
}
x += 260;
y += 265;
- getPainter().text(x, y, splash.text(), splash.font());
+ string stext = splash.text();
+ docstring dstext(stext.begin(), stext.end());
+ getPainter().text(x, y, dstext, splash.font());
}
expose(0, 0, width(), height());
getPainter().end();
if (cursor_visible_)
return;
- if (!buffer_view_->available())
+ if (!buffer_view_->buffer())
return;
CursorShape shape = BAR_SHAPE;
}
+void WorkArea::displayMessage(lyx::docstring const & message)
+{
+ lyx_view_.message(message);
+}
+
} // namespace frontend
} // namespace lyx
projects / lyx.git / blobdiff