get rid of LYX_LIBS

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index accc20cf9a0bad0e12bff2997cc9d5127a64501f..cc172ae59dd8d407bd3eaa280b0267c12619f79a 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -33,7 +33,7 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
-#include "support/syscall.h"
+#include "support/systemcall.h"
 #include "support/lstrings.h"
 
 #include <fstream>
@@ -56,74 +56,16 @@ extern BufferList bufferlist;
 bool quitting; // flag, that we are quitting the program
 extern bool finished; // all cleanup done just let it run through now.
 
-/* 
-   This is the inset locking stuff needed for mathed --------------------
-
-   an inset can simple call LockInset in it's edit call and *ONLY* in it's
-   edit call.
-   Inset::Edit() can only be called by the main lyx module.
-
-   Then the inset may modify the menu's and/or iconbars. 
-
-   Unlocking is either done by LyX or the inset itself with a UnlockInset-call
-
-   During the lock, all button and keyboard events will be modified
-   and send to the inset through the following inset-features. Note that
-   Inset::insetUnlock will be called from inside UnlockInset. It is meant
-   to contain the code for restoring the menus and things like this.
-
-   
-   virtual void insetButtonPress(int x, int y, int button);
-   virtual void insetButtonRelease(int x, int y, int button);
-   virtual void insetKeyPress(XKeyEvent *ev);
-   virtual void insetMotionNotify(int x, int y, int state);
-   virtual void insetUnlock();
-
-   If a inset wishes any redraw and/or update it just has to call
-   UpdateInset(this).
-   It's is completly irrelevant, where the inset is. UpdateInset will
-   find it in any paragraph in any buffer. 
-   Of course the_locking_inset and the insets in the current paragraph/buffer
-   are checked first, so no performance problem should occur.
-   
-   Hope that's ok for the beginning, Alejandro,
-   sorry that I needed so much time,
-
-                  Matthias
-   */
-
-//void UpdateInset(BufferView * bv, Inset * inset, bool mark_dirty = true);
-
-/* these functions return 1 if an error occured, 
-   otherwise 0 */
-// Now they work only for updatable insets. [Alejandro 080596]
-//int LockInset(UpdatableInset * inset);
-void ToggleLockedInsetCursor(int x, int y, int asc, int desc);
-//void FitLockedInsetCursor(long x, long y, int asc, int desc);
-//int UnlockInset(UpdatableInset * inset);
-//void LockedInsetStoreUndo(Undo::undo_kind kind);
-
-/* this is for asyncron updating. UpdateInsetUpdateList will be called
-   automatically from LyX. Just insert the Inset into the Updatelist */
-//void UpdateInsetUpdateList();
-//void PutInsetIntoInsetUpdateList(Inset * inset);
-
-//InsetUpdateStruct * InsetUpdateList = 0;
-
-
-/*
-  -----------------------------------------------------------------------
- */
-
 
 void ShowMessage(Buffer const * buf,
                 string const & msg1,
                 string const & msg2,
                 string const & msg3)
 {
-       if (lyxrc.use_gui) {
-               string const str = msg1 + ' ' + msg2 + ' ' + msg3;
-               buf->getUser()->owner()->message(str);
+       if (lyxrc.use_gui
+           && buf && buf->getUser() && buf->getUser()->owner()) {
+                       string const str = msg1 + ' ' + msg2 + ' ' + msg3;
+                       buf->getUser()->owner()->message(str);
        } else
                lyxerr << msg1 << msg2 << msg3 << endl;
 }
@@ -479,15 +421,13 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
        bv->owner()->prohibitInput();
        if (label.empty()) {
                Paragraph * par = bv->getLyXText()->cursor.par();
-               LyXLayout const * layout =
-                       &textclasslist.Style(bv->buffer()->params.textclass,
-                                            par->getLayout());
+               LyXTextClass const & tclass =
+                       textclasslist[bv->buffer()->params.textclass];
+               LyXLayout const * layout = &tclass[par->layout()];
 
                if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
                        Paragraph * par2 = par->previous();
-                       LyXLayout const * layout2 =
-                               &textclasslist.Style(bv->buffer()->params.textclass,
-                                                    par2->getLayout());
+                       LyXLayout const * layout2 = &tclass[par2->layout()];
                        if (layout2->latextype != LATEX_PARAGRAPH) {
                                par = par2;
                                layout = layout2;
@@ -520,9 +460,9 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
                }
        }
        if (!label.empty()) {
-               InsetCommandParams p( "label", label );
-               InsetLabel * inset = new InsetLabel( p );
-               bv->insertInset( inset );
+               InsetCommandParams p("label", label);
+               InsetLabel * inset = new InsetLabel(p);
+               bv->insertInset(inset);
        }
        bv->owner()->allowInput();
 }
@@ -536,7 +476,8 @@ void Reconfigure(BufferView * bv)
 
        // Run configure in user lyx directory
        Path p(user_lyxdir);
-       Systemcalls one(Systemcalls::System, 
+       Systemcall one;
+       one.startscript(Systemcall::Wait, 
                        AddName(system_lyxdir, "configure"));
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));