-/* This file is part of
- * ======================================================
+/**
+ * \file insetcollapsable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Alejandro Aguilar Sierra
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
*
- * Copyright 1998-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "insetcollapsable.h"
-#include "gettext.h"
-#include "lyxfont.h"
+#include "insettext.h"
+
#include "BufferView.h"
-#include "frontends/Painter.h"
#include "debug.h"
-#include "lyxtext.h"
-#include "frontends/font_metrics.h"
+#include "gettext.h"
+#include "lyxfont.h"
#include "lyxlex.h"
+#include "lyxtext.h"
+#include "WordLangTuple.h"
+#include "funcrequest.h"
+#include "buffer.h"
-#include "insets/insettext.h"
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "frontends/LyXView.h"
+#include "support/LAssert.h"
#include "support/LOstream.h"
#include "support/lstrings.h"
int ascent;
int descent;
font_metrics::buttonText(label, labelfont, width, ascent, descent);
- return width + (2*TEXT_TO_INSET_OFFSET);
+ return width + 2 * TEXT_TO_INSET_OFFSET;
}
void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+ int baseline, float & x) const
{
+ lyx::Assert(bv);
+ cache(bv);
+
if (need_update != NONE) {
const_cast<InsetText *>(&inset)->update(bv, f, true);
- bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
+ bv->text->postChangedInDraw();
need_update = NONE;
return;
}
if (!owner())
x += static_cast<float>(scroll());
- if (!cleared && (inset.need_update == InsetText::FULL ||
- inset.need_update == InsetText::INIT ||
- top_x != int(x) ||
- top_baseline != baseline))
- {
- // we don't need anymore to clear here we just have to tell
- // the underlying LyXText that it should do the RowClear!
- inset.setUpdateStatus(bv, InsetText::FULL);
- bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
- return;
- }
-
top_x = int(x);
topx_set = true;
top_baseline = baseline;
int const bl = baseline - ascent(bv, f) + ascent_collapsed();
draw_collapsed(pain, bl, old_x);
- inset.draw(bv, f,
- bl + descent_collapsed() + inset.ascent(bv, f),
- x, cleared);
+ inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
if (x < (top_x + button_length + TEXT_TO_INSET_OFFSET))
x = top_x + button_length + TEXT_TO_INSET_OFFSET;
}
void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
mouse_button::state button)
{
+#ifdef WITH_WARNINGS
+#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
+#endif
+ if (button == mouse_button::button3)
+ return;
+
UpdatableInset::edit(bv, xp, yp, button);
if (collapsed_) {
first_after_edit = true;
if (!bv->lockInset(this))
return;
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
inset.edit(bv);
} else {
if (!bv->lockInset(this))
if (!bv->lockInset(this))
return;
inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
inset.edit(bv, front);
first_after_edit = true;
} else {
inset.insetUnlock(bv);
if (scroll())
scroll(bv, 0.0F);
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
-void InsetCollapsable::insetButtonPress(BufferView * bv,
- int x, int y, mouse_button::state button)
+void InsetCollapsable::lfunMousePress(FuncRequest const & cmd)
{
- if (!collapsed_ && (y > button_bottom_y)) {
+ if (!collapsed_ && (cmd.y > button_bottom_y)) {
LyXFont font(LyXFont::ALL_SANE);
- int yy = ascent(bv, font) + y -
+ FuncRequest cmd1 = cmd;
+ cmd1.y = ascent(cmd.view(), font) + cmd.y -
(ascent_collapsed() +
descent_collapsed() +
- inset.ascent(bv, font));
- inset.insetButtonPress(bv, x, yy, button);
+ inset.ascent(cmd.view(), font));
+ inset.localDispatch(cmd1);
}
}
-bool InsetCollapsable::insetButtonRelease(BufferView * bv,
- int x, int y, mouse_button::state button)
+bool InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
{
bool ret = false;
- if ((button != mouse_button::button3) && (x < button_length) &&
- (y >= button_top_y) && (y <= button_bottom_y))
+ BufferView * bv = cmd.view();
+ if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
+ (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
{
if (collapsed_) {
collapsed_ = false;
// should not be called on inset open!
// inset.insetButtonRelease(bv, 0, 0, button);
inset.setUpdateStatus(bv, InsetText::FULL);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
} else {
collapsed_ = true;
bv->unlockInset(this);
- bv->updateInset(this, false);
+ bv->updateInset(this);
+ bv->buffer()->markDirty();
}
- } else if (!collapsed_ && (y > button_bottom_y)) {
+ } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
LyXFont font(LyXFont::ALL_SANE);
- int yy = ascent(bv, font) + y -
+ FuncRequest cmd1 = cmd;
+ cmd1.y = ascent(cmd.view(), font) + cmd.y -
(ascent_collapsed() +
descent_collapsed() +
- inset.ascent(bv, font));
- ret = inset.insetButtonRelease(bv, x, yy, button);
+ inset.ascent(cmd.view(), font));
+ ret = (inset.localDispatch(cmd1) == DISPATCHED);
}
- if ((button == mouse_button::button3) && !ret) {
+ if (cmd.button() == mouse_button::button3 && !ret)
return showInsetDialog(bv);
- }
return ret;
}
-void InsetCollapsable::insetMotionNotify(BufferView * bv,
- int x, int y, mouse_button::state state)
+void InsetCollapsable::lfunMouseMotion(FuncRequest const & cmd)
{
- if (y > button_bottom_y) {
+ if (cmd.y > button_bottom_y) {
LyXFont font(LyXFont::ALL_SANE);
- int yy = ascent(bv, font) + y -
+ FuncRequest cmd1 = cmd;
+ cmd1.y = ascent(cmd.view(), font) + cmd.y -
(ascent_collapsed() +
descent_collapsed() +
- inset.ascent(bv, font));
- inset.insetMotionNotify(bv, x, yy, state);
+ inset.ascent(cmd.view(), font));
+ inset.localDispatch(cmd1);
}
}
}
-UpdatableInset::RESULT
-InsetCollapsable::localDispatch(BufferView * bv, kb_action action,
- string const & arg)
+Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
{
- UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
- if (result >= FINISHED)
- bv->unlockInset(this);
- first_after_edit = false;
- return result;
+ switch (cmd.action) {
+
+ case LFUN_MOUSE_PRESS:
+ lfunMousePress(cmd);
+ return DISPATCHED;
+
+ case LFUN_MOUSE_MOTION:
+ lfunMouseMotion(cmd);
+ return DISPATCHED;
+
+ case LFUN_MOUSE_RELEASE:
+ lfunMouseRelease(cmd);
+ return DISPATCHED;
+
+ default:
+ UpdatableInset::RESULT result = inset.localDispatch(cmd);
+ if (result >= FINISHED)
+ cmd.view()->unlockInset(this);
+ first_after_edit = false;
+ return result;
+ }
+ return UNDISPATCHED;
}
}
-bool InsetCollapsable::doClearArea() const
-{
- return inset.doClearArea();
-}
-
-
LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
bool const recursive) const
{
}
-Paragraph * InsetCollapsable::getParFromID(int id) const
-{
- lyxerr[Debug::INFO] << "Looking for paragraph " << id << endl;
- return inset.getParFromID(id);
-}
-
-
Paragraph * InsetCollapsable::firstParagraph() const
{
return inset.firstParagraph();
if (!collapsed_) return;
collapsed_ = false;
- bv->updateInset(this, false);
+ bv->updateInset(this);
}
return;
collapsed_ = true;
- bv->updateInset(const_cast<InsetCollapsable *>(this), false);
+ bv->updateInset(const_cast<InsetCollapsable *>(this));
}
}
+void InsetCollapsable::markErased()
+{
+ inset.markErased();
+}
+
+
+bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
+{
+ bool found = inset.nextChange(bv, length);
+
+ if (first_after_edit && !found)
+ close(bv);
+ else if (!found)
+ first_after_edit = false;
+ return found;
+}
+
+
bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
bool cs, bool mw)
{
}
-WordLangTuple InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv,
- float & value) const
+WordLangTuple const
+InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
{
WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
if (first_after_edit && word.word().empty())
{
inset.addPreview(loader);
}
+
+
+void InsetCollapsable::cache(BufferView * bv) const
+{
+ view_ = bv->owner()->view();
+}
+
+
+BufferView * InsetCollapsable::view() const
+{
+ return view_.lock().get();
+}
projects / lyx.git / blobdiff