Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
custom_phrase.txt

- name: Upload artifact
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: artifact.zip
path: |
Expand All @@ -43,8 +43,6 @@ jobs:
build:
needs: [lint, data]
runs-on: macos-26
env:
MOZC_SHA: ce1fb7fe48efb1d85f8e54eff1b05e9e692bf0d4
strategy:
fail-fast: false
matrix:
Expand All @@ -58,13 +56,6 @@ jobs:
with:
submodules: recursive

- uses: actions/checkout@v6
with:
submodules: recursive
repository: google/mozc
path: engines/fcitx5-mozc/mozc
ref: ${{ env.MOZC_SHA }}

- name: Install dependencies
run: |
brew install librsvg
Expand Down Expand Up @@ -103,7 +94,7 @@ jobs:

- name: Download artifact
if: ${{ matrix.platform == 'OS64' }}
uses: actions/download-artifact@v6
uses: actions/download-artifact@v7
with:
merge-multiple: true

Expand All @@ -122,7 +113,7 @@ jobs:

- name: Upload artifact
if: ${{ github.ref != 'refs/heads/master' && matrix.platform == 'OS64' }}
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: Fcitx5.ipa
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
run: wget -O release.ipa https://github.com/fcitx-contrib/fcitx5-ios/releases/download/latest/Fcitx5.ipa

- name: Download artifact
uses: actions/download-artifact@v6
uses: actions/download-artifact@v7
with:
merge-multiple: true

