Merge pull request #73 from clehner/libnotify

More ways to answer calls in GTK+

3 files changed, 134 insertions, 10 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index 085a8c5..ac16662 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -225,6 +225,10 @@ ifeq ($(OS),freebsd)
 MODULES   += dtmfio
 endif
 
+ifneq ($(USE_GTK),)
+USE_LIBNOTIFY := $(shell pkg-config 'libnotify glib-2.0 < 2.40' && echo "yes")
+endif
+
 endif
 
 # ------------------------------------------------------------------------- #
diff --git a/modules/gtk/gtk_mod.c b/modules/gtk/gtk_mod.c
index 427912c..ee9e1a2 100644
--- a/modules/gtk/gtk_mod.c
+++ b/modules/gtk/gtk_mod.c
@@ -12,6 +12,14 @@
 #include <gio/gio.h>
 #include "gtk_mod.h"
 
+#ifdef USE_LIBNOTIFY
+#include <libnotify/notify.h>
+#endif
+
+#if GLIB_CHECK_VERSION(2,40,0) || defined(USE_LIBNOTIFY)
+#define USE_NOTIFICATIONS 1
+#endif
+
 /* About */
 #define COPYRIGHT " Copyright (C) 2010 - 2015 Alfred E. Heggestad et al."
 #define COMMENTS "A modular SIP User-Agent with audio and video support"
@@ -42,6 +50,7 @@ struct gtk_mod {
 	GSList *accounts_menu_group;
 	struct dial_dialog *dial_dialog;
 	GSList *call_windows;
+	GSList *incoming_call_menus;
 };
 
 struct gtk_mod mod_obj;
