/* This file is part of
-* ======================================================
-*
-* LyX, The Document Processor
-*
-* Copyright (C) 1995 Matthias Ettrich
-* Copyright (C) 1995-1998 The LyX Team.
-*
-*======================================================*/
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-1999 The LyX Team.
+ *
+ * ====================================================== */
#include <config.h>
#endif
#include "LyXAction.h"
-#include "error.h"
+#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
{ "citation-insert", LFUN_INSERT_CITATION },
{ "command-execute", LFUN_EXEC_COMMAND },
{ "command-prefix", LFUN_PREFIX },
+ { "command-sequence", LFUN_SEQUENCE },
{ "copy", LFUN_COPY },
{ "cut", LFUN_CUT },
{ "delete-backward", LFUN_BACKSPACE },
{ "index-insert", LFUN_INDEX_INSERT },
{ "index-insert-last", LFUN_INDEX_INSERT_LAST },
{ "index-print", LFUN_INDEX_PRINT },
+#if 0
{ "inset-latex-insert", LFUN_INSERT_INSET_LATEX },
+#endif
{ "keymap-off", LFUN_KMAP_OFF },
{ "keymap-primary", LFUN_KMAP_PRIM },
{ "keymap-secondary", LFUN_KMAP_SEC },
field with attributes using these tags:
enum FUNC_ATTRIB {
- LFAT_NONE=0, // Nothing special
- LFAT_ISRO=1, // Is readonly (does not modify a buffer)
- LFAT_ISIA=2, // Is interactive (requires a GUI)
- LFAT_REQARG=4, // Requires argument
- LFAT_ISMO=8, // Only math mode
+ LFAT_NONE= 0, // Nothing special
+ LFAT_ISRO= 1, // Is readonly (does not modify a buffer)
+ LFAT_ISIA= 2, // Is interactive (requires a GUI)
+ LFAT_REQARG= 4, // Requires argument
+ LFAT_ISMO= 8, // Only math mode
LFAT_ETCETC
};
LFUN_INSERTFOOTNOTE,
LFUN_INSERT_BIBTEX,
LFUN_INSERT_CITATION,
+#if 0
LFUN_INSERT_INSET_LATEX,
+#endif
LFUN_INSERT_LABEL,
LFUN_INSERT_MATH,
LFUN_INSERT_MATRIX,
// This is wrong, so I'll just disable it for now.
// The problem is that we might free memory twice in some situations...
// It's better to leak a bit that to crash. (Asger)
-// for (int i=0; i < psd_idx; i++) {
+// for (int i= 0; i < psd_idx; i++) {
// free(lyx_func_args[i].name);
// }
delete[] lyx_func_args;
int LyXAction::searchActionArg(kb_action action, char const *arg)
{
kb_func_table *tb = &lyx_func_args[0];
- for (int i=0; i<psd_idx; i++) {
- if (action==tb->action && !strcmp(tb->name, arg)) {
+ for (int i=
0; i<psd_idx; i++) {
+ if (action == tb->action && !strcmp(tb->name, arg)) {
- lyxerr.debug(string("Pseudoaction already exist[")
- + tostr(action) + '|'
- + tostr(arg) + ']',
- Error::KEY);
+ lyxerr[Debug::KEY] << "Pseudoaction already exist["
+ << action << '|'
+ << arg << ']' << endl;
return LFUN_LASTACTION+i;
}
if (psdaction >= 0) return psdaction;
- if (psd_idx>=MAX_PSEUDO_ACTION) {
- lyxerr.print("Lyx Error: No more pseudo-actions allowed");
- lyxerr.print(" Tell the developers.");
+ if (psd_idx>= MAX_PSEUDO_ACTION) {
+ lyxerr << "Lyx Error: No more pseudo-actions allowed"
+ << " Tell the developers." << endl;
return -1;
}
lyx_func_args[psd_idx].name = strdup(arg);
*arg = lyx_func_args[i].name;
return (int)lyx_func_args[i].action;
} else {
- lyxerr.print("Lyx Error: Unrecognized pseudo-action");
+ lyxerr << "Lyx Error: Unrecognized pseudo-action" << endl;
return -1;
}
}
// Returns an action tag from a string.
-int LyXAction::LookupFunc(char const *func)
+int LyXAction::LookupFunc(char const * func)
{
if (!func)
return LFUN_UNKNOWN_ACTION;
valid func table slot. RVDK_PATCH_5 */
int k, l= 0, r = funcCount;
int action = LFUN_UNKNOWN_ACTION;
- char *arg = strchr(func, ' ');
+ char * arg = strchr(const_cast<char*>(func), ' '); // const cast to
+ // help a sun complier, will go away when this func is rewritten
+ // to use std::containers and std::string.
if (arg) *(arg++) = '\0';
while (l < r) {
last_action_idx = (l+r)/2;
k = strcmp(lyx_func_table[last_action_idx].name, func);
- if (k==0) {
+ if (k == 0) {
action = lyx_func_table[last_action_idx].action;
break;
} else
}
if (arg && action >= 0) {
action = getPseudoAction((kb_action)action, arg);
- lyxerr.debug(string("Pseudo action_arg[")
- + tostr(action) + '|'
- + tostr(arg) + ']',Error::KEY);
+ lyxerr[Debug::KEY] << "Pseudo action_arg["
+ << action << '|'
+ << arg << ']' << endl;
}
return action;
}
// why LFUN_LASTACTION -1? Because LFUN_LASTACTION is too
// large an because there is one internal command, hence
// lyx_func_table is 2 less then LFUN_LASTACTION (Lgb)
- for (int i=0; i < funcCount; i++) {
- if (lyx_func_table[i].action==action)
+ for (int i= 0; i < funcCount; i++) {
+ if (lyx_func_table[i].action == action)
return lyx_func_table[i].name;
}
// Hmm.. let's see whether this is a pseudoaction
action -= LFUN_LASTACTION;
- if (action>=0 && action<psd_idx) {
+ if (action>=
0 && action<psd_idx) {
return lyx_func_args[action].name;
}
char const *LyXAction::helpText(kb_action action) const
{
static bool is_sorted = false;
- static kb_func_table helpTexts[LFUN_LASTACTION] =
+ static kb_func_table helpTexts[LFUN_LASTACTION] =
{
{ _("Describe command"), LFUN_APROPOS },
{ _("Select previous char"), LFUN_LEFTSEL },
// Sort to make it faster
if (!is_sorted) {
- int i=0;
+ int i= 0;
while (i < LFUN_LASTACTION-1) {
if (helpTexts[i].action == 0) {
helpTexts[i].action = (kb_action)i;
is_sorted = true;
}
- if (action <=1 || action >=funcCount)
+ if (action <= 1 || action >= funcCount)
goto no_desc;
if (helpTexts[action].action == action) {
// Function to compare items from the attrib table.
-int actioncomp(const void *a, const void *b)
+extern "C" int actioncomp(const void *a, const void *b)
{
- int const *ia=(int const*)a, *ib=(int const*)b;
+ int const *ia= (int const*)a, *ib= (int const*)b;
return (*ia)-(*ib);
}
if (!is_sorted) {
qsort(func_attrib_table, fCount, sizeof(kb_action), actioncomp);
is_sorted = true;
-// for (int i=0; i<fCount; i++)
+// for (int i= 0; i<fCount; i++)
// fprintf(stdout, "%d: %d\n", i, func_attrib_table[i]);
}
while (l < r) {
m = (l+r)/2;
k = func_attrib_table[m] - action;
- if (k==0) {
+ if (k == 0) {
is_ro = true;
break;
} else
if (k<0) l = m+1; else r = m;
}
- lyxerr.debug(string("RO[") + tostr(action)
- + string(" ") + tostr(is_ro) + string("]"));
+ lyxerr.debug() << "RO[" << action
+ << " " << is_ro << "]" << endl;
return is_ro;
}
+ostream & operator<<(ostream & o, kb_action action)
+{
+ return o << int(action);
+}
projects / lyx.git / blobdiff