0 | |
Origin: macuim project: http://macuim.googlecode.com/svn/trunk / r288
|
|
0 |
Origin: macuim project: http://macuim.googlecode.com/svn/trunk / r290
|
1 | 1 |
Bug: none
|
2 | 2 |
Bug-Debian: none
|
3 | 3 |
|
4 | |
From 452e19650181d18145b7b852059216f272b9b90d Mon Sep 17 00:00:00 2001
|
|
4 |
From a8dab019e89185c013853ba987992177fd38833d Mon Sep 17 00:00:00 2001
|
5 | 5 |
From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
|
6 | |
Date: Tue, 6 Dec 2011 02:39:18 +0900
|
|
6 |
Date: Sat, 17 Dec 2011 00:51:19 +0900
|
7 | 7 |
Subject: [PATCH] Add uim-mozc r288
|
8 | 8 |
|
9 | 9 |
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
|
10 | 10 |
---
|
11 | 11 |
unix/uim/key_translator.cc | 436 ++++++++++++++++
|
12 | 12 |
unix/uim/key_translator.h | 111 ++++
|
13 | |
unix/uim/mozc.cc | 1027 ++++++++++++++++++++++++++++++++++++++
|
|
13 |
unix/uim/mozc.cc | 1032 ++++++++++++++++++++++++++++++++++++++
|
14 | 14 |
unix/uim/scm/mozc-custom.scm | 385 ++++++++++++++
|
15 | 15 |
unix/uim/scm/mozc-key-custom.scm | 74 +++
|
16 | 16 |
unix/uim/scm/mozc.scm | 513 +++++++++++++++++++
|
17 | |
unix/uim/uim.gyp | 85 ++++
|
18 | |
7 files changed, 2631 insertions(+), 0 deletions(-)
|
|
17 |
unix/uim/uim.gyp | 87 ++++
|
|
18 |
7 files changed, 2638 insertions(+), 0 deletions(-)
|
19 | 19 |
create mode 100644 unix/uim/key_translator.cc
|
20 | 20 |
create mode 100644 unix/uim/key_translator.h
|
21 | 21 |
create mode 100644 unix/uim/mozc.cc
|
|
585 | 585 |
+#endif // MOZC_UNIX_UIM_KEY_TRANSLATOR_H_
|
586 | 586 |
diff --git a/unix/uim/mozc.cc b/unix/uim/mozc.cc
|
587 | 587 |
new file mode 100644
|
588 | |
index 0000000..e248fd2
|
|
588 |
index 0000000..88b9633
|
589 | 589 |
--- /dev/null
|
590 | 590 |
+++ b/unix/uim/mozc.cc
|
591 | |
@@ -0,0 +1,1027 @@
|
|
591 |
@@ -0,0 +1,1032 @@
|
592 | 592 |
+/*
|
593 | 593 |
+
|
594 | 594 |
+ Copyright (c) 2010-2011 uim Project http://code.google.com/p/uim/
|
|
646 | 646 |
+#include "session/commands.pb.h"
|
647 | 647 |
+#include "client/client.h"
|
648 | 648 |
+#include "unix/uim/key_translator.h"
|
|
649 |
+#include "languages/global_language_spec.h"
|
|
650 |
+#include "languages/japanese/lang_dep_spec.h"
|
649 | 651 |
+
|
650 | 652 |
+// use server/client session
|
651 | 653 |
+#include "base/util.h"
|
|
665 | 667 |
+uint64 GetTime() {
|
666 | 668 |
+ return static_cast<uint64>(time(NULL));
|
667 | 669 |
+}
|
|
670 |
+mozc::japanese::LangDepSpecJapanese uim_mozc_lang_spec;
|
668 | 671 |
+
|
669 | 672 |
+namespace mozc {
|
670 | 673 |
+
|
|
1599 | 1602 |
+ argv[1] = NULL;
|
1600 | 1603 |
+
|
1601 | 1604 |
+ InitGoogle((const char *)argv[0], &argc, (char ***)&argv, true);
|
|
1605 |
+ mozc::language::GlobalLanguageSpec::SetLanguageDependentSpec(&uim_mozc_lang_spec);
|
1602 | 1606 |
+ mozc::uim::install_keymap();
|
1603 | 1607 |
+}
|
1604 | 1608 |
+
|
|
1615 | 1619 |
+ delete mozc::uim::keyTranslator;
|
1616 | 1620 |
+ mozc::uim::keyTranslator = NULL;
|
1617 | 1621 |
+ free(argv);
|
|
1622 |
+ mozc::language::GlobalLanguageSpec::SetLanguageDependentSpec(NULL);
|
1618 | 1623 |
+}
|
1619 | 1624 |
diff --git a/unix/uim/scm/mozc-custom.scm b/unix/uim/scm/mozc-custom.scm
|
1620 | 1625 |
new file mode 100644
|
|
2608 | 2613 |
+)
|
2609 | 2614 |
diff --git a/unix/uim/uim.gyp b/unix/uim/uim.gyp
|
2610 | 2615 |
new file mode 100644
|
2611 | |
index 0000000..8d2dc03
|
|
2616 |
index 0000000..9fe04ca
|
2612 | 2617 |
--- /dev/null
|
2613 | 2618 |
+++ b/unix/uim/uim.gyp
|
2614 | |
@@ -0,0 +1,85 @@
|
|
2619 |
@@ -0,0 +1,87 @@
|
2615 | 2620 |
+#
|
2616 | 2621 |
+# Copyright (c) 2010-2011 uim Project http://code.google.com/p/uim/
|
2617 | 2622 |
+#
|
|
2653 | 2658 |
+ 'uim_dependencies': [
|
2654 | 2659 |
+ '../../base/base.gyp:base',
|
2655 | 2660 |
+ '../../client/client.gyp:client',
|
|
2661 |
+ '../../languages/languages.gyp:global_language_spec',
|
|
2662 |
+ '../../languages/japanese/japanese.gyp:language_dependent_spec_japanese',
|
2656 | 2663 |
+ ],
|
2657 | 2664 |
+ },
|
2658 | 2665 |
+ 'targets': [
|