Rename .C => .cpp for files in src/frontends/controllers, step 1

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

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index 8b8cad2a9ffe540a21ecae9ec40a1518931a5241..c1a89e18a9cb699702f9658e28e9a52ac646befc 100644 (file)
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -40,14 +40,12 @@
 #include "rowpainter.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>
 
-using lyx::support::libFileSearch;
 using lyx::support::ForkedcallsController;
 
 using std::endl;
@@ -151,15 +149,14 @@ void WorkArea::redraw()
        ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
        greyed_out_ = false;
 
-       if (lyxerr.debugging(Debug::WORKAREA)) {
-               lyxerr[Debug::WORKAREA] << "WorkArea::redraw screen" << endl;
-       }
+       LYXERR(Debug::WORKAREA) << "WorkArea::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);
 
-       //lyxerr[Debug::WORKAREA]
+       //LYXERR(Debug::WORKAREA)
        //<< "  ymin = " << ymin << "  width() = " << width()
 //             << "  ymax-ymin = " << ymax-ymin << std::endl;
 
@@ -168,8 +165,7 @@ void WorkArea::redraw()
 }
 
 
-void WorkArea::processKeySym(LyXKeySymPtr key,
-                                                        key_modifier::state state)
+void WorkArea::processKeySym(LyXKeySymPtr key, key_modifier::state state)
 {
        // In order to avoid bad surprise in the middle of an operation, we better stop
        // the blinking cursor.
@@ -185,7 +181,7 @@ void WorkArea::processKeySym(LyXKeySymPtr key,
 }
 
 
-void WorkArea::dispatch(FuncRequest const & cmd0)
+void WorkArea::dispatch(FuncRequest const & cmd0, key_modifier::state k)
 {
        // Handle drag&drop
        if (cmd0.action == LFUN_FILE_OPEN) {
@@ -195,31 +191,48 @@ void WorkArea::dispatch(FuncRequest const & cmd0)
 
        theLyXFunc().setLyXView(&lyx_view_);
 
-       bool needRedraw = buffer_view_->workAreaDispatch(cmd0);
+       FuncRequest cmd;
+
+       if (cmd0.action == LFUN_MOUSE_PRESS) {
+               if (k == key_modifier::shift)
+                       cmd = FuncRequest(cmd0, "region-select");
+               else if (k == key_modifier::ctrl)
+                       cmd = FuncRequest(cmd0, "paragraph-select");
+               else
+                       cmd = cmd0;
+       }
+       else
+               cmd = cmd0;
+
+       // In order to avoid bad surprise in the middle of an operation, we better stop
+       // the blinking cursor.
+       if (!(cmd.action == LFUN_MOUSE_MOTION 
+               && cmd.button() == mouse_button::none))
+               stopBlinkingCursor();
+
+       bool const needRedraw = buffer_view_->workAreaDispatch(cmd);
 
+       if (needRedraw)
+               redraw();
+       
        // Skip these when selecting
-       if (cmd0.action != LFUN_MOUSE_MOTION) {
+       if (cmd.action != LFUN_MOUSE_MOTION) {
                lyx_view_.updateLayoutChoice();
                lyx_view_.updateMenubar();
                lyx_view_.updateToolbars();
        }
 
-       
        // GUI tweaks except with mouse motion with no button pressed.
-       if (!(cmd0.action == LFUN_MOUSE_MOTION 
-               && cmd0.button() == mouse_button::none)) {
+       if (!(cmd.action == LFUN_MOUSE_MOTION 
+               && cmd.button() == mouse_button::none)) {
                // 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();
 
                // Show the cursor immediately after any operation.
-               hideCursor();
-               toggleCursor();
+               startBlinkingCursor();
        }
-
-       if (needRedraw)
-               redraw();
 }
 
 
@@ -229,9 +242,8 @@ void WorkArea::resizeBufferView()
        lyx_view_.message(_("Formatting document..."));
        buffer_view_->workAreaResize(width(), height());
        lyx_view_.updateLayoutChoice();
-       redraw();
-       lyx_view_.busy(false);
        lyx_view_.clearMessage();
+       lyx_view_.busy(false);
 }
 
 
@@ -246,14 +258,15 @@ void WorkArea::updateScrollbar()
 
 void WorkArea::scrollBufferView(int position)
 {
+       stopBlinkingCursor();
        buffer_view_->scrollDocView(position);
        redraw();
-       hideCursor();
        if (lyxrc.cursor_follows_scrollbar) {
                buffer_view_->setCursorFromScrollbar();
                lyx_view_.updateLayoutChoice();
        }
-       toggleCursor();
+       // Show the cursor immediately after any operation.
+       startBlinkingCursor();
 }
 
 
@@ -267,7 +280,7 @@ void WorkArea::showCursor()
 
        CursorShape shape = BAR_SHAPE;
 
-       LyXText const & text = *buffer_view_->getLyXText();
+       LyXText const & text = *buffer_view_->cursor().innerText();
        LyXFont const & realfont = text.real_current_font;
        BufferParams const & bp = buffer_view_->buffer()->params();
        bool const samelang = realfont.language() == bp.language;