1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- src/unix/fcitx/mozc_response_parser.cc.orig 2015-07-13 04:56:54.572997000 +0900
+++ src/unix/fcitx/mozc_response_parser.cc 2015-07-13 04:58:15.160661000 +0900
@@ -36,7 +36,7 @@
#include "base/logging.h"
#include "base/process.h"
#include "base/util.h"
-#include "session/commands.pb.h"
+#include "protocol/commands.pb.h"
#include "unix/fcitx/fcitx_mozc.h"
#include "unix/fcitx/surrounding_text_util.h"
#include <fcitx/candidate.h>
@@ -235,11 +235,13 @@
}
}
+#if 0
static boolean FcitxMozcPaging(void* arg, boolean prev)
{
FcitxMozc* mozc = static_cast<FcitxMozc*>(arg);
return mozc->paging(prev);
}
+#endif
void MozcResponseParser::ParseCandidates(
const mozc::commands::Candidates &candidates, FcitxMozc *fcitx_mozc) const {
@@ -286,12 +288,14 @@
FcitxCandidateWordList* candList = FcitxInputStateGetCandidateList(fcitx_mozc->GetInputState());
FcitxCandidateWordReset(candList);
FcitxCandidateWordSetPageSize(candList, 9);
+#if 0
if (candidates.has_direction() &&
candidates.direction() == commands::Candidates::HORIZONTAL) {
FcitxCandidateWordSetLayoutHint(candList, CLH_Horizontal);
} else {
FcitxCandidateWordSetLayoutHint(candList, CLH_Vertical);
}
+#endif
map<int32, pair<string, string> > usage_map;
if (candidates.has_usages()) {
@@ -395,7 +399,9 @@
else
FcitxCandidateWordSetChoose(candList, EMPTY_STR_CHOOSE);
FcitxCandidateWordSetFocus(candList, local_index);
+#if 0
FcitxCandidateWordSetOverridePaging(candList, hasPrev, hasNext, FcitxMozcPaging, fcitx_mozc, NULL);
+#endif
}
static int GetRawCursorPos(const char * str, int upos)
|
