Keep track of every notification ongoing
This commit is contained in:
parent
ce71f3af42
commit
0844f59384
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
#include <System.h>
|
#include <System.h>
|
||||||
#include <Desktop.h>
|
#include <Desktop.h>
|
||||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||||
@ -32,10 +33,21 @@
|
|||||||
/* Notify */
|
/* Notify */
|
||||||
/* private */
|
/* private */
|
||||||
/* types */
|
/* types */
|
||||||
typedef struct _PhonePlugin
|
typedef struct _PhonePlugin NotifyPhonePlugin;
|
||||||
|
|
||||||
|
typedef struct _NotifyWidget
|
||||||
|
{
|
||||||
|
NotifyPhonePlugin * notify;
|
||||||
|
GtkWidget * widget;
|
||||||
|
guint source;
|
||||||
|
} NotifyWidget;
|
||||||
|
|
||||||
|
struct _PhonePlugin
|
||||||
{
|
{
|
||||||
PhonePluginHelper * helper;
|
PhonePluginHelper * helper;
|
||||||
} NotifyPhonePlugin;
|
NotifyWidget ** widgets;
|
||||||
|
size_t widgets_cnt;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
/* prototypes */
|
/* prototypes */
|
||||||
@ -44,9 +56,17 @@ static NotifyPhonePlugin * _notify_init(PhonePluginHelper * helper);
|
|||||||
static void _notify_destroy(NotifyPhonePlugin * notify);
|
static void _notify_destroy(NotifyPhonePlugin * notify);
|
||||||
static int _notify_event(NotifyPhonePlugin * notify, PhoneEvent * event);
|
static int _notify_event(NotifyPhonePlugin * notify, PhoneEvent * event);
|
||||||
|
|
||||||
|
static NotifyWidget * _notify_widget_add(NotifyPhonePlugin * notify);
|
||||||
|
static void _notify_widget_remove(NotifyPhonePlugin * notify,
|
||||||
|
NotifyWidget * widget);
|
||||||
|
|
||||||
|
/* widgets */
|
||||||
|
static NotifyWidget * _notifywidget_new(NotifyPhonePlugin * notify);
|
||||||
|
static void _notifywidget_delete(NotifyWidget * widget);
|
||||||
|
|
||||||
/* callbacks */
|
/* callbacks */
|
||||||
static void _notify_on_close(gpointer data);
|
static void _notifywidget_on_close(gpointer data);
|
||||||
static gboolean _notify_on_timeout(gpointer data);
|
static gboolean _notifywidget_on_timeout(gpointer data);
|
||||||
|
|
||||||
|
|
||||||
/* public */
|
/* public */
|
||||||
@ -73,6 +93,8 @@ static NotifyPhonePlugin * _notify_init(PhonePluginHelper * helper)
|
|||||||
if((notify = object_new(sizeof(*notify))) == NULL)
|
if((notify = object_new(sizeof(*notify))) == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
notify->helper = helper;
|
notify->helper = helper;
|
||||||
|
notify->widgets = NULL;
|
||||||
|
notify->widgets_cnt = 0;
|
||||||
return notify;
|
return notify;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,6 +102,12 @@ static NotifyPhonePlugin * _notify_init(PhonePluginHelper * helper)
|
|||||||
/* notify_destroy */
|
/* notify_destroy */
|
||||||
static void _notify_destroy(NotifyPhonePlugin * notify)
|
static void _notify_destroy(NotifyPhonePlugin * notify)
|
||||||
{
|
{
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
for(i = 0; i < notify->widgets_cnt; i++)
|
||||||
|
if(notify->widgets[i] != NULL)
|
||||||
|
_notifywidget_delete(notify->widgets[i]);
|
||||||
|
free(notify->widgets);
|
||||||
object_delete(notify);
|
object_delete(notify);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,16 +129,19 @@ static int _notify_event(NotifyPhonePlugin * notify, PhoneEvent * event)
|
|||||||
|
|
||||||
static int _event_notification(NotifyPhonePlugin * notify, PhoneEvent * event)
|
static int _event_notification(NotifyPhonePlugin * notify, PhoneEvent * event)
|
||||||
{
|
{
|
||||||
|
NotifyWidget * widget;
|
||||||
PangoFontDescription * bold;
|
PangoFontDescription * bold;
|
||||||
char const * title = event->notification.title;
|
char const * title = event->notification.title;
|
||||||
char const * stock;
|
char const * stock;
|
||||||
GtkWidget * plug;
|
|
||||||
GtkWidget * hbox;
|
GtkWidget * hbox;
|
||||||
GtkWidget * vbox;
|
GtkWidget * vbox;
|
||||||
GtkWidget * image;
|
GtkWidget * image;
|
||||||
GtkWidget * widget;
|
GtkWidget * label;
|
||||||
|
GtkWidget * button;
|
||||||
uint32_t xid;
|
uint32_t xid;
|
||||||
|
|
||||||
|
if((widget = _notify_widget_add(notify)) == NULL)
|
||||||
|
return 0;
|
||||||
bold = pango_font_description_new();
|
bold = pango_font_description_new();
|
||||||
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
|
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
|
||||||
switch(event->notification.ntype)
|
switch(event->notification.ntype)
|
||||||
@ -132,61 +163,135 @@ static int _event_notification(NotifyPhonePlugin * notify, PhoneEvent * event)
|
|||||||
title = "Information";
|
title = "Information";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
plug = gtk_plug_new(0);
|
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(plug), 4);
|
|
||||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||||
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
|
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
|
||||||
#else
|
#else
|
||||||
hbox = gtk_hbox_new(FALSE, 4);
|
hbox = gtk_hbox_new(FALSE, 4);
|
||||||
#endif
|
#endif
|
||||||
/* icon */
|
/* icon */
|
||||||
widget = gtk_image_new_from_stock(stock, GTK_ICON_SIZE_DIALOG);
|
image = gtk_image_new_from_stock(stock, GTK_ICON_SIZE_DIALOG);
|
||||||
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, TRUE, 0);
|
||||||
/* title */
|
/* title */
|
||||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||||
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
|
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
|
||||||
#else
|
#else
|
||||||
vbox = gtk_vbox_new(FALSE, 4);
|
vbox = gtk_vbox_new(FALSE, 4);
|
||||||
#endif
|
#endif
|
||||||
widget = gtk_label_new(title);
|
label = gtk_label_new(title);
|
||||||
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.0);
|
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
|
||||||
gtk_widget_modify_font(widget, bold);
|
gtk_widget_modify_font(label, bold);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
|
||||||
/* label */
|
/* label */
|
||||||
widget = gtk_label_new(event->notification.message);
|
label = gtk_label_new(event->notification.message);
|
||||||
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.0);
|
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
|
||||||
/* button */
|
/* button */
|
||||||
widget = gtk_button_new();
|
button = gtk_button_new();
|
||||||
gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NONE);
|
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
|
||||||
image = gtk_image_new_from_stock(GTK_STOCK_CLOSE,
|
image = gtk_image_new_from_stock(GTK_STOCK_CLOSE,
|
||||||
GTK_ICON_SIZE_BUTTON);
|
GTK_ICON_SIZE_BUTTON);
|
||||||
gtk_button_set_image(GTK_BUTTON(widget), image);
|
gtk_button_set_image(GTK_BUTTON(button), image);
|
||||||
g_signal_connect_swapped(widget, "clicked", G_CALLBACK(
|
g_signal_connect_swapped(button, "clicked", G_CALLBACK(
|
||||||
_notify_on_close), plug);
|
_notifywidget_on_close), widget);
|
||||||
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(plug), hbox);
|
gtk_container_add(GTK_CONTAINER(widget->widget), hbox);
|
||||||
gtk_widget_show_all(plug);
|
gtk_widget_show_all(widget->widget);
|
||||||
xid = gtk_plug_get_id(GTK_PLUG(plug));
|
xid = gtk_plug_get_id(GTK_PLUG(widget->widget));
|
||||||
desktop_message_send(PANEL_CLIENT_MESSAGE, PANEL_MESSAGE_EMBED, xid, 0);
|
desktop_message_send(PANEL_CLIENT_MESSAGE, PANEL_MESSAGE_EMBED, xid, 0);
|
||||||
g_timeout_add(3000, _notify_on_timeout, plug);
|
|
||||||
pango_font_description_free(bold);
|
pango_font_description_free(bold);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _notify_on_close(gpointer data)
|
|
||||||
{
|
|
||||||
GtkWidget * widget = data;
|
|
||||||
|
|
||||||
/* FIXME also remove the timeout source */
|
/* widgets */
|
||||||
gtk_widget_destroy(widget);
|
/* notify_widget_add */
|
||||||
|
static NotifyWidget * _notify_widget_add(NotifyPhonePlugin * notify)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
NotifyWidget ** p;
|
||||||
|
|
||||||
|
for(i = 0; i < notify->widgets_cnt; i++)
|
||||||
|
if(notify->widgets[i] == NULL)
|
||||||
|
break;
|
||||||
|
if(i == notify->widgets_cnt)
|
||||||
|
{
|
||||||
|
if((p = realloc(notify->widgets, (notify->widgets_cnt + 1)
|
||||||
|
* sizeof(*p))) == NULL)
|
||||||
|
return NULL;
|
||||||
|
notify->widgets = p;
|
||||||
|
notify->widgets[notify->widgets_cnt++] = NULL;
|
||||||
|
}
|
||||||
|
if((notify->widgets[i] = _notifywidget_new(notify)) == NULL)
|
||||||
|
return NULL;
|
||||||
|
return notify->widgets[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean _notify_on_timeout(gpointer data)
|
|
||||||
{
|
|
||||||
GtkWidget * widget = data;
|
|
||||||
|
|
||||||
_notify_on_close(widget);
|
/* notify_widget_remove */
|
||||||
|
static void _notify_widget_remove(NotifyPhonePlugin * notify,
|
||||||
|
NotifyWidget * widget)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
NotifyWidget ** p;
|
||||||
|
|
||||||
|
for(i = 0; i < notify->widgets_cnt; i++)
|
||||||
|
if(widget == notify->widgets[i])
|
||||||
|
break;
|
||||||
|
if(i == notify->widgets_cnt)
|
||||||
|
return;
|
||||||
|
_notifywidget_delete(widget);
|
||||||
|
notify->widgets[i] = NULL;
|
||||||
|
/* free memory if we were the last element */
|
||||||
|
if(i != notify->widgets_cnt - 1)
|
||||||
|
return;
|
||||||
|
for(; i > 0 && notify->widgets[i - 1] == NULL; i--);
|
||||||
|
if((p = realloc(notify->widgets, (i - 1) * sizeof(*p))) == NULL
|
||||||
|
&& (i - 1) != 0)
|
||||||
|
return;
|
||||||
|
notify->widgets = p;
|
||||||
|
notify->widgets_cnt = i - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* notifywidget_new */
|
||||||
|
static NotifyWidget * _notifywidget_new(NotifyPhonePlugin * notify)
|
||||||
|
{
|
||||||
|
NotifyWidget * widget;
|
||||||
|
|
||||||
|
if((widget = malloc(sizeof(*widget))) == NULL)
|
||||||
|
return NULL;
|
||||||
|
widget->notify = notify;
|
||||||
|
widget->widget = gtk_plug_new(0);
|
||||||
|
gtk_container_set_border_width(GTK_CONTAINER(widget->widget), 4);
|
||||||
|
widget->source = g_timeout_add(3000, _notifywidget_on_timeout, widget);
|
||||||
|
return widget;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* notifywidget_delete */
|
||||||
|
static void _notifywidget_delete(NotifyWidget * widget)
|
||||||
|
{
|
||||||
|
if(widget->source != 0)
|
||||||
|
g_source_remove(widget->source);
|
||||||
|
if(widget->widget != NULL)
|
||||||
|
gtk_widget_destroy(widget->widget);
|
||||||
|
free(widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* callbacks */
|
||||||
|
static void _notifywidget_on_close(gpointer data)
|
||||||
|
{
|
||||||
|
NotifyWidget * widget = data;
|
||||||
|
|
||||||
|
_notify_widget_remove(widget->notify, widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean _notifywidget_on_timeout(gpointer data)
|
||||||
|
{
|
||||||
|
NotifyWidget * widget = data;
|
||||||
|
|
||||||
|
_notifywidget_on_close(widget);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user