e: Add notification API
Patch by: José Roberto de Souza <zehortigoza@profusion.mobi> SVN revision: 82116
This commit is contained in:
José Roberto de Souza
Lucas De Marchi
parent
33eab461c1
commit
ab185d46c3
|
|
@ -127,6 +127,7 @@ e_module.h \
|
|||
e_mouse.h \
|
||||
e_moveresize.h \
|
||||
e_msgbus.h \
|
||||
e_notification.h \
|
||||
e_msg.h \
|
||||
e_obj_dialog.h \
|
||||
e_object.h \
|
||||
|
|
@ -281,6 +282,7 @@ e_module.c \
|
|||
e_mouse.c \
|
||||
e_moveresize.c \
|
||||
e_msgbus.c \
|
||||
e_notification.c \
|
||||
e_msg.c \
|
||||
e_obj_dialog.c \
|
||||
e_object.c \
|
||||
|
|
|
|||
|
|
@ -149,3 +149,4 @@
|
|||
#include "e_grab_dialog.h"
|
||||
#include "e_widget_filepreview.h"
|
||||
#include "e_dbusmenu.h"
|
||||
#include "e_notification.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,270 @@
|
|||
#include "e.h"
|
||||
|
||||
typedef struct _Notification_Data
|
||||
{
|
||||
EDBus_Connection *conn;
|
||||
EDBus_Service_Interface *iface;
|
||||
E_Notification_Notify_Cb notify_cb;
|
||||
E_Notification_Close_Cb close_cb;
|
||||
void *data;
|
||||
const E_Notification_Server_Info *server_info;
|
||||
} Notification_Data;
|
||||
|
||||
static Notification_Data *n_data = NULL;
|
||||
|
||||
static void
|
||||
hints_dict_iter(void *data, const void *key, EDBus_Message_Iter *var)
|
||||
{
|
||||
E_Notification_Notify *n = data;
|
||||
if (!strcmp(key, "image-data") || !strcmp(key, "image_data"))
|
||||
{
|
||||
EDBus_Message_Iter *st, *data_iter;
|
||||
int w, h, r, bits, channels;
|
||||
Eina_Bool alpha;
|
||||
unsigned char *raw_data;
|
||||
if (!edbus_message_iter_arguments_get(var, "(iiibiiay)", &st))
|
||||
return;
|
||||
if (!edbus_message_iter_arguments_get(st, "iiibiiay", &w, &h, &r,
|
||||
&alpha, &bits, &channels,
|
||||
&data_iter))
|
||||
return;
|
||||
edbus_message_iter_fixed_array_get(data_iter, 'y', &raw_data,
|
||||
&n->icon.raw.data_size);
|
||||
n->icon.raw.width = w;
|
||||
n->icon.raw.height = h;
|
||||
n->icon.raw.has_alpha = alpha;
|
||||
n->icon.raw.rowstride = r;
|
||||
n->icon.raw.bits_per_sample = bits;
|
||||
n->icon.raw.channels = channels;
|
||||
n->icon.raw.data = malloc(sizeof(char) * n->icon.raw.data_size);
|
||||
EINA_SAFETY_ON_NULL_RETURN(n->icon.raw.data);
|
||||
memcpy(n->icon.raw.data, raw_data, sizeof(char)*n->icon.raw.data_size);
|
||||
}
|
||||
else if (!strcmp(key, "urgency"))
|
||||
{
|
||||
unsigned char urgency;
|
||||
edbus_message_iter_arguments_get(var, "y", &urgency);
|
||||
if (urgency < 3)
|
||||
n->urgency = urgency;
|
||||
}
|
||||
else if (!strcmp(key, "image-path") || !strcmp(key, "image_path"))
|
||||
{
|
||||
edbus_message_iter_arguments_get(var, "s", &n->icon.icon_path);
|
||||
n->icon.icon_path = eina_stringshare_add(n->icon.icon_path);
|
||||
}
|
||||
}
|
||||
|
||||
static EDBus_Message *
|
||||
notify_cb(const EDBus_Service_Interface *iface EINA_UNUSED, const EDBus_Message *msg)
|
||||
{
|
||||
E_Notification_Notify *n;
|
||||
EDBus_Message_Iter *actions_iter, *hints_iter;
|
||||
unsigned id;
|
||||
EDBus_Message *reply;
|
||||
|
||||
if (!n_data->notify_cb)
|
||||
return NULL;
|
||||
|
||||
n = calloc(1, sizeof(E_Notification_Notify));
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(n, NULL);
|
||||
|
||||
if (!edbus_message_arguments_get(msg, "susssasa{sv}i", &n->app_name,
|
||||
&n->replaces_id, &n->icon.icon, &n->sumary,
|
||||
&n->body, &actions_iter, &hints_iter,
|
||||
&n->timeout))
|
||||
{
|
||||
ERR("Reading message.");
|
||||
free(n);
|
||||
return NULL;
|
||||
}
|
||||
edbus_message_iter_dict_iterate(hints_iter, "sv", hints_dict_iter, n);
|
||||
n->app_name = eina_stringshare_add(n->app_name);
|
||||
n->icon.icon = eina_stringshare_add(n->icon.icon);
|
||||
n->sumary = eina_stringshare_add(n->sumary);
|
||||
n->body = eina_stringshare_add(n->body);
|
||||
|
||||
id = n_data->notify_cb(n_data->data, n);
|
||||
reply = edbus_message_method_return_new(msg);
|
||||
edbus_message_arguments_append(reply, "u", id);
|
||||
return reply;
|
||||
}
|
||||
|
||||
static EDBus_Message *
|
||||
close_notification_cb(const EDBus_Service_Interface *iface EINA_UNUSED, const EDBus_Message *msg)
|
||||
{
|
||||
unsigned id;
|
||||
if (!edbus_message_arguments_get(msg, "u", &id))
|
||||
return NULL;
|
||||
if (n_data->close_cb)
|
||||
n_data->close_cb(n_data->data, id);
|
||||
return edbus_message_method_return_new(msg);
|
||||
}
|
||||
|
||||
static EDBus_Message *
|
||||
capabilities_cb(const EDBus_Service_Interface *iface EINA_UNUSED, const EDBus_Message *msg)
|
||||
{
|
||||
EDBus_Message *reply = edbus_message_method_return_new(msg);
|
||||
int i;
|
||||
EDBus_Message_Iter *main_iter, *array;
|
||||
|
||||
main_iter = edbus_message_iter_get(reply);
|
||||
edbus_message_iter_arguments_append(main_iter, "as", &array);
|
||||
|
||||
for (i = 0; n_data->server_info->capabilities[i]; i++)
|
||||
edbus_message_iter_arguments_append(array, "s",
|
||||
n_data->server_info->capabilities[i]);
|
||||
edbus_message_iter_container_close(main_iter, array);
|
||||
return reply;
|
||||
}
|
||||
|
||||
static EDBus_Message *
|
||||
server_info_cb(const EDBus_Service_Interface *iface EINA_UNUSED, const EDBus_Message *msg)
|
||||
{
|
||||
EDBus_Message *reply = edbus_message_method_return_new(msg);
|
||||
edbus_message_arguments_append(reply, "ssss", n_data->server_info->name,
|
||||
n_data->server_info->vendor,
|
||||
n_data->server_info->version,
|
||||
n_data->server_info->spec_version);
|
||||
return reply;
|
||||
}
|
||||
|
||||
static const EDBus_Method methods[] = {
|
||||
{ "Notify",
|
||||
EDBUS_ARGS({"s", "app_name"}, {"u", "replaces_id"}, {"s", "app_icon"}, {"s", "summary"}, {"s", "body"}, {"as", "actions"}, {"a{sv}", "hints"}, {"i", "expire_timeout"}),
|
||||
EDBUS_ARGS({"u", "id"}), notify_cb, 0
|
||||
},
|
||||
{
|
||||
"CloseNotification", EDBUS_ARGS({"u", "id"}), NULL, close_notification_cb, 0
|
||||
},
|
||||
{
|
||||
"GetCapabilities", NULL, EDBUS_ARGS({"as", "capabilities"}), capabilities_cb, 0
|
||||
},
|
||||
{
|
||||
"GetServerInformation", NULL,
|
||||
EDBUS_ARGS({"s", "name"}, {"s", "vendor"}, {"s", "version"}, {"s", "spec_version"}), server_info_cb, 0
|
||||
},
|
||||
{ NULL, NULL, NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
static const EDBus_Signal signals[] = {
|
||||
{"NotificationClosed", EDBUS_ARGS({"u", "id"}, {"u", "reason"}), 0},
|
||||
{"ActionInvoked", EDBUS_ARGS({"u", "id"}, {"s", "action_key"}), 0},
|
||||
{ NULL, NULL, 0}
|
||||
};
|
||||
|
||||
#define PATH "/org/freedesktop/Notifications"
|
||||
#define BUS "org.freedesktop.Notifications"
|
||||
#define INTERFACE "org.freedesktop.Notifications"
|
||||
|
||||
static const EDBus_Service_Interface_Desc desc = {
|
||||
INTERFACE, methods, signals, NULL, NULL, NULL
|
||||
};
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_notification_start(E_Notification_Notify_Cb notification_cb, E_Notification_Close_Cb close_cb, const E_Notification_Server_Info *server_info, const void *data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(server_info, EINA_FALSE);
|
||||
if (n_data)
|
||||
return EINA_FALSE;
|
||||
n_data = calloc(1, sizeof(Notification_Data));
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(n_data, EINA_FALSE);
|
||||
|
||||
edbus_init();
|
||||
n_data->conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION);
|
||||
n_data->iface = edbus_service_interface_register(n_data->conn, PATH, &desc);
|
||||
n_data->notify_cb = notification_cb;
|
||||
n_data->close_cb = close_cb;
|
||||
n_data->data = (void *) data;
|
||||
n_data->server_info = server_info;
|
||||
edbus_name_request(n_data->conn, BUS,
|
||||
EDBUS_NAME_REQUEST_FLAG_REPLACE_EXISTING, NULL, NULL);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_notification_stop(void)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN(n_data);
|
||||
edbus_service_interface_unregister(n_data->iface);
|
||||
edbus_connection_unref(n_data->conn);
|
||||
edbus_shutdown();
|
||||
free(n_data);
|
||||
n_data = NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_notification_notify_free(E_Notification_Notify *notify)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN(notify);
|
||||
eina_stringshare_del(notify->app_name);
|
||||
eina_stringshare_del(notify->body);
|
||||
eina_stringshare_del(notify->icon.icon);
|
||||
if (notify->icon.icon_path)
|
||||
eina_stringshare_del(notify->icon.icon_path);
|
||||
eina_stringshare_del(notify->sumary);
|
||||
if (notify->icon.raw.data)
|
||||
free(notify->icon.raw.data);
|
||||
free(notify);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_notification_notification_closed(unsigned id, E_Notification_Closed_Reason reason)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN(n_data);
|
||||
EINA_SAFETY_ON_FALSE_RETURN(reason <= E_NOTIFICATION_CLOSED_REASON_UNDEFINED);
|
||||
edbus_service_signal_emit(n_data->iface, 0, id, reason);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_notification_raw_image_get(Evas *evas, E_Notification_Notify *notify)
|
||||
{
|
||||
Evas_Object *o;
|
||||
unsigned char *imgdata;
|
||||
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(notify, NULL);
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(notify->icon.raw.data, NULL);
|
||||
|
||||
o = evas_object_image_filled_add(evas);
|
||||
evas_object_resize(o, notify->icon.raw.width, notify->icon.raw.height);
|
||||
evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
|
||||
evas_object_image_alpha_set(o, notify->icon.raw.has_alpha);
|
||||
evas_object_image_size_set(o, notify->icon.raw.width, notify->icon.raw.height);
|
||||
|
||||
imgdata = evas_object_image_data_get(o, EINA_TRUE);
|
||||
EINA_SAFETY_ON_NULL_GOTO(imgdata, error);
|
||||
|
||||
if (notify->icon.raw.bits_per_sample == 8)
|
||||
{
|
||||
/* Although not specified.
|
||||
* The data are very likely to come from a GdkPixbuf
|
||||
* which align each row on a 4-bytes boundary when using RGB.
|
||||
* And is RGBA otherwise. */
|
||||
int x, y, *d;
|
||||
unsigned char *s;
|
||||
int rowstride = evas_object_image_stride_get(o);
|
||||
|
||||
for (y = 0; y < notify->icon.raw.height; y++)
|
||||
{
|
||||
s = notify->icon.raw.data + (y * notify->icon.raw.rowstride);
|
||||
d = (int *)(imgdata + (y * rowstride));
|
||||
|
||||
for (x = 0; x < notify->icon.raw.width;
|
||||
x++, s += notify->icon.raw.channels, d++)
|
||||
{
|
||||
if (notify->icon.raw.has_alpha)
|
||||
*d = (s[3] << 24) | (s[0] << 16) | (s[1] << 8) | (s[2]);
|
||||
else
|
||||
*d = (0xff << 24) | (s[0] << 16) | (s[1] << 8) | (s[2]);
|
||||
}
|
||||
}
|
||||
}
|
||||
evas_object_image_data_update_add(o, 0, 0, notify->icon.raw.width,
|
||||
notify->icon.raw.height);
|
||||
evas_object_image_data_set(o, imgdata);
|
||||
|
||||
return o;
|
||||
error:
|
||||
evas_object_del(o);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
#ifndef _E_NOTIFICATION_H
|
||||
#define _E_NOTIFICATION_H
|
||||
|
||||
#include <EDBus.h>
|
||||
#include <Eina.h>
|
||||
|
||||
typedef enum _E_Notification_Notify_Urgency
|
||||
{
|
||||
E_NOTIFICATION_NOTIFY_URGENCY_LOW,
|
||||
E_NOTIFICATION_NOTIFY_URGENCY_NORMAL,
|
||||
E_NOTIFICATION_NOTIFY_URGENCY_CRITICAL
|
||||
} E_Notification_Notify_Urgency;
|
||||
|
||||
typedef enum _E_Notification_Closed_Reason
|
||||
{
|
||||
E_NOTIFICATION_CLOSED_REASON_EXPIRED, /** The notification expired. */
|
||||
E_NOTIFICATION_CLOSED_REASON_DISMISSED, /** The notification was dismissed by the user. */
|
||||
E_NOTIFICATION_CLOSED_REASON_REQUESTED, /** The notification was closed by a call to CloseNotification method. */
|
||||
E_NOTIFICATION_CLOSED_REASON_UNDEFINED /** Undefined/reserved reasons. */
|
||||
} E_Notification_Closed_Reason;
|
||||
|
||||
typedef struct _E_Notification_Notify
|
||||
{
|
||||
const char *app_name;
|
||||
unsigned replaces_id;
|
||||
const char *sumary;
|
||||
const char *body;
|
||||
int timeout;
|
||||
E_Notification_Notify_Urgency urgency;
|
||||
struct
|
||||
{
|
||||
const char *icon;
|
||||
const char *icon_path;
|
||||
struct
|
||||
{
|
||||
int width;
|
||||
int height;
|
||||
int rowstride;
|
||||
Eina_Bool has_alpha;
|
||||
int bits_per_sample;
|
||||
int channels;
|
||||
unsigned char *data;
|
||||
int data_size;
|
||||
} raw;
|
||||
} icon;
|
||||
} E_Notification_Notify;
|
||||
|
||||
typedef unsigned int (*E_Notification_Notify_Cb)(void *data, E_Notification_Notify *n);
|
||||
typedef void (*E_Notification_Close_Cb)(void *data, unsigned int id);
|
||||
|
||||
typedef struct _E_Notification_Server_Info
|
||||
{
|
||||
const char *name;
|
||||
const char *vendor;
|
||||
const char *version;
|
||||
const char *spec_version;
|
||||
const char *capabilities[];
|
||||
} E_Notification_Server_Info;
|
||||
|
||||
EAPI void e_notification_notify_free(E_Notification_Notify *notify);
|
||||
EAPI void e_notification_stop(void);
|
||||
EAPI Eina_Bool e_notification_start(E_Notification_Notify_Cb notification_cb, E_Notification_Close_Cb close_cb, const E_Notification_Server_Info *server_info, const void *data);
|
||||
EAPI void e_notification_notification_closed(unsigned id, E_Notification_Closed_Reason reason);
|
||||
EAPI Evas_Object *e_notification_raw_image_get(Evas *evas, E_Notification_Notify *notify);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue