small changes to ButtonController usage

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index f7151736c66e9f50dea2a17302f50f1d1937e026..11970de6f3f384200d09f4c6f074e2ea307e6e9e 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -79,6 +79,27 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 {
        buffer_ = 0;
        workarea_ = new WorkArea(bv_, xpos, ypos, width, height);
+       // Setup the signals
+       workarea_->workAreaExpose
+               .connect(slot(this, &BufferView::Pimpl::workAreaExpose));
+       workarea_->workAreaEnter
+               .connect(slot(this, &BufferView::Pimpl::enterView));
+       workarea_->workAreaLeave
+               .connect(slot(this, &BufferView::Pimpl::leaveView));
+       workarea_->workAreaButtonPress
+               .connect(slot(this, &BufferView::Pimpl::workAreaButtonPress));
+       workarea_->workAreaButtonRelease
+               .connect(slot(this,
+                             &BufferView::Pimpl::workAreaButtonRelease));
+       workarea_->workAreaMotionNotify
+               .connect(slot(this, &BufferView::Pimpl::workAreaMotionNotify));
+       workarea_->workAreaDoubleClick
+               .connect(slot(this, &BufferView::Pimpl::doubleClick));
+       workarea_->workAreaTripleClick
+               .connect(slot(this, &BufferView::Pimpl::tripleClick));
+       workarea_->workAreaKeyPress
+               .connect(slot(this, &BufferView::Pimpl::workAreaKeyPress));
+       
        screen_ = 0;
 
        cursor_timeout.timeout.connect(slot(this,
@@ -493,6 +514,12 @@ int BufferView::Pimpl::scrollDown(long time)
 }
 
 
+void BufferView::Pimpl::workAreaKeyPress(KeySym keysym, unsigned int state)
+{
+       bv_->owner()->getLyXFunc()->processKeySym(keysym, state);
+}
+
+
 void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 {
        // Only use motion with button 1
@@ -506,7 +533,8 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
                LyXCursor cursor = bv_->text->cursor;
                bv_->the_locking_inset->
                        InsetMotionNotify(bv_,
-                                         x - cursor.x(),
+                                         x - cursor.x() -
+                                         bv_->the_locking_inset->scroll(),
                                          y - cursor.y() + bv_->text->first,
                                          state);
                return;
@@ -906,10 +934,7 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
   
        LyXCursor cursor;
        text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
-#if 0 // Are you planning to use this Jürgen? (Lgb)
-       bool move_cursor = ((cursor.par != text->cursor.par) ||
-                           (cursor.pos != text->cursor.pos()));
-#endif
+
        if (cursor.pos() < cursor.par()->Last()
            && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
            && cursor.par()->GetInset(cursor.pos())
@@ -923,20 +948,17 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                int start_x, end_x;
 
                if (is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font);
-                       end_x = cursor.x();
+                       start_x = cursor.x() - tmpinset->width(bv_, font) + tmpinset->scroll();
+                       end_x = cursor.x() + tmpinset->scroll();
                } else {
-                       start_x = cursor.x();
-                       end_x = cursor.x() + tmpinset->width(bv_, font);
+                       start_x = cursor.x() + tmpinset->scroll();
+                       end_x = cursor.x() + tmpinset->width(bv_, font) + tmpinset->scroll();
                }
 
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
                    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
-#if 0
-                       if (move_cursor && (tmpinset != bv_->the_locking_inset))
-#endif
-                               text->SetCursor(bv_, cursor.par(),cursor.pos(),true);
+                       text->SetCursor(bv_, cursor.par(),cursor.pos(),true);
                        x = x - start_x;
                        // The origin of an inset is on the baseline
                        y = y_tmp - (text->cursor.y()); 
@@ -955,11 +977,13 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                int start_x, end_x;
 
                if (!is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font);
-                       end_x = cursor.x();
+                       start_x = cursor.x() - tmpinset->width(bv_, font) +
+                           tmpinset->scroll();
+                       end_x = cursor.x() + tmpinset->scroll();
                } else {
-                       start_x = cursor.x();
-                       end_x = cursor.x() + tmpinset->width(bv_, font);
+                       start_x = cursor.x() + tmpinset->scroll();
+                       end_x = cursor.x() + tmpinset->width(bv_, font) +
+                           tmpinset->scroll();
                }
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
@@ -1244,15 +1268,19 @@ void BufferView::Pimpl::restorePosition()
        
        int  x, y;
        string fname = backstack.pop(&x, &y);
-       
+
        beforeChange();
-       Buffer * b = bufferlist.exists(fname) ?
-               bufferlist.getBuffer(fname) :
-               bufferlist.loadLyXFile(fname); // don't ask, just load it
-       buffer(b);
+
+       if( fname != buffer_->fileName() ) {
+               Buffer * b = bufferlist.exists(fname) ?
+                       bufferlist.getBuffer(fname) :
+                       bufferlist.loadLyXFile(fname); // don't ask, just load it
+               if( b != 0 ) buffer(b);
+       }
+
        bv_->text->SetCursorFromCoordinates(bv_, x, y);
        update(BufferView::SELECT|BufferView::FITCUR);
-} 
+}
 
 
 bool BufferView::Pimpl::NoSavedPositions()