More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 85886425b5ac412b5393bcc9901e5b00033ee34f..fac6aa8d9db29165deddcf5c8305ed4705257d53 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -61,12 +61,12 @@ void SetXtermCursor(Window win)
        static Cursor cursor;
        static bool cursor_undefined = true;
        if (cursor_undefined){
-               cursor = XCreateFontCursor(fl_display, XC_xterm);
-               XFlush(fl_display);
+               cursor = XCreateFontCursor(fl_get_display(), XC_xterm);
+               XFlush(fl_get_display());
                cursor_undefined = false;
        }
-       XDefineCursor(fl_display, win, cursor);
-       XFlush(fl_display);
+       XDefineCursor(fl_get_display(), win, cursor);
+       XFlush(fl_get_display());
 }
 
 
@@ -75,8 +75,13 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
        : bv_(b), owner_(o), cursor_timeout(400)
 {
        buffer_ = 0;
+#if 0
        workarea_ = new WorkArea(bv_, xpos, ypos, width, height);
+#else
+       workarea_ = new WorkArea(xpos, ypos, width, height);
+#endif
        // Setup the signals
+       workarea_->scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
        workarea_->workAreaExpose
                .connect(slot(this, &BufferView::Pimpl::workAreaExpose));
        workarea_->workAreaEnter
@@ -161,12 +166,17 @@ void BufferView::Pimpl::buffer(Buffer * b)
                bv_->text->first = screen_->TopCursorVisible(bv_->text);
                owner_->updateMenubar();
                owner_->updateToolbar();
+               // Similarly, buffer-dependent dialogs should be updated or
+               // hidden. This should go here because some dialogs (eg ToC)
+               // require bv_->text.
+               owner_->getDialogs()->updateBufferDependent(true);
                redraw();
                bv_->insetWakeup();
        } else {
                lyxerr[Debug::INFO] << "  No Buffer!" << endl;
                owner_->updateMenubar();
                owner_->updateToolbar();
+               owner_->getDialogs()->hideBufferDependent();
                updateScrollbar();
                workarea_->redraw();
 
@@ -181,15 +191,6 @@ void BufferView::Pimpl::buffer(Buffer * b)
        owner_->updateLayoutChoice();
        owner_->getMiniBuffer()->Init();
        owner_->updateWindowTitle();
-       // Similarly, buffer-dependent dialogs should be updated or hidden.
-       // This should go here because some dialogs (ToC) require bv_->text.
-       if (buffer_) owner_->getDialogs()->updateBufferDependent();
-#ifdef WITH_WARNINGS
-#warning Is this the right place for this?
-// What was wrong with where it used to be in the previous if(buffer_) above?
-// There also used to be a hideBufferDependent somewhere here but I haven't
-// time at present to check.  This should at least fix the segfault.
-#endif
 }
 
 
