X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=acd2dc171b61fdc03abe9b4c2e8ddf83204c5237;hb=98c966c64594611e469313314abd1e59524adb4a;hp=e79258f12c7ae6f7a9288d38e9e52422282cf647;hpb=bea633366d16ae972a4f5292e249c88d96a7e4e2;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index e79258f12c..acd2dc171b 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -1,38 +1,45 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich, - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include -#include -#include -#include - -#include FORMS_H_LOCATION - #include "lyx_cb.h" -#include "lyx_gui_misc.h" #include "lyx_main.h" +#include "buffer.h" #include "bufferlist.h" #include "bufferview_funcs.h" +#include "debug.h" #include "lastfiles.h" #include "LyXView.h" #include "lyxrc.h" #include "lyxtext.h" -#include "minibuffer.h" -#include "frontends/FileDialog.h" +#include "gettext.h" +#include "BufferView.h" +#include "lyxtextclasslist.h" + #include "insets/insetlabel.h" + +#include "frontends/Alert.h" +#include "frontends/FileDialog.h" +#include "frontends/GUIRunTime.h" + #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 +#include +#include +#include using std::vector; using std::ifstream; @@ -49,75 +56,17 @@ 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, int delay) + string const & msg3) { - if (lyxrc.use_gui) - buf->getUser()->owner()->getMiniBuffer()->Set(msg1, msg2, - msg3, delay); - else + 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; } @@ -133,13 +82,11 @@ void ShowMessage(Buffer const * buf, bool MenuWrite(BufferView * bv, Buffer * buffer) { // FIXME: needed ? - XFlush(fl_get_display()); - + XFlush(GUIRunTime::x11Display()); + if (!buffer->save()) { - string const fname = buffer->fileName(); - string const s = MakeAbsPath(fname); - if (AskQuestion(_("Save failed. Rename and try again?"), - MakeDisplayPath(s, 50), + if (Alert::askQuestion(_("Save failed. Rename and try again?"), + MakeDisplayPath(buffer->fileName(), 50), _("(If not, document is not saved.)"))) { return WriteAs(bv, buffer); } @@ -156,16 +103,16 @@ bool MenuWrite(BufferView * bv, Buffer * buffer) bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) { string fname = buffer->fileName(); - string oldname = fname; + string const oldname = fname; if (filename.empty()) { FileDialog fileDlg(bv->owner(), _("Choose a filename to save document as"), LFUN_WRITEAS, - make_pair(string(_("Documents")), + make_pair(string(_("Documents|#o#O")), string(lyxrc.document_path)), - make_pair(string(_("Templates")), + make_pair(string(_("Templates|#T#t")), string(lyxrc.template_path))); if (!IsLyXFilename(fname)) @@ -193,15 +140,15 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) // Same name as we have already? if (!buffer->isUnnamed() && fname == oldname) { - if (!AskQuestion(_("Same name as document already has:"), + if (!Alert::askQuestion(_("Same name as document already has:"), MakeDisplayPath(fname, 50), _("Save anyway?"))) return false; // Falls through to name change and save - } + } // No, but do we have another file with this name open? else if (!buffer->isUnnamed() && bufferlist.exists(fname)) { - if (AskQuestion(_("Another document with same name open!"), + if (Alert::askQuestion(_("Another document with same name open!"), MakeDisplayPath(fname, 50), _("Replace with current document?"))) { @@ -218,7 +165,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) } // Check whether the file exists else { FileInfo const myfile(fname); - if (myfile.isOK() && !AskQuestion(_("Document already exists:"), + if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"), MakeDisplayPath(fname, 50), _("Replace file?"))) return false; @@ -248,11 +195,11 @@ int MenuRunChktex(Buffer * buffer) int ret; if (buffer->isSGML()) { - WriteAlert(_("Chktex does not work with SGML derived documents.")); + Alert::alert(_("Chktex does not work with SGML derived documents.")); return 0; - } else + } else ret = buffer->runChktex(); - + if (ret >= 0) { string s; string t; @@ -260,15 +207,15 @@ int MenuRunChktex(Buffer * buffer) s = _("No warnings found."); } else if (ret == 1) { s = _("One warning found."); - t = _("Use 'Edit->Go to Error' to find it."); + t = _("Use `Navigate->Error' to find it."); } else { s += tostr(ret); s += _(" warnings found."); - t = _("Use 'Edit->Go to Error' to find them."); + t = _("Use `Navigate->Error' to find them."); } - WriteAlert(_("Chktex run successfully"), s, t); + Alert::alert(_("Chktex run successfully"), s, t); } else { - WriteAlert(_("Error!"), _("It seems chktex does not work.")); + Alert::alert(_("Error!"), _("It seems chktex does not work.")); } return ret; } @@ -276,10 +223,10 @@ int MenuRunChktex(Buffer * buffer) void QuitLyX() { - lyxerr.debug() << "Running QuitLyX." << endl; + lyxerr[Debug::INFO] << "Running QuitLyX." << endl; if (lyxrc.use_gui) { - if (!bufferlist.QwriteAll()) + if (!bufferlist.qwriteAll()) return; lastfiles->writeFile(lyxrc.lastfiles); @@ -293,7 +240,7 @@ void QuitLyX() bufferlist.closeAll(); // do any other cleanup procedures now - lyxerr.debug() << "Deleting tmp dir " << system_tempdir << endl; + lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl; DestroyLyXTmpDir(system_tempdir); @@ -315,14 +262,14 @@ void AutoSave(BufferView * bv) return; } - bv->owner()->getMiniBuffer()->Set(_("Autosaving current document...")); - + bv->owner()->message(_("Autosaving current document...")); + // create autosave filename - string fname = OnlyPath(bv->buffer()->fileName()); + string fname = bv->buffer()->filePath(); fname += "#"; fname += OnlyFilename(bv->buffer()->fileName()); fname += "#"; - + // tmp_ret will be located (usually) in /tmp // will that be a problem? pid_t const pid = fork(); // If you want to debug the autosave @@ -333,7 +280,7 @@ void AutoSave(BufferView * bv) // to fork. But we will do the save // anyway. bool failed = false; - + string const tmp_ret = lyx::tempName(string(), "lyxauto"); if (!tmp_ret.empty()) { bv->buffer()->writeFile(tmp_ret, 1); @@ -348,21 +295,21 @@ void AutoSave(BufferView * bv) } else { failed = true; } - + if (failed) { // failed to write/rename tmp_ret so try writing direct if (!bv->buffer()->writeFile(fname, 1)) { // It is dangerous to do this in the child, // but safe in the parent, so... if (pid == -1) - bv->owner()->getMiniBuffer()->Set(_("Autosave Failed!")); + bv->owner()->message(_("Autosave failed!")); } } if (pid == 0) { // we are the child so... _exit(0); } } - + bv->buffer()->markBakClean(); bv->owner()->resetAutosaveTimer(); } @@ -389,11 +336,11 @@ Buffer * NewLyxFile(string const & filename) tmpname = split(tmpname, ':'); } #endif - lyxerr.debug() << "Arg is " << filename - << "\nName is " << name - << "\nTemplate is " << tmpname << endl; + lyxerr[Debug::INFO] << "Arg is " << filename + << "\nName is " << name + << "\nTemplate is " << tmpname << endl; - // find a free buffer + // find a free buffer Buffer * tmpbuf = bufferlist.newFile(name, tmpname); if (tmpbuf) lastfiles->newFile(tmpbuf->fileName()); @@ -404,39 +351,63 @@ Buffer * NewLyxFile(string const & filename) // Insert ascii file (if filename is empty, prompt for one) void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) { - string fname = f; + if (!bv->available()) + return; - if (!bv->available()) + string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph); + if (tmpstr.empty()) return; - + + // insert the string + bv->hideCursor(); + + // clear the selection + bool flag = (bv->text == bv->getLyXText()); + if (flag) + bv->beforeChange(bv->text); + if (!asParagraph) + bv->getLyXText()->insertStringAsLines(bv, tmpstr); + else + bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr); + if (flag) + bv->update(bv->text, + BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); +} + + +// Insert ascii file (if filename is empty, prompt for one) +string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph) +{ + string fname = f; + if (fname.empty()) { FileDialog fileDlg(bv->owner(), _("Select file to insert"), (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII); - - FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filepath); + + FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filePath()); if (result.first == FileDialog::Later) - return; + return string(); fname = result.second; - if (fname.empty()) - return; + if (fname.empty()) + return string(); } FileInfo fi(fname); if (!fi.readable()) { - WriteFSAlert(_("Error! Specified file is unreadable: "), + Alert::err_alert(_("Error! Specified file is unreadable: "), MakeDisplayPath(fname, 50)); - return; + return string(); } ifstream ifs(fname.c_str()); if (!ifs) { - WriteFSAlert(_("Error! Cannot open specified file: "), + Alert::err_alert(_("Error! Cannot open specified file: "), MakeDisplayPath(fname, 50)); - return; + return string(); } ifs.unsetf(ios::skipws); @@ -449,50 +420,30 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) string const tmpstr(tmp.begin(), tmp.end()); #else // This is what we want to use and what we will use once the - // compilers get good enough. + // compilers get good enough. //string tmpstr(ii, end); // yet a reason for using std::string // alternate approach to get the file into a string: string tmpstr; copy(ii, end, back_inserter(tmpstr)); #endif - // insert the string - bv->hideCursor(); - - // clear the selection - bv->beforeChange(bv->text); - if (!asParagraph) - bv->text->InsertStringA(bv, tmpstr); - else - bv->text->InsertStringB(bv, tmpstr); - bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + + return tmpstr; } void MenuInsertLabel(BufferView * bv, string const & arg) { string label(arg); - ProhibitInput(bv); + bv->owner()->prohibitInput(); if (label.empty()) { -#ifndef NEW_INSETS - LyXParagraph * par = - bv->text->cursor.par()->FirstPhysicalPar(); -#else - LyXParagraph * par = bv->text->cursor.par(); -#endif - LyXLayout const * layout = - &textclasslist.Style(bv->buffer()->params.textclass, - par->GetLayout()); + Paragraph * par = bv->getLyXText()->cursor.par(); + LyXTextClass const & tclass = + textclasslist[bv->buffer()->params.textclass]; + LyXLayout const * layout = &tclass[par->layout()]; -#ifndef NEW_INSETS - if (layout->latextype == LATEX_PARAGRAPH && par->previous_) { - LyXParagraph * par2 = par->previous_->FirstPhysicalPar(); -#else if (layout->latextype == LATEX_PARAGRAPH && par->previous()) { - LyXParagraph * par2 = par->previous(); -#endif - LyXLayout const * layout2 = - &textclasslist.Style(bv->buffer()->params.textclass, - par2->GetLayout()); + Paragraph * par2 = par->previous(); + LyXLayout const * layout2 = &tclass[par2->layout()]; if (layout2->latextype != LATEX_PARAGRAPH) { par = par2; layout = layout2; @@ -501,30 +452,12 @@ void MenuInsertLabel(BufferView * bv, string const & arg) string text = layout->latexname().substr(0, 3); if (layout->latexname() == "theorem") text = "thm"; // Create a correct prefix for prettyref -#ifndef NEW_INSETS - if (par->footnoteflag==LyXParagraph::OPEN_FOOTNOTE) - switch (par->footnotekind) { - case LyXParagraph::FIG: - case LyXParagraph::WIDE_FIG: - text = "fig"; - break; - case LyXParagraph::TAB: - case LyXParagraph::WIDE_TAB: - text = "tab"; - break; - case LyXParagraph::ALGORITHM: - text = "alg"; - break; - case LyXParagraph::FOOTNOTE: - case LyXParagraph::MARGIN: - break; - } -#endif + text += ":"; if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0) text.erase(); - string par_text = par->String(bv->buffer(), false); + string par_text = par->asString(bv->buffer(), false); for (int i = 0; i < lyxrc.label_init_length; ++i) { if (par_text.empty()) break; @@ -532,34 +465,22 @@ void MenuInsertLabel(BufferView * bv, string const & arg) par_text = split(par_text, head, ' '); if (i > 0) text += '-'; // Is it legal to use spaces in - // labels ? + // labels ? text += head; } pair result = - askForText(_("Enter new label to insert:"), text); + Alert::askForText(_("Enter new label to insert:"), text); if (result.first) { label = frontStrip(strip(result.second)); } } 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); } - AllowInput(bv); -} - - -void MenuLayoutSave(BufferView * bv) -{ - if (!bv->available()) - return; - - if (AskQuestion(_("Do you want to save the current settings"), - _("for Character, Document, Paper and Quotes"), - _("as default for new documents?"))) - bv->buffer()->saveParamsAsDefaults(); + bv->owner()->allowInput(); } @@ -567,16 +488,17 @@ void MenuLayoutSave(BufferView * bv) // reconfigure the automatic settings. void Reconfigure(BufferView * bv) { - bv->owner()->getMiniBuffer()->Set(_("Running configure...")); + bv->owner()->message(_("Running configure...")); // 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()->getMiniBuffer()->Set(_("Reloading configuration...")); + bv->owner()->message(_("Reloading configuration...")); lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); - WriteAlert(_("The system has been reconfigured."), + Alert::alert(_("The system has been reconfigured."), _("You need to restart LyX to make use of any"), _("updated document class specifications.")); }