current_scrollbar_value = 0;
cursor_timeout.start();
workarea_->setFocus();
- work_area_focus = true;
- lyx_focus = false;
using_xterm_cursor = false;
}
updateScreen();
updateScrollbar();
}
- screen_->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->TopCursorVisible(bv_->text);
redraw();
owner_->getDialogs()->updateBufferDependent();
bv_->insetWakeup();
bv_->text->selection = false;
}
}
- screen_->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->TopCursorVisible(bv_->text);
/* this will scroll the
* screen such that the
* cursor becomes
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 &&
LyXText * vbt = bv_->text;
unsigned int height = vbt->DefaultHeight();
- if (vbt->cursor.y() < screen_->first + height) {
+ if (vbt->cursor.y() < bv_->text->first + height) {
vbt->SetCursorFromCoordinates(bv_, 0,
- screen_->first +
+ bv_->text->first +
height);
} else if (vbt->cursor.y() >
- screen_->first + workarea_->height() - height) {
+ bv_->text->first + workarea_->height() - height) {
vbt->SetCursorFromCoordinates(bv_, 0,
- screen_->first +
+ bv_->text->first +
workarea_->height() -
height);
}
bv_->the_locking_inset->
InsetMotionNotify(bv_,
x - cursor.x(),
- y - cursor.y() + screen_->first,
+ y - cursor.y() + bv_->text->first,
state);
return;
}
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
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) {
// Right button mouse click on a table
if (button == 3 &&
(bv_->text->cursor.par()->table ||
- bv_->text->MouseHitInTable(bv_, xpos, ypos + screen_->first))) {
+ bv_->text->MouseHitInTable(bv_, xpos, ypos + bv_->text->first))) {
// Set the cursor to the press-position
- bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_->first);
+ bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + bv_->text->first);
bool doit = true;
// Only show the table popup if the hit is in
}
#endif
- int screen_first = screen_->first;
+ int screen_first = bv_->text->first;
// Middle button press pastes if we have a selection
bool paste_internally = false;
// 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) {
// We are in inset locking mode.
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() -
* 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;
+ unsigned int y_tmp = y + text->first;
LyXCursor cursor;
- bv_->text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
+ 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()));
+ 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
// 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;
#if 0
if (move_cursor && (tmpinset != bv_->the_locking_inset))
#endif
- bv_->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 - (bv_->text->cursor.y());
+ y = y_tmp - (text->cursor.y());
return tmpinset;
}
}
(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;
#if 0
if (move_cursor && (tmpinset != bv_->the_locking_inset))
#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;
}
}
// 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();
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_->the_locking_inset) {
+ 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_->the_locking_inset->
+ ToggleInsetCursor(bv_);
}
-
+
set_timer_and_return:
cursor_timeout.restart();
- skip_timer:
return;
}
{
if (!bv_->text->cursor.row()->previous()) return;
- long y = screen_->first;
+ long y = bv_->text->first;
Row * cursorrow = bv_->text->cursor.row();
bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
bv_->text->FinishUndo();
{
if (!bv_->text->cursor.row()->next()) return;
- long y = screen_->first;
+ long y = bv_->text->first;
bv_->text->GetRowNearY(y);
Row * cursorrow = bv_->text->cursor.row();
bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y
projects / lyx.git / blobdiff