Skip to content

Linux + iPhone Continuity / iMessage / SMS

improve gtk app

Zack Bartel94b3ed94815d
diff --git a/src/core/include/tether/discovery.hpp b/src/core/include/tether/discovery.hpp
index d89237d..22c2ac5 100644
--- a/src/core/include/tether/discovery.hpp
+++ b/src/core/include/tether/discovery.hpp
@@ -1,6 +1,7 @@
#pragma once
#include <cstdint>
+#include <functional>
#include <memory>
#include <string>
#include <vector>
@@ -63,6 +64,15 @@ namespace tether {
/// @return A list of discovered hosts (one per interface), possibly empty.
std::vector<DiscoveredHost> discover(int timeout_ms = 3000);
+ /// Start continuous background discovery.
+ /// The callback is invoked whenever a new device is found or an existing device is removed.
+ /// The callback is executed on the background Avahi thread.
+ /// Only one continuous browse session can run per Discovery instance.
+ void start_continuous_browse(std::function<void(const std::vector<DiscoveredDevice>&)> callback);
+
+ /// Stop continuous background discovery.
+ void stop_continuous_browse();
+
private:
struct Impl;
std::unique_ptr<Impl> impl_;
diff --git a/src/core/src/discovery.cpp b/src/core/src/discovery.cpp
index 28c17f6..ed69e41 100644
--- a/src/core/src/discovery.cpp
+++ b/src/core/src/discovery.cpp
@@ -35,6 +35,13 @@ namespace tether {
// Discovery state (per-call, not persistent)
std::mutex results_mutex;
std::vector<DiscoveredHost> results;
+
+ // Continuous browse state
+ AvahiThreadedPoll* browse_poll = nullptr;
+ AvahiClient* browse_client = nullptr;
+ AvahiServiceBrowser* browse_browser = nullptr;
+ std::function<void(const std::vector<DiscoveredDevice>&)> browse_callback;
+ void* browse_ctx = nullptr;
};
// Wire the pimpl to use DiscoveryImpl
@@ -185,6 +192,11 @@ namespace tether {
if (!exists) {
ctx->impl->results.push_back(std::move(host));
}
+
+ if (ctx->impl->browse_callback) {
+ auto grouped = group_discovered_hosts(ctx->impl->results);
+ ctx->impl->browse_callback(grouped);
+ }
}
}
@@ -216,6 +228,20 @@ namespace tether {
(AvahiLookupFlags)0,
resolve_callback,
userdata);
+ } else if (event == AVAHI_BROWSER_REMOVE) {
+ std::lock_guard<std::mutex> lock(ctx->impl->results_mutex);
+ ctx->impl->results.erase(
+ std::remove_if(ctx->impl->results.begin(), ctx->impl->results.end(),
+ [&](const DiscoveredHost& h) {
+ return h.name == name;
+ }),
+ ctx->impl->results.end()
+ );
+
+ if (ctx->impl->browse_callback) {
+ auto grouped = group_discovered_hosts(ctx->impl->results);
+ ctx->impl->browse_callback(grouped);
+ }
}
}
@@ -348,6 +374,81 @@ namespace tether {
return impl_->results;
}
+ void Discovery::start_continuous_browse(std::function<void(const std::vector<DiscoveredDevice>&)> callback) {
+ stop_continuous_browse();
+
+ {
+ std::lock_guard<std::mutex> lock(impl_->results_mutex);
+ impl_->results.clear();
+ }
+
+ impl_->browse_callback = std::move(callback);
+
+ impl_->browse_poll = avahi_threaded_poll_new();
+ if (!impl_->browse_poll) {
+ std::cerr << "mDNS: Failed to create browse poll" << std::endl;
+ return;
+ }
+
+ int error = 0;
+ impl_->browse_client = avahi_client_new(
+ avahi_threaded_poll_get(impl_->browse_poll),
+ (AvahiClientFlags)0,
+ [](AvahiClient*, AvahiClientState, void*) {},
+ nullptr,
+ &error);
+
+ if (!impl_->browse_client) {
+ avahi_threaded_poll_free(impl_->browse_poll);
+ impl_->browse_poll = nullptr;
+ return;
+ }
+
+ // Allocate a dedicated context
+ auto* ctx = new BrowseContext{impl_.get(), impl_->browse_client};
+ impl_->browse_ctx = ctx;
+
+ impl_->browse_browser = avahi_service_browser_new(
+ impl_->browse_client,
+ AVAHI_IF_UNSPEC,
+ AVAHI_PROTO_UNSPEC,
+ SERVICE_TYPE,
+ nullptr,
+ (AvahiLookupFlags)0,
+ browse_callback,
+ ctx);
+
+ if (!impl_->browse_browser) {
+ avahi_client_free(impl_->browse_client);
+ avahi_threaded_poll_free(impl_->browse_poll);
+ impl_->browse_client = nullptr;
+ impl_->browse_poll = nullptr;
+ delete ctx;
+ return;
+ }
+
+ avahi_threaded_poll_start(impl_->browse_poll);
+ }
+
+ void Discovery::stop_continuous_browse() {
+ if (impl_->browse_poll) {
+ avahi_threaded_poll_stop(impl_->browse_poll);
+ if (impl_->browse_browser) avahi_service_browser_free(impl_->browse_browser);
+ if (impl_->browse_client) avahi_client_free(impl_->browse_client);
+ avahi_threaded_poll_free(impl_->browse_poll);
+
+ if (impl_->browse_ctx) {
+ delete static_cast<BrowseContext*>(impl_->browse_ctx);
+ impl_->browse_ctx = nullptr;
+ }
+
+ impl_->browse_browser = nullptr;
+ impl_->browse_client = nullptr;
+ impl_->browse_poll = nullptr;
+ impl_->browse_callback = nullptr;
+ }
+ }
+
// ─── Grouping helper ────────────────────────────────────────────
std::vector<DiscoveredDevice> group_discovered_hosts(const std::vector<DiscoveredHost>& hosts) {
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index ce83ad2..523d4ed 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -65,6 +65,26 @@ int main(int argc, char** argv) {
if (!discovery.publish(hostname, 5134, my_fp)) {
std::cerr << "Warning: mDNS advertisement failed (is avahi-daemon running?)" << std::endl;
}
+
+ discovery.start_continuous_browse([](const std::vector<tether::DiscoveredDevice>& devices) {
+ nlohmann::json payload;
+ payload["command"] = "discovery_result";
+ payload["devices"] = nlohmann::json::array();
+ for (const auto& dev : devices) {
+ nlohmann::json d;
+ d["name"] = dev.name;
+ d["fingerprint"] = dev.fingerprint;
+ d["addresses"] = nlohmann::json::array();
+ for (const auto& addr : dev.addresses) {
+ nlohmann::json a;
+ a["address"] = addr.address;
+ a["port"] = addr.port;
+ d["addresses"].push_back(a);
+ }
+ payload["devices"].push_back(d);
+ }
+ tether::broadcast_local_event(payload.dump());
+ });
}
tether::WaylandContext wayland_srv(loop);
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index 1fb8a58..168f4fc 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.cpp
@@ -172,13 +172,34 @@ namespace {
return row;
};
+ auto create_header_row = [](const std::string& title_text) {
+ GtkWidget* row = gtk_list_box_row_new();
+ gtk_list_box_row_set_selectable(GTK_LIST_BOX_ROW(row), FALSE);
+ GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(box), 8);
+ GtkWidget* lbl = gtk_label_new(nullptr);
+ gtk_label_set_markup(GTK_LABEL(lbl), ("<b><span size='small' color='gray'>" + escape_markup(title_text) + "</span></b>").c_str());
+ gtk_label_set_xalign(GTK_LABEL(lbl), 0.0);
+ gtk_box_pack_start(GTK_BOX(box), lbl, TRUE, TRUE, 0);
+ gtk_container_add(GTK_CONTAINER(row), box);
+ return row;
+ };
+
std::string my_fp = tether::Crypto::instance().get_my_fingerprint();
+ std::vector<GtkWidget*> connected_rows;
+ std::vector<GtkWidget*> remembered_rows;
+ std::vector<GtkWidget*> discovered_rows;
+
for (const auto& paired : g_app.paired_devices) {
bool online = std::find(g_app.connected_fps.begin(), g_app.connected_fps.end(), paired.first) !=
g_app.connected_fps.end();
GtkWidget* r = create_row(paired.second, paired.first, "", 5134, true, online);
- gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
+ if (online) {
+ connected_rows.push_back(r);
+ } else {
+ remembered_rows.push_back(r);
+ }
}
for (const auto& disc : g_app.discovered_devices) {
@@ -196,7 +217,7 @@ namespace {
std::string ip = disc.addresses.empty() ? "" : disc.addresses[0].address;
uint16_t port = disc.addresses.empty() ? 5134 : disc.addresses[0].port;
GtkWidget* r = create_row(disc.name, disc.fingerprint, ip, port, false, false);
- gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
+ discovered_rows.push_back(r);
}
// Render Pending Pair Requests
@@ -224,7 +245,22 @@ namespace {
std::string ip = req.addresses.empty() ? "" : req.addresses[0].address;
uint16_t port = req.addresses.empty() ? 5134 : req.addresses[0].port;
GtkWidget* r = create_row(req.name, req.fingerprint, ip, port, false, false);
- gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
+ discovered_rows.push_back(r);
+ }
+
+ if (!connected_rows.empty()) {
+ gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), create_header_row("CONNECTED"), -1);
+ for (auto* r : connected_rows) gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
+ }
+
+ if (!remembered_rows.empty()) {
+ gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), create_header_row("REMEMBERED"), -1);
+ for (auto* r : remembered_rows) gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
+ }
+
+ if (!discovered_rows.empty()) {
+ gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), create_header_row("DISCOVERED"), -1);
+ for (auto* r : discovered_rows) gtk_list_box_insert(GTK_LIST_BOX(g_app.list_devices), r, -1);
}
gtk_widget_show_all(g_app.list_devices);
@@ -610,33 +646,9 @@ namespace {
return G_SOURCE_REMOVE;
}
- void apply_css() {
- GtkCssProvider* provider = gtk_css_provider_new();
- const gchar* css = "window { background-color: #0d1117; color: #c9d1d9; }"
- ".card { background-color: #161b22; border: 1px solid #30363d; border-radius: 12px; }"
- ".muted { color: #8b949e; }"
- "button { border-radius: 8px; padding: 12px 24px; background-color: #21262d; color: "
- "#c9d1d9; border: 1px solid #30363d; font-weight: 600; }"
- "button:hover { background-color: #30363d; }"
- "button.suggested-action { background-color: #238636; color: #ffffff; border-color: "
- "rgba(240,246,252,0.1); }"
- "button.suggested-action:hover { background-color: #2ea043; }"
- "list { background-color: transparent; }"
- "list row { background-color: transparent; border-bottom: 1px solid #21262d; padding: 4px; "
- "transition: all 150ms ease-in-out; }"
- "list row:selected { background-color: rgba(56,139,253,0.15); border-radius: 8px; }"
- "scrolledwindow { background: transparent; }";
- gtk_css_provider_load_from_data(provider, css, -1, nullptr);
- gtk_style_context_add_provider_for_screen(
- gdk_screen_get_default(), GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
- g_object_unref(provider);
- }
-
void activate(GtkApplication* app, gpointer) {
g_app.app = app;
tether::Crypto::instance().init();
- g_object_set(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", TRUE, nullptr);
- apply_css();
g_app.window = gtk_application_window_new(app);
gtk_window_set_title(GTK_WINDOW(g_app.window), "Tether");
@@ -721,6 +733,15 @@ namespace {
g_signal_connect(btn_send_file, "clicked", G_CALLBACK(on_choose_file), nullptr);
gtk_box_pack_start(GTK_BOX(btn_grid), btn_send_file, FALSE, FALSE, 0);
+ GtkWidget* btn_send_clip = gtk_button_new_with_label("Send Clipboard");
+ g_signal_connect(btn_send_clip, "clicked", G_CALLBACK(+[](GtkWidget*, gpointer) {
+ nlohmann::json j;
+ j["command"] = "clipboard_set"; // triggers clipboard send
+ send_async_daemon_message(j);
+ set_status_action("Clipboard sync requested...");
+ }), nullptr);
+ gtk_box_pack_start(GTK_BOX(btn_grid), btn_send_clip, FALSE, FALSE, 0);
+
gtk_box_pack_start(GTK_BOX(action_box), btn_grid, FALSE, FALSE, 0);
g_app.lbl_action_status = gtk_label_new("Ready");