prepare for 1.1.6pre2

[lyx.git] / src / insets / inset.C

diff --git a/src/insets/inset.C b/src/insets/inset.C
index bf489a647570455fb599ab1770841d7fe7694379..c5526aa723fd0b909c94bad24e276512901be91d 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -14,11 +14,17 @@
 #pragma implementation "lyxinset.h"
 #endif
 
+#define SCROLL_INSET
+
 #include "lyxinset.h"
 #include "debug.h"
 #include "BufferView.h"
 #include "support/lstrings.h"
 #include "Painter.h"
+#ifdef SCROLL_INSET
+#include "commandtags.h"
+#include "support/lstrings.h"
+#endif
 
 using std::endl;
 
@@ -26,97 +32,98 @@ 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::IsTextInset() const
+void Inset::Validate(LaTeXFeatures &) const
 {
-       return ((LyxCode() == TEXT_CODE) ||
-               (LyxCode() == ERT_CODE) ||
-               (LyxCode() == FOOT_CODE) ||
-               (LyxCode() == MARGIN_CODE));
 }
 
 
-void Inset::Validate(LaTeXFeatures &) const
+bool Inset::AutoDelete() const
 {
+    return false;
 }
 
 
-bool Inset::AutoDelete() const
+void Inset::Edit(BufferView *, int, int, unsigned int)
 {
-  return false;
 }
 
 
-void Inset::Edit(BufferView *, int, int, unsigned int)
+LyXFont const Inset::ConvertFont(LyXFont const & font) const
 {
+    return LyXFont(font);
 }
 
 
-LyXFont Inset::ConvertFont(LyXFont font)
+string const Inset::EditMessage() const 
 {
-  return font;
+    return _("Opened inset");
 }
 
 
-char const * Inset::EditMessage() const 
+LyXText * Inset::getLyXText(BufferView * bv) const
 {
-       return _("Opened inset");
+    if (owner())
+           return owner()->getLyXText(bv);
+    else
+           return bv->text;
 }
 
+
  /* some stuff for inset locking */
 
 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;
 }
 
 
@@ -125,7 +132,7 @@ void UpdatableInset::ToggleInsetCursor(BufferView *)
 }
 
 
-void UpdatableInset::ShowInsetCursor(BufferView *)
+void UpdatableInset::ShowInsetCursor(BufferView *, bool)
 {
 }
 
@@ -135,20 +142,15 @@ void UpdatableInset::HideInsetCursor(BufferView *)
 }
 
 
-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->painter(), font) - bv->paperWidth()) / 2);
 }
 
 
-void UpdatableInset::draw(Painter &, LyXFont const &,
-                         int /* baseline */, float & x) const
+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;
@@ -160,10 +162,63 @@ void UpdatableInset::SetFont(BufferView *, LyXFont const &, bool )
 }
 
 
+#ifdef SCROLL_INSET
+void UpdatableInset::scroll(BufferView * bv, float s) const
+{
+    LyXFont font;
+
+    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 += 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;
+       }
+    }
+//    bv->updateInset(const_cast<UpdatableInset *>(this), false);
+}
+
+
+#endif
+
 ///  An updatable inset could handle lyx editing commands
 #ifdef SCROLL_INSET
 UpdatableInset::RESULT
-UpdatableInset::LocalDispatch(BufferView *, 
+UpdatableInset::LocalDispatch(BufferView * bv, 
                              int action, string const & arg) 
 #else
 UpdatableInset::RESULT
@@ -171,14 +226,19 @@ UpdatableInset::LocalDispatch(BufferView *, int, string const &)
 #endif
 {
 #ifdef SCROLL_INSET
-    if (action==LFUN_SCROLL_INSET)
-       {
-           float xx;
-           sscanf(arg.c_str(), "%f", &xx);     
-           scroll(xx);
 
-           return DISPATCHED;
+    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;
+    }
 #endif
     return UNDISPATCHED; 
 }