anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-10 18:58:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7186 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-06-18 13:47:11 +00:00
parent 9fe2fd47ea
commit 9ccb4e171c
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-18 André Pönitz <poenitz@gmx.net>
* kbmap.[Ch]: use vector<> instead of list<>
2003-06-17 Lars Gullik Bjønnes <larsbj@lyx.org>
* text3.C (dispatch): handle arg to LFUN_PASTE, call

22
src/kbmap.C
View File

@ -23,13 +23,18 @@ string const kb_keymap::printKeysym(LyXKeySymPtr key,
string const s = key->getSymbolName();
if (mod & key_modifier::shift) buf += "S-";
if (mod & key_modifier::ctrl) buf += "C-";
if (mod & key_modifier::alt) buf += "M-";
if (mod & key_modifier::shift)
buf += "S-";
if (mod & key_modifier::ctrl)
buf += "C-";
if (mod & key_modifier::alt)
buf += "M-";
buf += s;
return buf;
}
string const kb_keymap::printKey(kb_key const & key) const
{
return printKeysym(key.code, key.mod.first);
@ -68,8 +73,8 @@ int kb_keymap::lookup(LyXKeySymPtr key,
return LFUN_UNKNOWN_ACTION;
}
for (Table::const_iterator cit = table.begin();
cit != table.end(); ++cit) {
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
key_modifier::state mask(cit->mod.second);
key_modifier::state check =
static_cast<key_modifier::state>(mod & ~mask);
@ -99,8 +104,8 @@ int kb_keymap::lookup(LyXKeySymPtr key,
string const kb_keymap::print() const
{
string buf;
for (Table::const_iterator cit = table.begin();
cit != table.end(); ++cit) {
Table::const_iterator end = table.end();
for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
buf += printKey((*cit));
buf += ' ';
}
@ -118,7 +123,8 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
key_modifier::state const mod2 = seq->modifiers[r].second;
// check if key is already there
for (Table::iterator it = table.begin(); it != table.end(); ++it) {
Table::iterator end = table.end();
for (Table::iterator it = table.begin(); it != end; ++it) {
if (*(code) == *(it->code)
&& mod1 == it->mod.first
&& mod2 == it->mod.second) {

4
src/kbmap.h
View File

@ -15,7 +15,7 @@
#include "frontends/key_state.h"
#include "frontends/LyXKeySym.h"
#include <list>
#include <vector>
class kb_sequence;
@ -87,7 +87,7 @@ private:
return table.empty();
}
///
typedef std::list<kb_key> Table;
typedef std::vector<kb_key> Table;
///
Table table;
};