@@ -220,7 +221,7 @@ bool BufferView::Pimpl::fitCursor(LyXText * text)
 {
        Assert(screen_); // it is a programming error to call fitCursor
        // without a valid screen.
-       bool ret = screen_->FitCursor(text);
+       bool ret = screen_->FitCursor(text, bv_);
        if (ret)
            updateScrollbar();
        return ret;
@@ -421,8 +422,6 @@ void BufferView::Pimpl::updateScrollbar()
 // Callback for scrollbar slider
 void BufferView::Pimpl::scrollCB(double value)
 {
-       extern bool cursor_follows_scrollbar;
-       
        if (buffer_ == 0) return;
 
        current_scrollbar_value = long(value);
@@ -432,18 +431,18 @@ void BufferView::Pimpl::scrollCB(double value)
        if (!screen_)
                return;
 
-       screen_->Draw(bv_->text, current_scrollbar_value);
+       screen_->Draw(bv_->text, bv_, current_scrollbar_value);
 
-       if (cursor_follows_scrollbar) {
+       if (lyxrc.cursor_follows_scrollbar) {
                LyXText * vbt = bv_->text;
                int height = vbt->DefaultHeight();
                
-               if (vbt->cursor.y() < (int)(bv_->text->first + height)) {
+               if (vbt->cursor.y() < static_cast<int>((bv_->text->first + height))) {
                        vbt->SetCursorFromCoordinates(bv_, 0,
                                                      bv_->text->first +
                                                      height);
                } else if (vbt->cursor.y() >
-                          (int)(bv_->text->first+workarea_->height()-height))
+                          static_cast<int>((bv_->text->first+workarea_->height()-height)))
                {
                        vbt->SetCursorFromCoordinates(bv_, 0,
                                                      bv_->text->first +
@@ -478,7 +477,7 @@ int BufferView::Pimpl::scrollUp(long time)
    
        workarea_->setScrollbarValue(value);
    
-       bv_->scrollCB(value); 
+       scrollCB(value); 
        return 0;
 }
 
@@ -508,7 +507,7 @@ int BufferView::Pimpl::scrollDown(long time)
 
        workarea_->setScrollbarValue(value);
        
-       bv_->scrollCB(value); 
+       scrollCB(value); 
        return 0;
 }
 
@@ -530,10 +529,15 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
        // Check for inset locking
        if (bv_->theLockingInset()) {
                LyXCursor cursor = bv_->text->cursor;
+               LyXFont font = bv_->text->GetFont(bv_->buffer(),
+                                                 cursor.par(), cursor.pos());
+               int width = bv_->theLockingInset()->width(bv_, font);
+               int inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() - width : cursor.x();
+               int start_x = inset_x + bv_->theLockingInset()->scroll();
                bv_->theLockingInset()->
                        InsetMotionNotify(bv_,
-                                         x - cursor.x() -
-                                         bv_->theLockingInset()->scroll(),
+                                         x - start_x,
                                          y - cursor.y() + bv_->text->first,
                                          state);
                return;
@@ -550,9 +554,9 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
                        update(BufferView::UPDATE); // Maybe an empty line was deleted
       
                bv_->text->SetSelection();
-               screen_->ToggleToggle(bv_->text);
+               screen_->ToggleToggle(bv_->text, bv_);
                fitCursor(bv_->text);
-               screen_->ShowCursor(bv_->text);
+               screen_->ShowCursor(bv_->text, bv_);
        }
        return;
 }
@@ -612,10 +616,10 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
        }
        
        // Clear the selection
-       screen_->ToggleSelection(bv_->text);
+       screen_->ToggleSelection(bv_->text, bv_);
        bv_->text->ClearSelection();
        bv_->text->FullRebreak(bv_);
-       screen_->Update(bv_->text);
+       screen_->Update(bv_->text, bv_);
        updateScrollbar();
        
        // Single left click in math inset?
@@ -669,9 +673,9 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
        if (buffer_ && !bv_->theLockingInset()) {
                if (screen_ && button == 1) {
                        screen_->HideCursor();
-                       screen_->ToggleSelection(bv_->text);
+                       screen_->ToggleSelection(bv_->text, bv_);
                        bv_->text->SelectWord(bv_);
-                       screen_->ToggleSelection(bv_->text, false);
+                       screen_->ToggleSelection(bv_->text, bv_, false);
                        /* This will fit the cursor on the screen
                         * if necessary */
                        update(BufferView::SELECT|BufferView::FITCUR);
@@ -685,12 +689,12 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
        // select a line
        if (buffer_ && screen_ && !bv_->theLockingInset() && (button == 1)) {
                screen_->HideCursor();
-               screen_->ToggleSelection(bv_->text);
+               screen_->ToggleSelection(bv_->text, bv_);
                bv_->text->CursorHome(bv_);
                bv_->text->sel_cursor = bv_->text->cursor;
                bv_->text->CursorEnd(bv_);
                bv_->text->SetSelection();
-               screen_->ToggleSelection(bv_->text, false);
+               screen_->ToggleSelection(bv_->text, bv_, false);
                /* This will fit the cursor on the screen
                 * if necessary */
                update(BufferView::SELECT|BufferView::FITCUR);
@@ -710,7 +714,7 @@ void BufferView::Pimpl::enterView()
 void BufferView::Pimpl::leaveView()
 {
        if (using_xterm_cursor) {
-               XUndefineCursor(fl_display, workarea_->getWin());
+               XUndefineCursor(fl_get_display(), workarea_->getWin());
                using_xterm_cursor = false;
        }
 }
@@ -790,6 +794,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
                                GetChar(bv_->text->cursor.pos());
                }
 #ifndef NEW_INSETS
+              if(!bv_->text->selection)
                if (c == LyXParagraph::META_FOOTNOTE
                    || c == LyXParagraph::META_MARGIN
                    || c == LyXParagraph::META_FIG
@@ -891,17 +896,11 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
                LyXFont font = text->GetFont(bv_->buffer(),
                                                  cursor.par(), cursor.pos());
-               bool is_rtl = font.isVisibleRightToLeft();
-               int start_x;
-               int end_x;
-
-               if (is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font) + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->scroll();
-               } else {
-                       start_x = cursor.x() + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->width(bv_, font) + tmpinset->scroll();
-               }
+               int width = tmpinset->width(bv_, font);
+               int inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() - width : cursor.x();
+               int start_x = inset_x + tmpinset->scroll();
+               int end_x = inset_x + width;
 
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
@@ -921,19 +920,12 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
                Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
                LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
                                                  cursor.pos()-1);
-               bool is_rtl = font.isVisibleRightToLeft();
-               int start_x;
-               int end_x;
-
-               if (!is_rtl) {
-                       start_x = cursor.x() - tmpinset->width(bv_, font) +
-                           tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->scroll();
-               } else {
-                       start_x = cursor.x() + tmpinset->scroll();
-                       end_x = cursor.x() + tmpinset->width(bv_, font) +
-                           tmpinset->scroll();
-               }
+               int width = tmpinset->width(bv_, font);
+               int inset_x = font.isVisibleRightToLeft()
+                       ? cursor.x() : cursor.x() - width;
+               int start_x = inset_x + tmpinset->scroll();
+               int end_x = inset_x + width;
+
                if (x > start_x && x < end_x
                    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
                    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
@@ -995,7 +987,8 @@ void BufferView::Pimpl::workAreaExpose()
                        // ...including the minibuffer
                        owner_->getMiniBuffer()->Init();
 
-               } else if (screen_) screen_->Redraw(bv_->text);
+               } else if (screen_)
+                   screen_->Redraw(bv_->text, bv_);
        } else {
                // Grey box when we don't have a buffer
                workarea_->greyOut();
@@ -1010,7 +1003,7 @@ void BufferView::Pimpl::workAreaExpose()
 
 void BufferView::Pimpl::update()
 {
-       if (screen_) screen_->Update(bv_->text);
+       if (screen_) screen_->Update(bv_->text, bv_);
 }
 
 // Values used when calling update:
@@ -1131,7 +1124,7 @@ void BufferView::Pimpl::cursorToggle()
        }
 
        if (!bv_->theLockingInset()) {
-               screen_->CursorToggle(bv_->text);
+               screen_->CursorToggle(bv_->text, bv_);
        } else {
                bv_->theLockingInset()->ToggleInsetCursor(bv_);
        }
@@ -1159,7 +1152,7 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text)
        
        if (text->inset_owner ||
            text->cursor.row()->height() < workarea_->height())
