lyx_mirror/src/ToolbarBackend.C
Abdelrazak Younes 4d5ae916ad Fix bug 3293 by Bernhard Roider:
This changes the semantics of isOK() and operator(), comments from Bernhard below:

With the old version of lyxlex it was _impossible_ to check whether reading an integer, float, ... succeeded or not. The current solution to check for is.bad() in some cases and in other cases use is.good() does not give the desired information. Moreover the result of is.bad() depends on the stl implementation and behaves different for linux and windows.

the bug was introduced by the patch that fixed the bug that crashed lyx when "inset-insert ert" was executed from the command buffer.
The lexer has the method isOK() which reflects the status of the stream is.
The operators void* and ! are not really well defined (they depend on the value of is.bad()). What is missing is a test if the last reading operation was successful and thus the returned value is valid.
That's what i implemented in this patch.

The new rule for using the lexer:

if you want to know if the lexer still has data to read (either from the stream or from the pushed token) then use "lex.isOK()".
If you want to test if the last reading operation was successful then use eg. "if (lex) {...}" or unsuccessful then use eg. "if (!lex) {...}"

an example:

int readParam(LyxLex &lex) {

    int param = 1; // default value
    if (lex.isOK()) { // the lexer has data to read
        int p;    // temporary variable
        lex >> p;
        if (lex) param = p; // only use the input if the reading operation was successful
    }
    return param;
}




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17569 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-26 13:43:49 +00:00

263 lines
5.6 KiB
C

