#include "BufferView_pimpl.h"
#include "frontends/WorkArea.h"
#include "frontends/screen.h"
+#include "frontends/LyXScreenFactory.h"
+#include "frontends/WorkAreaFactory.h"
#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
#include "frontends/FileDialog.h"
#include "mathed/formulabase.h"
+#include "graphics/Previews.h"
+
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/filetools.h"
const unsigned int saved_positions_num = 20;
-inline
-void waitForX()
-{
- XSync(fl_get_display(), 0);
-}
-
-
-void SetXtermCursor(Window win)
-{
- static Cursor cursor;
- static bool cursor_undefined = true;
- if (cursor_undefined) {
- cursor = XCreateFontCursor(fl_get_display(), XC_xterm);
- XFlush(fl_get_display());
- cursor_undefined = false;
- }
- XDefineCursor(fl_get_display(), win, cursor);
- XFlush(fl_get_display());
-}
} // anon namespace
BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
int xpos, int ypos, int width, int height)
- : bv_(b), owner_(o), buffer_(0),
- current_scrollbar_value(0), cursor_timeout(400),
+ : bv_(b), owner_(o), buffer_(0), cursor_timeout(400),
using_xterm_cursor(false)
{
- workarea_.reset(new WorkArea(xpos, ypos, width, height));
- screen_.reset(new LScreen(workarea()));
-
+ workarea_.reset(WorkAreaFactory::create(xpos, ypos, width, height));
+ screen_.reset(LyXScreenFactory::create(workarea()));
+
// Setup the signals
- workarea().scrollCB.connect(boost::bind(&BufferView::Pimpl::scrollCB, this, _1));
- workarea().workAreaExpose
- .connect(boost::bind(&BufferView::Pimpl::workAreaExpose, this));
+ workarea().scrollDocView.connect(boost::bind(&BufferView::Pimpl::scrollDocView, this, _1));
+ workarea().workAreaResize
+ .connect(boost::bind(&BufferView::Pimpl::workAreaResize, this));
workarea().workAreaButtonPress
.connect(boost::bind(&BufferView::Pimpl::workAreaButtonPress, this, _1, _2, _3));
workarea().workAreaButtonRelease
cursor_timeout.timeout.connect(boost::bind(&BufferView::Pimpl::cursorToggle, this));
cursor_timeout.start();
- workarea().setFocus();
saved_positions.resize(saved_positions_num);
}
return *workarea_.get();
}
-
-LScreen & BufferView::Pimpl::screen() const
+
+LyXScreen & BufferView::Pimpl::screen() const
{
return *screen_.get();
}
if (buffer_) {
lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl;
buffer_->addUser(bv_);
+
// If we don't have a text object for this, we make one
if (bv_->text == 0) {
resizeCurrentBuffer();
- } else {
- updateScreen();
- updateScrollbar();
}
+
+ // FIXME: needed when ?
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- 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();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
- owner_->updateMenubar();
- owner_->updateToolbar();
owner_->getDialogs()->hideBufferDependent();
- updateScrollbar();
- workarea().redraw();
// Also remove all remaining text's from the testcache.
// (there should not be any!) (if there is any it is a
textcache.show(lyxerr, "buffer delete all");
textcache.clear();
}
- // should update layoutchoice even if we don't have a buffer.
- owner_->updateLayoutChoice();
+ repaint();
+ updateScrollbar();
+ owner_->updateMenubar();
+ owner_->updateToolbar();
+ owner_->updateLayoutChoice();
owner_->updateWindowTitle();
-}
-
-
-void BufferView::Pimpl::resize(int xpos, int ypos, int width, int height)
-{
- workarea().resize(xpos, ypos, width, height);
- update(bv_->text, SELECT);
- redraw();
-}
-
-
-void BufferView::Pimpl::resize()
-{
- if (buffer_)
- resizeCurrentBuffer();
-}
-
-void BufferView::Pimpl::redraw()
-{
- lyxerr[Debug::INFO] << "BufferView::redraw()" << endl;
- workarea().redraw();
+ if (grfx::Previews::activated() && buffer_)
+ grfx::Previews::get().generateBufferPreviews(buffer_);
}
bv_->owner()->getDialogs()->updateParagraph();
if (ret)
- updateScrollbar();
+ updateScrollbar();
return ret;
}
{
lyxerr[Debug::INFO] << "BufferView::redoCurrentBuffer" << endl;
if (buffer_ && bv_->text) {
- resize();
+ resizeCurrentBuffer();
owner_->updateLayoutChoice();
}
}
}
}
- updateScreen();
-
if (par) {
bv_->text->selection.set(true);
// At this point just to avoid the Delete-Empty-Paragraph-
bv_->text->first_y = screen().topCursorVisible(bv_->text->cursor, bv_->text->first_y);
- // this will scroll the screen such that the cursor becomes visible
- updateScrollbar();
- redraw();
-
setState();
owner_->allowInput();
}
-void BufferView::Pimpl::updateScreen()
+void BufferView::Pimpl::repaint()
{
// Regenerate the screen.
- screen().reset();
+ screen().redraw(bv_->text, bv_);
}
{
if (!bv_->text) {
lyxerr[Debug::GUI] << "no text in updateScrollbar" << endl;
- workarea().setScrollbar(0, 1.0);
+ workarea().setScrollbarParams(0, 0, 0);
return;
}
- long const text_height = bv_->text->height;
- long const work_height = workarea().workHeight();
-
- double const lineh = bv_->text->defaultHeight();
- double const slider_size =
- (text_height == 0) ? 1.0 : 1.0 / double(text_height);
-
- lyxerr[Debug::GUI] << "text_height now " << text_height << endl;
- lyxerr[Debug::GUI] << "work_height " << work_height << endl;
-
- /* If the text is smaller than the working area, the scrollbar
- * maximum must be the working area height. No scrolling will
- * be possible */
- if (text_height <= work_height) {
- lyxerr[Debug::GUI] << "doc smaller than workarea !" << endl;
- workarea().setScrollbarBounds(0.0, 0.0);
- current_scrollbar_value = bv_->text->first_y;
- workarea().setScrollbar(current_scrollbar_value, 1.0);
- return;
- }
+ LyXText const & t = *bv_->text;
+
+ lyxerr[Debug::GUI] << "Updating scrollbar: h " << t.height << ", first_y "
+ << t.first_y << ", default height " << t.defaultHeight() << endl;
- workarea().setScrollbarBounds(0.0, text_height - work_height);
- workarea().setScrollbarIncrements(lineh);
- current_scrollbar_value = bv_->text->first_y;
- workarea().setScrollbar(current_scrollbar_value, slider_size);
+ workarea().setScrollbarParams(t.height, t.first_y, t.defaultHeight());
}
-// Callback for scrollbar slider
-void BufferView::Pimpl::scrollCB(double value)
+void BufferView::Pimpl::scrollDocView(int value)
{
- lyxerr[Debug::GUI] << "scrollCB of " << value << endl;
+ lyxerr[Debug::GUI] << "scrollDocView of " << value << endl;
if (!buffer_) return;
- current_scrollbar_value = long(value);
-
- if (current_scrollbar_value < 0)
- current_scrollbar_value = 0;
-
- screen().draw(bv_->text, bv_, current_scrollbar_value);
+ screen().draw(bv_->text, bv_, value);
if (!lyxrc.cursor_follows_scrollbar) {
- waitForX();
return;
}
vbt->setCursorFromCoordinates(bv_, 0, first);
else if (vbt->cursor.y() > last)
vbt->setCursorFromCoordinates(bv_, 0, last);
-
- waitForX();
}
-int BufferView::Pimpl::scrollUp(long time)
+int BufferView::Pimpl::scroll(long time)
{
if (!buffer_)
return 0;
- double value = workarea().getScrollbarValue();
-
- if (value == 0)
- return 0;
-
-#if 1
- float add_value = (bv_->text->defaultHeight()
- + float(time) * float(time) * 0.125);
-
- if (add_value > workarea().workHeight())
- add_value = float(workarea().workHeight() -
- bv_->text->defaultHeight());
-#else
- float add_value = float(workarea().workHeight()) * float(time) / 100;
-#endif
-
- value -= add_value;
+ LyXText const * t = bv_->text;
- if (value < 0)
- value = 0;
+ double const diff = t->defaultHeight()
+ + double(time) * double(time) * 0.125;
- workarea().setScrollbarValue(value);
-
- scrollCB(value);
+ scrollDocView(int(diff));
+ workarea().setScrollbarParams(t->height, t->first_y, t->defaultHeight());
return 0;
}
-int BufferView::Pimpl::scrollDown(long time)
+void BufferView::Pimpl::workAreaKeyPress(LyXKeySymPtr key,
+ key_modifier::state state)
{
- if (!buffer_)
- return 0;
-
- double value = workarea().getScrollbarValue();
- pair<float, float> p = workarea().getScrollbarBounds();
- double const max = p.second;
-
- if (value == max)
- return 0;
-
-#if 1
- float add_value = (bv_->text->defaultHeight()
- + float(time) * float(time) * 0.125);
-
- if (add_value > workarea().workHeight())
- add_value = float(workarea().workHeight() -
- bv_->text->defaultHeight());
-#else
- float add_value = float(workarea().workHeight()) * float(time) / 100;
-#endif
-
- value += add_value;
-
- if (value > max)
- value = max;
-
- workarea().setScrollbarValue(value);
-
- scrollCB(value);
- return 0;
-}
-
-
-void BufferView::Pimpl::workAreaKeyPress(KeySym keysym, key_modifier::state state)
-{
- bv_->owner()->getLyXFunc()->processKeySym(keysym, state);
+ bv_->owner()->getLyXFunc()->processKeySym(key, state);
}
return;
// ok ok, this is a hack (for xforms)
-
if (button == mouse_button::button4) {
- scrollUp(lyxrc.wheel_jump);
+ scroll(-lyxrc.wheel_jump);
// We shouldn't go further down as we really should only do the
// scrolling and be done with this. Otherwise we may open some
// dialogs (Jug 20020424).
return;
} else if (button == mouse_button::button5) {
- scrollDown(lyxrc.wheel_jump);
+ scroll(lyxrc.wheel_jump);
// We shouldn't go further down as we really should only do the
// scrolling and be done with this. Otherwise we may open some
// dialogs (Jug 20020424).
}
-void BufferView::Pimpl::workAreaExpose()
+void BufferView::Pimpl::workAreaResize()
{
static int work_area_width;
- static unsigned int work_area_height;
+ static int work_area_height;
bool const widthChange = workarea().workWidth() != work_area_width;
bool const heightChange = workarea().workHeight() != work_area_height;
// update from work area
work_area_width = workarea().workWidth();
work_area_height = workarea().workHeight();
+
if (buffer_ != 0) {
if (widthChange) {
// The visible LyXView need a resize
- owner_->view()->resize();
+ resizeCurrentBuffer();
// Remove all texts from the textcache
// This is not _really_ what we want to do. What
if (lyxerr.debugging())
textcache.show(lyxerr, "Expose delete all");
textcache.clear();
+ // FIXME: this is aalready done in resizeCurrentBuffer() ??
buffer_->resizeInsets(bv_);
} else if (heightChange) {
- // Rebuild image of current screen
- updateScreen();
// fitCursor() ensures we don't jump back
// to the start of the document on vertical
// resize
fitCursor();
-
- // The main window size has changed, repaint most stuff
- redraw();
- } else {
- screen().redraw(bv_->text, bv_);
}
- } else {
- // Grey box when we don't have a buffer
- workarea().greyOut();
+ }
+
+ // FIXME: GUII temporarily we always repaint for xforms' benefit
+ if (1 || widthChange || heightChange) {
+ repaint();
}
// always make sure that the scrollbar is sane.
if (text->inset_owner) {
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
- updateInset(text->inset_owner, false);
+ updateInset(text->inset_owner, false);
} else {
- update();
+ update();
}
if ((f & FITCUR)) {
bv_->text->setCursor(bv_, par,
min(par->size(), saved_positions[i].par_pos));
- update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+ update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
if (i > 0) {
ostringstream str;
str << _("Moved to bookmark") << ' ' << i;
}
-bool BufferView::Pimpl::focus() const
-{
- return workarea().hasFocus();
-}
-
-
-void BufferView::Pimpl::focus(bool f)
-{
- if (f) workarea().setFocus();
-}
-
-
void BufferView::Pimpl::showCursor()
{
if (bv_->theLockingInset())
void BufferView::Pimpl::center()
{
- beforeChange(bv_->text);
- if (bv_->text->cursor.y() > static_cast<int>((workarea().workHeight() / 2))) {
- screen().draw(bv_->text, bv_, bv_->text->cursor.y() - workarea().workHeight() / 2);
- } else {
- screen().draw(bv_->text, bv_, 0);
+ LyXText * t = bv_->text;
+
+ beforeChange(t);
+ int const half_height = workarea().workHeight() / 2;
+ int new_y = 0;
+
+ if (t->cursor.y() > half_height) {
+ new_y = t->cursor.y() - half_height;
}
- update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
- redraw();
+
+ // FIXME: can we do this w/o calling screen directly ?
+ // This updates first_y but means the fitCursor() call
+ // from the update(FITCUR) doesn't realise that we might
+ // have moved (e.g. from GOTOPARAGRAPH), so doesn't cause
+ // the scrollbar to be updated as it should, so we have
+ // to do it manually. Any operation that does a center()
+ // and also might have moved first_y must make sure to call
+ // updateScrollbar() currently. Never mind that this is a
+ // pretty obfuscated way of updating t->first_y
+ screen().draw(t, bv_, new_y);
+
+ update(t, BufferView::SELECT | BufferView::FITCUR);
}
if (!lt->selection.set())
workarea().haveSelection(false);
-
+
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
//owner->showState();
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
- string const & obs = tclass[layout].obsoleted_by();
+ string const & obs = tclass[layout]->obsoleted_by();
if (!obs.empty())
layout = obs;
}
Paragraph * spar = lt->selection.start.par();
Paragraph * epar = lt->selection.end.par()->next();
while(spar != epar) {
- if (spar->layout() != current_layout) {
+ if (spar->layout()->name() != current_layout) {
change_layout = true;
break;
}
case LFUN_PROTECTEDSPACE:
{
LyXText * lt = bv_->getLyXText();
+ LyXLayout_ptr const & style = lt->cursor.par()->layout();
- LyXLayout const & style = tclass[lt->cursor.par()->layout()];
-
- if (style.free_spacing) {
+ if (style->free_spacing) {
lt->insertChar(bv_, ' ');
update(lt,
BufferView::SELECT
LyXText * lt = bv_->getLyXText();
if (!lt->selection.set()) {
- if (owner_->getIntl()->getTrans().backspace()) {
+ if (owner_->getIntl()->getTransManager().backspace()) {
lt->backspace(bv_);
lt->selection.cursor = lt->cursor;
update(lt,
owner_->getLyXFunc()->handleKeyFunc(action);
} else {
owner_->getLyXFunc()->handleKeyFunc(action);
- owner_->getIntl()->getTrans()
+ owner_->getIntl()->getTransManager()
.TranslateAndInsert(argument[0], bv_->getLyXText());
update(bv_->getLyXText(),
BufferView::SELECT
}
break;
+ case LFUN_MATH:
+ mathDispatch(bv_, argument);
+ break;
+
case LFUN_MATH_MACRO:
mathDispatchMathMacro(bv_, argument);
break;
}
break;
- case LFUN_INDEX_CREATE:
+ case LFUN_INDEX_INSERT:
{
- InsetCommandParams p("index");
- if (argument.empty()) {
- string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
- p.setContents(idxstring);
- } else {
- p.setContents(argument);
+ string entry = argument;
+ if (entry.empty()) {
+ entry = bv_->getLyXText()->getStringToIndex(bv_);
}
- owner_->getDialogs()->createIndex(p.getAsString());
- }
- break;
+ if (entry.empty()) {
+ owner_->getDialogs()->createIndex();
+ break;
+ }
- case LFUN_INDEX_INSERT:
- {
- InsetCommandParams p;
- p.setFromString(argument);
- InsetIndex * inset = new InsetIndex(p);
+ InsetIndex * inset = new InsetIndex(InsetCommandParams("index", entry));
- if (!insertInset(inset))
+ if (!insertInset(inset)) {
delete inset;
- else
+ } else {
updateInset(inset, true);
- }
- break;
-
- case LFUN_INDEX_INSERT_LAST:
- {
- string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
- if (!idxstring.empty()) {
- owner_->message(_("Word `")
- + idxstring + _(("' indexed.")));
- InsetCommandParams p("index", idxstring);
- InsetIndex * inset = new InsetIndex(p);
-
- if (!insertInset(inset))
- delete inset;
- else
- updateInset(inset, true);
}
}
break;
string::const_iterator cit = argument.begin();
string::const_iterator end = argument.end();
for (; cit != end; ++cit) {
- owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+ owner_->getIntl()->getTransManager().
+ TranslateAndInsert(*cit, lt);
}
bv_->update(lt,
hideCursor();
- LyXLayout const & style =
- textclasslist[bv_->buffer()->params.textclass][par->layout()];
+ LyXLayout_ptr const & style = par->layout();
- if (style.pass_thru ||
+ if (style->pass_thru ||
(!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
bv_->owner()->getLyXFunc()->dispatch(LFUN_SELFINSERT, "\"");
}
void BufferView::Pimpl::insertAndEditInset(Inset * inset)
{
+#if 0
if (insertInset(inset))
inset->edit(bv_);
else
delete inset;
+#else
+ bool gotsel = false;
+
+ if (bv_->getLyXText()->selection.set()) {
+ bv_->getLyXText()->cutSelection(bv_, true, false);
+ gotsel = true;
+ }
+
+ if (insertInset(inset)) {
+ inset->edit(bv_);
+ if (gotsel)
+ owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION);
+ }
+ else
+ delete inset;
+#endif
}