/* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
- * ======================================================*/
+ * ====================================================== */
#include <config.h>
+#include <time.h>
+#include <locale.h>
#include <cstdlib>
#include <cctype>
#pragma implementation
#endif
-#include "definitions.h"
#include "lyxlookup.h"
#include "kbmap.h"
#include "lyxfunc.h"
#include "intl.h"
#include "lyx_main.h"
#include "lyx_cb.h"
-#include "insets/insetlatex.h"
+#include "LyXAction.h"
#include "insets/inseturl.h"
#include "insets/insetlatexaccent.h"
#include "insets/insettoc.h"
#include "insets/insetlot.h"
#include "insets/insetref.h"
#include "insets/insetparent.h"
+#include "insets/insetindex.h"
+#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
+#include "insets/insetert.h"
+#include "insets/insetgraphics.h"
+#include "insets/insetfoot.h"
#include "mathed/formulamacro.h"
#include "toolbar.h"
#include "spellchecker.h" // RVDK_PATCH_5
#include "minibuffer.h"
#include "vspace.h"
-#include "insets/insetbib.h"
#include "LyXView.h"
-#include "insets/insetindex.h"
-#include "insets/insetinclude.h"
#include "filedlg.h"
#include "lyx_gui_misc.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
-#include "lyxscreen.h"
+#include "support/syscall.h"
+#include "support/lstrings.h"
+#include "support/path.h"
#include "debug.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "trans_mgr.h"
#include "ImportLaTeX.h"
#include "ImportNoweb.h"
-#include "support/syscall.h"
-#include "support/lstrings.h"
+#include "layout.h"
+#include "WorkArea.h"
+#include "lyxfr1.h"
extern bool cursor_follows_scrollbar;
-extern void InsertAsciiFile(string const &, bool);
-extern void math_insert_symbol(char const*);
+extern void InsertAsciiFile(BufferView *, string const &, bool);
+extern void math_insert_symbol(char const *);
extern Bool math_insert_greek(char const); // why "Bool"?
extern BufferList bufferlist;
-extern LyXServer *lyxserver;
+extern LyXServer * lyxserver;
extern short greek_kb_flag;
-extern FD_form_toc *fd_form_toc;
+extern FD_form_toc * fd_form_toc;
extern bool selection_possible;
-extern kb_keymap *toplevel_keymap;
+extern kb_keymap * toplevel_keymap;
-extern void BeforeChange();
-extern void MenuWrite(Buffer*);
-extern void MenuWriteAs(Buffer*);
-extern int MenuRunLaTeX(Buffer*);
-extern int MenuBuildProg(Buffer*);
-extern int MenuRunChktex(Buffer*);
-extern bool MenuRunDvips(Buffer *,bool);
-extern void MenuPrint(Buffer*);
+extern void MenuWrite(Buffer *);
+extern void MenuWriteAs(Buffer *);
+extern int MenuRunLaTeX(Buffer *);
+extern int MenuBuildProg(Buffer *);
+extern int MenuRunChktex(Buffer *);
+extern bool CreatePostscript(Buffer *, bool);
+extern void MenuPrint(Buffer *);
extern void MenuSendto();
extern void QuitLyX();
extern void MenuFax(Buffer *);
-extern void MenuMakeLaTeX(Buffer *);
-extern void MenuMakeLinuxDoc(Buffer *);
-extern void MenuMakeDocBook(Buffer *);
-extern void MenuMakeAscii(Buffer *);
+extern void MenuExport(Buffer *, string const &);
extern void MenuPasteSelection(char at);
extern LyXAction lyxaction;
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
extern void AutoSave();
-extern void MenuSearch();
-extern void CopyCB();
-extern void CopyEnvironmentCB();
-extern void PasteEnvironmentCB();
-extern void GotoNote();
-extern void NoteCB();
-extern void OpenStuff();
-extern void HyphenationPoint();
-extern void Ldots();
-extern void EndOfSentenceDot();
-extern void MenuSeparator();
-extern void HFill();
-extern void MenuUndo();
-extern void MenuRedo();
-extern void SmallUpdate(signed char);
-extern void SetUpdateTimer(float timer= 0.3);
+extern void SetUpdateTimer(float timer = 0.3);
extern void FreeUpdateTimer();
-extern bool MenuPreview(Buffer*);
-extern bool MenuPreviewPS(Buffer*);
-extern void MenuInsertLabel(const char *);
+extern bool PreviewDVI(Buffer *);
+extern bool PreviewPostscript(Buffer *);
+extern void MenuInsertLabel(char const *);
extern void MenuInsertRef();
extern void MenuLayoutCharacter();
extern void MenuLayoutParagraph();
extern Buffer * NewLyxFile(string const &);
extern void LoadLyXFile(string const &);
-extern void Reconfigure();
+extern void Reconfigure(BufferView *);
-extern int current_layout;
+extern LyXTextClass::size_type current_layout;
extern int getISOCodeFromLaTeX(char *);
-extern int UnlockInset(UpdatableInset*);
-
extern void ShowLatexLog();
-extern void UpdateInset(Inset* inset, bool mark_dirty = true);
-
/* === globals =========================================================== */
bool LyXFunc::show_sc = true;
-LyXFunc::LyXFunc(LyXView *o)
- :owner(o)
+LyXFunc::LyXFunc(LyXView * o)
+ : owner(o)
{
meta_fake_bit = 0;
lyx_dead_action = LFUN_NOACTION;
}
-LyXFunc::~LyXFunc()
-{
-}
-
-
// I changed this func slightly. I commented out the ...FinishUndo(),
// this means that all places that used to have a moveCursorUpdate, now
// have a ...FinishUndo() as the preceeding statement. I have also added
inline
void LyXFunc::moveCursorUpdate(bool selecting)
{
- if (selecting || owner->currentBuffer()->text->mark_set) {
- owner->currentBuffer()->text->SetSelection();
- owner->currentView()->getScreen()->ToggleToggle();
- owner->currentBuffer()->update(0);
+ if (selecting || owner->view()->text->mark_set) {
+ owner->view()->text->SetSelection();
+ owner->view()->toggleToggle();
+ owner->view()->update(0);
} else {
- owner->currentBuffer()->update(-2); // this IS necessary
+ owner->view()->update(-2); // this IS necessary
// (Matthias)
}
- owner->currentView()->getScreen()->ShowCursor();
+
+ 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->view()->setState();
}
-int LyXFunc::processKeyEvent(XEvent *ev)
+int LyXFunc::processKeyEvent(XEvent * ev)
{
char s_r[10];
- s_r[9] = '\0';
- int num_bytes;
- int action;
string argument;
- XKeyEvent *keyevent = &ev->xkey;
+ XKeyEvent * keyevent = &ev->xkey;
KeySym keysym_return;
- num_bytes = LyXLookupString(ev, s_r, 10, &keysym_return);
+ int num_bytes = LyXLookupString(ev, s_r, 10, &keysym_return);
+ s_r[num_bytes] = '\0';
if (lyxerr.debugging(Debug::KEY)) {
+ char * tmp = XKeysymToString(keysym_return);
+ string stm = (tmp ? tmp : "");
lyxerr << "KeySym is "
- << XKeysymToString(keysym_return)
+ << stm
<< "["
<< keysym_return << "]"
<< " and num_bytes is "
}
// this function should be used always [asierra060396]
- if (owner->currentView()->available() &&
- owner->currentBuffer()->the_locking_inset &&
+ if (owner->view()->available() &&
+ owner->view()->the_locking_inset &&
keysym_return == XK_Escape) {
- UnlockInset(owner->currentBuffer()->the_locking_inset);
- owner->currentBuffer()->text->CursorRight();
+ owner->view()->unlockInset(owner->view()->the_locking_inset);
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->Set(CurrentState());
return 0;
}
// cancel and meta-fake keys. RVDK_PATCH_5
cancel_meta_seq.reset();
- action = cancel_meta_seq.addkey(keysym_return, keyevent->state
- &(ShiftMask|ControlMask
- |Mod1Mask));
+ int action = cancel_meta_seq.addkey(keysym_return, keyevent->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.
if (action == 0) action = LFUN_PREFIX;
if (lyxerr.debugging(Debug::KEY)) {
- char buf[100];
- keyseq.print(buf,100);
+ string buf;
+ keyseq.print(buf);
lyxerr << "Key ["
<< action << "]["
<< buf << "]["
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if(keyseq.length>1 || keyseq.length<-1){
- char buf[100];
- keyseq.print(buf,100);
+ 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...
- char buf[100];
+ if (action == -1) {
+ if (keyseq.length < -1) { // unknown key sequence...
+ string buf;
LyXBell();
- keyseq.print(buf,100);
- owner->getMiniBuffer()->Set(_("Unknown sequence:"),buf);
+ keyseq.print(buf);
+ owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf);
return 0;
}
return 0;
}
} else
- if (action==LFUN_SELFINSERT) {
+ if (action == LFUN_SELFINSERT) {
argument = s_r[0];
}
Dispatch(action, argument.c_str());
show_sc = tmp_sc;
- // Need this for deadkeys (alkis)
- //keyseq.length=0;
- // ...but that breaks the minibuffer's display of "M-"...
-#ifdef WITH_WARNINGS
-#warning How does the deadkeys react to this?
-#endif
return 0;
}
-string LyXFunc::Dispatch(string const &cmd, string const &arg)
+LyXFunc::func_status LyXFunc::getStatus(int ac) const
+{
+ kb_action action;
+ func_status flag = LyXFunc::OK;
+ string argument;
+ Buffer * buf = owner->buffer();
+
+ if (lyxaction.isPseudoAction(ac))
+ action = lyxaction.retrieveActionArg(ac, argument);
+ else
+ action = static_cast<kb_action>(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)) {
+ // Yes we need a buffer, do we have one?
+ if (buf) {
+ // yes
+ // Can we use a readonly buffer?
+ if (buf->isReadonly() &&
+ !lyxaction.funcHasFlag(action,
+ LyXAction::ReadOnly)) {
+ // no
+ setErrorMessage(N_("Document is read-only"));
+ flag |= LyXFunc::Disabled;
+ }
+ } else {
+ // no
+ setErrorMessage(N_("Command not allowed with"
+ "out any document open"));
+ flag |= LyXFunc::Disabled;
+ }
+ }
+
+ 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) {
+ case LFUN_PREVIEW:
+ disable = noLaTeX || lyxrc.view_dvi_command == "none";
+ break;
+ case LFUN_PREVIEWPS:
+ disable = noLaTeX || lyxrc.view_ps_command == "none";
+ break;
+ case LFUN_RUNLATEX:
+ case LFUN_RUNDVIPS:
+ disable = noLaTeX;
+ break;
+ case LFUN_MENUPRINT:
+ disable = noLaTeX || lyxrc.print_command == "none";
+ break;
+ case LFUN_FAX:
+ disable = noLaTeX || lyxrc.fax_command == "none";
+ break;
+ case LFUN_IMPORT:
+ if (argument == "latex")
+ disable = lyxrc.relyx_command == "none";
+ if (argument == "linuxdoc")
+ disable = lyxrc.linuxdoc_to_lyx_command == "none";
+ break;
+ case LFUN_EXPORT:
+ 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";
+ break;
+ case LFUN_UNDO:
+ disable = buf->undostack.empty();
+ break;
+ case LFUN_REDO:
+ disable = buf->redostack.empty();
+ break;
+ case LFUN_SPELLCHECK:
+ disable = lyxrc.isp_command == "none";
+ break;
+ case LFUN_RUNCHKTEX:
+ disable = lyxrc.chktex_command == "none";
+ break;
+ case LFUN_LAYOUT_TABLE:
+ disable = ! owner->view()->text->cursor.par->table;
+ break;
+ default:
+ break;
+ }
+ if (disable)
+ flag |= LyXFunc::Disabled;
+
+ if (buf) {
+ func_status box = LyXFunc::ToggleOff;
+ LyXFont font = owner->view()->text->real_current_font;
+ switch (action) {
+ case LFUN_EMPH:
+ if (font.emph() == LyXFont::ON)
+ box = LyXFunc::ToggleOn;
+ break;
+ case LFUN_NOUN:
+ if (font.noun() == LyXFont::ON)
+ box = LyXFunc::ToggleOn;
+ break;
+ case LFUN_BOLD:
+ if (font.series() == LyXFont::BOLD_SERIES)
+ box = LyXFunc::ToggleOn;
+ break;
+ case LFUN_TEX:
+ if (font.latex() == LyXFont::ON)
+ box = LyXFunc::ToggleOn;
+ break;
+ default:
+ box = LyXFunc::OK;
+ break;
+ }
+ flag |= box;
+ }
+
+ return flag;
+}
+
+
+string LyXFunc::Dispatch(string const & s)
{
- return Dispatch(lyxaction.LookupFunc(cmd.c_str()),
- arg.c_str());
+ // Split command string into command and argument
+ string cmd, line = frontStrip(s);
+ string arg = strip(frontStrip(split(line, cmd, ' ')));
+
+ return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
}
string LyXFunc::Dispatch(int ac,
- char const *do_not_use_this_arg)
+ char const * do_not_use_this_arg)
{
string argument;
kb_action action;
-
- FL_OBJECT *ob = 0; // This will disapear soon
-
// we have not done anything wrong yet.
errorstat = false;
- dispatch_buffer = string();
+ dispatch_buffer.clear();
// if action is a pseudo-action, we need the real action
if (lyxaction.isPseudoAction(ac)) {
- char const *tmparg = 0;
- action = (kb_action)lyxaction.retrieveActionArg(ac, &tmparg);
- if (tmparg)
+ string tmparg;
+ action = static_cast<kb_action>
+ (lyxaction.retrieveActionArg(ac, tmparg));
+ if (!tmparg.empty())
argument = tmparg;
} else {
- action = (kb_action)ac;
+ action = static_cast<kb_action>(ac);
if (do_not_use_this_arg)
argument = do_not_use_this_arg; // except here
}
selection_possible = false;
- if (owner->currentView()->available()
- && owner->currentView()->getScreen())
- owner->currentView()->getScreen()->HideCursor();
-
- if(!owner->currentView()->available()) {
- // This lists the allowed funcs when we have no
- // buffer loaded
- switch(action){
- case LFUN_MENU_OPEN_BY_NAME:
- case LFUN_PREFIX:
- case LFUN_MENUNEW:
- case LFUN_MENUNEWTMPLT:
- case LFUN_MENUOPEN:
- case LFUN_QUIT:
- case LFUN_PUSH_TOOLBAR:
- case LFUN_ADD_TO_TOOLBAR:
- case LFUN_EXEC_COMMAND:
- case LFUN_DROP_LAYOUTS_CHOICE:
- case LFUN_FILE_NEW:
- case LFUN_FILE_OPEN:
- case LFUN_IMPORT:
- case LFUN_RECONFIGURE:
- case LFUN_CANCEL:
- case LFUN_APROPOS:
- case LFUN_META_FAKE:
+ if (owner->view()->available())
+ owner->view()->hideCursor();
- break;
- case LFUN_UNKNOWN_ACTION:
- setErrorMessage(N_("Unknown action"));
- goto exit_with_message;
- default:
- setErrorMessage(N_("Command not allowed with"
- "out any document open"));
- goto exit_with_message; // action not allowed
- }
- }
-
- commandshortcut = string();
+ // We cannot use this function here
+ if (getStatus(action) & Disabled)
+ goto exit_with_message;
+
+ commandshortcut.clear();
- if (lyxrc->display_shortcuts && show_sc) {
+ if (lyxrc.display_shortcuts && show_sc) {
if (action != LFUN_SELFINSERT) {
// Put name of command and list of shortcuts
// for it in minibuffer
}
}
- // Now that we know which action, if the buffer is RO let's check
- // whether the action is legal. Alejandro 970603
- if (owner->currentView()->available() &&
- owner->currentBuffer()->isReadonly() &&
- lyxaction.isFuncRO(action)) {
- setErrorMessage(N_("Document is read-only"));
- lyxerr.debug() << "Error: Document is read-only." << endl;
- goto exit_with_message;
- }
-
// If in math mode pass the control to
// the math inset [asierra060396]
- if (owner->currentView()->available() &&
- owner->currentBuffer()->the_locking_inset) {
- if (action>1 || (action==LFUN_UNKNOWN_ACTION && keyseq.length>=-1)) {
- if (action==LFUN_UNKNOWN_ACTION && argument.empty()) {
+ if (owner->view()->available() &&
+ owner->view()->the_locking_inset) {
+ 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.
- if (action==LFUN_UNDO) {
+ // Undo/Redo pre 0.13 is a bit tricky for insets.
+ if (action == LFUN_UNDO) {
int slx, sly;
- UpdatableInset* inset =
- owner->currentBuffer()->the_locking_inset;
+ UpdatableInset * inset =
+ owner->view()->the_locking_inset;
inset->GetCursorPos(slx, sly);
- UnlockInset(inset);
- MenuUndo();
- inset = (UpdatableInset*)owner->currentBuffer()->text->cursor.par->GetInset(owner->currentBuffer()->text->cursor.pos);
- if (inset)
- inset->Edit(slx, sly);
+ owner->view()->unlockInset(inset);
+ owner->view()->menuUndo();
+ inset = static_cast<UpdatableInset*>(
+ owner->view()->text->cursor.par->
+ GetInset(owner->view()->text->
+ cursor.pos));
+ if (inset)
+ inset->Edit(owner->view(),slx,sly,0);
return string();
- } else
- if (action==LFUN_REDO) {
- int slx, sly;
- UpdatableInset* inset = owner->currentBuffer()->the_locking_inset;
- inset->GetCursorPos(slx, sly);
- UnlockInset(inset);
- MenuRedo();
- inset = (UpdatableInset*)owner->currentBuffer()->text->cursor.par->GetInset(owner->currentBuffer()->text->cursor.pos);
- if (inset)
- inset->Edit(slx, sly);
+ } else if (action == LFUN_REDO) {
+ int slx, sly;
+ UpdatableInset * inset = owner->view()->
+ the_locking_inset;
+ inset->GetCursorPos(slx, sly);
+ owner->view()->unlockInset(inset);
+ owner->view()->menuRedo();
+ inset = static_cast<UpdatableInset*>(
+ owner->view()->text->cursor.par->
+ GetInset(owner->view()->text->
+ cursor.pos));
+ if (inset)
+ inset->Edit(owner->view(),slx,sly,0);
+ return string();
+ } else if (owner->view()->the_locking_inset->
+ LocalDispatch(owner->view(), action,
+ argument) ==
+ UpdatableInset::DISPATCHED)
+ return string();
+ else {
+ setMessage(N_("Text mode"));
+ LyXDirection direction = owner->view()->text->
+ cursor.par->getParDirection();
+ if ((action == -1) ||
+ ((action == LFUN_RIGHT) &&
+ (direction == LYX_DIR_LEFT_TO_RIGHT))) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState());
+ }
+ if ((action == LFUN_LEFT) &&
+ (direction == LYX_DIR_RIGHT_TO_LEFT)) {
+ owner->view()->text->CursorRight();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->
+ Set(CurrentState());
+ }
+ if ((action == LFUN_LEFT) ||
+ (action == LFUN_RIGHT))
return string();
- } else
- if (owner->currentBuffer()->the_locking_inset->LocalDispatch(action, argument.c_str()))
- return string();
- else {
- setMessage(N_("Text mode"));
- if (action==LFUN_RIGHT || action==-1)
- owner->currentBuffer()->text->CursorRight();
- if (action==LFUN_LEFT || action==LFUN_RIGHT)
- return string();
- }
+ }
}
}
switch(action) {
// --- Misc -------------------------------------------
case LFUN_WORDFINDFORWARD :
- case LFUN_WORDFINDBACKWARD : {
- LyXText *ltCur;
+ case LFUN_WORDFINDBACKWARD : {
static string last_search;
string searched_string;
searched_string = last_search;
}
- ltCur = owner->currentView()->currentBuffer()->text ;
+ LyXText * ltCur = owner->view()->text ;
if (!searched_string.empty() &&
- ( (action == LFUN_WORDFINDBACKWARD) ?
- ltCur->SearchBackward( searched_string.c_str() ) :
- ltCur->SearchForward( searched_string.c_str() )
- )){
+ ((action == LFUN_WORDFINDBACKWARD) ?
+ ltCur->SearchBackward(searched_string.c_str()) :
+ ltCur->SearchForward(searched_string.c_str()))) {
// ??? What is that ???
- owner->currentView()->currentBuffer()->update(-2);
+ owner->view()->update(-2);
// ??? Needed ???
// clear the selection (if there is any)
- owner->currentView()->getScreen()->ToggleSelection();
- owner->currentView()->currentBuffer()->text->ClearSelection();
+ owner->view()->toggleSelection();
+ owner->view()->text->ClearSelection();
// Move cursor so that successive C-s 's will not stand in place.
if( action == LFUN_WORDFINDFORWARD )
- owner->currentBuffer()->text->CursorRightOneWord();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->text->CursorRightOneWord();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
// ??? Needed ???
// set the new selection
- // SetSelectionOverLenChars(owner->currentView()->currentBuffer()->text, iLenSelected);
- owner->currentView()->getScreen()->ToggleSelection(false);
+ // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected);
+ owner->view()->toggleSelection(false);
} else
LyXBell();
- // REMOVED : if (owner->currentView()->getWorkArea()->focus)
- owner->currentView()->getScreen()->ShowCursor();
+ // REMOVED : if (owner->view()->getWorkArea()->focus)
+ owner->view()->showCursor();
}
break;
case LFUN_PREFIX:
{
- if (owner->currentView()->available()
- && owner->currentView()->getScreen()) {
- owner->currentBuffer()->update(-2);
+ if (owner->view()->available()) {
+ owner->view()->update(-2);
}
- char buf[100];
- keyseq.print(buf,100, true);
+ string buf;
+ keyseq.print(buf, true);
owner->getMiniBuffer()->Set(buf, string(), string(), 1);
}
break;
case LFUN_CANCEL: // RVDK_PATCH_5
keyseq.reset();
meta_fake_bit = 0;
- if(owner->currentView()->available())
+ if(owner->view()->available())
// cancel any selection
- Dispatch(int(LFUN_MARK_OFF), 0);
+ Dispatch(LFUN_MARK_OFF, 0);
setMessage(N_("Cancel"));
break;
case LFUN_META_FAKE: // RVDK_PATCH_5
{
meta_fake_bit = Mod1Mask;
- char buf[100];
- keyseq.print(buf, 98, true);
+ string buf;
+ keyseq.print(buf, true);
string res = string("M-") + buf;
setMessage(buf); // RVDK_PATCH_5
}
break;
case LFUN_READ_ONLY_TOGGLE:
- if (owner->currentBuffer()->lyxvc.inUse()) {
- owner->currentBuffer()->lyxvc.toggleReadOnly();
+ if (owner->buffer()->lyxvc.inUse()) {
+ owner->buffer()->lyxvc.toggleReadOnly();
} else {
- owner->currentBuffer()->setReadonly(
- !owner->currentBuffer()->isReadonly());
+ owner->buffer()->setReadonly(
+ !owner->buffer()->isReadonly());
}
break;
case LFUN_CENTER: // this is center and redraw.
- BeforeChange();
- if (owner->currentBuffer()->text->cursor.y >
- owner->currentView()->getWorkArea()->h / 2) {
- owner->currentView()->getScreen()->
- Draw(owner->currentBuffer()->text->cursor.y -
- owner->currentView()->getWorkArea()->h/2);
- } else { // <=
- owner->currentView()->getScreen()->
- Draw(0);
- }
- owner->currentBuffer()->update(0);
- owner->currentView()->redraw();
+ owner->view()->center();
break;
case LFUN_APPENDIX:
- if (owner->currentView()->available()) {
- owner->currentBuffer()->text->toggleAppendix();
- owner->currentBuffer()->update(1);
+ if (owner->view()->available()) {
+ owner->view()->text->toggleAppendix();
+ owner->view()->update(1);
}
break;
- // --- Menus -----------------------------------------------
+ // --- Menus -----------------------------------------------
case LFUN_MENUNEW:
MenuNew(false);
break;
break;
case LFUN_MENUWRITE:
- MenuWrite(owner->currentBuffer());
+ 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!"));
+ //}
break;
case LFUN_MENUWRITEAS:
- MenuWriteAs(owner->currentBuffer());
+ MenuWriteAs(owner->buffer());
break;
case LFUN_MENURELOAD:
break;
case LFUN_PREVIEW:
- MenuPreview(owner->currentBuffer());
+ PreviewDVI(owner->buffer());
break;
case LFUN_PREVIEWPS:
- MenuPreviewPS(owner->currentBuffer());
+ PreviewPostscript(owner->buffer());
break;
case LFUN_RUNLATEX:
- MenuRunLaTeX(owner->currentBuffer());
+ MenuRunLaTeX(owner->buffer());
break;
case LFUN_BUILDPROG:
- MenuBuildProg(owner->currentBuffer());
+ MenuBuildProg(owner->buffer());
break;
case LFUN_RUNCHKTEX:
- MenuRunChktex(owner->currentBuffer());
+ MenuRunChktex(owner->buffer());
break;
case LFUN_RUNDVIPS:
- MenuRunDvips(owner->currentBuffer(), false);
+ CreatePostscript(owner->buffer(), false);
break;
case LFUN_MENUPRINT:
- MenuPrint(owner->currentBuffer());
+ MenuPrint(owner->buffer());
break;
case LFUN_FAX:
- MenuFax(owner->currentBuffer());
+ MenuFax(owner->buffer());
break;
case LFUN_EXPORT:
- {
- //needs argument as string
- string extyp=argument;
-
- // latex
- if (extyp == "latex") {
- // make sure that this buffer is not linuxdoc
- MenuMakeLaTeX(owner->currentBuffer());
- }
- // linuxdoc
- else if (extyp == "linuxdoc") {
- // make sure that this buffer is not latex
- MenuMakeLinuxDoc(owner->currentBuffer());
- }
- // docbook
- else if (extyp == "docbook") {
- // make sure that this buffer is not latex or linuxdoc
- MenuMakeDocBook(owner->currentBuffer());
- }
- // dvi
- else if (extyp == "dvi") {
- // Run LaTeX as "Update dvi..." Bernhard.
- // We want the dvi in the current directory. This
- // is achieved by temporarily disabling use of
- // temp directory. As a side-effect, we get
- // *.log and *.aux files also. (Asger)
- bool flag = lyxrc->use_tempdir;
- lyxrc->use_tempdir = false;
- MenuRunLaTeX(owner->currentBuffer());
- lyxrc->use_tempdir = flag;
- }
- // postscript
- else if (extyp == "postscript") {
- // Start Print-dialog. Not as good as dvi... Bernhard.
- MenuPrint(owner->currentBuffer());
- // Since the MenuPrint is a pop-up, we can't use
- // the same trick as above. (Asger)
- // MISSING: Move of ps-file :-(
- }
- // ascii
- else if (extyp == "ascii") {
- MenuMakeAscii(owner->currentBuffer());
- }
- else if (extyp == "custom") {
- MenuSendto();
- break;
- }
- // HTML
- else if (extyp == "html") {
- // First, create LaTeX file
- MenuMakeLaTeX(owner->currentBuffer());
-
- // And now, run tth
- string file = owner->currentBuffer()->getFileName();
- file = ChangeExtension(file, ".tex", false);
- string result = ChangeExtension(file, ".html", false);
- string tmp = lyxrc->tth_command + " < " + file
- + " > " + result ;
- Systemcalls one;
- int res = one.startscript(Systemcalls::System, tmp);
- if (res == 0) {
- setMessage(string(
- N_("Document exported as HTML to file: ")) + result);
- } else {
- setErrorMessage(string(
- N_("An unexpected error occured while converting document to HTML in file:")) + result);
- }
- }
- else {
- setErrorMessage(string(N_("Unknown export type: "))
- + extyp);
- }
- }
- break;
+ MenuExport(owner->buffer(), argument);
+ break;
case LFUN_IMPORT:
{
//needs argument as string
- string imtyp=argument;
+ string imtyp = argument;
// latex
if (imtyp == "latex") {
doImportASCII(false);
} else if (imtyp == "asciiparagraph") {
doImportASCII(true);
- // noweb
+ // noweb
} else if (imtyp == "noweb") {
doImportLaTeX(true);
+ } else if (imtyp == "linuxdoc") {
+ doImportLinuxDoc();
} else {
setErrorMessage(string(N_("Unknown import type: "))
+ imtyp);
break;
case LFUN_TOCVIEW:
- TocUpdateCB(ob, 0);
+ 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);
}
break;
case LFUN_TOC_INSERT:
{
- Inset *new_inset =
- new InsetTOC(owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset,
- "Standard", true);
+ Inset * new_inset = new InsetTOC(owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
break;
}
case LFUN_LOF_INSERT:
{
- Inset *new_inset =
- new InsetLOF(owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset,
- "Standard", true);
+ Inset * new_inset = new InsetLOF(owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
break;
}
case LFUN_LOA_INSERT:
{
- Inset *new_inset =
- new InsetLOA(owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset,
- "Standard", true);
+ Inset * new_inset = new InsetLOA(owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
break;
}
case LFUN_LOT_INSERT:
{
- Inset *new_inset =
- new InsetLOT(owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset,
- "Standard", true);
+ Inset * new_inset = new InsetLOT(owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
break;
}
case LFUN_TABLE:
- TableCB(ob, 0);
+ Table();
break;
case LFUN_FIGURE:
- FigureCB(ob, 0);
+ Figure();
break;
-
+
+ case LFUN_INSERT_GRAPHICS:
+ {
+ Inset * new_inset = new InsetGraphics;
+ owner->view()->insertInset(new_inset);
+ break;
+ }
+
case LFUN_AUTOSAVE:
AutoSave();
break;
case LFUN_UNDO:
- MenuUndo();
+ owner->view()->menuUndo();
break;
case LFUN_REDO:
- MenuRedo();
+ owner->view()->menuRedo();
break;
case LFUN_MENUSEARCH:
- MenuSearch();
+ {
+ // Ok this is one _very_ bad solution, but I think that some
+ // of this will be rewritten as part of GUI indep anyway.
+ // Lgb
+ static LyXFindReplace FR_;
+ FR_.StartSearch(owner->view());
+ }
+
break;
case LFUN_PASTE:
- PasteCB();
+ owner->view()->paste();
break;
case LFUN_PASTESELECTION:
{
bool asPara = false;
- if (string(argument) == "paragraph") asPara = true;
+ if (argument == "paragraph") asPara = true;
MenuPasteSelection(asPara);
break;
}
case LFUN_CUT:
- CutCB();
+ owner->view()->cut();
break;
case LFUN_COPY:
- CopyCB();
+ owner->view()->copy();
break;
case LFUN_LAYOUT_COPY:
- CopyEnvironmentCB();
+ owner->view()->copyEnvironment();
break;
case LFUN_LAYOUT_PASTE:
- PasteEnvironmentCB();
+ owner->view()->pasteEnvironment();
break;
case LFUN_GOTOERROR:
- owner->currentView()->gotoError();
+ owner->view()->gotoError();
break;
case LFUN_REMOVEERRORS:
- if (owner->currentBuffer()->removeAutoInsets()) {
- owner->currentView()->redraw();
- owner->currentView()->fitCursor();
- owner->currentView()->updateScrollbar();
+ if (owner->view()->removeAutoInsets()) {
+ owner->view()->redraw();
+ owner->view()->fitCursor();
+ owner->view()->updateScrollbar();
}
break;
case LFUN_GOTONOTE:
- GotoNote();
+ owner->view()->gotoNote();
break;
case LFUN_OPENSTUFF:
- OpenStuff();
+ owner->view()->openStuff();
break;
case LFUN_HYPHENATION:
- HyphenationPoint();
+ owner->view()->hyphenationPoint();
break;
case LFUN_LDOTS:
- Ldots();
+ owner->view()->ldots();
break;
case LFUN_END_OF_SENTENCE:
- EndOfSentenceDot();
+ owner->view()->endOfSentenceDot();
break;
case LFUN_MENU_SEPARATOR:
- MenuSeparator();
+ owner->view()->menuSeparator();
break;
case LFUN_HFILL:
- HFill();
+ owner->view()->hfill();
break;
case LFUN_DEPTH:
- DepthCB(ob, 0);
+ changeDepth(owner->view(), 0);
break;
case LFUN_DEPTH_MIN:
- DepthCB(ob, -1);
+ changeDepth(owner->view(), -1);
break;
case LFUN_DEPTH_PLUS:
- DepthCB(ob, 1);
+ changeDepth(owner->view(), 1);
break;
case LFUN_FREE:
- FreeCB();
+ Free();
break;
case LFUN_TEX:
- TexCB();
+ Tex();
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_MELT:
- MeltCB(ob, 0);
+ Melt(owner->view());
break;
case LFUN_RECONFIGURE:
- Reconfigure();
+ Reconfigure(owner->view());
break;
case LFUN_FOOTMELT:
- if (owner->currentView()->available()
- && !owner->currentBuffer()->text->selection
- && owner->currentBuffer()->text->cursor.par->footnoteflag
+ if (owner->view()->available()
+ && !owner->view()->text->selection
+ && owner->view()->text->cursor.par->footnoteflag
!= LyXParagraph::NO_FOOTNOTE)
- { // only melt footnotes with FOOTMELT, not margins etc
- if(owner->currentBuffer()->text->cursor.par->footnotekind == LyXParagraph::FOOTNOTE)
- MeltCB(ob,0);
- }
+ { // only melt footnotes with FOOTMELT, not margins etc
+ if(owner->view()->text->cursor.par->footnotekind == LyXParagraph::FOOTNOTE)
+ Melt(owner->view());
+ }
else
- FootCB(ob, 0);
+ Foot(owner->view());
+ owner->view()->setState();
break;
case LFUN_MARGINMELT:
- if (owner->currentView()->available()
- && !owner->currentBuffer()->text->selection
- && owner->currentBuffer()->text->cursor.par->footnoteflag
- != LyXParagraph::NO_FOOTNOTE)
- { // only melt margins
- if(owner->currentBuffer()->text->cursor.par->footnotekind == LyXParagraph::MARGIN)
- MeltCB(ob,0);
- }
- else
- MarginCB(ob, 0);
+ if (owner->view()->available()
+ && !owner->view()->text->selection
+ && owner->view()->text->cursor.par->footnoteflag
+ != LyXParagraph::NO_FOOTNOTE) {
+ // only melt margins
+ if(owner->view()->text->cursor.par->footnotekind == LyXParagraph::MARGIN)
+ Melt(owner->view());
+ } else
+ Margin(owner->view());
+ owner->view()->setState();
break;
// --- version control -------------------------------
case LFUN_VC_REGISTER:
{
- if (!owner->currentBuffer()->lyxvc.inUse())
- owner->currentBuffer()->lyxvc.registrer();
+ if (!owner->buffer()->lyxvc.inUse())
+ owner->buffer()->lyxvc.registrer();
}
break;
case LFUN_VC_CHECKIN:
{
- if (owner->currentBuffer()->lyxvc.inUse()
- && !owner->currentBuffer()->isReadonly())
- owner->currentBuffer()->lyxvc.checkIn();
+ if (owner->buffer()->lyxvc.inUse()
+ && !owner->buffer()->isReadonly())
+ owner->buffer()->lyxvc.checkIn();
}
break;
case LFUN_VC_CHECKOUT:
{
- if (owner->currentBuffer()->lyxvc.inUse()
- && owner->currentBuffer()->isReadonly())
- owner->currentBuffer()->lyxvc.checkOut();
+ if (owner->buffer()->lyxvc.inUse()
+ && owner->buffer()->isReadonly())
+ owner->buffer()->lyxvc.checkOut();
}
break;
case LFUN_VC_REVERT:
{
- owner->currentBuffer()->lyxvc.revert();
+ owner->buffer()->lyxvc.revert();
}
break;
case LFUN_VC_UNDO:
{
- owner->currentBuffer()->lyxvc.undoLast();
+ owner->buffer()->lyxvc.undoLast();
}
break;
case LFUN_VC_HISTORY:
{
- owner->currentBuffer()->lyxvc.showLog();
+ owner->buffer()->lyxvc.showLog();
break;
}
// --- buffers ----------------------------------------
- case LFUN_PREVBUFFER:
-#ifdef WITH_WARNINGS
-#warning fix this please
-#endif
- // it is the LyXView or the BufferView that should
- // remember the previous buffer, not bufferlist.
-// if (owner->currentView()->available()){
-// BeforeChange();
-// owner->currentBuffer()->update(-2);
-// }
-// owner->currentView()->setBuffer(bufferlist.prev());
-// owner->currentView()->
-// resizeCurrentBufferPseudoExpose();
- break;
-
case LFUN_FILE_INSERT:
{
MenuInsertLyXFile(argument);
case LFUN_FILE_INSERT_ASCII:
{
- bool asPara = false;
- asPara = (string(argument) == "paragraph");
- InsertAsciiFile(string(), asPara);
+ bool asPara = (argument == "paragraph");
+ InsertAsciiFile(owner->view(), string(), asPara);
}
break;
case LFUN_FILE_NEW:
{
// servercmd: argument must be <file>:<template>
- Buffer * tmpbuf = 0;
- tmpbuf = NewLyxFile(argument);
+ Buffer * tmpbuf = NewLyxFile(argument);
if (tmpbuf)
- owner->currentView()->setBuffer(tmpbuf);
+ owner->view()->buffer(tmpbuf);
}
- break;
+ break;
case LFUN_FILE_OPEN:
- owner->currentView()->setBuffer(
- bufferlist.loadLyXFile(argument));
+ owner->view()->buffer(bufferlist.loadLyXFile(argument));
break;
case LFUN_LATEX_LOG:
if (sel == 0)
return string(); // illegal argument
- sel--; // sel 1..., but layout 0...
+ --sel; // sel 1..., but layout 0...
// Pretend we got the name instead.
Dispatch(int(LFUN_LAYOUT),
- lyxstyle.NameOfLayout(owner->currentBuffer()->
- text->parameters->
- textclass,
- sel).c_str());
+ textclasslist.NameOfLayout(owner->view()->
+ text->parameters->
+ textclass,
+ sel).c_str());
return string();
}
// Derive layout number from given argument (string)
// and current buffer's textclass (number). */
- int layoutno = -1;
- layoutno =
- lyxstyle.NumberOfLayout(owner->
- currentBuffer()->
- text->parameters->
- textclass,
- argument);
+ LyXTextClassList::ClassList::size_type tclass =
+ owner->view()->text->parameters->textclass;
+ pair <bool, LyXTextClass::size_type> layout =
+ textclasslist.NumberOfLayout(tclass, argument);
+
+ // If the entry is obsolete, use the new one instead.
+ if (layout.first) {
+ string obs = textclasslist.Style(tclass,layout.second)
+ .obsoleted_by();
+ if (!obs.empty())
+ layout =
+ textclasslist.NumberOfLayout(tclass, obs);
+ }
// see if we found the layout number:
- if (layoutno == -1) {
+ if (!layout.first) {
setErrorMessage(string(N_("Layout ")) + argument +
N_(" not known"));
break;
}
-
- if (current_layout != layoutno) {
- owner->currentView()->getScreen()->HideCursor();
- current_layout = layoutno;
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->
- SetLayout(layoutno);
+
+ if (current_layout != layout.second) {
+ owner->view()->hideCursor();
+ current_layout = layout.second;
+ owner->view()->update(-2);
+ owner->view()->text->
+ SetLayout(layout.second);
owner->getToolbar()->combox->
- select(owner->currentBuffer()->
+ select(owner->view()->
text->cursor.par->
GetLayout() + 1);
- owner->currentBuffer()->update(1);
+ owner->view()->update(1);
}
}
break;
case LFUN_LAYOUT_TABLE:
{
int flag = 0;
- if (string(argument) == "true") flag = 1;
+ if (argument == "true") flag = 1;
MenuLayoutTable(flag);
}
break;
owner->getToolbar()->combox->Show();
break;
+ case LFUN_LANGUAGE:
+ {
+ LangCB(argument);
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
+ }
+ break;
+
case LFUN_EMPH:
- EmphCB();
+ Emph();
break;
case LFUN_BOLD:
- BoldCB();
+ Bold();
break;
case LFUN_NOUN:
- NounCB();
+ Noun();
break;
case LFUN_CODE:
- CodeCB();
+ Code();
break;
case LFUN_SANS:
- SansCB();
+ Sans();
break;
case LFUN_ROMAN:
- RomanCB();
+ Roman();
break;
case LFUN_DEFAULT:
- StyleResetCB();
+ StyleReset();
break;
case LFUN_UNDERLINE:
- UnderlineCB();
+ Underline();
break;
case LFUN_FONT_SIZE:
- FontSizeCB(argument);
+ FontSize(argument);
break;
case LFUN_FONT_STATE:
break;
case LFUN_UPCASE_WORD:
- owner->currentBuffer()->update(-2);
+ owner->view()->update(-2);
FreeUpdateTimer();
- owner->currentBuffer()->text->ChangeWordCase(2);
- owner->currentBuffer()->update(1);
+ owner->view()->text->ChangeWordCase(LyXText::text_uppercase);
+ owner->view()->update(1);
SetUpdateTimer();
break;
case LFUN_LOWCASE_WORD:
- owner->currentBuffer()->update(-2);
+ owner->view()->update(-2);
FreeUpdateTimer();
- owner->currentBuffer()->text->ChangeWordCase(0);
- owner->currentBuffer()->update(1);
+ owner->view()->text->ChangeWordCase(LyXText::text_lowercase);
+ owner->view()->update(1);
SetUpdateTimer();
break;
case LFUN_CAPITALIZE_WORD:
- owner->currentBuffer()->update(-2);
+ owner->view()->update(-2);
FreeUpdateTimer();
- owner->currentBuffer()->text->ChangeWordCase(1);
- owner->currentBuffer()->update(1);
+ owner->view()->text->ChangeWordCase(LyXText::text_capitalization);
+ owner->view()->update(1);
SetUpdateTimer();
break;
case LFUN_REFTOGGLE:
{
- InsetRef *inset =
- (InsetRef*)getInsetByCode(Inset::REF_CODE);
+ InsetRef * inset =
+ static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
if (inset) {
- if (inset->getFlag()==InsetRef::REF)
+ if (inset->getFlag() == InsetRef::REF)
inset->setFlag(InsetRef::PAGE_REF);
else
inset->setFlag(InsetRef::REF);
- UpdateInset(inset);
+ owner->view()->updateInset(inset, true);
} else {
setErrorMessage(N_("No cross-reference to toggle"));
}
case LFUN_REFBACK:
{
- owner->currentView()->restorePosition();
+ owner->view()->restorePosition();
}
break;
{
string label(argument);
if (label.empty()) {
- InsetRef *inset =
- (InsetRef*)getInsetByCode(Inset::REF_CODE);
+ InsetRef * inset =
+ static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
if (inset)
label = inset->getContents();
}
if (!label.empty()) {
- owner->currentView()->savePosition();
- owner->currentBuffer()->gotoLabel(label.c_str());
+ owner->view()->savePosition();
+ owner->view()->gotoLabel(label.c_str());
}
}
break;
break; // RVDK_PATCH_5
case LFUN_SPELLCHECK:
- if (lyxrc->isp_command != "none")
- ShowSpellChecker();
+ if (lyxrc.isp_command != "none")
+ ShowSpellChecker(owner->view());
break; // RVDK_PATCH_5
// --- Cursor Movements -----------------------------
case LFUN_RIGHT:
{
- Buffer *tmpbuffer = owner->currentBuffer();
- LyXText *tmptext = owner->currentBuffer()->text;
+ LyXText * tmptext = owner->view()->text;
+ LyXDirection direction =
+ tmptext->cursor.par->getParDirection();
if(!tmptext->mark_set)
- BeforeChange();
- tmpbuffer->update(-2);
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ if (direction == LYX_DIR_RIGHT_TO_LEFT)
+ tmptext->CursorLeft();
if (tmptext->cursor.pos < tmptext->cursor.par->Last()
&& tmptext->cursor.par->GetChar(tmptext->cursor.pos)
- == LYX_META_INSET
+ == LyXParagraph::META_INSET
&& tmptext->cursor.par->GetInset(tmptext->cursor.pos)
- && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable()==2){
- Inset* tmpinset = tmptext->cursor.par->GetInset(tmptext->cursor.pos);
+ && tmptext->cursor.par->GetInset(tmptext->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE){
+ Inset * tmpinset = tmptext->cursor.par->GetInset(tmptext->cursor.pos);
setMessage(tmpinset->EditMessage());
- tmpinset->Edit(0,0);
+ tmpinset->Edit(owner->view(), 0, 0, 0);
break;
}
- tmptext->CursorRight();
- owner->currentBuffer()->text->FinishUndo();
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ tmptext->CursorRight();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
}
{
// This is soooo ugly. Isn`t it possible to make
// it simpler? (Lgb)
- LyXText *txt= owner->currentBuffer()->text;
- if(!txt->mark_set) BeforeChange();
- owner->currentBuffer()->update(-2);
- txt->CursorLeft();
+ LyXText * txt = owner->view()->text;
+ LyXDirection direction = txt->cursor.par->getParDirection();
+ if(!txt->mark_set) owner->view()->beforeChange();
+ owner->view()->update(-2);
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ txt->CursorLeft();
if (txt->cursor.pos < txt->cursor.par->Last()
&& txt->cursor.par->GetChar(txt->cursor.pos)
- == LYX_META_INSET
+ == LyXParagraph::META_INSET
&& txt->cursor.par->GetInset(txt->cursor.pos)
- && txt->cursor.par->GetInset(txt->cursor.pos)->Editable()==2) {
- Inset* tmpinset = txt->cursor.par->GetInset(txt->cursor.pos);
+ && txt->cursor.par->GetInset(txt->cursor.pos)->Editable() == Inset::HIGHLY_EDITABLE) {
+ Inset * tmpinset = txt->cursor.par->GetInset(txt->cursor.pos);
setMessage(tmpinset->EditMessage());
- tmpinset->Edit(tmpinset->Width(txt->GetFont(txt->cursor.par,
- txt->cursor.pos)),0);
- // tmpinset->Edit(-1, 0); // -1 means go rightmost
+ tmpinset->Edit(owner->view(),
+ tmpinset->width(owner->view()->painter(),
+ txt->GetFont(txt->cursor.par,
+ txt->cursor.pos)),
+ 0, 0);
break;
}
- owner->currentBuffer()->text->FinishUndo();
+ if (direction == LYX_DIR_RIGHT_TO_LEFT)
+ txt->CursorRight();
+
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
}
break;
case LFUN_UP:
- if(!owner->currentBuffer()->text->mark_set) BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentBuffer()->text->CursorUp();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set) owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->text->CursorUp();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_DOWN:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentBuffer()->text->CursorDown();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->text->CursorDown();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_UP_PARAGRAPH:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentBuffer()->text->CursorUpParagraph();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->text->CursorUpParagraph();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_DOWN_PARAGRAPH:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentBuffer()->text->CursorDownParagraph();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->text->CursorDownParagraph();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_PRIOR:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentView()->cursorPrevious();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->cursorPrevious();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_NEXT:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-3);
- owner->currentView()->cursorNext();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-3);
+ owner->view()->cursorNext();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_HOME:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorHome();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ owner->view()->text->CursorHome();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_END:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorEnd();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ owner->view()->text->CursorEnd();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_TAB:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorTab();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ owner->view()->text->CursorTab();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_WORDRIGHT:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorRightOneWord();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorRightOneWord();
+ else
+ owner->view()->text->CursorLeftOneWord();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_WORDLEFT:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorLeftOneWord();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorLeftOneWord();
+ else
+ owner->view()->text->CursorRightOneWord();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_BEGINNINGBUF:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorTop();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ owner->view()->text->CursorTop();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_ENDBUF:
- if(!owner->currentBuffer()->text->mark_set)
- BeforeChange();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorBottom();
- owner->currentBuffer()->text->FinishUndo();
+ if(!owner->view()->text->mark_set)
+ owner->view()->beforeChange();
+ owner->view()->update(-2);
+ owner->view()->text->CursorBottom();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(false);
owner->getMiniBuffer()->Set(CurrentState());
break;
/* cursor selection ---------------------------- */
case LFUN_RIGHTSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorRight();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorRight();
+ else
+ owner->view()->text->CursorLeft();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_LEFTSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorLeft();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorLeft();
+ else
+ owner->view()->text->CursorRight();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_UPSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorUp();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorUp();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_DOWNSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorDown();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorDown();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_UP_PARAGRAPHSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorUpParagraph();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorUpParagraph();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_DOWN_PARAGRAPHSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorDownParagraph();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorDownParagraph();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_PRIORSEL:
- owner->currentBuffer()->update(-2);
- owner->currentView()->cursorPrevious();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->cursorPrevious();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_NEXTSEL:
- owner->currentBuffer()->update(-2);
- owner->currentView()->cursorNext();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->cursorNext();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_HOMESEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorHome();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorHome();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_ENDSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorEnd();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorEnd();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_WORDRIGHTSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorRightOneWord();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorRightOneWord();
+ else
+ owner->view()->text->CursorLeftOneWord();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_WORDLEFTSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorLeftOneWord();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ if (owner->view()->text->cursor.par->getParDirection()
+ == LYX_DIR_LEFT_TO_RIGHT)
+ owner->view()->text->CursorLeftOneWord();
+ else
+ owner->view()->text->CursorRightOneWord();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_BEGINNINGBUFSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorTop();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorTop();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
case LFUN_ENDBUFSEL:
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->CursorBottom();
- owner->currentBuffer()->text->FinishUndo();
+ owner->view()->update(-2);
+ owner->view()->text->CursorBottom();
+ owner->view()->text->FinishUndo();
moveCursorUpdate(true);
owner->getMiniBuffer()->Set(CurrentState());
break;
// --- text changing commands ------------------------
case LFUN_BREAKLINE:
- BeforeChange();
- owner->currentBuffer()->text->InsertChar(LYX_META_NEWLINE);
- SmallUpdate(1);
+#if 1
+ owner->view()->beforeChange();
+ owner->view()->text->InsertChar(LyXParagraph::META_NEWLINE);
+ owner->view()->smallUpdate(1);
SetUpdateTimer(0.01);
moveCursorUpdate(false);
+#else
+ owner->view()->newline();
+#endif
break;
case LFUN_PROTECTEDSPACE:
- BeforeChange();
- owner->currentBuffer()->text->
- InsertChar(LYX_META_PROTECTED_SEPARATOR);
- SmallUpdate(1);
+#if 1
+ {
+ LyXLayout const & style =
+ textclasslist.Style(owner->view()->buffer()->params.textclass,
+ owner->view()->text->cursor.par->GetLayout());
+
+ if (style.free_spacing) {
+ owner->view()->text->InsertChar(' ');
+ owner->view()->update(-1);
+ } else {
+ owner->view()->protectedBlank();
+ }
+ moveCursorUpdate(false);
+ }
+#else
+ owner->view()->beforeChange();
+ owner->view()->text->
+ InsertChar(LyXParagraph::META_PROTECTED_SEPARATOR);
+ owner->view()->smallUpdate(1);
SetUpdateTimer();
moveCursorUpdate(false);
+#endif
break;
case LFUN_SETMARK:
- if(owner->currentBuffer()->text->mark_set) {
- BeforeChange();
- owner->currentBuffer()->update(0);
+ if(owner->view()->text->mark_set) {
+ owner->view()->beforeChange();
+ owner->view()->update(0);
setMessage(N_("Mark removed"));
} else {
- BeforeChange();
- owner->currentBuffer()->text->mark_set = 1;
- owner->currentBuffer()->update(0);
+ owner->view()->beforeChange();
+ owner->view()->text->mark_set = 1;
+ owner->view()->update(0);
setMessage(N_("Mark set"));
}
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
break;
case LFUN_DELETE:
FreeUpdateTimer();
- if (!owner->currentBuffer()->text->selection) {
- owner->currentBuffer()->text->Delete();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
- SmallUpdate(1);
+ if (!owner->view()->text->selection) {
+ owner->view()->text->Delete();
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->smallUpdate(1);
// It is possible to make it a lot faster still
// just comment out the lone below...
- owner->currentView()->getScreen()->ShowCursor();
+ owner->view()->showCursor();
} else {
- CutCB();
+ owner->view()->cut();
}
SetUpdateTimer();
+ moveCursorUpdate(false);
+ owner->getMiniBuffer()->Set(CurrentState());
+ owner->view()->setState();
break;
case LFUN_DELETE_SKIP:
{
// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
- LyXCursor cursor = owner->currentBuffer()->text->cursor;
+ LyXCursor cursor = owner->view()->text->cursor;
FreeUpdateTimer();
- if (!owner->currentBuffer()->text->selection) {
+ if (!owner->view()->text->selection) {
if (cursor.pos == cursor.par->Last()) {
- owner->currentBuffer()->text->CursorRight();
- cursor = owner->currentBuffer()->text->cursor;
+ owner->view()->text->CursorRight();
+ cursor = owner->view()->text->cursor;
if (cursor.pos == 0
&& !(cursor.par->added_space_top
== VSpace (VSpace::NONE))) {
- owner->currentBuffer()->text->SetParagraph
+ owner->view()->text->SetParagraph
(cursor.par->line_top,
cursor.par->line_bottom,
cursor.par->pagebreak_top,
cursor.par->added_space_bottom,
cursor.par->align,
cursor.par->labelwidthstring, 0);
- owner->currentBuffer()->text->CursorLeft();
- owner->currentBuffer()->update (1);
+ owner->view()->text->CursorLeft();
+ owner->view()->update (1);
} else {
- owner->currentBuffer()->text->CursorLeft();
- owner->currentBuffer()->text->Delete();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
- SmallUpdate(1);
+ owner->view()->text->CursorLeft();
+ owner->view()->text->Delete();
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->smallUpdate(1);
}
} else {
- owner->currentBuffer()->text->Delete();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
- SmallUpdate(1);
+ owner->view()->text->Delete();
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->smallUpdate(1);
}
} else {
- CutCB();
+ owner->view()->cut();
}
SetUpdateTimer();
}
/* -------> Delete word forward. */
case LFUN_DELETE_WORD_FORWARD:
- owner->currentBuffer()->update(-2);
+ owner->view()->update(-2);
FreeUpdateTimer();
- owner->currentBuffer()->text->DeleteWordForward();
- owner->currentBuffer()->update( 1 );
+ owner->view()->text->DeleteWordForward();
+ owner->view()->update( 1 );
SetUpdateTimer();
moveCursorUpdate(false);
+ owner->getMiniBuffer()->Set(CurrentState());
break;
/* -------> Delete word backward. */
case LFUN_DELETE_WORD_BACKWARD:
- owner->currentBuffer()->update(-2);
+ owner->view()->update(-2);
FreeUpdateTimer();
- owner->currentBuffer()->text->DeleteWordBackward();
- owner->currentBuffer()->update( 1 );
+ owner->view()->text->DeleteWordBackward();
+ owner->view()->update( 1 );
SetUpdateTimer();
moveCursorUpdate(false);
+ owner->getMiniBuffer()->Set(CurrentState());
break;
/* -------> Kill to end of line. */
case LFUN_DELETE_LINE_FORWARD:
FreeUpdateTimer();
- owner->currentBuffer()->update(-2);
- owner->currentBuffer()->text->DeleteLineForward();
- owner->currentBuffer()->update( 1 );
+ owner->view()->update(-2);
+ owner->view()->text->DeleteLineForward();
+ owner->view()->update( 1 );
SetUpdateTimer();
moveCursorUpdate(false);
break;
/* -------> Set mark off. */
case LFUN_MARK_OFF:
- BeforeChange();
- owner->currentBuffer()->update(0);
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->beforeChange();
+ owner->view()->update(0);
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
setMessage(N_("Mark off"));
break;
/* -------> Set mark on. */
case LFUN_MARK_ON:
- BeforeChange();
- owner->currentBuffer()->text->mark_set = 1;
- owner->currentBuffer()->update( 0 );
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->beforeChange();
+ owner->view()->text->mark_set = 1;
+ owner->view()->update( 0 );
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
setMessage(N_("Mark on"));
break;
case LFUN_BACKSPACE:
{
FreeUpdateTimer();
- if (!owner->currentBuffer()->text->selection) {
+ if (!owner->view()->text->selection) {
if (owner->getIntl()->getTrans()->backspace()) {
- owner->currentBuffer()->text->Backspace();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
- SmallUpdate(1);
+ owner->view()->text->Backspace();
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->smallUpdate(1);
// It is possible to make it a lot faster still
// just comment out the lone below...
- owner->currentView()->getScreen()->ShowCursor();
+ owner->view()->showCursor();
}
} else {
- CutCB();
+ owner->view()->cut();
}
SetUpdateTimer();
+ owner->getMiniBuffer()->Set(CurrentState());
+ owner->view()->setState();
}
break;
{
// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
- LyXCursor cursor = owner->currentBuffer()->text->cursor;
+ LyXCursor cursor = owner->view()->text->cursor;
FreeUpdateTimer();
- if (!owner->currentBuffer()->text->selection) {
+ if (!owner->view()->text->selection) {
if (cursor.pos == 0
&& !(cursor.par->added_space_top
== VSpace (VSpace::NONE))) {
- owner->currentBuffer()->text->SetParagraph
+ owner->view()->text->SetParagraph
(cursor.par->line_top,
cursor.par->line_bottom,
cursor.par->pagebreak_top,
VSpace(VSpace::NONE), cursor.par->added_space_bottom,
cursor.par->align,
cursor.par->labelwidthstring, 0);
- owner->currentBuffer()->update (1);
+ owner->view()->update (1);
} else {
- owner->currentBuffer()->text->Backspace();
- owner->currentBuffer()->text->sel_cursor
+ owner->view()->text->Backspace();
+ owner->view()->text->sel_cursor
= cursor;
- SmallUpdate (1);
+ owner->view()->smallUpdate (1);
}
} else
- CutCB();
+ owner->view()->cut();
SetUpdateTimer();
}
break;
case LFUN_BREAKPARAGRAPH:
{
- BeforeChange();
- owner->currentBuffer()->text->BreakParagraph(0);
- SmallUpdate(1);
+ owner->view()->beforeChange();
+ owner->view()->text->BreakParagraph(0);
+ owner->view()->smallUpdate(1);
SetUpdateTimer(0.01);
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
}
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
{
- BeforeChange();
- owner->currentBuffer()->text->BreakParagraph(1);
- SmallUpdate(1);
+ owner->view()->beforeChange();
+ owner->view()->text->BreakParagraph(1);
+ owner->view()->smallUpdate(1);
SetUpdateTimer(0.01);
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
break;
}
// indentation and add a "defskip" at the top.
// Otherwise, do the same as LFUN_BREAKPARAGRAPH.
- LyXCursor cursor = owner->currentBuffer()->text->cursor;
+ LyXCursor cursor = owner->view()->text->cursor;
- BeforeChange();
+ owner->view()->beforeChange();
if (cursor.pos == 0) {
if (cursor.par->added_space_top == VSpace(VSpace::NONE)) {
- owner->currentBuffer()->text->SetParagraph
+ owner->view()->text->SetParagraph
(cursor.par->line_top,
cursor.par->line_bottom,
cursor.par->pagebreak_top,
VSpace(VSpace::DEFSKIP), cursor.par->added_space_bottom,
cursor.par->align,
cursor.par->labelwidthstring, 1);
- owner->currentBuffer()->update(1);
+ owner->view()->update(1);
}
}
else {
- owner->currentBuffer()->text->BreakParagraph(0);
- SmallUpdate(1);
+ owner->view()->text->BreakParagraph(0);
+ owner->view()->smallUpdate(1);
}
SetUpdateTimer(0.01);
- owner->currentBuffer()->text->sel_cursor = cursor;
+ owner->view()->text->sel_cursor = cursor;
+ owner->view()->setState();
+ owner->getMiniBuffer()->Set(CurrentState());
}
break;
case LFUN_QUOTE:
- BeforeChange();
- owner->currentBuffer()->text->InsertChar('\"'); // This " matches the single quote in the code
- SmallUpdate(1);
+ owner->view()->beforeChange();
+ owner->view()->text->InsertChar('\"'); // This " matches the single quote in the code
+ owner->view()->smallUpdate(1);
SetUpdateTimer();
moveCursorUpdate(false);
break;
case LFUN_HTMLURL:
case LFUN_URL:
{
- InsetCommand *new_inset;
+ InsetCommand * new_inset;
if (action == LFUN_HTMLURL)
new_inset = new InsetUrl("htmlurl", "", "");
else
new_inset = new InsetUrl("url", "", "");
- owner->currentBuffer()->insertInset(new_inset);
- new_inset->Edit(0, 0);
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+ case LFUN_INSET_TEXT:
+ {
+ InsetText * new_inset = new InsetText(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+ case LFUN_INSET_ERT:
+ {
+ InsetERT * new_inset = new InsetERT(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
+ }
+ break;
+ case LFUN_INSET_FOOTNOTE:
+ {
+ InsetFoot * new_inset = new InsetFoot(owner->buffer());
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
break;
case LFUN_CHARATCURSOR:
{
- int pos = owner->currentBuffer()->text->cursor.pos;
- if(pos < owner->currentBuffer()->text->cursor.par->last)
- dispatch_buffer = owner->currentBuffer()->text->
- cursor.par->text[pos];
+ LyXParagraph::size_type pos =
+ owner->view()->text->cursor.pos;
+ if(pos < owner->view()->text->cursor.par->size())
+ //dispatch_buffer = owner->view()->text->
+ // cursor.par->text[pos];
+ dispatch_buffer =
+ owner->view()->text->
+ cursor.par->GetChar(pos);
else
dispatch_buffer = "EOF";
}
case LFUN_GETXY:
dispatch_buffer =
- tostr(owner->currentBuffer()->text->cursor.x) + ' '
- + tostr(owner->currentBuffer()->text->cursor.y);
+ tostr(owner->view()->text->cursor.x) + ' '
+ + tostr(owner->view()->text->cursor.y);
break;
case LFUN_SETXY:
int x;
long y;
sscanf(argument.c_str(), " %d %ld", &x, &y);
- owner->currentBuffer()->text->SetCursorFromCoordinates(x, y);
+ owner->view()->text->SetCursorFromCoordinates(x, y);
}
break;
case LFUN_GETLAYOUT:
dispatch_buffer =
- tostr(owner->currentBuffer()->text->cursor.par->layout);
+ tostr(owner->view()->text->cursor.par->layout);
break;
case LFUN_GETFONT:
{
- LyXFont *font = &(owner->currentBuffer()->text->current_font);
+ LyXFont * font = &(owner->view()->text->current_font);
if(font->shape() == LyXFont::ITALIC_SHAPE)
dispatch_buffer = 'E';
else if(font->shape() == LyXFont::SMALLCAPS_SHAPE)
case LFUN_GETLATEX:
{
- LyXFont *font = &(owner->currentBuffer()->text->current_font);
+ LyXFont * font = &(owner->view()->text->current_font);
if(font->latex() == LyXFont::ON)
dispatch_buffer = 'L';
else
break;
case LFUN_GETNAME:
- setMessage(owner->currentBuffer()->getFileName());
+ setMessage(owner->buffer()->fileName());
lyxerr.debug() << "FNAME["
- << owner->currentBuffer()->getFileName()
+ << owner->buffer()->fileName()
<< "] " << endl;
break;
case LFUN_NOTIFY:
{
- char buf[100];
- keyseq.print(buf,100);
+ string buf;
+ keyseq.print(buf);
dispatch_buffer = buf;
lyxserver->notifyClient(dispatch_buffer);
}
// Either change buffer or load the file
if (bufferlist.exists(s))
- owner->currentView()->setBuffer(bufferlist.getBuffer(s));
+ owner->view()->buffer(bufferlist.getBuffer(s));
else
- owner->currentView()->setBuffer(bufferlist.loadLyXFile(s));
+ owner->view()->buffer(bufferlist.loadLyXFile(s));
// Set the cursor
- owner->currentBuffer()->setCursorFromRow(row);
+ owner->view()->setCursorFromRow(row);
// Recenter screen
- BeforeChange();
- if (owner->currentBuffer()->text->cursor.y >
- owner->currentView()->getWorkArea()->h / 2) {
- owner->currentView()->getScreen()->
- Draw(owner->currentBuffer()->text->cursor.y -
- owner->currentView()->getWorkArea()->h/2);
- } else { // <=
- owner->currentView()->getScreen()->
- Draw(0);
- }
- owner->currentBuffer()->update(0);
- owner->currentView()->redraw();
+ owner->view()->center();
}
break;
case LFUN_GETTIP:
{
int qa = lyxaction.LookupFunc(argument.c_str());
- setMessage(lyxaction.helpText((kb_action)qa));
+ setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
}
break;
{
char c;
- if (keyseq.length==-1 && keyseq.getiso()!=0)
- c=keyseq.getiso();
+ if (keyseq.length == -1 && keyseq.getiso() != 0)
+ c = keyseq.getiso();
else
- c=0;
+ c = 0;
owner->getIntl()->getTrans()->
deadkey(c, get_accent(action).accent,
- owner->currentBuffer()->text);
+ owner->view()->text);
// Need to reset, in case the minibuffer calls these
// actions
keyseq.reset();
- keyseq.length=0;
+ keyseq.length = 0;
// copied verbatim from do_accent_char
- SmallUpdate(1);
+ owner->view()->smallUpdate(1);
SetUpdateTimer();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
}
break;
// --- insert characters ----------------------------------------
- case LFUN_INSERT_INSET_LATEX:
- {
- Inset *new_inset = new InsetLatex(argument);
- owner->currentBuffer()->insertInset(new_inset);
- }
- break;
-
// --- Mathed stuff. If we are here, there is no locked inset yet.
// Greek mode
// Greek keyboard
case LFUN_GREEK_TOGGLE:
{
- greek_kb_flag = (greek_kb_flag) ? 0: 2;
+ greek_kb_flag = greek_kb_flag ? 0 : 2;
if (greek_kb_flag) {
setMessage(N_("Math greek keyboard on"));
} else {
case LFUN_MATH_DELIM:
case LFUN_INSERT_MATRIX:
{
- if (owner->currentView()->available()) {
- owner->currentBuffer()->
+ if (owner->view()->available()) {
+ owner->view()->
open_new_inset(new InsetFormula(false));
- owner->currentBuffer()->
- the_locking_inset->LocalDispatch(action, argument.c_str());
+ owner->view()
+ ->the_locking_inset
+ ->LocalDispatch(owner->view(),
+ action,
+ argument);
}
}
break;
case LFUN_MATH_DISPLAY:
{
- if (owner->currentView()->available())
- owner->currentBuffer()->open_new_inset(new InsetFormula(true));
+ if (owner->view()->available())
+ owner->view()->open_new_inset(new InsetFormula(true));
break;
}
case LFUN_MATH_MACRO:
{
- if (owner->currentView()->available()) {
+ if (owner->view()->available()) {
string s(argument);
if (s.empty())
- setErrorMessage(N_("Missing argument"));
+ setErrorMessage(N_("Missing argument"));
else {
- string s1 = token(s, ' ', 1);
- int na = s1.empty() ? 0: atoi(s1.c_str());
- owner->currentBuffer()->
- open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
+ string s1 = token(s, ' ', 1);
+ int na = s1.empty() ? 0: atoi(s1.c_str());
+ owner->view()->
+ open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na));
}
}
}
case LFUN_MATH_MODE: // Open or create a math inset
{
- if (owner->currentView()->available())
- owner->currentBuffer()->open_new_inset(new InsetFormula);
+ if (owner->view()->available())
+ owner->view()->open_new_inset(new InsetFormula);
setMessage(N_("Math editor mode"));
}
break;
case LFUN_INSERT_CITATION:
{
- InsetCitation *new_inset = new InsetCitation();
+ 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.
new_inset->setOptions(token(lsarg, '|', 1));
} else
new_inset->setContents(lsarg);
- owner->currentBuffer()->insertInset(new_inset);
+ owner->view()->insertInset(new_inset);
} else {
- owner->currentBuffer()->insertInset(new_inset);
- new_inset->Edit(0,0);
+ owner->view()->insertInset(new_inset);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
}
break;
string bibstyle = token(lsarg, ' ', 1);
if (bibstyle.empty())
bibstyle = "plain";
- InsetBibtex *new_inset
+ InsetBibtex * new_inset
= new InsetBibtex(token(lsarg, ' ', 0),
bibstyle,
- owner->currentBuffer());
+ owner->buffer());
- owner->currentBuffer()->insertInset(new_inset);
+ owner->view()->insertInset(new_inset);
if (lsarg.empty()) {
- new_inset->Edit(0,0);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
}
break;
// BibTeX data bases
case LFUN_BIBDB_ADD:
{
- InsetBibtex *inset =
- (InsetBibtex*)getInsetByCode(Inset::BIBTEX_CODE);
+ InsetBibtex * inset =
+ static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
if (inset) {
inset->addDatabase(argument);
}
case LFUN_BIBDB_DEL:
{
- InsetBibtex *inset =
- (InsetBibtex*)getInsetByCode(Inset::BIBTEX_CODE);
+ InsetBibtex * inset =
+ static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
if (inset) {
inset->delDatabase(argument);
}
case LFUN_BIBTEX_STYLE:
{
- InsetBibtex *inset =
- (InsetBibtex*)getInsetByCode(Inset::BIBTEX_CODE);
+ InsetBibtex * inset =
+ static_cast<InsetBibtex*>(getInsetByCode(Inset::BIBTEX_CODE));
if (inset) {
inset->setOptions(argument);
}
case LFUN_INDEX_INSERT:
case LFUN_INDEX_INSERT_LAST:
{
- InsetIndex *new_inset = new InsetIndex();
+ // Can't do that at the beginning of a paragraph.
+ if (owner->view()->text->cursor.pos - 1 < 0)
+ break;
+
+ InsetIndex * new_inset = new InsetIndex();
if (!argument.empty()) {
string lsarg(argument);
new_inset->setContents(lsarg);
- owner->currentBuffer()->insertInset(new_inset);
+ owner->view()->insertInset(new_inset);
} else {
- //reh 98/09/21
- //get the current word for an argument
-
-
- // grab a word
-
- int lastpos =owner->currentBuffer()->text->cursor.pos-1;
-
- //this shouldn't happen, but let's be careful
- if (lastpos < 0) lastpos=0;
-
- // get the current word
- // note that this must be done before
- // inserting the inset, or the inset will break
- // the word
- string curstring(owner->currentBuffer()->text->cursor.par->GetWord(lastpos));
-
- //make the new inset and write the current word into it
- InsetIndex *new_inset = new InsetIndex();
-
- new_inset->setContents(curstring);
-
- //don't edit it if the call was to INSERT_LAST
- if(action!=LFUN_INDEX_INSERT_LAST) {
- new_inset->Edit(0,0);
- } else {
- //it looks blank on the screen unless
- //we do something. put it here.
-
- // move the cursor to the returned value of lastpos
- // but only for the auto-insert
- owner->currentBuffer()->text->cursor.pos=lastpos;
- }
-
- //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
- owner->currentBuffer()->insertInset(new_inset);
+ //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));
+
+ //make the new inset and write the current word into it
+ InsetIndex * new_inset = new InsetIndex();
+
+ new_inset->setContents(curstring);
+
+ //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.
+
+ // move the cursor to the returned value of lastpos
+ // but only for the auto-insert
+ owner->view()->text->cursor.pos = lastpos;
+ }
+
+ //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
+ owner->view()->insertInset(new_inset);
}
}
break;
case LFUN_INDEX_PRINT:
{
- Inset *new_inset = new InsetPrintIndex(owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset, "Standard", true);
+ Inset * new_inset = new InsetPrintIndex(owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
}
break;
case LFUN_PARENTINSERT:
{
lyxerr << "arg " << argument << endl;
- Inset *new_inset = new InsetParent(argument, owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset, "Standard", true);
+ Inset * new_inset = new InsetParent(argument, owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
}
break;
case LFUN_CHILDINSERT:
{
- Inset *new_inset = new InsetInclude(argument,owner->currentBuffer());
- owner->currentBuffer()->insertInset(new_inset, "Standard", true);
- new_inset->Edit(0,0);
+ Inset * new_inset = new InsetInclude(argument,
+ owner->buffer());
+ owner->view()->insertInset(new_inset, "Standard", true);
+ new_inset->Edit(owner->view(), 0, 0, 0);
}
break;
case LFUN_CHILDOPEN:
{
- string filename = MakeAbsPath(argument,
- OnlyPath(owner->currentBuffer()->getFileName()));
+ string filename =
+ MakeAbsPath(argument,
+ OnlyPath(owner->buffer()->fileName()));
setMessage(N_("Opening child document ") +
MakeDisplayPath(filename) + "...");
- owner->currentView()->savePosition();
+ owner->view()->savePosition();
if (bufferlist.exists(filename))
- owner->currentView()->setBuffer(bufferlist.getBuffer(filename));
+ owner->view()->buffer(bufferlist.getBuffer(filename));
else
- owner->currentView()->setBuffer(bufferlist.loadLyXFile(filename));
+ owner->view()->buffer(bufferlist.loadLyXFile(filename));
}
break;
case LFUN_INSERT_NOTE:
- NoteCB();
+ owner->view()->insertNote();
break;
case LFUN_INSERTFOOTNOTE:
setErrorMessage(N_("Unknown kind of footnote"));
break;
}
- owner->currentBuffer()->text->InsertFootnoteEnvironment(kind);
- owner->currentBuffer()->update(1);
+ owner->view()->text->InsertFootnoteEnvironment(kind);
+ owner->view()->update(1);
+ owner->view()->setState();
}
break;
case LFUN_SELFINSERT:
{
for (string::size_type i = 0; i < argument.length(); ++i) {
- owner->currentBuffer()->text->InsertChar(argument[i]);
+ owner->view()->text->InsertChar(argument[i]);
// This needs to be in the loop, or else we
// won't break lines correctly. (Asger)
- SmallUpdate(1);
+ owner->view()->smallUpdate(1);
}
SetUpdateTimer();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
moveCursorUpdate(false);
}
break;
+ case LFUN_SEQUENCE:
+ {
+ // argument contains ';'-terminated commands
+ while (argument.find(';') != string::npos) {
+ string first;
+ argument = split(argument, first, ';');
+ Dispatch(first);
+ }
+ }
+ break;
+
+ case LFUN_DATE_INSERT: // jdblair: date-insert cmd
+ {
+ char datetmp[32];
+ int datetmp_len;
+ time_t now_time_t;
+ struct tm *now_tm;
+ static string arg;
+
+ now_time_t = time(NULL);
+ now_tm = localtime(&now_time_t);
+ (void)setlocale(LC_TIME, "");
+ if (!argument.empty())
+ arg = argument;
+ else if (arg.empty())
+ arg = lyxrc.date_insert_format;
+ datetmp_len = (int) strftime(datetmp, 32, arg.c_str(), now_tm);
+ for (int i = 0; i < datetmp_len; i++) {
+ owner->view()->text->InsertChar(datetmp[i]);
+ owner->view()->smallUpdate(1);
+ }
+ SetUpdateTimer();
+ owner->view()->text->sel_cursor = owner->view()->text->cursor;
+ moveCursorUpdate(false);
+ }
+ break;
+
+ case LFUN_SAVEPREFERENCES:
+ {
+ Path p(user_lyxdir);
+ lyxrc.write("preferences");
+ }
+ break;
+
case LFUN_UNKNOWN_ACTION:
{
- if (owner->currentBuffer()->isReadonly()) {
+ if(!owner->buffer()) {
+ LyXBell();
+ setErrorMessage(N_("No document open"));
+ break;
+ }
+
+ if (owner->buffer()->isReadonly()) {
LyXBell();
setErrorMessage(N_("Document is read only"));
break;
* "auto_region_delete", which defaults to
* true (on). */
- if ( lyxrc->auto_region_delete ) {
- if (owner->currentBuffer()->text->selection){
- owner->currentBuffer()->text->CutSelection(false);
- owner->currentBuffer()->update(-1);
+ if ( lyxrc.auto_region_delete ) {
+ if (owner->view()->text->selection){
+ owner->view()->text->CutSelection(false);
+ owner->view()->update(-1);
}
}
- BeforeChange();
- for (string::size_type i = 0; i < argument.length(); ++i) {
+ owner->view()->beforeChange();
+
+ if (isdigit(argument[0]) &&
+ (lyxrc.auto_mathmode == "true" ||
+ (lyxrc.auto_mathmode == "rtl" &&
+ owner->view()->text->real_current_font.isVisibleRightToLeft()
+ ))) {
+ UpdatableInset * tmpinset = new InsetFormula;
+ LyXCursor & cursor = owner->view()->text->cursor;
+ if (cursor.pos > 0 &&
+ cursor.par->GetChar(cursor.pos - 1) == '-' &&
+ (cursor.pos == 1 ||
+ cursor.par->IsSeparator(cursor.pos - 2) ||
+ cursor.par->IsNewline(cursor.pos - 2) )
+ ) {
+ owner->view()->text->Backspace();
+ owner->view()->open_new_inset(tmpinset);
+ tmpinset->LocalDispatch(owner->view(),
+ LFUN_UNKNOWN_ACTION,
+ "-");
+ } else {
+ owner->view()->open_new_inset(tmpinset);
+ }
+ tmpinset->LocalDispatch(owner->view(),
+ LFUN_UNKNOWN_ACTION,
+ argument);
+ return string();
+ }
+
+ for (string::size_type i = 0;
+ i < argument.length(); ++i) {
if (greek_kb_flag) {
if (!math_insert_greek(argument[i]))
- owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->currentBuffer()->text);
+ owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
} else
- owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->currentBuffer()->text);
+ owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
}
- SmallUpdate(1);
+ owner->view()->smallUpdate(1);
SetUpdateTimer();
- owner->currentBuffer()->text->sel_cursor =
- owner->currentBuffer()->text->cursor;
+ owner->view()->text->sel_cursor =
+ owner->view()->text->cursor;
moveCursorUpdate(false);
return string();
} else {
} // end of switch
exit_with_message:
- string res=getMessage();
+ string res = getMessage();
if (res.empty()) {
if (!commandshortcut.empty()) {
+ " " + commandshortcut);
}
- return getMessage();
+ return res;
}
-
+
void LyXFunc::setupLocalKeymap()
{
void LyXFunc::MenuNew(bool fromTemplate)
{
- string fname, initpath = lyxrc->document_path;
+ string fname, initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
- if (owner->currentView()->available()) {
- string trypath = owner->currentBuffer()->filepath;
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath) == 1)
initpath = trypath;
}
ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
- fileDlg.SetButton(1, _("Templates"), lyxrc->template_path);
+ 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();
// Check if the document already is open
if (bufferlist.exists(s)){
switch(AskConfirmation(_("Document is already open:"),
- MakeDisplayPath(s,50),
+ 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)))
+ {
+ case 1: // Yes: close the document
+ if (!bufferlist.close(bufferlist.getBuffer(s)))
// If close is canceled, we cancel here too.
+ return;
+ break;
+ case 2: // No: switch to the open document
+ owner->view()->buffer(bufferlist.getBuffer(s));
return;
- break;
- case 2: // No: switch to the open document
- owner->currentView()->setBuffer(bufferlist.getBuffer(s));
- return;
- case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
+ case 3: // Cancel: Do nothing
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
}
// Check whether the file already exists
if (IsLyXFilename(s)) {
- FilePtr myfile(s, FilePtr::read);
- if (myfile() &&
+ FileInfo fi(s);
+ if (fi.readable() &&
AskQuestion(_("File already exists:"),
- MakeDisplayPath(s,50),
+ MakeDisplayPath(s, 50),
_("Do you want to open the document?"))) {
// loads document
owner->getMiniBuffer()->Set(_("Opening document"),
MakeDisplayPath(s), "...");
XFlush(fl_display);
- owner->currentView()->setBuffer(
+ owner->view()->buffer(
bufferlist.loadLyXFile(s));
owner->getMiniBuffer()->Set(_("Document"),
MakeDisplayPath(s),
if (fromTemplate) {
ProhibitInput();
fname = fileDlg.Select(_("Choose template"),
- lyxrc->template_path,
+ lyxrc.template_path,
"*.lyx");
templname = fname;
AllowInput();
// find a free buffer
lyxerr.debug() << "Find a free buffer." << endl;
- owner->currentView()->setBuffer(bufferlist.newFile(s,templname));
+ owner->view()->buffer(bufferlist.newFile(s, templname));
}
void LyXFunc::MenuOpen()
{
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
- if (owner->currentView()->available()) {
- string trypath = owner->currentBuffer()->filepath;
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath) == 1)
initpath = trypath;
// launches dialog
ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
string filename = fileDlg.Select(_("Select Document to Open"),
- initpath, "*.lyx");
+ initpath, "*.lyx");
AllowInput();
// check selected filename
MakeDisplayPath(filename), "...");
Buffer * openbuf = bufferlist.loadLyXFile(filename);
if (openbuf) {
- owner->currentView()->setBuffer(openbuf);
+ owner->view()->buffer(openbuf);
owner->getMiniBuffer()->Set(_("Document"),
MakeDisplayPath(filename),
_("opened."));
void LyXFunc::doImportASCII(bool linorpar)
{
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
- if (owner->currentView()->available()) {
- string trypath = owner->currentBuffer()->filepath;
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath) == 1)
initpath = trypath;
// launches dialog
ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
string filename = fileDlg.Select(_("Select ASCII file to Import"),
- initpath, "*.txt");
+ initpath, "*.txt");
AllowInput();
// check selected filename
string s = ChangeExtension(filename, ".lyx", false);
// Check if the document already is open
- if (bufferlist.exists(s)){
+ if (bufferlist.exists(s)) {
switch(AskConfirmation(_("Document is already open:"),
- MakeDisplayPath(s,50),
+ 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)))
+ {
+ case 1: // Yes: close the document
+ if (!bufferlist.close(bufferlist.getBuffer(s)))
// If close is canceled, we cancel here too.
+ return;
+ break;
+ case 2: // No: switch to the open document
+ owner->view()->buffer(bufferlist.getBuffer(s));
return;
- break;
- case 2: // No: switch to the open document
- owner->currentView()->setBuffer(bufferlist.getBuffer(s));
- return;
- case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
+ case 3: // Cancel: Do nothing
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
}
// Check if a LyX document by the same root exists in filesystem
return;
}
- owner->currentView()->setBuffer(bufferlist.newFile(s,string()));
+ owner->view()->buffer(bufferlist.newFile(s, string()));
owner->getMiniBuffer()->Set(_("Importing ASCII file"),
MakeDisplayPath(filename), "...");
// Insert ASCII file
- InsertAsciiFile(filename,linorpar);
+ InsertAsciiFile(owner->view(), filename, linorpar);
owner->getMiniBuffer()->Set(_("ASCII file "),
MakeDisplayPath(filename),
_("imported."));
void LyXFunc::doImportLaTeX(bool isnoweb)
{
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
- if (owner->currentView()->available()) {
- string trypath = owner->currentBuffer()->filepath;
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath) == 1)
initpath = trypath;
// launches dialog
ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
string filename;
string LyXfilename = ChangeExtension(filename, ".lyx", false);
if (bufferlist.exists(LyXfilename)){
switch(AskConfirmation(_("Document is already open:"),
- MakeDisplayPath(LyXfilename,50),
+ MakeDisplayPath(LyXfilename, 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(LyXfilename)))
+ {
+ case 1: // Yes: close the document
+ if (!bufferlist.close(bufferlist.getBuffer(LyXfilename)))
// If close is canceled, we cancel here too.
+ return;
+ break;
+ case 2: // No: switch to the open document
+ owner->view()->buffer(
+ bufferlist.getBuffer(LyXfilename));
return;
- break;
- case 2: // No: switch to the open document
- owner->currentView()->setBuffer(
- bufferlist.getBuffer(LyXfilename));
- return;
- case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
- return;
- }
+ case 3: // Cancel: Do nothing
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
}
// Check if a LyX document by the same root exists in filesystem
openbuf = myImport.run();
}
if (openbuf) {
- owner->currentView()->setBuffer(openbuf);
+ owner->view()->buffer(openbuf);
owner->getMiniBuffer()->Set(isnoweb ?
_("Noweb file ") : _("LateX file "),
MakeDisplayPath(filename),
}
+void LyXFunc::doImportLinuxDoc()
+{
+ string initpath = lyxrc.document_path;
+ LyXFileDlg fileDlg;
+
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
+ // If directory is writeable, use this as default.
+ if (IsDirWriteable(trypath) == 1)
+ initpath = trypath;
+ }
+
+ // launches dialog
+ ProhibitInput();
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
+ fileDlg.SetButton(1, _("Examples"),
+ AddPath(system_lyxdir, "examples"));
+
+ string filename = fileDlg.Select(_("Select LinuxDoc file to Import"),
+ initpath, "*.sgml");
+
+ AllowInput();
+
+ // check selected filename
+ if (filename.empty()) {
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
+
+ // get absolute path of file
+ filename = MakeAbsPath(filename);
+
+ // Check if the document already is open
+ string LyXfilename = ChangeExtension(filename, ".lyx", false);
+ if (bufferlist.exists(LyXfilename)){
+ switch(AskConfirmation(_("Document is already open:"),
+ MakeDisplayPath(LyXfilename, 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(LyXfilename)))
+ // If close is canceled, we cancel here too.
+ return;
+ break;
+ case 2: // No: switch to the open document
+ owner->view()->buffer(
+ bufferlist.getBuffer(LyXfilename));
+ return;
+ case 3: // Cancel: Do nothing
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
+ }
+
+ // Check if a LyX document by the same root exists in filesystem
+ FileInfo f(LyXfilename, true);
+ if (f.exist() && !AskQuestion(_("A document by the name"),
+ MakeDisplayPath(LyXfilename),
+ _("already exists. Overwrite?"))) {
+ owner->getMiniBuffer()->Set(_("Canceled."));
+ return;
+ }
+
+ // loads document
+ owner->getMiniBuffer()->Set(_("Importing LinuxDoc file"),
+ MakeDisplayPath(filename), "...");
+
+ // run sgml2lyx
+ string tmp = lyxrc.linuxdoc_to_lyx_command + filename;
+ Systemcalls one;
+ Buffer * buf = 0;
+
+ int result = one.startscript(Systemcalls::System, tmp);
+ if (result == 0) {
+ string filename = ChangeExtension(filename, ".lyx", false);
+ // File was generated without problems. Load it.
+ buf = bufferlist.loadLyXFile(filename);
+ owner->view()->buffer(buf);
+ owner->getMiniBuffer()->Set(_("LinuxDoc file "),
+ MakeDisplayPath(filename),
+ _("imported."));
+ } else {
+ owner->getMiniBuffer()->Set(_("Could not import LinuxDoc file"),
+ MakeDisplayPath(filename));
+ }
+}
+
+
void LyXFunc::MenuInsertLyXFile(string const & filen)
{
string filename = filen;
if (filename.empty()) {
// Launch a file browser
- string initpath = lyxrc->document_path;
+ string initpath = lyxrc.document_path;
LyXFileDlg fileDlg;
- if (owner->currentView()->available()) {
- string trypath = owner->currentBuffer()->filepath;
+ if (owner->view()->available()) {
+ string trypath = owner->buffer()->filepath;
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath) == 1)
initpath = trypath;
// launches dialog
ProhibitInput();
- fileDlg.SetButton(0, _("Documents"), lyxrc->document_path);
+ fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
fileDlg.SetButton(1, _("Examples"),
AddPath(system_lyxdir, "examples"));
filename = fileDlg.Select(_("Select Document to Insert"),
// Inserts document
owner->getMiniBuffer()->Set(_("Inserting document"),
MakeDisplayPath(filename), "...");
- bool res = owner->currentBuffer()->insertLyXFile(filename);
+ bool res = owner->view()->insertLyXFile(filename);
if (res) {
owner->getMiniBuffer()->Set(_("Document"),
MakeDisplayPath(filename),
void LyXFunc::reloadBuffer()
{
- string fn = owner->currentBuffer()->getFileName();
- if (bufferlist.close(owner->currentBuffer()))
- owner->currentView()->setBuffer(bufferlist.loadLyXFile(fn));
+ string fn = owner->buffer()->fileName();
+ if (bufferlist.close(owner->buffer()))
+ owner->view()->buffer(bufferlist.loadLyXFile(fn));
}
void LyXFunc::CloseBuffer()
{
- if (bufferlist.close(owner->currentBuffer()) && !quitting) {
- if (bufferlist.isEmpty()) {
+ if (bufferlist.close(owner->buffer()) && !quitting) {
+ if (bufferlist.empty()) {
// need this otherwise SEGV may occur while trying to
// set variables that don't exist
// since there's no current buffer
CloseAllBufferRelatedPopups();
}
else {
- owner->currentView()->setBuffer(bufferlist.first());
+ owner->view()->buffer(bufferlist.first());
}
}
}
-Inset* LyXFunc::getInsetByCode(Inset::Code code)
+Inset * LyXFunc::getInsetByCode(Inset::Code code)
{
bool found = false;
- Inset* inset = 0;
- LyXCursor cursor = owner->currentBuffer()->text->cursor;
- int pos = cursor.pos;
- LyXParagraph *par = cursor.par;
+ Inset * inset = 0;
+ LyXCursor cursor = owner->view()->text->cursor;
+ LyXParagraph::size_type pos = cursor.pos;
+ LyXParagraph * par = cursor.par;
while (par && !found) {
while ((inset = par->ReturnNextInsetPointer(pos))){
- if (inset->LyxCode()==code) {
+ if (inset->LyxCode() == code) {
found = true;
break;
}
- pos++;
+ ++pos;
}
par = par->next;
}
- return (found) ? inset: 0;
+ return found ? inset : 0;
}
// This func is bit problematic when it comes to NLS, to make the
// lyx servers client be language indepenent we must not translate
// strings sent to this func.
-void LyXFunc::setErrorMessage(string const &m)
+void LyXFunc::setErrorMessage(string const & m) const
{
dispatch_buffer = m;
errorstat = true;
projects / lyx.git / blobdiff