remove more forms.h cruft

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 065e488036c43571f215c5d114b5f171c6b2a116..f44336ed1191146456333add476542b02e082982 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -17,7 +17,7 @@
 #include "bufferview_funcs.h"
 #include "LyXView.h"
 #include "BufferView.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
 #include "lyxfont.h"
 #include "lyx_gui_misc.h"
 #include "lyxtext.h"
@@ -26,7 +26,7 @@
 #include "lyx_cb.h"
 #include "language.h"
 #include "gettext.h"
-
+#include "ParagraphParameters.h"
 
 void Emph(BufferView * bv)
 {
@@ -71,12 +71,14 @@ void Lang(BufferView * bv, string const & l)
 }
 
 
+#ifndef NO_LATEX
 void Tex(BufferView * bv)
 {
        LyXFont font(LyXFont::ALL_IGNORE);
        font.setLatex (LyXFont::TOGGLE);
        ToggleAndShow(bv, font);
 }
+#endif
 
 
 // Change environment depth.
@@ -90,9 +92,9 @@ void changeDepth(BufferView * bv, LyXText * text, int decInc)
        bv->hideCursor();
        bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
        if (decInc >= 0)
-               text->IncDepth(bv);
+               text->incDepth(bv);
        else
-               text->DecDepth(bv);
+               text->decDepth(bv);
        if (text->inset_owner)
            bv->updateInset((Inset *)text->inset_owner, true);
        bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -101,46 +103,6 @@ void changeDepth(BufferView * bv, LyXText * text, int decInc)
 }
 
 
-// How should this actually work? Should it prohibit input in all BufferViews,
-// or just in the current one? If "just the current one", then it should be
-// placed in BufferView. If "all BufferViews" then LyXGUI (I think) should
-// run "ProhibitInput" on all LyXViews which will run prohibitInput on all
-// BufferViews. Or is it perhaps just the (input in) BufferViews in the
-// current LyxView that should be prohibited (Lgb) (This applies to
-// "AllowInput" as well.)
-void ProhibitInput(BufferView * bv)
-{
-       bv->hideCursor();
-
-       static Cursor cursor;
-       static bool cursor_undefined = true;
-   
-       if (cursor_undefined){
-               cursor = XCreateFontCursor(fl_get_display(), XC_watch);
-               XFlush(fl_get_display());
-               cursor_undefined = false;
-       }
-   
-       /* set the cursor to the watch for all forms and the canvas */ 
-       XDefineCursor(fl_get_display(), bv->owner()->getForm()->window, 
-                     cursor);
-
-       XFlush(fl_get_display());
-       fl_deactivate_all_forms();
-}
-
-
-void AllowInput(BufferView * bv)
-{
-       /* reset the cursor from the watch for all forms and the canvas */
-   
-       XUndefineCursor(fl_get_display(), bv->owner()->getForm()->window);
-
-       XFlush(fl_get_display());
-       fl_activate_all_forms();
-}
-
-
 void Code(BufferView * bv)
 {
        LyXFont font(LyXFont::ALL_IGNORE);
@@ -209,15 +171,15 @@ string const CurrentState(BufferView * bv)
                      << font.stateText(&buffer->params);
                
                // The paragraph depth
-               int depth = text->GetDepth();
+               int depth = text->getDepth();
                if (depth > 0)
                        state << _(", Depth: ") << depth;
                
                // The paragraph spacing, but only if different from
                // buffer spacing.
-               if (!text->cursor.par()->params.spacing().isDefault()) {
+               if (!text->cursor.par()->params().spacing().isDefault()) {
                        Spacing::Space cur_space =
-                               text->cursor.par()->params.spacing().getSpace();
+                               text->cursor.par()->params().spacing().getSpace();
                        state << _(", Spacing: ");
 
                        switch (cur_space) {
@@ -233,7 +195,7 @@ string const CurrentState(BufferView * bv)
                                break;
                        case Spacing::Other:
                                state << _("Other (")
-                                     << text->cursor.par()->params.spacing().getValue()
+                                     << text->cursor.par()->params().spacing().getValue()
                                      << ")";
                                break;
                        case Spacing::Default:
@@ -253,7 +215,7 @@ void ToggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 {
        if (bv->available()) { 
                if (bv->theLockingInset()) {
-                       bv->theLockingInset()->SetFont(bv, font, toggleall);
+                       bv->theLockingInset()->setFont(bv, font, toggleall);
                        return;
                }
                LyXText * text = bv->getLyXText();
@@ -262,19 +224,21 @@ void ToggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 
                bv->hideCursor();
                bv->update(text, BufferView::SELECT|BufferView::FITCUR);
-               text->ToggleFree(bv, font, toggleall);
+               text->toggleFree(bv, font, toggleall);
                bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
                if (font.language() != ignore_language ||
+#ifndef NO_LATEX
                    font.latex() != LyXFont::IGNORE ||
+#endif
                    font.number() != LyXFont::IGNORE)
                {
                        LyXCursor & cursor = text->cursor;
-                       text->ComputeBidiTables(bv->buffer(), cursor.row());
+                       text->computeBidiTables(bv->buffer(), cursor.row());
                        if (cursor.boundary() != 
-                           text->IsBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+                           text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
                                             text->real_current_font) )
-                               text->SetCursor(bv, cursor.par(), cursor.pos(),
+                               text->setCursor(bv, cursor.par(), cursor.pos(),
                                                false, !cursor.boundary());
                }
        }