-               screen_->Draw(bv_->text,
+               screen_->Draw(bv_->text, bv_,
                              text->cursor.y()
                              - text->cursor.row()->baseline()
                              + text->cursor.row()->height()
@@ -1173,13 +1166,13 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
        if (!text->cursor.row()->next())
                return;
        
-       int y = text->first;
+       int y = text->first + workarea_->height();
 //     if (text->inset_owner)
 //             y += bv_->text->first;
        text->GetRowNearY(y);
+    
        Row * cursorrow = text->cursor.row();
-       text->SetCursorFromCoordinates(bv_, text->cursor.x_fix(), y
-                                      + workarea_->height());
+       text->SetCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
        bv_->text->FinishUndo();
        // This is to allow jumping over large insets
        if ((cursorrow == bv_->text->cursor.row()))
@@ -1187,7 +1180,7 @@ void BufferView::Pimpl::cursorNext(LyXText * text)
        
        if (text->inset_owner ||
            text->cursor.row()->height() < workarea_->height())
-               screen_->Draw(bv_->text, text->cursor.y() -
+               screen_->Draw(bv_->text, bv_, text->cursor.y() -
                              text->cursor.row()->baseline());
        updateScrollbar();
 }
@@ -1227,11 +1220,11 @@ void BufferView::Pimpl::restorePosition()
 
        beforeChange();
 
-       if( fname != buffer_->fileName() ) {
+       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);
+               if (b != 0 ) buffer(b);
        }
 
        bv_->text->SetCursorFromCoordinates(bv_, x, y);
@@ -1250,8 +1243,9 @@ void BufferView::Pimpl::setState()
        if (!lyxrc.rtl_support)
                return;
 
-       if (bv_->text->real_current_font.isRightToLeft() &&
-           bv_->text->real_current_font.latex() != LyXFont::ON) {
+       LyXText * text = bv_->getLyXText();
+       if (text->real_current_font.isRightToLeft() &&
+           text->real_current_font.latex() != LyXFont::ON) {
                if (owner_->getIntl()->primarykeymap)
                        owner_->getIntl()->KeyMapSec();
        } else {
@@ -1319,7 +1313,7 @@ bool BufferView::Pimpl::belowMouse() const
 void BufferView::Pimpl::showCursor()
 {
        if (screen_)
-               screen_->ShowCursor(bv_->text);
+               screen_->ShowCursor(bv_->text, bv_);
 }
 
 
@@ -1333,24 +1327,24 @@ void BufferView::Pimpl::hideCursor()
 void BufferView::Pimpl::toggleSelection(bool b)
 {
        if (screen_)
-               screen_->ToggleSelection(bv_->text, b);
+               screen_->ToggleSelection(bv_->text, bv_, b);
 }
 
 
 void BufferView::Pimpl::toggleToggle()
 {
        if (screen_)
-               screen_->ToggleToggle(bv_->text);
+               screen_->ToggleToggle(bv_->text, bv_);
 }
 
 
 void BufferView::Pimpl::center() 
 {
        beforeChange();
-       if (bv_->text->cursor.y() > (int)(workarea_->height() / 2)) {
-               screen_->Draw(bv_->text, bv_->text->cursor.y() - workarea_->height() / 2);
+       if (bv_->text->cursor.y() > static_cast<int>((workarea_->height() / 2))) {
+               screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_->height() / 2);
        } else {
-               screen_->Draw(bv_->text, 0);
+               screen_->Draw(bv_->text, bv_, 0);
        }
        update(BufferView::SELECT|BufferView::FITCUR);
        redraw();
@@ -1364,7 +1358,7 @@ void BufferView::Pimpl::pasteClipboard(bool asPara)
        screen_->HideCursor();
        bv_->beforeChange();
        
-       string clip(workarea_->getClipboard());
+       string const clip(workarea_->getClipboard());
        
        if (clip.empty()) return;