Skip to content

fix: fix treeland-protocol name #65

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

Merged
zccrs merged 1 commit into from
Jan 15, 2026
Merged

fix: fix treeland-protocol name #65

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
26 changes: 13 additions & 13 deletions src/daemon/TreelandConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ bool TreelandConnector::isConnected() {
return m_ddm;
}

void TreelandConnector::setPrivateObject(struct treeland_ddm *ddm) {
void TreelandConnector::setPrivateObject(struct treeland_ddm_v1 *ddm) {
m_ddm = ddm;
}

Expand All @@ -152,20 +152,20 @@ void TreelandConnector::setSignalHandler() {

// Event implementation

static void switchToVt([[maybe_unused]] void *data, [[maybe_unused]] struct treeland_ddm *ddm, int32_t vtnr) {
static void switchToVt([[maybe_unused]] void *data, [[maybe_unused]] struct treeland_ddm_v1 *ddm, int32_t vtnr) {
int fd = open(qPrintable(VirtualTerminal::path(vtnr)), O_RDWR | O_NOCTTY);
Copy link

@sourcery-ai sourcery-ai bot Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Handle open failures before using the file descriptor in the VT helpers.

open may fail in both switchToVt and acquireVt, but its return value is used without checking for < 0. This means ioctl, VirtualTerminal::handleVtSwitches, and close can be called with an invalid FD. Please add a check for fd < 0 and return or log appropriately before using the descriptor.

if (ioctl(fd, VT_ACTIVATE, vtnr) < 0)
qWarning("Failed to switch to VT %d: %s", vtnr, strerror(errno));
close(fd);
}

static void acquireVt([[maybe_unused]] void *data, [[maybe_unused]] struct treeland_ddm *ddm, int32_t vtnr) {
static void acquireVt([[maybe_unused]] void *data, [[maybe_unused]] struct treeland_ddm_v1 *ddm, int32_t vtnr) {
int fd = open(qPrintable(VirtualTerminal::path(vtnr)), O_RDWR | O_NOCTTY);
VirtualTerminal::handleVtSwitches(fd);
close(fd);
}

const struct treeland_ddm_listener treelandDDMListener {
const struct treeland_ddm_v1_listener treelandDDMListener {
.switch_to_vt = switchToVt,
.acquire_vt = acquireVt,
};
Expand All @@ -175,10 +175,10 @@ const struct treeland_ddm_listener treelandDDMListener {
void registerGlobal(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
if (strcmp(interface, "treeland_ddm") == 0) {
auto connector = static_cast<TreelandConnector *>(data);
auto ddm = static_cast<struct treeland_ddm *>(
wl_registry_bind(registry, name, &treeland_ddm_interface, version)
auto ddm = static_cast<struct treeland_ddm_v1 *>(
wl_registry_bind(registry, name, &treeland_ddm_v1_interface, version)
);
treeland_ddm_add_listener(ddm, &treelandDDMListener, connector);
treeland_ddm_v1_add_listener(ddm, &treelandDDMListener, connector);
connector->setPrivateObject(ddm);
qDebug("Connected to treeland_ddm global object");
}
Expand Down Expand Up @@ -225,7 +225,7 @@ void TreelandConnector::connect(QString socketPath) {

void TreelandConnector::switchToGreeter() {
if (isConnected()) {
treeland_ddm_switch_to_greeter(m_ddm);
treeland_ddm_v1_switch_to_greeter(m_ddm);
wl_display_flush(m_display);
} else {
qWarning("Treeland is not connected when trying to call switchToGreeter");
Expand All @@ -234,7 +234,7 @@ void TreelandConnector::switchToGreeter() {

void TreelandConnector::switchToUser(const QString username) {
if (isConnected()) {
treeland_ddm_switch_to_user(m_ddm, qPrintable(username));
treeland_ddm_v1_switch_to_user(m_ddm, qPrintable(username));
wl_display_flush(m_display);
} else {
qWarning("Treeland is not connected when trying to call switchToUser");
Expand All @@ -243,7 +243,7 @@ void TreelandConnector::switchToUser(const QString username) {

void TreelandConnector::activateSession() {
if (isConnected()) {
treeland_ddm_activate_session(m_ddm);
treeland_ddm_v1_activate_session(m_ddm);
wl_display_flush(m_display);
} else {
qWarning("Treeland is not connected when trying to call activateSession");
Expand All @@ -252,7 +252,7 @@ void TreelandConnector::activateSession() {

void TreelandConnector::deactivateSession() {
if (isConnected()) {
treeland_ddm_deactivate_session(m_ddm);
treeland_ddm_v1_deactivate_session(m_ddm);
wl_display_flush(m_display);
} else {
qWarning("Treeland is not connected when trying to call deactivateSession");
Expand All @@ -261,7 +261,7 @@ void TreelandConnector::deactivateSession() {

void TreelandConnector::enableRender() {
if (isConnected()) {
treeland_ddm_enable_render(m_ddm);
treeland_ddm_v1_enable_render(m_ddm);
wl_display_flush(m_display);
} else {
qWarning("Treeland is not connected when trying to call enableRender");
Expand All @@ -270,7 +270,7 @@ void TreelandConnector::enableRender() {

struct wl_callback *TreelandConnector::disableRender() {
if (isConnected()) {
auto callback = treeland_ddm_disable_render(m_ddm);
auto callback = treeland_ddm_v1_disable_render(m_ddm);
wl_display_flush(m_display);
return callback;
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/daemon/TreelandConnector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

struct wl_display;
struct wl_callback;
struct treeland_ddm;
struct treeland_ddm_v1;

namespace DDM {
class TreelandConnector : QObject {
Expand All @@ -15,7 +15,7 @@ class TreelandConnector : QObject {
TreelandConnector();
~TreelandConnector();
bool isConnected();
void setPrivateObject(struct treeland_ddm *ddm);
void setPrivateObject(struct treeland_ddm_v1 *ddm);
void setSignalHandler();
void connect(const QString socketPath);

Expand All @@ -29,6 +29,6 @@ class TreelandConnector : QObject {
private:
struct wl_display *m_display { nullptr };
QSocketNotifier *m_notifier { nullptr };
struct treeland_ddm *m_ddm { nullptr };
struct treeland_ddm_v1 *m_ddm { nullptr };
};
}