Skip to content

Make X11 dependencies optional #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make X11 dependencies optional #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ include(GenerateExportHeader)
option(ENABLE_KCM "Enable KDE Config Module" On)
option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)
option(ENABLE_TEST "Enable test" Off)
option(ENABLE_X11 "Enable X11 integration" On)
add_definitions(-DTRANSLATION_DOMAIN=\"kcm_fcitx5\")
add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\")
add_definitions(-DQT_NO_KEYWORDS)
if (ENABLE_X11)
add_definitions(-DENABLE_X11)
endif ()

if (ENABLE_CONFIG_QT)
find_package(KF${QT_MAJOR_VERSION}ItemViews REQUIRED)
Expand Down Expand Up @@ -95,15 +99,19 @@ include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cma

find_package(PkgConfig REQUIRED)
find_package(Gettext REQUIRED)
if (ENABLE_X11)
find_package(X11 REQUIRED)
find_package(XKeyboardConfig REQUIRED)
pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET)
endif ()

configure_file(config.h.in config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})

add_subdirectory(po)
add_subdirectory(src)
if (ENABLE_X11)
add_subdirectory(layout)
endif ()

feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
6 changes: 4 additions & 2 deletions src/lib/configwidgetslib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ target_link_libraries(configwidgetslib
Fcitx5::Utils
Fcitx5Qt${QT_MAJOR_VERSION}::DBusAddons
Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons
configlib
layoutlib)
configlib)
if (ENABLE_X11)
target_link_libraries(configwidgetslib layoutlib)
endif ()
8 changes: 8 additions & 0 deletions src/lib/configwidgetslib/layoutselector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

#include "layoutselector.h"
#include "dbusprovider.h"
#ifdef ENABLE_X11
#include "keyboardlayoutwidget.h"
#endif // ENABLE_X11
#include "layoutmodel.h"
#include "ui_layoutselector.h"
#include <QDBusPendingCallWatcher>
Expand Down Expand Up @@ -45,13 +47,15 @@ LayoutSelector::LayoutSelector(DBusProvider *dbus, QWidget *parent)
connect(ui_->variantComboBox,
qOverload<int>(&QComboBox::currentIndexChanged), this,
&LayoutSelector::variantComboBoxChanged);
#ifdef ENABLE_X11
if (qApp->platformName() == "xcb") {
keyboardLayoutWidget_ = new KeyboardLayoutWidget(this);
keyboardLayoutWidget_->setMinimumSize(QSize(400, 200));
keyboardLayoutWidget_->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
ui_->verticalLayout->addWidget(keyboardLayoutWidget_);
}
#endif // ENABLE_X11
}

LayoutSelector::~LayoutSelector() {}
Expand Down Expand Up @@ -128,6 +132,7 @@ void LayoutSelector::layoutComboBoxChanged() {
ui_->variantComboBox->setCurrentIndex(0);
}

#ifdef ENABLE_X11
void LayoutSelector::variantComboBoxChanged() {
if (!keyboardLayoutWidget_) {
return;
Expand All @@ -142,6 +147,9 @@ void LayoutSelector::variantComboBoxChanged() {
keyboardLayoutWidget_->setVisible(true);
}
}
#else
void LayoutSelector::variantComboBoxChanged() { return; }
#endif // ENABLE_X11

} // namespace kcm
} // namespace fcitx
2 changes: 2 additions & 0 deletions src/lib/configwidgetslib/layoutselector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ private Q_SLOTS:
std::unique_ptr<Ui::LayoutSelector> ui_;
DBusProvider *dbus_;
LayoutProvider *layoutProvider_;
#ifdef ENABLE_X11
KeyboardLayoutWidget *keyboardLayoutWidget_ = nullptr;
#endif
Iso639 iso639_;

QString preSelectLayout_;
Expand Down