@@ -57,6 +66,7 @@ enum gtk_mod_events {
 
 static void answer_activated(GSimpleAction *, GVariant *, gpointer);
 static void reject_activated(GSimpleAction *, GVariant *, gpointer);
+static void denotify_incoming_call(struct gtk_mod *, struct call *);
 
 static GActionEntry app_entries[] = {
 	{"answer", answer_activated, "x", NULL, NULL, {0} },
@@ -166,6 +176,24 @@ static void menu_on_presence_set(GtkMenuItem *item, struct gtk_mod *mod)
 }
 
 
+static void menu_on_incoming_call_answer(GtkMenuItem *menuItem,
+		struct gtk_mod *mod)
+{
+	struct call *call = g_object_get_data(G_OBJECT(menuItem), "call");
+	denotify_incoming_call(mod, call);
+	mqueue_push(mod->mq, MQ_ANSWER, call);
+}
+
+
+static void menu_on_incoming_call_reject(GtkMenuItem *menuItem,
+		struct gtk_mod *mod)
+{
+	struct call *call = g_object_get_data(G_OBJECT(menuItem), "call");
+	denotify_incoming_call(mod, call);
+	mqueue_push(mod->mq, MQ_HANGUP, call);
+}
+
+
 static GtkMenuItem *accounts_menu_add_item(struct gtk_mod *mod,
 		struct ua *ua)
 {
@@ -268,15 +296,19 @@ static void accounts_menu_set_status(struct gtk_mod *mod,
 static void notify_incoming_call(struct gtk_mod *mod,
 		struct call *call)
 {
-	GNotification *notification;
-	GVariant *target;
+	static const char *title = "Incoming call";
+	const char *msg = call_peeruri(call);
+	GtkWidget *call_menu;
+	GtkWidget *menu_item;
+
+#if GLIB_CHECK_VERSION(2,40,0)
 	char id[64];
+	GVariant *target;
+	GNotification *notification = g_notification_new(title);
 
 	re_snprintf(id, sizeof id, "incoming-call-%p", call);
 	id[sizeof id - 1] = '\0';
 
-	notification = g_notification_new("Incoming call");
-
 #if GLIB_CHECK_VERSION(2,42,0)
 	g_notification_set_priority(notification,
 			G_NOTIFICATION_PRIORITY_URGENT);
@@ -285,24 +317,75 @@ static void notify_incoming_call(struct gtk_mod *mod,
 #endif
 
 	target = g_variant_new_int64(GPOINTER_TO_INT(call));
-	g_notification_set_body(notification, call_peeruri(call));
+	g_notification_set_body(notification, msg);
 	g_notification_add_button_with_target_value(notification,
 			"Answer", "app.answer", target);
 	g_notification_add_button_with_target_value(notification,
 			"Reject", "app.reject", target);
 	g_application_send_notification(mod->app, id, notification);
 	g_object_unref(notification);
-}
 
+#elif defined(USE_LIBNOTIFY)
+	/* If glib does not have GNotification, use libnotify instead. */
+	if (!notify_is_initted())
+		return;
+	NotifyNotification* notification = notify_notification_new(title,
+			msg, "baresip");
+	notify_notification_set_urgency(notification, NOTIFY_URGENCY_CRITICAL);
+	notify_notification_show(notification, NULL);
+	g_object_unref(notification);
+
+#endif
+
+	/* Add incoming call to the app menu */
+	call_menu = gtk_menu_new();
+	menu_item = gtk_menu_item_new_with_mnemonic("_Incoming call");
+	g_object_set_data(G_OBJECT(menu_item), "call", call);
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
+			call_menu);
+	gtk_menu_shell_prepend(GTK_MENU_SHELL(mod->app_menu), menu_item);
+	mod->incoming_call_menus = g_slist_append(mod->incoming_call_menus,
+			menu_item);
+
+	menu_item = gtk_menu_item_new_with_label(call_peeruri(call));
+	gtk_widget_set_sensitive(menu_item, FALSE);
+	gtk_menu_shell_append(GTK_MENU_SHELL(call_menu), menu_item);
+
+	menu_item = gtk_menu_item_new_with_mnemonic("_Accept");
+	g_object_set_data(G_OBJECT(menu_item), "call", call);
+	g_signal_connect(G_OBJECT(menu_item), "activate",
+			G_CALLBACK(menu_on_incoming_call_answer), mod);
+	gtk_menu_shell_append(GTK_MENU_SHELL(call_menu), menu_item);
+
+	menu_item = gtk_menu_item_new_with_mnemonic("_Reject");
+	g_object_set_data(G_OBJECT(menu_item), "call", call);
+	g_signal_connect(G_OBJECT(menu_item), "activate",
+			G_CALLBACK(menu_on_incoming_call_reject), mod);
+	gtk_menu_shell_append(GTK_MENU_SHELL(call_menu), menu_item);
+}
 
 static void denotify_incoming_call(struct gtk_mod *mod,
 		struct call *call)
 {
+#if GLIB_CHECK_VERSION(2,40,0)
 	char id[64];
 
 	re_snprintf(id, sizeof id, "incoming-call-%p", call);
 	id[sizeof id - 1] = '\0';
 	g_application_withdraw_notification(mod->app, id);
+#endif
+
+	/* Remove call submenu */
+	GSList *item, *next;
+	for (item = mod->incoming_call_menus; item; item = next) {
+		next = item->next;
+		GtkWidget *menu_item = item->data;
+		if (call == g_object_get_data(G_OBJECT(menu_item), "call")) {
+			gtk_widget_destroy(menu_item);
+			mod->incoming_call_menus =
+				g_slist_delete_link(mod->incoming_call_menus, item);
+		}
+	}
 }
 
 
@@ -392,9 +475,11 @@ static void ua_event_handler(struct ua *ua,
 		accounts_menu_set_status(mod, ua, ev);
 		break;
 
+#ifdef USE_NOTIFICATIONS
 	case UA_EVENT_CALL_INCOMING:
 		notify_incoming_call(mod, call);
 		break;
+#endif
 
 	case UA_EVENT_CALL_CLOSED:
 		win = get_call_window(mod, call);
@@ -435,15 +520,16 @@ static void ua_event_handler(struct ua *ua,
 	gdk_threads_leave();
 }
 
+#ifdef USE_NOTIFICATIONS
 static void message_handler(const struct pl *peer, const struct pl *ctype,
 			    struct mbuf *body, void *arg)
 {
 	struct gtk_mod *mod = arg;
-	GNotification *notification;
 	char title[128];
 	char msg[512];
 	(void)ctype;
 
+
 	/* Display notification of chat */
 
 	re_snprintf(title, sizeof title, "Chat from %r", peer);
@@ -452,11 +538,24 @@ static void message_handler(const struct pl *peer, const struct pl *ctype,
 	re_snprintf(msg, sizeof msg, "%b",
 			mbuf_buf(body), mbuf_get_left(body));
 
-	notification = g_notification_new(title);
+#if GLIB_CHECK_VERSION(2,40,0)
+	GNotification *notification = g_notification_new(title);
 	g_notification_set_body(notification, msg);
 	g_application_send_notification(mod->app, NULL, notification);
 	g_object_unref(notification);
+
+#elif defined(USE_LIBNOTIFY)
+	(void)mod;
+
+	if (!notify_is_initted())
+		return;
+	NotifyNotification* notification = notify_notification_new(title, msg,
+			"baresip");
+	notify_notification_show(notification, NULL);
+	g_object_unref(notification);
+#endif
 }
+#endif
 
 
 static void popup_menu(struct gtk_mod *mod, GtkMenuPositionFunc position,
@@ -611,6 +710,10 @@ static void *gtk_thread(void *arg)
 		err = NULL;
 	}
 
+#ifdef USE_LIBNOTIFY
+	notify_init("baresip");
+#endif
+
 	mod->status_icon = gtk_status_icon_new_from_icon_name("call-start");
 	gtk_status_icon_set_tooltip_text (mod->status_icon, "baresip");
 
@@ -622,6 +725,7 @@ static void *gtk_thread(void *arg)
 	mod->contacts_inited = false;
 	mod->dial_dialog = NULL;
 	mod->call_windows = NULL;
+	mod->incoming_call_menus = NULL;
 
 	/* App menu */
 	mod->app_menu = gtk_menu_new();
@@ -859,9 +963,11 @@ static int module_init(void)
 		return err;
 
 	aufilt_register(&vumeter);
+#ifdef USE_NOTIFICATIONS
 	err = message_init(message_handler, &mod_obj);
 	if (err)
 		return err;
+#endif
 
 	err = cmd_register(cmdv, ARRAY_SIZE(cmdv));
 
@@ -881,6 +987,15 @@ static int module_close(void)
 	aufilt_unregister(&vumeter);
 	message_close();
 
+#ifdef USE_LIBNOTIFY
+	if (notify_is_initted())
+		notify_uninit();
+#endif
+
+	g_slist_free(mod_obj.accounts_menu_group);
+	g_slist_free(mod_obj.call_windows);
+	g_slist_free(mod_obj.incoming_call_menus);
+
 	return 0;
 }
 
diff --git a/modules/gtk/module.mk b/modules/gtk/module.mk
index aae0145..2ed3709 100644
--- a/modules/gtk/module.mk
+++ b/modules/gtk/module.mk
@@ -8,8 +8,13 @@
 MOD		:= gtk
 $(MOD)_SRCS	+= gtk_mod.c call_window.c dial_dialog.c transfer_dialog.c \
 	uri_entry.c
-$(MOD)_LFLAGS      += `pkg-config --libs gtk+-2.0 `
-$(MOD)_CFLAGS      += `pkg-config --cflags gtk+-2.0 `
+$(MOD)_LFLAGS      += `pkg-config --libs gtk+-2.0 $($(MOD)_EXTRA)`
+$(MOD)_CFLAGS      += `pkg-config --cflags gtk+-2.0 $($(MOD)_EXTRA)`
 $(MOD)_CFLAGS	+= -Wno-strict-prototypes
 
+ifneq ($(USE_LIBNOTIFY),)
+$(MOD)_EXTRA = libnotify
+$(MOD)_CFLAGS += -DUSE_LIBNOTIFY=1
+endif
+
 include mk/mod.mk