Codebase list mozc / 2e0ed8b
Update patches/uim-mozc.patch Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 6 years ago
2 changed file(s) with 35 addition(s) and 30 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
11
22 * New upstream release.
33 * Bump Standards-Version to 4.1.3.
4 * Update patches/uim-mozc.patch.
45
56 -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Tue, 03 Apr 2018 08:04:52 +0900
67
+34
-30
debian/patches/uim-mozc.patch less more
00 Description: Support uim framework
1 Origin: macuim project: https://github.com/e-kato/macuim.git 3ea28b1f6c16a5ad624f137302ab9ed060a84db7
1 Origin: macuim project: https://github.com/e-kato/macuim.git c979f127acaeb7b35d3344e8b1e40848e1a68d54
22 Forwarded: http://code.google.com/p/mozc/issues/detail?id=13
33 Author: uim Project http://code.google.com/p/uim/
4 Last-Update: 2016-08-24
4 Last-Update: 2018-04-03
55
6 Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
7 From 126b3e3a0e79000297575d871d3e34d261b3f858 Mon Sep 17 00:00:00 2001
6 From c663605af607af471eeb8c2fa9440887ec2e2b1f Mon Sep 17 00:00:00 2001
87 From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
9 Date: Wed, 24 Aug 2016 08:39:50 +0900
10 Subject: [PATCH] Update uim-mozc to i3ea28b1f6c16a5ad624f137302ab9ed060a84db7
8 Date: Tue, 3 Apr 2018 08:27:47 +0900
9 Subject: [PATCH] Update uim-mozc to c979f127acaeb7b35d3344e8b1e40848e1a68d54
1110
1211 Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
1312 ---
14 src/unix/uim/key_translator.cc | 436 ++++++++++++
13 src/unix/uim/key_translator.cc | 441 ++++++++++++
1514 src/unix/uim/key_translator.h | 111 ++++
1615 src/unix/uim/mozc.cc | 1219 ++++++++++++++++++++++++++++++++++
1716 src/unix/uim/scm/mozc-custom.scm | 396 +++++++++++
1817 src/unix/uim/scm/mozc-key-custom.scm | 74 +++
1918 src/unix/uim/scm/mozc.scm | 566 ++++++++++++++++
2019 src/unix/uim/uim.gyp | 85 +++
21 7 files changed, 2887 insertions(+)
20 7 files changed, 2892 insertions(+)
2221 create mode 100644 src/unix/uim/key_translator.cc
2322 create mode 100644 src/unix/uim/key_translator.h
2423 create mode 100644 src/unix/uim/mozc.cc
2928
3029 diff --git a/src/unix/uim/key_translator.cc b/src/unix/uim/key_translator.cc
3130 new file mode 100644
32 index 0000000..c7c4c4a
31 index 00000000..b1c9be85
3332 --- /dev/null
3433 +++ b/src/unix/uim/key_translator.cc
35 @@ -0,0 +1,436 @@
34 @@ -0,0 +1,441 @@
3635 +// Copyright 2010, Google Inc.
3736 +// Copyright (c) 2010-2012 uim Project http://code.google.com/p/uim/
3837 +// All rights reserved.
403402 +
404403 +void KeyTranslator::Init() {
405404 + for (int i = 0; i < arraysize(special_key_map); ++i) {
406 + CHECK(special_key_map_.insert(make_pair(special_key_map[i].from,
407 + special_key_map[i].to)).second);
405 + CHECK(special_key_map_.insert(
406 + std::make_pair(special_key_map[i].from,
407 + special_key_map[i].to)).second);
408408 + }
409409 + for (int i = 0; i < arraysize(modifier_key_map); ++i) {
410 + CHECK(modifier_key_map_.insert(make_pair(modifier_key_map[i].from,
411 + modifier_key_map[i].to)).second);
410 + CHECK(modifier_key_map_.insert(
411 + std::make_pair(modifier_key_map[i].from,
412 + modifier_key_map[i].to)).second);
412413 + }
413414 + for (int i = 0; i < arraysize(modifier_mask_map); ++i) {
414 + CHECK(modifier_mask_map_.insert(make_pair(modifier_mask_map[i].from,
415 + modifier_mask_map[i].to)).second);
415 + CHECK(modifier_mask_map_.insert(
416 + std::make_pair(modifier_mask_map[i].from,
417 + modifier_mask_map[i].to)).second);
416418 + }
417419 + for (int i = 0; i < arraysize(kana_map_jp); ++i) {
418420 + CHECK(kana_map_jp_.insert(
419 + make_pair(kana_map_jp[i].code, make_pair(
420 + kana_map_jp[i].no_shift, kana_map_jp[i].shift))).second);
421 + std::make_pair(kana_map_jp[i].code,
422 + std::make_pair(kana_map_jp[i].no_shift,
423 + kana_map_jp[i].shift))).second);
421424 + }
422425 + for (int i = 0; i < arraysize(kana_map_us); ++i) {
423426 + CHECK(kana_map_us_.insert(
424 + make_pair(kana_map_us[i].code, make_pair(
425 + kana_map_us[i].no_shift, kana_map_us[i].shift))).second);
427 + std::make_pair(kana_map_us[i].code,
428 + std::make_pair(kana_map_us[i].no_shift,
429 + kana_map_us[i].shift))).second);
426430 + }
427431 +}
428432 +
471475 +} // namespace mozc
472476 diff --git a/src/unix/uim/key_translator.h b/src/unix/uim/key_translator.h
473477 new file mode 100644
474 index 0000000..e8a4f08
478 index 00000000..2649cc5e
475479 --- /dev/null
476480 +++ b/src/unix/uim/key_translator.h
477481 @@ -0,0 +1,111 @@
539543 +
540544 + private:
541545 + typedef hash_map<unsigned int, commands::KeyEvent::SpecialKey> SpecialKeyMap;
542 + typedef map<unsigned int, commands::KeyEvent::ModifierKey> ModifierKeyMap;
543 + typedef map<unsigned int, pair<string, string> > KanaMap;
546 + typedef std::map<unsigned int, commands::KeyEvent::ModifierKey> ModifierKeyMap;
547 + typedef std::map<unsigned int, std::pair<string, string> > KanaMap;
544548 +
545549 + // Returns true iff key is modifier key such as SHIFT, ALT, or CAPSLOCK.
546550 + bool IsModifierKey(unsigned int keyval,
588592 +#endif // MOZC_UNIX_UIM_KEY_TRANSLATOR_H_
589593 diff --git a/src/unix/uim/mozc.cc b/src/unix/uim/mozc.cc
590594 new file mode 100644
591 index 0000000..a609abc
595 index 00000000..31fc3a26
592596 --- /dev/null
593597 +++ b/src/unix/uim/mozc.cc
594598 @@ -0,0 +1,1219 @@
14991503 + int i;
15001504 +
15011505 + for (i = 0; key_tab[i].key; i++)
1502 + key_map.insert(make_pair(key_tab[i].str, key_tab[i].key));
1506 + key_map.insert(std::make_pair(key_tab[i].str, key_tab[i].key));
15031507 +}
15041508 +
15051509 +static uim_lisp
18131817 +}
18141818 diff --git a/src/unix/uim/scm/mozc-custom.scm b/src/unix/uim/scm/mozc-custom.scm
18151819 new file mode 100644
1816 index 0000000..adfd65b
1820 index 00000000..adfd65bd
18171821 --- /dev/null
18181822 +++ b/src/unix/uim/scm/mozc-custom.scm
18191823 @@ -0,0 +1,396 @@
22152219 + (N_ "long description will be here."))
22162220 diff --git a/src/unix/uim/scm/mozc-key-custom.scm b/src/unix/uim/scm/mozc-key-custom.scm
22172221 new file mode 100644
2218 index 0000000..bcf8528
2222 index 00000000..bcf85287
22192223 --- /dev/null
22202224 +++ b/src/unix/uim/scm/mozc-key-custom.scm
22212225 @@ -0,0 +1,74 @@
22952299 + (_ "long description will be here"))
22962300 diff --git a/src/unix/uim/scm/mozc.scm b/src/unix/uim/scm/mozc.scm
22972301 new file mode 100644
2298 index 0000000..9938ec4
2302 index 00000000..9938ec47
22992303 --- /dev/null
23002304 +++ b/src/unix/uim/scm/mozc.scm
23012305 @@ -0,0 +1,566 @@
28672871 +)
28682872 diff --git a/src/unix/uim/uim.gyp b/src/unix/uim/uim.gyp
28692873 new file mode 100644
2870 index 0000000..bb1c602
2874 index 00000000..bb1c602f
28712875 --- /dev/null
28722876 +++ b/src/unix/uim/uim.gyp
28732877 @@ -0,0 +1,85 @@
29572961 + ],
29582962 +}
29592963 --
2960 2.9.3
2964 2.16.2
29612965