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());
}
: 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
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();
- owner_->getDialogs()->updateBufferDependent();
bv_->insetWakeup();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
owner_->updateMenubar();
owner_->updateToolbar();
+ owner_->getDialogs()->hideBufferDependent();
updateScrollbar();
workarea_->redraw();
{
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;
// Callback for scrollbar slider
void BufferView::Pimpl::scrollCB(double value)
{
- extern bool cursor_follows_scrollbar;
-
if (buffer_ == 0) return;
current_scrollbar_value = long(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;
- unsigned int height = vbt->DefaultHeight();
+ int height = vbt->DefaultHeight();
- if (vbt->cursor.y() < 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() >
- bv_->text->first + workarea_->height() - height) {
+ static_cast<int>((bv_->text->first+workarea_->height()-height)))
+ {
vbt->SetCursorFromCoordinates(bv_, 0,
bv_->text->first +
workarea_->height() -
workarea_->setScrollbarValue(value);
- bv_->scrollCB(value);
+ scrollCB(value);
return 0;
}
workarea_->setScrollbarValue(value);
- bv_->scrollCB(value);
+ scrollCB(value);
return 0;
}
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->
+ 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_->the_locking_inset->scroll(),
+ x - start_x,
y - cursor.y() + bv_->text->first,
state);
return;
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;
}
}
}
- 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());
}
}
}
// 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?
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);
+ 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);
void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
{
// select a line
- if (buffer_ && screen_ && !bv_->the_locking_inset && (button == 1)) {
+ 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);
void BufferView::Pimpl::leaveView()
{
if (using_xterm_cursor) {
- XUndefineCursor(fl_display, workarea_->getWin());
+ XUndefineCursor(fl_get_display(), workarea_->getWin());
using_xterm_cursor = false;
}
}
// inset, inset_hit is 0, and inset_x == x, inset_y == y.
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;
}
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
if (!screen_)
return 0;
- unsigned int y_tmp = y + text->first;
+ int y_tmp = y + text->first;
LyXCursor cursor;
text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
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, 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)
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, end_x;
+ 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 (!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();
- }
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))
+ if (move_cursor && (tmpinset != bv_->theLockingInset()))
#endif
text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true);
x = x - start_x;
// ...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();
void BufferView::Pimpl::update()
{
- if (screen_) screen_->Update(bv_->text);
+ if (screen_) screen_->Update(bv_->text, bv_);
}
// Values used when calling update:
goto set_timer_and_return;
}
- if (!bv_->the_locking_inset) {
- screen_->CursorToggle(bv_->text);
+ if (!bv_->theLockingInset()) {
+ screen_->CursorToggle(bv_->text, bv_);
} else {
- bv_->the_locking_inset->
- ToggleInsetCursor(bv_);
+ bv_->theLockingInset()->ToggleInsetCursor(bv_);
}
set_timer_and_return:
}
-void BufferView::Pimpl::cursorPrevious()
+void BufferView::Pimpl::cursorPrevious(LyXText * text)
{
- if (!bv_->text->cursor.row()->previous()) return;
+ if (!text->cursor.row()->previous())
+ return;
- int y = bv_->text->first;
- Row * cursorrow = bv_->text->cursor.row();
- bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
+ int y = text->first;
+ if (text->inset_owner)
+ y += bv_->text->first;
+ Row * cursorrow = text->cursor.row();
+ text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
bv_->text->FinishUndo();
// This is to allow jumping over large insets
- if ((cursorrow == bv_->text->cursor.row()))
- bv_->text->CursorUp(bv_);
+ if ((cursorrow == text->cursor.row()))
+ text->CursorUp(bv_);
- if (bv_->text->cursor.row()->height() < workarea_->height())
- screen_->Draw(bv_->text,
- bv_->text->cursor.y()
- - bv_->text->cursor.row()->baseline()
- + bv_->text->cursor.row()->height()
+ if (text->inset_owner ||
+ text->cursor.row()->height() < workarea_->height())
+ screen_->Draw(bv_->text, bv_,
+ text->cursor.y()
+ - text->cursor.row()->baseline()
+ + text->cursor.row()->height()
- workarea_->height() + 1 );
updateScrollbar();
}
-void BufferView::Pimpl::cursorNext()
+void BufferView::Pimpl::cursorNext(LyXText * text)
{
- if (!bv_->text->cursor.row()->next()) return;
+ if (!text->cursor.row()->next())
+ return;
- 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
- + workarea_->height());
+ 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());
bv_->text->FinishUndo();
// This is to allow jumping over large insets
if ((cursorrow == bv_->text->cursor.row()))
- bv_->text->CursorDown(bv_);
+ text->CursorDown(bv_);
- if (bv_->text->cursor.row()->height() < workarea_->height())
- screen_->Draw(bv_->text, bv_->text->cursor.y()
- - bv_->text->cursor.row()->baseline());
+ if (text->inset_owner ||
+ text->cursor.row()->height() < workarea_->height())
+ screen_->Draw(bv_->text, bv_, text->cursor.y() -
+ text->cursor.row()->baseline());
updateScrollbar();
}
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);
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 {
void BufferView::Pimpl::insetSleep()
{
- if (bv_->the_locking_inset && !bv_->inset_slept) {
- bv_->the_locking_inset->GetCursorPos(bv_, 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;
}
}
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;
}
}
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;
}
void BufferView::Pimpl::showCursor()
{
if (screen_)
- screen_->ShowCursor(bv_->text);
+ screen_->ShowCursor(bv_->text, bv_);
}
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() > 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();
screen_->HideCursor();
bv_->beforeChange();
- string clip(workarea_->getClipboard());
+ string const clip(workarea_->getClipboard());
if (clip.empty()) return;
projects / lyx.git / blobdiff