X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=22780d0629fd3504a3c8c589b45737a7e9b5e890;hb=ebfcf1c0e72288b7131607af0330500c8739cead;hp=6f9ecaffa3fee42f8b6789b21c8466eaad52dab8;hpb=105116682d41fd297782175c05c7384d71d1942e;p=lyx.git diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 6f9ecaffa3..22780d0629 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, @@ -83,8 +104,6 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o, current_scrollbar_value = 0; cursor_timeout.start(); workarea_->setFocus(); - work_area_focus = true; - lyx_focus = false; using_xterm_cursor = false; } @@ -132,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(); @@ -140,13 +158,16 @@ void BufferView::Pimpl::buffer(Buffer * b) updateScreen(); updateScrollbar(); } - screen_->first = screen_->TopCursorVisible(bv_->text); + 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(); @@ -187,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; } @@ -271,11 +293,9 @@ int BufferView::Pimpl::resizeCurrentBuffer() bv_->text->selection = false; } } - screen_->first = screen_->TopCursorVisible(bv_->text); - /* this will scroll the - * screen such that the - * cursor becomes - * visible */ + bv_->text->first = screen_->TopCursorVisible(bv_->text); + buffer_->resizeInsets(bv_); + // this will scroll the screen such that the cursor becomes visible updateScrollbar(); redraw(); owner_->getMiniBuffer()->Init(); @@ -346,10 +366,10 @@ void BufferView::Pimpl::updateScrollbar() unsigned long cbth = 0; long cbsf = 0; - if (bv_->text) + if (bv_->text) { cbth = bv_->text->height; - if (screen_) - cbsf = screen_->first; + cbsf = bv_->text->first; + } // check if anything has changed. if (max2 == cbth && @@ -408,16 +428,17 @@ void BufferView::Pimpl::scrollCB(double value) if (cursor_follows_scrollbar) { LyXText * vbt = bv_->text; - unsigned int height = vbt->DefaultHeight(); + int height = vbt->DefaultHeight(); - if (vbt->cursor.y() < screen_->first + height) { + if (vbt->cursor.y() < (int)(bv_->text->first + height)) { vbt->SetCursorFromCoordinates(bv_, 0, - screen_->first + + bv_->text->first + height); } else if (vbt->cursor.y() > - screen_->first + workarea_->height() - height) { + (int)(bv_->text->first+workarea_->height()-height)) + { vbt->SetCursorFromCoordinates(bv_, 0, - screen_->first + + bv_->text->first + workarea_->height() - height); } @@ -484,6 +505,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 @@ -493,12 +520,13 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state) if (buffer_ == 0 || !screen_) return; // Check for inset locking - if (bv_->the_locking_inset) { + if (bv_->theLockingInset()) { LyXCursor cursor = bv_->text->cursor; - bv_->the_locking_inset-> + bv_->theLockingInset()-> InsetMotionNotify(bv_, - x - cursor.x(), - y - cursor.y() + screen_->first, + x - cursor.x() - + bv_->theLockingInset()->scroll(), + y - cursor.y() + bv_->text->first, state); return; } @@ -508,14 +536,14 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state) if (selection_possible) { screen_->HideCursor(); - bv_->text->SetCursorFromCoordinates(bv_, x, y + screen_->first); + bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first); if (!bv_->text->selection) update(BufferView::UPDATE); // Maybe an empty line was deleted bv_->text->SetSelection(); screen_->ToggleToggle(bv_->text); - fitCursor(); + fitCursor(bv_->text); screen_->ShowCursor(bv_->text); } return; @@ -531,33 +559,33 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, if (buffer_ == 0 || !screen_) return; - Inset * inset_hit = checkInsetHit(xpos, ypos, button); + Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button); // ok ok, this is a hack. 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; } } - if (bv_->the_locking_inset) { + if (bv_->theLockingInset()) { // We are in inset locking mode /* Check whether the inset was hit. If not reset mode, otherwise give the event to the inset */ - if (inset_hit == bv_->the_locking_inset) { - bv_->the_locking_inset-> + if (inset_hit == bv_->theLockingInset()) { + bv_->theLockingInset()-> InsetButtonPress(bv_, xpos, ypos, button); return; } else { - bv_->unlockInset(bv_->the_locking_inset); + bv_->unlockInset(bv_->theLockingInset()); } } @@ -565,46 +593,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 + screen_->first))) { - // Set the cursor to the press-position - bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_->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 = screen_->first; + int const screen_first = bv_->text->first; // Middle button press pastes if we have a selection bool paste_internally = false; @@ -647,7 +636,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; } @@ -669,7 +658,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos, void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) { // select a word - if (buffer_ && !bv_->the_locking_inset) { + if (buffer_ && !bv_->theLockingInset()) { if (screen_ && button == 1) { screen_->HideCursor(); screen_->ToggleSelection(bv_->text); @@ -679,14 +668,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_->theLockingInset() && (button == 1)) { screen_->HideCursor(); screen_->ToggleSelection(bv_->text); bv_->text->CursorHome(bv_); @@ -727,38 +716,25 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, // If we hit an inset, we have the inset coordinates in these // and inset_hit points to the inset. If we do not hit an // inset, inset_hit is 0, and inset_x == x, inset_y == y. - Inset * inset_hit = checkInsetHit(x, y, button); + Inset * inset_hit = checkInsetHit(bv_->text, x, y, button); - if (bv_->the_locking_inset) { + if (bv_->theLockingInset()) { // We are in inset locking mode. /* LyX does a kind of work-area grabbing for insets. Only a ButtonPress Event outside the inset will force a InsetUnlock. */ - bv_->the_locking_inset-> + bv_->theLockingInset()-> InsetButtonRelease(bv_, x, y, button); return; } 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) { @@ -805,6 +781,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 @@ -813,9 +790,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 @@ -827,14 +807,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 @@ -847,7 +831,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, int box_x = 20; // LYX_PAPER_MARGIN; box_x += lyxfont::width(" wide-tab ", font); - unsigned int screen_first = screen_->first; + unsigned int screen_first = bv_->text->first; if (x < box_x && y + screen_first > bv_->text->cursor.y() - @@ -860,13 +844,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); } @@ -879,20 +863,17 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, * If hit, the coordinates are changed relative to the inset. * Otherwise coordinates are not changed, and false is returned. */ -Inset * BufferView::Pimpl::checkInsetHit(int & x, int & y, +Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y, unsigned int /* button */) { if (!screen_) return 0; - unsigned int y_tmp = y + screen_->first; + int y_tmp = y + text->first; LyXCursor cursor; - bv_->text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp); -#if 0 // Are you planning to use this Jürgen? (Lgb) - bool move_cursor = ((cursor.par != bv_->text->cursor.par) || - (cursor.pos != bv_->text->cursor.pos())); -#endif + text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp); + if (cursor.pos() < cursor.par()->Last() && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET && cursor.par()->GetInset(cursor.pos()) @@ -900,29 +881,27 @@ Inset * BufferView::Pimpl::checkInsetHit(int & x, int & y, // Check whether the inset really was hit Inset * tmpinset = cursor.par()->GetInset(cursor.pos()); - LyXFont font = bv_->text->GetFont(bv_->buffer(), + LyXFont font = text->GetFont(bv_->buffer(), cursor.par(), cursor.pos()); bool is_rtl = font.isVisibleRightToLeft(); - int start_x, end_x; + int start_x; + int 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 - bv_->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 - (bv_->text->cursor.y()); + y = y_tmp - (text->cursor.y()); return tmpinset; } } @@ -932,28 +911,31 @@ Inset * BufferView::Pimpl::checkInsetHit(int & x, int & y, (cursor.par()->GetInset(cursor.pos() - 1)) && (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) { Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1); - LyXFont font = bv_->text->GetFont(bv_->buffer(), cursor.par(), + LyXFont font = text->GetFont(bv_->buffer(), cursor.par(), cursor.pos()-1); bool is_rtl = font.isVisibleRightToLeft(); - int start_x, end_x; + int start_x; + int 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)) + if (move_cursor && (tmpinset != bv_->theLockingInset())) #endif - bv_->text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true); + text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true); x = x - start_x; // The origin of an inset is on the baseline - y = y_tmp - (bv_->text->cursor.y()); + y = y_tmp - (text->cursor.y()); return tmpinset; } } @@ -998,7 +980,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(); @@ -1061,7 +1043,6 @@ void BufferView::Pimpl::update() // update(1) -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE) // update(3) -> update(1) -> update(1) -> update(SELECT) -//void BufferView::Pimpl::update(signed char f) void BufferView::Pimpl::update(BufferView::UpdateCodes f) { owner_->updateLayoutChoice(); @@ -1075,7 +1056,7 @@ void BufferView::Pimpl::update(BufferView::UpdateCodes f) update(); if ((f & FITCUR)) { - fitCursor(); + fitCursor(bv_->text); } if ((f & CHANGE)) { @@ -1141,53 +1122,14 @@ void BufferView::Pimpl::cursorToggle() goto set_timer_and_return; } - if (lyx_focus && work_area_focus) { - if (!bv_->the_locking_inset) { - screen_->CursorToggle(bv_->text); - } else { - bv_->the_locking_inset-> - ToggleInsetCursor(bv_); - } - goto set_timer_and_return; + if (!bv_->theLockingInset()) { + screen_->CursorToggle(bv_->text); } else { - // Make sure that the cursor is visible. - if (!bv_->the_locking_inset) { - screen_->ShowCursor(bv_->text); - } else { - if (!bv_->the_locking_inset->isCursorVisible()) - bv_->the_locking_inset-> - ToggleInsetCursor(bv_); - } - // This is only run when work_area_focus or lyx_focus is false. - Window tmpwin; - int tmp; - XGetInputFocus(fl_display, &tmpwin, &tmp); - // Commenting this out, we have not had problems with this - // for a long time. We will probably work on this code later - // and we can reenable this debug code then. Now it only - // anoying when debugging. (Lgb) - //if (lyxerr.debugging(Debug::INFO)) { - // lyxerr << "tmpwin: " << tmpwin - // << "\nwindow: " << view->owner_->getForm()->window - // << "\nwork_area_focus: " << view->work_area_focus - // << "\nlyx_focus : " << view->lyx_focus - // << endl; - //} - if (tmpwin != owner_->getForm()->window) { - lyx_focus = false; - goto skip_timer; - } else { - lyx_focus = true; - if (!work_area_focus) - goto skip_timer; - else - goto set_timer_and_return; - } + bv_->theLockingInset()->ToggleInsetCursor(bv_); } - + set_timer_and_return: cursor_timeout.restart(); - skip_timer: return; } @@ -1196,7 +1138,7 @@ void BufferView::Pimpl::cursorPrevious() { if (!bv_->text->cursor.row()->previous()) return; - long y = screen_->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(); @@ -1218,7 +1160,7 @@ void BufferView::Pimpl::cursorNext() { if (!bv_->text->cursor.row()->next()) return; - long y = screen_->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 @@ -1266,15 +1208,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() @@ -1301,9 +1247,9 @@ void BufferView::Pimpl::setState() void BufferView::Pimpl::insetSleep() { - if (bv_->the_locking_inset && !bv_->inset_slept) { - bv_->the_locking_inset->GetCursorPos(bv_->slx, bv_->sly); - bv_->the_locking_inset->InsetUnlock(bv_); + if (bv_->theLockingInset() && !bv_->inset_slept) { + bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly); + bv_->theLockingInset()->InsetUnlock(bv_); bv_->inset_slept = true; } } @@ -1311,8 +1257,8 @@ void BufferView::Pimpl::insetSleep() void BufferView::Pimpl::insetWakeup() { - if (bv_->the_locking_inset && bv_->inset_slept) { - bv_->the_locking_inset->Edit(bv_, bv_->slx, bv_->sly, 0); + if (bv_->theLockingInset() && bv_->inset_slept) { + bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0); bv_->inset_slept = false; } } @@ -1320,9 +1266,10 @@ void BufferView::Pimpl::insetWakeup() void BufferView::Pimpl::insetUnlock() { - if (bv_->the_locking_inset) { - if (!bv_->inset_slept) bv_->the_locking_inset->InsetUnlock(bv_); - bv_->the_locking_inset = 0; + if (bv_->theLockingInset()) { + if (!bv_->inset_slept) + bv_->theLockingInset()->InsetUnlock(bv_); + bv_->theLockingInset(0); bv_->text->FinishUndo(); bv_->inset_slept = false; } @@ -1384,7 +1331,7 @@ void BufferView::Pimpl::toggleToggle() void BufferView::Pimpl::center() { beforeChange(); - if (bv_->text->cursor.y() > workarea_->height() / 2) { + if (bv_->text->cursor.y() > (int)(workarea_->height() / 2)) { screen_->Draw(bv_->text, bv_->text->cursor.y() - workarea_->height() / 2); } else { screen_->Draw(bv_->text, 0);