anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename LyXKeySym into KeySymbol

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18059 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-04-27 08:43:38 +00:00
parent e870207601
commit 50016ccf3a
17 changed files with 76 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/KeyMap.cpp
View File

@ -20,7 +20,7 @@
#include "LyXAction.h"
#include "Lexer.h"
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include "support/filetools.h"
@ -36,7 +36,7 @@ using std::endl;
using std::string;
string const KeyMap::printKeySym(LyXKeySym const & key,
string const KeyMap::printKeySym(KeySymbol const & key,
key_modifier::state mod)
{
string buf;
@ -171,7 +171,7 @@ bool KeyMap::read(string const & bind_file)
FuncRequest const &
KeyMap::lookup(LyXKeySymPtr key,
KeyMap::lookup(KeySymbolPtr key,
key_modifier::state mod, KeySequence * seq) const
{
static FuncRequest const unknown(LFUN_UNKNOWN_ACTION);
@ -226,7 +226,7 @@ docstring const KeyMap::print(bool forgui) const
void KeyMap::defkey(KeySequence * seq, FuncRequest const & func, unsigned int r)
{
LyXKeySymPtr code = seq->sequence[r];
KeySymbolPtr code = seq->sequence[r];
if (!code->isOK())
return;
@ -322,7 +322,7 @@ KeyMap::Bindings KeyMap::findbindings(FuncRequest const & func,
}
std::pair<LyXKeySym const *, key_modifier::state>
std::pair<KeySymbol const *, key_modifier::state>
KeyMap::find1keybinding(FuncRequest const & func) const
{
Table::const_iterator end = table.end();
@ -332,7 +332,7 @@ KeyMap::find1keybinding(FuncRequest const & func) const
return std::make_pair(cit->code.get(), cit->mod.first);
}
return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
return std::make_pair<KeySymbol const *, key_modifier::state>(0, key_modifier::none);
}

12
src/KeyMap.h
View File

@ -17,7 +17,7 @@
#include "FuncRequest.h"
#include "frontends/key_state.h"
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include "support/docstream.h"
@ -60,7 +60,7 @@ public:
* @return the action / LFUN_COMMAND_PREFIX / LFUN_UNKNOWN_ACTION
*/
FuncRequest const &
lookup(LyXKeySymPtr key,
lookup(KeySymbolPtr key,
key_modifier::state mod, KeySequence * seq) const;
///
@ -74,10 +74,10 @@ public:
/**
* Given an action, find the first 1-key binding (if it exists).
* The LyXKeySym pointer is 0 is no key is found.
* The KeySymbol pointer is 0 is no key is found.
* [only used by the Qt/Mac frontend]
*/
std::pair<LyXKeySym const *, key_modifier::state>
std::pair<KeySymbol const *, key_modifier::state>
find1keybinding(FuncRequest const & func) const;
@ -86,7 +86,7 @@ public:
* @param key the key as a keysym
* @param mod the modifiers
*/
static std::string const printKeySym(LyXKeySym const & key,
static std::string const printKeySym(KeySymbol const & key,
key_modifier::state mod);
typedef std::pair<key_modifier::state, key_modifier::state> modifier_pair;
@ -95,7 +95,7 @@ private:
///
struct Key {
/// Keysym
LyXKeySymPtr code;
KeySymbolPtr code;
/// Modifier masks
modifier_pair mod;

7
src/KeySequence.cpp
View File

@ -18,8 +18,7 @@
#include "KeyMap.h"
#include "lfuns.h"
#include "frontends/LyXKeySym.h"
#include "frontends/LyXKeySymFactory.h"
#include "frontends/KeySymbol.h"
namespace lyx {
@ -29,7 +28,7 @@ using std::string;
FuncRequest const &
KeySequence::addkey(LyXKeySymPtr key,
KeySequence::addkey(KeySymbolPtr key,
key_modifier::state mod, key_modifier::state nmod)
{
// adding a key to a deleted sequence
@ -108,7 +107,7 @@ size_t KeySequence::parse(string const & s)
for (; j < s.length() && s[j] != ' '; ++j)
tbuf += s[j]; // (!!!check bounds :-)
LyXKeySymPtr key(LyXKeySymFactory::create());
KeySymbolPtr key(createKeySymbol());
key->init(tbuf);
if (!key->isOK())

6
src/KeySequence.h
View File

@ -14,7 +14,7 @@
#define KB_SEQUENCE_H
#include "frontends/key_state.h"
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include <string>
#include <vector>
@ -28,7 +28,7 @@ class FuncRequest;
/// Holds a key sequence and the current and standard keymaps
class KeySequence {
public:
typedef std::vector<LyXKeySymPtr> Sequence;
typedef std::vector<KeySymbolPtr> Sequence;
friend class KeyMap;
@ -45,7 +45,7 @@ public:
* @return the action matching this key sequence or LFUN_UNKNOWN_ACTION
*/
FuncRequest const &
addkey(LyXKeySymPtr keysym, key_modifier::state mod,
addkey(KeySymbolPtr keysym, key_modifier::state mod,
key_modifier::state nmod = key_modifier::none);
/**

4
src/LyXFunc.cpp
View File

@ -80,7 +80,7 @@
#include "frontends/FileDialog.h"
#include "frontends/FontLoader.h"
#include "frontends/Gui.h"
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include "frontends/LyXView.h"
#include "frontends/Menubar.h"
#include "frontends/Toolbars.h"
@ -275,7 +275,7 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
}
void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
{
LYXERR(Debug::KEY) << "KeySym is " << keysym->getSymbolName() << endl;

4
src/LyXFunc.h
View File

@ -28,7 +28,7 @@ namespace lyx {
class BufferView;
class FuncRequest;
class FuncStatus;
class LyXKeySym;
class KeySymbol;
class LyXText;
class LyXView;
@ -57,7 +57,7 @@ public:
docstring const viewStatusMessage();
///
void processKeySym(LyXKeySymPtr key, key_modifier::state state);
void processKeySym(KeySymbolPtr key, key_modifier::state state);
///
FuncStatus getStatus(FuncRequest const & action) const;

25
src/frontends/LyXKeySym.h → src/frontends/KeySymbol.h
View File

@ -1,6 +1,6 @@
// -*- C++ -*-
/**
* \file LyXKeySym.h
* \file KeySymbol.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@ -9,8 +9,8 @@
* Full author contact details are available in file CREDITS.
*/
#ifndef LYXKEYSYM_H
#define LYXKEYSYM_H
#ifndef KEYSYMBOL_H
#define KEYSYMBOL_H
#include <string>
@ -29,14 +29,14 @@ namespace lyx {
* the functionality that LyX needs in regards to
* key presses.
*/
class LyXKeySym {
class KeySymbol {
public:
LyXKeySym() {}
KeySymbol() {}
virtual ~LyXKeySym() {}
virtual ~KeySymbol() {}
///
virtual bool operator==(LyXKeySym const& ks) const = 0;
virtual bool operator==(KeySymbol const& ks) const = 0;
/// Initialize with the name of a key. F. ex. "space" or "a"
virtual void init(std::string const & symbolname) = 0;
@ -55,7 +55,7 @@ public:
/**
* Return the value of the keysym into the UCS-4 encoding.
* This converts the LyXKeySym to a 32-bit encoded character.
* This converts the KeySymbol to a 32-bit encoded character.
*/
virtual char_type getUCSEncoded() const = 0;
@ -67,7 +67,14 @@ public:
};
typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
typedef boost::shared_ptr<KeySymbol> KeySymbolPtr;
/**
* Make a KeySymbol. Used because we want to
* generate a toolkit-specific instance.
*/
KeySymbol * createKeySymbol();
} // namespace lyx

29
src/frontends/LyXKeySymFactory.h
View File

@ -1,29 +0,0 @@
// -*- C++ -*-
/**
* \file LyXKeySymFactory.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Asger & Jürgen
*
* Full author contact details are available in file CREDITS.
*/
#ifndef LYXKEYSYMFACTORY_H
#define LYXKEYSYMFACTORY_H
namespace lyx {
class LyXKeySym;
namespace LyXKeySymFactory {
/**
* Make a LyXKeySym. Used because we want to
* generate a toolkit-specific instance.
*/
LyXKeySym * create();
}
} // namespace lyx
#endif // LYXKEYSYM_FACTORY_H

4
src/frontends/Makefile.am
View File

@ -25,8 +25,8 @@ libfrontends_la_SOURCES = \
FileDialog.h \
FontLoader.h \
FontMetrics.h \
LyXKeySym.h \
LyXKeySymFactory.h \
KeySymbol.h \
KeySymbolFactory.h \
LyXView.cpp \
LyXView.h \
Menubar.h \

2
src/frontends/WorkArea.cpp
View File

@ -165,7 +165,7 @@ void WorkArea::redraw()
}
void WorkArea::processKeySym(LyXKeySymPtr key, key_modifier::state state)
void WorkArea::processKeySym(KeySymbolPtr key, key_modifier::state state)
{
// In order to avoid bad surprise in the middle of an operation, we better stop
// the blinking cursor.

4
src/frontends/WorkArea.h
View File

@ -15,7 +15,7 @@
#define BASE_WORKAREA_H
#include "frontends/key_state.h"
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include "frontends/Timeout.h"
#include "support/docstring.h"
@ -93,7 +93,7 @@ public:
/// Process Key pressed event.
/// This needs to be public because it is accessed externally by GuiView.
void processKeySym(LyXKeySymPtr key, key_modifier::state state);
void processKeySym(KeySymbolPtr key, key_modifier::state state);
protected:
/// cause the display of the given area of the work area
virtual void expose(int x, int y, int w, int h) = 0;

4
src/frontends/qt4/GuiView.cpp
View File

@ -17,7 +17,7 @@
#include "GuiImplementation.h"
#include "GuiWorkArea.h"
#include "QLyXKeySym.h"
#include "QKeySymbol.h"
#include "QLMenubar.h"
#include "QLToolbar.h"
#include "QCommandBuffer.h"
@ -650,7 +650,7 @@ bool GuiView::event(QEvent * e)
if (e->type() == QEvent::ShortcutOverride) {
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) {
boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
boost::shared_ptr<QKeySymbol> sym(new QKeySymbol);
sym->set(ke);
BOOST_ASSERT(work_area_);
work_area_->processKeySym(sym, key_modifier::none);

4
src/frontends/qt4/GuiWorkArea.cpp
View File

@ -15,7 +15,7 @@
#include "GuiApplication.h"
#include "QLPainter.h"
#include "QLyXKeySym.h"
#include "QKeySymbol.h"
#include "qt_helpers.h"
#include "LyXView.h"
@ -421,7 +421,7 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * e)
<< " key=" << e->key()
<< endl;
boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
boost::shared_ptr<QKeySymbol> sym(new QKeySymbol);
sym->set(e);
processKeySym(sym, q_key_state(e->modifiers()));
}

16
src/frontends/qt4/LyXKeySymFactory.cpp → src/frontends/qt4/KeySymbol.cpp
View File

@ -1,5 +1,5 @@
/**
* \file qt4/LyXKeySymFactory.cpp
* \file qt4/KeySymbolFactory.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@ -10,21 +10,15 @@
#include <config.h>
#include "frontends/LyXKeySymFactory.h"
#include "QLyXKeySym.h"
#include "frontends/KeySymbol.h"
#include "QKeySymbol.h"
namespace lyx {
namespace LyXKeySymFactory {
LyXKeySym * create()
KeySymbol * createKeySymbol()
{
return new QLyXKeySym;
return new QKeySymbol;
}
} // namespace LyXKeySymFactory
} // namespace lyx

4
src/frontends/qt4/Makefile.am
View File

@ -39,7 +39,7 @@ libqt4_la_SOURCES = \
GuiFontLoader.h GuiFontLoader.cpp \
GuiFontMetrics.h GuiFontMetrics.cpp \
GuiSelection.h GuiSelection.cpp \
LyXKeySymFactory.cpp \
KeySymbol.cpp \
QLMenubar.cpp QLMenubar.h \
QBox.cpp QBox.h \
QBranches.cpp QBranches.h \
@ -50,7 +50,7 @@ libqt4_la_SOURCES = \
QLImage.cpp QLImage.h \
QViewSource.cpp QViewSource.h \
QLPainter.cpp QLPainter.h \
QLyXKeySym.cpp QLyXKeySym.h \
QKeySymbol.cpp QKeySymbol.h \
QPrint.cpp QPrint.h \
Qt2BC.cpp Qt2BC.h \
CheckedLineEdit.cpp CheckedLineEdit.h \

30
src/frontends/qt4/QLyXKeySym.cpp → src/frontends/qt4/QKeySymbol.cpp
View File

@ -1,5 +1,5 @@
/**
* \file QLyXKeySym.cpp
* \file QKeySymbol.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@ -11,7 +11,7 @@
#include <config.h>
#include "QLyXKeySym.h"
#include "QKeySymbol.h"
#include "qlkey.h"
#include "qt_helpers.h"
@ -78,13 +78,13 @@ char const encode(string const & encoding, QString const & str)
}
QLyXKeySym::QLyXKeySym()
: LyXKeySym(), key_(0)
QKeySymbol::QKeySymbol()
: KeySymbol(), key_(0)
{
}
void QLyXKeySym::set(QKeyEvent * ev)
void QKeySymbol::set(QKeyEvent * ev)
{
key_ = ev->key();
if (ev->text().isNull()) {
@ -97,7 +97,7 @@ void QLyXKeySym::set(QKeyEvent * ev)
}
void QLyXKeySym::init(string const & symbolname)
void QKeySymbol::init(string const & symbolname)
{
key_ = string_to_qkey(symbolname);
text_ = toqstr(symbolname);
@ -105,7 +105,7 @@ void QLyXKeySym::init(string const & symbolname)
}
bool QLyXKeySym::isOK() const
bool QKeySymbol::isOK() const
{
bool const ok(!(text_.isEmpty() && key_ == Qt::Key_unknown));
LYXERR(Debug::KEY) << "isOK is " << ok << endl;
@ -113,7 +113,7 @@ bool QLyXKeySym::isOK() const
}
bool QLyXKeySym::isModifier() const
bool QKeySymbol::isModifier() const
{
bool const mod(q_is_modifier(key_));
LYXERR(Debug::KEY) << "isMod is " << mod << endl;
@ -121,7 +121,7 @@ bool QLyXKeySym::isModifier() const
}
string QLyXKeySym::getSymbolName() const
string QKeySymbol::getSymbolName() const
{
string sym(qkey_to_string(key_));
@ -133,7 +133,7 @@ string QLyXKeySym::getSymbolName() const
}
char_type QLyXKeySym::getUCSEncoded() const
char_type QKeySymbol::getUCSEncoded() const
{
if (text_.isEmpty())
return 0;
@ -143,7 +143,7 @@ char_type QLyXKeySym::getUCSEncoded() const
if (lyxerr.debugging() && text_.size() > 1) {
// We don't know yet how well support the full ucs4 range.
LYXERR(Debug::KEY) << "QLyXKeySym::getUCSEncoded()" << endl;
LYXERR(Debug::KEY) << "QKeySymbol::getUCSEncoded()" << endl;
for (int i = 0; i < text_.size(); ++i) {
LYXERR(Debug::KEY) << "char " << i << ": "
<< text_[i].unicode() << endl;
@ -156,7 +156,7 @@ char_type QLyXKeySym::getUCSEncoded() const
}
docstring const QLyXKeySym::print(key_modifier::state mod, bool forgui) const
docstring const QKeySymbol::print(key_modifier::state mod, bool forgui) const
{
int tmpkey = key_;
@ -174,7 +174,7 @@ docstring const QLyXKeySym::print(key_modifier::state mod, bool forgui) const
}
bool QLyXKeySym::isText() const
bool QKeySymbol::isText() const
{
if (text_.isEmpty()) {
LYXERR(Debug::KEY) << "text_ empty, isText() == false" << endl;
@ -185,9 +185,9 @@ bool QLyXKeySym::isText() const
}
bool QLyXKeySym::operator==(LyXKeySym const & ks) const
bool QKeySymbol::operator==(KeySymbol const & ks) const
{
QLyXKeySym const & qks = static_cast<QLyXKeySym const &>(ks);
QKeySymbol const & qks = static_cast<QKeySymbol const &>(ks);
// we do not have enough info for a fair comparison, so return
// false. This works out OK because unknown text from Qt will

14
src/frontends/qt4/QLyXKeySym.h → src/frontends/qt4/QKeySymbol.h
View File

@ -1,6 +1,6 @@
// -*- C++ -*-
/**
* \file QLyXKeySym.h
* \file QKeySymbol.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@ -13,7 +13,7 @@
#ifndef QLYXKEYSYM_H
#define QLYXKEYSYM_H
#include "frontends/LyXKeySym.h"
#include "frontends/KeySymbol.h"
#include <QString>
#include <QKeyEvent>
@ -28,16 +28,16 @@ namespace lyx {
*
* This is some really sick stuff.
*/
class QLyXKeySym : public LyXKeySym {
class QKeySymbol : public KeySymbol {
public:
QLyXKeySym();
QKeySymbol();
virtual ~QLyXKeySym() {}
virtual ~QKeySymbol() {}
/// .
/// inlined out because of profiling results under linux when
/// opening a document.
inline bool operator==(LyXKeySym const& ks) const;
inline bool operator==(KeySymbol const& ks) const;
/// delayed constructor
void set(QKeyEvent * ev);
@ -59,7 +59,7 @@ public:
/**
* Return the value of the keysym into the UCS-4 encoding.
* This converts the LyXKeySym to a 32-bit encoded character.
* This converts the KeySymbol to a 32-bit encoded character.
*/
virtual char_type getUCSEncoded() const;