enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index 0ff8fb4f8252a0aaef7b40b50bc53d19555bbe56..aa4089a26cffe60a294cd48de75149ace8e9f1c5 100644 (file)
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -16,7 +16,9 @@
 #include "WorkArea.h"
 
 #include "font_metrics.h"
+#include "funcrequest.h"
 #include "lyx_gui.h"
+#include "lyxfunc.h"
 #include "Painter.h"
 
 #include "BufferView.h"
@@ -31,6 +33,7 @@
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "lyxtext.h"
+#include "LyXView.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
 #include "rowpainter.h"
@@ -39,13 +42,13 @@
 #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/current_function.hpp>
-#include <boost/signals/trackable.hpp>
 
 using lyx::support::libFileSearch;
 using lyx::support::ForkedcallsController;
@@ -135,8 +138,8 @@ boost::signals::connection timecon;
 
 } // anon namespace
 
-WorkArea::WorkArea(BufferView * buffer_view)
-       :  buffer_view_(buffer_view), greyed_out_(true),
+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
@@ -156,7 +159,21 @@ WorkArea::WorkArea(BufferView * buffer_view)
 
 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);
 }
 
 
@@ -186,11 +203,13 @@ void WorkArea::redraw()
 
        if (!buffer_view_->buffer()) {
                greyOut();
+               updateScrollbar();
                return;
        }
 
-       if (!buffer_view_->needsRedraw())
-               return;
+       buffer_view_->updateMetrics(false);
+
+       updateScrollbar();
 
        ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
        greyed_out_ = false;
@@ -202,7 +221,6 @@ void WorkArea::redraw()
                ( vi.p2 < vi.size - 1 ?  vi.y2 : height() );
        expose(0, ymin, width(), ymax - ymin);
        getPainter().end();
-       buffer_view_->needsRedraw(false);
 
        lyxerr[Debug::DEBUG]
        << "  ymin = " << ymin << "  width() = " << width()
@@ -214,7 +232,7 @@ void WorkArea::processKeySym(LyXKeySymPtr key,
                                                         key_modifier::state state)
 {
        hideCursor();
-       buffer_view_->workAreaKeyPress(key, state);
+       lyx_view_.getLyXFunc().processKeySym(key, state);
 
        /* This is perhaps a bit of a hack. When we move
         * around, or type, it's nice to be able to see
@@ -223,23 +241,73 @@ void WorkArea::processKeySym(LyXKeySymPtr key,
         * 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();
-       redraw();
+       
+       // 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();
 }
 
 
@@ -268,7 +336,9 @@ void WorkArea::greyOut()
                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();
@@ -280,7 +350,7 @@ void WorkArea::showCursor()
        if (cursor_visible_)
                return;
 
-       if (!buffer_view_->available())
+       if (!buffer_view_->buffer())
                return;
 
        CursorShape shape = BAR_SHAPE;
@@ -348,5 +418,11 @@ void WorkArea::toggleCursor()
        cursor_timeout_.restart();
 }
 
+
+void WorkArea::displayMessage(lyx::docstring const & message)
+{
+       lyx_view_.message(message);
+}
+
 } // namespace frontend
 } // namespace lyx