Get rid of fcitx::getline usage

Author: wengxt

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.6)
 
 project(fcitx5-unikey VERSION 5.1.6)
 
-set(REQUIRED_FCITX_VERSION 5.1.12)
+set(REQUIRED_FCITX_VERSION 5.1.13)
 find_package(ECM 1.0.0 REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(FeatureSummary)

keymap-editor/model.cpp

@@ -13,6 +13,7 @@
 #include <fcitx-utils/charutils.h>
 #include <fcitx-utils/i18n.h>
 #include <fcitx-utils/standardpath.h>
+#include <fcitx-utils/unixfd.h>
 #include <fcntl.h>
 
 namespace fcitx {
@@ -156,9 +157,8 @@ void KeymapModel::load() {
     beginResetModel();
     auto keymapFile = StandardPath::global().open(
         StandardPath::Type::PkgConfig, "unikey/keymap.txt", O_RDONLY);
-    auto fp = fs::openFD(keymapFile, "rb");
-    if (fp) {
-        list_ = UkLoadKeyOrderMap(fp.get());
+    if (keymapFile.isValid()) {
+        list_ = UkLoadKeyOrderMap(keymapFile.fd());
     } else {
         list_.clear();
     }
@@ -173,14 +173,14 @@ void KeymapModel::save() {
 }
 
 void KeymapModel::load(const QString &file) {
-    UniqueFilePtr fp{fopen(file.toLocal8Bit().constData(), "rb")};
+    UnixFD fd = UnixFD::own(open(file.toLocal8Bit().constData(), O_RDONLY));
 
-    if (!fp) {
+    if (!fd.isValid()) {
         return;
     }
 
     beginResetModel();
-    list_ = UkLoadKeyOrderMap(fp.get());
+    list_ = UkLoadKeyOrderMap(fd.fd());
     endResetModel();
     setNeedSave(true);
 }

src/unikey-im.cpp

@@ -668,9 +668,7 @@ void UnikeyEngine::reloadKeymap() {
     auto keymapFile = StandardPath::global().open(
         StandardPath::Type::PkgConfig, "unikey/keymap.txt", O_RDONLY);
     if (keymapFile.isValid()) {
-        UniqueFilePtr fp = fs::openFD(keymapFile, "rb");
-
-        UkLoadKeyMap(fp.get(), im_.sharedMem()->usrKeyMap);
+        UkLoadKeyMap(keymapFile.fd(), im_.sharedMem()->usrKeyMap);
         im_.sharedMem()->usrKeyMapLoaded = true;
     } else {
         im_.sharedMem()->usrKeyMapLoaded = false;

unikey/usrkeymap.cpp

@@ -8,9 +8,12 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
+#include <fcitx-utils/fdstreambuf.h>
 #include <fcitx-utils/log.h>
 #include <fcitx-utils/misc.h>
 #include <fcitx-utils/stringutils.h>
+#include <istream>
+#include <string>
 
 namespace {
 
@@ -93,8 +96,8 @@ static bool parseNameValue(std::string_view line, std::string_view *name,
 }
 
 //-----------------------------------------------------
-DllExport void UkLoadKeyMap(FILE *f, int keyMap[256]) {
-    std::vector<UkKeyMapping> orderMap = UkLoadKeyOrderMap(f);
+DllExport void UkLoadKeyMap(int fd, int keyMap[256]) {
+    std::vector<UkKeyMapping> orderMap = UkLoadKeyOrderMap(fd);
     initKeyMap(keyMap);
     for (const auto &item : orderMap) {
         keyMap[item.key] = item.action;
@@ -105,18 +108,19 @@ DllExport void UkLoadKeyMap(FILE *f, int keyMap[256]) {
 }
 
 //------------------------------------------------------------------
-DllExport std::vector<UkKeyMapping> UkLoadKeyOrderMap(FILE *f) {
+DllExport std::vector<UkKeyMapping> UkLoadKeyOrderMap(int fd) {
     size_t lineCount = 0;
     int keyMap[256];
 
     initKeyMap(keyMap);
 
     std::vector<UkKeyMapping> pMap;
-    fcitx::UniqueCPtr<char> clineBuf;
-    size_t bufSize = 0;
-    while (getline(clineBuf, &bufSize, f) >= 0) {
+    fcitx::IFDStreamBuf buf(fd);
+    std::istream in(&buf);
+    std::string line;
+    while (std::getline(in, line)) {
         lineCount++;
-        auto text = fcitx::stringutils::trimView(clineBuf.get());
+        auto text = fcitx::stringutils::trimView(line);
         if (text.empty()) {
             continue;
         }

unikey/usrkeymap.h

@@ -11,8 +11,8 @@
 #include <cstdio>
 #include <vector>
 
-DllInterface void UkLoadKeyMap(FILE *f, int keyMap[256]);
-DllInterface std::vector<UkKeyMapping> UkLoadKeyOrderMap(FILE *f);
+DllInterface void UkLoadKeyMap(int fd, int keyMap[256]);
+DllInterface std::vector<UkKeyMapping> UkLoadKeyOrderMap(int fd);
 DllInterface void UkStoreKeyOrderMap(FILE *f,
                                      const std::vector<UkKeyMapping> &pMap);