Update uim patch to r317
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Nobuhiro Iwamatsu
11 years ago
0 | Origin: macuim project: http://macuim.googlecode.com/svn/trunk / r308 | |
1 | Bug: none | |
2 | Bug-Debian: none | |
3 | Comment: Add some change. | |
0 | Origin: macuim project: http://macuim.googlecode.com/svn/trunk / r317 | |
1 | Bug: none | |
2 | Bug-Debian: none | |
3 | Comment: | |
4 | 4 | |
5 | From 016d5878509f08df20829082bf8e8fbe54b2b999 Mon Sep 17 00:00:00 2001 | |
5 | From 01753eb85146cd57ecf5fc59fe02a1784b63e42a Mon Sep 17 00:00:00 2001 | |
6 | 6 | From: Nobuhiro Iwamatsu <iwamatsu@debian.org> |
7 | Date: Wed, 28 Mar 2012 13:47:01 +0900 | |
8 | Subject: [PATCH] support uim | |
7 | Date: Mon, 7 May 2012 10:22:43 +0900 | |
8 | Subject: [PATCH] Add support uim / macuim r317 | |
9 | 9 | |
10 | 10 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> |
11 | 11 | --- |
12 | unix/uim/key_translator.cc | 436 ++++++++++++++ | |
13 | unix/uim/key_translator.h | 111 ++++ | |
14 | unix/uim/mozc.cc | 1185 ++++++++++++++++++++++++++++++++++++++ | |
15 | unix/uim/scm/mozc-custom.scm | 390 +++++++++++++ | |
16 | unix/uim/scm/mozc-key-custom.scm | 74 +++ | |
17 | unix/uim/scm/mozc.scm | 555 ++++++++++++++++++ | |
18 | unix/uim/uim.gyp | 85 +++ | |
19 | 7 files changed, 2836 insertions(+), 0 deletions(-) | |
12 | unix/uim/key_translator.cc | 436 +++++++ | |
13 | unix/uim/key_translator.h | 111 ++ | |
14 | unix/uim/mozc.cc | 1185 ++++++++++++++++++++ | |
15 | unix/uim/scm/mozc-custom.scm | 390 +++++++ | |
16 | unix/uim/scm/mozc-key-custom.scm | 74 ++ | |
17 | unix/uim/scm/mozc.scm | 555 +++++++++ | |
18 | unix/uim/uim.gyp | 85 ++ | |
19 | 12 files changed, 4008 insertions(+) | |
20 | 20 | create mode 100644 unix/uim/key_translator.cc |
21 | 21 | create mode 100644 unix/uim/key_translator.h |
22 | 22 | create mode 100644 unix/uim/mozc.cc |
586 | 586 | +#endif // MOZC_UNIX_UIM_KEY_TRANSLATOR_H_ |
587 | 587 | diff --git a/unix/uim/mozc.cc b/unix/uim/mozc.cc |
588 | 588 | new file mode 100644 |
589 | index 0000000..d08bade | |
589 | index 0000000..aa8ec1f | |
590 | 590 | --- /dev/null |
591 | 591 | +++ b/unix/uim/mozc.cc |
592 | 592 | @@ -0,0 +1,1185 @@ |
1667 | 1667 | + } |
1668 | 1668 | + |
1669 | 1669 | + if (!context_slot[id].session->GetConfig(&config)) |
1670 | + return false; | |
1670 | + return uim_scm_f(); | |
1671 | 1671 | + |
1672 | 1672 | + config.set_preedit_method(method); |
1673 | 1673 | + |
1674 | 1674 | + if (!context_slot[id].session->SetConfig(config)) |
1675 | + return false; | |
1675 | + return uim_scm_f(); | |
1676 | 1676 | + |
1677 | 1677 | + context_slot[id].preedit_method = method; |
1678 | 1678 | + |
2814 | 2814 | +) |
2815 | 2815 | diff --git a/unix/uim/uim.gyp b/unix/uim/uim.gyp |
2816 | 2816 | new file mode 100644 |
2817 | index 0000000..cba2ef3 | |
2817 | index 0000000..b2520d9 | |
2818 | 2818 | --- /dev/null |
2819 | 2819 | +++ b/unix/uim/uim.gyp |
2820 | 2820 | @@ -0,0 +1,85 @@ |
2869 | 2869 | + 'key_translator.cc', |
2870 | 2870 | + ], |
2871 | 2871 | + 'dependencies': [ |
2872 | + '../../session/session_base.gyp:genproto_session', | |
2872 | + '../../session/session_base.gyp:genproto_session#host', | |
2873 | 2873 | + ], |
2874 | 2874 | + 'cflags': [ |
2875 | 2875 | + '<!@(pkg-config --cflags <@(pkg_config_libs))', |
2904 | 2904 | + ], |
2905 | 2905 | +} |
2906 | 2906 | -- |
2907 | 1.7.9.1 | |
2907 | 1.7.10 | |
2908 | 2908 |