#include "TextCache.h"
#include "bufferlist.h"
#include "insets/insetbib.h"
-#include "menus.h"
+#include "insets/insettext.h"
#include "lyx_gui_misc.h"
#include "lyxrc.h"
#include "intl.h"
+#include "support/LAssert.h"
+#include "frontends/Dialogs.h"
+
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::slot;
+#endif
using std::pair;
using std::endl;
+using std::make_pair;
+using std::min;
/* the selection possible is needed, that only motion events are
* used, where the bottom press event was on the drawing area too */
extern char ascii_type;
extern void sigchldhandler(pid_t pid, int * status);
-extern int bibitemMaxWidth(Painter &, LyXFont const &);
-extern void FreeUpdateTimer();
-
-extern "C"
-void C_BufferView_CursorToggleCB(FL_OBJECT * ob, long buf);
+extern int bibitemMaxWidth(BufferView *, LyXFont const &);
+const unsigned int saved_positions_num = 20;
static inline
void waitForX()
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());
}
BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
int xpos, int ypos, int width, int height)
- : bv_(b), owner_(o)
+ : bv_(b), owner_(o), cursor_timeout(400)
{
buffer_ = 0;
- workarea = new WorkArea(bv_, xpos, ypos, width, height);
- screen = 0;
- timer_cursor = 0;
- create_view();
+ workarea_ = new WorkArea(xpos, ypos, width, height);
+ // Setup the signals
+ workarea_->scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
+ 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,
+ &BufferView::Pimpl::cursorToggle));
current_scrollbar_value = 0;
- fl_set_timer(timer_cursor, 0.4);
- workarea->setFocus();
- work_area_focus = true;
- lyx_focus = false;
+ cursor_timeout.start();
+ workarea_->setFocus();
using_xterm_cursor = false;
+ saved_positions.resize(saved_positions_num);
}
Painter & BufferView::Pimpl::painter()
{
- return workarea->getPainter();
+ return workarea_->getPainter();
}
// Put the old text into the TextCache, but
// only if the buffer is still loaded.
// Also set the owner of the test to 0
- bv_->text->owner(0);
- textcache.add(bv_->text);
+ // bv_->text->owner(0);
+ textcache.add(buffer_, workarea_->workWidth(), bv_->text);
if (lyxerr.debugging())
textcache.show(lyxerr, "BufferView::buffer");
// Nuke old image
// screen is always deleted when the buffer is changed.
- delete screen;
- screen = 0;
+ delete screen_;
+ screen_ = 0;
// If we are closing the buffer, use the first buffer as current
if (!buffer_) {
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)
+ if (bv_->text == 0) {
resizeCurrentBuffer();
- else {
+ } else {
updateScreen();
updateScrollbar();
}
- screen->first = screen->TopCursorVisible();
+ 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();
- updateAllVisibleBufferRelatedPopups();
bv_->insetWakeup();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
- owner_->getMenus()->hideMenus();
+ owner_->updateMenubar();
+ owner_->updateToolbar();
+ owner_->getDialogs()->hideBufferDependent();
updateScrollbar();
- workarea->redraw();
+ workarea_->redraw();
// Also remove all remaining text's from the testcache.
// (there should not be any!) (if there is any it is a
owner_->updateWindowTitle();
}
+
void BufferView::Pimpl::resize(int xpos, int ypos, int width, int height)
{
- workarea->resize(xpos, ypos, width, height);
- update(3);
+ workarea_->resize(xpos, ypos, width, height);
+ update(bv_->text, SELECT);
redraw();
}
void BufferView::Pimpl::resize()
{
- // This will resize the buffer. (Asger)
if (buffer_)
resizeCurrentBuffer();
}
void BufferView::Pimpl::redraw()
{
lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
- workarea->redraw();
+ workarea_->redraw();
}
-void BufferView::Pimpl::fitCursor()
+bool BufferView::Pimpl::fitCursor(LyXText * text)
{
- if (screen) screen->FitCursor();
- updateScrollbar();
+ Assert(screen_);
+
+ bool ret = screen_->FitCursor(text, bv_);
+ if (ret)
+ updateScrollbar();
+ return ret;
}
LyXParagraph * par = 0;
LyXParagraph * selstartpar = 0;
LyXParagraph * selendpar = 0;
+ UpdatableInset * the_locking_inset;
+
int pos = 0;
int selstartpos = 0;
int selendpos = 0;
owner_->getMiniBuffer()->Set(_("Formatting document..."));
if (bv_->text) {
- par = bv_->text->cursor.par;
- pos = bv_->text->cursor.pos;
- selstartpar = bv_->text->sel_start_cursor.par;
- selstartpos = bv_->text->sel_start_cursor.pos;
- selendpar = bv_->text->sel_end_cursor.par;
- selendpos = bv_->text->sel_end_cursor.pos;
+ par = bv_->text->cursor.par();
+ pos = bv_->text->cursor.pos();
+ selstartpar = bv_->text->sel_start_cursor.par();
+ selstartpos = bv_->text->sel_start_cursor.pos();
+ selendpar = bv_->text->sel_end_cursor.par();
+ selendpos = bv_->text->sel_end_cursor.pos();
selection = bv_->text->selection;
mark_set = bv_->text->mark_set;
+ the_locking_inset = bv_->text->the_locking_inset;
delete bv_->text;
- bv_->text = new LyXText(bv_, workarea->workWidth(), buffer_);
+ bv_->text = new LyXText(bv_);
} else {
// See if we have a text in TextCache that fits
// the new buffer_ with the correct width.
- bv_->text = textcache.findFit(buffer_, workarea->workWidth());
+ bv_->text = textcache.findFit(buffer_, workarea_->workWidth());
if (bv_->text) {
if (lyxerr.debugging()) {
lyxerr << "Found a LyXText that fits:\n";
- textcache.show(lyxerr, bv_->text);
+ textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_->workWidth(), bv_->text)));
}
// Set the owner of the newly found text
- bv_->text->owner(bv_);
+ // bv_->text->owner(bv_);
if (lyxerr.debugging())
textcache.show(lyxerr, "resizeCurrentBuffer");
} else {
- bv_->text = new LyXText(bv_, workarea->workWidth(), buffer_);
+ bv_->text = new LyXText(bv_);
}
}
updateScreen();
* Mechanism when setting the cursor */
bv_->text->mark_set = mark_set;
if (selection) {
- bv_->text->SetCursor(selstartpar, selstartpos);
+ bv_->text->SetCursor(bv_, selstartpar, selstartpos);
bv_->text->sel_cursor = bv_->text->cursor;
- bv_->text->SetCursor(selendpar, selendpos);
- bv_->text->SetSelection();
- bv_->text->SetCursor(par, pos);
+ bv_->text->SetCursor(bv_, selendpar, selendpos);
+ bv_->text->SetSelection(bv_);
+ bv_->text->SetCursor(bv_, par, pos);
} else {
- bv_->text->SetCursor(par, pos);
+ bv_->text->SetCursor(bv_, par, pos);
bv_->text->sel_cursor = bv_->text->cursor;
bv_->text->selection = false;
}
+ // remake the inset locking
+ bv_->text->the_locking_inset = the_locking_inset;
}
- screen->first = screen->TopCursorVisible(); /* 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();
bv_->setState();
AllowInput(bv_);
- // Now if the title form still exist kill it
- TimerCB(0, 0);
-
+ owner_->getDialogs()->hideSplash();
+
return 0;
}
-void BufferView::Pimpl::gotoError()
-{
- if (!screen)
- return;
-
- screen->HideCursor();
- bv_->beforeChange();
- update(-2);
- LyXCursor tmp;
-
- if (!bv_->text->GotoNextError()) {
- if (bv_->text->cursor.pos
- || bv_->text->cursor.par != bv_->text->FirstParagraph()) {
- tmp = bv_->text->cursor;
- bv_->text->cursor.par = bv_->text->FirstParagraph();
- bv_->text->cursor.pos = 0;
- if (!bv_->text->GotoNextError()) {
- bv_->text->cursor = tmp;
- owner_->getMiniBuffer()
- ->Set(_("No more errors"));
- LyXBell();
- }
- } else {
- owner_->getMiniBuffer()->Set(_("No more errors"));
- LyXBell();
- }
- }
- update(0);
- bv_->text->sel_cursor = bv_->text->cursor;
-}
-
-
void BufferView::Pimpl::updateScreen()
{
// Regenerate the screen.
- delete screen;
- screen = new LyXScreen(*workarea, bv_->text);
-}
-
-
-void BufferView::Pimpl::create_view()
-{
- FL_OBJECT * obj;
-
- //
- // TIMERS
- //
-
- // timer_cursor
- timer_cursor = obj = fl_add_timer(FL_HIDDEN_TIMER,
- 0, 0, 0, 0, "Timer");
- fl_set_object_callback(obj, C_BufferView_CursorToggleCB, 0);
- obj->u_vdata = bv_;
+ delete screen_;
+ screen_ = new LyXScreen(*workarea_);
}
* be possible */
if (!buffer_) {
- workarea->setScrollbar(0, 1.0);
+ workarea_->setScrollbar(0, 1.0);
return;
}
- static long max2 = 0;
- static long height2 = 0;
+ static unsigned long max2 = 0;
+ static unsigned long height2 = 0;
- long cbth = 0;
+ 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 &&
- height2 == workarea->height() &&
+ height2 == workarea_->height() &&
current_scrollbar_value == cbsf)
return; // no
max2 = cbth;
- height2 = workarea->height();
+ height2 = workarea_->height();
current_scrollbar_value = cbsf;
if (cbth <= height2) { // text is smaller than screen
- workarea->setScrollbar(0, 1.0); // right?
+ workarea_->setScrollbar(0, 1.0); // right?
return;
}
- long maximum_height = workarea->height() * 3 / 4 + cbth;
+ long maximum_height = workarea_->height() * 3 / 4 + cbth;
long value = cbsf;
// set the scrollbar
- double hfloat = workarea->height();
+ double hfloat = workarea_->height();
double maxfloat = maximum_height;
float slider_size = 0.0;
int slider_value = value;
- workarea->setScrollbarBounds(0, bv_->text->height - workarea->height());
+ workarea_->setScrollbarBounds(0, bv_->text->height - workarea_->height());
double lineh = bv_->text->DefaultHeight();
- workarea->setScrollbarIncrements(lineh);
+ workarea_->setScrollbarIncrements(lineh);
if (maxfloat > 0.0) {
if ((hfloat / maxfloat) * float(height2) < 3)
slider_size = 3.0/float(height2);
} else
slider_size = hfloat;
- workarea->setScrollbar(slider_value, slider_size / workarea->height());
+ workarea_->setScrollbar(slider_value, slider_size / workarea_->height());
}
// Callback for scrollbar slider
void BufferView::Pimpl::scrollCB(double value)
{
- extern bool cursor_follows_scrollbar;
-
- if (buffer_ == 0) return;
+ if (!buffer_) return;
current_scrollbar_value = long(value);
if (current_scrollbar_value < 0)
current_scrollbar_value = 0;
- if (!screen)
+ if (!screen_)
return;
- screen->Draw(current_scrollbar_value);
+ screen_->Draw(bv_->text, bv_, current_scrollbar_value);
- if (cursor_follows_scrollbar) {
- LyXText * vbt = bv_->text;
- int height = vbt->DefaultHeight();
-
- if (vbt->cursor.y < screen->first + height) {
- vbt->SetCursorFromCoordinates(0,
- screen->first +
- height);
- } else if (vbt->cursor.y >
- screen->first + workarea->height() - height) {
- vbt->SetCursorFromCoordinates(0,
- screen->first +
- workarea->height() -
- height);
- }
+ if (!lyxrc.cursor_follows_scrollbar) {
+ waitForX();
+ return;
}
- waitForX();
-}
+
+ LyXText * vbt = bv_->text;
+
+ int const height = vbt->DefaultHeight();
+ int const first = static_cast<int>((bv_->text->first + height));
+ int const last = static_cast<int>((bv_->text->first + workarea_->height() - height));
+
+ if (vbt->cursor.y() < first)
+ vbt->SetCursorFromCoordinates(bv_, 0, first);
+ else if (vbt->cursor.y() > last)
+ vbt->SetCursorFromCoordinates(bv_, 0, last);
-
-// Callback for scrollbar down button
-void BufferView::Pimpl::downCB(long time, int button)
-{
- if (buffer_ == 0) return;
-
- switch (button) {
- case 2:
- scrollUpOnePage();
- break;
- case 3:
- scrollDownOnePage();
- break;
- default:
- scrollDown(time);
- break;
- }
+ waitForX();
}
int BufferView::Pimpl::scrollUp(long time)
{
- if (buffer_ == 0) return 0;
- if (!screen) return 0;
+ if (!buffer_) return 0;
+ if (!screen_) return 0;
- double value = workarea->getScrollbarValue();
+ double value = workarea_->getScrollbarValue();
if (value == 0) return 0;
float add_value = (bv_->text->DefaultHeight()
+ float(time) * float(time) * 0.125);
- if (add_value > workarea->height())
- add_value = float(workarea->height() -
+ if (add_value > workarea_->height())
+ add_value = float(workarea_->height() -
bv_->text->DefaultHeight());
value -= add_value;
if (value < 0)
value = 0;
- workarea->setScrollbarValue(value);
+ workarea_->setScrollbarValue(value);
- bv_->scrollCB(value);
+ scrollCB(value);
return 0;
}
int BufferView::Pimpl::scrollDown(long time)
{
- if (buffer_ == 0) return 0;
- if (!screen) return 0;
+ if (!buffer_) return 0;
+ if (!screen_) return 0;
- double value= workarea->getScrollbarValue();
- pair<double, double> p = workarea->getScrollbarBounds();
+ double value= workarea_->getScrollbarValue();
+ pair<float, float> p = workarea_->getScrollbarBounds();
double max = p.second;
if (value == max) return 0;
float add_value = (bv_->text->DefaultHeight()
+ float(time) * float(time) * 0.125);
- if (add_value > workarea->height())
- add_value = float(workarea->height() -
+ if (add_value > workarea_->height())
+ add_value = float(workarea_->height() -
bv_->text->DefaultHeight());
value += add_value;
if (value > max)
value = max;
- workarea->setScrollbarValue(value);
+ workarea_->setScrollbarValue(value);
- bv_->scrollCB(value);
+ scrollCB(value);
return 0;
}
-void BufferView::Pimpl::scrollUpOnePage()
-{
- if (buffer_ == 0) return;
- if (!screen) return;
-
- long y = screen->first;
-
- if (!y) return;
-
- Row * row = bv_->text->GetRowNearY(y);
-
- y = y - workarea->height() + row->height;
-
- workarea->setScrollbarValue(y);
-
- bv_->scrollCB(y);
-}
-
-
-void BufferView::Pimpl::scrollDownOnePage()
+void BufferView::Pimpl::workAreaKeyPress(KeySym keysym, unsigned int state)
{
- if (buffer_ == 0) return;
- if (!screen) return;
-
- long y = screen->first;
-
- if (y > bv_->text->height - workarea->height())
- return;
-
- y += workarea->height();
- bv_->text->GetRowNearY(y);
-
- workarea->setScrollbarValue(y);
-
- bv_->scrollCB(y);
+ bv_->owner()->getLyXFunc()->processKeySym(keysym, state);
}
void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
{
- if (buffer_ == 0 || !screen) return;
-
// Only use motion with button 1
- if (!state & Button1MotionMask)
- return;
+ if (!(state & Button1MotionMask))
+ return;
+
+ if (!buffer_ || !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,
- y - cursor.y + screen->first,
+ x - start_x,
+ y - cursor.y() + bv_->text->first,
state);
return;
}
- /* The selection possible is needed, that only motion events are
+ /* The test for not selection possible is needed, that only motion events are
* used, where the bottom press event was on the drawing area too */
- if (selection_possible) {
- screen->HideCursor();
+ if (!selection_possible)
+ return;
+
+ screen_->HideCursor();
- bv_->text->SetCursorFromCoordinates(x, y + screen->first);
+ bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first);
- if (!bv_->text->selection)
- update(-3); // Maybe an empty line was deleted
+ if (!bv_->text->selection)
+ update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
- bv_->text->SetSelection();
- screen->ToggleToggle();
- if (screen->FitCursor())
- updateScrollbar();
- screen->ShowCursor();
- }
- return;
+ bv_->text->SetSelection(bv_);
+ screen_->ToggleToggle(bv_->text, bv_);
+ fitCursor(bv_->text);
+ screen_->ShowCursor(bv_->text, bv_);
}
last_click_x = -1;
last_click_y = -1;
- if (buffer_ == 0 || !screen) return;
+ if (!buffer_ || !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());
}
}
if (!inset_hit)
selection_possible = true;
- screen->HideCursor();
-
- // Right button mouse click on a table
- if (button == 3 &&
- (bv_->text->cursor.par->table ||
- bv_->text->MouseHitInTable(xpos, ypos + screen->first))) {
- // Set the cursor to the press-position
- bv_->text->SetCursorFromCoordinates(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_->text->cursor.row, xpos))
- doit = false;
-
- // Hit above or below the table?
- if (doit) {
- if (!bv_->text->selection) {
- screen->ToggleSelection();
- bv_->text->ClearSelection();
- bv_->text->FullRebreak();
- screen->Update();
- 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;
- }
- }
-
- int screen_first = screen->first;
+ screen_->HideCursor();
+
+ int const screen_first = bv_->text->first;
// Middle button press pastes if we have a selection
bool paste_internally = false;
}
// Clear the selection
- screen->ToggleSelection();
+ screen_->ToggleSelection(bv_->text, bv_);
bv_->text->ClearSelection();
- bv_->text->FullRebreak();
- screen->Update();
+ bv_->text->FullRebreak(bv_);
+ screen_->Update(bv_->text, bv_);
updateScrollbar();
// Single left click in math inset?
}
if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
- bv_->text->SetCursorFromCoordinates(xpos, ypos + screen_first);
+ bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_first);
bv_->text->FinishUndo();
bv_->text->sel_cursor = bv_->text->cursor;
- bv_->text->cursor.x_fix = bv_->text->cursor.x;
+ bv_->text->cursor.x_fix(bv_->text->cursor.x());
owner_->updateLayoutChoice();
- if (screen->FitCursor()){
- updateScrollbar();
+ if (fitCursor(bv_->text)) {
selection_possible = false;
}
void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
{
// select a word
- if (buffer_ && !bv_->the_locking_inset) {
- if (screen && button == 1) {
- screen->HideCursor();
- screen->ToggleSelection();
- bv_->text->SelectWord();
- screen->ToggleSelection(false);
- /* This will fit the cursor on the screen
- * if necessary */
- update(0);
- }
- }
+ if (!buffer_)
+ return;
+
+ LyXText * text = bv_->getLyXText();
+
+ if (text->bv_owner && bv_->theLockingInset())
+ return;
+
+ if (screen_ && button == 1) {
+ screen_->HideCursor();
+ screen_->ToggleSelection(text, bv_);
+ text->SelectWord(bv_);
+ screen_->ToggleSelection(text, bv_, false);
+ /* This will fit the cursor on the screen
+ * if necessary */
+ update(text, BufferView::SELECT|BufferView::FITCUR);
+ }
}
void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
{
// select a line
- if (buffer_ && screen && button == 1) {
- screen->HideCursor();
- screen->ToggleSelection();
- bv_->text->CursorHome();
- bv_->text->sel_cursor = bv_->text->cursor;
- bv_->text->CursorEnd();
- bv_->text->SetSelection();
- screen->ToggleSelection(false);
+ if (buffer_)
+ return;
+
+ LyXText * text = bv_->getLyXText();
+
+ if (text->bv_owner && bv_->theLockingInset())
+ return;
+
+ if (screen_ && (button == 1)) {
+ screen_->HideCursor();
+ screen_->ToggleSelection(text, bv_);
+ text->CursorHome(bv_);
+ text->sel_cursor = text->cursor;
+ text->CursorEnd(bv_);
+ text->SetSelection(bv_);
+ screen_->ToggleSelection(text, bv_, false);
/* This will fit the cursor on the screen
* if necessary */
- update(0);
+ update(text, BufferView::SELECT|BufferView::FITCUR);
}
}
void BufferView::Pimpl::enterView()
{
if (active() && available()) {
- SetXtermCursor(workarea->getWin());
+ SetXtermCursor(workarea_->getWin());
using_xterm_cursor = true;
}
}
void BufferView::Pimpl::leaveView()
{
if (using_xterm_cursor) {
- XUndefineCursor(fl_display, workarea->getWin());
+ XUndefineCursor(fl_get_display(), workarea_->getWin());
using_xterm_cursor = false;
}
}
-void BufferView::Pimpl::workAreaButtonRelease(int x, int y, unsigned int button)
+void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
+ unsigned int button)
{
- if (buffer_ == 0 || screen == 0) return;
+ if (!buffer_ || !screen_) return;
// 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;
- 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();
- }
- }
if (button >= 2) return;
bv_->setState();
- owner_->getMiniBuffer()->Set(CurrentState(bv_));
+ owner_->showState();
// Did we hit an editable inset?
- if (inset_hit != 0) {
+ if (inset_hit) {
// Inset like error, notes and figures
selection_possible = false;
-#ifdef WITH_WARNINGS
-#warning fix this proper in 0.13
-#endif
+
+ // CHECK fix this proper in 0.13
+
// Following a ref shouldn't issue
// a push on the undo-stack
// anylonger, now that we have
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
if (inset_hit->LyxCode() == Inset::REF_CODE) {
- bv_->text->SetCursorParUndo();
+ bv_->text->SetCursorParUndo(bv_->buffer());
}
owner_->getMiniBuffer()->Set(inset_hit->EditMessage());
if (bv_->text) {
bool hit = false;
char c = ' ';
- if (bv_->text->cursor.pos <
- bv_->text->cursor.par->Last()) {
- c = bv_->text->cursor.par->
- GetChar(bv_->text->cursor.pos);
+ if (bv_->text->cursor.pos() <
+ bv_->text->cursor.par()->Last()) {
+ c = bv_->text->cursor.par()->
+ 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
|| c == LyXParagraph::META_WIDE_TAB
|| c == LyXParagraph::META_ALGORITHM){
hit = true;
- } else if (bv_->text->cursor.pos - 1 >= 0) {
- c = bv_->text->cursor.par->
- GetChar(bv_->text->cursor.pos - 1);
+ } 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
|| c == LyXParagraph::META_WIDE_TAB
|| c == LyXParagraph::META_ALGORITHM){
// We are one step too far to the right
- bv_->text->CursorLeft();
+ 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 ==
+ if (bv_->text->cursor.row()->par()->footnoteflag ==
LyXParagraph::OPEN_FOOTNOTE
- //&& text->cursor.pos == 0
- && bv_->text->cursor.row->previous &&
- bv_->text->cursor.row->previous->par->
+ && bv_->text->cursor.row()->previous() &&
+ bv_->text->cursor.row()->previous()->par()->
footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
LyXFont font(LyXFont::ALL_SANE);
font.setSize(LyXFont::SIZE_FOOTNOTE);
int box_x = 20; // LYX_PAPER_MARGIN;
box_x += lyxfont::width(" wide-tab ", font);
- int screen_first = screen->first;
+ unsigned int screen_first = bv_->text->first;
if (x < box_x
- && y + screen_first > bv_->text->cursor.y -
- bv_->text->cursor.row->baseline
- && y + screen_first < bv_->text->cursor.y -
- bv_->text->cursor.row->baseline
+ && y + screen_first > bv_->text->cursor.y() -
+ bv_->text->cursor.row()->baseline()
+ && y + screen_first < bv_->text->cursor.y() -
+ bv_->text->cursor.row()->baseline()
+ lyxfont::maxAscent(font) * 1.2 + lyxfont::maxDescent(font) * 1.2) {
bv_->toggleFloat();
selection_possible = false;
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())) {
- bv_->text->cursor.par->bibkey->Edit(bv_, 0, 0, 0);
+ if (bv_->text->cursor.par()->bibkey && x < 20 +
+ bibitemMaxWidth(bv_, textclasslist.
+ TextClass(buffer_->
+ params.textclass).defaultfont())) {
+ bv_->text->cursor.par()->bibkey->Edit(bv_, 0, 0, 0);
}
return;
* 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, unsigned int /* button */)
+Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
+ unsigned int /* button */)
{
- if (!screen)
+ if (!screen_)
return 0;
- int y_tmp = y + screen->first;
+ int y_tmp = y + text->first;
LyXCursor cursor;
- bv_->text->SetCursorFromCoordinates(cursor, x, y_tmp);
- bool move_cursor = ((cursor.par != bv_->text->cursor.par) ||
- (cursor.pos != bv_->text->cursor.pos));
+ 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)
- && cursor.par->GetInset(cursor.pos)->Editable()) {
+ if (cursor.pos() < cursor.par()->Last()
+ && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
+ && cursor.par()->GetInset(cursor.pos())
+ && cursor.par()->GetInset(cursor.pos())->Editable()) {
// Check whether the inset really was hit
- Inset * tmpinset = cursor.par->GetInset(cursor.pos);
- LyXFont font = bv_->text->GetFont(cursor.par, cursor.pos);
- bool is_rtl = font.isVisibleRightToLeft();
- int start_x, end_x;
-
- if (is_rtl) {
- start_x = cursor.x - tmpinset->width(bv_->painter(), font);
- end_x = cursor.x;
- } else {
- start_x = cursor.x;
- end_x = cursor.x + tmpinset->width(bv_->painter(), font);
- }
+ Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
+ LyXFont font = text->GetFont(bv_->buffer(),
+ cursor.par(), cursor.pos());
+ 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_->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(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;
}
}
- if ((cursor.pos - 1 >= 0) &&
- (cursor.par->GetChar(cursor.pos-1) == LyXParagraph::META_INSET) &&
- (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(cursor.par, cursor.pos-1);
- bool is_rtl = font.isVisibleRightToLeft();
- int start_x, end_x;
-
- if (!is_rtl) {
- start_x = cursor.x - tmpinset->width(bv_->painter(), font);
- end_x = cursor.x;
- } else {
- start_x = cursor.x;
- end_x = cursor.x + tmpinset->width(bv_->painter(), font);
- }
+ if ((cursor.pos() - 1 >= 0) &&
+ (cursor.par()->GetChar(cursor.pos()-1) == LyXParagraph::META_INSET) &&
+ (cursor.par()->GetInset(cursor.pos() - 1)) &&
+ (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) {
+ Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
+ LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
+ cursor.pos()-1);
+ 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_->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(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;
}
}
void BufferView::Pimpl::workAreaExpose()
{
- // this is a hack to ensure that we only call this through
- // BufferView::redraw().
- //if (!lgb_hack) {
- // redraw();
- //}
-
- static int work_area_width = -1;
- static int work_area_height = -1;
+ static int work_area_width = 0;
+ static unsigned int work_area_height = 0;
- bool widthChange = workarea->workWidth() != work_area_width;
- bool heightChange = workarea->height() != work_area_height;
+ bool widthChange = workarea_->workWidth() != work_area_width;
+ bool heightChange = workarea_->height() != work_area_height;
// update from work area
- work_area_width = workarea->workWidth();
- work_area_height = workarea->height();
+ work_area_width = workarea_->workWidth();
+ work_area_height = workarea_->height();
if (buffer_ != 0) {
if (widthChange) {
// All buffers need a resize
// 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();
// ...including the minibuffer
owner_->getMiniBuffer()->Init();
- } else if (screen) screen->Redraw();
+ } else if (screen_)
+ screen_->Redraw(bv_->text, bv_);
} else {
// Grey box when we don't have a buffer
- workarea->greyOut();
+ workarea_->greyOut();
}
// always make sure that the scrollbar is sane.
}
-static
-string fromClipboard(Window win, XEvent * event)
-{
- string strret;
- if (event->xselection.type == XA_STRING
- && event->xselection.property) {
- Atom tmpatom;
- unsigned long ul1;
- unsigned long ul2;
- unsigned char * uc = 0;
- int tmpint;
- if (XGetWindowProperty(
- event->xselection.display, // display
- win, // w
- event->xselection.property, // property
- 0, // long_offset
- 0, // logn_length
- False, // delete
- XA_STRING, // req_type
- &tmpatom, // actual_type_return
- &tmpint, // actual_format_return
- &ul1,
- &ul2,
- &uc // prop_return
- ) != Success) {
- return strret;
- }
- if (uc) {
- free(uc);
- uc = 0;
- }
- if (XGetWindowProperty(
- event->xselection.display, // display
- win, // w
- event->xselection.property, // property
- 0, // long_offset
- ul2/4+1, // long_length
- True, // delete
- XA_STRING, // req_type
- &tmpatom, // actual_type_return
- &tmpint, // actual_format_return
- &ul1, // nitems_return
- &ul2, // bytes_after_return
- &uc // prop_return */
- ) != Success) {
- return strret;
- }
- if (uc) {
- strret = reinterpret_cast<char*>(uc);
- free(uc); // yes free!
- uc = 0;
- }
- }
- return strret;
-}
-
-
-void BufferView::Pimpl::workAreaSelectionNotify(Window win, XEvent * event)
-{
- if (buffer_ == 0) return;
-
- screen->HideCursor();
- bv_->beforeChange();
- string clb = fromClipboard(win, event);
- if (!clb.empty()) {
- if (!ascii_type)
- bv_->text->InsertStringA(clb);
- else
- bv_->text->InsertStringB(clb);
-
- update(1);
- }
-}
-
-
void BufferView::Pimpl::update()
{
- if (screen) screen->Update();
+ if (screen_) screen_->Update(bv_->text, bv_);
}
-
-void BufferView::Pimpl::update(signed char f)
+// Values used when calling update:
+// -3 - update
+// -2 - update, move sel_cursor if selection, fitcursor
+// -1 - update, move sel_cursor if selection, fitcursor, mark dirty
+// 0 - update, move sel_cursor if selection, fitcursor
+// 1 - update, move sel_cursor if selection, fitcursor, mark dirty
+// 3 - update, move sel_cursor if selection
+//
+// update -
+// a simple redraw of the parts that need refresh
+//
+// move sel_cursor if selection -
+// the text's sel_cursor is moved if there is selection is progress
+//
+// fitcursor -
+// fitCursor() is called and the scrollbar updated
+//
+// mark dirty -
+// the buffer is marked dirty.
+//
+// enum {
+// UPDATE = 0,
+// SELECT = 1,
+// FITCUR = 2,
+// CHANGE = 4
+// };
+//
+// UPDATE_ONLY = UPDATE;
+// UPDATE_SELECT = UPDATE | SELECT;
+// UPDATE_SELECT_MOVE = UPDATE | SELECT | FITCUR;
+// UPDATE_SELECT_MOVE_AFTER_CHANGE = UPDATE | SELECT | FITCUR | CHANGE;
+//
+// update(-3) -> update(0) -> update(0) -> update(UPDATE)
+// update(-2) -> update(1 + 2) -> update(3) -> update(SELECT|FITCUR)
+// update(-1) -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE)
+// update(1) -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE)
+// update(3) -> update(1) -> update(1) -> update(SELECT)
+
+void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
{
owner_->updateLayoutChoice();
- if (!bv_->text->selection && f > -3)
- bv_->text->sel_cursor = bv_->text->cursor;
-
- FreeUpdateTimer();
- bv_->text->FullRebreak();
-
- update();
-
- if (f != 3 && f != -3) {
- fitCursor();
- updateScrollbar();
- }
-
- if (f == 1 || f == -1) {
- if (buffer_->isLyxClean()) {
- buffer_->markDirty();
- owner_->getMiniBuffer()->setTimer(4);
- } else {
- buffer_->markDirty();
- }
+ if (!text->selection && (f & SELECT)) {
+ text->sel_cursor = text->cursor;
}
-}
+ text->FullRebreak(bv_);
-void BufferView::Pimpl::smallUpdate(signed char f)
-{
- screen->SmallUpdate();
- if (screen->TopCursorVisible()
- != screen->first) {
- update(f);
- return;
- }
-
- fitCursor();
- updateScrollbar();
+ if (text->inset_owner) {
+ text->inset_owner->SetUpdateStatus(bv_, InsetText::CURSOR_PAR);
+ bv_->updateInset(text->inset_owner, true);
+ } else
+ update();
- if (!bv_->text->selection)
- bv_->text->sel_cursor = bv_->text->cursor;
+ if ((f & FITCUR)) {
+ fitCursor(text);
+ }
- if (f == 1 || f == -1) {
+ if ((f & CHANGE)) {
if (buffer_->isLyxClean()) {
buffer_->markDirty();
owner_->getMiniBuffer()->setTimer(4);
// Quite a nice place for asyncron Inset updating, isn't it?
// Actually no! This is run even if no buffer exist... so (Lgb)
if (!buffer_) {
- goto set_timer_and_return;
- }
-
- // NOTE:
- // On my quest to solve the gs render hangups I am now
- // disabling the SIGHUP completely, and will do a wait
- // now and then instead. If the guess that xforms somehow
- // destroys something is true, this is likely (hopefully)
- // to solve the problem...at least I hope so. Lgb
-
- // ...Ok this seems to work...at least it does not make things
- // worse so far. However I still see gs processes that hangs.
- // I would really like to know _why_ they are hanging. Anyway
- // the solution without the SIGCHLD handler seems to be easier
- // to debug.
-
- // When attaching gdb to a a running gs that hangs it shows
- // that it is waiting for input(?) Is it possible for us to
- // provide that input somehow? Or figure what it is expecing
- // to read?
-
- // One solution is to, after some time, look if there are some
- // old gs processes still running and if there are: kill them
- // and re render.
-
- // Another solution is to provide the user an option to rerender
- // a picture. This would, for the picture in question, check if
- // there is a gs running for it, if so kill it, and start a new
- // rendering process.
-
- // these comments posted to lyx@via
- {
- int status = 1;
- int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
- if (pid == -1) // error find out what is wrong
- ; // ignore it for now.
- else if (pid > 0)
- sigchldhandler(pid, &status);
+ cursor_timeout.restart();
+ return;
}
+
+ int status = 1;
+ int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
+ if (pid == -1) // error find out what is wrong
+ ; // ignore it for now.
+ else if (pid > 0)
+ sigchldhandler(pid, &status);
updatelist.update(bv_);
- if (!screen) {
- goto set_timer_and_return;
+ if (!screen_) {
+ cursor_timeout.restart();
+ return;
}
- if (lyx_focus && work_area_focus) {
- if (!bv_->the_locking_inset) {
- screen->CursorToggle();
- } else {
- bv_->the_locking_inset->
- ToggleInsetCursor(bv_);
- }
- goto set_timer_and_return;
+ if (!bv_->theLockingInset()) {
+ screen_->CursorToggle(bv_->text, bv_);
} else {
- // Make sure that the cursor is visible.
- if (!bv_->the_locking_inset) {
- screen->ShowCursor();
- } 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:
- fl_set_timer(timer_cursor, 0.4);
- skip_timer:
- return;
+
+ cursor_timeout.restart();
}
-void BufferView::Pimpl::cursorPrevious()
+void BufferView::Pimpl::cursorPrevious(LyXText * text)
{
- if (!bv_->text->cursor.row->previous) return;
+ if (!text->cursor.row()->previous())
+ return;
- long y = screen->first;
- Row * cursorrow = bv_->text->cursor.row;
- bv_->text->SetCursorFromCoordinates(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();
+ if ((cursorrow == text->cursor.row()))
+ text->CursorUp(bv_);
- if (bv_->text->cursor.row->height < workarea->height())
- screen->Draw(bv_->text->cursor.y
- - bv_->text->cursor.row->baseline
- + bv_->text->cursor.row->height
- - workarea->height() + 1 );
+ 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;
- long y = screen->first;
- bv_->text->GetRowNearY(y);
- Row * cursorrow = bv_->text->cursor.row;
- bv_->text->SetCursorFromCoordinates(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();
+ if ((cursorrow == bv_->text->cursor.row()))
+ text->CursorDown(bv_);
- if (bv_->text->cursor.row->height < workarea->height())
- screen->Draw(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();
}
}
-void BufferView::Pimpl::beforeChange()
+void BufferView::Pimpl::beforeChange(LyXText * text)
{
toggleSelection();
- bv_->text->ClearSelection();
- FreeUpdateTimer();
+ text->ClearSelection();
}
-void BufferView::Pimpl::savePosition()
+void BufferView::Pimpl::savePosition(unsigned int i)
{
- backstack.push(buffer_->fileName(),
- bv_->text->cursor.x,
- bv_->text->cursor.y);
+ if (i >= saved_positions_num)
+ return;
+ saved_positions[i] = Position(buffer_->fileName(),
+ bv_->text->cursor.par()->id(),
+ bv_->text->cursor.pos());
+ if (i > 0)
+ owner_->getMiniBuffer()->Set(_("Saved bookmark ") + tostr(i));
}
-void BufferView::Pimpl::restorePosition()
+void BufferView::Pimpl::restorePosition(unsigned int i)
{
- if (backstack.empty()) return;
-
- 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);
- bv_->text->SetCursorFromCoordinates(x, y);
- update(0);
-}
+ if (i >= saved_positions_num)
+ return;
+
+ string fname = saved_positions[i].filename;
+
+ beforeChange(bv_->text);
+
+ 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);
+ }
+
+ LyXParagraph * par = bv_->text->GetParFromID(saved_positions[i].par_id);
+ if (!par)
+ return;
+
+ bv_->text->SetCursor(bv_, par,
+ min(par->Last(), saved_positions[i].par_pos));
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+ if (i > 0)
+ owner_->getMiniBuffer()->Set(_("Moved to bookmark ") + tostr(i));
+}
+
+
+bool BufferView::Pimpl::isSavedPosition(unsigned int i)
+{
+ if (i >= saved_positions_num)
+ return false;
+
+ return !saved_positions[i].filename.empty();
+}
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 {
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;
}
}
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;
}
bool BufferView::Pimpl::focus() const
{
- return workarea->hasFocus();
+ return workarea_->hasFocus();
}
void BufferView::Pimpl::focus(bool f)
{
- if (f) workarea->setFocus();
+ if (f) workarea_->setFocus();
}
bool BufferView::Pimpl::active() const
{
- return workarea->active();
+ return workarea_->active();
}
bool BufferView::Pimpl::belowMouse() const
{
- return workarea->belowMouse();
+ return workarea_->belowMouse();
}
void BufferView::Pimpl::showCursor()
{
- if (screen)
- screen->ShowCursor();
+ if (screen_)
+ screen_->ShowCursor(bv_->text, bv_);
}
void BufferView::Pimpl::hideCursor()
{
- if (screen)
- screen->HideCursor();
+ if (screen_)
+ screen_->HideCursor();
}
void BufferView::Pimpl::toggleSelection(bool b)
{
- if (screen)
- screen->ToggleSelection(b);
+ if (screen_)
+ screen_->ToggleSelection(bv_->text, bv_, b);
}
void BufferView::Pimpl::toggleToggle()
{
- if (screen)
- screen->ToggleToggle();
+ if (screen_)
+ screen_->ToggleToggle(bv_->text, bv_);
}
void BufferView::Pimpl::center()
{
- beforeChange();
- if (bv_->text->cursor.y > workarea->height() / 2) {
- screen->Draw(bv_->text->cursor.y - workarea->height() / 2);
+ beforeChange(bv_->text);
+ 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(0);
+ screen_->Draw(bv_->text, bv_, 0);
}
- update(0);
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
redraw();
}
+
+
+void BufferView::Pimpl::pasteClipboard(bool asPara)
+{
+ if (!buffer_) return;
+
+ screen_->HideCursor();
+ beforeChange(bv_->text);
+
+ string const clip(workarea_->getClipboard());
+
+ if (clip.empty()) return;
+
+ if (asPara) {
+ bv_->text->InsertStringB(bv_, clip);
+ } else {
+ bv_->text->InsertStringA(bv_, clip);
+ }
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+}
+
+
+void BufferView::Pimpl::stuffClipboard(string const & stuff) const
+{
+ workarea_->putClipboard(stuff);
+}
projects / lyx.git / blobdiff