Skip to content

Fix Linux compilation errors in platform-specific code #20

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
lijy91 merged 2 commits into from
Sep 17, 2025
Merged

Fix Linux compilation errors in platform-specific code #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39fdb0f
Initial plan
Copilot Sep 17, 2025
0dd35f8
Fix Linux compilation errors in platform-specific code
Copilot Sep 17, 2025
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
4 changes: 4 additions & 0 deletions src/platform/linux/display_manager_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ DisplayManager::DisplayManager() {
std::cout << "DisplayManager initialized" << std::endl;
}

DisplayManager::~DisplayManager() {
// Destructor implementation
}

std::vector<Display> DisplayManager::GetAll() {
// Empty implementation
std::vector<Display> displayList;
Expand Down
14 changes: 5 additions & 9 deletions src/platform/linux/keyboard_monitor_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class KeyboardMonitor::Impl {
uint32_t GetModifierState();
};

KeyboardMonitor::KeyboardMonitor() : impl_(std::make_unique<Impl>(this)), event_dispatcher_() {}
KeyboardMonitor::KeyboardMonitor() : impl_(std::make_unique<Impl>(this)) {}

KeyboardMonitor::~KeyboardMonitor() {
Stop();
Expand Down Expand Up @@ -156,16 +156,16 @@ void KeyboardMonitor::Impl::MonitoringLoop() {

if (xi_event->evtype == XI_KeyPress) {
KeyPressedEvent key_event(xi_event->detail);
monitor_->DispatchEvent(key_event);
monitor_->EmitSync(key_event);

ModifierKeysChangedEvent modifier_event(GetModifierState());
monitor_->DispatchEvent(modifier_event);
monitor_->EmitSync(modifier_event);
} else if (xi_event->evtype == XI_KeyRelease) {
KeyReleasedEvent key_event(xi_event->detail);
monitor_->DispatchEvent(key_event);
monitor_->EmitSync(key_event);

ModifierKeysChangedEvent modifier_event(GetModifierState());
monitor_->DispatchEvent(modifier_event);
monitor_->EmitSync(modifier_event);
}

XFreeEventData(display_, &event.xcookie);
Expand Down Expand Up @@ -216,8 +216,4 @@ bool KeyboardMonitor::IsMonitoring() const {
return impl_->monitoring_;
}

void KeyboardMonitor::DispatchEvent(const Event& event) {
event_dispatcher_.DispatchSync(event);
}

} // namespace nativeapi
71 changes: 17 additions & 54 deletions src/platform/linux/menu_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,49 +16,36 @@ class MenuItem::Impl {
std::string tooltip_;
};

MenuItem::MenuItem() : pimpl_(new Impl(nullptr)) {
id = -1;
}

MenuItem::MenuItem(void* menu_item) : pimpl_(new Impl((GtkWidget*)menu_item)) {
id = -1;
}

MenuItem::~MenuItem() {
delete pimpl_;
}

void MenuItem::SetIcon(std::string icon) {
void MenuItem::SetIcon(const std::string& icon) {
pimpl_->icon_ = icon;
// TODO: Implement icon setting for GTK menu item
}

std::string MenuItem::GetIcon() {
std::string MenuItem::GetIcon() const {
return pimpl_->icon_;
}

void MenuItem::SetTitle(std::string title) {
pimpl_->title_ = title;
if (pimpl_->gtk_menu_item_) {
gtk_menu_item_set_label(GTK_MENU_ITEM(pimpl_->gtk_menu_item_), title.c_str());
}
}

std::string MenuItem::GetTitle() {
return pimpl_->title_;
}

void MenuItem::SetTooltip(std::string tooltip) {
void MenuItem::SetTooltip(const std::string& tooltip) {
pimpl_->tooltip_ = tooltip;
if (pimpl_->gtk_menu_item_) {
gtk_widget_set_tooltip_text(pimpl_->gtk_menu_item_, tooltip.c_str());
}
}

std::string MenuItem::GetTooltip() {
std::string MenuItem::GetTooltip() const {
return pimpl_->tooltip_;
}

void* MenuItem::GetNativeItem() const {
return (void*)pimpl_->gtk_menu_item_;
}

// Private implementation class for Menu
class Menu::Impl {
public:
Expand All @@ -67,54 +54,30 @@ class Menu::Impl {
GtkWidget* gtk_menu_;
};

Menu::Menu() : pimpl_(new Impl(gtk_menu_new())) {
id = -1;
}

Menu::Menu(void* menu) : pimpl_(new Impl((GtkWidget*)menu)) {
id = -1;
}

Menu::~Menu() {
if (pimpl_->gtk_menu_) {
g_object_unref(pimpl_->gtk_menu_);
}
delete pimpl_;
}

void Menu::AddItem(MenuItem item) {
if (pimpl_->gtk_menu_ && item.pimpl_->gtk_menu_item_) {
gtk_menu_shell_append(GTK_MENU_SHELL(pimpl_->gtk_menu_), item.pimpl_->gtk_menu_item_);
}
}

void Menu::RemoveItem(MenuItem item) {
if (pimpl_->gtk_menu_ && item.pimpl_->gtk_menu_item_) {
gtk_container_remove(GTK_CONTAINER(pimpl_->gtk_menu_), item.pimpl_->gtk_menu_item_);
void Menu::AddItem(std::shared_ptr<MenuItem> item) {
if (pimpl_->gtk_menu_ && item && item->GetNativeItem()) {
gtk_menu_shell_append(GTK_MENU_SHELL(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeItem());
}
}

void Menu::AddSeparator() {
if (pimpl_->gtk_menu_) {
GtkWidget* separator = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(pimpl_->gtk_menu_), separator);
bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
if (pimpl_->gtk_menu_ && item && item->GetNativeItem()) {
gtk_container_remove(GTK_CONTAINER(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeItem());
return true;
}
return false;
}

MenuItem Menu::CreateItem(std::string title) {
GtkWidget* menu_item = gtk_menu_item_new_with_label(title.c_str());
MenuItem item(menu_item);
item.SetTitle(title);
return item;
}

MenuItem Menu::CreateItem(std::string title, std::string icon) {
MenuItem item = CreateItem(title);
item.SetIcon(icon);
return item;
}

void* Menu::GetNativeMenu() {
void* Menu::GetNativeMenu() const {
return (void*)pimpl_->gtk_menu_;
}

Expand Down
26 changes: 7 additions & 19 deletions src/platform/linux/tray_icon_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ namespace nativeapi {
// Private implementation class
class TrayIcon::Impl {
public:
Impl(GtkStatusIcon* tray) : gtk_status_icon_(tray), title_(""), tooltip_("") {}
Impl(GtkStatusIcon* tray) : gtk_status_icon_(tray), title_(""), tooltip_(""), context_menu_(nullptr) {}

GtkStatusIcon* gtk_status_icon_;
Menu context_menu_; // Store menu object to keep it alive
std::shared_ptr<Menu> context_menu_; // Store menu shared_ptr to keep it alive
std::string title_; // GTK StatusIcon doesn't have title, so we store it
std::string tooltip_;
};
Expand Down Expand Up @@ -113,15 +113,15 @@ std::string TrayIcon::GetTooltip() {
}

void TrayIcon::SetContextMenu(std::shared_ptr<Menu> menu) {
// Store the menu object to keep it alive
pimpl_->context_menu_ = *menu;
// Store the menu shared_ptr to keep it alive
pimpl_->context_menu_ = menu;

// Note: Full GTK integration would need to connect popup-menu signal
// and show the GTK menu from the Menu object's GetNativeMenu()
}

std::shared_ptr<Menu> TrayIcon::GetContextMenu() {
return std::make_shared<Menu>(pimpl_->context_menu_);
return pimpl_->context_menu_;
}

Rectangle TrayIcon::GetBounds() {
Expand Down Expand Up @@ -166,20 +166,8 @@ bool TrayIcon::IsVisible() {
return false;
}

void TrayIcon::SetOnLeftClick(std::function<void()> callback) {
// This method is deprecated - use event listeners instead
}

void TrayIcon::SetOnRightClick(std::function<void()> callback) {
// This method is deprecated - use event listeners instead
}

void TrayIcon::SetOnDoubleClick(std::function<void()> callback) {
// This method is deprecated - use event listeners instead
}

bool TrayIcon::ShowContextMenu(double x, double y) {
if (!pimpl_->context_menu_.GetNativeMenu()) {
if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeMenu()) {
return false;
}

Expand All @@ -189,7 +177,7 @@ bool TrayIcon::ShowContextMenu(double x, double y) {
}

bool TrayIcon::ShowContextMenu() {
if (!pimpl_->context_menu_.GetNativeMenu()) {
if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeMenu()) {
return false;
}

Expand Down
14 changes: 7 additions & 7 deletions src/platform/linux/window_manager_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
namespace nativeapi {

// Private implementation for Linux (stub for now)
class WindowManager::WindowManagerImpl {
class WindowManager::Impl {
public:
WindowManagerImpl(WindowManager* manager) : manager_(manager) {}
~WindowManagerImpl() {}
Impl(WindowManager* manager) : manager_(manager) {}
~Impl() {}

void SetupEventMonitoring() {
// TODO: Implement Linux-specific event monitoring using GTK signals
Expand All @@ -29,7 +29,7 @@ class WindowManager::WindowManagerImpl {
WindowManager* manager_;
};

WindowManager::WindowManager() : impl_(std::make_unique<WindowManagerImpl>(this)) {
WindowManager::WindowManager() : pimpl_(std::make_unique<Impl>(this)) {
// Try to initialize GTK if not already initialized
// In headless environments, this may fail, which is acceptable
if (!gdk_display_get_default()) {
Expand All @@ -56,15 +56,15 @@ WindowManager::~WindowManager() {
}

void WindowManager::SetupEventMonitoring() {
impl_->SetupEventMonitoring();
pimpl_->SetupEventMonitoring();
}

void WindowManager::CleanupEventMonitoring() {
impl_->CleanupEventMonitoring();
pimpl_->CleanupEventMonitoring();
}

void WindowManager::DispatchWindowEvent(const Event& event) {
event_dispatcher_.DispatchSync(event);
EmitSync(event);
}

std::shared_ptr<Window> WindowManager::Get(WindowID id) {
Expand Down