mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

free notifications properly

Browse source
This commit is contained in:
Patrick Reynolds 2013-12-18 23:05:19 -06:00
parent a82e9f30ed
commit 272b3c30d3
2 changed files with 78 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

124
brightray/browser/linux/notification_presenter_linux.cc
View file

@ -17,24 +17,9 @@ namespace brightray {
namespace { namespace {
struct NotificationID { const char *kRenderProcessIDKey = "RenderProcessID";
NotificationID( const char *kRenderViewIDKey = "RenderViewID";
int render_process_id, const char *kNotificationIDKey = "NotificationID";
int render_view_id,
int notification_id)
: render_process_id(render_process_id),
render_view_id(render_view_id),
notification_id(notification_id) {
}
std::string GetID() {
return base::StringPrintf("%d:%d:%d", render_process_id, render_view_id, notification_id);
}
int render_process_id;
int render_view_id;
int notification_id;
};
void log_and_clear_error(GError *error, const char *context) { void log_and_clear_error(GError *error, const char *context) {
if (error) { if (error) {
@ -43,20 +28,28 @@ void log_and_clear_error(GError *error, const char *context) {
} }
} }
void closed_cb(NotifyNotification *notification, NotificationID *ID) { void closed_cb(NotifyNotification *notification, NotificationPresenterLinux *obj) {
auto host = content::RenderViewHost::FromID(ID->render_process_id, ID->render_view_id); int render_process_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kRenderProcessIDKey));
if (host) host->DesktopNotificationPostClick(ID->notification_id); int render_view_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kRenderViewIDKey));
int notification_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kNotificationIDKey));
LOG(INFO) << "closed_cb: process=" << render_process_id
<< " view=" << render_view_id
<< " notification=" << notification_id
<< " reason=" << notify_notification_get_closed_reason(notification);
obj->RemoveNotification(notification);
} }
NotifyNotification *CreateUserNotification( void action_cb(NotifyNotification *notification, const char *action, NotificationPresenterLinux *obj) {
const content::ShowDesktopNotificationHostMsgParams& params, int render_process_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kRenderProcessIDKey));
int render_process_id, int render_view_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kRenderViewIDKey));
int render_view_id) { int notification_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(notification), kNotificationIDKey));
std::string title = base::UTF16ToUTF8(params.title); LOG(INFO) << "action_cb: process=" << render_process_id
std::string body = base::UTF16ToUTF8(params.body); << " view=" << render_view_id
NotifyNotification *notification = notify_notification_new(title.c_str(), body.c_str(), NULL); << " notification=" << notification_id
<< " action=\"" << action << '"';
return notification; auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (host) host->DesktopNotificationPostClick(notification_id);
obj->RemoveNotification(notification);
} }
} }
@ -68,58 +61,85 @@ NotificationPresenter* NotificationPresenter::Create() {
return new NotificationPresenterLinux; return new NotificationPresenterLinux;
} }
NotificationPresenterLinux::NotificationPresenterLinux() : notifications_(NULL) { }
NotificationPresenterLinux::~NotificationPresenterLinux() {
if (notifications_) {
for (GList *p = notifications_; p != NULL; p = p->next) {
g_object_unref(G_OBJECT(p->data));
}
g_list_free(notifications_);
}
}
void NotificationPresenterLinux::ShowNotification( void NotificationPresenterLinux::ShowNotification(
const content::ShowDesktopNotificationHostMsgParams& params, const content::ShowDesktopNotificationHostMsgParams& params,
int render_process_id, int render_process_id,
int render_view_id) { int render_view_id) {
DLOG(INFO) << "ShowNotification: process=" << render_process_id LOG(INFO) << "ShowNotification: process=" << render_process_id
<< " view=" << render_view_id << " view=" << render_view_id
<< " notification=" << params.notification_id << " notification=" << params.notification_id
<< " title=\"" << params.title << '"' << " title=\"" << params.title << '"'
<< " body=\"" << params.body << '"'; << " body=\"" << params.body << '"';
NotifyNotification *notification = CreateUserNotification(params, render_process_id, render_view_id);
NotificationID ID(render_process_id, render_view_id, params.notification_id);
std::pair<NotificationMap::iterator,bool> p = notification_map_.insert(std::make_pair(ID.GetID(), notification));
g_signal_connect(notification, "closed", G_CALLBACK(closed_cb), new NotificationID(ID)); // FIXME: closure to free it std::string title = base::UTF16ToUTF8(params.title);
std::string body = base::UTF16ToUTF8(params.body);
NotifyNotification *notification = notify_notification_new(title.c_str(), body.c_str(), NULL);
g_object_set_data(G_OBJECT(notification), kRenderProcessIDKey, GINT_TO_POINTER(render_process_id));
g_object_set_data(G_OBJECT(notification), kRenderViewIDKey, GINT_TO_POINTER(render_view_id));
g_object_set_data(G_OBJECT(notification), kNotificationIDKey, GINT_TO_POINTER(params.notification_id));
g_signal_connect(notification, "closed", G_CALLBACK(closed_cb), this);
notify_notification_add_action(notification, "default", "View", (NotifyActionCallback)action_cb, this, NULL);
notifications_ = g_list_append(notifications_, notification);
GError *error = NULL; GError *error = NULL;
notify_notification_show(notification, &error); notify_notification_show(notification, &error);
log_and_clear_error(error, "notify_notification_show"); log_and_clear_error(error, "notify_notification_show");
auto host = content::RenderViewHost::FromID(ID.render_process_id, ID.render_view_id); auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host) if (!host)
return; return;
host->DesktopNotificationPostDisplay(ID.notification_id); host->DesktopNotificationPostDisplay(params.notification_id);
} }
void NotificationPresenterLinux::CancelNotification( void NotificationPresenterLinux::CancelNotification(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int notification_id) { int notification_id) {
DLOG(INFO) << "CancelNotification: process=" << render_process_id LOG(INFO) << "CancelNotification: process=" << render_process_id
<< " view=" << render_view_id << " view=" << render_view_id
<< " notification=" << notification_id; << " notification=" << notification_id;
auto found = notification_map_.find(NotificationID(render_process_id, render_view_id, notification_id).GetID()); NotifyNotification *notification = NULL;
if (found == notification_map_.end()) for (GList *p = notifications_; p != NULL; p = p->next) {
if (render_process_id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(p->data), kRenderProcessIDKey))
&& render_view_id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(p->data), kRenderViewIDKey))
&& notification_id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(p->data), kNotificationIDKey))) {
notification = (NotifyNotification*)p->data;
notifications_ = g_list_delete_link(notifications_, p);
break;
}
}
if (!notification)
return; return;
auto notification = found->second;
notification_map_.erase(found);
GError *error = NULL; GError *error = NULL;
notify_notification_close(notification, &error); notify_notification_close(notification, &error);
log_and_clear_error(error, "notify_notification_close"); log_and_clear_error(error, "notify_notification_close");
g_object_unref(notification);
NotificationID ID(render_process_id, render_view_id, notification_id);
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id); auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host) if (!host)
return; return;
host->DesktopNotificationPostClose(ID.notification_id, false); host->DesktopNotificationPostClose(notification_id, false);
}
void NotificationPresenterLinux::RemoveNotification(NotifyNotification *former_notification) {
notifications_ = g_list_remove(notifications_, former_notification);
g_object_unref(former_notification);
} }
} }

8
brightray/browser/linux/notification_presenter_linux.h
View file

@ -17,6 +17,9 @@ namespace brightray {
class NotificationPresenterLinux : public NotificationPresenter { class NotificationPresenterLinux : public NotificationPresenter {
public: public:
NotificationPresenterLinux();
~NotificationPresenterLinux();
virtual void ShowNotification( virtual void ShowNotification(
const content::ShowDesktopNotificationHostMsgParams&, const content::ShowDesktopNotificationHostMsgParams&,
int render_process_id, int render_process_id,
@ -26,9 +29,10 @@ class NotificationPresenterLinux : public NotificationPresenter {
int render_view_id, int render_view_id,
int notification_id) OVERRIDE; int notification_id) OVERRIDE;
void RemoveNotification(NotifyNotification *former_notification);
private: private:
typedef std::map<std::string, NotifyNotification*> NotificationMap; GList *notifications_;
NotificationMap notification_map_;
}; };
} // namespace brightray } // namespace brightray