Fixed the display bug for text-insets we still had and now ERT-insets do

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index cad6369463ee645e9cdd3388e77297ded29448ba..02b733c9a76b7461824fde8fa946a2175eeaf508 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -1,12 +1,12 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
  *          Copyright 1995-1999 The LyX Team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 
@@ -16,6 +16,7 @@
 
 #include "lyxinset.h"
 #include "debug.h"
+#include "BufferView.h"
 #include "support/lstrings.h"
 
 /* Insets default methods */
@@ -49,7 +50,7 @@ bool Inset::AutoDelete() const
 }
 
 
-void Inset::Edit(int, int)
+void Inset::Edit(BufferView *, int, int, unsigned int)
 {
 }
 
@@ -62,14 +63,14 @@ LyXFont Inset::ConvertFont(LyXFont font)
 
  /* some stuff for inset locking */
 
-void UpdatableInset::InsetButtonPress(int x, int y, int button)
+void UpdatableInset::InsetButtonPress(BufferView *, int x, int y, int button)
 {
        lyxerr.debug() << "Inset Button Press x=" << x
                       << ", y=" << y << ", button=" << button << endl;
 }
 
 
-void UpdatableInset::InsetButtonRelease(int x, int y, int button)
+void UpdatableInset::InsetButtonRelease(BufferView *, int x, int y, int button)
 {
        lyxerr.debug() << "Inset Button Release x=" << x
                       << ", y=" << y << ", button=" << button << endl;
@@ -82,14 +83,14 @@ void UpdatableInset::InsetKeyPress(XKeyEvent *)
 }
 
 
-void UpdatableInset::InsetMotionNotify(int x, int y, int state)
+void UpdatableInset::InsetMotionNotify(BufferView *, int x, int y, int state)
 {
        lyxerr.debug() << "Inset Motion Notify x=" << x
                       << ", y=" << y << ", state=" << state << endl;
 }
 
 
-void UpdatableInset::InsetUnlock()
+void UpdatableInset::InsetUnlock(BufferView *)
 {
        lyxerr.debug() << "Inset Unlock" << endl;
 }
@@ -102,6 +103,54 @@ unsigned char UpdatableInset::Editable() const
 }
 
 
-void UpdatableInset::ToggleInsetCursor()
+void UpdatableInset::ToggleInsetCursor(BufferView *)
 {
 }
+
+
+void UpdatableInset::Edit(BufferView * bv, int, int, unsigned int)
+{
+    LyXFont
+       font;
+
+    scx = 0;
+
+    mx_scx=abs((width(bv->getPainter(), font) - bv->paperWidth())/2);
+}
+
+
+void UpdatableInset::draw(Painter &, LyXFont const &,
+                         int baseline, float & x) const
+{
+    if (scx) x += float(scx);
+    top_x = int(x);
+    top_baseline = baseline;
+}
+
+
+void UpdatableInset::SetFont(BufferView *, LyXFont const &, bool )
+{
+}
+
+///  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
+{
+#ifdef SCROLL_INSET
+    if (action==LFUN_SCROLL_INSET)
+       {
+           float xx;
+           sscanf(arg.c_str(), "%f", &xx);     
+           scroll(xx);
+
+           return DISPATCHED;
+       }
+#endif
+    return UNDISPATCHED; 
+}