X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=79d0dc66a0db010db0a72d57901e216b79f1ebe6;hb=9625f5e2300339330e099ccea259c46667ea1461;hp=00e4318fd03347e861ff4f62db2839bea533e00b;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 00e4318fd0..79d0dc66a0 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -28,10 +28,12 @@ using std::istringstream; #pragma implementation #endif +#include "version.h" #include "lyxlookup.h" #include "kbmap.h" #include "lyxfunc.h" #include "bufferlist.h" +#include "ColorHandler.h" #include "lyxserver.h" #include "lyx.h" #include "intl.h" @@ -41,9 +43,6 @@ using std::istringstream; #include "insets/inseturl.h" #include "insets/insetlatexaccent.h" #include "insets/insettoc.h" -#include "insets/insetlof.h" -#include "insets/insetloa.h" -#include "insets/insetlot.h" #include "insets/insetref.h" #include "insets/insetparent.h" #include "insets/insetindex.h" @@ -52,11 +51,17 @@ using std::istringstream; #include "insets/insetcite.h" #include "insets/insettext.h" #include "insets/insetert.h" +#include "insets/insetexternal.h" #include "insets/insetgraphics.h" #include "insets/insetfoot.h" +#include "insets/insetmarginal.h" +#include "insets/insetminipage.h" +#include "insets/insetfloat.h" +#include "insets/insetlist.h" #include "insets/insettabular.h" +#include "insets/insettheorem.h" +#include "insets/insetcaption.h" #include "mathed/formulamacro.h" -#include "toolbar.h" #include "spellchecker.h" // RVDK_PATCH_5 #include "minibuffer.h" #include "vspace.h" @@ -78,8 +83,18 @@ using std::istringstream; #include "layout.h" #include "WorkArea.h" #include "lyxfr1.h" -#include "menus.h" #include "bufferview_funcs.h" +#include "frontends/Dialogs.h" +#include "frontends/Toolbar.h" +#ifdef NEW_MENUBAR +#include "frontends/Menubar.h" +#else +#include "menus.h" +#endif +#include "FloatList.h" +#include "exporter.h" +#include "FontLoader.h" +#include "TextCache.h" using std::pair; using std::endl; @@ -88,40 +103,43 @@ extern bool cursor_follows_scrollbar; extern void InsertAsciiFile(BufferView *, string const &, bool); extern void math_insert_symbol(char const *); -extern Bool math_insert_greek(char const); // why "Bool"? +extern bool math_insert_greek(char); extern BufferList bufferlist; extern LyXServer * lyxserver; -extern short greek_kb_flag; -extern FD_form_toc * fd_form_toc; +extern int greek_kb_flag; extern bool selection_possible; extern kb_keymap * toplevel_keymap; -extern void MenuWrite(Buffer *); -extern void MenuWriteAs(Buffer *); +extern bool MenuWrite(Buffer *); +extern bool MenuWriteAs(Buffer *); +#ifdef NEW_MENUBAR extern int MenuRunLaTeX(Buffer *); +#endif extern int MenuBuildProg(Buffer *); extern int MenuRunChktex(Buffer *); +#ifndef NEW_EXPORT extern bool CreatePostscript(Buffer *, bool); +#endif extern void MenuPrint(Buffer *); extern void MenuSendto(); extern void QuitLyX(); extern void MenuFax(Buffer *); +#ifndef NEW_EXPORT extern void MenuExport(Buffer *, string const &); +#endif +extern void show_symbols_form(LyXFunc *); extern LyXAction lyxaction; // (alkis) extern tex_accent_struct get_accent(kb_action action); extern void AutoSave(BufferView *); -#if 0 -extern void SetUpdateTimer(float timer = 0.3); -extern void FreeUpdateTimer(); -#endif +#ifndef NEW_EXPORT extern bool PreviewDVI(Buffer *); extern bool PreviewPostscript(Buffer *); +#endif extern void MenuInsertLabel(char const *); -extern void MenuInsertRef(); extern void MenuLayoutCharacter(); extern void MenuLayoutParagraph(); extern void MenuLayoutDocument(); @@ -167,28 +185,144 @@ void LyXFunc::moveCursorUpdate(bool selecting) if (selecting || owner->view()->text->mark_set) { owner->view()->text->SetSelection(); owner->view()->toggleToggle(); - //owner->view()->update(0); - //} else { - //owner->view()->update(-2); // this IS necessary - // (Matthias) } - owner->view()->update(0); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->showCursor(); /* ---> Everytime the cursor is moved, show the current font state. */ // should this too me moved out of this func? - //owner->getMiniBuffer()->Set(CurrentState()); + //owner->showState(); owner->view()->setState(); } +int LyXFunc::processKeySym(KeySym keysym, unsigned int state) +{ + string argument; + + if (lyxerr.debugging(Debug::KEY)) { + char * tmp = XKeysymToString(keysym); + string stm = (tmp ? tmp : ""); + lyxerr << "KeySym is " + << stm + << "[" + << keysym << "]" + << endl; + } + // Do nothing if we have nothing (JMarc) + if (keysym == NoSymbol) { + lyxerr[Debug::KEY] << "Empty kbd action (probably composing)" + << endl; + //return 0; + return FL_PREEMPT; + } + + // this function should be used always [asierra060396] + UpdatableInset * tli = owner->view()->the_locking_inset; + if (owner->view()->available() && tli && (keysym == XK_Escape)) { + if (tli == tli->GetLockingInset()) { + owner->view()->unlockInset(tli); + owner->view()->text->CursorRight(owner->view()); + moveCursorUpdate(false); + owner->showState(); + } else { + tli->UnlockInsetInInset(owner->view(), + tli->GetLockingInset(),true); + } + //return 0; + return FL_PREEMPT; + } + + // Can we be sure that this will work for all X-Windows + // implementations? (Lgb) + // This code snippet makes lyx ignore some keys. Perhaps + // all of them should be explictly mentioned? + if((keysym >= XK_Shift_L && keysym <= XK_Hyper_R) + || keysym == XK_Mode_switch || keysym == 0x0) + return 0; + + // Do a one-deep top-level lookup for + // cancel and meta-fake keys. RVDK_PATCH_5 + cancel_meta_seq.reset(); + + int action = cancel_meta_seq.addkey(keysym, state + &(ShiftMask|ControlMask + |Mod1Mask)); + + // When not cancel or meta-fake, do the normal lookup. + // Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards. + // Mostly, meta_fake_bit = 0. RVDK_PATCH_5. + if ( (action != LFUN_CANCEL) && (action != LFUN_META_FAKE) ) { + + // remove Caps Lock and Mod2 as a modifiers + action = keyseq.addkey(keysym, + (state | meta_fake_bit) + &(ShiftMask|ControlMask + |Mod1Mask)); + } + // Dont remove this unless you know what you are doing. + meta_fake_bit = 0; + + if (action == 0) action = LFUN_PREFIX; + + if (lyxerr.debugging(Debug::KEY)) { + string buf; + keyseq.print(buf); + lyxerr << "Key [" + << action << "][" + << buf << "]" + << endl; + } + + // already here we know if it any point in going further + // why not return already here if action == -1 and + // num_bytes == 0? (Lgb) + + if(keyseq.length > 1 || keyseq.length < -1) { + string buf; + keyseq.print(buf); + owner->getMiniBuffer()->Set(buf); + } + + if (action == -1) { + if (keyseq.length < -1) { // unknown key sequence... + string buf; + LyXBell(); + keyseq.print(buf); + owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf); + return 0; + } + + char isochar = keyseq.getiso(); + if (!(state & ControlMask) && + !(state & Mod1Mask) && + (isochar && keysym < 0xF000)) { + argument += isochar; + } + if (argument.empty()) { + lyxerr.debug() << "Empty argument!" << endl; + // This can`t possibly be of any use + // so we`ll skip the dispatch. + return 0; + } + } + + bool tmp_sc = show_sc; + show_sc = false; + Dispatch(action, argument.c_str()); + show_sc = tmp_sc; + + return 0; +} + + +#if 0 int LyXFunc::processKeyEvent(XEvent * ev) { char s_r[10]; + KeySym keysym_return = 0; string argument; XKeyEvent * keyevent = &ev->xkey; - KeySym keysym_return = 0; - int num_bytes = LyXLookupString(ev, s_r, 10, &keysym_return); s_r[num_bytes] = '\0'; @@ -202,7 +336,8 @@ int LyXFunc::processKeyEvent(XEvent * ev) << " and num_bytes is " << num_bytes << " the string returned is \"" - << s_r << '\"' << endl; + << s_r << '\"' + << endl; } // Do nothing if we have nothing (JMarc) if (num_bytes == 0 && keysym_return == NoSymbol) { @@ -216,12 +351,12 @@ int LyXFunc::processKeyEvent(XEvent * ev) if (owner->view()->available() && tli && (keysym_return==XK_Escape)) { if (tli == tli->GetLockingInset()) { owner->view()->unlockInset(tli); - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); } else { tli->UnlockInsetInInset(owner->view(), - tli->GetLockingInset()); + tli->GetLockingInset(),true); } return 0; } @@ -263,8 +398,10 @@ int LyXFunc::processKeyEvent(XEvent * ev) keyseq.print(buf); lyxerr << "Key [" << action << "][" - << buf << "][" - << num_bytes << "]" << endl; + << buf << "]" + << "[" + << num_bytes << "]" + << endl; } // already here we know if it any point in going further @@ -298,11 +435,12 @@ int LyXFunc::processKeyEvent(XEvent * ev) // so we`ll skip the dispatch. return 0; } - } else + } + else if (action == LFUN_SELFINSERT) { argument = s_r[0]; } - + bool tmp_sc = show_sc; show_sc = false; Dispatch(action, argument.c_str()); @@ -310,6 +448,7 @@ int LyXFunc::processKeyEvent(XEvent * ev) return 0; } +#endif LyXFunc::func_status LyXFunc::getStatus(int ac) const @@ -321,13 +460,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const if (lyxaction.isPseudoAction(ac)) action = lyxaction.retrieveActionArg(ac, argument); - else + else action = static_cast(ac); if (action == LFUN_UNKNOWN_ACTION) { setErrorMessage(N_("Unknown action")); return LyXFunc::Unknown; - } + } // Check whether we need a buffer if (!lyxaction.funcHasFlag(action, LyXAction::NoBuffer)) { @@ -347,49 +486,60 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const setErrorMessage(N_("Command not allowed with" "out any document open")); flag |= LyXFunc::Disabled; + return flag; } } - if (flag & LyXFunc::Disabled) - return flag; - // I would really like to avoid having this switch and rather try to // encode this in the function itself. static bool noLaTeX = lyxrc.latex_command == "none"; bool disable = false; switch (action) { +#ifndef NEW_EXPORT case LFUN_PREVIEW: disable = noLaTeX || lyxrc.view_dvi_command == "none"; - break; - case LFUN_PREVIEWPS: + break; + case LFUN_PREVIEWPS: disable = noLaTeX || lyxrc.view_ps_command == "none"; break; case LFUN_RUNLATEX: case LFUN_RUNDVIPS: disable = noLaTeX; break; +#endif case LFUN_MENUPRINT: disable = noLaTeX || lyxrc.print_command == "none"; break; case LFUN_FAX: - disable = noLaTeX || lyxrc.fax_command == "none"; + disable = noLaTeX || lyxrc.fax_command == "none"; break; case LFUN_IMPORT: - if (argument == "latex") + if (argument == "latex" || argument == "noweb") disable = lyxrc.relyx_command == "none"; - if (argument == "linuxdoc") + else if (argument == "linuxdoc") disable = lyxrc.linuxdoc_to_lyx_command == "none"; break; +#ifndef NEW_EXPORT case LFUN_EXPORT: - if (argument == "dvi" || argument == "postscript") + if (argument == "latex") + disable = (! buf->isLatex() && ! buf->isLiterate()) ; + else if (argument == "linuxdoc") + disable = ! buf->isLinuxDoc(); + else if (argument == "docbook") + disable = ! buf->isDocBook(); + else if (argument == "dvi" || argument == "postscript") disable = noLaTeX; - if (argument == "html") - disable = lyxrc.html_command == "none"; - if (argument == "html-linuxdoc") - disable = lyxrc.linuxdoc_to_html_command == "none"; - if (argument == "html-docbook") - disable = lyxrc.docbook_to_html_command == "none"; + else if (argument == "html") + disable = (buf->isLinuxDoc() + && lyxrc.linuxdoc_to_html_command == "none") + || (buf->isDocBook() + && lyxrc.docbook_to_html_command == "none") + || (! buf->isLinuxDoc() && ! buf->isDocBook() + && lyxrc.html_command == "none"); + else if (argument == "custom") + disable = (! buf->isLatex() && ! buf->isLiterate()); break; +#endif case LFUN_UNDO: disable = buf->undostack.empty(); break; @@ -402,9 +552,66 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const case LFUN_RUNCHKTEX: disable = lyxrc.chktex_command == "none"; break; + case LFUN_BUILDPROG: + disable = (lyxrc.literate_command == "none" + || ! buf->isLiterate()); + break; + +#ifndef NEW_TABULAR case LFUN_LAYOUT_TABLE: disable = ! owner->view()->text->cursor.par()->table; break; +#endif + case LFUN_LAYOUT_TABULAR: + disable = true; + if (owner->view()->the_locking_inset) { + disable = (owner->view()->the_locking_inset->LyxCode() != Inset::TABULAR_CODE) && + !owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE); + } + break; + + case LFUN_TABULAR_FEATURE: + disable = true; + if (owner->view()->the_locking_inset) { + func_status ret = LyXFunc::Disabled; + if (owner->view()->the_locking_inset->LyxCode() == Inset::TABULAR_CODE) { + ret = static_cast + (owner->view()->the_locking_inset)-> + getStatus(argument); + } else if (owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)) { + ret = static_cast + (owner->view()->the_locking_inset-> + GetFirstLockingInsetOfType(Inset::TABULAR_CODE))-> + getStatus(argument); + } + flag |= ret; + disable = false; + } else { + static InsetTabular inset(owner->buffer(), 1, 1); + func_status ret; + + disable = true; + ret = inset.getStatus(argument); + if ((ret & LyXFunc::ToggleOn) || + (ret & LyXFunc::ToggleOff)) + flag |= LyXFunc::ToggleOff; + } + break; + + case LFUN_VC_REGISTER: + disable = buf->lyxvc.inUse(); + break; + case LFUN_VC_CHECKIN: + disable = !buf->lyxvc.inUse() || buf->isReadonly(); + break; + case LFUN_VC_CHECKOUT: + disable = !buf->lyxvc.inUse() || !buf->isReadonly(); + break; + case LFUN_VC_REVERT: + case LFUN_VC_UNDO: + case LFUN_VC_HISTORY: + disable = !buf->lyxvc.inUse(); + break; default: break; } @@ -413,7 +620,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const if (buf) { func_status box = LyXFunc::ToggleOff; - LyXFont font = owner->view()->text->real_current_font; + LyXFont font; + if (owner->view()->the_locking_inset && + owner->view()->the_locking_inset->getLyXText(owner->view())) + font = owner->view()->the_locking_inset-> + getLyXText(owner->view())->real_current_font; + else + font = owner->view()->text->real_current_font; switch (action) { case LFUN_EMPH: if (font.emph() == LyXFont::ON) @@ -481,7 +694,7 @@ string LyXFunc::Dispatch(int ac, owner->view()->hideCursor(); // We cannot use this function here - if (getStatus(action) & Disabled) + if (getStatus(ac) & Disabled) goto exit_with_message; commandshortcut.erase(); @@ -537,11 +750,10 @@ string LyXFunc::Dispatch(int ac, if (owner->view()->available() && owner->view()->the_locking_inset) { UpdatableInset::RESULT result; - if (action > 1 - || (action == LFUN_UNKNOWN_ACTION - && keyseq.length >= -1)) { - if (action == LFUN_UNKNOWN_ACTION - && argument.empty()) { + if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) && + (keyseq.length >= -1))) + { + if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){ argument = keyseq.getiso(); } // Undo/Redo pre 0.13 is a bit tricky for insets. @@ -549,7 +761,7 @@ string LyXFunc::Dispatch(int ac, int slx, sly; UpdatableInset * inset = owner->view()->the_locking_inset; - inset->GetCursorPos(slx, sly); + inset->GetCursorPos(owner->view(), slx, sly); owner->view()->unlockInset(inset); owner->view()->menuUndo(); if (owner->view()->text->cursor.par()-> @@ -568,7 +780,7 @@ string LyXFunc::Dispatch(int ac, int slx, sly; UpdatableInset * inset = owner->view()-> the_locking_inset; - inset->GetCursorPos(slx, sly); + inset->GetCursorPos(owner->view(), slx, sly); owner->view()->unlockInset(inset); owner->view()->menuRedo(); inset = static_cast( @@ -590,31 +802,28 @@ string LyXFunc::Dispatch(int ac, case LFUN_UNKNOWN_ACTION: case LFUN_BREAKPARAGRAPH: case LFUN_BREAKLINE: - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_RIGHT: if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); moveCursorUpdate(false); - owner->getMiniBuffer()-> - Set(CurrentState(owner->view())); + owner->showState(); } return string(); case LFUN_LEFT: if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); moveCursorUpdate(false); - owner->getMiniBuffer()-> - Set(CurrentState(owner->view())); + owner->showState(); } return string(); case LFUN_DOWN: - owner->view()->text->CursorDown(); + owner->view()->text->CursorDown(owner->view()); moveCursorUpdate(false); - owner->getMiniBuffer()-> - Set(CurrentState(owner->view())); + owner->showState(); return string(); default: break; @@ -641,11 +850,11 @@ string LyXFunc::Dispatch(int ac, if (!searched_string.empty() && ((action == LFUN_WORDFINDBACKWARD) ? - ltCur->SearchBackward(searched_string.c_str()) : - ltCur->SearchForward(searched_string.c_str()))) { + ltCur->SearchBackward(owner->view(), searched_string.c_str()) : + ltCur->SearchForward(owner->view(), searched_string.c_str()))) { // ??? What is that ??? - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); // ??? Needed ??? // clear the selection (if there is any) @@ -654,7 +863,7 @@ string LyXFunc::Dispatch(int ac, // Move cursor so that successive C-s 's will not stand in place. if( action == LFUN_WORDFINDFORWARD ) - owner->view()->text->CursorRightOneWord(); + owner->view()->text->CursorRightOneWord(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); @@ -673,7 +882,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_PREFIX: { if (owner->view()->available()) { - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); } string buf; keyseq.print(buf, true); @@ -720,8 +929,8 @@ string LyXFunc::Dispatch(int ac, case LFUN_APPENDIX: if (owner->view()->available()) { - owner->view()->text->toggleAppendix(); - owner->view()->update(1); + owner->view()->text->toggleAppendix(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } break; @@ -743,16 +952,20 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_MENUWRITE: - owner->getMiniBuffer()->Set(_("Saving document"), - MakeDisplayPath(owner->buffer()->fileName()), - "..."); - MenuWrite(owner->buffer()); - //owner->getMiniBuffer()-> { - // Set(_("Document saved as"), - // MakeDisplayPath(owner->buffer()->fileName())); - //} else { - //owner->getMiniBuffer()->Set(_("Save failed!")); - //} + if (!owner->buffer()->isUnnamed()) { + owner->getMiniBuffer()->Set(_("Saving document"), + MakeDisplayPath(owner->buffer()->fileName()), + "..."); + MenuWrite(owner->buffer()); + //owner->getMiniBuffer()-> { + // Set(_("Document saved as"), + // MakeDisplayPath(owner->buffer()->fileName())); + //} else { + //owner->getMiniBuffer()->Set(_("Save failed!")); + //} + } else { + MenuWriteAs(owner->buffer()); + } break; case LFUN_MENUWRITEAS: @@ -763,6 +976,15 @@ string LyXFunc::Dispatch(int ac, reloadBuffer(); break; +#ifdef NEW_EXPORT + case LFUN_UPDATE: + Exporter::Export(owner->buffer(), argument, true); + break; + + case LFUN_PREVIEW: + Exporter::Preview(owner->buffer(), argument); + break; +#else case LFUN_PREVIEW: PreviewDVI(owner->buffer()); break; @@ -774,6 +996,11 @@ string LyXFunc::Dispatch(int ac, case LFUN_RUNLATEX: MenuRunLaTeX(owner->buffer()); break; + + case LFUN_RUNDVIPS: + CreatePostscript(owner->buffer(), false); + break; +#endif case LFUN_BUILDPROG: MenuBuildProg(owner->buffer()); @@ -782,21 +1009,21 @@ string LyXFunc::Dispatch(int ac, case LFUN_RUNCHKTEX: MenuRunChktex(owner->buffer()); break; - - case LFUN_RUNDVIPS: - CreatePostscript(owner->buffer(), false); - break; - + case LFUN_MENUPRINT: - MenuPrint(owner->buffer()); + owner->getDialogs()->showPrint(); break; - + case LFUN_FAX: MenuFax(owner->buffer()); break; case LFUN_EXPORT: +#ifdef NEW_EXPORT + Exporter::Export(owner->buffer(), argument, false); +#else MenuExport(owner->buffer(), argument); +#endif break; case LFUN_IMPORT: @@ -812,76 +1039,72 @@ string LyXFunc::Dispatch(int ac, case LFUN_LOTVIEW: case LFUN_LOAVIEW: { - Buffer::TocType type = Buffer::TOC_TOC; - if (action == LFUN_LOFVIEW) - type = Buffer::TOC_LOF; - else if (action == LFUN_LOTVIEW) - type = Buffer::TOC_LOT; - else if (action == LFUN_LOAVIEW) - type = Buffer::TOC_LOA; - fl_set_choice(fd_form_toc->toctype,type + 1); - TocUpdateCB(0, 0); - if (fd_form_toc->form_toc->visible) { - fl_raise_form(fd_form_toc->form_toc); - } else { - static int ow = -1, oh; - fl_show_form(fd_form_toc->form_toc, - FL_PLACE_MOUSE | - FL_FREE_SIZE, FL_FULLBORDER, - _("Table of Contents")); - if (ow < 0) { - ow = fd_form_toc->form_toc->w; - oh = fd_form_toc->form_toc->h; - } - fl_set_form_minsize(fd_form_toc->form_toc, ow, oh); - } + InsetCommandParams p; + + if( action == LFUN_TOCVIEW ) + p.setCmdName( "tableofcontents" ); + else if( action == LFUN_LOAVIEW ) + p.setCmdName( "listofalgorithms" ); + else if( action == LFUN_LOFVIEW ) + p.setCmdName( "listoffigures" ); + else + p.setCmdName( "listoftables" ); + + owner->getDialogs()->createTOC( p.getAsString() ); break; } + case LFUN_TOC_INSERT: - { - Inset * new_inset = new InsetTOC(owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; - break; - } - - case LFUN_LOF_INSERT: - { - Inset * new_inset = new InsetLOF(owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; - break; - } - case LFUN_LOA_INSERT: - { - Inset * new_inset = new InsetLOA(owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; - break; - } - + case LFUN_LOF_INSERT: case LFUN_LOT_INSERT: { - Inset * new_inset = new InsetLOT(owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; + InsetCommandParams p; + + if( action == LFUN_TOC_INSERT ) + p.setCmdName( "tableofcontents" ); + else if( action == LFUN_LOA_INSERT ) + p.setCmdName( "listofalgorithms" ); + else if( action == LFUN_LOF_INSERT ) + p.setCmdName( "listoffigures" ); + else + p.setCmdName( "listoftables" ); + + Inset * inset = new InsetTOC( p ); + if( !owner->view()->insertInset( inset, "Standard", true ) ) + delete inset; break; } - case LFUN_TABLE: + case LFUN_DIALOG_TABULAR_INSERT: +#ifndef NEW_TABULAR Table(); +#else + owner->getDialogs()->showTabularCreate(); +#endif break; + case LFUN_TABULAR_FEATURE: + case LFUN_SCROLL_INSET: + // this is not handled here as this funktion is only aktive + // if we have a locking_inset and that one is (or contains) + // a tabular-inset + break; + case LFUN_FIGURE: Figure(); break; - case LFUN_INSERT_GRAPHICS: + case LFUN_INSET_GRAPHICS: { Inset * new_inset = new InsetGraphics; - if (!owner->view()->insertInset(new_inset)) + if (!owner->view()->insertInset(new_inset)) { delete new_inset; + } else { + // this is need because you don't use a inset->Edit() + owner->view()->updateInset(new_inset, true); + new_inset->Edit(owner->view(), 0, 0, 0); + } break; } @@ -952,10 +1175,12 @@ string LyXFunc::Dispatch(int ac, case LFUN_GOTONOTE: owner->view()->gotoNote(); break; - + +#ifndef NEW_INSETS case LFUN_OPENSTUFF: owner->view()->openStuff(); break; +#endif case LFUN_HYPHENATION: owner->view()->hyphenationPoint(); @@ -992,23 +1217,23 @@ string LyXFunc::Dispatch(int ac, case LFUN_FREE: Free(owner->view()); owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_TEX: Tex(owner->view()); owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; - +#ifndef NEW_INSETS case LFUN_MELT: Melt(owner->view()); break; - +#endif case LFUN_RECONFIGURE: Reconfigure(owner->view()); break; - +#ifndef NEW_INSETS case LFUN_FOOTMELT: if (owner->view()->available() && !owner->view()->text->selection @@ -1035,7 +1260,47 @@ string LyXFunc::Dispatch(int ac, Margin(owner->view()); owner->view()->setState(); break; - +#endif + case LFUN_HELP_COPYRIGHT: + owner->getDialogs()->showCopyright(); + break; + + case LFUN_HELP_CREDITS: + owner->getDialogs()->showCredits(); + break; + + case LFUN_HELP_OPEN: { + string arg = argument; + if (arg.empty()) { + setErrorMessage(N_("Missing argument")); + break; + } + ProhibitInput(owner->view()); + string fname = i18nLibFileSearch("doc", arg, "lyx"); + if (fname.empty()) { + lyxerr << "LyX: unable to find documentation file `" + << arg << "'. Bad installation?" << endl; + AllowInput(owner->view()); + break; + } + owner->getMiniBuffer()->Set(_("Opening help file"), + MakeDisplayPath(fname),"..."); + owner->view()->buffer(bufferlist.loadLyXFile(fname,false)); + AllowInput(owner->view()); + break; + } + + case LFUN_HELP_VERSION: + ProhibitInput(owner->view()); + fl_show_message((string(_("LyX Version ")) + LYX_VERSION + + _(" of ") + LYX_RELEASE).c_str(), + (_("Library directory: ") + + MakeDisplayPath(system_lyxdir)).c_str(), + (_("User directory: ") + + MakeDisplayPath(user_lyxdir)).c_str()); + AllowInput(owner->view()); + break; + // --- version control ------------------------------- case LFUN_VC_REGISTER: { @@ -1080,6 +1345,11 @@ string LyXFunc::Dispatch(int ac, // --- buffers ---------------------------------------- + case LFUN_SWITCHBUFFER: + owner->view()->buffer(bufferlist.getBuffer(argument)); + break; + + case LFUN_FILE_INSERT: { MenuInsertLyXFile(argument); @@ -1161,21 +1431,22 @@ string LyXFunc::Dispatch(int ac, if (current_layout != layout.second) { owner->view()->hideCursor(); current_layout = layout.second; - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->text-> - SetLayout(layout.second); - owner->getToolbar()->combox-> - select(owner->view()-> - text->cursor.par()-> - GetLayout() + 1); - owner->view()->update(1); + SetLayout(owner->view(), layout.second); + owner->setLayout(layout.second); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->setState(); } } break; case LFUN_LAYOUT_DOCUMENT: +#ifdef USE_OLD_DOCUMENT_LAYOUT MenuLayoutDocument(); +#else + owner->getDialogs()->showLayoutDocument(); +#endif break; case LFUN_LAYOUT_PARAGRAPH: @@ -1194,12 +1465,31 @@ string LyXFunc::Dispatch(int ac, } break; + case LFUN_LAYOUT_TABULAR: + if (owner->view()->the_locking_inset) { + if (owner->view()->the_locking_inset->LyxCode()==Inset::TABULAR_CODE) { + InsetTabular * inset = static_cast + (owner->view()->the_locking_inset); + inset->OpenLayoutDialog(owner->view()); + } else if (owner->view()->the_locking_inset-> + GetFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) { + InsetTabular * inset = static_cast( + owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)); + inset->OpenLayoutDialog(owner->view()); + } + } + break; + case LFUN_LAYOUT_PAPER: +#ifdef USE_OLD_DOCUMENT_LAYOUT MenuLayoutPaper(); +#endif break; case LFUN_LAYOUT_QUOTES: +#ifdef USE_OLD_DOCUMENT_LAYOUT MenuLayoutQuotes(); +#endif break; case LFUN_LAYOUT_PREAMBLE: @@ -1211,58 +1501,58 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_DROP_LAYOUTS_CHOICE: - owner->getToolbar()->combox->Show(); + owner->getToolbar()->openLayoutList(); break; case LFUN_LANGUAGE: Lang(owner->view(), argument); owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_EMPH: Emph(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_BOLD: Bold(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_NOUN: Noun(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_CODE: Code(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_SANS: Sans(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_ROMAN: Roman(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_DEFAULT: StyleReset(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_UNDERLINE: Underline(owner->view()); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_FONT_SIZE: FontSize(owner->view(), argument); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_FONT_STATE: @@ -1270,81 +1560,57 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_UPCASE_WORD: - owner->view()->update(-2); -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->text->ChangeWordCase(LyXText::text_uppercase); - owner->view()->update(1); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->ChangeWordCase(owner->view(), + LyXText::text_uppercase); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); break; case LFUN_LOWCASE_WORD: - owner->view()->update(-2); -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->text->ChangeWordCase(LyXText::text_lowercase); - owner->view()->update(1); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->ChangeWordCase(owner->view(), + LyXText::text_lowercase); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); break; case LFUN_CAPITALIZE_WORD: - owner->view()->update(-2); -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->text->ChangeWordCase(LyXText::text_capitalization); - owner->view()->update(1); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->ChangeWordCase(owner->view(), + LyXText::text_capitalization); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); break; case LFUN_INSERT_LABEL: MenuInsertLabel(argument.c_str()); break; - case LFUN_INSERT_REF: - MenuInsertRef(); - break; + case LFUN_REF_CREATE: + { + InsetCommandParams p( "ref" ); + owner->getDialogs()->createRef( p.getAsString() ); + } + break; - case LFUN_REFTOGGLE: + case LFUN_REF_INSERT: { - InsetRef * inset = - static_cast(getInsetByCode(Inset::REF_CODE)); - if (inset) { - inset->Toggle(); - owner->view()->updateInset(inset, true); - } else { - setErrorMessage(N_("No cross-reference to toggle")); - } + InsetCommandParams p; + p.setFromString( argument ); + + InsetRef * inset = new InsetRef( p ); + if (!owner->view()->insertInset(inset)) + delete inset; + else + owner->view()->updateInset( inset, true ); } break; - - case LFUN_REFBACK: + + case LFUN_REF_BACK: { owner->view()->restorePosition(); } break; - case LFUN_REFGOTO: + case LFUN_REF_GOTO: { string label(argument); if (label.empty()) { @@ -1365,7 +1631,11 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_MENU_OPEN_BY_NAME: +#ifdef NEW_MENUBAR + owner->getMenubar()->openByName(argument); +#else owner->getMenus()->openByName(argument); +#endif break; // RVDK_PATCH_5 case LFUN_SPELLCHECK: @@ -1380,9 +1650,9 @@ string LyXFunc::Dispatch(int ac, bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params); if(!tmptext->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (is_rtl) - tmptext->CursorLeft(false); + tmptext->CursorLeft(owner->view(), false); if (tmptext->cursor.pos() < tmptext->cursor.par()->Last() && tmptext->cursor.par()->GetChar(tmptext->cursor.pos()) == LyXParagraph::META_INSET @@ -1394,10 +1664,10 @@ string LyXFunc::Dispatch(int ac, break; } if (!is_rtl) - tmptext->CursorRight(false); + tmptext->CursorRight(owner->view(), false); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); } break; @@ -1408,9 +1678,9 @@ string LyXFunc::Dispatch(int ac, LyXText * txt = owner->view()->text; bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params); if(!txt->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (!is_rtl) - txt->CursorLeft(false); + txt->CursorLeft(owner->view(), false); if (txt->cursor.pos() < txt->cursor.par()->Last() && txt->cursor.par()->GetChar(txt->cursor.pos()) == LyXParagraph::META_INSET @@ -1418,295 +1688,292 @@ string LyXFunc::Dispatch(int ac, && txt->cursor.par()->GetInset(txt->cursor.pos())->Editable() == Inset::HIGHLY_EDITABLE) { Inset * tmpinset = txt->cursor.par()->GetInset(txt->cursor.pos()); setMessage(tmpinset->EditMessage()); - LyXFont font = txt->GetFont(txt->cursor.par(), + LyXFont font = txt->GetFont(owner->view()->buffer(), + txt->cursor.par(), txt->cursor.pos()); tmpinset->Edit(owner->view(), - tmpinset->x() + tmpinset->width(owner->view()->painter(),font), - tmpinset->descent(owner->view()->painter(),font), + tmpinset->x() + + tmpinset->width(owner->view(),font), + tmpinset->descent(owner->view(),font), 0); break; } if (is_rtl) - txt->CursorRight(false); + txt->CursorRight(owner->view(), false); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); } break; case LFUN_UP: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); - owner->view()->text->CursorUp(); + owner->view()->update(BufferView::UPDATE); + owner->view()->text->CursorUp(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_DOWN: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); - owner->view()->text->CursorDown(); + owner->view()->update(BufferView::UPDATE); + owner->view()->text->CursorDown(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_UP_PARAGRAPH: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); - owner->view()->text->CursorUpParagraph(); + owner->view()->update(BufferView::UPDATE); + owner->view()->text->CursorUpParagraph(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_DOWN_PARAGRAPH: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); - owner->view()->text->CursorDownParagraph(); + owner->view()->update(BufferView::UPDATE); + owner->view()->text->CursorDownParagraph(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_PRIOR: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); + owner->view()->update(BufferView::UPDATE); owner->view()->cursorPrevious(); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_NEXT: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-3); + owner->view()->update(BufferView::UPDATE); owner->view()->cursorNext(); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_HOME: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); - owner->view()->text->CursorHome(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorHome(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_END: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); - owner->view()->text->CursorEnd(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorEnd(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_SHIFT_TAB: case LFUN_TAB: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); - owner->view()->text->CursorTab(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorTab(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_WORDRIGHT: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorLeftOneWord(); + owner->view()->text->CursorLeftOneWord(owner->view()); else - owner->view()->text->CursorRightOneWord(); + owner->view()->text->CursorRightOneWord(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_WORDLEFT: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorRightOneWord(); + owner->view()->text->CursorRightOneWord(owner->view()); else - owner->view()->text->CursorLeftOneWord(); + owner->view()->text->CursorLeftOneWord(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_BEGINNINGBUF: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); - owner->view()->text->CursorTop(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorTop(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_ENDBUF: if(!owner->view()->text->mark_set) owner->view()->beforeChange(); - owner->view()->update(-2); - owner->view()->text->CursorBottom(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorBottom(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; /* cursor selection ---------------------------- */ case LFUN_RIGHTSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorLeft(); + owner->view()->text->CursorLeft(owner->view()); else - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_LEFTSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); else - owner->view()->text->CursorLeft(); + owner->view()->text->CursorLeft(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_UPSEL: - owner->view()->update(-2); - owner->view()->text->CursorUp(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorUp(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_DOWNSEL: - owner->view()->update(-2); - owner->view()->text->CursorDown(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorDown(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_UP_PARAGRAPHSEL: - owner->view()->update(-2); - owner->view()->text->CursorUpParagraph(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorUpParagraph(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_DOWN_PARAGRAPHSEL: - owner->view()->update(-2); - owner->view()->text->CursorDownParagraph(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorDownParagraph(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_PRIORSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->cursorPrevious(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_NEXTSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->cursorNext(); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_HOMESEL: - owner->view()->update(-2); - owner->view()->text->CursorHome(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorHome(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_ENDSEL: - owner->view()->update(-2); - owner->view()->text->CursorEnd(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorEnd(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_WORDRIGHTSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorLeftOneWord(); + owner->view()->text->CursorLeftOneWord(owner->view()); else - owner->view()->text->CursorRightOneWord(); + owner->view()->text->CursorRightOneWord(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_WORDLEFTSEL: - owner->view()->update(-2); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) - owner->view()->text->CursorRightOneWord(); + owner->view()->text->CursorRightOneWord(owner->view()); else - owner->view()->text->CursorLeftOneWord(); + owner->view()->text->CursorLeftOneWord(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_BEGINNINGBUFSEL: - owner->view()->update(-2); - owner->view()->text->CursorTop(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorTop(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; case LFUN_ENDBUFSEL: - owner->view()->update(-2); - owner->view()->text->CursorBottom(); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->CursorBottom(owner->view()); owner->view()->text->FinishUndo(); moveCursorUpdate(true); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; // --- text changing commands ------------------------ case LFUN_BREAKLINE: owner->view()->beforeChange(); - owner->view()->text->InsertChar(LyXParagraph::META_NEWLINE); - owner->view()->update(1); -#if 1 - //owner->update_timeout.callback(); -#else - SetUpdateTimer(0.01); -#endif + owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(false); break; @@ -1717,8 +1984,8 @@ string LyXFunc::Dispatch(int ac, owner->view()->text->cursor.par()->GetLayout()); if (style.free_spacing) { - owner->view()->text->InsertChar(' '); - owner->view()->update(-1); + owner->view()->text->InsertChar(owner->view(), ' '); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } else { owner->view()->protectedBlank(); } @@ -1729,12 +1996,12 @@ string LyXFunc::Dispatch(int ac, case LFUN_SETMARK: if(owner->view()->text->mark_set) { owner->view()->beforeChange(); - owner->view()->update(0); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); setMessage(N_("Mark removed")); } else { owner->view()->beforeChange(); owner->view()->text->mark_set = 1; - owner->view()->update(0); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); setMessage(N_("Mark set")); } owner->view()->text->sel_cursor = @@ -1742,29 +2009,19 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_DELETE: -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif if (!owner->view()->text->selection) { - owner->view()->text->Delete(); + owner->view()->text->Delete(owner->view()); owner->view()->text->sel_cursor = owner->view()->text->cursor; - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); // It is possible to make it a lot faster still // just comment out the lone below... owner->view()->showCursor(); } else { owner->view()->cut(); } -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); owner->view()->setState(); break; @@ -1774,20 +2031,16 @@ string LyXFunc::Dispatch(int ac, LyXCursor cursor = owner->view()->text->cursor; -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif if (!owner->view()->text->selection) { if (cursor.pos() == cursor.par()->Last()) { - owner->view()->text->CursorRight(); + owner->view()->text->CursorRight(owner->view()); cursor = owner->view()->text->cursor; if (cursor.pos() == 0 && !(cursor.par()->added_space_top == VSpace (VSpace::NONE))) { owner->view()->text->SetParagraph - (cursor.par()->line_top, + (owner->view(), + cursor.par()->line_top, cursor.par()->line_bottom, cursor.par()->pagebreak_top, cursor.par()->pagebreak_bottom, @@ -1795,92 +2048,57 @@ string LyXFunc::Dispatch(int ac, cursor.par()->added_space_bottom, cursor.par()->align, cursor.par()->labelwidthstring, 0); - owner->view()->text->CursorLeft(); - owner->view()->update (1); + owner->view()->text->CursorLeft(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } else { - owner->view()->text->CursorLeft(); - owner->view()->text->Delete(); + owner->view()->text->CursorLeft(owner->view()); + owner->view()->text->Delete(owner->view()); owner->view()->text->sel_cursor = owner->view()->text->cursor; - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } else { - owner->view()->text->Delete(); + owner->view()->text->Delete(owner->view()); owner->view()->text->sel_cursor = owner->view()->text->cursor; - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } else { owner->view()->cut(); } -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif } break; /* -------> Delete word forward. */ case LFUN_DELETE_WORD_FORWARD: - owner->view()->update(-2); -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->text->DeleteWordForward(); - owner->view()->update( 1 ); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->DeleteWordForward(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; /* -------> Delete word backward. */ case LFUN_DELETE_WORD_BACKWARD: - owner->view()->update(-2); -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->text->DeleteWordBackward(); - owner->view()->update( 1 ); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->DeleteWordBackward(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(false); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; /* -------> Kill to end of line. */ case LFUN_DELETE_LINE_FORWARD: -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif - owner->view()->update(-2); - owner->view()->text->DeleteLineForward(); - owner->view()->update( 1 ); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); + owner->view()->text->DeleteLineForward(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(false); break; /* -------> Set mark off. */ case LFUN_MARK_OFF: owner->view()->beforeChange(); - owner->view()->update(0); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->text->sel_cursor = owner->view()->text->cursor; setMessage(N_("Mark off")); @@ -1890,7 +2108,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_MARK_ON: owner->view()->beforeChange(); owner->view()->text->mark_set = 1; - owner->view()->update( 0 ); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR); owner->view()->text->sel_cursor = owner->view()->text->cursor; setMessage(N_("Mark on")); @@ -1898,17 +2116,12 @@ string LyXFunc::Dispatch(int ac, case LFUN_BACKSPACE: { -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif if (!owner->view()->text->selection) { if (owner->getIntl()->getTrans()->backspace()) { - owner->view()->text->Backspace(); + owner->view()->text->Backspace(owner->view()); owner->view()->text->sel_cursor = owner->view()->text->cursor; - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); // It is possible to make it a lot faster still // just comment out the lone below... owner->view()->showCursor(); @@ -1916,12 +2129,7 @@ string LyXFunc::Dispatch(int ac, } else { owner->view()->cut(); } -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); owner->view()->setState(); } break; @@ -1932,71 +2140,52 @@ string LyXFunc::Dispatch(int ac, LyXCursor cursor = owner->view()->text->cursor; -#if 1 - //owner->update_timeout.stop(); -#else - FreeUpdateTimer(); -#endif if (!owner->view()->text->selection) { if (cursor.pos() == 0 && !(cursor.par()->added_space_top == VSpace (VSpace::NONE))) { owner->view()->text->SetParagraph - (cursor.par()->line_top, + (owner->view(), + cursor.par()->line_top, cursor.par()->line_bottom, cursor.par()->pagebreak_top, cursor.par()->pagebreak_bottom, VSpace(VSpace::NONE), cursor.par()->added_space_bottom, cursor.par()->align, cursor.par()->labelwidthstring, 0); - owner->view()->update (1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } else { - owner->view()->text->Backspace(); + owner->view()->text->Backspace(owner->view()); owner->view()->text->sel_cursor = cursor; - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } else owner->view()->cut(); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif } break; case LFUN_BREAKPARAGRAPH: { owner->view()->beforeChange(); - owner->view()->text->BreakParagraph(0); - owner->view()->update(1); -#if 1 - //owner->update_timeout.callback(); -#else - SetUpdateTimer(0.01); -#endif + owner->view()->text->BreakParagraph(owner->view(), 0); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->text->sel_cursor = owner->view()->text->cursor; owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; } case LFUN_BREAKPARAGRAPHKEEPLAYOUT: { owner->view()->beforeChange(); - owner->view()->text->BreakParagraph(1); - owner->view()->update(1); -#if 1 - //owner->update_timeout.callback(); -#else - SetUpdateTimer(0.01); -#endif + owner->view()->text->BreakParagraph(owner->view(), 1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->text->sel_cursor = owner->view()->text->cursor; owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); break; } @@ -2012,29 +2201,26 @@ string LyXFunc::Dispatch(int ac, if (cursor.pos() == 0) { if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) { owner->view()->text->SetParagraph - (cursor.par()->line_top, + (owner->view(), + cursor.par()->line_top, cursor.par()->line_bottom, cursor.par()->pagebreak_top, cursor.par()->pagebreak_bottom, VSpace(VSpace::DEFSKIP), cursor.par()->added_space_bottom, cursor.par()->align, cursor.par()->labelwidthstring, 1); - //owner->view()->update(1); + //owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } else { - owner->view()->text->BreakParagraph(0); - //owner->view()->update(1); + owner->view()->text->BreakParagraph(owner->view(), 0); + //owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } -#if 1 - owner->view()->update(1); - //owner->update_timeout.callback(); -#else - SetUpdateTimer(0.01); -#endif + + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->text->sel_cursor = cursor; owner->view()->setState(); - owner->getMiniBuffer()->Set(CurrentState(owner->view())); + owner->showState(); } break; @@ -2080,32 +2266,47 @@ string LyXFunc::Dispatch(int ac, } if (cur_spacing != new_spacing || cur_value != new_value) { par->spacing.set(new_spacing, new_value); - owner->view()->text->RedoParagraph(); - owner->view()->update(-1); + owner->view()->text->RedoParagraph(owner->view()); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } break; case LFUN_QUOTE: owner->view()->beforeChange(); - owner->view()->text->InsertChar('\"'); // This " matches the single quote in the code - owner->view()->update(1); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->text->InsertChar(owner->view(), '\"'); // This " matches the single quote in the code + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); moveCursorUpdate(false); break; case LFUN_HTMLURL: case LFUN_URL: { - InsetCommand * new_inset; + InsetCommandParams p; if (action == LFUN_HTMLURL) - new_inset = new InsetUrl("htmlurl", "", ""); + p.setCmdName("htmlurl"); else - new_inset = new InsetUrl("url", "", ""); + p.setCmdName("url"); + owner->getDialogs()->createUrl( p.getAsString() ); + } + break; + + case LFUN_INSERT_URL: + { + InsetCommandParams p; + p.setFromString( argument ); + + InsetUrl * inset = new InsetUrl( p ); + if (!owner->view()->insertInset(inset)) + delete inset; + else + owner->view()->updateInset( inset, true ); + } + break; + + case LFUN_INSET_TEXT: + { + InsetText * new_inset = new InsetText; if (owner->view()->insertInset(new_inset)) new_inset->Edit(owner->view(), 0, 0, 0); else @@ -2113,18 +2314,19 @@ string LyXFunc::Dispatch(int ac, } break; - case LFUN_INSET_TEXT: + case LFUN_INSET_ERT: { - InsetText * new_inset = new InsetText(owner->buffer()); + InsetERT * new_inset = new InsetERT; if (owner->view()->insertInset(new_inset)) new_inset->Edit(owner->view(), 0, 0, 0); else delete new_inset; } break; - case LFUN_INSET_ERT: + + case LFUN_INSET_EXTERNAL: { - InsetERT * new_inset = new InsetERT(owner->buffer()); + InsetExternal * new_inset = new InsetExternal; if (owner->view()->insertInset(new_inset)) new_inset->Edit(owner->view(), 0, 0, 0); else @@ -2134,7 +2336,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_INSET_FOOTNOTE: { - InsetFoot * new_inset = new InsetFoot(owner->buffer()); + InsetFoot * new_inset = new InsetFoot; if (owner->view()->insertInset(new_inset)) new_inset->Edit(owner->view(), 0, 0, 0); else @@ -2142,12 +2344,89 @@ string LyXFunc::Dispatch(int ac, } break; + case LFUN_INSET_MARGINAL: + { + InsetMarginal * new_inset = new InsetMarginal; + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } + break; + + case LFUN_INSET_MINIPAGE: + { + InsetMinipage * new_inset = new InsetMinipage; + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } + break; + + case LFUN_INSET_FLOAT: + { + // check if the float type exist + if (floatList.typeExist(argument)) { + InsetFloat * new_inset = new InsetFloat(argument); + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } else { + lyxerr << "Non-existant float type: " + << argument << endl; + } + + } + break; + + case LFUN_INSET_LIST: + { + InsetList * new_inset = new InsetList; + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } + break; + + case LFUN_INSET_THEOREM: + { + InsetTheorem * new_inset = new InsetTheorem; + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } + break; + + case LFUN_INSET_CAPTION: + { + // Do we have a locking inset... + if (owner->view()->the_locking_inset) { + lyxerr << "Locking inset code: " + << static_cast(owner->view()->the_locking_inset->LyxCode()); + InsetCaption * new_inset = new InsetCaption; + new_inset->setOwner(owner->view()->the_locking_inset); + new_inset->SetAutoBreakRows(true); + new_inset->SetDrawFrame(0, InsetText::LOCKED); + new_inset->SetFrameColor(0, LColor::footnoteframe); + if (owner->view()->insertInset(new_inset)) + new_inset->Edit(owner->view(), 0, 0, 0); + else + delete new_inset; + } + } + break; + case LFUN_INSET_TABULAR: { int r = 2, c = 2; if (!argument.empty()) - sscanf(argument.c_str(),"%d%d",&r,&c); - InsetTabular * new_inset = new InsetTabular(owner->buffer(),r,c); + sscanf(argument.c_str(),"%d%d", &r, &c); + InsetTabular * new_inset = + new InsetTabular(owner->buffer(), r, c); if (owner->view()->insertInset(new_inset)) new_inset->Edit(owner->view(), 0, 0, 0); else @@ -2183,7 +2462,7 @@ string LyXFunc::Dispatch(int ac, int x; long y; sscanf(argument.c_str(), " %d %ld", &x, &y); - owner->view()->text->SetCursorFromCoordinates(x, y); + owner->view()->text->SetCursorFromCoordinates(owner->view(), x, y); } break; @@ -2297,13 +2576,8 @@ string LyXFunc::Dispatch(int ac, keyseq.length = 0; // copied verbatim from do_accent_char - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif owner->view()->text->sel_cursor = owner->view()->text->cursor; } @@ -2313,15 +2587,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_PUSH_TOOLBAR: { int nth = strToInt(argument); - if (lyxerr.debugging(Debug::TOOLBAR)) { - lyxerr << "LFUN_PUSH_TOOLBAR: argument = `" - << argument << "'\n" - << "LFUN_PUSH_TOOLBAR: nth = `" - << nth << "'" << endl; - } - if (nth <= 0) { - LyXBell(); setErrorMessage(N_("Push-toolbar needs argument > 0")); } else { owner->getToolbar()->push(nth); @@ -2331,7 +2597,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_ADD_TO_TOOLBAR: { - if (lyxerr.debugging(Debug::TOOLBAR)) { + if (lyxerr.debugging(Debug::GUI)) { lyxerr << "LFUN_ADD_TO_TOOLBAR:" "argument = `" << argument << '\'' << endl; } @@ -2339,7 +2605,6 @@ string LyXFunc::Dispatch(int ac, //lyxerr <")); } else { owner->getToolbar()->add(argument, false); @@ -2420,8 +2685,7 @@ string LyXFunc::Dispatch(int ac, break; case LFUN_MATH_MODE: // Open or create a math inset - { - + { if (owner->view()->available()) owner->view()->open_new_inset(new InsetFormula); setMessage(N_("Math editor mode")); @@ -2432,30 +2696,42 @@ string LyXFunc::Dispatch(int ac, case LFUN_MATH_LIMITS: { setErrorMessage(N_("This is only allowed in math mode!")); + + } + break; + + case LFUN_MATH_PANEL: + { + show_symbols_form(this); } break; - case LFUN_INSERT_CITATION: - { - InsetCitation * new_inset = new InsetCitation(); - // ale970405 - // The note, if any, must be after the key, delimited - // by a | so both key and remark can have spaces. - if (!argument.empty()) { - string lsarg(argument); - if (contains(lsarg, "|")) { - new_inset->setContents(token(lsarg, '|', 0)); - new_inset->setOptions(token(lsarg, '|', 1)); - } else - new_inset->setContents(lsarg); - if (!owner->view()->insertInset(new_inset)) - delete new_inset; + case LFUN_CITATION_CREATE: + { + // Should do this "at source" + InsetCommandParams p( "cite" ); + + if (contains(argument, "|")) { + p.setContents( token(argument, '|', 0) ); + p.setOptions( token(argument, '|', 1) ); } else { - if (owner->view()->insertInset(new_inset)) - new_inset->Edit(owner->view(), 0, 0, 0); - else - delete new_inset; + p.setContents( argument ); } + + owner->getDialogs()->createCitation( p.getAsString() ); + } + break; + + case LFUN_CITATION_INSERT: + { + InsetCommandParams p; + p.setFromString( argument ); + + InsetCitation * inset = new InsetCitation( p ); + if (!owner->view()->insertInset(inset)) + delete inset; + else + owner->view()->updateInset( inset, true ); } break; @@ -2464,20 +2740,19 @@ string LyXFunc::Dispatch(int ac, // ale970405+lasgoutt970425 // The argument can be up to two tokens separated // by a space. The first one is the bibstyle. - string lsarg(argument); - string bibstyle = token(lsarg, ' ', 1); + string db = token(argument, ' ', 0); + string bibstyle = token(argument, ' ', 1); if (bibstyle.empty()) bibstyle = "plain"; - InsetBibtex * new_inset - = new InsetBibtex(token(lsarg, ' ', 0), - bibstyle, - owner->buffer()); + + InsetCommandParams p( "BibTeX", db, bibstyle ); + InsetBibtex * inset = new InsetBibtex(p, owner->buffer()); - if (owner->view()->insertInset(new_inset)) { - if (lsarg.empty()) - new_inset->Edit(owner->view(), 0, 0, 0); + if (owner->view()->insertInset(inset)) { + if (argument.empty()) + inset->Edit(owner->view(), 0, 0, 0); } else - delete new_inset; + delete inset; } break; @@ -2512,81 +2787,90 @@ string LyXFunc::Dispatch(int ac, } break; - case LFUN_INDEX_INSERT: - case LFUN_INDEX_INSERT_LAST: + case LFUN_INDEX_CREATE: { - // Can't do that at the beginning of a paragraph. - if (owner->view()->text->cursor.pos() - 1 < 0) - break; + InsetCommandParams p( "index" ); + + if( argument.empty() ) { + // Get the word immediately preceding the cursor + LyXParagraph::size_type curpos = + owner->view()->text->cursor.pos() - 1; - InsetIndex * new_inset = new InsetIndex(); - if (!argument.empty()) { - string lsarg(argument); - new_inset->setContents(lsarg); - if (!owner->view()->insertInset(new_inset)) - delete new_inset; + string curstring; + if( curpos >= 0 ) + curstring = owner->view()->text + ->cursor.par()->GetWord(curpos); + + p.setContents( curstring ); } else { - //reh 98/09/21 - //get the current word for an argument - LyXParagraph::size_type lastpos = - owner->view()->text->cursor.pos() - 1; - // Get the current word. note that this must be done - // before inserting the inset, or the inset will - // break the word - string curstring(owner->view() - ->text->cursor.par()->GetWord(lastpos)); + p.setContents( argument ); + } - //make the new inset and write the current word into it - InsetIndex * new_inset = new InsetIndex(); + owner->getDialogs()->createIndex( p.getAsString() ); + } + break; + + case LFUN_INDEX_INSERT: + { + InsetCommandParams p; + p.setFromString( argument ); + InsetIndex * inset = new InsetIndex( p ); - new_inset->setContents(curstring); + if (!owner->view()->insertInset(inset)) + delete inset; + else + owner->view()->updateInset( inset, true ); + } + break; + + case LFUN_INDEX_INSERT_LAST: + { + // Get word immediately preceding the cursor + LyXParagraph::size_type curpos = + owner->view()->text->cursor.pos() - 1; + // Can't do that at the beginning of a paragraph + if( curpos < 0 ) break; - //don't edit it if the call was to INSERT_LAST - if(action != LFUN_INDEX_INSERT_LAST) { - new_inset->Edit(owner->view(), 0, 0, 0); - } else { - //it looks blank on the screen unless - //we do something. put it here. + string curstring( owner->view()->text + ->cursor.par()->GetWord(curpos) ); - // move the cursor to the returned value of lastpos - // but only for the auto-insert - owner->view()->text->cursor.pos(lastpos); - } + InsetCommandParams p( "index", curstring ); + InsetIndex * inset = new InsetIndex( p ); - //put the new inset into the buffer. - // there should be some way of knowing the user - //cancelled & avoiding this, but i don't know how - if (!owner->view()->insertInset(new_inset)) - delete new_inset; - } + if (!owner->view()->insertInset(inset)) + delete inset; + else + owner->view()->updateInset( inset, true ); } break; - + case LFUN_INDEX_PRINT: { - Inset * new_inset = new InsetPrintIndex(owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; + InsetCommandParams p( "printindex" ); + Inset * inset = new InsetPrintIndex(p); + if (!owner->view()->insertInset(inset, "Standard", true)) + delete inset; } break; case LFUN_PARENTINSERT: { lyxerr << "arg " << argument << endl; - Inset * new_inset = new InsetParent(argument, owner->buffer()); - if (!owner->view()->insertInset(new_inset, "Standard", true)) - delete new_inset; + InsetCommandParams p( "lyxparent", argument ); + Inset * inset = new InsetParent(p, owner->buffer()); + if (!owner->view()->insertInset(inset, "Standard", true)) + delete inset; } break; case LFUN_CHILDINSERT: { - Inset * new_inset = new InsetInclude(argument, - owner->buffer()); - if (owner->view()->insertInset(new_inset, "Standard", true)) - new_inset->Edit(owner->view(), 0, 0, 0); + InsetCommandParams p( "Include", argument ); + Inset * inset = new InsetInclude(p, owner->buffer()); + if (owner->view()->insertInset(inset, "Standard", true)) + inset->Edit(owner->view(), 0, 0, 0); else - delete new_inset; + delete inset; } break; @@ -2608,7 +2892,7 @@ string LyXFunc::Dispatch(int ac, case LFUN_INSERT_NOTE: owner->view()->insertNote(); break; - +#ifndef NEW_INSETS case LFUN_INSERTFOOTNOTE: { LyXParagraph::footnote_kind kind; @@ -2630,12 +2914,12 @@ string LyXFunc::Dispatch(int ac, setErrorMessage(N_("Unknown kind of footnote")); break; } - owner->view()->text->InsertFootnoteEnvironment(kind); - owner->view()->update(1); + owner->view()->text->InsertFootnoteEnvironment(owner->view(), kind); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->setState(); } break; - +#endif case LFUN_BUFFERBULLETSSELECT: bulletForm(); break; @@ -2663,16 +2947,11 @@ string LyXFunc::Dispatch(int ac, case LFUN_SELFINSERT: { for (string::size_type i = 0; i < argument.length(); ++i) { - owner->view()->text->InsertChar(argument[i]); + owner->view()->text->InsertChar(owner->view(), argument[i]); // This needs to be in the loop, or else we // won't break lines correctly. (Asger) - owner->view()->update(1); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif owner->view()->text->sel_cursor = owner->view()->text->cursor; moveCursorUpdate(false); @@ -2705,26 +2984,66 @@ string LyXFunc::Dispatch(int ac, char datetmp[32]; int datetmp_len = strftime(datetmp, 32, arg.c_str(), now_tm); for (int i = 0; i < datetmp_len; i++) { - owner->view()->text->InsertChar(datetmp[i]); - owner->view()->update(1); + owner->view()->text->InsertChar(owner->view(), datetmp[i]); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->text->sel_cursor = owner->view()->text->cursor; moveCursorUpdate(false); } break; + case LFUN_DIALOG_PREFERENCES: + owner->getDialogs()->showPreferences(); + break; + case LFUN_SAVEPREFERENCES: { Path p(user_lyxdir); lyxrc.write("preferences"); } break; - + + case LFUN_SCREEN_FONT_UPDATE: + { + // handle the screen font changes. + // + lyxrc.set_font_norm_type(); + fontloader.update(); + // Of course we should only do the resize and the textcache.clear + // if values really changed...but not very important right now. (Lgb) + // All buffers will need resize + bufferlist.resize(); + // We also need to empty the textcache so that + // the buffer will be formatted correctly after + // a zoom change. + textcache.clear(); + } + + case LFUN_SET_COLOR: + { + string lyx_name, x11_name; + x11_name = split(argument, lyx_name, ' '); + if (lyx_name.empty() || x11_name.empty()) { + LyXBell(); + setErrorMessage(N_("Syntax: set-color " + " ")); + break; + } + + if (!lcolor.setColor(lyx_name, x11_name)) { + static string err1 (N_("Set-color \"")); + static string err2 (N_("\" failed - color is undefined " + "or may not be redefined")); + LyXBell(); + setErrorMessage(err1 + lyx_name + err2); + break; + } + lyxColorHandler->updateColor(lcolor.getFromLyXName(lyx_name)); + owner->view()->redraw(); + break; + } + case LFUN_UNKNOWN_ACTION: { if(!owner->buffer()) { @@ -2749,8 +3068,8 @@ string LyXFunc::Dispatch(int ac, if ( lyxrc.auto_region_delete ) { if (owner->view()->text->selection){ - owner->view()->text->CutSelection(false); - owner->view()->update(-1); + owner->view()->text->CutSelection(owner->view(), false); + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); } } @@ -2765,12 +3084,7 @@ string LyXFunc::Dispatch(int ac, owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text); } - owner->view()->update(1); -#if 1 - //owner->update_timeout.start(); -#else - SetUpdateTimer(); -#endif + owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); owner->view()->text->sel_cursor = owner->view()->text->cursor; @@ -2830,31 +3144,35 @@ void LyXFunc::MenuNew(bool fromTemplate) initpath = trypath; } - ProhibitInput(owner->view()); - fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); - fileDlg.SetButton(1, _("Templates"), lyxrc.template_path); - fname = fileDlg.Select(_("Enter Filename for new document"), - initpath, "*.lyx", _("newfile")); - AllowInput(owner->view()); - - if (fname.empty()) { - owner->getMiniBuffer()->Set(_("Canceled.")); - lyxerr.debug() << "New Document Cancelled." << endl; - return; - } - - // get absolute path of file and make sure the filename ends - // with .lyx - string s = MakeAbsPath(fname); - if (!IsLyXFilename(s)) - s += ".lyx"; + static int newfile_number = 0; + string s; - // Check if the document already is open - if (bufferlist.exists(s)){ - switch(AskConfirmation(_("Document is already open:"), - MakeDisplayPath(s, 50), - _("Do you want to close that document now?\n" - "('No' will just switch to the open version)"))) + if (lyxrc.new_ask_filename) { + ProhibitInput(owner->view()); + fileDlg.SetButton(0, _("Documents"), lyxrc.document_path); + fileDlg.SetButton(1, _("Templates"), lyxrc.template_path); + fname = fileDlg.Select(_("Enter Filename for new document"), + initpath, "*.lyx", _("newfile")); + AllowInput(owner->view()); + + if (fname.empty()) { + owner->getMiniBuffer()->Set(_("Canceled.")); + lyxerr.debug() << "New Document Cancelled." << endl; + return; + } + + // get absolute path of file and make sure the filename ends + // with .lyx + s = MakeAbsPath(fname); + if (!IsLyXFilename(s)) + s += ".lyx"; + + // Check if the document already is open + if (bufferlist.exists(s)) { + switch(AskConfirmation(_("Document is already open:"), + MakeDisplayPath(s, 50), + _("Do you want to close that document now?\n" + "('No' will just switch to the open version)"))) { case 1: // Yes: close the document if (!bufferlist.close(bufferlist.getBuffer(s))) @@ -2868,25 +3186,34 @@ void LyXFunc::MenuNew(bool fromTemplate) owner->getMiniBuffer()->Set(_("Canceled.")); return; } - } - - // Check whether the file already exists - if (IsLyXFilename(s)) { + } + // Check whether the file already exists + if (IsLyXFilename(s)) { + FileInfo fi(s); + if (fi.readable() && + AskQuestion(_("File already exists:"), + MakeDisplayPath(s, 50), + _("Do you want to open the document?"))) { + // loads document + owner->getMiniBuffer()->Set(_("Opening document"), + MakeDisplayPath(s), "..."); + XFlush(fl_display); + owner->view()->buffer( + bufferlist.loadLyXFile(s)); + owner->getMiniBuffer()->Set(_("Document"), + MakeDisplayPath(s), + _("opened.")); + return; + } + } + } else { + s = lyxrc.document_path + "newfile" + tostr(++newfile_number); FileInfo fi(s); - if (fi.readable() && - AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to open the document?"))) { - // loads document - owner->getMiniBuffer()->Set(_("Opening document"), - MakeDisplayPath(s), "..."); - XFlush(fl_display); - owner->view()->buffer( - bufferlist.loadLyXFile(s)); - owner->getMiniBuffer()->Set(_("Document"), - MakeDisplayPath(s), - _("opened.")); - return; + while (bufferlist.exists(s) || fi.readable()) { + ++newfile_number; + s = lyxrc.document_path + "newfile" + + tostr(newfile_number); + fi.newFile(s); } } @@ -3205,7 +3532,7 @@ void LyXFunc::CloseBuffer() // need this otherwise SEGV may occur while trying to // set variables that don't exist // since there's no current buffer - CloseAllBufferRelatedPopups(); + owner->getDialogs()->hideBufferDependent(); } else { owner->view()->buffer(bufferlist.first());