/**
* \file ToolbarBackend.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Jean-Marc Lasgouttes
* \author John Levon
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "ToolbarBackend.h"
#include "funcrequest.h"
#include "LyXAction.h"
#include "lyxlex.h"
#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
#include "support/filetools.h"
#include "frontends/controllers/ControlMath.h"
namespace lyx {
using support::compare_ascii_no_case;
using support::getVectorFromString;
using support::libFileSearch;
using support::subst;
using std::endl;
using std::make_pair;
using std::string;
using std::vector;
ToolbarBackend toolbarbackend;
namespace {
enum tooltags {
TO_ADD = 1,
TO_ENDTOOLBAR,
TO_SEPARATOR,
TO_LAYOUTS,
TO_MINIBUFFER,
TO_LAST
};
struct keyword_item toolTags[TO_LAST - 1] = {
{ "end", TO_ENDTOOLBAR },
{ "item", TO_ADD },
{ "layouts", TO_LAYOUTS },
{ "minibuffer", TO_MINIBUFFER },
{ "separator", TO_SEPARATOR }
};
} // namespace anon
ToolbarBackend::ToolbarBackend()
{
}
void ToolbarBackend::read(LyXLex & lex)
{
//consistency check
if (compare_ascii_no_case(lex.getString(), "toolbar")) {
lyxerr << "ToolbarBackend::read: ERROR wrong token:`"
<< lex.getString() << '\'' << endl;
}
lex.next(true);
Toolbar tb;
tb.name = lex.getString();
lex.next(true);
tb.gui_name = lex.getString();
if (!lex) {
lyxerr << "ToolbarBackend::read: Malformed toolbar "
"description " << lex.getString() << endl;
return;
}
bool quit = false;
lex.pushTable(toolTags, TO_LAST - 1);
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
while (lex.isOK() && !quit) {
switch (lex.lex()) {
case TO_ADD:
if (lex.next(true)) {
docstring const tooltip = translateIfPossible(lex.getDocString());
lex.next(true);
string const func_arg = lex.getString();
lyxerr[Debug::PARSER]
<< "ToolbarBackend::read TO_ADD func: `"
<< func_arg << '\'' << endl;
FuncRequest func =
lyxaction.lookupFunc(func_arg);
add(tb, func, tooltip);
}
break;
case TO_MINIBUFFER:
add(tb, FuncRequest(kb_action(MINIBUFFER)));
break;
case TO_SEPARATOR:
add(tb, FuncRequest(kb_action(SEPARATOR)));
break;
case TO_LAYOUTS:
add(tb, FuncRequest(kb_action(LAYOUTS)));
break;
case TO_ENDTOOLBAR:
quit = true;
break;
default:
lex.printError("ToolbarBackend::read: "
"Unknown toolbar tag: `$$Token'");
break;
}
}
toolbars.push_back(tb);
lex.popTable();
}
void ToolbarBackend::readToolbars(LyXLex & lex)
{
//consistency check
if (compare_ascii_no_case(lex.getString(), "toolbars")) {
lyxerr << "ToolbarBackend::read: ERROR wrong token:`"
<< lex.getString() << '\'' << endl;
}
lex.next(true);
while (lex.isOK()) {
string name = lex.getString();
lex.next(true);
if (!compare_ascii_no_case(name, "end"))
return;
Toolbars::iterator tcit = toolbars.begin();
Toolbars::iterator tend = toolbars.end();
for (; tcit != tend; ++tcit) {
if (tcit->name == name)
break;
}
if (tcit == tend) {
lyxerr << "ToolbarBackend: undefined toolbar "
<< name << endl;
return;
}
tcit->flags = static_cast<Flags>(0);
string flagstr = lex.getString();
lex.next(true);
vector<string> flags = getVectorFromString(flagstr);
vector<string>::const_iterator cit = flags.begin();
vector<string>::const_iterator end = flags.end();
for (; cit != end; ++cit) {
int flag = 0;
if (!compare_ascii_no_case(*cit, "off"))
flag = OFF;
else if (!compare_ascii_no_case(*cit, "on"))
flag = ON;
else if (!compare_ascii_no_case(*cit, "math"))
flag = MATH;
else if (!compare_ascii_no_case(*cit, "table"))
flag = TABLE;
else if (!compare_ascii_no_case(*cit, "review"))
flag = REVIEW;
else if (!compare_ascii_no_case(*cit, "top"))
flag = TOP;
else if (!compare_ascii_no_case(*cit, "bottom"))
flag = BOTTOM;
else if (!compare_ascii_no_case(*cit, "left"))
flag = LEFT;
else if (!compare_ascii_no_case(*cit, "right"))
flag = RIGHT;
else {
lyxerr << "ToolbarBackend::read: unrecognised token:`"
<< *cit << '\'' << endl;
}
tcit->flags = static_cast<Flags>(tcit->flags | flag);
}
usedtoolbars.push_back(*tcit);
}
}
void ToolbarBackend::add(Toolbar & tb,
FuncRequest const & func, docstring const & tooltip)
{
tb.items.push_back(make_pair(func, tooltip));
tb.items.back().first.origin = FuncRequest::TOOLBAR;
}
string const ToolbarBackend::getIcon(FuncRequest const & f)
{
using frontend::find_xpm;
string fullname;
switch (f.action) {
case LFUN_MATH_INSERT:
if (!f.argument().empty())
fullname = find_xpm(to_utf8(f.argument()).substr(1));
break;
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
fullname = find_xpm(to_utf8(f.argument()));
break;
default:
string const name = lyxaction.getActionName(f.action);
string xpm_name(name);
if (!f.argument().empty())
xpm_name = subst(name + ' ' + to_utf8(f.argument()), ' ', '_');
fullname = libFileSearch("images", xpm_name, "xpm").absFilename();
if (fullname.empty()) {
// try without the argument
fullname = libFileSearch("images", name, "xpm").absFilename();
}
}
if (!fullname.empty()) {
lyxerr[Debug::GUI] << "Full icon name is `"
<< fullname << '\'' << endl;
return fullname;
}
lyxerr[Debug::GUI] << "Cannot find icon for command \""
<< lyxaction.getActionName(f.action)
<< '(' << to_utf8(f.argument()) << ")\"" << endl;
return libFileSearch("images", "unknown", "xpm").absFilename();
}
} // namespace lyx