X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=36dbfa07c3744369fb5bc1e43b0bedd0c5c6fcf6;hb=2b300d130c21037e9ae9cb547024be53111d2014;hp=df4a1244ad3ba16655c3159c67fa618fd2033cd9;hpb=eb7220abe64a6e301c51974fb34bb916ac41d64b;p=lyx.git diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index df4a1244ad..36dbfa07c3 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -21,7 +21,6 @@ #include "TextCache.h" #include "bufferlist.h" #include "insets/insetbib.h" -#include "menus.h" #include "lyx_gui_misc.h" #include "lyxrc.h" #include "intl.h" @@ -44,8 +43,9 @@ bool selection_possible = false; extern BufferList bufferlist; extern char ascii_type; +extern "C" void TimerCB(FL_OBJECT *, long); extern void sigchldhandler(pid_t pid, int * status); -extern int bibitemMaxWidth(Painter &, LyXFont const &); +extern int bibitemMaxWidth(BufferView *, LyXFont const &); static inline @@ -76,6 +76,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, @@ -130,7 +151,6 @@ void BufferView::Pimpl::buffer(Buffer * b) if (buffer_) { lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl; buffer_->addUser(bv_); - owner_->getMenus()->showMenus(); // If we don't have a text object for this, we make one if (bv_->text == 0) { resizeCurrentBuffer(); @@ -139,12 +159,15 @@ void BufferView::Pimpl::buffer(Buffer * b) updateScrollbar(); } bv_->text->first = screen_->TopCursorVisible(bv_->text); + owner_->updateMenubar(); + owner_->updateToolbar(); redraw(); owner_->getDialogs()->updateBufferDependent(); bv_->insetWakeup(); } else { lyxerr[Debug::INFO] << " No Buffer!" << endl; - owner_->getMenus()->hideMenus(); + owner_->updateMenubar(); + owner_->updateToolbar(); updateScrollbar(); workarea_->redraw(); @@ -185,12 +208,13 @@ void BufferView::Pimpl::redraw() } -bool BufferView::Pimpl::fitCursor() +bool BufferView::Pimpl::fitCursor(LyXText * text) { Assert(screen_); // it is a programming error to call fitCursor // without a valid screen. - bool ret = screen_->FitCursor(bv_->text); - if (ret) updateScrollbar(); + bool ret = screen_->FitCursor(text); + if (ret) + updateScrollbar(); return ret; } @@ -270,10 +294,8 @@ int BufferView::Pimpl::resizeCurrentBuffer() } } bv_->text->first = screen_->TopCursorVisible(bv_->text); - /* this will scroll the - * screen such that the - * cursor becomes - * visible */ + buffer_->resizeInsets(bv_); + // this will scroll the screen such that the cursor becomes visible updateScrollbar(); redraw(); owner_->getMiniBuffer()->Init(); @@ -482,6 +504,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 @@ -495,7 +523,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; @@ -513,7 +542,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state) bv_->text->SetSelection(); screen_->ToggleToggle(bv_->text); - fitCursor(); + fitCursor(bv_->text); screen_->ShowCursor(bv_->text); } return; @@ -535,10 +564,10 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, if (button == 4 || button == 5) { switch (button) { case 4: - scrollUp(100); // This number is only temporary + scrollUp(lyxrc.wheel_jump); // default 100, set in lyxrc break; case 5: - scrollDown(100); + scrollDown(lyxrc.wheel_jump); break; } } @@ -563,46 +592,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, selection_possible = true; screen_->HideCursor(); -#ifndef NEW_TABULAR - // Right button mouse click on a table - if (button == 3 && - (bv_->text->cursor.par()->table || - bv_->text->MouseHitInTable(bv_, xpos, ypos + bv_->text->first))) { - // Set the cursor to the press-position - bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + bv_->text->first); - bool doit = true; - - // Only show the table popup if the hit is in - // the table, too - if (!bv_->text->HitInTable(bv_, - bv_->text->cursor.row(), xpos)) - doit = false; - - // Hit above or below the table? - if (doit) { - if (!bv_->text->selection) { - screen_->ToggleSelection(bv_->text); - bv_->text->ClearSelection(); - bv_->text->FullRebreak(bv_); - screen_->Update(bv_->text); - updateScrollbar(); - } - // Popup table popup when on a table. - // This is obviously temporary, since we - // should be able to popup various - // context-sensitive-menus with the - // the right mouse. So this should be done more - // general in the future. Matthias. - selection_possible = false; - owner_->getLyXFunc() - ->Dispatch(LFUN_LAYOUT_TABLE, - "true"); - return; - } - } -#endif - - int screen_first = bv_->text->first; + int const screen_first = bv_->text->first; // Middle button press pastes if we have a selection bool paste_internally = false; @@ -645,7 +635,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, bv_->text->cursor.x_fix(bv_->text->cursor.x()); owner_->updateLayoutChoice(); - if (fitCursor()) { + if (fitCursor(bv_->text)) { selection_possible = false; } @@ -677,14 +667,14 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) * if necessary */ update(BufferView::SELECT|BufferView::FITCUR); } - } + } } void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button) { // select a line - if (buffer_ && screen_ && button == 1) { + if (buffer_ && screen_ && !bv_->the_locking_inset && (button == 1)) { screen_->HideCursor(); screen_->ToggleSelection(bv_->text); bv_->text->CursorHome(bv_); @@ -739,24 +729,11 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, } selection_possible = false; -#ifndef NEW_TABULAR - if (bv_->text->cursor.par()->table) { - int cell = bv_->text-> - NumberOfCell(bv_->text->cursor.par(), - bv_->text->cursor.pos()); - if (bv_->text->cursor.par()->table->IsContRow(cell) && - bv_->text->cursor.par()->table-> - CellHasContRow(bv_->text->cursor.par()->table-> - GetCellAbove(cell))<0) { - bv_->text->CursorUp(bv_); - } - } -#endif if (button >= 2) return; bv_->setState(); - owner_->getMiniBuffer()->Set(CurrentState(bv_)); + owner_->showState(); // Did we hit an editable inset? if (inset_hit != 0) { @@ -803,6 +780,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, c = bv_->text->cursor.par()-> GetChar(bv_->text->cursor.pos()); } +#ifndef NEW_INSETS if (c == LyXParagraph::META_FOOTNOTE || c == LyXParagraph::META_MARGIN || c == LyXParagraph::META_FIG @@ -811,9 +789,12 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, || c == LyXParagraph::META_WIDE_TAB || c == LyXParagraph::META_ALGORITHM){ hit = true; - } else if (bv_->text->cursor.pos() - 1 >= 0) { + } else +#endif + if (bv_->text->cursor.pos() - 1 >= 0) { c = bv_->text->cursor.par()-> GetChar(bv_->text->cursor.pos() - 1); +#ifndef NEW_INSETS if (c == LyXParagraph::META_FOOTNOTE || c == LyXParagraph::META_MARGIN || c == LyXParagraph::META_FIG @@ -825,14 +806,18 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, bv_->text->CursorLeft(bv_); hit = true; } +#endif } if (hit == true) { +#ifndef NEW_INSETS bv_->toggleFloat(); +#endif selection_possible = false; return; } } +#ifndef NEW_INSETS // Do we want to close a float? (click on the float-label) if (bv_->text->cursor.row()->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE @@ -858,13 +843,13 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, return; } } +#endif // Maybe we want to edit a bibitem ale970302 if (bv_->text->cursor.par()->bibkey && x < 20 + - bibitemMaxWidth(bv_->painter(), - textclasslist - .TextClass(buffer_-> - params.textclass).defaultfont())) { + bibitemMaxWidth(bv_, textclasslist. + TextClass(buffer_-> + params.textclass).defaultfont())) { bv_->text->cursor.par()->bibkey->Edit(bv_, 0, 0, 0); } @@ -887,10 +872,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()) @@ -904,20 +886,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_->painter(), 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_->painter(), 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_->painter(), font) - && y_tmp < cursor.y() + tmpinset->descent(bv_->painter(), font)) { -#if 0 - if (move_cursor && (tmpinset != bv_->the_locking_inset)) -#endif - text->SetCursor(bv_, cursor.par(),cursor.pos(),true); + && y_tmp > cursor.y() - tmpinset->ascent(bv_, font) + && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) { + 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()); @@ -936,15 +915,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_->painter(), 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_->painter(), 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_->painter(), font) - && y_tmp < cursor.y() + tmpinset->descent(bv_->painter(), font)) { + && 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 @@ -996,7 +977,7 @@ void BufferView::Pimpl::workAreaExpose() // fitCursor() ensures we don't jump back // to the start of the document on vertical // resize - fitCursor(); + fitCursor(bv_->text); // The main window size has changed, repaint most stuff redraw(); @@ -1072,7 +1053,7 @@ void BufferView::Pimpl::update(BufferView::UpdateCodes f) update(); if ((f & FITCUR)) { - fitCursor(); + fitCursor(bv_->text); } if ((f & CHANGE)) { @@ -1155,7 +1136,7 @@ void BufferView::Pimpl::cursorPrevious() { if (!bv_->text->cursor.row()->previous()) return; - long y = bv_->text->first; + int y = bv_->text->first; Row * cursorrow = bv_->text->cursor.row(); bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y); bv_->text->FinishUndo(); @@ -1177,7 +1158,7 @@ void BufferView::Pimpl::cursorNext() { if (!bv_->text->cursor.row()->next()) return; - long y = bv_->text->first; + int y = bv_->text->first; bv_->text->GetRowNearY(y); Row * cursorrow = bv_->text->cursor.row(); bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y @@ -1225,15 +1206,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()