Tomotaka SUWA
t-suw****@users*****
2007年 2月 3日 (土) 18:03:54 JST
ForkIndex: AquaSKK/SKKInputKeymap.cpp
diff -u AquaSKK/SKKInputKeymap.cpp:1.1.2.1 AquaSKK/SKKInputKeymap.cpp:1.1.2.2
--- AquaSKK/SKKInputKeymap.cpp:1.1.2.1 Sat Feb 3 16:53:29 2007
+++ AquaSKK/SKKInputKeymap.cpp Sat Feb 3 18:03:53 2007
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- $Id: SKKInputKeymap.cpp,v 1.1.2.1 2007/02/03 07:53:29 t-suwa Exp $
+ $Id: SKKInputKeymap.cpp,v 1.1.2.2 2007/02/03 09:03:53 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -84,20 +84,20 @@
int code = 0;
int labels = 0;
while(buf >> str) {
- if(str == "group") labels += group;
- if(str == "ctrl") labels += ctrl;
- if(str == "ascii") labels += ascii;
- if(str == "keycode") labels += keycode;
+ if(str == "group") labels += LABEL_GROUP;
+ if(str == "ctrl") labels += LABEL_CTRL;
+ if(str == "ascii") labels += LABEL_ASCII;
+ if(str == "keycode") labels += LABEL_KEYCODE;
}
- if(labels & ascii && labels & keycode) {
+ if(labels & LABEL_ASCII && labels & LABEL_KEYCODE) {
std::cerr << "SKKInputKeymap::parse(): invalid syntax ignored ["
<< values[index].name << "]" << std::endl;
return;
}
// å˜ä¸€ã‚³ãƒ¼ãƒ‰ï¼Ÿ
- if(!(labels & group)) {
+ if(!(labels & LABEL_GROUP)) {
code = get_code(str, labels);
store_state(code, labels, index);
} else {
@@ -144,7 +144,7 @@
std::stringstream buf(str);
int result;
- if(labels & (ascii | keycode)) {
+ if(labels & (LABEL_ASCII | LABEL_KEYCODE)) {
buf >> std::hex >> result;
} else {
result = str[0];
@@ -156,10 +156,10 @@
void SKKInputKeymap::store_state(int code, int labels, int index) {
int state;
- if(labels & keycode) {
- state = KeyState::Keycode(code, labels & ctrl);
+ if(labels & LABEL_KEYCODE) {
+ state = KeyState::Keycode(code, labels & LABEL_CTRL);
} else {
- state = KeyState::Ascii(code, labels & ctrl);
+ state = KeyState::Ascii(code, labels & LABEL_CTRL);
}
if(values[index].type == TYPE_EVENT) {
Index: AquaSKK/SKKInputKeymap.h
diff -u AquaSKK/SKKInputKeymap.h:1.1.2.1 AquaSKK/SKKInputKeymap.h:1.1.2.2
--- AquaSKK/SKKInputKeymap.h:1.1.2.1 Sat Feb 3 16:53:29 2007
+++ AquaSKK/SKKInputKeymap.h Sat Feb 3 18:03:53 2007
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- $Id: SKKInputKeymap.h,v 1.1.2.1 2007/02/03 07:53:29 t-suwa Exp $
+ $Id: SKKInputKeymap.h,v 1.1.2.2 2007/02/03 09:03:53 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -53,7 +53,7 @@
Keymap events_;
Keymap attributes_;
- enum label { group = 1, ctrl = 2, ascii = 4, keycode = 8 };
+ enum { LABEL_GROUP = 1, LABEL_CTRL = 2, LABEL_ASCII = 4, LABEL_KEYCODE = 8 };
void parse(const std::string& value, int index);
int get_code(const std::string& str, int labels);