Expand Down
2 changes: 1 addition & 1 deletion engines/fcitx5-hallelujah
2 changes: 1 addition & 1 deletion engines/fcitx5-lua
2 changes: 1 addition & 1 deletion engines/fcitx5-rime
Submodule fcitx5-rime updated 3 files
+1 −0 po/LINGUAS
+130 −0 po/ka.po
+26 −25 po/tr.po
2 changes: 1 addition & 1 deletion fcitx5
Submodule fcitx5 updated 76 files
+3 −1 .github/workflows/check.yml
+3 −0 .gitmodules
+10 −2 CMakeLists.txt
+1 −1 README.md
+1 −0 data/org.fcitx.Fcitx5.metainfo.xml.in
+1 −0 po/LINGUAS
+3,045 −0 po/ka.po
+7 −6 po/zh_CN.po
+266 −265 po/zh_TW.po
+2 −3 src/frontend/dbusfrontend/dbusfrontend.cpp
+1 −1 src/frontend/ibusfrontend/ibusfrontend.cpp
+20 −2 src/frontend/waylandim/waylandimserver.cpp
+19 −2 src/frontend/waylandim/waylandimserverv2.cpp
+1 −1 src/im/keyboard/keyboard.cpp
+1 −2 src/lib/fcitx-config/configuration.cpp
+1 −2 src/lib/fcitx-config/marshallfunction.cpp
+1 −2 src/lib/fcitx-utils/color.cpp
+1 −2 src/lib/fcitx-utils/cutf8.cpp
+3 −3 src/lib/fcitx-utils/dbus/libdbus/bus.cpp
+1 −2 src/lib/fcitx-utils/fs.cpp
+1 −3 src/lib/fcitx-utils/key.cpp
+2 −3 src/lib/fcitx-utils/standardpath.h
+5 −14 src/lib/fcitx-utils/stringutils.cpp
+6 −6 src/lib/fcitx-utils/stringutils.h
+35 −0 src/lib/fcitx-utils/utf8.cpp
+40 −0 src/lib/fcitx-utils/utf8.h
+2 −0 src/lib/fcitx-wayland/core/wl_buffer.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_data_device.cpp
+3 −0 src/lib/fcitx-wayland/core/wl_data_offer.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_data_source.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_keyboard.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_keyboard.h
+3 −0 src/lib/fcitx-wayland/core/wl_output.cpp
+3 −0 src/lib/fcitx-wayland/core/wl_pointer.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_pointer.h
+2 −0 src/lib/fcitx-wayland/core/wl_region.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_seat.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_seat.h
+10 −1 src/lib/fcitx-wayland/core/wl_shm.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_shm.h
+2 −0 src/lib/fcitx-wayland/core/wl_shm_pool.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_shm_pool.h
+2 −0 src/lib/fcitx-wayland/core/wl_subcompositor.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_subsurface.cpp
+3 −0 src/lib/fcitx-wayland/core/wl_surface.cpp
+2 −0 src/lib/fcitx-wayland/core/wl_touch.cpp
+1 −1 src/lib/fcitx-wayland/core/wl_touch.h
+1 −1 src/lib/fcitx/icontheme.cpp
+48 −25 src/lib/fcitx/inputcontext.cpp
+4 −1 src/lib/fcitx/inputcontext.h
+11 −2 src/lib/fcitx/inputcontext_p.h
+1 −3 src/lib/fcitx/inputmethodentry.cpp
+5 −0 src/lib/fcitx/inputpanel.cpp
+9 −7 src/lib/fcitx/instance.cpp
+1 −1 src/lib/fcitx/misc_p.h
+9 −4 src/lib/fcitx/text.cpp
+1 −1 src/lib/fcitx/userinterfacemanager.cpp
+4 −4 src/modules/dbus/dbusmodule.cpp
+1 −1 src/modules/emoji/emoji.cpp
+99 −67 src/modules/notificationitem/notificationitem.cpp
+7 −2 src/modules/notificationitem/notificationitem.h
+38 −4 src/modules/notifications/notifications.cpp
+17 −0 src/modules/notifications/notifications.h
+1 −1 src/modules/quickphrase/quickphraseprovider.cpp
+1 −2 src/modules/spell/spell-enchant.cpp
+26 −17 src/modules/wayland/waylandmodule.cpp
+3 −4 src/modules/xcb/xcbconnection.cpp
+4 −0 src/modules/xcb/xcbmodule.cpp
+1 −0 src/ui/classic/CMakeLists.txt
+4 −5 src/ui/classic/classicui.cpp
+318 −174 src/ui/classic/inputwindow.cpp
+29 −1 src/ui/classic/inputwindow.h
+4 −5 src/ui/kimpanel/kimpanel.cpp
+3 −0 test/testtext.cpp
+11 −0 test/testutf8.cpp
+1 −0 third_party/yoga
9 changes: 4 additions & 5 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ nlohmann::json getConfig(const std::string &uri) {
if (uri == globalConfigPath) {
auto &config = instance->globalConfig().config();
return configToJson(config);
} else if (stringutils::startsWith(uri, addonConfigPrefix)) {
} else if (uri.starts_with(addonConfigPrefix)) {
auto [addonName, subPath] = parseAddonUri(uri);
auto *addonInfo = instance->addonManager().addonInfo(addonName);
if (!addonInfo) {
Expand All @@ -59,7 +59,7 @@ nlohmann::json getConfig(const std::string &uri) {
"Failed to get config for addon \""s + addonName + "\""}};
}
return configToJson(*config);
} else if (stringutils::startsWith(uri, imConfigPrefix)) {
} else if (uri.starts_with(imConfigPrefix)) {
auto imName = uri.substr(sizeof(imConfigPrefix) - 1);
auto *entry = instance->inputMethodManager().entry(imName);
if (!entry) {
Expand Down Expand Up @@ -242,8 +242,7 @@ void setConfig(const char *uri_, const char *value) {
if (gc.safeSave()) {
instance->reloadConfig();
}
} else if (fcitx::stringutils::startsWith(uri,
fcitx::addonConfigPrefix)) {
} else if (uri.starts_with(fcitx::addonConfigPrefix)) {
auto [addonName, subPath] = fcitx::parseAddonUri(uri);
auto *addon = instance->addonManager().addon(addonName, true);
if (addon) {
Expand All @@ -256,7 +255,7 @@ void setConfig(const char *uri_, const char *value) {
} else {
FCITX_ERROR() << "Failed to get addon";
}
} else if (fcitx::stringutils::startsWith(uri, fcitx::imConfigPrefix)) {
} else if (uri.starts_with(fcitx::imConfigPrefix)) {
auto im = uri.substr(sizeof(fcitx::imConfigPrefix) - 1);
const auto *entry = instance->inputMethodManager().entry(im);
auto *engine = instance->inputMethodEngine(im);
Expand Down