+2001-12-06 John Levon <moz@compsoc.man.ac.uk>
+
+ * lyx_cb.C: another bv->text misuse, from insert label
+
+2001-12-03 John Levon <moz@compsoc.man.ac.uk>
+
+ * kbsequence.h:
+ * kbsequence.C: re-instate nmodifier mask
+
+2001-12-12 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * lyx_main.h: make lyxGUI private.
+
2001-12-06 John Levon <moz@compsoc.man.ac.uk>
* lyxfind.C: place the cursor correctly on failed search
/// Asks for a text
std::pair<bool, string> const askForText(string const & msg,
string const & dflt = string());
-};
+}
+2001-12-12 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * Alert.h: remove spurious semi-colon at the end of the namespace scope.
+
2001-11-22 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am:
enum { ModsMask = ShiftMask | ControlMask | Mod1Mask };
-kb_action kb_sequence::addkey(unsigned int key, unsigned int mod)
+kb_action kb_sequence::addkey(unsigned int key, unsigned int mod, unsigned int nmod)
{
// adding a key to a deleted sequence
// starts a new sequence
modifiers.clear();
}
- modifiers.push_back(mod);
+ modifiers.push_back(mod + (nmod << 16));
sequence.push_back(key);
++length_;
string::size_type i = 0;
unsigned int mod = 0;
+ unsigned int nmod = 0;
while (i < s.length()) {
if (s[i] == ' ')
++i;
&& s[i + 2] == '-') {
switch (s[i + 1]) {
case 's': case 'S':
+ nmod |= ShiftMask;
i += 3;
continue;
case 'c': case 'C':
+ nmod |= ControlMask;
i += 3;
continue;
case 'm': case 'M':
+ nmod |= Mod1Mask;
i += 3;
continue;
default:
}
i = j;
- addkey(key, mod);
+ addkey(key, mod, nmod);
mod = 0;
}
}
string buf;
buf += print();
-
+
if (!curmap)
return buf;
* Add a key to the key sequence and look it up in the curmap
* if the latter is defined.
* @param mod modifier mask
+ * @param nmod which modifiers to mask out for equality test
* @return the action matching this key sequence or LFUN_UNKNOWN_ACTION
*/
- kb_action addkey(unsigned int key, unsigned int mod);
+ kb_action addkey(unsigned int key, unsigned int mod, unsigned int nmod = 0);
/**
* Add a sequence of keys from a string to the sequence
string label(arg);
bv->owner()->prohibitInput();
if (label.empty()) {
- Paragraph * par = bv->text->cursor.par();
+ Paragraph * par = bv->getLyXText()->cursor.par();
LyXLayout const * layout =
&textclasslist.Style(bv->buffer()->params.textclass,
par->getLayout());
/// in the case of failure
static void emergencyCleanup();
-
- ///
- LyXGUI * lyxGUI; // should be only one of this
+
private:
+ /// Should be a maximum of 1 LyXGUI.
+ LyXGUI * lyxGUI;
/// does this user start lyx for the first time?
bool first_start;
///