#include "BufferView.h"
#include "support/lstrings.h"
#include "Painter.h"
+#include "commandtags.h"
+#include "support/lstrings.h"
using std::endl;
bool Inset::Deletable() const
{
- return true;
+ return true;
}
bool Inset::DirectWrite() const
{
- return false;
+ return false;
}
Inset::EDITABLE Inset::Editable() const
{
- return NOT_EDITABLE;
+ return NOT_EDITABLE;
}
bool Inset::AutoDelete() const
{
- return false;
+ return false;
}
}
-LyXFont Inset::ConvertFont(LyXFont font)
+LyXFont const Inset::ConvertFont(LyXFont const & font) const
{
- return font;
+ return LyXFont(font);
}
-char const * Inset::EditMessage() const
+string const Inset::EditMessage() const
{
- return _("Opened inset");
+ return _("Opened inset");
}
-LyXText * Inset::getLyXText(BufferView * bv) const
+LyXText * Inset::getLyXText(BufferView const * bv, bool const) const
{
if (owner())
- return owner()->getLyXText(bv);
+ return owner()->getLyXText(bv, false);
else
return bv->text;
}
void UpdatableInset::InsetButtonPress(BufferView *, int x, int y, int button)
{
- lyxerr.debug() << "Inset Button Press x=" << x
- << ", y=" << y << ", button=" << button << endl;
+ lyxerr.debug() << "Inset Button Press x=" << x
+ << ", y=" << y << ", button=" << button << endl;
}
void UpdatableInset::InsetButtonRelease(BufferView *, int x, int y, int button)
{
- lyxerr.debug() << "Inset Button Release x=" << x
- << ", y=" << y << ", button=" << button << endl;
+ lyxerr.debug() << "Inset Button Release x=" << x
+ << ", y=" << y << ", button=" << button << endl;
}
void UpdatableInset::InsetKeyPress(XKeyEvent *)
{
- lyxerr.debug() << "Inset Keypress" << endl;
+ lyxerr.debug() << "Inset Keypress" << endl;
}
void UpdatableInset::InsetMotionNotify(BufferView *, int x, int y, int state)
{
- lyxerr.debug() << "Inset Motion Notify x=" << x
- << ", y=" << y << ", state=" << state << endl;
+ lyxerr.debug() << "Inset Motion Notify x=" << x
+ << ", y=" << y << ", state=" << state << endl;
}
void UpdatableInset::InsetUnlock(BufferView *)
{
- lyxerr.debug() << "Inset Unlock" << endl;
+ lyxerr.debug() << "Inset Unlock" << endl;
}
// An updatable inset is highly editable by definition
Inset::EDITABLE UpdatableInset::Editable() const
{
- return HIGHLY_EDITABLE;
+ return HIGHLY_EDITABLE;
}
}
-void UpdatableInset::ShowInsetCursor(BufferView *)
+void UpdatableInset::ShowInsetCursor(BufferView *, bool)
{
}
}
-void UpdatableInset::Edit(BufferView * bv, int, int, unsigned int)
+void UpdatableInset::Edit(BufferView *, int, int, unsigned int)
{
- LyXFont font;
-
- scx = 0;
-
- mx_scx = abs((width(bv, font) - bv->workWidth()) / 2);
}
void UpdatableInset::draw(BufferView *, LyXFont const &,
int /* baseline */, float & x, bool/*cleared*/) const
{
- if (scx) x += float(scx);
+ x += float(scx);
// ATTENTION: don't do the following here!!!
// top_x = int(x);
// top_baseline = baseline;
}
-/// An updatable inset could handle lyx editing commands
-#ifdef SCROLL_INSET
-UpdatableInset::RESULT
-UpdatableInset::LocalDispatch(BufferView *,
- int action, string const & arg)
-#else
-UpdatableInset::RESULT
-UpdatableInset::LocalDispatch(BufferView *, int, string const &)
-#endif
+void UpdatableInset::scroll(BufferView * bv, float s) const
{
-#ifdef SCROLL_INSET
- if (action==LFUN_SCROLL_INSET)
- {
- float xx;
- sscanf(arg.c_str(), "%f", &xx);
- scroll(xx);
+ LyXFont font;
- return DISPATCHED;
+ if (!s) {
+ scx = 0;
+ return;
+ }
+ if (((top_x - scx) > 0) &&
+ (top_x - scx + width(bv, font)) < bv->workWidth())
+ return;
+ if ((s > 0) && (top_x > 0))
+ return;
+
+// int mx_scx=abs((width(bv,font) - bv->workWidth())/2);
+ int save_scx = scx;
+
+ scx = int(s*bv->workWidth()/2);
+// if (!display())
+// scx += 20;
+
+ if ((top_x - save_scx + scx + width(bv, font)) < (bv->workWidth()/2)) {
+ scx += (bv->workWidth()/2) - (top_x - save_scx + scx + width(bv,font));
+ }
+// bv->updateInset(const_cast<UpdatableInset *>(this), false);
+}
+
+void UpdatableInset::scroll(BufferView * bv, int offset) const
+{
+ if (offset > 0) {
+ if (!scx && top_x >= 20)
+ return;
+ if ((top_x + offset) > 20)
+ scx = 0;
+// scx += offset - (top_x - scx + offset - 20);
+ else
+ scx += offset;
+ } else {
+ LyXFont font;
+ if (!scx && (top_x+width(bv, font)) < (bv->workWidth()-20))
+ return;
+ if ((top_x - scx + offset + width(bv,font)) < (bv->workWidth()-20)) {
+ scx = bv->workWidth() - width(bv,font) - top_x + scx - 20;
+ } else {
+ scx += offset;
}
-#endif
+ }
+// bv->updateInset(const_cast<UpdatableInset *>(this), false);
+}
+
+/// An updatable inset could handle lyx editing commands
+UpdatableInset::RESULT
+UpdatableInset::LocalDispatch(BufferView * bv,
+ kb_action action, string const & arg)
+{
+ if (!arg.empty() && (action==LFUN_SCROLL_INSET)) {
+ if (arg.find('.') != arg.npos) {
+ float xx = static_cast<float>(strToDbl(arg));
+ scroll(bv, xx);
+ } else {
+ int xx = strToInt(arg);
+ scroll(bv, xx);
+ }
+ bv->updateInset(this, false);
+
+ return DISPATCHED;
+ }
return UNDISPATCHED;
}