2003-08-23 00:17:00 +00:00
|
|
|
|
/**
|
|
|
|
|
* \file text3.C
|
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-08-20 13:00:25 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* \author Asger Alstrup
|
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
* \author Alfredo Braunstein
|
|
|
|
|
* \author Angus Leeming
|
|
|
|
|
* \author John Levon
|
|
|
|
|
* \author Andr<EFBFBD> P<EFBFBD>nitz
|
2002-08-20 13:00:25 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include "lyxtext.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
|
2005-11-02 11:27:08 +00:00
|
|
|
|
#include "BranchList.h"
|
2004-03-18 13:57:20 +00:00
|
|
|
|
#include "FloatList.h"
|
|
|
|
|
#include "FuncStatus.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "buffer.h"
|
2005-02-25 11:55:36 +00:00
|
|
|
|
#include "buffer_funcs.h"
|
2003-09-09 11:24:33 +00:00
|
|
|
|
#include "bufferparams.h"
|
2002-08-20 13:00:25 +00:00
|
|
|
|
#include "BufferView.h"
|
2003-11-04 12:36:59 +00:00
|
|
|
|
#include "cursor.h"
|
2004-08-14 14:03:42 +00:00
|
|
|
|
#include "coordcache.h"
|
2004-03-25 09:16:36 +00:00
|
|
|
|
#include "CutAndPaste.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "debug.h"
|
2003-10-29 10:47:21 +00:00
|
|
|
|
#include "dispatchresult.h"
|
2006-08-13 16:16:43 +00:00
|
|
|
|
#include "errorlist.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "factory.h"
|
2002-08-20 13:00:25 +00:00
|
|
|
|
#include "funcrequest.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "gettext.h"
|
|
|
|
|
#include "intl.h"
|
|
|
|
|
#include "language.h"
|
2005-02-08 02:06:39 +00:00
|
|
|
|
#include "LyXAction.h"
|
2004-02-06 13:59:26 +00:00
|
|
|
|
#include "lyxfunc.h"
|
2004-02-13 11:05:29 +00:00
|
|
|
|
#include "lyxlex.h"
|
2002-08-20 13:00:25 +00:00
|
|
|
|
#include "lyxrc.h"
|
2003-09-06 12:36:58 +00:00
|
|
|
|
#include "lyxrow.h"
|
2003-09-06 17:23:08 +00:00
|
|
|
|
#include "paragraph.h"
|
2003-11-10 18:15:55 +00:00
|
|
|
|
#include "paragraph_funcs.h"
|
2002-08-20 13:00:25 +00:00
|
|
|
|
#include "ParagraphParameters.h"
|
2003-10-14 13:01:49 +00:00
|
|
|
|
#include "undo.h"
|
2003-09-09 17:00:19 +00:00
|
|
|
|
#include "vspace.h"
|
2006-04-26 22:43:26 +00:00
|
|
|
|
#include "pariterator.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
|
2006-07-03 20:19:33 +00:00
|
|
|
|
#include "frontends/Clipboard.h"
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
#include "frontends/Selection.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
|
2002-08-27 12:32:04 +00:00
|
|
|
|
#include "insets/insetcommand.h"
|
2004-02-12 16:36:01 +00:00
|
|
|
|
#include "insets/insetfloatlist.h"
|
2003-03-12 19:16:42 +00:00
|
|
|
|
#include "insets/insetnewline.h"
|
2004-02-20 10:32:44 +00:00
|
|
|
|
#include "insets/insetquotes.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "insets/insetspecialchar.h"
|
|
|
|
|
#include "insets/insettext.h"
|
|
|
|
|
|
|
|
|
|
#include "support/lstrings.h"
|
2004-02-11 14:45:44 +00:00
|
|
|
|
#include "support/lyxlib.h"
|
2005-01-06 16:39:35 +00:00
|
|
|
|
#include "support/convert.h"
|
2005-07-05 09:01:52 +00:00
|
|
|
|
#include "support/lyxtime.h"
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-09-17 09:14:18 +00:00
|
|
|
|
#include "mathed/InsetMathHull.h"
|
|
|
|
|
#include "mathed/MathMacroTemplate.h"
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2005-03-07 11:03:45 +00:00
|
|
|
|
#include <boost/current_function.hpp>
|
|
|
|
|
|
2003-09-05 22:17:02 +00:00
|
|
|
|
#include <clocale>
|
2004-07-24 10:55:30 +00:00
|
|
|
|
#include <sstream>
|
2002-08-27 13:39:27 +00:00
|
|
|
|
|
2003-09-09 22:13:45 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
namespace lyx {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
using cap::copySelection;
|
|
|
|
|
using cap::cutSelection;
|
|
|
|
|
using cap::pasteSelection;
|
|
|
|
|
using cap::replaceSelection;
|
|
|
|
|
|
|
|
|
|
using support::isStrUnsignedInt;
|
|
|
|
|
using support::token;
|
2003-06-30 23:56:22 +00:00
|
|
|
|
|
2002-08-20 17:31:23 +00:00
|
|
|
|
using std::endl;
|
2003-10-06 15:43:21 +00:00
|
|
|
|
using std::string;
|
2003-09-05 18:02:24 +00:00
|
|
|
|
using std::istringstream;
|
view-source feature, from Bo Peng <ben.bob@gmail.com>
* src/buffer.h buffer.C - getSourceCode()
* src/lyxfunc.C - open view-source dialog
* src/text3.C - change LFUN_MOUSE_RELEASE
* src/output_linuxdoc.C, src/output_docbook.C, src/output_latex.C
- intercept output
* src/outputparams.h, outputparams.C - add par_begin, par_end, dryrun
* src/insets/insetgraphics.C - add dryrun mode of file conversion
* lib/ui/stdmenus.ui - add view-source menu item under view
* Add view-source dialog, add
src/frontends/qt2/QViewSourceDialog.h, QViewSource.C, QViewSource.h, QViewSourceDialog.C
src/frontends/qt2/ui/QViewSourceDialogBase.ui
src/frontends/controllers/ControlViewSource.h ControlViewSource.C
modify
src/frontends/qt2/Makefile.dialogs, Makefile.am, Dialogs.C,
src/frontends/controllers/Makefile.am, po.POTFILES.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13610 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-09 02:48:54 +00:00
|
|
|
|
using std::ostringstream;
|
2003-09-08 00:33:41 +00:00
|
|
|
|
|
|
|
|
|
|
2002-08-20 15:26:52 +00:00
|
|
|
|
extern string current_layout;
|
2002-08-28 10:45:38 +00:00
|
|
|
|
|
2002-08-20 15:26:52 +00:00
|
|
|
|
|
2002-08-27 13:17:22 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
// globals...
|
|
|
|
|
LyXFont freefont(LyXFont::ALL_IGNORE);
|
|
|
|
|
bool toggleall = false;
|
|
|
|
|
|
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
void toggleAndShow(LCursor & cur, LyXText * text,
|
2003-11-10 09:06:48 +00:00
|
|
|
|
LyXFont const & font, bool toggleall = true)
|
|
|
|
|
{
|
2004-02-13 07:30:59 +00:00
|
|
|
|
text->toggleFree(cur, font, toggleall);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
|
|
|
|
if (font.language() != ignore_language ||
|
|
|
|
|
font.number() != LyXFont::IGNORE) {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
2004-04-08 15:03:33 +00:00
|
|
|
|
text->bidi.computeTables(par, cur.buffer(), cur.textRow());
|
2004-01-13 10:37:38 +00:00
|
|
|
|
if (cur.boundary() !=
|
2004-04-08 15:03:33 +00:00
|
|
|
|
text->bidi.isBoundary(cur.buffer(), par,
|
2004-01-13 10:37:38 +00:00
|
|
|
|
cur.pos(),
|
2003-11-10 09:06:48 +00:00
|
|
|
|
text->real_current_font))
|
2004-11-24 21:53:46 +00:00
|
|
|
|
text->setCursor(cur, cur.pit(), cur.pos(),
|
2004-01-13 10:37:38 +00:00
|
|
|
|
false, !cur.boundary());
|
2003-11-10 09:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-01-20 14:25:24 +00:00
|
|
|
|
void moveCursor(LCursor & cur, bool selecting)
|
2002-08-27 14:43:49 +00:00
|
|
|
|
{
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (selecting || cur.mark())
|
|
|
|
|
cur.setSelection();
|
|
|
|
|
if (!cur.selection())
|
2006-10-11 17:24:46 +00:00
|
|
|
|
theSelection().haveSelection(false);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.bv().switchKeyMap();
|
2002-08-27 14:43:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-03-08 21:14:45 +00:00
|
|
|
|
void finishChange(LCursor & cur, bool selecting)
|
2002-08-27 13:17:22 +00:00
|
|
|
|
{
|
|
|
|
|
finishUndo();
|
2004-02-06 13:59:26 +00:00
|
|
|
|
moveCursor(cur, selecting);
|
2002-08-27 13:17:22 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-02-11 14:45:44 +00:00
|
|
|
|
|
2004-03-25 09:16:36 +00:00
|
|
|
|
void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
|
2004-02-11 14:45:44 +00:00
|
|
|
|
{
|
2004-03-08 21:14:45 +00:00
|
|
|
|
recordUndo(cur);
|
2006-10-22 14:37:32 +00:00
|
|
|
|
docstring sel = cur.selectionAsString(false);
|
2005-07-15 08:51:34 +00:00
|
|
|
|
//lyxerr << "selection is: '" << sel << "'" << endl;
|
2004-02-11 14:45:44 +00:00
|
|
|
|
|
2006-02-24 12:58:31 +00:00
|
|
|
|
// It may happen that sel is empty but there is a selection
|
|
|
|
|
replaceSelection(cur);
|
|
|
|
|
|
2004-02-11 14:45:44 +00:00
|
|
|
|
if (sel.empty()) {
|
2004-08-12 19:49:25 +00:00
|
|
|
|
const int old_pos = cur.pos();
|
2006-09-16 18:11:38 +00:00
|
|
|
|
cur.insert(new InsetMathHull(hullSimple));
|
2004-08-12 19:49:25 +00:00
|
|
|
|
BOOST_ASSERT(old_pos == cur.pos());
|
2004-04-07 08:07:26 +00:00
|
|
|
|
cur.nextInset()->edit(cur, true);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// don't do that also for LFUN_MATH_MODE
|
|
|
|
|
// unless you want end up with always changing
|
|
|
|
|
// to mathrm when opening an inlined inset --
|
|
|
|
|
// I really hate "LyXfunc overloading"...
|
2004-02-11 14:45:44 +00:00
|
|
|
|
if (display)
|
|
|
|
|
cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
|
2005-10-12 18:40:22 +00:00
|
|
|
|
// Avoid an unnecessary undo step if cmd.argument
|
|
|
|
|
// is empty
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (!cmd.argument().empty())
|
2006-05-05 20:23:12 +00:00
|
|
|
|
cur.dispatch(FuncRequest(LFUN_MATH_INSERT,
|
2006-09-01 15:41:38 +00:00
|
|
|
|
cmd.argument()));
|
2004-02-11 14:45:44 +00:00
|
|
|
|
} else {
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// create a macro if we see "\\newcommand"
|
|
|
|
|
// somewhere, and an ordinary formula
|
|
|
|
|
// otherwise
|
2006-10-22 14:37:32 +00:00
|
|
|
|
if (sel.find(from_ascii("\\newcommand")) == string::npos
|
|
|
|
|
&& sel.find(from_ascii("\\def")) == string::npos)
|
2004-02-11 14:45:44 +00:00
|
|
|
|
{
|
2006-09-16 18:11:38 +00:00
|
|
|
|
InsetMathHull * formula = new InsetMathHull;
|
2006-10-22 14:37:32 +00:00
|
|
|
|
istringstream is(to_utf8(sel));
|
2006-03-02 19:56:05 +00:00
|
|
|
|
LyXLex lex(0, 0);
|
|
|
|
|
lex.setStream(is);
|
|
|
|
|
formula->read(cur.buffer(), lex);
|
2006-09-03 16:14:51 +00:00
|
|
|
|
if (formula->getType() == hullNone)
|
2006-03-02 19:56:05 +00:00
|
|
|
|
// Don't create pseudo formulas if
|
|
|
|
|
// delimiters are left out
|
2006-09-03 16:14:51 +00:00
|
|
|
|
formula->mutate(hullSimple);
|
2006-03-02 19:56:05 +00:00
|
|
|
|
cur.insert(formula);
|
2006-10-22 14:37:32 +00:00
|
|
|
|
} else {
|
|
|
|
|
cur.insert(new MathMacroTemplate(sel));
|
|
|
|
|
}
|
2004-02-11 14:45:44 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_utf8(N_("Math editor mode")));
|
2004-02-11 14:45:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
2002-08-28 12:09:19 +00:00
|
|
|
|
|
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
namespace bv_funcs {
|
|
|
|
|
|
|
|
|
|
string const freefont2string()
|
|
|
|
|
{
|
|
|
|
|
string data;
|
|
|
|
|
if (font2string(freefont, toggleall, data))
|
|
|
|
|
return data;
|
|
|
|
|
return string();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-20 14:42:18 +00:00
|
|
|
|
void LyXText::cursorPrevious(LCursor & cur)
|
2002-08-22 13:02:14 +00:00
|
|
|
|
{
|
2004-01-30 11:41:12 +00:00
|
|
|
|
pos_type cpos = cur.pos();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
pit_type cpar = cur.pit();
|
2003-08-14 11:30:11 +00:00
|
|
|
|
|
2004-02-12 16:36:01 +00:00
|
|
|
|
int x = cur.x_target();
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
2006-11-20 14:42:18 +00:00
|
|
|
|
// FIXME: there would maybe a need for this 'updated' boolean in the future...
|
2005-10-13 14:48:27 +00:00
|
|
|
|
bool updated = setCursorFromCoordinates(cur, x, 0);
|
2006-11-28 17:24:44 +00:00
|
|
|
|
if (cur.inMathed())
|
|
|
|
|
updated |= cur.up();
|
|
|
|
|
else
|
|
|
|
|
updated |= cursorUp(cur);
|
2002-08-22 13:02:14 +00:00
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
if (cpar == cur.pit() && cpos == cur.pos()) {
|
2002-12-20 14:28:28 +00:00
|
|
|
|
// we have a row which is taller than the workarea. The
|
|
|
|
|
// simplest solution is to move to the previous row instead.
|
2006-11-28 17:24:44 +00:00
|
|
|
|
if (cur.inMathed())
|
|
|
|
|
updated |= cur.up();
|
|
|
|
|
else
|
|
|
|
|
updated |= cursorUp(cur);
|
2003-10-23 15:44:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-11-20 10:38:12 +00:00
|
|
|
|
finishUndo();
|
2006-11-20 14:42:18 +00:00
|
|
|
|
cur.updateFlags(Update::Force | Update::FitCursor);
|
2002-08-22 13:02:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-11-20 14:42:18 +00:00
|
|
|
|
void LyXText::cursorNext(LCursor & cur)
|
2002-08-22 13:02:14 +00:00
|
|
|
|
{
|
2004-01-30 11:41:12 +00:00
|
|
|
|
pos_type cpos = cur.pos();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
pit_type cpar = cur.pit();
|
2002-08-22 13:02:14 +00:00
|
|
|
|
|
2004-01-30 11:41:12 +00:00
|
|
|
|
int x = cur.x_target();
|
2006-11-20 14:42:18 +00:00
|
|
|
|
// FIXME: there would maybe a need for this 'updated' boolean in the future...
|
2005-10-13 14:48:27 +00:00
|
|
|
|
bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
|
2006-11-28 17:24:44 +00:00
|
|
|
|
if (cur.inMathed())
|
|
|
|
|
updated |= cur.down();
|
|
|
|
|
else
|
|
|
|
|
updated |= cursorDown(cur);
|
2002-08-22 13:02:14 +00:00
|
|
|
|
|
2004-11-24 21:53:46 +00:00
|
|
|
|
if (cpar == cur.pit() && cpos == cur.pos()) {
|
2002-12-20 14:28:28 +00:00
|
|
|
|
// we have a row which is taller than the workarea. The
|
|
|
|
|
// simplest solution is to move to the next row instead.
|
2006-11-28 17:24:44 +00:00
|
|
|
|
if (cur.inMathed())
|
|
|
|
|
updated |= cur.down();
|
|
|
|
|
else
|
|
|
|
|
updated |= cursorDown(cur);
|
2003-10-24 09:45:07 +00:00
|
|
|
|
}
|
2003-11-22 14:44:59 +00:00
|
|
|
|
|
2003-11-20 10:38:12 +00:00
|
|
|
|
finishUndo();
|
2006-11-20 14:42:18 +00:00
|
|
|
|
cur.updateFlags(Update::Force | Update::FitCursor);
|
2002-08-22 13:02:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 09:57:50 +00:00
|
|
|
|
namespace {
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-03-25 09:16:36 +00:00
|
|
|
|
void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
|
2002-08-20 13:00:25 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
cur.insert(new InsetSpecialChar(kind));
|
2004-11-02 14:25:14 +00:00
|
|
|
|
cur.posRight();
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-02-18 11:47:16 +00:00
|
|
|
|
|
2005-05-30 15:35:11 +00:00
|
|
|
|
bool doInsertInset(LCursor & cur, LyXText * text,
|
2004-02-13 07:30:59 +00:00
|
|
|
|
FuncRequest const & cmd, bool edit, bool pastesel)
|
2003-01-17 09:57:50 +00:00
|
|
|
|
{
|
2004-02-13 11:05:29 +00:00
|
|
|
|
InsetBase * inset = createInset(&cur.bv(), cmd);
|
2003-12-12 10:05:21 +00:00
|
|
|
|
if (!inset)
|
2005-05-30 15:35:11 +00:00
|
|
|
|
return false;
|
2003-12-12 10:05:21 +00:00
|
|
|
|
|
2004-03-08 21:14:45 +00:00
|
|
|
|
recordUndo(cur);
|
2003-12-12 10:05:21 +00:00
|
|
|
|
bool gotsel = false;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.selection()) {
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_CUT));
|
2003-12-12 10:05:21 +00:00
|
|
|
|
gotsel = true;
|
2003-01-17 09:57:50 +00:00
|
|
|
|
}
|
2004-02-13 07:30:59 +00:00
|
|
|
|
text->insertInset(cur, inset);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
|
2004-02-04 09:44:12 +00:00
|
|
|
|
if (edit)
|
2004-02-13 07:30:59 +00:00
|
|
|
|
inset->edit(cur, true);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
|
2006-09-14 13:44:53 +00:00
|
|
|
|
if (gotsel && pastesel) {
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_PASTE));
|
2006-09-14 13:44:53 +00:00
|
|
|
|
// reset first par to default
|
|
|
|
|
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
|
|
|
|
|
LyXLayout_ptr const layout =
|
|
|
|
|
cur.buffer().params().getLyXTextClass().defaultLayout();
|
|
|
|
|
cur.text()->paragraphs().begin()->layout(layout);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-05-30 15:35:11 +00:00
|
|
|
|
return true;
|
2003-01-17 09:57:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
|
2003-10-13 01:35:47 +00:00
|
|
|
|
} // anon namespace
|
|
|
|
|
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-02-13 11:05:29 +00:00
|
|
|
|
void LyXText::number(LCursor & cur)
|
2003-11-10 09:06:48 +00:00
|
|
|
|
{
|
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setNumber(LyXFont::TOGGLE);
|
2004-02-13 11:05:29 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
bool LyXText::isRTL(Buffer const & buffer, Paragraph const & par) const
|
2003-11-10 09:06:48 +00:00
|
|
|
|
{
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
return par.isRightToLeftPar(buffer.params());
|
2003-11-10 09:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-03-18 12:53:43 +00:00
|
|
|
|
void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
|
2002-08-20 13:00:25 +00:00
|
|
|
|
{
|
2004-01-30 11:41:12 +00:00
|
|
|
|
lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
|
2002-08-22 15:04:27 +00:00
|
|
|
|
|
2006-11-17 17:42:52 +00:00
|
|
|
|
// FIXME: We use the update flag to indicates wether a singlePar or a
|
|
|
|
|
// full screen update is needed. We reset it here but shall we restore it
|
|
|
|
|
// at the end?
|
|
|
|
|
cur.noUpdate();
|
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
BOOST_ASSERT(cur.text() == this);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
BufferView * bv = &cur.bv();
|
2005-02-08 02:06:39 +00:00
|
|
|
|
CursorSlice oldTopSlice = cur.top();
|
2005-07-16 16:34:54 +00:00
|
|
|
|
bool oldBoundary = cur.boundary();
|
2004-05-18 07:18:02 +00:00
|
|
|
|
bool sel = cur.selection();
|
2005-10-07 12:00:41 +00:00
|
|
|
|
// Signals that, even if needsUpdate == false, an update of the
|
|
|
|
|
// cursor paragraph is required
|
|
|
|
|
bool singleParUpdate = lyxaction.funcHasFlag(cmd.action,
|
|
|
|
|
LyXAction::SingleParUpdate);
|
|
|
|
|
// Signals that a full-screen update is required
|
2006-04-05 23:56:29 +00:00
|
|
|
|
bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
|
2005-10-07 12:00:41 +00:00
|
|
|
|
LyXAction::NoUpdate) || singleParUpdate);
|
2005-12-31 11:40:33 +00:00
|
|
|
|
// Remember the old paragraph metric (_outer_ paragraph!)
|
|
|
|
|
Dimension olddim = cur.bottom().paragraph().dim();
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
|
|
|
|
switch (cmd.action) {
|
|
|
|
|
|
2006-04-26 22:43:26 +00:00
|
|
|
|
case LFUN_PARAGRAPH_MOVE_DOWN: {
|
|
|
|
|
pit_type const pit = cur.pit();
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
recUndo(cur, pit, pit + 1);
|
2006-04-26 22:43:26 +00:00
|
|
|
|
finishUndo();
|
|
|
|
|
std::swap(pars_[pit], pars_[pit + 1]);
|
|
|
|
|
|
2006-04-28 13:02:05 +00:00
|
|
|
|
ParIterator begin(cur);
|
|
|
|
|
++cur.pit();
|
2006-04-28 14:16:21 +00:00
|
|
|
|
ParIterator end = boost::next(ParIterator(cur));
|
2006-04-28 13:02:05 +00:00
|
|
|
|
updateLabels(cur.buffer(), begin, end);
|
2006-04-26 22:43:26 +00:00
|
|
|
|
|
|
|
|
|
needsUpdate = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case LFUN_PARAGRAPH_MOVE_UP: {
|
|
|
|
|
pit_type const pit = cur.pit();
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
recUndo(cur, pit - 1, pit);
|
2006-04-26 22:43:26 +00:00
|
|
|
|
finishUndo();
|
|
|
|
|
std::swap(pars_[pit], pars_[pit - 1]);
|
|
|
|
|
|
2006-04-28 14:16:21 +00:00
|
|
|
|
ParIterator end = boost::next(ParIterator(cur));
|
2006-04-28 13:02:05 +00:00
|
|
|
|
--cur.pit();
|
|
|
|
|
ParIterator begin(cur);
|
|
|
|
|
updateLabels(cur.buffer(), begin, end);
|
2006-04-26 22:43:26 +00:00
|
|
|
|
|
|
|
|
|
needsUpdate = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-20 13:00:25 +00:00
|
|
|
|
case LFUN_APPENDIX: {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
|
|
|
|
bool start = !par.params().startOfAppendix();
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2005-02-25 11:55:36 +00:00
|
|
|
|
#ifdef WITH_WARNINGS
|
2005-04-13 09:43:58 +00:00
|
|
|
|
#warning The code below only makes sense at top level.
|
2005-02-25 11:55:36 +00:00
|
|
|
|
// Should LFUN_APPENDIX be restricted to top-level paragraphs?
|
|
|
|
|
#endif
|
2002-08-20 13:00:25 +00:00
|
|
|
|
// ensure that we have only one start_of_appendix in this document
|
2004-11-24 21:53:46 +00:00
|
|
|
|
for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (pars_[tmp].params().startOfAppendix()) {
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
recUndo(cur, tmp);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
pars_[tmp].params().startOfAppendix(false);
|
2002-10-30 21:02:40 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
recordUndo(cur);
|
|
|
|
|
par.params().startOfAppendix(start);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
|
|
|
|
// we can set the refreshing parameters now
|
2006-04-16 14:19:25 +00:00
|
|
|
|
updateLabels(cur.buffer());
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_WORD_DELETE_FORWARD:
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
deleteWordForward(cur);
|
2004-03-08 21:14:45 +00:00
|
|
|
|
finishChange(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_WORD_DELETE_BACKWARD:
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
deleteWordBackward(cur);
|
2004-03-08 21:14:45 +00:00
|
|
|
|
finishChange(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_LINE_DELETE:
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
deleteLineForward(cur);
|
2004-03-08 21:14:45 +00:00
|
|
|
|
finishChange(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BUFFER_BEGIN:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_BUFFER_BEGIN_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
|
2005-02-08 13:18:05 +00:00
|
|
|
|
if (cur.depth() == 1) {
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorTop(cur);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
} else {
|
|
|
|
|
cur.undispatched();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BUFFER_END:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_BUFFER_END_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
|
2005-02-08 13:18:05 +00:00
|
|
|
|
if (cur.depth() == 1) {
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorBottom(cur);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
} else {
|
|
|
|
|
cur.undispatched();
|
|
|
|
|
}
|
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHAR_FORWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_FORWARD_SELECT:
|
2005-07-15 15:49:40 +00:00
|
|
|
|
//lyxerr << BOOST_CURRENT_FUNCTION
|
2006-05-05 20:23:12 +00:00
|
|
|
|
// << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
if (isRTL(*cur.bv().buffer(), cur.paragraph()))
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorLeft(cur);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorRight(cur);
|
2005-07-16 16:34:54 +00:00
|
|
|
|
|
2005-07-17 10:31:44 +00:00
|
|
|
|
if (!needsUpdate && oldTopSlice == cur.top()
|
|
|
|
|
&& cur.boundary() == oldBoundary) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
cur.undispatched();
|
2004-03-18 12:53:43 +00:00
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHAR_BACKWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_BACKWARD_SELECT:
|
|
|
|
|
//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
if (isRTL(*cur.bv().buffer(), cur.paragraph()))
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorRight(cur);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorLeft(cur);
|
2005-07-17 10:31:44 +00:00
|
|
|
|
|
|
|
|
|
if (!needsUpdate && oldTopSlice == cur.top()
|
|
|
|
|
&& cur.boundary() == oldBoundary) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
cur.undispatched();
|
2004-03-18 12:53:43 +00:00
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_LEFT);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-02-20 17:19:53 +00:00
|
|
|
|
case LFUN_UP:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_UP_SELECT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_UP_SELECT);
|
2005-07-17 10:31:44 +00:00
|
|
|
|
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorUp(cur);
|
2006-10-22 11:46:36 +00:00
|
|
|
|
|
2005-07-17 10:31:44 +00:00
|
|
|
|
if (!needsUpdate && oldTopSlice == cur.top()
|
|
|
|
|
&& cur.boundary() == oldBoundary) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
cur.undispatched();
|
2004-03-18 12:53:43 +00:00
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_UP);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-02-20 17:19:53 +00:00
|
|
|
|
case LFUN_DOWN:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DOWN_SELECT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorDown(cur);
|
2006-10-22 11:46:36 +00:00
|
|
|
|
|
2005-07-16 23:54:32 +00:00
|
|
|
|
if (!needsUpdate && oldTopSlice == cur.top() &&
|
|
|
|
|
cur.boundary() == oldBoundary)
|
|
|
|
|
{
|
2004-03-25 09:16:36 +00:00
|
|
|
|
cur.undispatched();
|
2004-03-18 12:53:43 +00:00
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_DOWN);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PARAGRAPH_UP:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_PARAGRAPH_UP_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorUpParagraph(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PARAGRAPH_DOWN:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_PARAGRAPH_DOWN_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorDownParagraph(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_SCREEN_UP:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_SCREEN_UP_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
|
2006-07-13 07:43:48 +00:00
|
|
|
|
if (cur.pit() == 0 && cur.textRow().pos() == 0) {
|
|
|
|
|
cur.undispatched();
|
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_UP);
|
|
|
|
|
} else {
|
2006-11-20 14:42:18 +00:00
|
|
|
|
cursorPrevious(cur);
|
2006-07-13 07:43:48 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_SCREEN_DOWN:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_SCREEN_DOWN_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
|
2006-07-13 07:43:48 +00:00
|
|
|
|
if (cur.pit() == cur.lastpit()
|
|
|
|
|
&& cur.textRow().endpos() == cur.lastpos()) {
|
|
|
|
|
cur.undispatched();
|
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_DOWN);
|
|
|
|
|
} else {
|
2006-11-20 14:42:18 +00:00
|
|
|
|
cursorNext(cur);
|
2006-07-13 07:43:48 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_LINE_BEGIN:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_LINE_BEGIN_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorHome(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_LINE_END:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_LINE_END_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorEnd(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_WORD_FORWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_WORD_FORWARD_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
if (isRTL(*cur.bv().buffer(), cur.paragraph()))
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorLeftOneWord(cur);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorRightOneWord(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-07-13 07:43:48 +00:00
|
|
|
|
case LFUN_WORD_BACKWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_WORD_BACKWARD_SELECT:
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
if (isRTL(*cur.bv().buffer(), cur.paragraph()))
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorRightOneWord(cur);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= cursorLeftOneWord(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_SELECT: {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
selectWord(cur, WHOLE_WORD);
|
2004-02-06 13:59:26 +00:00
|
|
|
|
finishChange(cur, true);
|
2002-09-11 14:48:19 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BREAK_LINE: {
|
2003-03-12 19:16:42 +00:00
|
|
|
|
// Not allowed by LaTeX (labels or empty par)
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.pos() > cur.paragraph().beginOfBody()) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
cur.insert(new InsetNewline);
|
2004-11-02 14:25:14 +00:00
|
|
|
|
cur.posRight();
|
2004-02-06 16:50:29 +00:00
|
|
|
|
moveCursor(cur, false);
|
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2003-03-12 19:16:42 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_DELETE_FORWARD:
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!cur.selection()) {
|
2006-03-10 16:10:35 +00:00
|
|
|
|
if (cur.pos() == cur.paragraph().size())
|
|
|
|
|
// Par boundary, force full-screen update
|
|
|
|
|
singleParUpdate = false;
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= erase(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
// It is possible to make it a lot faster still
|
|
|
|
|
// just comment out the line below...
|
|
|
|
|
} else {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2006-03-10 16:10:35 +00:00
|
|
|
|
singleParUpdate = false;
|
2002-08-20 15:26:52 +00:00
|
|
|
|
}
|
2004-01-20 14:25:24 +00:00
|
|
|
|
moveCursor(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DELETE_FORWARD_SKIP:
|
|
|
|
|
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!cur.selection()) {
|
2004-02-12 16:36:01 +00:00
|
|
|
|
if (cur.pos() == cur.lastpos()) {
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorRight(cur);
|
|
|
|
|
cursorLeft(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
}
|
2006-04-09 00:26:19 +00:00
|
|
|
|
erase(cur);
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-26 13:25:49 +00:00
|
|
|
|
} else {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2002-08-26 13:25:49 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_DELETE_BACKWARD:
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!cur.selection()) {
|
2006-09-17 10:03:00 +00:00
|
|
|
|
if (bv->getIntl().getTransManager().backspace()) {
|
2006-03-10 16:10:35 +00:00
|
|
|
|
// Par boundary, full-screen update
|
|
|
|
|
if (cur.pos() == 0)
|
|
|
|
|
singleParUpdate = false;
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= backspace(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
// It is possible to make it a lot faster still
|
|
|
|
|
// just comment out the line below...
|
|
|
|
|
}
|
2002-08-26 13:25:49 +00:00
|
|
|
|
} else {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2006-03-10 16:10:35 +00:00
|
|
|
|
singleParUpdate = false;
|
2002-08-26 13:25:49 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_DELETE_BACKWARD_SKIP:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!cur.selection()) {
|
2004-04-05 09:36:28 +00:00
|
|
|
|
#ifdef WITH_WARNINGS
|
2004-02-02 16:38:13 +00:00
|
|
|
|
#warning look here
|
2004-04-05 09:36:28 +00:00
|
|
|
|
#endif
|
2004-02-02 16:38:13 +00:00
|
|
|
|
//CursorSlice cur = cursor();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
backspace(cur);
|
2004-02-02 16:38:13 +00:00
|
|
|
|
//anchor() = cur;
|
2002-08-26 13:25:49 +00:00
|
|
|
|
} else {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, false);
|
2002-08-26 13:25:49 +00:00
|
|
|
|
}
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-02-12 16:36:01 +00:00
|
|
|
|
breakParagraph(cur, 0);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-02-12 16:36:01 +00:00
|
|
|
|
breakParagraph(cur, 1);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH_SKIP: {
|
2002-08-20 15:26:52 +00:00
|
|
|
|
// When at the beginning of a paragraph, remove
|
2006-05-05 20:23:12 +00:00
|
|
|
|
// indentation. Otherwise, do the same as LFUN_BREAK_PARAGRAPH.
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (cur.pos() == 0)
|
2006-10-20 19:26:23 +00:00
|
|
|
|
cur.paragraph().params().labelWidthString(docstring());
|
2004-03-25 09:16:36 +00:00
|
|
|
|
else
|
2004-02-12 16:36:01 +00:00
|
|
|
|
breakParagraph(cur, 0);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
cur.resetAnchor();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case LFUN_PARAGRAPH_SPACING: {
|
2004-02-12 16:36:01 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
|
|
|
|
Spacing::Space cur_spacing = par.params().spacing().getSpace();
|
2005-01-06 13:48:13 +00:00
|
|
|
|
string cur_value = "1.0";
|
2002-08-20 15:26:52 +00:00
|
|
|
|
if (cur_spacing == Spacing::Other)
|
2005-01-06 13:48:13 +00:00
|
|
|
|
cur_value = par.params().spacing().getValueAsString();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
istringstream is(to_utf8(cmd.argument()));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
string tmp;
|
|
|
|
|
is >> tmp;
|
|
|
|
|
Spacing::Space new_spacing = cur_spacing;
|
2005-01-06 13:48:13 +00:00
|
|
|
|
string new_value = cur_value;
|
2002-08-20 15:26:52 +00:00
|
|
|
|
if (tmp.empty()) {
|
|
|
|
|
lyxerr << "Missing argument to `paragraph-spacing'"
|
|
|
|
|
<< endl;
|
|
|
|
|
} else if (tmp == "single") {
|
|
|
|
|
new_spacing = Spacing::Single;
|
|
|
|
|
} else if (tmp == "onehalf") {
|
|
|
|
|
new_spacing = Spacing::Onehalf;
|
|
|
|
|
} else if (tmp == "double") {
|
|
|
|
|
new_spacing = Spacing::Double;
|
|
|
|
|
} else if (tmp == "other") {
|
|
|
|
|
new_spacing = Spacing::Other;
|
2005-01-06 13:48:13 +00:00
|
|
|
|
string tmpval = "0.0";
|
2002-08-20 15:26:52 +00:00
|
|
|
|
is >> tmpval;
|
|
|
|
|
lyxerr << "new_value = " << tmpval << endl;
|
2005-01-06 13:48:13 +00:00
|
|
|
|
if (tmpval != "0.0")
|
2002-08-20 15:26:52 +00:00
|
|
|
|
new_value = tmpval;
|
|
|
|
|
} else if (tmp == "default") {
|
|
|
|
|
new_spacing = Spacing::Default;
|
|
|
|
|
} else {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
lyxerr << to_utf8(_("Unknown spacing argument: "))
|
|
|
|
|
<< to_utf8(cmd.argument()) << endl;
|
2002-08-20 15:26:52 +00:00
|
|
|
|
}
|
2005-01-06 15:40:49 +00:00
|
|
|
|
if (cur_spacing != new_spacing || cur_value != new_value)
|
2004-02-12 16:36:01 +00:00
|
|
|
|
par.params().spacing(Spacing(new_spacing, new_value));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-13 20:16:34 +00:00
|
|
|
|
case LFUN_INSET_INSERT: {
|
2004-03-08 21:14:45 +00:00
|
|
|
|
recordUndo(cur);
|
2004-01-26 10:13:15 +00:00
|
|
|
|
InsetBase * inset = createInset(bv, cmd);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
if (inset) {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
insertInset(cur, inset);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
cur.posRight();
|
|
|
|
|
}
|
2003-11-13 20:16:34 +00:00
|
|
|
|
break;
|
2003-12-12 10:05:21 +00:00
|
|
|
|
}
|
2003-11-13 20:16:34 +00:00
|
|
|
|
|
2006-09-08 14:08:26 +00:00
|
|
|
|
case LFUN_INSET_DISSOLVE:
|
2006-10-21 12:01:14 +00:00
|
|
|
|
needsUpdate |= dissolveInset(cur);
|
2006-08-08 13:34:02 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-04-26 19:01:33 +00:00
|
|
|
|
case LFUN_INSET_SETTINGS:
|
2005-07-15 22:10:25 +00:00
|
|
|
|
cur.inset().showInsetDialog(bv);
|
2003-04-26 19:01:33 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-05-22 10:40:57 +00:00
|
|
|
|
case LFUN_SPACE_INSERT:
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (cur.paragraph().layout()->free_spacing)
|
|
|
|
|
insertChar(cur, ' ');
|
2004-11-02 14:25:14 +00:00
|
|
|
|
else {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
doInsertInset(cur, this, cmd, false, false);
|
2004-11-02 14:25:14 +00:00
|
|
|
|
cur.posRight();
|
|
|
|
|
}
|
2004-01-20 14:25:24 +00:00
|
|
|
|
moveCursor(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HYPHENATION_POINT_INSERT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
specialChar(cur, InsetSpecialChar::HYPHENATION);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LIGATURE_BREAK_INSERT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DOTS_INSERT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
specialChar(cur, InsetSpecialChar::LDOTS);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MENU_SEPARATOR_INSERT:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_UPCASE:
|
2004-02-13 07:30:59 +00:00
|
|
|
|
changeCase(cur, LyXText::text_uppercase);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_LOWCASE:
|
2004-02-13 07:30:59 +00:00
|
|
|
|
changeCase(cur, LyXText::text_lowercase);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_CAPITALIZE:
|
2004-02-13 07:30:59 +00:00
|
|
|
|
changeCase(cur, LyXText::text_capitalization);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHARS_TRANSPOSE:
|
2006-11-17 09:03:30 +00:00
|
|
|
|
charsTranspose(cur);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2003-10-10 09:01:23 +00:00
|
|
|
|
case LFUN_PASTE:
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Paste"));
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
|
|
|
|
if (isStrUnsignedInt(to_utf8(cmd.argument())))
|
2006-08-13 16:16:43 +00:00
|
|
|
|
pasteSelection(cur, bv->buffer()->errorList("Paste"),
|
2006-10-21 00:16:43 +00:00
|
|
|
|
convert<unsigned int>(to_utf8(cmd.argument())));
|
2003-10-10 09:01:23 +00:00
|
|
|
|
else
|
2006-08-13 16:16:43 +00:00
|
|
|
|
pasteSelection(cur, bv->buffer()->errorList("Paste"),
|
|
|
|
|
0);
|
|
|
|
|
bv->buffer()->errors("Paste");
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection(); // bug 393
|
2002-08-26 13:25:49 +00:00
|
|
|
|
bv->switchKeyMap();
|
2003-10-10 09:01:23 +00:00
|
|
|
|
finishUndo();
|
2002-08-26 13:25:49 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_CUT:
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, true, true);
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Cut"));
|
2002-08-26 13:25:49 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_COPY:
|
2004-02-13 11:05:29 +00:00
|
|
|
|
copySelection(cur);
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Copy"));
|
2002-08-26 13:25:49 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SERVER_GET_XY:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_utf8(
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
convert<string>(cursorX(cur.buffer(), cur.top(), cur.boundary()))
|
|
|
|
|
+ ' ' + convert<string>(cursorY(cur.top(), cur.boundary()))));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SERVER_SET_XY: {
|
2002-08-20 13:00:25 +00:00
|
|
|
|
int x = 0;
|
|
|
|
|
int y = 0;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
istringstream is(to_utf8(cmd.argument()));
|
2002-08-21 06:50:42 +00:00
|
|
|
|
is >> x >> y;
|
|
|
|
|
if (!is)
|
2002-08-20 13:00:25 +00:00
|
|
|
|
lyxerr << "SETXY: Could not parse coordinates in '"
|
2006-10-21 00:16:43 +00:00
|
|
|
|
<< to_utf8(cmd.argument()) << std::endl;
|
2002-11-27 10:30:28 +00:00
|
|
|
|
else
|
2004-02-13 13:51:12 +00:00
|
|
|
|
setCursorFromCoordinates(cur, x, y);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SERVER_GET_FONT:
|
2002-08-20 13:00:25 +00:00
|
|
|
|
if (current_font.shape() == LyXFont::ITALIC_SHAPE)
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_ascii("E"));
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE)
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_ascii("N"));
|
2002-08-20 13:00:25 +00:00
|
|
|
|
else
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_ascii("0"));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SERVER_GET_LAYOUT:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.message(from_utf8(cur.paragraph().layout()->name()));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_LAYOUT: {
|
2006-11-16 08:17:48 +00:00
|
|
|
|
string layout = to_ascii(cmd.argument());
|
|
|
|
|
lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) " << layout << endl;
|
2002-08-20 15:26:52 +00:00
|
|
|
|
|
|
|
|
|
// Derive layout number from given argument (string)
|
|
|
|
|
// and current buffer's textclass (number)
|
2003-09-09 09:47:59 +00:00
|
|
|
|
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
|
2006-11-16 08:17:48 +00:00
|
|
|
|
if (layout.empty())
|
|
|
|
|
layout = tclass.defaultLayoutName();
|
|
|
|
|
bool hasLayout = tclass.hasLayout(layout);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
|
|
|
|
|
// If the entry is obsolete, use the new one instead.
|
|
|
|
|
if (hasLayout) {
|
|
|
|
|
string const & obs = tclass[layout]->obsoleted_by();
|
|
|
|
|
if (!obs.empty())
|
|
|
|
|
layout = obs;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!hasLayout) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.errorMessage(from_utf8(N_("Layout ")) + cmd.argument() +
|
|
|
|
|
from_utf8(N_(" not known")));
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool change_layout = (current_layout != layout);
|
2003-05-19 07:12:09 +00:00
|
|
|
|
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (!change_layout && cur.selection() &&
|
2004-11-24 21:53:46 +00:00
|
|
|
|
cur.selBegin().pit() != cur.selEnd().pit())
|
2002-08-20 15:26:52 +00:00
|
|
|
|
{
|
2004-11-24 21:53:46 +00:00
|
|
|
|
pit_type spit = cur.selBegin().pit();
|
|
|
|
|
pit_type epit = cur.selEnd().pit() + 1;
|
2003-04-09 09:15:20 +00:00
|
|
|
|
while (spit != epit) {
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (pars_[spit].layout()->name() != current_layout) {
|
2002-08-20 15:26:52 +00:00
|
|
|
|
change_layout = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-04-09 09:15:20 +00:00
|
|
|
|
++spit;
|
2002-08-20 15:26:52 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2003-05-19 07:12:09 +00:00
|
|
|
|
|
2002-08-20 15:26:52 +00:00
|
|
|
|
if (change_layout) {
|
|
|
|
|
current_layout = layout;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
setLayout(cur, layout);
|
2006-09-26 10:06:46 +00:00
|
|
|
|
// inform the GUI that the layout has changed.
|
|
|
|
|
bv->layoutChanged(layout);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
case LFUN_CLIPBOARD_PASTE: {
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection();
|
2006-10-11 17:24:46 +00:00
|
|
|
|
docstring const clip = theClipboard().get();
|
2002-08-20 15:26:52 +00:00
|
|
|
|
if (!clip.empty()) {
|
2005-09-16 10:06:09 +00:00
|
|
|
|
recordUndo(cur);
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument() == "paragraph")
|
2004-02-13 07:30:59 +00:00
|
|
|
|
insertStringAsParagraphs(cur, clip);
|
2002-08-20 17:31:23 +00:00
|
|
|
|
else
|
2004-02-13 07:30:59 +00:00
|
|
|
|
insertStringAsLines(cur, clip);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
case LFUN_PRIMARY_SELECTION_PASTE: {
|
|
|
|
|
cur.clearSelection();
|
2006-10-11 17:24:46 +00:00
|
|
|
|
docstring const clip = theSelection().get();
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
if (!clip.empty()) {
|
|
|
|
|
recordUndo(cur);
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument() == "paragraph")
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
insertStringAsParagraphs(cur, clip);
|
|
|
|
|
else
|
|
|
|
|
insertStringAsLines(cur, clip);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-22 18:47:19 +00:00
|
|
|
|
case LFUN_UNICODE_INSERT: {
|
|
|
|
|
if (cmd.argument().empty())
|
|
|
|
|
break;
|
|
|
|
|
docstring hexstring = cmd.argument();
|
|
|
|
|
if (lyx::support::isHex(hexstring)) {
|
|
|
|
|
char_type c = lyx::support::hexToInt(hexstring);
|
|
|
|
|
if (c > 32 && c < 0x10ffff) {
|
|
|
|
|
lyxerr << "Inserting c: " << c << endl;
|
|
|
|
|
docstring s = docstring(1, c);
|
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, s));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_QUOTE_INSERT: {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cap::replaceSelection(cur);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
Paragraph & par = cur.paragraph();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
pos_type pos = cur.pos();
|
|
|
|
|
char_type c;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (pos == 0)
|
2002-08-27 13:17:22 +00:00
|
|
|
|
c = ' ';
|
2004-02-13 07:30:59 +00:00
|
|
|
|
else if (cur.prevInset() && cur.prevInset()->isSpace())
|
2002-08-27 13:17:22 +00:00
|
|
|
|
c = ' ';
|
|
|
|
|
else
|
2004-02-13 07:30:59 +00:00
|
|
|
|
c = par.getChar(pos - 1);
|
2002-08-27 13:17:22 +00:00
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
LyXLayout_ptr const & style = par.layout();
|
2004-04-03 08:37:12 +00:00
|
|
|
|
|
2003-09-09 09:47:59 +00:00
|
|
|
|
BufferParams const & bufparams = bv->buffer()->params();
|
2004-02-20 10:32:44 +00:00
|
|
|
|
if (!style->pass_thru
|
|
|
|
|
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string arg = to_utf8(cmd.argument());
|
2004-02-20 10:32:44 +00:00
|
|
|
|
if (arg == "single")
|
|
|
|
|
cur.insert(new InsetQuotes(c,
|
2004-04-03 08:37:12 +00:00
|
|
|
|
bufparams.quotes_language,
|
2004-02-20 10:32:44 +00:00
|
|
|
|
InsetQuotes::SingleQ));
|
2005-10-13 10:59:39 +00:00
|
|
|
|
else
|
2004-02-20 10:32:44 +00:00
|
|
|
|
cur.insert(new InsetQuotes(c,
|
2004-04-03 08:37:12 +00:00
|
|
|
|
bufparams.quotes_language,
|
2004-02-20 10:32:44 +00:00
|
|
|
|
InsetQuotes::DoubleQ));
|
2004-08-12 19:49:25 +00:00
|
|
|
|
cur.posRight();
|
2004-03-18 12:53:43 +00:00
|
|
|
|
}
|
2004-02-04 09:44:12 +00:00
|
|
|
|
else
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
|
2002-08-27 13:17:22 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
case LFUN_DATE_INSERT:
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument().empty())
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
|
2006-10-21 00:16:43 +00:00
|
|
|
|
formatted_time(current_time())));
|
2002-08-27 13:39:27 +00:00
|
|
|
|
else
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
|
2006-10-21 00:16:43 +00:00
|
|
|
|
formatted_time(current_time(), to_utf8(cmd.argument()))));
|
2002-08-27 13:39:27 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2002-08-28 10:45:38 +00:00
|
|
|
|
case LFUN_MOUSE_TRIPLE:
|
2004-02-06 16:50:29 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button1) {
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cursorHome(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
cursorEnd(cur);
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.setSelection();
|
2005-04-20 10:47:15 +00:00
|
|
|
|
bv->cursor() = cur;
|
2006-10-11 17:24:46 +00:00
|
|
|
|
theSelection().haveSelection(cur.selection());
|
2002-08-28 10:45:38 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_MOUSE_DOUBLE:
|
2004-02-06 16:50:29 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button1) {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
selectWord(cur, WHOLE_WORD_STRICT);
|
2005-04-20 10:47:15 +00:00
|
|
|
|
bv->cursor() = cur;
|
2006-10-11 17:24:46 +00:00
|
|
|
|
theSelection().haveSelection(cur.selection());
|
2002-08-28 10:45:38 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// Single-click on work area
|
2003-11-06 16:43:12 +00:00
|
|
|
|
case LFUN_MOUSE_PRESS: {
|
2004-02-06 16:50:29 +00:00
|
|
|
|
// Right click on a footnote flag opens float menu
|
2006-04-15 15:10:03 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button3)
|
2004-02-06 16:50:29 +00:00
|
|
|
|
cur.clearSelection();
|
|
|
|
|
|
2002-08-28 10:45:38 +00:00
|
|
|
|
// Middle button press pastes if we have a selection
|
|
|
|
|
// We do this here as if the selection was inside an inset
|
|
|
|
|
// it could get cleared on the unlocking of the inset so
|
|
|
|
|
// we have to check this first
|
|
|
|
|
bool paste_internally = false;
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button2 && cur.selection()) {
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_COPY));
|
2002-08-28 10:45:38 +00:00
|
|
|
|
paste_internally = true;
|
|
|
|
|
}
|
|
|
|
|
|
2005-12-01 10:28:50 +00:00
|
|
|
|
bv->mouseSetCursor(cur);
|
2004-04-07 08:07:26 +00:00
|
|
|
|
|
2002-08-28 10:45:38 +00:00
|
|
|
|
// Insert primary selection with middle mouse
|
|
|
|
|
// if there is a local selection in the current buffer,
|
|
|
|
|
// insert this
|
|
|
|
|
if (cmd.button() == mouse_button::button2) {
|
|
|
|
|
if (paste_internally)
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_PASTE));
|
2002-08-28 10:45:38 +00:00
|
|
|
|
else
|
2006-10-11 17:24:46 +00:00
|
|
|
|
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
|
2002-08-28 10:45:38 +00:00
|
|
|
|
}
|
2004-04-07 08:07:26 +00:00
|
|
|
|
|
2006-11-17 17:42:52 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button1) {
|
|
|
|
|
needsUpdate = false;
|
|
|
|
|
cur.noUpdate();
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-28 10:45:38 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-08-14 20:34:46 +00:00
|
|
|
|
case LFUN_MOUSE_MOTION: {
|
|
|
|
|
// Only use motion with button 1
|
|
|
|
|
//if (cmd.button() != mouse_button::button1)
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
// ignore motions deeper nested than the real anchor
|
|
|
|
|
LCursor & bvcur = cur.bv().cursor();
|
2004-08-14 21:56:40 +00:00
|
|
|
|
if (bvcur.anchor_.hasPart(cur)) {
|
2004-11-30 01:59:49 +00:00
|
|
|
|
CursorSlice old = bvcur.top();
|
|
|
|
|
|
|
|
|
|
int const wh = bv->workHeight();
|
|
|
|
|
int const y = std::max(0, std::min(wh - 1, cmd.y));
|
2005-01-06 15:40:49 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
setCursorFromCoordinates(cur, cmd.x, y);
|
|
|
|
|
cur.x_target() = cmd.x;
|
|
|
|
|
if (cmd.y >= wh)
|
|
|
|
|
cursorDown(cur);
|
|
|
|
|
else if (cmd.y < 0)
|
|
|
|
|
cursorUp(cur);
|
2004-08-14 21:56:40 +00:00
|
|
|
|
// This is to allow jumping over large insets
|
2004-11-30 01:59:49 +00:00
|
|
|
|
if (cur.top() == old) {
|
|
|
|
|
if (cmd.y >= wh)
|
2004-08-14 21:56:40 +00:00
|
|
|
|
cursorDown(cur);
|
2004-11-30 01:59:49 +00:00
|
|
|
|
else if (cmd.y < 0)
|
2004-08-14 21:56:40 +00:00
|
|
|
|
cursorUp(cur);
|
|
|
|
|
}
|
2004-08-14 20:34:46 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
if (cur.top() == old)
|
|
|
|
|
cur.noUpdate();
|
|
|
|
|
else {
|
|
|
|
|
// don't set anchor_
|
|
|
|
|
bvcur.setCursor(cur);
|
|
|
|
|
bvcur.selection() = true;
|
2005-07-15 00:39:44 +00:00
|
|
|
|
//lyxerr << "MOTION: " << bv->cursor() << endl;
|
2004-11-30 01:59:49 +00:00
|
|
|
|
}
|
2005-01-06 15:40:49 +00:00
|
|
|
|
|
2004-11-30 01:59:49 +00:00
|
|
|
|
} else
|
|
|
|
|
cur.undispatched();
|
2004-08-14 20:34:46 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
case LFUN_MOUSE_RELEASE: {
|
2002-08-28 10:45:38 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button2)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// finish selection
|
2006-11-17 17:42:52 +00:00
|
|
|
|
if (cmd.button() == mouse_button::button1) {
|
|
|
|
|
if (cur.selection())
|
|
|
|
|
theSelection().haveSelection(cur.selection());
|
|
|
|
|
needsUpdate = false;
|
|
|
|
|
cur.noUpdate();
|
|
|
|
|
}
|
2002-08-28 10:45:38 +00:00
|
|
|
|
|
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SELF_INSERT: {
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument().empty())
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
|
|
|
|
// Automatically delete the currently selected
|
|
|
|
|
// text and replace it with what is being
|
|
|
|
|
// typed in now. Depends on lyxrc settings
|
|
|
|
|
// "auto_region_delete", which defaults to
|
|
|
|
|
// true (on).
|
|
|
|
|
|
|
|
|
|
if (lyxrc.auto_region_delete) {
|
2004-01-20 14:25:24 +00:00
|
|
|
|
if (cur.selection())
|
2004-02-13 11:05:29 +00:00
|
|
|
|
cutSelection(cur, false, false);
|
2006-10-11 17:24:46 +00:00
|
|
|
|
theSelection().haveSelection(false);
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.clearSelection();
|
2003-08-19 16:46:47 +00:00
|
|
|
|
LyXFont const old_font = real_current_font;
|
2005-04-26 11:12:20 +00:00
|
|
|
|
|
2006-09-01 15:41:38 +00:00
|
|
|
|
docstring::const_iterator cit = cmd.argument().begin();
|
|
|
|
|
docstring::const_iterator end = cmd.argument().end();
|
2002-08-20 13:00:25 +00:00
|
|
|
|
for (; cit != end; ++cit)
|
2006-09-01 15:41:38 +00:00
|
|
|
|
#if 0
|
2006-09-17 10:03:00 +00:00
|
|
|
|
bv->getIntl().getTransManager().
|
2006-04-09 00:26:19 +00:00
|
|
|
|
translateAndInsert(*cit, this);
|
2006-08-13 22:54:59 +00:00
|
|
|
|
#else
|
|
|
|
|
insertChar(bv->cursor(), *cit);
|
|
|
|
|
#endif
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-01-20 14:25:24 +00:00
|
|
|
|
cur.resetAnchor();
|
|
|
|
|
moveCursor(cur, false);
|
2002-08-20 15:26:52 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_URL_INSERT: {
|
2003-11-11 13:59:39 +00:00
|
|
|
|
InsetCommandParams p("url");
|
2003-02-27 13:26:07 +00:00
|
|
|
|
string const data = InsetCommandMailer::params2string("url", p);
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->showInsetDialog("url", data, 0);
|
2002-08-29 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HTML_INSERT: {
|
2003-11-11 13:59:39 +00:00
|
|
|
|
InsetCommandParams p("htmlurl");
|
2003-02-27 13:26:07 +00:00
|
|
|
|
string const data = InsetCommandMailer::params2string("url", p);
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->showInsetDialog("url", data, 0);
|
2002-08-29 13:41:58 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LABEL_INSERT: {
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
InsetCommandParams p("label");
|
2004-04-19 02:39:05 +00:00
|
|
|
|
// Try to generate a valid label
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
p["name"] = (cmd.argument().empty()) ?
|
2006-11-11 11:27:47 +00:00
|
|
|
|
cur.getPossibleLabel() :
|
Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
(operator[]): New, access a parameter
(clear): New, clear all parameters
(info_): New, stire info about this command
(cmdname): Rename to name_
(contents, options, sec_options): Replace with params_. Parameters
are now stored as docstring.
(findInfo): New factor for command info for all commands
(read, write): Use new syntax
(parameter set and get methods): reimplemenmt for new parameter storage
* src/insets/insetcommand.h
(getParam): New, get a parameter
(setParam): New, set a parameter
(parameter set and get methods): Adjust to InsetCommandParams changes
* src/insets/insetbibitem.[Ch]
(write): Remove, not needed anymore
(directWrite): ditto
* src/insets/insetbibitem.C
(InsetBibitem::read): Use InsetCommand::read
* src/insets/insetref.C
(InsetRef::latex): Use new InsetCommandParams interface
* src/mathed/InsetMathHull.C
(InsetMathHull::doDispatch): ditto
* src/text3.C
(LyXText::dispatch): ditto
* src/factory.C
(createInset): Create InsetCommandParams with command name
(readInset): ditto
(readInset): Remove error message for bibitem, since bibitem is
now a normal command inset
* src/buffer.C: Bump file format number
* src/frontends/controllers/ControlCommand.[Ch]
(ControlCommand): take an additional command name parameter
* src/text.C
(readParToken): Remove code for \bibitem
* lib/lyx2lyx/LyX.py: Bump latest file format number
* lib/lyx2lyx/lyx_1_5.py
(convert_bibitem, convert_commandparams): new, convert to new format
(revert_commandparams): new, convert to old format
* development/FORMAT: document new format
* many other files: Adjust to the changes above
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
|
|
|
|
cmd.argument();
|
2003-11-13 20:16:34 +00:00
|
|
|
|
string const data = InsetCommandMailer::params2string("label", p);
|
2004-04-19 02:39:05 +00:00
|
|
|
|
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument().empty()) {
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->showInsetDialog("label", data, 0);
|
2004-04-19 02:39:05 +00:00
|
|
|
|
} else {
|
|
|
|
|
FuncRequest fr(LFUN_INSET_INSERT, data);
|
|
|
|
|
dispatch(cur, fr);
|
|
|
|
|
}
|
2003-11-13 20:16:34 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-29 13:41:58 +00:00
|
|
|
|
|
2002-08-28 17:33:42 +00:00
|
|
|
|
#if 0
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LIST_INSERT:
|
|
|
|
|
case LFUN_THEOREM_INSERT:
|
|
|
|
|
case LFUN_CAPTION_INSERT:
|
2002-08-28 17:33:42 +00:00
|
|
|
|
#endif
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_NOTE_INSERT:
|
|
|
|
|
case LFUN_CHARSTYLE_INSERT:
|
|
|
|
|
case LFUN_BOX_INSERT:
|
|
|
|
|
case LFUN_BRANCH_INSERT:
|
|
|
|
|
case LFUN_BIBITEM_INSERT:
|
|
|
|
|
case LFUN_ERT_INSERT:
|
|
|
|
|
case LFUN_FOOTNOTE_INSERT:
|
|
|
|
|
case LFUN_MARGINALNOTE_INSERT:
|
|
|
|
|
case LFUN_OPTIONAL_INSERT:
|
2003-03-13 11:16:56 +00:00
|
|
|
|
case LFUN_ENVIRONMENT_INSERT:
|
2003-01-17 09:57:50 +00:00
|
|
|
|
// Open the inset, and move the current selection
|
|
|
|
|
// inside it.
|
2004-02-13 11:05:29 +00:00
|
|
|
|
doInsertInset(cur, this, cmd, true, true);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
cur.posRight();
|
2003-01-17 09:57:50 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2005-05-30 15:35:11 +00:00
|
|
|
|
case LFUN_TABULAR_INSERT:
|
|
|
|
|
// if there were no arguments, just open the dialog
|
|
|
|
|
if (doInsertInset(cur, this, cmd, false, true))
|
|
|
|
|
cur.posRight();
|
|
|
|
|
else
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->showDialog("tabularcreate");
|
2005-05-30 15:35:11 +00:00
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FLOAT_INSERT:
|
|
|
|
|
case LFUN_FLOAT_WIDE_INSERT:
|
|
|
|
|
case LFUN_WRAP_INSERT:
|
2005-04-14 10:19:39 +00:00
|
|
|
|
doInsertInset(cur, this, cmd, true, true);
|
|
|
|
|
cur.posRight();
|
|
|
|
|
// FIXME: the "Caption" name should not be hardcoded,
|
|
|
|
|
// but given by the float definition.
|
|
|
|
|
cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption"));
|
|
|
|
|
break;
|
|
|
|
|
|
2006-11-04 17:55:36 +00:00
|
|
|
|
case LFUN_INDEX_INSERT:
|
|
|
|
|
case LFUN_NOMENCL_INSERT: {
|
2005-11-30 15:51:12 +00:00
|
|
|
|
InsetBase * inset = createInset(&cur.bv(), cmd);
|
|
|
|
|
if (!inset)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
recordUndo(cur);
|
|
|
|
|
cur.clearSelection();
|
|
|
|
|
insertInset(cur, inset);
|
|
|
|
|
inset->edit(cur, true);
|
2006-11-04 17:55:36 +00:00
|
|
|
|
// Show the dialog for the nomenclature entry, since the
|
|
|
|
|
// description entry still needs to be filled in.
|
|
|
|
|
if (cmd.action == LFUN_NOMENCL_INSERT)
|
|
|
|
|
InsetCommandMailer("nomenclature",
|
|
|
|
|
*reinterpret_cast<InsetCommand *>(inset)).showDialog(&cur.bv());
|
2004-08-12 19:49:25 +00:00
|
|
|
|
cur.posRight();
|
2003-01-17 09:57:50 +00:00
|
|
|
|
break;
|
2005-11-30 15:51:12 +00:00
|
|
|
|
}
|
2003-01-17 09:57:50 +00:00
|
|
|
|
|
2002-11-27 10:30:28 +00:00
|
|
|
|
case LFUN_INDEX_PRINT:
|
2006-11-04 17:55:36 +00:00
|
|
|
|
case LFUN_NOMENCL_PRINT:
|
2002-08-28 17:33:42 +00:00
|
|
|
|
case LFUN_TOC_INSERT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HFILL_INSERT:
|
|
|
|
|
case LFUN_LINE_INSERT:
|
|
|
|
|
case LFUN_PAGEBREAK_INSERT:
|
2006-11-25 15:09:01 +00:00
|
|
|
|
case LFUN_CLEARPAGE_INSERT:
|
|
|
|
|
case LFUN_CLEARDOUBLEPAGE_INSERT:
|
2003-01-17 09:57:50 +00:00
|
|
|
|
// do nothing fancy
|
2004-02-13 11:05:29 +00:00
|
|
|
|
doInsertInset(cur, this, cmd, false, false);
|
2004-08-12 19:49:25 +00:00
|
|
|
|
cur.posRight();
|
2002-08-28 17:33:42 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DEPTH_DECREMENT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
changeDepth(cur, DEC_DEPTH);
|
2003-10-02 14:42:31 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DEPTH_INCREMENT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
changeDepth(cur, INC_DEPTH);
|
2003-10-02 14:42:31 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
case LFUN_MATH_DISPLAY:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
mathDispatch(cur, cmd, true);
|
2004-02-11 14:45:44 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
case LFUN_MATH_IMPORT_SELECTION:
|
|
|
|
|
case LFUN_MATH_MODE:
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument() == "on")
|
2004-12-27 18:26:11 +00:00
|
|
|
|
// don't pass "on" as argument
|
|
|
|
|
mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
|
|
|
|
|
else
|
|
|
|
|
mathDispatch(cur, cmd, false);
|
2004-02-11 14:45:44 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_MATH_MACRO:
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument().empty())
|
2006-10-21 00:16:43 +00:00
|
|
|
|
cur.errorMessage(from_utf8(N_("Missing argument")));
|
2004-02-11 14:45:44 +00:00
|
|
|
|
else {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
string s = to_utf8(cmd.argument());
|
2004-02-11 14:45:44 +00:00
|
|
|
|
string const s1 = token(s, ' ', 1);
|
2005-01-27 21:05:44 +00:00
|
|
|
|
int const nargs = s1.empty() ? 0 : convert<int>(s1);
|
2004-02-11 14:45:44 +00:00
|
|
|
|
string const s2 = token(s, ' ', 2);
|
|
|
|
|
string const type = s2.empty() ? "newcommand" : s2;
|
2006-10-22 10:15:23 +00:00
|
|
|
|
cur.insert(new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, from_utf8(type)));
|
2004-04-13 06:27:29 +00:00
|
|
|
|
//cur.nextInset()->edit(cur, true);
|
2004-02-11 14:45:44 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2005-01-06 15:40:49 +00:00
|
|
|
|
|
2005-01-04 09:18:48 +00:00
|
|
|
|
// passthrough hat and underscore outside mathed:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MATH_SUBSCRIPT:
|
|
|
|
|
mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "_"), false);
|
2005-01-04 09:18:48 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MATH_SUPERSCRIPT:
|
|
|
|
|
mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "^"), false);
|
2005-01-04 09:18:48 +00:00
|
|
|
|
break;
|
2004-02-11 14:45:44 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MATH_INSERT:
|
|
|
|
|
case LFUN_MATH_MATRIX:
|
2006-05-07 10:51:19 +00:00
|
|
|
|
case LFUN_MATH_DELIM:
|
|
|
|
|
case LFUN_MATH_BIGDELIM: {
|
2006-09-16 18:11:38 +00:00
|
|
|
|
cur.insert(new InsetMathHull(hullSimple));
|
2006-05-05 20:23:12 +00:00
|
|
|
|
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
|
2004-02-11 14:45:44 +00:00
|
|
|
|
cur.dispatch(cmd);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-11 14:45:44 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_EMPH: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setEmph(LyXFont::TOGGLE);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_BOLD: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setSeries(LyXFont::BOLD_SERIES);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_NOUN: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setNoun(LyXFont::TOGGLE);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_CODE: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_SANS: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setFamily(LyXFont::SANS_FAMILY);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_ROMAN: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setFamily(LyXFont::ROMAN_FAMILY);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_DEFAULT: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_UNDERLINE: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setUnderbar(LyXFont::TOGGLE);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2004-02-06 13:59:26 +00:00
|
|
|
|
case LFUN_FONT_SIZE: {
|
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
font.setLyXSize(to_utf8(cmd.argument()));
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2004-02-06 13:59:26 +00:00
|
|
|
|
case LFUN_LANGUAGE: {
|
2006-10-21 00:16:43 +00:00
|
|
|
|
Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
|
2004-02-06 13:59:26 +00:00
|
|
|
|
if (!lang)
|
|
|
|
|
break;
|
|
|
|
|
LyXFont font(LyXFont::ALL_IGNORE);
|
|
|
|
|
font.setLanguage(lang);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, font);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
bv->switchKeyMap();
|
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_FREE_APPLY:
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, freefont, toggleall);
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Character set"));
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2004-02-06 13:59:26 +00:00
|
|
|
|
// Set the freefont using the contents of \param data dispatched from
|
|
|
|
|
// the frontends and apply it at the current cursor location.
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_FREE_UPDATE: {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
LyXFont font;
|
|
|
|
|
bool toggle;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (bv_funcs::string2font(to_utf8(cmd.argument()), font, toggle)) {
|
2004-02-06 13:59:26 +00:00
|
|
|
|
freefont = font;
|
|
|
|
|
toggleall = toggle;
|
2004-02-13 07:30:59 +00:00
|
|
|
|
toggleAndShow(cur, this, freefont, toggleall);
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Character set"));
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
2004-02-06 13:59:26 +00:00
|
|
|
|
}
|
2003-11-22 14:44:59 +00:00
|
|
|
|
|
2003-11-10 09:06:48 +00:00
|
|
|
|
case LFUN_FINISHED_LEFT:
|
2004-08-14 15:55:22 +00:00
|
|
|
|
lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_FINISHED_RIGHT:
|
2004-08-14 15:55:22 +00:00
|
|
|
|
lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
++cur.pos();
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_FINISHED_UP:
|
2004-08-14 15:55:22 +00:00
|
|
|
|
lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorUp(cur);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_FINISHED_DOWN:
|
2004-08-14 15:55:22 +00:00
|
|
|
|
lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorDown(cur);
|
2003-11-10 09:06:48 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2004-02-06 13:59:26 +00:00
|
|
|
|
case LFUN_LAYOUT_PARAGRAPH: {
|
|
|
|
|
string data;
|
|
|
|
|
params2string(cur.paragraph(), data);
|
|
|
|
|
data = "show\n" + data;
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->showDialogWithData("paragraph", data);
|
2004-02-06 13:59:26 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case LFUN_PARAGRAPH_UPDATE: {
|
|
|
|
|
string data;
|
|
|
|
|
params2string(cur.paragraph(), data);
|
|
|
|
|
|
|
|
|
|
// Will the paragraph accept changes from the dialog?
|
2005-11-17 08:41:56 +00:00
|
|
|
|
bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
|
2004-02-06 13:59:26 +00:00
|
|
|
|
|
2005-01-06 15:40:49 +00:00
|
|
|
|
data = "update " + convert<string>(accept) + '\n' + data;
|
2006-09-19 13:36:20 +00:00
|
|
|
|
bv->updateDialog("paragraph", data);
|
2004-02-06 13:59:26 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_ACCENT_UMLAUT:
|
|
|
|
|
case LFUN_ACCENT_CIRCUMFLEX:
|
|
|
|
|
case LFUN_ACCENT_GRAVE:
|
|
|
|
|
case LFUN_ACCENT_ACUTE:
|
|
|
|
|
case LFUN_ACCENT_TILDE:
|
|
|
|
|
case LFUN_ACCENT_CEDILLA:
|
|
|
|
|
case LFUN_ACCENT_MACRON:
|
|
|
|
|
case LFUN_ACCENT_DOT:
|
|
|
|
|
case LFUN_ACCENT_UNDERDOT:
|
|
|
|
|
case LFUN_ACCENT_UNDERBAR:
|
|
|
|
|
case LFUN_ACCENT_CARON:
|
|
|
|
|
case LFUN_ACCENT_SPECIAL_CARON:
|
|
|
|
|
case LFUN_ACCENT_BREVE:
|
|
|
|
|
case LFUN_ACCENT_TIE:
|
|
|
|
|
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
|
|
|
|
|
case LFUN_ACCENT_CIRCLE:
|
|
|
|
|
case LFUN_ACCENT_OGONEK:
|
2006-10-11 17:24:46 +00:00
|
|
|
|
theLyXFunc().handleKeyFunc(cmd.action);
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (!cmd.argument().empty())
|
|
|
|
|
// FIXME: Are all these characters encoded in one byte in utf8?
|
2006-09-17 10:03:00 +00:00
|
|
|
|
bv->getIntl().getTransManager()
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
.translateAndInsert(cmd.argument()[0], this, cur);
|
2004-02-06 13:59:26 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2004-02-12 16:36:01 +00:00
|
|
|
|
case LFUN_FLOAT_LIST: {
|
|
|
|
|
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
|
2006-10-21 00:16:43 +00:00
|
|
|
|
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
|
2004-02-12 16:36:01 +00:00
|
|
|
|
// not quite sure if we want this...
|
|
|
|
|
recordUndo(cur);
|
|
|
|
|
cur.clearSelection();
|
|
|
|
|
breakParagraph(cur);
|
|
|
|
|
|
|
|
|
|
if (cur.lastpos() != 0) {
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cursorLeft(cur);
|
2004-02-12 16:36:01 +00:00
|
|
|
|
breakParagraph(cur);
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-13 07:30:59 +00:00
|
|
|
|
setLayout(cur, tclass.defaultLayoutName());
|
2006-11-11 12:00:34 +00:00
|
|
|
|
setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, docstring(), 0);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
|
2004-11-02 14:25:14 +00:00
|
|
|
|
cur.posRight();
|
2004-02-12 16:36:01 +00:00
|
|
|
|
} else {
|
|
|
|
|
lyxerr << "Non-existent float type: "
|
2006-10-21 00:16:43 +00:00
|
|
|
|
<< to_utf8(cmd.argument()) << endl;
|
2004-02-12 16:36:01 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHANGE_ACCEPT: {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
acceptChange(cur);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHANGE_REJECT: {
|
2004-02-13 07:30:59 +00:00
|
|
|
|
rejectChange(cur);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case LFUN_THESAURUS_ENTRY: {
|
2006-09-03 07:02:38 +00:00
|
|
|
|
docstring arg = cmd.argument();
|
2004-02-13 07:30:59 +00:00
|
|
|
|
if (arg.empty()) {
|
|
|
|
|
arg = cur.selectionAsString(false);
|
|
|
|
|
// FIXME
|
|
|
|
|
if (arg.size() > 100 || arg.empty()) {
|
|
|
|
|
// Get word or selection
|
2006-10-21 00:16:43 +00:00
|
|
|
|
selectWordWhenUnderCursor(cur, WHOLE_WORD);
|
2004-02-13 07:30:59 +00:00
|
|
|
|
arg = cur.selectionAsString(false);
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
bv->showDialogWithData("thesaurus", to_utf8(arg));
|
2004-02-13 07:30:59 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PARAGRAPH_PARAMS_APPLY: {
|
2004-02-13 11:05:29 +00:00
|
|
|
|
// Given data, an encoding of the ParagraphParameters
|
|
|
|
|
// generated in the Paragraph dialog, this function sets
|
|
|
|
|
// the current paragraph appropriately.
|
2006-10-21 00:16:43 +00:00
|
|
|
|
istringstream is(to_utf8(cmd.argument()));
|
2004-02-13 11:05:29 +00:00
|
|
|
|
LyXLex lex(0, 0);
|
|
|
|
|
lex.setStream(is);
|
|
|
|
|
ParagraphParameters params;
|
|
|
|
|
params.read(lex);
|
|
|
|
|
setParagraph(cur,
|
2006-10-20 19:26:23 +00:00
|
|
|
|
params.spacing(),
|
|
|
|
|
params.align(),
|
2006-11-11 12:00:34 +00:00
|
|
|
|
params.labelWidthString(),
|
2006-10-20 19:26:23 +00:00
|
|
|
|
params.noindent());
|
2006-09-11 08:54:10 +00:00
|
|
|
|
cur.message(_("Paragraph layout set"));
|
2004-02-13 11:05:29 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-20 17:19:53 +00:00
|
|
|
|
case LFUN_ESCAPE:
|
2004-03-25 09:16:36 +00:00
|
|
|
|
if (cur.selection()) {
|
2004-02-20 17:19:53 +00:00
|
|
|
|
cur.selection() = false;
|
2004-03-25 09:16:36 +00:00
|
|
|
|
} else {
|
|
|
|
|
cur.undispatched();
|
2005-09-27 08:42:28 +00:00
|
|
|
|
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
|
2004-03-25 09:16:36 +00:00
|
|
|
|
}
|
2004-02-20 17:19:53 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2002-08-20 13:00:25 +00:00
|
|
|
|
default:
|
2006-04-05 23:56:29 +00:00
|
|
|
|
lyxerr[Debug::ACTION]
|
2005-08-03 20:21:11 +00:00
|
|
|
|
<< BOOST_CURRENT_FUNCTION
|
2006-04-05 23:56:29 +00:00
|
|
|
|
<< ": Command " << cmd
|
2005-08-03 20:21:11 +00:00
|
|
|
|
<< " not DISPATCHED by LyXText" << endl;
|
2004-03-01 17:12:09 +00:00
|
|
|
|
cur.undispatched();
|
2004-02-20 17:19:53 +00:00
|
|
|
|
break;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
2004-05-18 07:18:02 +00:00
|
|
|
|
|
2006-10-22 11:46:36 +00:00
|
|
|
|
needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
|
2006-11-17 17:42:52 +00:00
|
|
|
|
|
|
|
|
|
// FIXME: The cursor flag is reset two lines below
|
|
|
|
|
// so we need to check here if some of the LFUN did touch that.
|
|
|
|
|
// for now only LyXText::erase() and LyXText::backspace() do that.
|
|
|
|
|
// The plan is to verify all the LFUNs and then to remove this
|
|
|
|
|
// singleParUpdate boolean altogether.
|
|
|
|
|
if (cur.result().update() & Update::Force) {
|
|
|
|
|
singleParUpdate = false;
|
|
|
|
|
needsUpdate = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIXME: the following code should go in favor of fine grained
|
|
|
|
|
// update flag treatment.
|
2005-10-07 12:00:41 +00:00
|
|
|
|
if (singleParUpdate)
|
|
|
|
|
// Inserting characters does not change par height
|
2006-04-05 23:56:29 +00:00
|
|
|
|
if (cur.bottom().paragraph().dim().height()
|
2005-12-31 11:40:33 +00:00
|
|
|
|
== olddim.height()) {
|
2005-10-07 12:00:41 +00:00
|
|
|
|
// if so, update _only_ this paragraph
|
2006-10-22 11:46:36 +00:00
|
|
|
|
cur.updateFlags(Update::SinglePar |
|
|
|
|
|
Update::FitCursor |
|
|
|
|
|
Update::MultiParSel);
|
2006-03-10 16:10:35 +00:00
|
|
|
|
return;
|
2005-10-07 12:00:41 +00:00
|
|
|
|
} else
|
|
|
|
|
needsUpdate = true;
|
2006-11-17 17:42:52 +00:00
|
|
|
|
|
2005-02-08 02:06:39 +00:00
|
|
|
|
if (!needsUpdate
|
|
|
|
|
&& &oldTopSlice.inset() == &cur.inset()
|
|
|
|
|
&& oldTopSlice.idx() == cur.idx()
|
2006-11-17 17:42:52 +00:00
|
|
|
|
&& !sel // sel is a backup of cur.selection() at the biginning of the function.
|
2005-02-08 02:06:39 +00:00
|
|
|
|
&& !cur.selection())
|
2006-11-27 12:49:28 +00:00
|
|
|
|
// FIXME: it would be better if we could just do this
|
|
|
|
|
//
|
|
|
|
|
//if (cur.result().update() != Update::FitCursor)
|
|
|
|
|
// cur.noUpdate();
|
|
|
|
|
//
|
|
|
|
|
// But some LFUNs do not set Update::FitCursor when needed, so we
|
|
|
|
|
// do it for all. This is not very harmfull as FitCursor will provoke
|
|
|
|
|
// a full redraw only if needed but still, a proper review of all LFUN
|
|
|
|
|
// should be done and this needsUpdate boolean can then be removed.
|
|
|
|
|
cur.updateFlags(Update::FitCursor);
|
2005-02-08 02:06:39 +00:00
|
|
|
|
else
|
2006-10-22 11:46:36 +00:00
|
|
|
|
cur.updateFlags(Update::Force | Update::FitCursor);
|
2004-02-20 17:19:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-20 13:00:25 +00:00
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
|
2004-12-02 11:32:14 +00:00
|
|
|
|
FuncStatus & flag) const
|
2004-02-20 17:19:53 +00:00
|
|
|
|
{
|
2004-03-18 13:57:20 +00:00
|
|
|
|
BOOST_ASSERT(cur.text() == this);
|
2005-11-02 11:27:08 +00:00
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
LyXFont const & font = real_current_font;
|
|
|
|
|
bool enable = true;
|
2005-11-02 11:27:08 +00:00
|
|
|
|
InsetBase::Code code = InsetBase::NO_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
|
|
|
|
switch (cmd.action) {
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DEPTH_DECREMENT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
enable = changeDepthAllowed(cur, DEC_DEPTH);
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DEPTH_INCREMENT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
enable = changeDepthAllowed(cur, INC_DEPTH);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_APPENDIX:
|
|
|
|
|
flag.setOnOff(cur.paragraph().params().startOfAppendix());
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BIBITEM_INSERT:
|
2005-06-06 08:30:20 +00:00
|
|
|
|
enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_DIALOG_SHOW_NEW_INSET:
|
2006-09-01 15:41:38 +00:00
|
|
|
|
if (cmd.argument() == "bibitem")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BIBITEM_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "bibtex")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BIBTEX_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "box")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BOX_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "branch")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BRANCH_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "citation")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::CITE_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "ert")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::ERT_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "external")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::EXTERNAL_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "float")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::FLOAT_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "graphics")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::GRAPHICS_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "include")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::INCLUDE_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "index")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::INDEX_CODE;
|
2006-11-04 17:55:36 +00:00
|
|
|
|
else if (cmd.argument() == "nomenclature")
|
|
|
|
|
code = InsetBase::NOMENCL_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "label")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::LABEL_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "note")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::NOTE_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "ref")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::REF_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "toc")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::TOC_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "url")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::URL_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "vspace")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::VSPACE_CODE;
|
2006-09-01 15:41:38 +00:00
|
|
|
|
else if (cmd.argument() == "wrap")
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::WRAP_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_ERT_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::ERT_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FOOTNOTE_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::FOOT_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_TABULAR_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::TABULAR_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MARGINALNOTE_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::MARGIN_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FLOAT_INSERT:
|
|
|
|
|
case LFUN_FLOAT_WIDE_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::FLOAT_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WRAP_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::WRAP_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_FLOAT_LIST:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::FLOAT_LIST_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
#if 0
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LIST_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::LIST_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_THEOREM_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::THEOREM_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CAPTION_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::CAPTION_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_NOTE_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::NOTE_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHARSTYLE_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::CHARSTYLE_CODE;
|
2005-11-02 11:27:08 +00:00
|
|
|
|
if (cur.buffer().params().getLyXTextClass().charstyles().empty())
|
2004-03-18 13:57:20 +00:00
|
|
|
|
enable = false;
|
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BOX_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BOX_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BRANCH_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BRANCH_CODE;
|
2005-11-02 11:27:08 +00:00
|
|
|
|
if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
|
2004-03-18 13:57:20 +00:00
|
|
|
|
enable = false;
|
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_LABEL_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::LABEL_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_OPTIONAL_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::OPTARG_CODE;
|
2005-11-02 11:27:08 +00:00
|
|
|
|
enable = numberOfOptArgs(cur.paragraph())
|
|
|
|
|
< cur.paragraph().layout()->optionalargs;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_ENVIRONMENT_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::BOX_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_INDEX_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::INDEX_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_INDEX_PRINT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::INDEX_PRINT_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-11-04 17:55:36 +00:00
|
|
|
|
case LFUN_NOMENCL_INSERT:
|
|
|
|
|
code = InsetBase::NOMENCL_CODE;
|
|
|
|
|
break;
|
|
|
|
|
case LFUN_NOMENCL_PRINT:
|
|
|
|
|
code = InsetBase::NOMENCL_PRINT_CODE;
|
|
|
|
|
break;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_TOC_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::TOC_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HTML_INSERT:
|
|
|
|
|
case LFUN_URL_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::URL_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_QUOTE_INSERT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
// always allow this, since we will inset a raw quote
|
|
|
|
|
// if an inset is not allowed.
|
|
|
|
|
break;
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_HYPHENATION_POINT_INSERT:
|
|
|
|
|
case LFUN_LIGATURE_BREAK_INSERT:
|
|
|
|
|
case LFUN_HFILL_INSERT:
|
|
|
|
|
case LFUN_MENU_SEPARATOR_INSERT:
|
|
|
|
|
case LFUN_DOTS_INSERT:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::SPECIALCHAR_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_SPACE_INSERT:
|
|
|
|
|
// slight hack: we know this is allowed in math mode
|
|
|
|
|
if (cur.inTexted())
|
2004-11-25 19:13:07 +00:00
|
|
|
|
code = InsetBase::SPACE_CODE;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
break;
|
2005-11-02 11:27:08 +00:00
|
|
|
|
|
2005-04-13 09:43:58 +00:00
|
|
|
|
case LFUN_INSET_MODIFY:
|
|
|
|
|
// We need to disable this, because we may get called for a
|
|
|
|
|
// tabular cell via
|
|
|
|
|
// InsetTabular::getStatus() -> InsetText::getStatus()
|
|
|
|
|
// and we don't handle LFUN_INSET_MODIFY.
|
|
|
|
|
enable = false;
|
|
|
|
|
break;
|
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_EMPH:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.emph() == LyXFont::ON);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_NOUN:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.noun() == LyXFont::ON);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_BOLD:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_SANS:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_ROMAN:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_CODE:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
|
2005-05-05 13:13:56 +00:00
|
|
|
|
return true;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
|
2005-11-25 09:27:08 +00:00
|
|
|
|
case LFUN_CUT:
|
|
|
|
|
case LFUN_COPY:
|
|
|
|
|
enable = cur.selection();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LFUN_PASTE:
|
2006-10-21 00:16:43 +00:00
|
|
|
|
enable = cap::numberOfSelections() > 0;
|
2005-11-25 09:27:08 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-09-08 14:08:26 +00:00
|
|
|
|
case LFUN_PARAGRAPH_MOVE_UP:
|
2006-04-26 22:43:26 +00:00
|
|
|
|
enable = cur.pit() > 0 && !cur.selection();
|
|
|
|
|
break;
|
|
|
|
|
|
2006-09-08 14:08:26 +00:00
|
|
|
|
case LFUN_PARAGRAPH_MOVE_DOWN:
|
2006-04-26 22:43:26 +00:00
|
|
|
|
enable = cur.pit() < cur.lastpit() && !cur.selection();
|
|
|
|
|
break;
|
|
|
|
|
|
2006-09-08 14:08:26 +00:00
|
|
|
|
case LFUN_INSET_DISSOLVE:
|
Move BufferView cached pointer out of LyXText:
* LyXText
- bv(), bv_owner, : deleted.
- These methods now need a (Buffer const &) argument: getFont(), applyOuterFont(), getLayoutFont(), getLabelFont(), setCharFont(), setLayout(), singleWidth(), leftMargin(), rightMargin(), computeRowMetrics(), isMainText(), spacing(), isRTL(), cursorX(), rowBreakPoint(), setRowWidth(), labelFill(), labelEnd().
- These methods now need a (BufferView const &) argument and are propably candidates for future removal when 1.6 is opened for development: redoParagraph(), x2pos(), getRowNearY(), getColumnNearX(), checkInsetHit(), setHeightOfRow().
- recUndo(): now need a LCursor argument.
* CoordCache::get(LyXText const *, pit_type):
- now const.
- use const_iterator instead of iterator.
* FontIterator:
- add (Buffer const &) argument to ctor
- buffer_: new const reference to applicable BufferView.
* InsetBase
- xo(), yo(), covers() and neverIndent() are now const.
* InsetText::setViewCache(): deleted
All other changes are due to the LyXText and InsetBase API changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15618 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 12:45:33 +00:00
|
|
|
|
enable = !isMainText(*cur.bv().buffer()) && cur.inset().nargs() == 1;
|
2006-08-08 13:34:02 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-10-04 21:43:40 +00:00
|
|
|
|
case LFUN_CHANGE_ACCEPT:
|
|
|
|
|
case LFUN_CHANGE_REJECT:
|
2006-11-24 23:01:24 +00:00
|
|
|
|
// TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
|
|
|
|
|
// In principle, these LFUNs should only be enabled if there
|
|
|
|
|
// is a change at the current position/in the current selection.
|
|
|
|
|
// However, without proper optimizations, this will inevitably
|
|
|
|
|
// result in unacceptable performance - just imagine a user who
|
|
|
|
|
// wants to select the complete content of a long document.
|
|
|
|
|
enable = true;
|
2006-10-04 21:43:40 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_WORD_DELETE_FORWARD:
|
|
|
|
|
case LFUN_WORD_DELETE_BACKWARD:
|
|
|
|
|
case LFUN_LINE_DELETE:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_FORWARD:
|
|
|
|
|
case LFUN_WORD_BACKWARD:
|
|
|
|
|
case LFUN_CHAR_FORWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_FORWARD_SELECT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_CHAR_BACKWARD:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_BACKWARD_SELECT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_UP:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_UP_SELECT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_DOWN:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DOWN_SELECT:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_PARAGRAPH_UP_SELECT:
|
|
|
|
|
case LFUN_PARAGRAPH_DOWN_SELECT:
|
|
|
|
|
case LFUN_SCREEN_UP_SELECT:
|
|
|
|
|
case LFUN_SCREEN_DOWN_SELECT:
|
|
|
|
|
case LFUN_LINE_BEGIN_SELECT:
|
|
|
|
|
case LFUN_LINE_END_SELECT:
|
|
|
|
|
case LFUN_WORD_FORWARD_SELECT:
|
|
|
|
|
case LFUN_WORD_BACKWARD_SELECT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_SELECT:
|
|
|
|
|
case LFUN_PARAGRAPH_UP:
|
|
|
|
|
case LFUN_PARAGRAPH_DOWN:
|
|
|
|
|
case LFUN_SCREEN_UP:
|
|
|
|
|
case LFUN_SCREEN_DOWN:
|
|
|
|
|
case LFUN_LINE_BEGIN:
|
|
|
|
|
case LFUN_LINE_END:
|
|
|
|
|
case LFUN_BREAK_LINE:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_DELETE_FORWARD:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_DELETE_FORWARD_SKIP:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_CHAR_DELETE_BACKWARD:
|
|
|
|
|
case LFUN_DELETE_BACKWARD_SKIP:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BREAK_PARAGRAPH_SKIP:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_PARAGRAPH_SPACING:
|
|
|
|
|
case LFUN_INSET_INSERT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_WORD_UPCASE:
|
|
|
|
|
case LFUN_WORD_LOWCASE:
|
|
|
|
|
case LFUN_WORD_CAPITALIZE:
|
|
|
|
|
case LFUN_CHARS_TRANSPOSE:
|
|
|
|
|
case LFUN_SERVER_GET_XY:
|
|
|
|
|
case LFUN_SERVER_SET_XY:
|
|
|
|
|
case LFUN_SERVER_GET_FONT:
|
|
|
|
|
case LFUN_SERVER_GET_LAYOUT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_LAYOUT:
|
Split clipboard and X selection
* src/LyXAction.C
(LyXAction::init): handle new LFUN_CLIPBOARD_PASTE
* src/insets/insettabular.C
(InsetTabular::doDispatch): ditto
* src/insets/insetbox.C
(InsetBox::doDispatch): ditto
* src/insets/insetert.C
(InsetERT::doDispatch): ditto
(InsetERT::getStatus): ditto
* src/insets/insetcharstyle.C
(InsetCharStyle::doDispatch): ditto
* src/BufferView_pimpl.C
(BufferView::Pimpl::selectionRequest): stuff selection, not clipboard
* src/mathed/math_nestinset.C
(MathNestInset::lfunMousePress): get stuff selection, not clipboard
(MathNestInset::lfunMouseRelease): clipboard -> selection in
commented code
* src/CutAndPaste.C
(cutSelection): ditto
* src/frontends/{qt3,gtk}/GuiImplementation.C
(GuiImplementation::newWorkArea): create new selection, not clipboard,
since the clipboard is now an object
(GuiImplementation::destroyWorkArea): destroy selection, not clipboard
* src/frontends/{qt4,qt3,gtk}/GuiSelection.h: new, copied from
GuiClipboard.h
* src/frontends/{qt4,qt3,gtk}/GuiSelection.C: new, copied from
GuiClipboard.C
* src/frontends/{qt3,gtk}/GuiImplementation.h
(selection): new accessor for selection_
(selection_): new, the global selection object
* src/frontends/{qt4,qt3,gtk}/Makefile.am: add GuiSelection.C and
GuiSelection.h
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.C
(GuiClipboard::get): return clipboard, not selection
(GuiClipboard::put): stuff clipboard, not selection
* src/frontends/{qt4,qt3,gtk}/GuiClipboard.h
(haveSelection): remove (this is now in GuiSelection)
* src/frontends/{qt3,gtk}/GuiClipboard.h
(old_work_area_): remove, since it is not needed anymore
* src/frontends/gtk/ghelpers.C
(getGTKStockIcon): handle LFUN_CLIPBOARD_PASTE
* src/frontends/Clipboard.h
(haveSelection): remove (this is now in Selection)
* src/frontends/qt4/GuiImplementation.[Ch]
(GuiImplementation::selection): new accessor for selection_
* src/frontends/Gui.h
(selection): New accessor for the global selection object
* src/frontends/Selection.h; new, copied from Clipboard.h
* src/frontends/Makefile.am: add Selection.h
* src/text3.C
(various): s/clipboard().haveSelection/selection().haveSelection/
(LyXText::dispatch): handle LFUN_CLIPBOARD_PASTE
(LyXText::getStatus): ditto
* src/lfuns.h: new lfun LFUN_CLIPBOARD_PASTE
* lib/ui/stdmenus.ui: add new lfun LFUN_CLIPBOARD_PASTE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14408 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-10 11:32:25 +00:00
|
|
|
|
case LFUN_CLIPBOARD_PASTE:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PRIMARY_SELECTION_PASTE:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_DATE_INSERT:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_SELF_INSERT:
|
|
|
|
|
case LFUN_LINE_INSERT:
|
|
|
|
|
case LFUN_PAGEBREAK_INSERT:
|
2006-11-25 15:09:01 +00:00
|
|
|
|
case LFUN_CLEARPAGE_INSERT:
|
|
|
|
|
case LFUN_CLEARDOUBLEPAGE_INSERT:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_MATH_DISPLAY:
|
|
|
|
|
case LFUN_MATH_IMPORT_SELECTION:
|
|
|
|
|
case LFUN_MATH_MODE:
|
|
|
|
|
case LFUN_MATH_MACRO:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MATH_MATRIX:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_MATH_DELIM:
|
2006-05-07 10:51:19 +00:00
|
|
|
|
case LFUN_MATH_BIGDELIM:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_MATH_SUBSCRIPT:
|
|
|
|
|
case LFUN_MATH_SUPERSCRIPT:
|
|
|
|
|
case LFUN_FONT_DEFAULT:
|
|
|
|
|
case LFUN_FONT_UNDERLINE:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_FONT_SIZE:
|
|
|
|
|
case LFUN_LANGUAGE:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_FONT_FREE_APPLY:
|
|
|
|
|
case LFUN_FONT_FREE_UPDATE:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_LAYOUT_PARAGRAPH:
|
|
|
|
|
case LFUN_PARAGRAPH_UPDATE:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_ACCENT_UMLAUT:
|
|
|
|
|
case LFUN_ACCENT_CIRCUMFLEX:
|
|
|
|
|
case LFUN_ACCENT_GRAVE:
|
|
|
|
|
case LFUN_ACCENT_ACUTE:
|
|
|
|
|
case LFUN_ACCENT_TILDE:
|
|
|
|
|
case LFUN_ACCENT_CEDILLA:
|
|
|
|
|
case LFUN_ACCENT_MACRON:
|
|
|
|
|
case LFUN_ACCENT_DOT:
|
|
|
|
|
case LFUN_ACCENT_UNDERDOT:
|
|
|
|
|
case LFUN_ACCENT_UNDERBAR:
|
|
|
|
|
case LFUN_ACCENT_CARON:
|
|
|
|
|
case LFUN_ACCENT_SPECIAL_CARON:
|
|
|
|
|
case LFUN_ACCENT_BREVE:
|
|
|
|
|
case LFUN_ACCENT_TIE:
|
|
|
|
|
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
|
|
|
|
|
case LFUN_ACCENT_CIRCLE:
|
|
|
|
|
case LFUN_ACCENT_OGONEK:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_THESAURUS_ENTRY:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_PARAGRAPH_PARAMS_APPLY:
|
2004-03-18 13:57:20 +00:00
|
|
|
|
case LFUN_ESCAPE:
|
2006-05-05 20:23:12 +00:00
|
|
|
|
case LFUN_BUFFER_END:
|
|
|
|
|
case LFUN_BUFFER_BEGIN:
|
2006-05-08 18:09:19 +00:00
|
|
|
|
case LFUN_BUFFER_BEGIN_SELECT:
|
|
|
|
|
case LFUN_BUFFER_END_SELECT:
|
2006-10-22 18:47:19 +00:00
|
|
|
|
case LFUN_UNICODE_INSERT:
|
2004-11-30 01:59:49 +00:00
|
|
|
|
// these are handled in our dispatch()
|
2004-08-13 20:14:32 +00:00
|
|
|
|
enable = true;
|
|
|
|
|
break;
|
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
default:
|
2004-12-02 11:32:14 +00:00
|
|
|
|
return false;
|
2004-03-18 13:57:20 +00:00
|
|
|
|
}
|
2005-11-02 11:27:08 +00:00
|
|
|
|
|
|
|
|
|
if (code != InsetBase::NO_CODE
|
|
|
|
|
&& (cur.empty() || !cur.inset().insetAllowed(code)))
|
|
|
|
|
enable = false;
|
|
|
|
|
|
2004-03-18 13:57:20 +00:00
|
|
|
|
flag.enabled(enable);
|
|
|
|
|
return true;
|
2002-08-20 13:00:25 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|